llm-simple-router 0.11.27 → 0.11.29

package/config/recommended-providers.json

@@ -94,12 +94,12 @@
     "group": "智谱",
     "presets": [
       {
-      "plan": "Coding Plan",
-    "presetName": "zhipu-coding-plan",
-    "apiType": "openai",
-    "baseUrl": "https://open.bigmodel.cn",
-    "upstreamPath": "/api/coding/paas/v4/chat/completions",
-    "modelsEndpoint": "/v1/models",
+        "plan": "Coding Plan",
+        "presetName": "zhipu-coding-plan",
+        "apiType": "openai",
+        "baseUrl": "https://open.bigmodel.cn",
+        "upstreamPath": "/api/coding/paas/v4/chat/completions",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "glm-5.1",
           "glm-5",
@@ -108,6 +108,22 @@
           "glm-4.5-air"
         ]
       },
+      {
+        "plan": "Coding Plan (Anthropic)",
+        "presetName": "zhipu-coding-plan-anthropic",
+        "apiType": "anthropic",
+        "baseUrl": "https://open.bigmodel.cn",
+        "upstreamPath": "/api/anthropic/v1/messages",
+        "modelsEndpoint": "/api/anthropic/v1/models",
+        "models": [
+          "glm-5.1",
+          "glm-5",
+          "glm-5-turbo",
+          "glm-4.7",
+          "glm-4.5-air"
+        ],
+        "hidden": true
+      },
       {
         "plan": "API",
         "presetName": "zhipu",
@@ -352,4 +368,4 @@
       }
     ]
   }
-]
+]

package/dist/admin/providers.js

@@ -1,5 +1,6 @@
 import { Type } from "@sinclair/typebox";
 import { getAllProviders, getProviderById, createProvider, updateProvider, deleteProvider, getAllMappingGroups, updateMappingGroup, PROVIDER_CONCURRENCY_DEFAULTS } from "../db/index.js";
+import { parseEndpoints, serializeEndpoints } from "../db/providers.js";
 import { encrypt, decrypt } from "../utils/crypto.js";
 import { getSetting } from "../db/settings.js";
 import { HTTP_CREATED, HTTP_NOT_FOUND, HTTP_CONFLICT, HTTP_BAD_REQUEST, HTTP_OK } from "./constants.js";
@@ -26,10 +27,11 @@ function cascadeProviderDisable(db, providerId) {
         let modified = false;
         let shouldDisable = false;
         // 归一化旧格式 { default, windows } → { targets }（向后兼容 migration 026 前数据）
-        // eslint-disable-next-line taste/no-deprecated-rule-format
-        if (!Array.isArray(rule.targets) && typeof rule.default === "object" && rule.default !== null) {
-            // eslint-disable-next-line taste/no-deprecated-rule-format
-            rule.targets = [rule.default];
+        if (!Array.isArray(rule.targets)) {
+            const legacyDefault = rule["default"];
+            if (typeof legacyDefault === "object" && legacyDefault !== null) {
+                rule.targets = [legacyDefault];
+            }
         }
         const targets = rule.targets;
         if (Array.isArray(targets)) {
@@ -95,12 +97,42 @@ function isValidHttpUrl(str) {
         return false;
     }
 }
+/** 校验 endpoints 数组并加密 api_key。成功返回处理后的数组，失败返回错误信息 */
+function validateAndEncryptEndpoints(endpoints, encryptionKey) {
+    const apiTypes = endpoints.map(e => e.api_type);
+    if (new Set(apiTypes).size !== apiTypes.length) {
+        return { ok: false, message: "endpoints 中存在重复的 api_type" };
+    }
+    for (const ep of endpoints) {
+        if (!isValidHttpUrl(ep.base_url)) {
+            return { ok: false, message: `endpoint (${ep.api_type}) base_url 格式无效，必须是以 http:// 或 https:// 开头的合法 URL` };
+        }
+    }
+    const processed = endpoints.map(e => ({
+        api_type: e.api_type,
+        base_url: e.base_url,
+        upstream_path: e.upstream_path ?? null,
+        api_key: e.api_key ? encrypt(e.api_key, encryptionKey) : null,
+    }));
+    return { ok: true, processed };
+}
+const EndpointSchema = Type.Object({
+    api_type: Type.Union([
+        Type.Literal("openai"),
+        Type.Literal("openai-responses"),
+        Type.Literal("anthropic"),
+    ]),
+    base_url: Type.String({ minLength: 1 }),
+    upstream_path: Type.Optional(Type.Union([Type.String({ minLength: 1 }), Type.Null()])),
+    api_key: Type.Optional(Type.Union([Type.String({ minLength: 1 }), Type.Null()])),
+});
 const CreateProviderSchema = Type.Object({
     name: Type.String({ minLength: 1 }),
-    api_type: Type.Union([Type.Literal("openai"), Type.Literal("anthropic")]),
-    base_url: Type.String({ minLength: 1 }),
+    api_type: Type.Optional(Type.Union([Type.Literal("openai"), Type.Literal("anthropic"), Type.Literal("openai-responses")])),
+    base_url: Type.Optional(Type.String({ minLength: 1 })),
     upstream_path: Type.Optional(Type.String({ minLength: 1 })),
-    api_key: Type.String({ minLength: 1 }),
+    api_key: Type.Optional(Type.String({ minLength: 1 })),
+    endpoints: Type.Optional(Type.Array(EndpointSchema, { minItems: 1 })),
     models: Type.Optional(Type.Array(Type.Union([
         Type.String(),
         Type.Object({ name: Type.String(), context_window: Type.Optional(Type.Number()), patches: Type.Optional(Type.Array(Type.String())), stream_timeout_ms: Type.Optional(Type.Number({ minimum: 0, maximum: 86_400_000 })), capabilities: Type.Optional(Type.Array(Type.String())) }),
@@ -118,10 +150,11 @@ const CreateProviderSchema = Type.Object({
 });
 const UpdateProviderSchema = Type.Object({
     name: Type.Optional(Type.String({ minLength: 1 })),
-    api_type: Type.Optional(Type.Union([Type.Literal("openai"), Type.Literal("anthropic")])),
+    api_type: Type.Optional(Type.Union([Type.Literal("openai"), Type.Literal("anthropic"), Type.Literal("openai-responses")])),
     base_url: Type.Optional(Type.String({ minLength: 1 })),
     upstream_path: Type.Optional(Type.String({ minLength: 1 })),
     api_key: Type.Optional(Type.String({ minLength: 1 })),
+    endpoints: Type.Optional(Type.Array(EndpointSchema, { minItems: 1 })),
     models: Type.Optional(Type.Array(Type.Union([
         Type.String(),
         Type.Object({ name: Type.String(), context_window: Type.Optional(Type.Number()), patches: Type.Optional(Type.Array(Type.String())), stream_timeout_ms: Type.Optional(Type.Number({ minimum: 0, maximum: 86_400_000 })), capabilities: Type.Optional(Type.Array(Type.String())) }),
@@ -137,6 +170,104 @@ const UpdateProviderSchema = Type.Object({
     proxy_username: Type.Optional(Type.Union([Type.String(), Type.Null()])),
     proxy_password: Type.Optional(Type.Union([Type.String(), Type.Null()])),
 });
+async function handleCreateProvider(body, reply, deps) {
+    const { db, stateRegistry, tracker, adaptiveController } = deps;
+    if (!PROVIDER_NAME_RE.test(body.name)) {
+        return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.VALIDATION_FAILED, "Provider 名称仅允许英文大小写字母、数字、横线和下划线"));
+    }
+    const existing = db.prepare("SELECT id FROM providers WHERE name = ?").get(body.name);
+    if (existing) {
+        return reply.code(HTTP_CONFLICT).send(apiError(API_CODE.CONFLICT_NAME, `Provider 名称 '${body.name}' 已存在`));
+    }
+    const encryptionKey = getSetting(db, "encryption_key");
+    // ---- endpoints 解析 ----
+    let legacyApiType;
+    let legacyBaseUrl;
+    let legacyUpstreamPath;
+    let legacyApiKeyPlain;
+    let endpointsSerialized;
+    if (body.endpoints && body.endpoints.length > 0) {
+        const result = validateAndEncryptEndpoints(body.endpoints, encryptionKey);
+        if (!result.ok) {
+            return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.VALIDATION_FAILED, result.message));
+        }
+        endpointsSerialized = serializeEndpoints(result.processed);
+        legacyApiType = body.endpoints[0].api_type;
+        legacyBaseUrl = body.endpoints[0].base_url;
+        legacyUpstreamPath = body.endpoints[0].upstream_path ?? null;
+        legacyApiKeyPlain = body.endpoints[0].api_key ?? body.api_key ?? "";
+        if (!legacyApiKeyPlain) {
+            return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.VALIDATION_FAILED, "第一个 endpoint 需要提供 api_key 或使用旧 api_key 字段"));
+        }
+    }
+    else {
+        if (!body.api_type || !body.base_url || !body.api_key) {
+            return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.VALIDATION_FAILED, "缺少 endpoints 时，api_type/base_url/api_key 为必填"));
+        }
+        if (!isValidHttpUrl(body.base_url)) {
+            return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.VALIDATION_FAILED, "base_url 格式无效，必须是以 http:// 或 https:// 开头的合法 URL"));
+        }
+        legacyApiType = body.api_type;
+        legacyBaseUrl = body.base_url;
+        legacyUpstreamPath = body.upstream_path ?? null;
+        legacyApiKeyPlain = body.api_key;
+        endpointsSerialized = serializeEndpoints([{
+                api_type: body.api_type,
+                base_url: body.base_url,
+                upstream_path: body.upstream_path ?? null,
+                api_key: null,
+            }]);
+    }
+    const encryptedKey = encrypt(legacyApiKeyPlain, encryptionKey);
+    const { entries: normalizedModels, overrides: contextOverrides } = extractModelOverrides((body.models ?? []));
+    const isAdaptiveEnabled = body.adaptive_enabled ?? 0;
+    const effectiveProxyType = body.proxy_url?.trim() ? body.proxy_type : null;
+    const effectiveProxyUrl = body.proxy_url?.trim() || null;
+    const encryptedProxyUsername = (effectiveProxyType && body.proxy_username) ? encrypt(body.proxy_username, encryptionKey) : null;
+    const encryptedProxyPassword = (effectiveProxyType && body.proxy_password) ? encrypt(body.proxy_password, encryptionKey) : null;
+    const id = createProvider(db, {
+        name: body.name,
+        api_type: legacyApiType,
+        base_url: legacyBaseUrl,
+        upstream_path: legacyUpstreamPath,
+        api_key: encryptedKey,
+        api_key_preview: legacyApiKeyPlain.length > API_KEY_PREVIEW_MIN_LENGTH ? `${legacyApiKeyPlain.slice(0, API_KEY_PREVIEW_PREFIX_LEN)}...${legacyApiKeyPlain.slice(-API_KEY_PREVIEW_PREFIX_LEN)}` : "****",
+        models: JSON.stringify(normalizedModels),
+        is_active: body.is_active ?? 1,
+        max_concurrency: body.max_concurrency ?? PROVIDER_CONCURRENCY_DEFAULTS.max_concurrency,
+        queue_timeout_ms: body.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms,
+        max_queue_size: body.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size,
+        adaptive_enabled: isAdaptiveEnabled,
+        proxy_type: effectiveProxyType,
+        proxy_url: effectiveProxyUrl,
+        proxy_username: encryptedProxyUsername,
+        proxy_password: encryptedProxyPassword,
+        endpoints: endpointsSerialized,
+    });
+    if (contextOverrides.length > 0) {
+        setModelInfoForProvider(db, id, contextOverrides.map(o => ({ model_name: o.name, context_window: o.context_window })));
+    }
+    if (!isAdaptiveEnabled) {
+        stateRegistry?.updateProviderConcurrency(id, {
+            maxConcurrency: body.max_concurrency ?? PROVIDER_CONCURRENCY_DEFAULTS.max_concurrency,
+            queueTimeoutMs: body.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms,
+            maxQueueSize: body.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size,
+        });
+    }
+    adaptiveController?.syncProvider(id, {
+        adaptive_enabled: isAdaptiveEnabled,
+        max_concurrency: body.max_concurrency ?? PROVIDER_CONCURRENCY_DEFAULTS.max_concurrency,
+        queue_timeout_ms: body.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms,
+        max_queue_size: body.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size,
+    });
+    tracker?.updateProviderConfig(id, {
+        name: body.name,
+        maxConcurrency: body.max_concurrency ?? PROVIDER_CONCURRENCY_DEFAULTS.max_concurrency,
+        queueTimeoutMs: body.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms,
+        maxQueueSize: body.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size,
+    });
+    return reply.code(HTTP_CREATED).send({ id });
+}
 export const adminProviderRoutes = (app, options, done) => {
     const { db, stateRegistry, tracker, adaptiveController, proxyAgentFactory } = options;
     app.get("/admin/api/providers", async (_request, reply) => {
@@ -162,6 +293,12 @@ export const adminProviderRoutes = (app, options, done) => {
                 proxy_url: s.proxy_url,
                 proxy_username: s.proxy_username ? decrypt(s.proxy_username, encryptionKey) : null,
                 proxy_password: s.proxy_password ? decrypt(s.proxy_password, encryptionKey) : null,
+                endpoints: parseEndpoints(s.endpoints).map(ep => ({
+                    api_type: ep.api_type,
+                    base_url: ep.base_url,
+                    upstream_path: ep.upstream_path ?? null,
+                    api_key: ep.api_key ? decrypt(ep.api_key, encryptionKey) : "",
+                })),
                 concurrency_status: stateRegistry?.getProviderStatus(s.id) ?? { active: 0, queued: 0 },
                 created_at: s.created_at,
                 updated_at: s.updated_at,
@@ -169,67 +306,7 @@ export const adminProviderRoutes = (app, options, done) => {
         }));
     });
     app.post("/admin/api/providers", { schema: { body: CreateProviderSchema } }, async (request, reply) => {
-        const body = request.body;
-        if (!PROVIDER_NAME_RE.test(body.name)) {
-            return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.VALIDATION_FAILED, "Provider 名称仅允许英文大小写字母、数字、横线和下划线"));
-        }
-        const existing = db.prepare("SELECT id FROM providers WHERE name = ?").get(body.name);
-        if (existing) {
-            return reply.code(HTTP_CONFLICT).send(apiError(API_CODE.CONFLICT_NAME, `Provider 名称 '${body.name}' 已存在`));
-        }
-        if (!isValidHttpUrl(body.base_url)) {
-            return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.VALIDATION_FAILED, "base_url 格式无效，必须是以 http:// 或 https:// 开头的合法 URL"));
-        }
-        const encryptedKey = encrypt(body.api_key, getSetting(db, "encryption_key"));
-        const { entries: normalizedModels, overrides: contextOverrides } = extractModelOverrides((body.models ?? []));
-        const isAdaptiveEnabled = body.adaptive_enabled ?? 0;
-        // 将空 proxy_url 视为不使用代理
-        const effectiveProxyType = body.proxy_url?.trim() ? body.proxy_type : null;
-        const effectiveProxyUrl = body.proxy_url?.trim() || null;
-        const encryptedProxyUsername = (effectiveProxyType && body.proxy_username) ? encrypt(body.proxy_username, getSetting(db, "encryption_key")) : null;
-        const encryptedProxyPassword = (effectiveProxyType && body.proxy_password) ? encrypt(body.proxy_password, getSetting(db, "encryption_key")) : null;
-        const id = createProvider(db, {
-            name: body.name,
-            api_type: body.api_type,
-            base_url: body.base_url,
-            upstream_path: body.upstream_path ?? null,
-            api_key: encryptedKey,
-            api_key_preview: body.api_key.length > API_KEY_PREVIEW_MIN_LENGTH ? `${body.api_key.slice(0, API_KEY_PREVIEW_PREFIX_LEN)}...${body.api_key.slice(-API_KEY_PREVIEW_PREFIX_LEN)}` : "****",
-            models: JSON.stringify(normalizedModels),
-            is_active: body.is_active ?? 1,
-            max_concurrency: body.max_concurrency ?? PROVIDER_CONCURRENCY_DEFAULTS.max_concurrency,
-            queue_timeout_ms: body.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms,
-            max_queue_size: body.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size,
-            adaptive_enabled: isAdaptiveEnabled,
-            proxy_type: effectiveProxyType,
-            proxy_url: effectiveProxyUrl,
-            proxy_username: encryptedProxyUsername,
-            proxy_password: encryptedProxyPassword,
-        });
-        if (contextOverrides.length > 0) {
-            setModelInfoForProvider(db, id, contextOverrides.map(o => ({ model_name: o.name, context_window: o.context_window })));
-        }
-        // 当 adaptive 启用时，由 syncProvider 全权管理信号量（避免重复调用 updateConfig）
-        if (!isAdaptiveEnabled) {
-            stateRegistry?.updateProviderConcurrency(id, {
-                maxConcurrency: body.max_concurrency ?? PROVIDER_CONCURRENCY_DEFAULTS.max_concurrency,
-                queueTimeoutMs: body.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms,
-                maxQueueSize: body.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size,
-            });
-        }
-        adaptiveController?.syncProvider(id, {
-            adaptive_enabled: isAdaptiveEnabled,
-            max_concurrency: body.max_concurrency ?? PROVIDER_CONCURRENCY_DEFAULTS.max_concurrency,
-            queue_timeout_ms: body.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms,
-            max_queue_size: body.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size,
-        });
-        tracker?.updateProviderConfig(id, {
-            name: body.name,
-            maxConcurrency: body.max_concurrency ?? PROVIDER_CONCURRENCY_DEFAULTS.max_concurrency,
-            queueTimeoutMs: body.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms,
-            maxQueueSize: body.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size,
-        });
-        return reply.code(HTTP_CREATED).send({ id });
+        return handleCreateProvider(request.body, reply, { db, stateRegistry, tracker, adaptiveController });
     });
     app.put("/admin/api/providers/:id", { schema: { body: UpdateProviderSchema } }, async (request, reply) => {
         const { id } = request.params;
@@ -295,6 +372,24 @@ export const adminProviderRoutes = (app, options, done) => {
         if (body.proxy_password !== undefined && effectiveProxyType) {
             fields.proxy_password = body.proxy_password ? encrypt(body.proxy_password, getSetting(db, "encryption_key")) : null;
         }
+        // ---- endpoints 处理 ----
+        if (body.endpoints) {
+            const ek = getSetting(db, "encryption_key");
+            const result = validateAndEncryptEndpoints(body.endpoints, ek);
+            if (!result.ok) {
+                return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.VALIDATION_FAILED, result.message));
+            }
+            fields.endpoints = serializeEndpoints(result.processed);
+            // 同步旧字段 = endpoints[0]
+            fields.api_type = body.endpoints[0].api_type;
+            fields.base_url = body.endpoints[0].base_url;
+            fields.upstream_path = body.endpoints[0].upstream_path ?? null;
+            const primaryApiKey = body.endpoints[0].api_key;
+            if (primaryApiKey) {
+                fields.api_key = encrypt(primaryApiKey, ek);
+                fields.api_key_preview = primaryApiKey.length > API_KEY_PREVIEW_MIN_LENGTH ? `${primaryApiKey.slice(0, API_KEY_PREVIEW_PREFIX_LEN)}...${primaryApiKey.slice(-API_KEY_PREVIEW_PREFIX_LEN)}` : "****";
+            }
+        }
         updateProvider(db, id, fields);
         proxyAgentFactory?.invalidate(id);
         const updated = getProviderById(db, id);

package/dist/config/recommended-providers.json

@@ -94,12 +94,12 @@
     "group": "智谱",
     "presets": [
       {
-      "plan": "Coding Plan",
-    "presetName": "zhipu-coding-plan",
-    "apiType": "openai",
-    "baseUrl": "https://open.bigmodel.cn",
-    "upstreamPath": "/api/coding/paas/v4/chat/completions",
-    "modelsEndpoint": "/v1/models",
+        "plan": "Coding Plan",
+        "presetName": "zhipu-coding-plan",
+        "apiType": "openai",
+        "baseUrl": "https://open.bigmodel.cn",
+        "upstreamPath": "/api/coding/paas/v4/chat/completions",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "glm-5.1",
           "glm-5",
@@ -108,6 +108,22 @@
           "glm-4.5-air"
         ]
       },
+      {
+        "plan": "Coding Plan (Anthropic)",
+        "presetName": "zhipu-coding-plan-anthropic",
+        "apiType": "anthropic",
+        "baseUrl": "https://open.bigmodel.cn",
+        "upstreamPath": "/api/anthropic/v1/messages",
+        "modelsEndpoint": "/api/anthropic/v1/models",
+        "models": [
+          "glm-5.1",
+          "glm-5",
+          "glm-5-turbo",
+          "glm-4.7",
+          "glm-4.5-air"
+        ],
+        "hidden": true
+      },
       {
         "plan": "API",
         "presetName": "zhipu",
@@ -352,4 +368,4 @@
       }
     ]
   }
-]
+]

package/dist/config/recommended.d.ts

@@ -9,6 +9,8 @@ export interface ProviderPreset {
     models: string[];
     /** 由 API handler 补充：模型名 → capabilities 映射 */
     modelCapabilities?: Record<string, string[]>;
+    /** 隐藏 preset，不在 plan 下拉菜单显示，但 endpoints 生成仍遍历 */
+    hidden?: boolean;
 }
 export interface ProviderGroup {
     group: string;

package/dist/core/types.d.ts

@@ -57,6 +57,8 @@ export interface MetricsResult {
     text_tokens: number | null;
     tool_use_tokens: number | null;
 }
+/** Provider endpoint API 类型（openai / openai-responses / anthropic） */
+export type ApiType = "openai" | "openai-responses" | "anthropic";
 export type RawHeaders = Record<string, string | string[] | undefined>;
 export type TransportResult = {
     kind: "success";
@@ -119,5 +121,20 @@ export interface ResilienceAttempt {
     /** response headers 是否已发送，影响重试/failover 决策 */
     headers_sent?: boolean | null;
 }
+/** Provider endpoint — stored in providers.endpoints JSON field */
+export interface ProviderEndpoint {
+    api_type: ApiType;
+    base_url: string;
+    upstream_path?: string | null;
+    api_key?: string | null;
+}
+/** resolveEndpoint() 的输出 — 所有下游消费者只消费此对象 */
+export interface ResolvedEndpoint {
+    api_type: ApiType;
+    base_url: string;
+    upstream_path: string | null;
+    api_key: string;
+    needs_transform: boolean;
+}
 /** 流式传输阶段状态 */
 export type StreamState = "BUFFERING" | "STREAMING" | "COMPLETED" | "EARLY_ERROR" | "ABORTED";

package/dist/db/logs.d.ts

@@ -21,6 +21,8 @@ export interface RequestLog {
     original_model: string | null;
     stream_text_content: string | null;
     session_id: string | null;
+    upstream_api_type: string | null;
+    upstream_base_url: string | null;
 }
 /** 列表查询扩展字段：JOIN providers 获得 provider_name */
 export interface RequestLogListRow extends RequestLog {
@@ -57,6 +59,8 @@ export interface RequestLogInsert {
     resilience_reason?: string | null;
     mapping_reason?: string | null;
     failover_trigger?: string | null;
+    upstream_api_type?: string | null;
+    upstream_base_url?: string | null;
 }
 export interface LogWriteContext {
     matcher?: RetryMatcher | null;

package/dist/db/logs.js

@@ -9,6 +9,7 @@ const LOG_LIST_SELECT = `rl.id, rl.api_type, rl.model, rl.provider_id, rl.status
             rm.tokens_per_second, rm.stop_reason, rm.backend_model, rm.is_complete AS metrics_complete,
             rm.input_tokens_estimated, rm.client_type, rm.cache_read_tokens_estimated,
             COALESCE(p.name, rl.provider_id) AS provider_name,
+            rl.upstream_api_type, rl.upstream_base_url,
             CASE
               WHEN rl.client_request IS NULL THEN 'off'
               WHEN rl.api_type = 'anthropic' THEN COALESCE(json_extract(rl.client_request, '$.body.thinking.type'), 'off')
@@ -22,9 +23,10 @@ function rawInsertRequestLog(db, log, writeContext) {
     getCachedStmt(db, `INSERT INTO request_logs (id, api_type, model, provider_id, status_code, client_status_code, latency_ms,
       is_stream, error_message, created_at, client_request, upstream_request, upstream_response,
       is_retry, is_failover, original_request_id, router_key_id, original_model, session_id, pipeline_snapshot,
-      transport_kind, abort_reason, error_code, headers_sent, resilience_action, resilience_reason, mapping_reason, failover_trigger)
+      transport_kind, abort_reason, error_code, headers_sent, resilience_action, resilience_reason, mapping_reason, failover_trigger,
+      upstream_api_type, upstream_base_url)
      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
-      ?, ?, ?, ?, ?, ?, ?, ?)`).run(log.id, log.api_type, log.model, log.provider_id, log.status_code, log.client_status_code ?? null, log.latency_ms, log.is_stream, log.error_message, log.created_at, log.client_request ?? null, preserveDetail ? (log.upstream_request ?? null) : null, preserveDetail ? (log.upstream_response ?? null) : null, log.is_retry ?? 0, log.is_failover ?? 0, log.original_request_id ?? null, log.router_key_id ?? null, log.original_model ?? null, log.session_id ?? null, log.pipeline_snapshot ?? null, log.transport_kind ?? null, log.abort_reason ?? null, log.error_code ?? null, log.headers_sent ?? null, log.resilience_action ?? null, log.resilience_reason ?? null, log.mapping_reason ?? null, log.failover_trigger ?? null);
+      ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(log.id, log.api_type, log.model, log.provider_id, log.status_code, log.client_status_code ?? null, log.latency_ms, log.is_stream, log.error_message, log.created_at, log.client_request ?? null, preserveDetail ? (log.upstream_request ?? null) : null, preserveDetail ? (log.upstream_response ?? null) : null, log.is_retry ?? 0, log.is_failover ?? 0, log.original_request_id ?? null, log.router_key_id ?? null, log.original_model ?? null, log.session_id ?? null, log.pipeline_snapshot ?? null, log.transport_kind ?? null, log.abort_reason ?? null, log.error_code ?? null, log.headers_sent ?? null, log.resilience_action ?? null, log.resilience_reason ?? null, log.mapping_reason ?? null, log.failover_trigger ?? null, log.upstream_api_type ?? null, log.upstream_base_url ?? null);
 }
 export function insertRequestLog(db, log, writeContext) {
     // 文件写入：始终同步调用（WriteStream 内部异步，不阻塞事件循环）
@@ -110,7 +112,8 @@ export function getRequestLogById(db, id) {
     return db.prepare(`SELECT rl.*, rm.input_tokens, rm.output_tokens, rm.cache_read_tokens, rm.ttft_ms,
             rm.tokens_per_second, rm.stop_reason, rm.backend_model, rm.is_complete AS metrics_complete,
             rm.input_tokens_estimated, rm.client_type, rm.cache_read_tokens_estimated,
-            COALESCE(p.name, rl.provider_id) AS provider_name${LOG_DETAIL_THINKING_LEVEL}
+            COALESCE(p.name, rl.provider_id) AS provider_name${LOG_DETAIL_THINKING_LEVEL},
+            rl.upstream_api_type, rl.upstream_base_url
      FROM request_logs rl
      LEFT JOIN providers p ON p.id = rl.provider_id
      LEFT JOIN request_metrics rm ON rm.request_log_id = rl.id

package/dist/db/migrations/051_provider_endpoints.sql

@@ -0,0 +1,15 @@
+-- 051: Add endpoints column to providers, migrate existing data to endpoints JSON
+ALTER TABLE providers ADD COLUMN endpoints TEXT DEFAULT NULL;
+
+UPDATE providers
+SET endpoints = json_array(
+    json_object(
+      'api_type', api_type,
+      'base_url', base_url,
+      'upstream_path', CASE WHEN upstream_path IS NULL THEN json('null') ELSE upstream_path END,
+      'api_key', CASE WHEN api_key IS NULL THEN json('null') ELSE api_key END
+    )
+  )
+WHERE endpoints IS NULL
+  AND api_type IS NOT NULL
+  AND base_url IS NOT NULL;

package/dist/db/migrations/052_add_upstream_log_fields.sql

@@ -0,0 +1,3 @@
+-- 052: Add upstream endpoint fields to request_logs for multi-API-type logging
+ALTER TABLE request_logs ADD COLUMN upstream_api_type TEXT DEFAULT NULL;
+ALTER TABLE request_logs ADD COLUMN upstream_base_url TEXT DEFAULT NULL;

package/dist/db/providers.d.ts

@@ -1,4 +1,5 @@
 import Database from "better-sqlite3";
+import type { ProviderEndpoint } from "../core/types.js";
 export interface Provider {
     id: string;
     name: string;
@@ -18,6 +19,8 @@ export interface Provider {
     proxy_url: string | null;
     proxy_username: string | null;
     proxy_password: string | null;
+    /** @internal 原始 JSON 文本，业务层用 parseEndpoints() 解析 */
+    endpoints?: string;
     created_at: string;
     updated_at: string;
 }
@@ -30,6 +33,10 @@ export declare const PROVIDER_CONCURRENCY_DEFAULTS: {
     readonly queue_timeout_ms: 0;
     readonly max_queue_size: 100;
 };
+/** 解析 endpoints JSON 文本为类型安全的数组 */
+export declare function parseEndpoints(endpointsJson: string | null | undefined): ProviderEndpoint[];
+/** 将 endpoints 数组序列化为 JSON 文本（用于 DB 写入） */
+export declare function serializeEndpoints(endpoints: ProviderEndpoint[]): string;
 export declare function getActiveProviders(db: Database.Database, apiType: "openai" | "openai-responses" | "anthropic"): Provider[];
 export declare function getAllProviders(db: Database.Database): Provider[];
 export declare function getProviderById(db: Database.Database, id: string): Provider | undefined;
@@ -50,8 +57,9 @@ export declare function createProvider(db: Database.Database, provider: {
     proxy_url?: string | null;
     proxy_username?: string | null;
     proxy_password?: string | null;
+    endpoints?: string;
 }): string;
-export declare function updateProvider(db: Database.Database, id: string, fields: Partial<Pick<Provider, "name" | "api_type" | "base_url" | "upstream_path" | "api_key" | "api_key_preview" | "models" | "is_active" | "max_concurrency" | "queue_timeout_ms" | "max_queue_size" | "adaptive_enabled" | "proxy_type" | "proxy_url" | "proxy_username" | "proxy_password">>): void;
+export declare function updateProvider(db: Database.Database, id: string, fields: Partial<Pick<Provider, "name" | "api_type" | "base_url" | "upstream_path" | "api_key" | "api_key_preview" | "models" | "is_active" | "max_concurrency" | "queue_timeout_ms" | "max_queue_size" | "adaptive_enabled" | "proxy_type" | "proxy_url" | "proxy_username" | "proxy_password" | "endpoints">>): void;
 export declare function deleteProvider(db: Database.Database, id: string): void;
 export declare function getActiveProviderByName(db: Database.Database, name: string): {
     id: string;

package/dist/db/providers.js

@@ -22,8 +22,37 @@ export const PROVIDER_CONCURRENCY_DEFAULTS = {
     max_queue_size: 100,
 };
 const PROVIDER_FIELDS = new Set([
-    "name", "api_type", "base_url", "upstream_path", "api_key", "api_key_preview", "models", "is_active", "max_concurrency", "queue_timeout_ms", "max_queue_size", "adaptive_enabled", "proxy_type", "proxy_url", "proxy_username", "proxy_password",
+    "name", "api_type", "base_url", "upstream_path", "api_key", "api_key_preview", "models", "is_active", "max_concurrency", "queue_timeout_ms", "max_queue_size", "adaptive_enabled", "proxy_type", "proxy_url", "proxy_username", "proxy_password", "endpoints",
 ]);
+const VALID_API_TYPES = new Set(["openai", "openai-responses", "anthropic"]);
+/** 解析 endpoints JSON 文本为类型安全的数组 */
+export function parseEndpoints(endpointsJson) {
+    if (!endpointsJson)
+        return [];
+    const parsed = JSON.parse(endpointsJson);
+    if (!Array.isArray(parsed)) {
+        throw new Error(`Invalid endpoints JSON: not an array`);
+    }
+    // Validate every element is a non-null object with required fields
+    for (let i = 0; i < parsed.length; i++) {
+        const item = parsed[i];
+        if (item === null || typeof item !== "object" || Array.isArray(item)) {
+            throw new Error(`Invalid endpoints JSON: element [${i}] is not an object`);
+        }
+        const obj = item;
+        if (typeof obj.api_type !== "string" || !VALID_API_TYPES.has(obj.api_type)) {
+            throw new Error(`Invalid endpoints JSON: element [${i}] has invalid api_type '${typeof obj.api_type === "string" ? obj.api_type : JSON.stringify(obj.api_type)}', must be one of: openai, openai-responses, anthropic`);
+        }
+        if (typeof obj.base_url !== "string" || obj.base_url.trim() === "") {
+            throw new Error(`Invalid endpoints JSON: element [${i}] has invalid base_url, must be a non-empty string`);
+        }
+    }
+    return parsed;
+}
+/** 将 endpoints 数组序列化为 JSON 文本（用于 DB 写入） */
+export function serializeEndpoints(endpoints) {
+    return JSON.stringify(endpoints);
+}
 export function getActiveProviders(db, apiType) {
     return db
         .prepare("SELECT * FROM providers WHERE api_type = ? AND is_active = 1")
@@ -38,8 +67,8 @@ export function getProviderById(db, id) {
 export function createProvider(db, provider) {
     const id = randomUUID();
     const now = new Date().toISOString();
-    db.prepare(`INSERT INTO providers (id, name, api_type, base_url, upstream_path, api_key, api_key_preview, models, is_active, max_concurrency, queue_timeout_ms, max_queue_size, adaptive_enabled, proxy_type, proxy_url, proxy_username, proxy_password, created_at, updated_at)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, provider.name, provider.api_type, provider.base_url, provider.upstream_path ?? null, provider.api_key, provider.api_key_preview ?? null, provider.models ?? "[]", provider.is_active ?? 1, provider.max_concurrency ?? PROVIDER_CONCURRENCY_DEFAULTS.max_concurrency, provider.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms, provider.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size, provider.adaptive_enabled ?? 0, provider.proxy_type ?? null, provider.proxy_url ?? null, provider.proxy_username ?? null, provider.proxy_password ?? null, now, now);
+    db.prepare(`INSERT INTO providers (id, name, api_type, base_url, upstream_path, api_key, api_key_preview, models, is_active, max_concurrency, queue_timeout_ms, max_queue_size, adaptive_enabled, proxy_type, proxy_url, proxy_username, proxy_password, endpoints, created_at, updated_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, provider.name, provider.api_type, provider.base_url, provider.upstream_path ?? null, provider.api_key, provider.api_key_preview ?? null, provider.models ?? "[]", provider.is_active ?? 1, provider.max_concurrency ?? PROVIDER_CONCURRENCY_DEFAULTS.max_concurrency, provider.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms, provider.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size, provider.adaptive_enabled ?? 0, provider.proxy_type ?? null, provider.proxy_url ?? null, provider.proxy_username ?? null, provider.proxy_password ?? null, provider.endpoints ?? null, now, now);
     return id;
 }
 export function updateProvider(db, id, fields) {

package/dist/index.js

@@ -408,6 +408,19 @@ export async function main() {
     const config = getConfig();
     // 全局兜底：防止未捕获异常导致进程崩溃
     process.on("uncaughtException", (err) => {
+        const code = err.code;
+        // EPIPE/ECONNRESET 是客户端断连后的正常网络错误，不影响服务稳定性
+        if (code === "EPIPE" || code === "ECONNRESET") {
+            try {
+                app.log.warn({ err }, "Client disconnected (EPIPE/ECONNRESET)");
+                /* eslint-disable taste/no-silent-catch -- app.log 可能已崩溃 */
+            }
+            catch {
+                console.warn("Client disconnected:", err.message);
+            }
+            /* eslint-enable taste/no-silent-catch */
+            return;
+        }
         try {
             app.log.fatal({ err }, "Uncaught exception");
             /* eslint-disable taste/no-silent-catch -- app.log 可能已崩溃，console 是最后手段 */