llm-simple-router 0.9.15 → 0.9.16

package/dist/core/constants.d.ts

@@ -1,3 +1,4 @@
+export declare const HTTP_OK = 200;
 export declare const HTTP_BAD_REQUEST = 400;
 export declare const HTTP_CREATED = 201;
 export declare const HTTP_FORBIDDEN = 403;

package/dist/core/constants.js

@@ -1,5 +1,6 @@
 // src/core/constants.ts
 // HTTP 状态码常量 — 全局唯一来源
+export const HTTP_OK = 200;
 export const HTTP_BAD_REQUEST = 400;
 export const HTTP_CREATED = 201;
 export const HTTP_FORBIDDEN = 403;

package/dist/proxy/handler/openai.js

@@ -1,12 +1,10 @@
 import { randomUUID } from "crypto";
 import fp from "fastify-plugin";
-import { getActiveProviders, insertRequestLog } from "../../db/index.js";
-import { getSetting } from "../../db/settings.js";
-import { decrypt } from "../../utils/crypto.js";
-import { proxyGetRequest, createErrorFormatter } from "../proxy-core.js";
+import { getAllProviders, insertRequestLog } from "../../db/index.js";
+import { createErrorFormatter } from "../proxy-core.js";
 import { handleProxyRequest } from "./proxy-handler.js";
 import { createOrchestrator } from "../orchestration/orchestrator.js";
-import { HTTP_NOT_FOUND, HTTP_BAD_GATEWAY } from "../../core/constants.js";
+import { HTTP_OK, HTTP_BAD_GATEWAY, MS_PER_SECOND } from "../../core/constants.js";
 import { SERVICE_KEYS } from "../../core/container.js";
 const CHAT_COMPLETIONS_PATH = "/v1/chat/completions";
 const MODELS_PATH = "/v1/models";
@@ -55,54 +53,75 @@ const openaiProxyRaw = (app, opts, done) => {
     // 规范路径 + 兼容路径（不带 /v1 前缀）
     app.post(CHAT_COMPLETIONS_PATH, handleChatCompletions);
     app.post(CHAT_COMPLETIONS_COMPAT_PATH, handleChatCompletions);
+    const ANTHROPIC_DEFAULT_PAGE_SIZE = 20;
+    const ANTHROPIC_MAX_PAGE_SIZE = 1000;
     const handleModels = async (request, reply) => {
-        const startTime = Date.now();
-        const providers = getActiveProviders(db, "openai");
-        if (providers.length === 0) {
-            insertRequestLog(db, {
-                id: randomUUID(), api_type: "openai", model: null,
-                provider_id: null, status_code: HTTP_NOT_FOUND, latency_ms: Date.now() - startTime, is_stream: 0,
-                error_message: "No active OpenAI provider configured",
-                created_at: new Date().toISOString(),
-                client_request: JSON.stringify({ headers: request.headers }),
-                router_key_id: request.routerKey?.id ?? null,
-            });
-            return sendError(reply, {
-                statusCode: HTTP_NOT_FOUND,
-                body: { error: { message: "No active OpenAI provider configured", type: "invalid_request_error", code: "no_provider" } },
-            });
-        }
-        const provider = providers[0];
-        const apiKey = decrypt(provider.api_key, getSetting(db, "encryption_key"));
-        const cliHdrs = request.headers;
-        try {
-            const result = await proxyGetRequest(provider, apiKey, cliHdrs, MODELS_PATH);
-            insertRequestLog(db, {
-                id: randomUUID(), api_type: "openai", model: null,
-                provider_id: provider.id, status_code: result.statusCode, latency_ms: Date.now() - startTime, is_stream: 0,
-                error_message: null, created_at: new Date().toISOString(),
-                client_request: JSON.stringify({ headers: request.headers }),
-                router_key_id: request.routerKey?.id ?? null,
-            });
-            for (const [k, v] of Object.entries(result.headers))
-                reply.header(k, v);
-            return reply.code(result.statusCode).send(result.body);
+        // 聚合所有活跃 provider 的模型列表
+        const allProviders = getAllProviders(db).filter(p => p.is_active);
+        const modelMeta = new Map();
+        for (const p of allProviders) {
+            try {
+                const models = JSON.parse(p.models || '[]');
+                for (const m of models) {
+                    if (!modelMeta.has(m))
+                        modelMeta.set(m, { providerName: p.name, createdAt: p.created_at });
+                }
+            }
+            catch {
+                // providers.models 有 NOT NULL 约束默认 '[]'，此处防御开发期误配的非法 JSON
+                continue;
+            }
         }
-        catch (err) {
-            insertRequestLog(db, {
-                id: randomUUID(), api_type: "openai", model: null,
-                provider_id: provider.id, status_code: HTTP_BAD_GATEWAY, latency_ms: Date.now() - startTime, is_stream: 0,
-                error_message: err instanceof Error ? err.message : String(err),
-                created_at: new Date().toISOString(),
-                client_request: JSON.stringify({ headers: request.headers }),
-                router_key_id: request.routerKey?.id ?? null,
-            });
-            request.log.error({ err: err instanceof Error ? err.message : String(err) }, "Failed to reach OpenAI backend for /v1/models");
-            return sendError(reply, {
-                statusCode: HTTP_BAD_GATEWAY,
-                body: { error: { message: "Failed to reach backend service", type: "server_error", code: "upstream_error" } },
+        const sortedIds = [...modelMeta.keys()].sort();
+        // 根据请求头判断响应格式：Anthropic 客户端发送 anthropic-version 头
+        const isAnthropicFormat = !!request.headers['anthropic-version'];
+        if (isAnthropicFormat) {
+            // Anthropic 格式: { data: [...], has_more, first_id, last_id }
+            const query = request.query;
+            const limit = Math.min(Math.max(parseInt(query.limit || String(ANTHROPIC_DEFAULT_PAGE_SIZE), 10) || ANTHROPIC_DEFAULT_PAGE_SIZE, 1), ANTHROPIC_MAX_PAGE_SIZE);
+            let sliced;
+            let hasMore;
+            if (query.after_id) {
+                const idx = sortedIds.indexOf(query.after_id);
+                const start = idx !== -1 ? idx + 1 : 0;
+                sliced = sortedIds.slice(start, start + limit);
+                hasMore = start + limit < sortedIds.length;
+            }
+            else if (query.before_id) {
+                const endIdx = sortedIds.indexOf(query.before_id);
+                const end = endIdx !== -1 ? endIdx : sortedIds.length;
+                const start = Math.max(0, end - limit);
+                sliced = sortedIds.slice(start, end);
+                hasMore = start > 0;
+            }
+            else {
+                sliced = sortedIds.slice(0, limit);
+                hasMore = limit < sortedIds.length;
+            }
+            const data = sliced.map(id => ({
+                type: 'model',
+                id,
+                display_name: id,
+                created_at: modelMeta.get(id).createdAt,
+            }));
+            return reply.code(HTTP_OK).send({
+                data,
+                has_more: hasMore,
+                first_id: data.length > 0 ? data[0].id : null,
+                last_id: data.length > 0 ? data[data.length - 1].id : null,
             });
         }
+        // OpenAI 格式: { object: "list", data: [...] }
+        const data = sortedIds.map(id => ({
+            id,
+            object: 'model',
+            created: Math.floor(new Date(modelMeta.get(id).createdAt).getTime() / MS_PER_SECOND),
+            owned_by: modelMeta.get(id).providerName,
+        }));
+        return reply.code(HTTP_OK).send({
+            object: 'list',
+            data,
+        });
     };
     // 规范路径 + 兼容路径
     app.get(MODELS_PATH, handleModels);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-simple-router",
-  "version": "0.9.15",
+  "version": "0.9.16",
   "description": "LLM API proxy router with OpenAI/Anthropic support, model mapping, retry strategies, and admin dashboard",
   "license": "MIT",
   "author": "ZZzzswszzZZ",