chuan/Cli-Proxy-API-Management-Center
1
0
Fork 0
mirror of https://github.com/router-for-me/Cli-Proxy-API-Management-Center.git synced 2026-02-19 11:10:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(core): harden API parsing and improve type safety

Browse Source
This commit is contained in:
LTbinglingfeng
2026-02-08 09:42:00 +08:00
parent 3783bec983
commit 6c2cd761ba
39 changed files with 689 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/common/PageTransition.tsx
View File

@@ -1,14 +1,13 @@
import { import {
ReactNode, ReactNode,
createContext,
useCallback, useCallback,
useContext,
useLayoutEffect, useLayoutEffect,
useRef, useRef,
useState, useState,
} from 'react'; } from 'react';
import { useLocation, type Location } from 'react-router-dom'; import { useLocation, type Location } from 'react-router-dom';
import gsap from 'gsap'; import gsap from 'gsap';
import { PageTransitionLayerContext, type LayerStatus } from './PageTransitionLayer';
import './PageTransition.scss'; import './PageTransition.scss';
interface PageTransitionProps { interface PageTransitionProps {
@@ -27,8 +26,6 @@ const IOS_EXIT_TO_X_PERCENT_BACKWARD = 100;
const IOS_ENTER_FROM_X_PERCENT_BACKWARD = -30; const IOS_ENTER_FROM_X_PERCENT_BACKWARD = -30;
const IOS_EXIT_DIM_OPACITY = 0.72; const IOS_EXIT_DIM_OPACITY = 0.72;
type LayerStatus = 'current' | 'exiting' | 'stacked';
type Layer = { type Layer = {
key: string; key: string;
location: Location; location: Location;
@@ -39,16 +36,6 @@ type TransitionDirection = 'forward' | 'backward';
type TransitionVariant = 'vertical' | 'ios'; type TransitionVariant = 'vertical' | 'ios';
type PageTransitionLayerContextValue = {
status: LayerStatus;
};
const PageTransitionLayerContext = createContext<PageTransitionLayerContextValue | null>(null);
export function usePageTransitionLayer() {
return useContext(PageTransitionLayerContext);
}
export function PageTransition({ export function PageTransition({
render, render,
getRouteOrder, getRouteOrder,

15
src/components/common/PageTransitionLayer.ts Normal file
View File

@@ -0,0 +1,15 @@
import { createContext, useContext } from 'react';
export type LayerStatus = 'current' | 'exiting' | 'stacked';
type PageTransitionLayerContextValue = {
status: LayerStatus;
};
export const PageTransitionLayerContext =
createContext<PageTransitionLayerContextValue | null>(null);
export function usePageTransitionLayer() {
return useContext(PageTransitionLayerContext);
}

10
src/components/layout/MainLayout.tsx
View File

@@ -441,7 +441,8 @@ export function MainLayout() {
setCheckingVersion(true); setCheckingVersion(true);
try { try {
const data = await versionApi.checkLatest(); const data = await versionApi.checkLatest();
const latest = data?.['latest-version'] ?? data?.latest_version ?? data?.latest ?? ''; const latestRaw = data?.['latest-version'] ?? data?.latest_version ?? data?.latest ?? '';
const latest = typeof latestRaw === 'string' ? latestRaw : String(latestRaw ?? '');
const comparison = compareVersions(latest, serverVersion); const comparison = compareVersions(latest, serverVersion);
if (!latest) { if (!latest) {
@@ -459,8 +460,11 @@ export function MainLayout() {
} else { } else {
showNotification(t('system_info.version_is_latest'), 'success'); showNotification(t('system_info.version_is_latest'), 'success');
} }
} catch (error: any) { } catch (error: unknown) {
showNotification(`${t('system_info.version_check_error')}: ${error?.message || ''}`, 'error'); const message =
error instanceof Error ? error.message : typeof error === 'string' ? error : '';
const suffix = message ? `: ${message}` : '';
showNotification(`${t('system_info.version_check_error')}${suffix}`, 'error');
} finally { } finally {
setCheckingVersion(false); setCheckingVersion(false);
} }

2
src/components/modelAlias/ModelMappingDiagram.tsx
View File

@@ -285,7 +285,6 @@ export const ModelMappingDiagram = forwardRef<ModelMappingDiagramRef, ModelMappi
useLayoutEffect(() => { useLayoutEffect(() => {
// updateLines is called after layout is calculated, ensuring elements are in place. // updateLines is called after layout is calculated, ensuring elements are in place.
updateLines();
const raf = requestAnimationFrame(updateLines); const raf = requestAnimationFrame(updateLines);
window.addEventListener('resize', updateLines); window.addEventListener('resize', updateLines);
return () => { return () => {
@@ -295,7 +294,6 @@ export const ModelMappingDiagram = forwardRef<ModelMappingDiagramRef, ModelMappi
}, [updateLines, aliasNodes]); }, [updateLines, aliasNodes]);
useLayoutEffect(() => { useLayoutEffect(() => {
updateLines();
const raf = requestAnimationFrame(updateLines); const raf = requestAnimationFrame(updateLines);
return () => cancelAnimationFrame(raf); return () => cancelAnimationFrame(raf);
}, [providerGroupHeights, updateLines]); }, [providerGroupHeights, updateLines]);

8
src/components/providers/ProviderNav/ProviderNav.tsx
View File

@@ -1,7 +1,7 @@
import { CSSProperties, useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'; import { CSSProperties, useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
import { createPortal } from 'react-dom'; import { createPortal } from 'react-dom';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import { usePageTransitionLayer } from '@/components/common/PageTransition'; import { usePageTransitionLayer } from '@/components/common/PageTransitionLayer';
import { useThemeStore } from '@/stores'; import { useThemeStore } from '@/stores';
import iconGemini from '@/assets/icons/gemini.svg'; import iconGemini from '@/assets/icons/gemini.svg';
import iconOpenaiLight from '@/assets/icons/openai-light.svg'; import iconOpenaiLight from '@/assets/icons/openai-light.svg';
@@ -135,8 +135,9 @@ export function ProviderNav() {
window.addEventListener('scroll', handleScroll, { passive: true }); window.addEventListener('scroll', handleScroll, { passive: true });
contentScroller?.addEventListener('scroll', handleScroll, { passive: true }); contentScroller?.addEventListener('scroll', handleScroll, { passive: true });
window.addEventListener('resize', handleScroll); window.addEventListener('resize', handleScroll);
handleScroll(); const raf = requestAnimationFrame(handleScroll);
return () => { return () => {
cancelAnimationFrame(raf);
window.removeEventListener('scroll', handleScroll); window.removeEventListener('scroll', handleScroll);
window.removeEventListener('resize', handleScroll); window.removeEventListener('resize', handleScroll);
contentScroller?.removeEventListener('scroll', handleScroll); contentScroller?.removeEventListener('scroll', handleScroll);
@@ -168,7 +169,8 @@ export function ProviderNav() {
useLayoutEffect(() => { useLayoutEffect(() => {
if (!shouldShow) return; if (!shouldShow) return;
updateIndicator(activeProvider); const raf = requestAnimationFrame(() => updateIndicator(activeProvider));
return () => cancelAnimationFrame(raf);
}, [activeProvider, shouldShow, updateIndicator]); }, [activeProvider, shouldShow, updateIndicator]);
// Expose overlay height to the page, so it can reserve bottom padding and avoid being covered. // Expose overlay height to the page, so it can reserve bottom padding and avoid being covered.

4
src/components/usage/hooks/useUsageData.ts
View File

@@ -45,8 +45,8 @@ export function useUsageData(): UseUsageDataReturn {
setError(''); setError('');
try { try {
const data = await usageApi.getUsage(); const data = await usageApi.getUsage();
const payload = data?.usage ?? data; const payload = (data?.usage ?? data) as unknown;
setUsage(payload); setUsage(payload && typeof payload === 'object' ? (payload as UsagePayload) : null);
} catch (err: unknown) { } catch (err: unknown) {
const message = err instanceof Error ? err.message : t('usage_stats.loading_error'); const message = err instanceof Error ? err.message : t('usage_stats.loading_error');
setError(message); setError(message);

7
src/hooks/useApi.ts
View File

@@ -13,7 +13,7 @@ interface UseApiOptions<T> {
successMessage?: string; successMessage?: string;
} }
export function useApi<T = any, Args extends any[] = any[]>( export function useApi<T = unknown, Args extends unknown[] = unknown[]>(
apiFunction: (...args: Args) => Promise<T>, apiFunction: (...args: Args) => Promise<T>,
options: UseApiOptions<T> = {} options: UseApiOptions<T> = {}
) { ) {
@@ -38,8 +38,9 @@ export function useApi<T = any, Args extends any[] = any[]>(
options.onSuccess?.(result); options.onSuccess?.(result);
return result; return result;
} catch (err) { } catch (err: unknown) {
const errorObj = err as Error; const errorObj =
err instanceof Error ? err : new Error(typeof err === 'string' ? err : 'Unknown error');
setError(errorObj); setError(errorObj);
if (options.showErrorNotification !== false) { if (options.showErrorNotification !== false) {

175
src/hooks/useVisualConfig.ts
View File

@@ -1,4 +1,4 @@
import { useCallback, useMemo, useRef, useState } from 'react'; import { useCallback, useMemo, useState } from 'react';
import { parse as parseYaml, stringify as stringifyYaml } from 'yaml'; import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
import type { import type {
PayloadFilterRule, PayloadFilterRule,
@@ -123,20 +123,47 @@ function parsePayloadParamValue(raw: unknown): { valueType: PayloadParamValueTyp
return { valueType: 'string', value: String(raw ?? '') }; return { valueType: 'string', value: String(raw ?? '') };
} }
const PAYLOAD_PROTOCOL_VALUES = [
'openai',
'openai-response',
'gemini',
'claude',
'codex',
'antigravity',
] as const;
type PayloadProtocol = (typeof PAYLOAD_PROTOCOL_VALUES)[number];
function parsePayloadProtocol(raw: unknown): PayloadProtocol | undefined {
if (typeof raw !== 'string') return undefined;
return PAYLOAD_PROTOCOL_VALUES.includes(raw as PayloadProtocol)
? (raw as PayloadProtocol)
: undefined;
}
function parsePayloadRules(rules: unknown): PayloadRule[] { function parsePayloadRules(rules: unknown): PayloadRule[] {
if (!Array.isArray(rules)) return []; if (!Array.isArray(rules)) return [];
return rules.map((rule, index) => ({ return rules.map((rule, index) => {
id: `payload-rule-${index}`, const record = asRecord(rule) ?? {};
models: Array.isArray((rule as any)?.models)
? ((rule as any).models as unknown[]).map((model: any, modelIndex: number) => ({ const modelsRaw = record.models;
id: `model-${index}-${modelIndex}`, const models = Array.isArray(modelsRaw)
name: typeof model === 'string' ? model : model?.name || '', ? modelsRaw.map((model, modelIndex) => {
protocol: typeof model === 'object' ? (model?.protocol as any) : undefined, const modelRecord = asRecord(model);
})) const nameRaw =
: [], typeof model === 'string' ? model : (modelRecord?.name ?? modelRecord?.id ?? '');
params: (rule as any)?.params const name = typeof nameRaw === 'string' ? nameRaw : String(nameRaw ?? '');
? Object.entries((rule as any).params as Record<string, unknown>).map(([path, value], pIndex) => { return {
id: `model-${index}-${modelIndex}`,
name,
protocol: parsePayloadProtocol(modelRecord?.protocol),
};
})
: [];
const paramsRecord = asRecord(record.params);
const params = paramsRecord
? Object.entries(paramsRecord).map(([path, value], pIndex) => {
const parsedValue = parsePayloadParamValue(value); const parsedValue = parsePayloadParamValue(value);
return { return {
id: `param-${index}-${pIndex}`, id: `param-${index}-${pIndex}`,
@@ -145,41 +172,55 @@ function parsePayloadRules(rules: unknown): PayloadRule[] {
value: parsedValue.value, value: parsedValue.value,
}; };
}) })
: [], : [];
}));
return { id: `payload-rule-${index}`, models, params };
});
} }
function parsePayloadFilterRules(rules: unknown): PayloadFilterRule[] { function parsePayloadFilterRules(rules: unknown): PayloadFilterRule[] {
if (!Array.isArray(rules)) return []; if (!Array.isArray(rules)) return [];
return rules.map((rule, index) => ({ return rules.map((rule, index) => {
id: `payload-filter-rule-${index}`, const record = asRecord(rule) ?? {};
models: Array.isArray((rule as any)?.models)
? ((rule as any).models as unknown[]).map((model: any, modelIndex: number) => ({ const modelsRaw = record.models;
id: `filter-model-${index}-${modelIndex}`, const models = Array.isArray(modelsRaw)
name: typeof model === 'string' ? model : model?.name || '', ? modelsRaw.map((model, modelIndex) => {
protocol: typeof model === 'object' ? (model?.protocol as any) : undefined, const modelRecord = asRecord(model);
})) const nameRaw =
: [], typeof model === 'string' ? model : (modelRecord?.name ?? modelRecord?.id ?? '');
params: Array.isArray((rule as any)?.params) ? ((rule as any).params as unknown[]).map(String) : [], const name = typeof nameRaw === 'string' ? nameRaw : String(nameRaw ?? '');
})); return {
id: `filter-model-${index}-${modelIndex}`,
name,
protocol: parsePayloadProtocol(modelRecord?.protocol),
};
})
: [];
const paramsRaw = record.params;
const params = Array.isArray(paramsRaw) ? paramsRaw.map(String) : [];
return { id: `payload-filter-rule-${index}`, models, params };
});
} }
function serializePayloadRulesForYaml(rules: PayloadRule[]): any[] { function serializePayloadRulesForYaml(rules: PayloadRule[]): Array<Record<string, unknown>> {
return rules return rules
.map((rule) => { .map((rule) => {
const models = (rule.models || []) const models = (rule.models || [])
.filter((m) => m.name?.trim()) .filter((m) => m.name?.trim())
.map((m) => { .map((m) => {
const obj: Record<string, any> = { name: m.name.trim() }; const obj: Record<string, unknown> = { name: m.name.trim() };
if (m.protocol) obj.protocol = m.protocol; if (m.protocol) obj.protocol = m.protocol;
return obj; return obj;
}); });
const params: Record<string, any> = {}; const params: Record<string, unknown> = {};
for (const param of rule.params || []) { for (const param of rule.params || []) {
if (!param.path?.trim()) continue; if (!param.path?.trim()) continue;
let value: any = param.value; let value: unknown = param.value;
if (param.valueType === 'number') { if (param.valueType === 'number') {
const num = Number(param.value); const num = Number(param.value);
value = Number.isFinite(num) ? num : param.value; value = Number.isFinite(num) ? num : param.value;
@@ -200,13 +241,15 @@ function serializePayloadRulesForYaml(rules: PayloadRule[]): any[] {
.filter((rule) => rule.models.length > 0); .filter((rule) => rule.models.length > 0);
} }
function serializePayloadFilterRulesForYaml(rules: PayloadFilterRule[]): any[] { function serializePayloadFilterRulesForYaml(
rules: PayloadFilterRule[]
): Array<Record<string, unknown>> {
return rules return rules
.map((rule) => { .map((rule) => {
const models = (rule.models || []) const models = (rule.models || [])
.filter((m) => m.name?.trim()) .filter((m) => m.name?.trim())
.map((m) => { .map((m) => {
const obj: Record<string, any> = { name: m.name.trim() }; const obj: Record<string, unknown> = { name: m.name.trim() };
if (m.protocol) obj.protocol = m.protocol; if (m.protocol) obj.protocol = m.protocol;
return obj; return obj;
}); });
@@ -225,33 +268,45 @@ export function useVisualConfig() {
...DEFAULT_VISUAL_VALUES, ...DEFAULT_VISUAL_VALUES,
}); });
const baselineValues = useRef<VisualConfigValues>({ ...DEFAULT_VISUAL_VALUES }); const [baselineValues, setBaselineValues] = useState<VisualConfigValues>({
...DEFAULT_VISUAL_VALUES,
});
const visualDirty = useMemo(() => { const visualDirty = useMemo(() => {
return JSON.stringify(visualValues) !== JSON.stringify(baselineValues.current); return JSON.stringify(visualValues) !== JSON.stringify(baselineValues);
}, [visualValues]); }, [baselineValues, visualValues]);
const loadVisualValuesFromYaml = useCallback((yamlContent: string) => { const loadVisualValuesFromYaml = useCallback((yamlContent: string) => {
try { try {
const parsed: any = parseYaml(yamlContent) || {}; const parsedRaw: unknown = parseYaml(yamlContent) || {};
const parsed = asRecord(parsedRaw) ?? {};
const tls = asRecord(parsed.tls);
const remoteManagement = asRecord(parsed['remote-management']);
const quotaExceeded = asRecord(parsed['quota-exceeded']);
const routing = asRecord(parsed.routing);
const payload = asRecord(parsed.payload);
const streaming = asRecord(parsed.streaming);
const newValues: VisualConfigValues = { const newValues: VisualConfigValues = {
host: parsed.host || '', host: typeof parsed.host === 'string' ? parsed.host : '',
port: String(parsed.port ?? ''), port: String(parsed.port ?? ''),
tlsEnable: Boolean(parsed.tls?.enable), tlsEnable: Boolean(tls?.enable),
tlsCert: parsed.tls?.cert || '', tlsCert: typeof tls?.cert === 'string' ? tls.cert : '',
tlsKey: parsed.tls?.key || '', tlsKey: typeof tls?.key === 'string' ? tls.key : '',
rmAllowRemote: Boolean(parsed['remote-management']?.['allow-remote']), rmAllowRemote: Boolean(remoteManagement?.['allow-remote']),
rmSecretKey: parsed['remote-management']?.['secret-key'] || '', rmSecretKey:
rmDisableControlPanel: Boolean(parsed['remote-management']?.['disable-control-panel']), typeof remoteManagement?.['secret-key'] === 'string' ? remoteManagement['secret-key'] : '',
rmDisableControlPanel: Boolean(remoteManagement?.['disable-control-panel']),
rmPanelRepo: rmPanelRepo:
parsed['remote-management']?.['panel-github-repository'] ?? typeof remoteManagement?.['panel-github-repository'] === 'string'
parsed['remote-management']?.['panel-repo'] ?? ? remoteManagement['panel-github-repository']
'', : typeof remoteManagement?.['panel-repo'] === 'string'
? remoteManagement['panel-repo']
: '',
authDir: parsed['auth-dir'] || '', authDir: typeof parsed['auth-dir'] === 'string' ? parsed['auth-dir'] : '',
apiKeysText: parseApiKeysText(parsed['api-keys']), apiKeysText: parseApiKeysText(parsed['api-keys']),
debug: Boolean(parsed.debug), debug: Boolean(parsed.debug),
@@ -260,35 +315,36 @@ export function useVisualConfig() {
logsMaxTotalSizeMb: String(parsed['logs-max-total-size-mb'] ?? ''), logsMaxTotalSizeMb: String(parsed['logs-max-total-size-mb'] ?? ''),
usageStatisticsEnabled: Boolean(parsed['usage-statistics-enabled']), usageStatisticsEnabled: Boolean(parsed['usage-statistics-enabled']),
proxyUrl: parsed['proxy-url'] || '', proxyUrl: typeof parsed['proxy-url'] === 'string' ? parsed['proxy-url'] : '',
forceModelPrefix: Boolean(parsed['force-model-prefix']), forceModelPrefix: Boolean(parsed['force-model-prefix']),
requestRetry: String(parsed['request-retry'] ?? ''), requestRetry: String(parsed['request-retry'] ?? ''),
maxRetryInterval: String(parsed['max-retry-interval'] ?? ''), maxRetryInterval: String(parsed['max-retry-interval'] ?? ''),
wsAuth: Boolean(parsed['ws-auth']), wsAuth: Boolean(parsed['ws-auth']),
quotaSwitchProject: Boolean(parsed['quota-exceeded']?.['switch-project'] ?? true), quotaSwitchProject: Boolean(quotaExceeded?.['switch-project'] ?? true),
quotaSwitchPreviewModel: Boolean( quotaSwitchPreviewModel: Boolean(
parsed['quota-exceeded']?.['switch-preview-model'] ?? true quotaExceeded?.['switch-preview-model'] ?? true
), ),
routingStrategy: (parsed.routing?.strategy || 'round-robin') as 'round-robin' | 'fill-first', routingStrategy:
routing?.strategy === 'fill-first' ? 'fill-first' : 'round-robin',
payloadDefaultRules: parsePayloadRules(parsed.payload?.default), payloadDefaultRules: parsePayloadRules(payload?.default),
payloadOverrideRules: parsePayloadRules(parsed.payload?.override), payloadOverrideRules: parsePayloadRules(payload?.override),
payloadFilterRules: parsePayloadFilterRules(parsed.payload?.filter), payloadFilterRules: parsePayloadFilterRules(payload?.filter),
streaming: { streaming: {
keepaliveSeconds: String(parsed.streaming?.['keepalive-seconds'] ?? ''), keepaliveSeconds: String(streaming?.['keepalive-seconds'] ?? ''),
bootstrapRetries: String(parsed.streaming?.['bootstrap-retries'] ?? ''), bootstrapRetries: String(streaming?.['bootstrap-retries'] ?? ''),
nonstreamKeepaliveInterval: String(parsed['nonstream-keepalive-interval'] ?? ''), nonstreamKeepaliveInterval: String(parsed['nonstream-keepalive-interval'] ?? ''),
}, },
}; };
setVisualValuesState(newValues); setVisualValuesState(newValues);
baselineValues.current = deepClone(newValues); setBaselineValues(deepClone(newValues));
} catch { } catch {
setVisualValuesState({ ...DEFAULT_VISUAL_VALUES }); setVisualValuesState({ ...DEFAULT_VISUAL_VALUES });
baselineValues.current = deepClone(DEFAULT_VISUAL_VALUES); setBaselineValues(deepClone(DEFAULT_VISUAL_VALUES));
} }
}, []); }, []);
@@ -331,7 +387,7 @@ export function useVisualConfig() {
} }
setString(parsed, 'auth-dir', values.authDir); setString(parsed, 'auth-dir', values.authDir);
if (values.apiKeysText !== baselineValues.current.apiKeysText) { if (values.apiKeysText !== baselineValues.apiKeysText) {
const apiKeys = values.apiKeysText const apiKeys = values.apiKeysText
.split('\n') .split('\n')
.map((key) => key.trim()) .map((key) => key.trim())
@@ -419,7 +475,7 @@ export function useVisualConfig() {
return currentYaml; return currentYaml;
} }
}, },
[visualValues] [baselineValues, visualValues]
); );
const setVisualValues = useCallback((newValues: Partial<VisualConfigValues>) => { const setVisualValues = useCallback((newValues: Partial<VisualConfigValues>) => {
@@ -444,6 +500,7 @@ export function useVisualConfig() {
export const VISUAL_CONFIG_PROTOCOL_OPTIONS = [ export const VISUAL_CONFIG_PROTOCOL_OPTIONS = [
{ value: '', label: '默认' }, { value: '', label: '默认' },
{ value: 'openai', label: 'OpenAI' }, { value: 'openai', label: 'OpenAI' },
{ value: 'openai-response', label: 'OpenAI Response' },
{ value: 'gemini', label: 'Gemini' }, { value: 'gemini', label: 'Gemini' },
{ value: 'claude', label: 'Claude' }, { value: 'claude', label: 'Claude' },
{ value: 'codex', label: 'Codex' }, { value: 'codex', label: 'Codex' },

2
src/pages/AiProvidersOpenAIEditLayout.tsx
View File

@@ -243,7 +243,7 @@ export function AiProvidersOpenAIEditLayout() {
setTestStatus('idle'); setTestStatus('idle');
setTestMessage(''); setTestMessage('');
} }
}, [availableModels, loading, testModel]); }, [availableModels, loading, setTestMessage, setTestModel, setTestStatus, testModel]);
const mergeDiscoveredModels = useCallback( const mergeDiscoveredModels = useCallback(
(selectedModels: ModelInfo[]) => { (selectedModels: ModelInfo[]) => {

15
src/pages/AuthFilesPage.tsx
View File

@@ -3,7 +3,7 @@ import { Trans, useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { useInterval } from '@/hooks/useInterval'; import { useInterval } from '@/hooks/useInterval';
import { useHeaderRefresh } from '@/hooks/useHeaderRefresh'; import { useHeaderRefresh } from '@/hooks/useHeaderRefresh';
import { usePageTransitionLayer } from '@/components/common/PageTransition'; import { usePageTransitionLayer } from '@/components/common/PageTransitionLayer';
import { Card } from '@/components/ui/Card'; import { Card } from '@/components/ui/Card';
import { Button } from '@/components/ui/Button'; import { Button } from '@/components/ui/Button';
import { LoadingSpinner } from '@/components/ui/LoadingSpinner'; import { LoadingSpinner } from '@/components/ui/LoadingSpinner';
@@ -1475,11 +1475,14 @@ export function AuthFilesPage() {
return GEMINI_CLI_CONFIG; return GEMINI_CLI_CONFIG;
}; };
const getQuotaState = (type: QuotaProviderType, fileName: string) => { const getQuotaState = useCallback(
if (type === 'antigravity') return antigravityQuota[fileName]; (type: QuotaProviderType, fileName: string) => {
if (type === 'codex') return codexQuota[fileName]; if (type === 'antigravity') return antigravityQuota[fileName];
return geminiCliQuota[fileName]; if (type === 'codex') return codexQuota[fileName];
}; return geminiCliQuota[fileName];
},
[antigravityQuota, codexQuota, geminiCliQuota]
);
const updateQuotaState = useCallback( const updateQuotaState = useCallback(
( (

15
src/pages/DashboardPage.tsx
View File

@@ -62,14 +62,23 @@ export function DashboardPage() {
apiKeysCache.current = []; apiKeysCache.current = [];
}, [apiBase, config?.apiKeys]); }, [apiBase, config?.apiKeys]);
const normalizeApiKeyList = (input: any): string[] => { const normalizeApiKeyList = (input: unknown): string[] => {
if (!Array.isArray(input)) return []; if (!Array.isArray(input)) return [];
const seen = new Set<string>(); const seen = new Set<string>();
const keys: string[] = []; const keys: string[] = [];
input.forEach((item) => { input.forEach((item) => {
const value = typeof item === 'string' ? item : item?.['api-key'] ?? item?.apiKey ?? ''; const record =
const trimmed = String(value || '').trim(); item !== null && typeof item === 'object' && !Array.isArray(item)
? (item as Record<string, unknown>)
: null;
const value =
typeof item === 'string'
? item
: record
? (record['api-key'] ?? record['apiKey'] ?? record.key ?? record.Key)
: '';
const trimmed = String(value ?? '').trim();
if (!trimmed || seen.has(trimmed)) return; if (!trimmed || seen.has(trimmed)) return;
seen.add(trimmed); seen.add(trimmed);
keys.push(trimmed); keys.push(trimmed);

25
src/pages/LoginPage.tsx
View File

@@ -15,11 +15,20 @@ import styles from './LoginPage.module.scss';
/** /**
* 将 API 错误转换为本地化的用户友好消息 * 将 API 错误转换为本地化的用户友好消息
*/ */
function getLocalizedErrorMessage(error: any, t: (key: string) => string): string { type RedirectState = { from?: { pathname?: string } };
const apiError = error as ApiError;
const status = apiError?.status; function getLocalizedErrorMessage(error: unknown, t: (key: string) => string): string {
const code = apiError?.code; const apiError = error as Partial<ApiError>;
const message = apiError?.message || ''; const status = typeof apiError.status === 'number' ? apiError.status : undefined;
const code = typeof apiError.code === 'string' ? apiError.code : undefined;
const message =
error instanceof Error
? error.message
: typeof apiError.message === 'string'
? apiError.message
: typeof error === 'string'
? error
: '';
// 根据 HTTP 状态码判断 // 根据 HTTP 状态码判断
if (status === 401) { if (status === 401) {
@@ -99,7 +108,7 @@ export function LoginPage() {
setAutoLoginSuccess(true); setAutoLoginSuccess(true);
// 延迟跳转，让用户看到成功动画 // 延迟跳转，让用户看到成功动画
setTimeout(() => { setTimeout(() => {
const redirect = (location.state as any)?.from?.pathname || '/'; const redirect = (location.state as RedirectState | null)?.from?.pathname || '/';
navigate(redirect, { replace: true }); navigate(redirect, { replace: true });
}, 1500); }, 1500);
} else { } else {
@@ -135,7 +144,7 @@ export function LoginPage() {
}); });
showNotification(t('common.connected_status'), 'success'); showNotification(t('common.connected_status'), 'success');
navigate('/', { replace: true }); navigate('/', { replace: true });
} catch (err: any) { } catch (err: unknown) {
const message = getLocalizedErrorMessage(err, t); const message = getLocalizedErrorMessage(err, t);
setError(message); setError(message);
showNotification(`${t('notification.login_failed')}: ${message}`, 'error'); showNotification(`${t('notification.login_failed')}: ${message}`, 'error');
@@ -155,7 +164,7 @@ export function LoginPage() {
); );
if (isAuthenticated && !autoLoading && !autoLoginSuccess) { if (isAuthenticated && !autoLoading && !autoLoginSuccess) {
const redirect = (location.state as any)?.from?.pathname || '/'; const redirect = (location.state as RedirectState | null)?.from?.pathname || '/';
return <Navigate to={redirect} replace />; return <Navigate to={redirect} replace />;
} }

53
src/pages/OAuthPage.tsx
View File

@@ -56,6 +56,21 @@ interface VertexImportState {
result?: VertexImportResult; result?: VertexImportResult;
} }
function isRecord(value: unknown): value is Record<string, unknown> {
return value !== null && typeof value === 'object';
}
function getErrorMessage(error: unknown): string {
if (error instanceof Error) return error.message;
if (isRecord(error) && typeof error.message === 'string') return error.message;
return typeof error === 'string' ? error : '';
}
function getErrorStatus(error: unknown): number | undefined {
if (!isRecord(error)) return undefined;
return typeof error.status === 'number' ? error.status : undefined;
}
const PROVIDERS: { id: OAuthProvider; titleKey: string; hintKey: string; urlLabelKey: string; icon: string | { light: string; dark: string } }[] = [ const PROVIDERS: { id: OAuthProvider; titleKey: string; hintKey: string; urlLabelKey: string; icon: string | { light: string; dark: string } }[] = [
{ id: 'codex', titleKey: 'auth_login.codex_oauth_title', hintKey: 'auth_login.codex_oauth_hint', urlLabelKey: 'auth_login.codex_oauth_url_label', icon: { light: iconCodexLight, dark: iconCodexDark } }, { id: 'codex', titleKey: 'auth_login.codex_oauth_title', hintKey: 'auth_login.codex_oauth_hint', urlLabelKey: 'auth_login.codex_oauth_url_label', icon: { light: iconCodexLight, dark: iconCodexDark } },
{ id: 'anthropic', titleKey: 'auth_login.anthropic_oauth_title', hintKey: 'auth_login.anthropic_oauth_hint', urlLabelKey: 'auth_login.anthropic_oauth_url_label', icon: iconClaude }, { id: 'anthropic', titleKey: 'auth_login.anthropic_oauth_title', hintKey: 'auth_login.anthropic_oauth_hint', urlLabelKey: 'auth_login.anthropic_oauth_url_label', icon: iconClaude },
@@ -127,8 +142,8 @@ export function OAuthPage() {
window.clearInterval(timer); window.clearInterval(timer);
delete timers.current[provider]; delete timers.current[provider];
} }
} catch (err: any) { } catch (err: unknown) {
updateProviderState(provider, { status: 'error', error: err?.message, polling: false }); updateProviderState(provider, { status: 'error', error: getErrorMessage(err), polling: false });
window.clearInterval(timer); window.clearInterval(timer);
delete timers.current[provider]; delete timers.current[provider];
} }
@@ -159,9 +174,13 @@ export function OAuthPage() {
if (res.state) { if (res.state) {
startPolling(provider, res.state); startPolling(provider, res.state);
} }
} catch (err: any) { } catch (err: unknown) {
updateProviderState(provider, { status: 'error', error: err?.message, polling: false }); const message = getErrorMessage(err);
showNotification(`${t(getAuthKey(provider, 'oauth_start_error'))} ${err?.message || ''}`, 'error'); updateProviderState(provider, { status: 'error', error: message, polling: false });
showNotification(
`${t(getAuthKey(provider, 'oauth_start_error'))}${message ? ` ${message}` : ''}`,
'error'
);
} }
}; };
@@ -190,13 +209,15 @@ export function OAuthPage() {
await oauthApi.submitCallback(provider, redirectUrl); await oauthApi.submitCallback(provider, redirectUrl);
updateProviderState(provider, { callbackSubmitting: false, callbackStatus: 'success' }); updateProviderState(provider, { callbackSubmitting: false, callbackStatus: 'success' });
showNotification(t('auth_login.oauth_callback_success'), 'success'); showNotification(t('auth_login.oauth_callback_success'), 'success');
} catch (err: any) { } catch (err: unknown) {
const status = getErrorStatus(err);
const message = getErrorMessage(err);
const errorMessage = const errorMessage =
err?.status === 404 status === 404
? t('auth_login.oauth_callback_upgrade_hint', { ? t('auth_login.oauth_callback_upgrade_hint', {
defaultValue: 'Please update CLI Proxy API or check the connection.' defaultValue: 'Please update CLI Proxy API or check the connection.'
}) })
: err?.message; : message || undefined;
updateProviderState(provider, { updateProviderState(provider, {
callbackSubmitting: false, callbackSubmitting: false,
callbackStatus: 'error', callbackStatus: 'error',
@@ -236,15 +257,19 @@ export function OAuthPage() {
})); }));
showNotification(`${t('auth_login.iflow_cookie_status_error')} ${res.error || ''}`, 'error'); showNotification(`${t('auth_login.iflow_cookie_status_error')} ${res.error || ''}`, 'error');
} }
} catch (err: any) { } catch (err: unknown) {
if (err?.status === 409) { if (getErrorStatus(err) === 409) {
const message = t('auth_login.iflow_cookie_config_duplicate'); const message = t('auth_login.iflow_cookie_config_duplicate');
setIflowCookie((prev) => ({ ...prev, loading: false, error: message, errorType: 'warning' })); setIflowCookie((prev) => ({ ...prev, loading: false, error: message, errorType: 'warning' }));
showNotification(message, 'warning'); showNotification(message, 'warning');
return; return;
} }
setIflowCookie((prev) => ({ ...prev, loading: false, error: err?.message, errorType: 'error' })); const message = getErrorMessage(err);
showNotification(`${t('auth_login.iflow_cookie_start_error')} ${err?.message || ''}`, 'error'); setIflowCookie((prev) => ({ ...prev, loading: false, error: message, errorType: 'error' }));
showNotification(
`${t('auth_login.iflow_cookie_start_error')}${message ? ` ${message}` : ''}`,
'error'
);
} }
}; };
@@ -292,8 +317,8 @@ export function OAuthPage() {
}; };
setVertexState((prev) => ({ ...prev, loading: false, result })); setVertexState((prev) => ({ ...prev, loading: false, result }));
showNotification(t('vertex_import.success'), 'success'); showNotification(t('vertex_import.success'), 'success');
} catch (err: any) { } catch (err: unknown) {
const message = err?.message || ''; const message = getErrorMessage(err);
setVertexState((prev) => ({ setVertexState((prev) => ({
...prev, ...prev,
loading: false, loading: false,

43
src/pages/SystemPage.tsx
View File

@@ -83,14 +83,23 @@ export function SystemPage() {
return resolvedTheme === 'dark' ? iconEntry.dark : iconEntry.light; return resolvedTheme === 'dark' ? iconEntry.dark : iconEntry.light;
}; };
const normalizeApiKeyList = (input: any): string[] => { const normalizeApiKeyList = (input: unknown): string[] => {
if (!Array.isArray(input)) return []; if (!Array.isArray(input)) return [];
const seen = new Set<string>(); const seen = new Set<string>();
const keys: string[] = []; const keys: string[] = [];
input.forEach((item) => { input.forEach((item) => {
const value = typeof item === 'string' ? item : item?.['api-key'] ?? item?.apiKey ?? ''; const record =
const trimmed = String(value || '').trim(); item !== null && typeof item === 'object' && !Array.isArray(item)
? (item as Record<string, unknown>)
: null;
const value =
typeof item === 'string'
? item
: record
? (record['api-key'] ?? record['apiKey'] ?? record.key ?? record.Key)
: '';
const trimmed = String(value ?? '').trim();
if (!trimmed || seen.has(trimmed)) return; if (!trimmed || seen.has(trimmed)) return;
seen.add(trimmed); seen.add(trimmed);
keys.push(trimmed); keys.push(trimmed);
@@ -151,9 +160,12 @@ export function SystemPage() {
type: hasModels ? 'success' : 'warning', type: hasModels ? 'success' : 'warning',
message: hasModels ? t('system_info.models_count', { count: list.length }) : t('system_info.models_empty') message: hasModels ? t('system_info.models_count', { count: list.length }) : t('system_info.models_empty')
}); });
} catch (err: any) { } catch (err: unknown) {
const message = `${t('system_info.models_error')}: ${err?.message || ''}`; const message =
setModelStatus({ type: 'error', message }); err instanceof Error ? err.message : typeof err === 'string' ? err : '';
const suffix = message ? `: ${message}` : '';
const text = `${t('system_info.models_error')}${suffix}`;
setModelStatus({ type: 'error', message: text });
} }
}; };
@@ -219,9 +231,14 @@ export function SystemPage() {
clearCache('request-log'); clearCache('request-log');
showNotification(t('notification.request_log_updated'), 'success'); showNotification(t('notification.request_log_updated'), 'success');
setRequestLogModalOpen(false); setRequestLogModalOpen(false);
} catch (error: any) { } catch (error: unknown) {
const message =
error instanceof Error ? error.message : typeof error === 'string' ? error : '';
updateConfigValue('request-log', previous); updateConfigValue('request-log', previous);
showNotification(`${t('notification.update_failed')}: ${error?.message || ''}`, 'error'); showNotification(
`${t('notification.update_failed')}${message ? `: ${message}` : ''}`,
'error'
);
} finally { } finally {
setRequestLogSaving(false); setRequestLogSaving(false);
} }
@@ -282,11 +299,11 @@ export function SystemPage() {
<div className={styles.tileValue}>{buildTime}</div> <div className={styles.tileValue}>{buildTime}</div>
</div> </div>
<div className={styles.infoTile}> <div className={styles.infoTile}>
<div className={styles.tileLabel}>{t('connection.status')}</div> <div className={styles.tileLabel}>{t('connection.status')}</div>
<div className={styles.tileValue}>{t(`common.${auth.connectionStatus}_status` as any)}</div> <div className={styles.tileValue}>{t(`common.${auth.connectionStatus}_status`)}</div>
<div className={styles.tileSub}>{auth.apiBase || '-'}</div> <div className={styles.tileSub}>{auth.apiBase || '-'}</div>
</div> </div>
</div> </div>
<div className={styles.aboutActions}> <div className={styles.aboutActions}>

2
src/services/api/ampcode.ts
View File

@@ -19,7 +19,7 @@ export const ampcodeApi = {
clearUpstreamApiKey: () => apiClient.delete('/ampcode/upstream-api-key'), clearUpstreamApiKey: () => apiClient.delete('/ampcode/upstream-api-key'),
async getModelMappings(): Promise<AmpcodeModelMapping[]> { async getModelMappings(): Promise<AmpcodeModelMapping[]> {
const data = await apiClient.get('/ampcode/model-mappings'); const data = await apiClient.get<Record<string, unknown>>('/ampcode/model-mappings');
const list = data?.['model-mappings'] ?? data?.modelMappings ?? data?.items ?? data; const list = data?.['model-mappings'] ?? data?.modelMappings ?? data?.items ?? data;
return normalizeAmpcodeModelMappings(list); return normalizeAmpcodeModelMappings(list);
}, },

21
src/services/api/apiCall.ts
View File

@@ -13,14 +13,14 @@ export interface ApiCallRequest {
data?: string; data?: string;
} }
export interface ApiCallResult<T = any> { export interface ApiCallResult<T = unknown> {
statusCode: number; statusCode: number;
header: Record<string, string[]>; header: Record<string, string[]>;
bodyText: string; bodyText: string;
body: T | null; body: T | null;
} }
const normalizeBody = (input: unknown): { bodyText: string; body: any | null } => { const normalizeBody = (input: unknown): { bodyText: string; body: unknown | null } => {
if (input === undefined || input === null) { if (input === undefined || input === null) {
return { bodyText: '', body: null }; return { bodyText: '', body: null };
} }
@@ -46,13 +46,24 @@ const normalizeBody = (input: unknown): { bodyText: string; body: any | null } =
}; };
export const getApiCallErrorMessage = (result: ApiCallResult): string => { export const getApiCallErrorMessage = (result: ApiCallResult): string => {
const isRecord = (value: unknown): value is Record<string, unknown> =>
value !== null && typeof value === 'object';
const status = result.statusCode; const status = result.statusCode;
const body = result.body; const body = result.body;
const bodyText = result.bodyText; const bodyText = result.bodyText;
let message = ''; let message = '';
if (body && typeof body === 'object') { if (isRecord(body)) {
message = body?.error?.message || body?.error || body?.message || ''; const errorValue = body.error;
if (isRecord(errorValue) && typeof errorValue.message === 'string') {
message = errorValue.message;
} else if (typeof errorValue === 'string') {
message = errorValue;
}
if (!message && typeof body.message === 'string') {
message = body.message;
}
} else if (typeof body === 'string') { } else if (typeof body === 'string') {
message = body; message = body;
} }
@@ -71,7 +82,7 @@ export const apiCallApi = {
payload: ApiCallRequest, payload: ApiCallRequest,
config?: AxiosRequestConfig config?: AxiosRequestConfig
): Promise<ApiCallResult> => { ): Promise<ApiCallResult> => {
const response = await apiClient.post('/api-call', payload, config); const response = await apiClient.post<Record<string, unknown>>('/api-call', payload, config);
const statusCode = Number(response?.status_code ?? response?.statusCode ?? 0); const statusCode = Number(response?.status_code ?? response?.statusCode ?? 0);
const header = (response?.header ?? response?.headers ?? {}) as Record<string, string[]>; const header = (response?.header ?? response?.headers ?? {}) as Record<string, string[]>;
const { bodyText, body } = normalizeBody(response?.body); const { bodyText, body } = normalizeBody(response?.body);

6
src/services/api/apiKeys.ts
View File

@@ -6,9 +6,9 @@ import { apiClient } from './client';
export const apiKeysApi = { export const apiKeysApi = {
async list(): Promise<string[]> { async list(): Promise<string[]> {
const data = await apiClient.get('/api-keys'); const data = await apiClient.get<Record<string, unknown>>('/api-keys');
const keys = (data && (data['api-keys'] ?? data.apiKeys)) as unknown; const keys = data['api-keys'] ?? data.apiKeys;
return Array.isArray(keys) ? (keys as string[]) : []; return Array.isArray(keys) ? keys.map((key) => String(key)) : [];
}, },
replace: (keys: string[]) => apiClient.put('/api-keys', keys), replace: (keys: string[]) => apiClient.put('/api-keys', keys),

18
src/services/api/authFiles.ts
View File

@@ -171,15 +171,25 @@ export const authFilesApi = {
// 获取认证凭证支持的模型 // 获取认证凭证支持的模型
async getModelsForAuthFile(name: string): Promise<{ id: string; display_name?: string; type?: string; owned_by?: string }[]> { async getModelsForAuthFile(name: string): Promise<{ id: string; display_name?: string; type?: string; owned_by?: string }[]> {
const data = await apiClient.get(`/auth-files/models?name=${encodeURIComponent(name)}`); const data = await apiClient.get<Record<string, unknown>>(
return (data && Array.isArray(data['models'])) ? data['models'] : []; `/auth-files/models?name=${encodeURIComponent(name)}`
);
const models = data.models ?? data['models'];
return Array.isArray(models)
? (models as { id: string; display_name?: string; type?: string; owned_by?: string }[])
: [];
}, },
// 获取指定 channel 的模型定义 // 获取指定 channel 的模型定义
async getModelDefinitions(channel: string): Promise<{ id: string; display_name?: string; type?: string; owned_by?: string }[]> { async getModelDefinitions(channel: string): Promise<{ id: string; display_name?: string; type?: string; owned_by?: string }[]> {
const normalizedChannel = String(channel ?? '').trim().toLowerCase(); const normalizedChannel = String(channel ?? '').trim().toLowerCase();
if (!normalizedChannel) return []; if (!normalizedChannel) return [];
const data = await apiClient.get(`/model-definitions/${encodeURIComponent(normalizedChannel)}`); const data = await apiClient.get<Record<string, unknown>>(
return (data && Array.isArray(data['models'])) ? data['models'] : []; `/model-definitions/${encodeURIComponent(normalizedChannel)}`
);
const models = data.models ?? data['models'];
return Array.isArray(models)
? (models as { id: string; display_name?: string; type?: string; owned_by?: string }[])
: [];
} }
}; };

49
src/services/api/client.ts
View File

@@ -62,7 +62,10 @@ class ApiClient {
return `${normalized}${MANAGEMENT_API_PREFIX}`; return `${normalized}${MANAGEMENT_API_PREFIX}`;
} }
private readHeader(headers: Record<string, any> | undefined, keys: string[]): string | null { private readHeader(
headers: Record<string, unknown> | undefined,
keys: string[]
): string | null {
if (!headers) return null; if (!headers) return null;
const normalizeValue = (value: unknown): string | null => { const normalizeValue = (value: unknown): string | null => {
@@ -75,7 +78,7 @@ class ApiClient {
return text ? text : null; return text ? text : null;
}; };
const headerGetter = (headers as { get?: (name: string) => any }).get; const headerGetter = (headers as { get?: (name: string) => unknown }).get;
if (typeof headerGetter === 'function') { if (typeof headerGetter === 'function') {
for (const key of keys) { for (const key of keys) {
const match = normalizeValue(headerGetter.call(headers, key)); const match = normalizeValue(headerGetter.call(headers, key));
@@ -84,8 +87,8 @@ class ApiClient {
} }
const entries = const entries =
typeof (headers as { entries?: () => Iterable<[string, any]> }).entries === 'function' typeof (headers as { entries?: () => Iterable<[string, unknown]> }).entries === 'function'
? Array.from((headers as { entries: () => Iterable<[string, any]> }).entries()) ? Array.from((headers as { entries: () => Iterable<[string, unknown]> }).entries())
: Object.entries(headers); : Object.entries(headers);
const normalized = Object.fromEntries( const normalized = Object.fromEntries(
@@ -147,10 +150,22 @@ class ApiClient {
/** /**
* 错误处理 * 错误处理
*/ */
private handleError(error: any): ApiError { private handleError(error: unknown): ApiError {
const isRecord = (value: unknown): value is Record<string, unknown> =>
value !== null && typeof value === 'object';
if (axios.isAxiosError(error)) { if (axios.isAxiosError(error)) {
const responseData = error.response?.data as any; const responseData: unknown = error.response?.data;
const message = responseData?.error || responseData?.message || error.message || 'Request failed'; const responseRecord = isRecord(responseData) ? responseData : null;
const errorValue = responseRecord?.error;
const message =
typeof errorValue === 'string'
? errorValue
: isRecord(errorValue) && typeof errorValue.message === 'string'
? errorValue.message
: typeof responseRecord?.message === 'string'
? responseRecord.message
: error.message || 'Request failed';
const apiError = new Error(message) as ApiError; const apiError = new Error(message) as ApiError;
apiError.name = 'ApiError'; apiError.name = 'ApiError';
apiError.status = error.response?.status; apiError.status = error.response?.status;
@@ -166,7 +181,9 @@ class ApiClient {
return apiError; return apiError;
} }
const fallback = new Error(error?.message || 'Unknown error occurred') as ApiError; const fallbackMessage =
error instanceof Error ? error.message : typeof error === 'string' ? error : 'Unknown error occurred';
const fallback = new Error(fallbackMessage) as ApiError;
fallback.name = 'ApiError'; fallback.name = 'ApiError';
return fallback; return fallback;
} }
@@ -174,7 +191,7 @@ class ApiClient {
/** /**
* GET 请求 * GET 请求
*/ */
async get<T = any>(url: string, config?: AxiosRequestConfig): Promise<T> { async get<T = unknown>(url: string, config?: AxiosRequestConfig): Promise<T> {
const response = await this.instance.get<T>(url, config); const response = await this.instance.get<T>(url, config);
return response.data; return response.data;
} }
@@ -182,7 +199,7 @@ class ApiClient {
/** /**
* POST 请求 * POST 请求
*/ */
async post<T = any>(url: string, data?: any, config?: AxiosRequestConfig): Promise<T> { async post<T = unknown>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T> {
const response = await this.instance.post<T>(url, data, config); const response = await this.instance.post<T>(url, data, config);
return response.data; return response.data;
} }
@@ -190,7 +207,7 @@ class ApiClient {
/** /**
* PUT 请求 * PUT 请求
*/ */
async put<T = any>(url: string, data?: any, config?: AxiosRequestConfig): Promise<T> { async put<T = unknown>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T> {
const response = await this.instance.put<T>(url, data, config); const response = await this.instance.put<T>(url, data, config);
return response.data; return response.data;
} }
@@ -198,7 +215,7 @@ class ApiClient {
/** /**
* PATCH 请求 * PATCH 请求
*/ */
async patch<T = any>(url: string, data?: any, config?: AxiosRequestConfig): Promise<T> { async patch<T = unknown>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T> {
const response = await this.instance.patch<T>(url, data, config); const response = await this.instance.patch<T>(url, data, config);
return response.data; return response.data;
} }
@@ -206,7 +223,7 @@ class ApiClient {
/** /**
* DELETE 请求 * DELETE 请求
*/ */
async delete<T = any>(url: string, config?: AxiosRequestConfig): Promise<T> { async delete<T = unknown>(url: string, config?: AxiosRequestConfig): Promise<T> {
const response = await this.instance.delete<T>(url, config); const response = await this.instance.delete<T>(url, config);
return response.data; return response.data;
} }
@@ -221,7 +238,11 @@ class ApiClient {
/** /**
* 发送 FormData * 发送 FormData
*/ */
async postForm<T = any>(url: string, formData: FormData, config?: AxiosRequestConfig): Promise<T> { async postForm<T = unknown>(
url: string,
formData: FormData,
config?: AxiosRequestConfig
): Promise<T> {
const response = await this.instance.post<T>(url, formData, { const response = await this.instance.post<T>(url, formData, {
...config, ...config,
headers: { headers: {

15
src/services/api/config.ts
View File

@@ -72,8 +72,10 @@ export const configApi = {
* 获取日志总大小上限（MB） * 获取日志总大小上限（MB）
*/ */
async getLogsMaxTotalSizeMb(): Promise<number> { async getLogsMaxTotalSizeMb(): Promise<number> {
const data = await apiClient.get('/logs-max-total-size-mb'); const data = await apiClient.get<Record<string, unknown>>('/logs-max-total-size-mb');
return data?.['logs-max-total-size-mb'] ?? data?.logsMaxTotalSizeMb ?? 0; const value = data?.['logs-max-total-size-mb'] ?? data?.logsMaxTotalSizeMb ?? 0;
const parsed = Number(value);
return Number.isFinite(parsed) ? parsed : 0;
}, },
/** /**
@@ -91,8 +93,8 @@ export const configApi = {
* 获取强制模型前缀开关 * 获取强制模型前缀开关
*/ */
async getForceModelPrefix(): Promise<boolean> { async getForceModelPrefix(): Promise<boolean> {
const data = await apiClient.get('/force-model-prefix'); const data = await apiClient.get<Record<string, unknown>>('/force-model-prefix');
return data?.['force-model-prefix'] ?? data?.forceModelPrefix ?? false; return Boolean(data?.['force-model-prefix'] ?? data?.forceModelPrefix ?? false);
}, },
/** /**
@@ -104,8 +106,9 @@ export const configApi = {
* 获取路由策略 * 获取路由策略
*/ */
async getRoutingStrategy(): Promise<string> { async getRoutingStrategy(): Promise<string> {
const data = await apiClient.get('/routing/strategy'); const data = await apiClient.get<Record<string, unknown>>('/routing/strategy');
return data?.strategy ?? data?.['routing-strategy'] ?? data?.routingStrategy ?? 'round-robin'; const strategy = data?.strategy ?? data?.['routing-strategy'] ?? data?.routingStrategy;
return typeof strategy === 'string' ? strategy : 'round-robin';
}, },
/** /**

2
src/services/api/configFile.ts
View File

@@ -10,7 +10,7 @@ export const configFileApi = {
responseType: 'text', responseType: 'text',
headers: { Accept: 'application/yaml, text/yaml, text/plain' } headers: { Accept: 'application/yaml, text/yaml, text/plain' }
}); });
const data = response.data as any; const data: unknown = response.data;
if (typeof data === 'string') return data; if (typeof data === 'string') return data;
if (data === undefined || data === null) return ''; if (data === undefined || data === null) return '';
return String(data); return String(data);

37
src/services/api/providers.ts
View File

@@ -18,12 +18,22 @@ import type {
const serializeHeaders = (headers?: Record<string, string>) => (headers && Object.keys(headers).length ? headers : undefined); const serializeHeaders = (headers?: Record<string, string>) => (headers && Object.keys(headers).length ? headers : undefined);
const isRecord = (value: unknown): value is Record<string, unknown> =>
value !== null && typeof value === 'object' && !Array.isArray(value);
const extractArrayPayload = (data: unknown, key: string): unknown[] => {
if (Array.isArray(data)) return data;
if (!isRecord(data)) return [];
const candidate = data[key] ?? data.items ?? data.data ?? data;
return Array.isArray(candidate) ? candidate : [];
};
const serializeModelAliases = (models?: ModelAlias[]) => const serializeModelAliases = (models?: ModelAlias[]) =>
Array.isArray(models) Array.isArray(models)
? models ? models
.map((model) => { .map((model) => {
if (!model?.name) return null; if (!model?.name) return null;
const payload: Record<string, any> = { name: model.name }; const payload: Record<string, unknown> = { name: model.name };
if (model.alias && model.alias !== model.name) { if (model.alias && model.alias !== model.name) {
payload.alias = model.alias; payload.alias = model.alias;
} }
@@ -39,7 +49,7 @@ const serializeModelAliases = (models?: ModelAlias[]) =>
: undefined; : undefined;
const serializeApiKeyEntry = (entry: ApiKeyEntry) => { const serializeApiKeyEntry = (entry: ApiKeyEntry) => {
const payload: Record<string, any> = { 'api-key': entry.apiKey }; const payload: Record<string, unknown> = { 'api-key': entry.apiKey };
if (entry.proxyUrl) payload['proxy-url'] = entry.proxyUrl; if (entry.proxyUrl) payload['proxy-url'] = entry.proxyUrl;
const headers = serializeHeaders(entry.headers); const headers = serializeHeaders(entry.headers);
if (headers) payload.headers = headers; if (headers) payload.headers = headers;
@@ -47,7 +57,7 @@ const serializeApiKeyEntry = (entry: ApiKeyEntry) => {
}; };
const serializeProviderKey = (config: ProviderKeyConfig) => { const serializeProviderKey = (config: ProviderKeyConfig) => {
const payload: Record<string, any> = { 'api-key': config.apiKey }; const payload: Record<string, unknown> = { 'api-key': config.apiKey };
if (config.prefix?.trim()) payload.prefix = config.prefix.trim(); if (config.prefix?.trim()) payload.prefix = config.prefix.trim();
if (config.baseUrl) payload['base-url'] = config.baseUrl; if (config.baseUrl) payload['base-url'] = config.baseUrl;
if (config.proxyUrl) payload['proxy-url'] = config.proxyUrl; if (config.proxyUrl) payload['proxy-url'] = config.proxyUrl;
@@ -74,7 +84,7 @@ const serializeVertexModelAliases = (models?: ModelAlias[]) =>
: undefined; : undefined;
const serializeVertexKey = (config: ProviderKeyConfig) => { const serializeVertexKey = (config: ProviderKeyConfig) => {
const payload: Record<string, any> = { 'api-key': config.apiKey }; const payload: Record<string, unknown> = { 'api-key': config.apiKey };
if (config.prefix?.trim()) payload.prefix = config.prefix.trim(); if (config.prefix?.trim()) payload.prefix = config.prefix.trim();
if (config.baseUrl) payload['base-url'] = config.baseUrl; if (config.baseUrl) payload['base-url'] = config.baseUrl;
if (config.proxyUrl) payload['proxy-url'] = config.proxyUrl; if (config.proxyUrl) payload['proxy-url'] = config.proxyUrl;
@@ -86,7 +96,7 @@ const serializeVertexKey = (config: ProviderKeyConfig) => {
}; };
const serializeGeminiKey = (config: GeminiKeyConfig) => { const serializeGeminiKey = (config: GeminiKeyConfig) => {
const payload: Record<string, any> = { 'api-key': config.apiKey }; const payload: Record<string, unknown> = { 'api-key': config.apiKey };
if (config.prefix?.trim()) payload.prefix = config.prefix.trim(); if (config.prefix?.trim()) payload.prefix = config.prefix.trim();
if (config.baseUrl) payload['base-url'] = config.baseUrl; if (config.baseUrl) payload['base-url'] = config.baseUrl;
const headers = serializeHeaders(config.headers); const headers = serializeHeaders(config.headers);
@@ -98,7 +108,7 @@ const serializeGeminiKey = (config: GeminiKeyConfig) => {
}; };
const serializeOpenAIProvider = (provider: OpenAIProviderConfig) => { const serializeOpenAIProvider = (provider: OpenAIProviderConfig) => {
const payload: Record<string, any> = { const payload: Record<string, unknown> = {
name: provider.name, name: provider.name,
'base-url': provider.baseUrl, 'base-url': provider.baseUrl,
'api-key-entries': Array.isArray(provider.apiKeyEntries) 'api-key-entries': Array.isArray(provider.apiKeyEntries)
@@ -118,8 +128,7 @@ const serializeOpenAIProvider = (provider: OpenAIProviderConfig) => {
export const providersApi = { export const providersApi = {
async getGeminiKeys(): Promise<GeminiKeyConfig[]> { async getGeminiKeys(): Promise<GeminiKeyConfig[]> {
const data = await apiClient.get('/gemini-api-key'); const data = await apiClient.get('/gemini-api-key');
const list = (data && (data['gemini-api-key'] ?? data.items ?? data)) as any; const list = extractArrayPayload(data, 'gemini-api-key');
if (!Array.isArray(list)) return [];
return list.map((item) => normalizeGeminiKeyConfig(item)).filter(Boolean) as GeminiKeyConfig[]; return list.map((item) => normalizeGeminiKeyConfig(item)).filter(Boolean) as GeminiKeyConfig[];
}, },
@@ -134,8 +143,7 @@ export const providersApi = {
async getCodexConfigs(): Promise<ProviderKeyConfig[]> { async getCodexConfigs(): Promise<ProviderKeyConfig[]> {
const data = await apiClient.get('/codex-api-key'); const data = await apiClient.get('/codex-api-key');
const list = (data && (data['codex-api-key'] ?? data.items ?? data)) as any; const list = extractArrayPayload(data, 'codex-api-key');
if (!Array.isArray(list)) return [];
return list.map((item) => normalizeProviderKeyConfig(item)).filter(Boolean) as ProviderKeyConfig[]; return list.map((item) => normalizeProviderKeyConfig(item)).filter(Boolean) as ProviderKeyConfig[];
}, },
@@ -150,8 +158,7 @@ export const providersApi = {
async getClaudeConfigs(): Promise<ProviderKeyConfig[]> { async getClaudeConfigs(): Promise<ProviderKeyConfig[]> {
const data = await apiClient.get('/claude-api-key'); const data = await apiClient.get('/claude-api-key');
const list = (data && (data['claude-api-key'] ?? data.items ?? data)) as any; const list = extractArrayPayload(data, 'claude-api-key');
if (!Array.isArray(list)) return [];
return list.map((item) => normalizeProviderKeyConfig(item)).filter(Boolean) as ProviderKeyConfig[]; return list.map((item) => normalizeProviderKeyConfig(item)).filter(Boolean) as ProviderKeyConfig[];
}, },
@@ -166,8 +173,7 @@ export const providersApi = {
async getVertexConfigs(): Promise<ProviderKeyConfig[]> { async getVertexConfigs(): Promise<ProviderKeyConfig[]> {
const data = await apiClient.get('/vertex-api-key'); const data = await apiClient.get('/vertex-api-key');
const list = (data && (data['vertex-api-key'] ?? data.items ?? data)) as any; const list = extractArrayPayload(data, 'vertex-api-key');
if (!Array.isArray(list)) return [];
return list.map((item) => normalizeProviderKeyConfig(item)).filter(Boolean) as ProviderKeyConfig[]; return list.map((item) => normalizeProviderKeyConfig(item)).filter(Boolean) as ProviderKeyConfig[];
}, },
@@ -182,8 +188,7 @@ export const providersApi = {
async getOpenAIProviders(): Promise<OpenAIProviderConfig[]> { async getOpenAIProviders(): Promise<OpenAIProviderConfig[]> {
const data = await apiClient.get('/openai-compatibility'); const data = await apiClient.get('/openai-compatibility');
const list = (data && (data['openai-compatibility'] ?? data.items ?? data)) as any; const list = extractArrayPayload(data, 'openai-compatibility');
if (!Array.isArray(list)) return [];
return list.map((item) => normalizeOpenAIProvider(item)).filter(Boolean) as OpenAIProviderConfig[]; return list.map((item) => normalizeOpenAIProvider(item)).filter(Boolean) as OpenAIProviderConfig[];
}, },

182
src/services/api/transformers.ts
View File

@@ -10,7 +10,10 @@ import type {
import type { Config } from '@/types/config'; import type { Config } from '@/types/config';
import { buildHeaderObject } from '@/utils/headers'; import { buildHeaderObject } from '@/utils/headers';
const normalizeBoolean = (value: any): boolean | undefined => { const isRecord = (value: unknown): value is Record<string, unknown> =>
value !== null && typeof value === 'object' && !Array.isArray(value);
const normalizeBoolean = (value: unknown): boolean | undefined => {
if (value === undefined || value === null) return undefined; if (value === undefined || value === null) return undefined;
if (typeof value === 'boolean') return value; if (typeof value === 'boolean') return value;
if (typeof value === 'number') return value !== 0; if (typeof value === 'number') return value !== 0;
@@ -22,11 +25,17 @@ const normalizeBoolean = (value: any): boolean | undefined => {
return Boolean(value); return Boolean(value);
}; };
const normalizeModelAliases = (models: any): ModelAlias[] => { const normalizeModelAliases = (models: unknown): ModelAlias[] => {
if (!Array.isArray(models)) return []; if (!Array.isArray(models)) return [];
return models return models
.map((item) => { .map((item) => {
if (!item) return null; if (item === undefined || item === null) return null;
if (typeof item === 'string') {
const trimmed = item.trim();
return trimmed ? ({ name: trimmed } satisfies ModelAlias) : null;
}
if (!isRecord(item)) return null;
const name = item.name || item.id || item.model; const name = item.name || item.id || item.model;
if (!name) return null; if (!name) return null;
const alias = item.alias || item.display_name || item.displayName; const alias = item.alias || item.display_name || item.displayName;
@@ -37,7 +46,10 @@ const normalizeModelAliases = (models: any): ModelAlias[] => {
entry.alias = String(alias); entry.alias = String(alias);
} }
if (priority !== undefined) { if (priority !== undefined) {
entry.priority = Number(priority); const parsed = Number(priority);
if (Number.isFinite(parsed)) {
entry.priority = parsed;
}
} }
if (testModel) { if (testModel) {
entry.testModel = String(testModel); entry.testModel = String(testModel);
@@ -47,13 +59,17 @@ const normalizeModelAliases = (models: any): ModelAlias[] => {
.filter(Boolean) as ModelAlias[]; .filter(Boolean) as ModelAlias[];
}; };
const normalizeHeaders = (headers: any) => { const normalizeHeaders = (headers: unknown) => {
if (!headers || typeof headers !== 'object') return undefined; if (!headers || typeof headers !== 'object') return undefined;
const normalized = buildHeaderObject(headers as Record<string, string>); const normalized = buildHeaderObject(
Array.isArray(headers)
? (headers as Array<{ key: string; value: string }>)
: (headers as Record<string, string | undefined | null>)
);
return Object.keys(normalized).length ? normalized : undefined; return Object.keys(normalized).length ? normalized : undefined;
}; };
const normalizeExcludedModels = (input: any): string[] => { const normalizeExcludedModels = (input: unknown): string[] => {
const rawList = Array.isArray(input) ? input : typeof input === 'string' ? input.split(/[\n,]/) : []; const rawList = Array.isArray(input) ? input : typeof input === 'string' ? input.split(/[\n,]/) : [];
const seen = new Set<string>(); const seen = new Set<string>();
const normalized: string[] = []; const normalized: string[] = [];
@@ -70,20 +86,22 @@ const normalizeExcludedModels = (input: any): string[] => {
return normalized; return normalized;
}; };
const normalizePrefix = (value: any): string | undefined => { const normalizePrefix = (value: unknown): string | undefined => {
if (value === undefined || value === null) return undefined; if (value === undefined || value === null) return undefined;
const trimmed = String(value).trim(); const trimmed = String(value).trim();
return trimmed ? trimmed : undefined; return trimmed ? trimmed : undefined;
}; };
const normalizeApiKeyEntry = (entry: any): ApiKeyEntry | null => { const normalizeApiKeyEntry = (entry: unknown): ApiKeyEntry | null => {
if (!entry) return null; if (entry === undefined || entry === null) return null;
const apiKey = entry['api-key'] ?? entry.apiKey ?? entry.key ?? (typeof entry === 'string' ? entry : ''); const record = isRecord(entry) ? entry : null;
const apiKey =
record?.['api-key'] ?? record?.apiKey ?? record?.key ?? (typeof entry === 'string' ? entry : '');
const trimmed = String(apiKey || '').trim(); const trimmed = String(apiKey || '').trim();
if (!trimmed) return null; if (!trimmed) return null;
const proxyUrl = entry['proxy-url'] ?? entry.proxyUrl; const proxyUrl = record ? record['proxy-url'] ?? record.proxyUrl : undefined;
const headers = normalizeHeaders(entry.headers); const headers = record ? normalizeHeaders(record.headers) : undefined;
return { return {
apiKey: trimmed, apiKey: trimmed,
@@ -92,33 +110,38 @@ const normalizeApiKeyEntry = (entry: any): ApiKeyEntry | null => {
}; };
}; };
const normalizeProviderKeyConfig = (item: any): ProviderKeyConfig | null => { const normalizeProviderKeyConfig = (item: unknown): ProviderKeyConfig | null => {
if (!item) return null; if (item === undefined || item === null) return null;
const apiKey = item['api-key'] ?? item.apiKey ?? (typeof item === 'string' ? item : ''); const record = isRecord(item) ? item : null;
const apiKey = record?.['api-key'] ?? record?.apiKey ?? (typeof item === 'string' ? item : '');
const trimmed = String(apiKey || '').trim(); const trimmed = String(apiKey || '').trim();
if (!trimmed) return null; if (!trimmed) return null;
const config: ProviderKeyConfig = { apiKey: trimmed }; const config: ProviderKeyConfig = { apiKey: trimmed };
const prefix = normalizePrefix(item.prefix ?? item['prefix']); const prefix = normalizePrefix(record?.prefix ?? record?.['prefix']);
if (prefix) config.prefix = prefix; if (prefix) config.prefix = prefix;
const baseUrl = item['base-url'] ?? item.baseUrl; const baseUrl = record ? record['base-url'] ?? record.baseUrl : undefined;
const proxyUrl = item['proxy-url'] ?? item.proxyUrl; const proxyUrl = record ? record['proxy-url'] ?? record.proxyUrl : undefined;
if (baseUrl) config.baseUrl = String(baseUrl); if (baseUrl) config.baseUrl = String(baseUrl);
if (proxyUrl) config.proxyUrl = String(proxyUrl); if (proxyUrl) config.proxyUrl = String(proxyUrl);
const headers = normalizeHeaders(item.headers); const headers = normalizeHeaders(record?.headers);
if (headers) config.headers = headers; if (headers) config.headers = headers;
const models = normalizeModelAliases(item.models); const models = normalizeModelAliases(record?.models);
if (models.length) config.models = models; if (models.length) config.models = models;
const excludedModels = normalizeExcludedModels( const excludedModels = normalizeExcludedModels(
item['excluded-models'] ?? item.excludedModels ?? item['excluded_models'] ?? item.excluded_models record?.['excluded-models'] ??
record?.excludedModels ??
record?.['excluded_models'] ??
record?.excluded_models
); );
if (excludedModels.length) config.excludedModels = excludedModels; if (excludedModels.length) config.excludedModels = excludedModels;
return config; return config;
}; };
const normalizeGeminiKeyConfig = (item: any): GeminiKeyConfig | null => { const normalizeGeminiKeyConfig = (item: unknown): GeminiKeyConfig | null => {
if (!item) return null; if (item === undefined || item === null) return null;
let apiKey = item['api-key'] ?? item.apiKey; const record = isRecord(item) ? item : null;
let apiKey = record?.['api-key'] ?? record?.apiKey;
if (!apiKey && typeof item === 'string') { if (!apiKey && typeof item === 'string') {
apiKey = item; apiKey = item;
} }
@@ -126,19 +149,19 @@ const normalizeGeminiKeyConfig = (item: any): GeminiKeyConfig | null => {
if (!trimmed) return null; if (!trimmed) return null;
const config: GeminiKeyConfig = { apiKey: trimmed }; const config: GeminiKeyConfig = { apiKey: trimmed };
const prefix = normalizePrefix(item.prefix ?? item['prefix']); const prefix = normalizePrefix(record?.prefix ?? record?.['prefix']);
if (prefix) config.prefix = prefix; if (prefix) config.prefix = prefix;
const baseUrl = item['base-url'] ?? item.baseUrl ?? item['base_url']; const baseUrl = record ? record['base-url'] ?? record.baseUrl ?? record['base_url'] : undefined;
if (baseUrl) config.baseUrl = String(baseUrl); if (baseUrl) config.baseUrl = String(baseUrl);
const headers = normalizeHeaders(item.headers); const headers = normalizeHeaders(record?.headers);
if (headers) config.headers = headers; if (headers) config.headers = headers;
const excludedModels = normalizeExcludedModels(item['excluded-models'] ?? item.excludedModels); const excludedModels = normalizeExcludedModels(record?.['excluded-models'] ?? record?.excludedModels);
if (excludedModels.length) config.excludedModels = excludedModels; if (excludedModels.length) config.excludedModels = excludedModels;
return config; return config;
}; };
const normalizeOpenAIProvider = (provider: any): OpenAIProviderConfig | null => { const normalizeOpenAIProvider = (provider: unknown): OpenAIProviderConfig | null => {
if (!provider || typeof provider !== 'object') return null; if (!isRecord(provider)) return null;
const name = provider.name || provider.id; const name = provider.name || provider.id;
const baseUrl = provider['base-url'] ?? provider.baseUrl; const baseUrl = provider['base-url'] ?? provider.baseUrl;
if (!name || !baseUrl) return null; if (!name || !baseUrl) return null;
@@ -146,11 +169,11 @@ const normalizeOpenAIProvider = (provider: any): OpenAIProviderConfig | null =>
let apiKeyEntries: ApiKeyEntry[] = []; let apiKeyEntries: ApiKeyEntry[] = [];
if (Array.isArray(provider['api-key-entries'])) { if (Array.isArray(provider['api-key-entries'])) {
apiKeyEntries = provider['api-key-entries'] apiKeyEntries = provider['api-key-entries']
.map((entry: any) => normalizeApiKeyEntry(entry)) .map((entry) => normalizeApiKeyEntry(entry))
.filter(Boolean) as ApiKeyEntry[]; .filter(Boolean) as ApiKeyEntry[];
} else if (Array.isArray(provider['api-keys'])) { } else if (Array.isArray(provider['api-keys'])) {
apiKeyEntries = provider['api-keys'] apiKeyEntries = provider['api-keys']
.map((key: any) => normalizeApiKeyEntry({ 'api-key': key })) .map((key) => normalizeApiKeyEntry({ 'api-key': key }))
.filter(Boolean) as ApiKeyEntry[]; .filter(Boolean) as ApiKeyEntry[];
} }
@@ -174,10 +197,10 @@ const normalizeOpenAIProvider = (provider: any): OpenAIProviderConfig | null =>
return result; return result;
}; };
const normalizeOauthExcluded = (payload: any): Record<string, string[]> | undefined => { const normalizeOauthExcluded = (payload: unknown): Record<string, string[]> | undefined => {
if (!payload || typeof payload !== 'object') return undefined; if (!isRecord(payload)) return undefined;
const source = payload['oauth-excluded-models'] ?? payload.items ?? payload; const source = payload['oauth-excluded-models'] ?? payload.items ?? payload;
if (!source || typeof source !== 'object') return undefined; if (!isRecord(source)) return undefined;
const map: Record<string, string[]> = {}; const map: Record<string, string[]> = {};
Object.entries(source).forEach(([provider, models]) => { Object.entries(source).forEach(([provider, models]) => {
const key = String(provider || '').trim(); const key = String(provider || '').trim();
@@ -188,13 +211,13 @@ const normalizeOauthExcluded = (payload: any): Record<string, string[]> | undefi
return map; return map;
}; };
const normalizeAmpcodeModelMappings = (input: any): AmpcodeModelMapping[] => { const normalizeAmpcodeModelMappings = (input: unknown): AmpcodeModelMapping[] => {
if (!Array.isArray(input)) return []; if (!Array.isArray(input)) return [];
const seen = new Set<string>(); const seen = new Set<string>();
const mappings: AmpcodeModelMapping[] = []; const mappings: AmpcodeModelMapping[] = [];
input.forEach((entry) => { input.forEach((entry) => {
if (!entry || typeof entry !== 'object') return; if (!isRecord(entry)) return;
const from = String(entry.from ?? entry['from'] ?? '').trim(); const from = String(entry.from ?? entry['from'] ?? '').trim();
const to = String(entry.to ?? entry['to'] ?? '').trim(); const to = String(entry.to ?? entry['to'] ?? '').trim();
if (!from || !to) return; if (!from || !to) return;
@@ -207,9 +230,10 @@ const normalizeAmpcodeModelMappings = (input: any): AmpcodeModelMapping[] => {
return mappings; return mappings;
}; };
const normalizeAmpcodeConfig = (payload: any): AmpcodeConfig | undefined => { const normalizeAmpcodeConfig = (payload: unknown): AmpcodeConfig | undefined => {
const source = payload?.ampcode ?? payload; const sourceRaw = isRecord(payload) ? (payload.ampcode ?? payload) : payload;
if (!source || typeof source !== 'object') return undefined; if (!isRecord(sourceRaw)) return undefined;
const source = sourceRaw;
const config: AmpcodeConfig = {}; const config: AmpcodeConfig = {};
const upstreamUrl = source['upstream-url'] ?? source.upstreamUrl ?? source['upstream_url']; const upstreamUrl = source['upstream-url'] ?? source.upstreamUrl ?? source['upstream_url'];
@@ -237,70 +261,94 @@ const normalizeAmpcodeConfig = (payload: any): AmpcodeConfig | undefined => {
/** /**
* 规范化 /config 返回值 * 规范化 /config 返回值
*/ */
export const normalizeConfigResponse = (raw: any): Config => { export const normalizeConfigResponse = (raw: unknown): Config => {
const config: Config = { raw: raw || {} }; const config: Config = { raw: isRecord(raw) ? raw : {} };
if (!raw || typeof raw !== 'object') { if (!isRecord(raw)) {
return config; return config;
} }
config.debug = raw.debug; config.debug = normalizeBoolean(raw.debug);
config.proxyUrl = raw['proxy-url'] ?? raw.proxyUrl; const proxyUrl = raw['proxy-url'] ?? raw.proxyUrl;
config.requestRetry = raw['request-retry'] ?? raw.requestRetry; config.proxyUrl =
typeof proxyUrl === 'string' ? proxyUrl : proxyUrl === undefined || proxyUrl === null ? undefined : String(proxyUrl);
const requestRetry = raw['request-retry'] ?? raw.requestRetry;
if (typeof requestRetry === 'number' && Number.isFinite(requestRetry)) {
config.requestRetry = requestRetry;
} else if (typeof requestRetry === 'string' && requestRetry.trim() !== '') {
const parsed = Number(requestRetry);
if (Number.isFinite(parsed)) {
config.requestRetry = parsed;
}
}
const quota = raw['quota-exceeded'] ?? raw.quotaExceeded; const quota = raw['quota-exceeded'] ?? raw.quotaExceeded;
if (quota && typeof quota === 'object') { if (isRecord(quota)) {
config.quotaExceeded = { config.quotaExceeded = {
switchProject: quota['switch-project'] ?? quota.switchProject, switchProject: normalizeBoolean(quota['switch-project'] ?? quota.switchProject),
switchPreviewModel: quota['switch-preview-model'] ?? quota.switchPreviewModel switchPreviewModel: normalizeBoolean(quota['switch-preview-model'] ?? quota.switchPreviewModel)
}; };
} }
config.usageStatisticsEnabled = raw['usage-statistics-enabled'] ?? raw.usageStatisticsEnabled; config.usageStatisticsEnabled = normalizeBoolean(
config.requestLog = raw['request-log'] ?? raw.requestLog; raw['usage-statistics-enabled'] ?? raw.usageStatisticsEnabled
config.loggingToFile = raw['logging-to-file'] ?? raw.loggingToFile; );
config.logsMaxTotalSizeMb = raw['logs-max-total-size-mb'] ?? raw.logsMaxTotalSizeMb; config.requestLog = normalizeBoolean(raw['request-log'] ?? raw.requestLog);
config.wsAuth = raw['ws-auth'] ?? raw.wsAuth; config.loggingToFile = normalizeBoolean(raw['logging-to-file'] ?? raw.loggingToFile);
config.forceModelPrefix = raw['force-model-prefix'] ?? raw.forceModelPrefix; const logsMaxTotalSizeMb = raw['logs-max-total-size-mb'] ?? raw.logsMaxTotalSizeMb;
const routing = raw.routing; if (typeof logsMaxTotalSizeMb === 'number' && Number.isFinite(logsMaxTotalSizeMb)) {
if (routing && typeof routing === 'object') { config.logsMaxTotalSizeMb = logsMaxTotalSizeMb;
config.routingStrategy = routing.strategy ?? routing['strategy']; } else if (typeof logsMaxTotalSizeMb === 'string' && logsMaxTotalSizeMb.trim() !== '') {
} else { const parsed = Number(logsMaxTotalSizeMb);
config.routingStrategy = raw['routing-strategy'] ?? raw.routingStrategy; if (Number.isFinite(parsed)) {
config.logsMaxTotalSizeMb = parsed;
}
}
config.wsAuth = normalizeBoolean(raw['ws-auth'] ?? raw.wsAuth);
config.forceModelPrefix = normalizeBoolean(raw['force-model-prefix'] ?? raw.forceModelPrefix);
const routing = raw.routing;
const strategyRaw = isRecord(routing)
? (routing.strategy ?? routing['strategy'])
: (raw['routing-strategy'] ?? raw.routingStrategy);
if (strategyRaw !== undefined && strategyRaw !== null) {
config.routingStrategy = String(strategyRaw);
}
const apiKeysRaw = raw['api-keys'] ?? raw.apiKeys;
if (Array.isArray(apiKeysRaw)) {
config.apiKeys = apiKeysRaw.map((key) => String(key)).filter((key) => key.trim() !== '');
} }
config.apiKeys = Array.isArray(raw['api-keys']) ? raw['api-keys'].slice() : raw.apiKeys;
const geminiList = raw['gemini-api-key'] ?? raw.geminiApiKey ?? raw.geminiApiKeys; const geminiList = raw['gemini-api-key'] ?? raw.geminiApiKey ?? raw.geminiApiKeys;
if (Array.isArray(geminiList)) { if (Array.isArray(geminiList)) {
config.geminiApiKeys = geminiList config.geminiApiKeys = geminiList
.map((item: any) => normalizeGeminiKeyConfig(item)) .map((item) => normalizeGeminiKeyConfig(item))
.filter(Boolean) as GeminiKeyConfig[]; .filter(Boolean) as GeminiKeyConfig[];
} }
const codexList = raw['codex-api-key'] ?? raw.codexApiKey ?? raw.codexApiKeys; const codexList = raw['codex-api-key'] ?? raw.codexApiKey ?? raw.codexApiKeys;
if (Array.isArray(codexList)) { if (Array.isArray(codexList)) {
config.codexApiKeys = codexList config.codexApiKeys = codexList
.map((item: any) => normalizeProviderKeyConfig(item)) .map((item) => normalizeProviderKeyConfig(item))
.filter(Boolean) as ProviderKeyConfig[]; .filter(Boolean) as ProviderKeyConfig[];
} }
const claudeList = raw['claude-api-key'] ?? raw.claudeApiKey ?? raw.claudeApiKeys; const claudeList = raw['claude-api-key'] ?? raw.claudeApiKey ?? raw.claudeApiKeys;
if (Array.isArray(claudeList)) { if (Array.isArray(claudeList)) {
config.claudeApiKeys = claudeList config.claudeApiKeys = claudeList
.map((item: any) => normalizeProviderKeyConfig(item)) .map((item) => normalizeProviderKeyConfig(item))
.filter(Boolean) as ProviderKeyConfig[]; .filter(Boolean) as ProviderKeyConfig[];
} }
const vertexList = raw['vertex-api-key'] ?? raw.vertexApiKey ?? raw.vertexApiKeys; const vertexList = raw['vertex-api-key'] ?? raw.vertexApiKey ?? raw.vertexApiKeys;
if (Array.isArray(vertexList)) { if (Array.isArray(vertexList)) {
config.vertexApiKeys = vertexList config.vertexApiKeys = vertexList
.map((item: any) => normalizeProviderKeyConfig(item)) .map((item) => normalizeProviderKeyConfig(item))
.filter(Boolean) as ProviderKeyConfig[]; .filter(Boolean) as ProviderKeyConfig[];
} }
const openaiList = raw['openai-compatibility'] ?? raw.openaiCompatibility ?? raw.openAICompatibility; const openaiList = raw['openai-compatibility'] ?? raw.openaiCompatibility ?? raw.openAICompatibility;
if (Array.isArray(openaiList)) { if (Array.isArray(openaiList)) {
config.openaiCompatibility = openaiList config.openaiCompatibility = openaiList
.map((item: any) => normalizeOpenAIProvider(item)) .map((item) => normalizeOpenAIProvider(item))
.filter(Boolean) as OpenAIProviderConfig[]; .filter(Boolean) as OpenAIProviderConfig[];
} }

6
src/services/api/usage.ts
View File

@@ -26,7 +26,7 @@ export const usageApi = {
/** /**
* 获取使用统计原始数据 * 获取使用统计原始数据
*/ */
getUsage: () => apiClient.get('/usage', { timeout: USAGE_TIMEOUT_MS }), getUsage: () => apiClient.get<Record<string, unknown>>('/usage', { timeout: USAGE_TIMEOUT_MS }),
/** /**
* 导出使用统计快照 * 导出使用统计快照
@@ -42,10 +42,10 @@ export const usageApi = {
/** /**
* 计算密钥成功/失败统计，必要时会先获取 usage 数据 * 计算密钥成功/失败统计，必要时会先获取 usage 数据
*/ */
async getKeyStats(usageData?: any): Promise<KeyStats> { async getKeyStats(usageData?: unknown): Promise<KeyStats> {
let payload = usageData; let payload = usageData;
if (!payload) { if (!payload) {
const response = await apiClient.get('/usage', { timeout: USAGE_TIMEOUT_MS }); const response = await apiClient.get<Record<string, unknown>>('/usage', { timeout: USAGE_TIMEOUT_MS });
payload = response?.usage ?? response; payload = response?.usage ?? response;
} }
return computeKeyStats(payload); return computeKeyStats(payload);

2
src/services/api/version.ts
View File

@@ -5,5 +5,5 @@
import { apiClient } from './client'; import { apiClient } from './client';
export const versionApi = { export const versionApi = {
checkLatest: () => apiClient.get('/latest-version') checkLatest: () => apiClient.get<Record<string, unknown>>('/latest-version')
}; };

6
src/services/storage/secureStorage.ts
View File

@@ -13,7 +13,7 @@ class SecureStorageService {
/** /**
* 存储数据 * 存储数据
*/ */
setItem(key: string, value: any, options: StorageOptions = {}): void { setItem(key: string, value: unknown, options: StorageOptions = {}): void {
const { encrypt = true } = options; const { encrypt = true } = options;
if (value === null || value === undefined) { if (value === null || value === undefined) {
@@ -30,7 +30,7 @@ class SecureStorageService {
/** /**
* 获取数据 * 获取数据
*/ */
getItem<T = any>(key: string, options: StorageOptions = {}): T | null { getItem<T = unknown>(key: string, options: StorageOptions = {}): T | null {
const { encrypt = true } = options; const { encrypt = true } = options;
const raw = localStorage.getItem(key); const raw = localStorage.getItem(key);
@@ -84,7 +84,7 @@ class SecureStorageService {
return; return;
} }
let parsed: any = raw; let parsed: unknown = raw;
try { try {
parsed = JSON.parse(raw); parsed = JSON.parse(raw);
} catch { } catch {

10
src/stores/useAuthStore.ts
View File

@@ -117,10 +117,16 @@ export const useAuthStore = create<AuthStoreState>()(
} else { } else {
localStorage.removeItem('isLoggedIn'); localStorage.removeItem('isLoggedIn');
} }
} catch (error: any) { } catch (error: unknown) {
const message =
error instanceof Error
? error.message
: typeof error === 'string'
? error
: 'Connection failed';
set({ set({
connectionStatus: 'error', connectionStatus: 'error',
connectionError: error.message || 'Connection failed' connectionError: message || 'Connection failed'
}); });
throw error; throw error;
} }

57
src/stores/useConfigStore.ts
View File

@@ -10,7 +10,7 @@ import { configApi } from '@/services/api/config';
import { CACHE_EXPIRY_MS } from '@/utils/constants'; import { CACHE_EXPIRY_MS } from '@/utils/constants';
interface ConfigCache { interface ConfigCache {
data: any; data: unknown;
timestamp: number; timestamp: number;
} }
@@ -21,8 +21,11 @@ interface ConfigState {
error: string | null; error: string | null;
// 操作 // 操作
fetchConfig: (section?: RawConfigSection, forceRefresh?: boolean) => Promise<Config | any>; fetchConfig: {
updateConfigValue: (section: RawConfigSection, value: any) => void; (section?: undefined, forceRefresh?: boolean): Promise<Config>;
(section: RawConfigSection, forceRefresh?: boolean): Promise<unknown>;
};
updateConfigValue: (section: RawConfigSection, value: unknown) => void;
clearCache: (section?: RawConfigSection) => void; clearCache: (section?: RawConfigSection) => void;
isCacheValid: (section?: RawConfigSection) => boolean; isCacheValid: (section?: RawConfigSection) => boolean;
} }
@@ -105,7 +108,7 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
loading: false, loading: false,
error: null, error: null,
fetchConfig: async (section, forceRefresh = false) => { fetchConfig: (async (section?: RawConfigSection, forceRefresh: boolean = false) => {
const { cache, isCacheValid } = get(); const { cache, isCacheValid } = get();
// 检查缓存 // 检查缓存
@@ -163,10 +166,12 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
}); });
return section ? extractSectionValue(data, section) : data; return section ? extractSectionValue(data, section) : data;
} catch (error: any) { } catch (error: unknown) {
const message =
error instanceof Error ? error.message : typeof error === 'string' ? error : 'Failed to fetch config';
if (requestId === configRequestToken) { if (requestId === configRequestToken) {
set({ set({
error: error.message || 'Failed to fetch config', error: message || 'Failed to fetch config',
loading: false loading: false
}); });
} }
@@ -176,7 +181,7 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
inFlightConfigRequest = null; inFlightConfigRequest = null;
} }
} }
}, }) as ConfigState['fetchConfig'],
updateConfigValue: (section, value) => { updateConfigValue: (section, value) => {
set((state) => { set((state) => {
@@ -186,61 +191,61 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
switch (section) { switch (section) {
case 'debug': case 'debug':
nextConfig.debug = value; nextConfig.debug = value as Config['debug'];
break; break;
case 'proxy-url': case 'proxy-url':
nextConfig.proxyUrl = value; nextConfig.proxyUrl = value as Config['proxyUrl'];
break; break;
case 'request-retry': case 'request-retry':
nextConfig.requestRetry = value; nextConfig.requestRetry = value as Config['requestRetry'];
break; break;
case 'quota-exceeded': case 'quota-exceeded':
nextConfig.quotaExceeded = value; nextConfig.quotaExceeded = value as Config['quotaExceeded'];
break; break;
case 'usage-statistics-enabled': case 'usage-statistics-enabled':
nextConfig.usageStatisticsEnabled = value; nextConfig.usageStatisticsEnabled = value as Config['usageStatisticsEnabled'];
break; break;
case 'request-log': case 'request-log':
nextConfig.requestLog = value; nextConfig.requestLog = value as Config['requestLog'];
break; break;
case 'logging-to-file': case 'logging-to-file':
nextConfig.loggingToFile = value; nextConfig.loggingToFile = value as Config['loggingToFile'];
break; break;
case 'logs-max-total-size-mb': case 'logs-max-total-size-mb':
nextConfig.logsMaxTotalSizeMb = value; nextConfig.logsMaxTotalSizeMb = value as Config['logsMaxTotalSizeMb'];
break; break;
case 'ws-auth': case 'ws-auth':
nextConfig.wsAuth = value; nextConfig.wsAuth = value as Config['wsAuth'];
break; break;
case 'force-model-prefix': case 'force-model-prefix':
nextConfig.forceModelPrefix = value; nextConfig.forceModelPrefix = value as Config['forceModelPrefix'];
break; break;
case 'routing/strategy': case 'routing/strategy':
nextConfig.routingStrategy = value; nextConfig.routingStrategy = value as Config['routingStrategy'];
break; break;
case 'api-keys': case 'api-keys':
nextConfig.apiKeys = value; nextConfig.apiKeys = value as Config['apiKeys'];
break; break;
case 'ampcode': case 'ampcode':
nextConfig.ampcode = value; nextConfig.ampcode = value as Config['ampcode'];
break; break;
case 'gemini-api-key': case 'gemini-api-key':
nextConfig.geminiApiKeys = value; nextConfig.geminiApiKeys = value as Config['geminiApiKeys'];
break; break;
case 'codex-api-key': case 'codex-api-key':
nextConfig.codexApiKeys = value; nextConfig.codexApiKeys = value as Config['codexApiKeys'];
break; break;
case 'claude-api-key': case 'claude-api-key':
nextConfig.claudeApiKeys = value; nextConfig.claudeApiKeys = value as Config['claudeApiKeys'];
break; break;
case 'vertex-api-key': case 'vertex-api-key':
nextConfig.vertexApiKeys = value; nextConfig.vertexApiKeys = value as Config['vertexApiKeys'];
break; break;
case 'openai-compatibility': case 'openai-compatibility':
nextConfig.openaiCompatibility = value; nextConfig.openaiCompatibility = value as Config['openaiCompatibility'];
break; break;
case 'oauth-excluded-models': case 'oauth-excluded-models':
nextConfig.oauthExcludedModels = value; nextConfig.oauthExcludedModels = value as Config['oauthExcludedModels'];
break; break;
default: default:
break; break;

5
src/stores/useModelsStore.ts
View File

@@ -52,8 +52,9 @@ export const useModelsStore = create<ModelsState>((set, get) => ({
}); });
return list; return list;
} catch (error: any) { } catch (error: unknown) {
const message = error?.message || 'Failed to fetch models'; const message =
error instanceof Error ? error.message : typeof error === 'string' ? error : 'Failed to fetch models';
set({ set({
error: message, error: message,
loading: false, loading: false,

8
src/types/api.ts
View File

@@ -17,8 +17,8 @@ export interface ApiClientConfig {
export interface RequestOptions { export interface RequestOptions {
method?: HttpMethod; method?: HttpMethod;
headers?: Record<string, string>; headers?: Record<string, string>;
params?: Record<string, any>; params?: Record<string, unknown>;
data?: any; data?: unknown;
} }
// 服务器版本信息 // 服务器版本信息
@@ -31,6 +31,6 @@ export interface ServerVersion {
export type ApiError = Error & { export type ApiError = Error & {
status?: number; status?: number;
code?: string; code?: string;
details?: any; details?: unknown;
data?: any; data?: unknown;
}; };

2
src/types/authFile.ts
View File

@@ -26,7 +26,7 @@ export interface AuthFileItem {
runtimeOnly?: boolean | string; runtimeOnly?: boolean | string;
disabled?: boolean; disabled?: boolean;
modified?: number; modified?: number;
[key: string]: any; [key: string]: unknown;
} }
export interface AuthFilesResponse { export interface AuthFilesResponse {

2
src/types/common.ts
View File

@@ -15,7 +15,7 @@ export interface Notification {
duration?: number; duration?: number;
} }
export interface ApiResponse<T = any> { export interface ApiResponse<T = unknown> {
data?: T; data?: T;
error?: string; error?: string;
message?: string; message?: string;

2
src/types/config.ts
View File

@@ -31,7 +31,7 @@ export interface Config {
vertexApiKeys?: ProviderKeyConfig[]; vertexApiKeys?: ProviderKeyConfig[];
openaiCompatibility?: OpenAIProviderConfig[]; openaiCompatibility?: OpenAIProviderConfig[];
oauthExcludedModels?: Record<string, string[]>; oauthExcludedModels?: Record<string, string[]>;
raw?: Record<string, any>; raw?: Record<string, unknown>;
} }
export type RawConfigSection = export type RawConfigSection =

2
src/types/log.ts
View File

@@ -11,7 +11,7 @@ export interface LogEntry {
timestamp: string; timestamp: string;
level: LogLevel; level: LogLevel;
message: string; message: string;
details?: any; details?: unknown;
} }
// 日志筛选 // 日志筛选

2
src/types/provider.ts
View File

@@ -43,5 +43,5 @@ export interface OpenAIProviderConfig {
models?: ModelAlias[]; models?: ModelAlias[];
priority?: number; priority?: number;
testModel?: string; testModel?: string;
[key: string]: any; [key: string]: unknown;
} }

2
src/types/visualConfig.ts
View File

@@ -10,7 +10,7 @@ export type PayloadParamEntry = {
export type PayloadModelEntry = { export type PayloadModelEntry = {
id: string; id: string;
name: string; name: string;
protocol?: 'openai' | 'gemini' | 'claude' | 'codex' | 'antigravity'; protocol?: 'openai' | 'openai-response' | 'gemini' | 'claude' | 'codex' | 'antigravity';
}; };
export type PayloadRule = { export type PayloadRule = {

31
src/utils/helpers.ts
View File

@@ -15,13 +15,13 @@ export function normalizeArrayResponse<T>(data: T | T[] | null | undefined): T[]
/** /**
* 防抖函数 * 防抖函数
*/ */
export function debounce<T extends (...args: any[]) => any>( export function debounce<This, Args extends unknown[], Return>(
func: T, func: (this: This, ...args: Args) => Return,
delay: number delay: number
): (...args: Parameters<T>) => void { ): (this: This, ...args: Args) => void {
let timeoutId: ReturnType<typeof setTimeout>; let timeoutId: ReturnType<typeof setTimeout>;
return function (this: any, ...args: Parameters<T>) { return function (this: This, ...args: Args) {
clearTimeout(timeoutId); clearTimeout(timeoutId);
timeoutId = setTimeout(() => func.apply(this, args), delay); timeoutId = setTimeout(() => func.apply(this, args), delay);
}; };
@@ -30,13 +30,13 @@ export function debounce<T extends (...args: any[]) => any>(
/** /**
* 节流函数 * 节流函数
*/ */
export function throttle<T extends (...args: any[]) => any>( export function throttle<This, Args extends unknown[], Return>(
func: T, func: (this: This, ...args: Args) => Return,
limit: number limit: number
): (...args: Parameters<T>) => void { ): (this: This, ...args: Args) => void {
let inThrottle: boolean; let inThrottle: boolean;
return function (this: any, ...args: Parameters<T>) { return function (this: This, ...args: Args) {
if (!inThrottle) { if (!inThrottle) {
func.apply(this, args); func.apply(this, args);
inThrottle = true; inThrottle = true;
@@ -67,16 +67,17 @@ export function generateId(): string {
export function deepClone<T>(obj: T): T { export function deepClone<T>(obj: T): T {
if (obj === null || typeof obj !== 'object') return obj; if (obj === null || typeof obj !== 'object') return obj;
if (obj instanceof Date) return new Date(obj.getTime()) as any; if (obj instanceof Date) return new Date(obj.getTime()) as unknown as T;
if (obj instanceof Array) return obj.map((item) => deepClone(item)) as any; if (Array.isArray(obj)) return obj.map((item) => deepClone(item)) as unknown as T;
const clonedObj = {} as T; const source = obj as Record<string, unknown>;
for (const key in obj) { const cloned: Record<string, unknown> = {};
if (Object.prototype.hasOwnProperty.call(obj, key)) { for (const key in source) {
clonedObj[key] = deepClone((obj as any)[key]); if (Object.prototype.hasOwnProperty.call(source, key)) {
cloned[key] = deepClone(source[key]);
} }
} }
return clonedObj; return cloned as unknown as T;
} }
/** /**

11
src/utils/models.ts
View File

@@ -30,12 +30,15 @@ const matchCategory = (text: string) => {
return null; return null;
}; };
export function normalizeModelList(payload: any, { dedupe = false } = {}): ModelInfo[] { const isRecord = (value: unknown): value is Record<string, unknown> =>
const toModel = (entry: any): ModelInfo | null => { value !== null && typeof value === 'object' && !Array.isArray(value);
export function normalizeModelList(payload: unknown, { dedupe = false } = {}): ModelInfo[] {
const toModel = (entry: unknown): ModelInfo | null => {
if (typeof entry === 'string') { if (typeof entry === 'string') {
return { name: entry }; return { name: entry };
} }
if (!entry || typeof entry !== 'object') { if (!isRecord(entry)) {
return null; return null;
} }
const name = entry.id || entry.name || entry.model || entry.value; const name = entry.id || entry.name || entry.model || entry.value;
@@ -57,7 +60,7 @@ export function normalizeModelList(payload: any, { dedupe = false } = {}): Model
if (Array.isArray(payload)) { if (Array.isArray(payload)) {
models = payload.map(toModel); models = payload.map(toModel);
} else if (payload && typeof payload === 'object') { } else if (isRecord(payload)) {
if (Array.isArray(payload.data)) { if (Array.isArray(payload.data)) {
models = payload.data.map(toModel); models = payload.data.map(toModel);
} else if (Array.isArray(payload.models)) { } else if (Array.isArray(payload.models)) {

224
src/utils/usage.ts
View File

@@ -64,7 +64,16 @@ export interface ApiStats {
const TOKENS_PER_PRICE_UNIT = 1_000_000; const TOKENS_PER_PRICE_UNIT = 1_000_000;
const MODEL_PRICE_STORAGE_KEY = 'cli-proxy-model-prices-v2'; const MODEL_PRICE_STORAGE_KEY = 'cli-proxy-model-prices-v2';
const normalizeAuthIndex = (value: any) => { const isRecord = (value: unknown): value is Record<string, unknown> =>
value !== null && typeof value === 'object' && !Array.isArray(value);
const getApisRecord = (usageData: unknown): Record<string, unknown> | null => {
const usageRecord = isRecord(usageData) ? usageData : null;
const apisRaw = usageRecord ? usageRecord.apis : null;
return isRecord(apisRaw) ? apisRaw : null;
};
const normalizeAuthIndex = (value: unknown) => {
if (typeof value === 'number' && Number.isFinite(value)) { if (typeof value === 'number' && Number.isFinite(value)) {
return value.toString(); return value.toString();
} }
@@ -306,24 +315,29 @@ export function formatUsd(value: number): string {
/** /**
* 从使用数据中收集所有请求明细 * 从使用数据中收集所有请求明细
*/ */
export function collectUsageDetails(usageData: any): UsageDetail[] { export function collectUsageDetails(usageData: unknown): UsageDetail[] {
if (!usageData) { const apis = getApisRecord(usageData);
return []; if (!apis) return [];
}
const apis = usageData.apis || {};
const details: UsageDetail[] = []; const details: UsageDetail[] = [];
Object.values(apis as Record<string, any>).forEach((apiEntry) => { Object.values(apis).forEach((apiEntry) => {
const models = apiEntry?.models || {}; if (!isRecord(apiEntry)) return;
Object.entries(models as Record<string, any>).forEach(([modelName, modelEntry]) => { const modelsRaw = apiEntry.models;
const modelDetails = Array.isArray(modelEntry.details) ? modelEntry.details : []; const models = isRecord(modelsRaw) ? modelsRaw : null;
modelDetails.forEach((detail: any) => { if (!models) return;
if (detail && detail.timestamp) {
details.push({ Object.entries(models).forEach(([modelName, modelEntry]) => {
...detail, if (!isRecord(modelEntry)) return;
source: normalizeUsageSourceId(detail.source), const modelDetailsRaw = modelEntry.details;
__modelName: modelName const modelDetails = Array.isArray(modelDetailsRaw) ? modelDetailsRaw : [];
});
} modelDetails.forEach((detailRaw) => {
if (!isRecord(detailRaw) || typeof detailRaw.timestamp !== 'string') return;
const detail = detailRaw as unknown as UsageDetail;
details.push({
...detail,
source: normalizeUsageSourceId(detail.source),
__modelName: modelName,
});
}); });
}); });
}); });
@@ -333,8 +347,10 @@ export function collectUsageDetails(usageData: any): UsageDetail[] {
/** /**
* 从单条明细提取总 tokens * 从单条明细提取总 tokens
*/ */
export function extractTotalTokens(detail: any): number { export function extractTotalTokens(detail: unknown): number {
const tokens = detail?.tokens || {}; const record = isRecord(detail) ? detail : null;
const tokensRaw = record?.tokens;
const tokens = isRecord(tokensRaw) ? tokensRaw : {};
if (typeof tokens.total_tokens === 'number') { if (typeof tokens.total_tokens === 'number') {
return tokens.total_tokens; return tokens.total_tokens;
} }
@@ -352,7 +368,7 @@ export function extractTotalTokens(detail: any): number {
/** /**
* 计算 token 分类统计 * 计算 token 分类统计
*/ */
export function calculateTokenBreakdown(usageData: any): TokenBreakdown { export function calculateTokenBreakdown(usageData: unknown): TokenBreakdown {
const details = collectUsageDetails(usageData); const details = collectUsageDetails(usageData);
if (!details.length) { if (!details.length) {
return { cachedTokens: 0, reasoningTokens: 0 }; return { cachedTokens: 0, reasoningTokens: 0 };
@@ -361,8 +377,8 @@ export function calculateTokenBreakdown(usageData: any): TokenBreakdown {
let cachedTokens = 0; let cachedTokens = 0;
let reasoningTokens = 0; let reasoningTokens = 0;
details.forEach(detail => { details.forEach((detail) => {
const tokens = detail?.tokens || {}; const tokens = detail.tokens;
cachedTokens += Math.max( cachedTokens += Math.max(
typeof tokens.cached_tokens === 'number' ? Math.max(tokens.cached_tokens, 0) : 0, typeof tokens.cached_tokens === 'number' ? Math.max(tokens.cached_tokens, 0) : 0,
typeof tokens.cache_tokens === 'number' ? Math.max(tokens.cache_tokens, 0) : 0 typeof tokens.cache_tokens === 'number' ? Math.max(tokens.cache_tokens, 0) : 0
@@ -378,7 +394,10 @@ export function calculateTokenBreakdown(usageData: any): TokenBreakdown {
/** /**
* 计算最近 N 分钟的 RPM/TPM * 计算最近 N 分钟的 RPM/TPM
*/ */
export function calculateRecentPerMinuteRates(windowMinutes: number = 30, usageData: any): RateStats { export function calculateRecentPerMinuteRates(
windowMinutes: number = 30,
usageData: unknown
): RateStats {
const details = collectUsageDetails(usageData); const details = collectUsageDetails(usageData);
const effectiveWindow = Number.isFinite(windowMinutes) && windowMinutes > 0 ? windowMinutes : 30; const effectiveWindow = Number.isFinite(windowMinutes) && windowMinutes > 0 ? windowMinutes : 30;
@@ -391,7 +410,7 @@ export function calculateRecentPerMinuteRates(windowMinutes: number = 30, usageD
let requestCount = 0; let requestCount = 0;
let tokenCount = 0; let tokenCount = 0;
details.forEach(detail => { details.forEach((detail) => {
const timestamp = Date.parse(detail.timestamp); const timestamp = Date.parse(detail.timestamp);
if (Number.isNaN(timestamp) || timestamp < windowStart) { if (Number.isNaN(timestamp) || timestamp < windowStart) {
return; return;
@@ -413,15 +432,16 @@ export function calculateRecentPerMinuteRates(windowMinutes: number = 30, usageD
/** /**
* 从使用数据获取模型名称列表 * 从使用数据获取模型名称列表
*/ */
export function getModelNamesFromUsage(usageData: any): string[] { export function getModelNamesFromUsage(usageData: unknown): string[] {
if (!usageData) { const apis = getApisRecord(usageData);
return []; if (!apis) return [];
}
const apis = usageData.apis || {};
const names = new Set<string>(); const names = new Set<string>();
Object.values(apis as Record<string, any>).forEach(apiEntry => { Object.values(apis).forEach((apiEntry) => {
const models = apiEntry?.models || {}; if (!isRecord(apiEntry)) return;
Object.keys(models).forEach(modelName => { const modelsRaw = apiEntry.models;
const models = isRecord(modelsRaw) ? modelsRaw : null;
if (!models) return;
Object.keys(models).forEach((modelName) => {
if (modelName) { if (modelName) {
names.add(modelName); names.add(modelName);
} }
@@ -433,13 +453,13 @@ export function getModelNamesFromUsage(usageData: any): string[] {
/** /**
* 计算成本数据 * 计算成本数据
*/ */
export function calculateCost(detail: any, modelPrices: Record<string, ModelPrice>): number { export function calculateCost(detail: UsageDetail, modelPrices: Record<string, ModelPrice>): number {
const modelName = detail.__modelName || ''; const modelName = detail.__modelName || '';
const price = modelPrices[modelName]; const price = modelPrices[modelName];
if (!price) { if (!price) {
return 0; return 0;
} }
const tokens = detail?.tokens || {}; const tokens = detail.tokens;
const rawInputTokens = Number(tokens.input_tokens); const rawInputTokens = Number(tokens.input_tokens);
const rawCompletionTokens = Number(tokens.output_tokens); const rawCompletionTokens = Number(tokens.output_tokens);
const rawCachedTokensPrimary = Number(tokens.cached_tokens); const rawCachedTokensPrimary = Number(tokens.cached_tokens);
@@ -463,7 +483,7 @@ export function calculateCost(detail: any, modelPrices: Record<string, ModelPric
/** /**
* 计算总成本 * 计算总成本
*/ */
export function calculateTotalCost(usageData: any, modelPrices: Record<string, ModelPrice>): number { export function calculateTotalCost(usageData: unknown, modelPrices: Record<string, ModelPrice>): number {
const details = collectUsageDetails(usageData); const details = collectUsageDetails(usageData);
if (!details.length || !Object.keys(modelPrices).length) { if (!details.length || !Object.keys(modelPrices).length) {
return 0; return 0;
@@ -483,16 +503,17 @@ export function loadModelPrices(): Record<string, ModelPrice> {
if (!raw) { if (!raw) {
return {}; return {};
} }
const parsed = JSON.parse(raw); const parsed: unknown = JSON.parse(raw);
if (!parsed || typeof parsed !== 'object') { if (!isRecord(parsed)) {
return {}; return {};
} }
const normalized: Record<string, ModelPrice> = {}; const normalized: Record<string, ModelPrice> = {};
Object.entries(parsed).forEach(([model, price]: [string, any]) => { Object.entries(parsed).forEach(([model, price]: [string, unknown]) => {
if (!model) return; if (!model) return;
const promptRaw = Number(price?.prompt); const priceRecord = isRecord(price) ? price : null;
const completionRaw = Number(price?.completion); const promptRaw = Number(priceRecord?.prompt);
const cacheRaw = Number(price?.cache); const completionRaw = Number(priceRecord?.completion);
const cacheRaw = Number(priceRecord?.cache);
if (!Number.isFinite(promptRaw) && !Number.isFinite(completionRaw) && !Number.isFinite(cacheRaw)) { if (!Number.isFinite(promptRaw) && !Number.isFinite(completionRaw) && !Number.isFinite(cacheRaw)) {
return; return;
@@ -536,21 +557,21 @@ export function saveModelPrices(prices: Record<string, ModelPrice>): void {
/** /**
* 获取 API 统计数据 * 获取 API 统计数据
*/ */
export function getApiStats(usageData: any, modelPrices: Record<string, ModelPrice>): ApiStats[] { export function getApiStats(usageData: unknown, modelPrices: Record<string, ModelPrice>): ApiStats[] {
if (!usageData?.apis) { const apis = getApisRecord(usageData);
return []; if (!apis) return [];
}
const apis = usageData.apis;
const result: ApiStats[] = []; const result: ApiStats[] = [];
Object.entries(apis as Record<string, any>).forEach(([endpoint, apiData]) => { Object.entries(apis).forEach(([endpoint, apiData]) => {
if (!isRecord(apiData)) return;
const models: Record<string, { requests: number; successCount: number; failureCount: number; tokens: number }> = {}; const models: Record<string, { requests: number; successCount: number; failureCount: number; tokens: number }> = {};
let derivedSuccessCount = 0; let derivedSuccessCount = 0;
let derivedFailureCount = 0; let derivedFailureCount = 0;
let totalCost = 0; let totalCost = 0;
const modelsData = apiData?.models || {}; const modelsData = isRecord(apiData.models) ? apiData.models : {};
Object.entries(modelsData as Record<string, any>).forEach(([modelName, modelData]) => { Object.entries(modelsData).forEach(([modelName, modelData]) => {
if (!isRecord(modelData)) return;
const details = Array.isArray(modelData.details) ? modelData.details : []; const details = Array.isArray(modelData.details) ? modelData.details : [];
const hasExplicitCounts = const hasExplicitCounts =
typeof modelData.success_count === 'number' || typeof modelData.failure_count === 'number'; typeof modelData.success_count === 'number' || typeof modelData.failure_count === 'number';
@@ -564,46 +585,50 @@ export function getApiStats(usageData: any, modelPrices: Record<string, ModelPri
const price = modelPrices[modelName]; const price = modelPrices[modelName];
if (details.length > 0 && (!hasExplicitCounts || price)) { if (details.length > 0 && (!hasExplicitCounts || price)) {
details.forEach((detail: any) => { details.forEach((detail) => {
const detailRecord = isRecord(detail) ? detail : null;
if (!hasExplicitCounts) { if (!hasExplicitCounts) {
if (detail?.failed === true) { if (detailRecord?.failed === true) {
failureCount += 1; failureCount += 1;
} else { } else {
successCount += 1; successCount += 1;
} }
} }
if (price) { if (price && detailRecord) {
totalCost += calculateCost({ ...detail, __modelName: modelName }, modelPrices); totalCost += calculateCost(
{ ...(detailRecord as unknown as UsageDetail), __modelName: modelName },
modelPrices
);
} }
}); });
} }
models[modelName] = { models[modelName] = {
requests: modelData.total_requests || 0, requests: Number(modelData.total_requests) || 0,
successCount, successCount,
failureCount, failureCount,
tokens: modelData.total_tokens || 0 tokens: Number(modelData.total_tokens) || 0
}; };
derivedSuccessCount += successCount; derivedSuccessCount += successCount;
derivedFailureCount += failureCount; derivedFailureCount += failureCount;
}); });
const hasApiExplicitCounts = const hasApiExplicitCounts =
typeof apiData?.success_count === 'number' || typeof apiData?.failure_count === 'number'; typeof apiData.success_count === 'number' || typeof apiData.failure_count === 'number';
const successCount = hasApiExplicitCounts const successCount = hasApiExplicitCounts
? (Number(apiData?.success_count) || 0) ? (Number(apiData.success_count) || 0)
: derivedSuccessCount; : derivedSuccessCount;
const failureCount = hasApiExplicitCounts const failureCount = hasApiExplicitCounts
? (Number(apiData?.failure_count) || 0) ? (Number(apiData.failure_count) || 0)
: derivedFailureCount; : derivedFailureCount;
result.push({ result.push({
endpoint: maskUsageSensitiveValue(endpoint) || endpoint, endpoint: maskUsageSensitiveValue(endpoint) || endpoint,
totalRequests: apiData.total_requests || 0, totalRequests: Number(apiData.total_requests) || 0,
successCount, successCount,
failureCount, failureCount,
totalTokens: apiData.total_tokens || 0, totalTokens: Number(apiData.total_tokens) || 0,
totalCost, totalCost,
models models
}); });
@@ -615,7 +640,7 @@ export function getApiStats(usageData: any, modelPrices: Record<string, ModelPri
/** /**
* 获取模型统计数据 * 获取模型统计数据
*/ */
export function getModelStats(usageData: any, modelPrices: Record<string, ModelPrice>): Array<{ export function getModelStats(usageData: unknown, modelPrices: Record<string, ModelPrice>): Array<{
model: string; model: string;
requests: number; requests: number;
successCount: number; successCount: number;
@@ -623,18 +648,22 @@ export function getModelStats(usageData: any, modelPrices: Record<string, ModelP
tokens: number; tokens: number;
cost: number; cost: number;
}> { }> {
if (!usageData?.apis) { const apis = getApisRecord(usageData);
return []; if (!apis) return [];
}
const modelMap = new Map<string, { requests: number; successCount: number; failureCount: number; tokens: number; cost: number }>(); const modelMap = new Map<string, { requests: number; successCount: number; failureCount: number; tokens: number; cost: number }>();
Object.values(usageData.apis as Record<string, any>).forEach(apiData => { Object.values(apis).forEach((apiData) => {
const models = apiData?.models || {}; if (!isRecord(apiData)) return;
Object.entries(models as Record<string, any>).forEach(([modelName, modelData]) => { const modelsRaw = apiData.models;
const models = isRecord(modelsRaw) ? modelsRaw : null;
if (!models) return;
Object.entries(models).forEach(([modelName, modelData]) => {
if (!isRecord(modelData)) return;
const existing = modelMap.get(modelName) || { requests: 0, successCount: 0, failureCount: 0, tokens: 0, cost: 0 }; const existing = modelMap.get(modelName) || { requests: 0, successCount: 0, failureCount: 0, tokens: 0, cost: 0 };
existing.requests += modelData.total_requests || 0; existing.requests += Number(modelData.total_requests) || 0;
existing.tokens += modelData.total_tokens || 0; existing.tokens += Number(modelData.total_tokens) || 0;
const details = Array.isArray(modelData.details) ? modelData.details : []; const details = Array.isArray(modelData.details) ? modelData.details : [];
@@ -648,17 +677,21 @@ export function getModelStats(usageData: any, modelPrices: Record<string, ModelP
} }
if (details.length > 0 && (!hasExplicitCounts || price)) { if (details.length > 0 && (!hasExplicitCounts || price)) {
details.forEach((detail: any) => { details.forEach((detail) => {
const detailRecord = isRecord(detail) ? detail : null;
if (!hasExplicitCounts) { if (!hasExplicitCounts) {
if (detail?.failed === true) { if (detailRecord?.failed === true) {
existing.failureCount += 1; existing.failureCount += 1;
} else { } else {
existing.successCount += 1; existing.successCount += 1;
} }
} }
if (price) { if (price && detailRecord) {
existing.cost += calculateCost({ ...detail, __modelName: modelName }, modelPrices); existing.cost += calculateCost(
{ ...(detailRecord as unknown as UsageDetail), __modelName: modelName },
modelPrices
);
} }
}); });
} }
@@ -700,7 +733,10 @@ export function formatDayLabel(date: Date): string {
/** /**
* 构建小时级别的数据序列 * 构建小时级别的数据序列
*/ */
export function buildHourlySeriesByModel(usageData: any, metric: 'requests' | 'tokens' = 'requests'): { export function buildHourlySeriesByModel(
usageData: unknown,
metric: 'requests' | 'tokens' = 'requests'
): {
labels: string[]; labels: string[];
dataByModel: Map<string, number[]>; dataByModel: Map<string, number[]>;
hasData: boolean; hasData: boolean;
@@ -728,7 +764,7 @@ export function buildHourlySeriesByModel(usageData: any, metric: 'requests' | 't
return { labels, dataByModel, hasData }; return { labels, dataByModel, hasData };
} }
details.forEach(detail => { details.forEach((detail) => {
const timestamp = Date.parse(detail.timestamp); const timestamp = Date.parse(detail.timestamp);
if (Number.isNaN(timestamp)) { if (Number.isNaN(timestamp)) {
return; return;
@@ -767,7 +803,10 @@ export function buildHourlySeriesByModel(usageData: any, metric: 'requests' | 't
/** /**
* 构建日级别的数据序列 * 构建日级别的数据序列
*/ */
export function buildDailySeriesByModel(usageData: any, metric: 'requests' | 'tokens' = 'requests'): { export function buildDailySeriesByModel(
usageData: unknown,
metric: 'requests' | 'tokens' = 'requests'
): {
labels: string[]; labels: string[];
dataByModel: Map<string, number[]>; dataByModel: Map<string, number[]>;
hasData: boolean; hasData: boolean;
@@ -781,7 +820,7 @@ export function buildDailySeriesByModel(usageData: any, metric: 'requests' | 'to
return { labels: [], dataByModel: new Map(), hasData }; return { labels: [], dataByModel: new Map(), hasData };
} }
details.forEach(detail => { details.forEach((detail) => {
const timestamp = Date.parse(detail.timestamp); const timestamp = Date.parse(detail.timestamp);
if (Number.isNaN(timestamp)) { if (Number.isNaN(timestamp)) {
return; return;
@@ -885,7 +924,7 @@ const buildAreaGradient = (context: ScriptableContext<'line'>, baseHex: string,
* 构建图表数据 * 构建图表数据
*/ */
export function buildChartData( export function buildChartData(
usageData: any, usageData: unknown,
period: 'hour' | 'day' = 'day', period: 'hour' | 'day' = 'day',
metric: 'requests' | 'tokens' = 'requests', metric: 'requests' | 'tokens' = 'requests',
selectedModels: string[] = [] selectedModels: string[] = []
@@ -1034,8 +1073,9 @@ export function calculateStatusBarData(
}; };
} }
export function computeKeyStats(usageData: any, masker: (val: string) => string = maskApiKey): KeyStats { export function computeKeyStats(usageData: unknown, masker: (val: string) => string = maskApiKey): KeyStats {
if (!usageData) { const apis = getApisRecord(usageData);
if (!apis) {
return { bySource: {}, byAuthIndex: {} }; return { bySource: {}, byAuthIndex: {} };
} }
@@ -1049,17 +1089,21 @@ export function computeKeyStats(usageData: any, masker: (val: string) => string
return bucket[key]; return bucket[key];
}; };
const apis = usageData.apis || {}; Object.values(apis).forEach((apiEntry) => {
Object.values(apis as any).forEach((apiEntry: any) => { if (!isRecord(apiEntry)) return;
const models = apiEntry?.models || {}; const modelsRaw = apiEntry.models;
const models = isRecord(modelsRaw) ? modelsRaw : null;
if (!models) return;
Object.values(models as any).forEach((modelEntry: any) => { Object.values(models).forEach((modelEntry) => {
const details = modelEntry?.details || []; if (!isRecord(modelEntry)) return;
const details = Array.isArray(modelEntry.details) ? modelEntry.details : [];
details.forEach((detail: any) => { details.forEach((detail) => {
const source = normalizeUsageSourceId(detail?.source, masker); const detailRecord = isRecord(detail) ? detail : null;
const authIndexKey = normalizeAuthIndex(detail?.auth_index); const source = normalizeUsageSourceId(detailRecord?.source, masker);
const isFailed = detail?.failed === true; const authIndexKey = normalizeAuthIndex(detailRecord?.auth_index);
const isFailed = detailRecord?.failed === true;
if (source) { if (source) {
const bucket = ensureBucket(sourceStats, source); const bucket = ensureBucket(sourceStats, source);