aicodeswitch 1.0.0 → 1.1.1

package/dist/server/proxy-server.js

@@ -19,6 +19,7 @@ const streaming_1 = require("./transformers/streaming");
 const chunk_collector_1 = require("./transformers/chunk-collector");
 const claude_openai_1 = require("./transformers/claude-openai");
 const openai_responses_1 = require("./transformers/openai-responses");
+const SUPPORTED_TARGETS = ['claude-code', 'codex'];
 class ProxyServer {
     constructor(dbManager, app) {
         Object.defineProperty(this, "app", {
@@ -68,39 +69,71 @@ class ProxyServer {
             // Capture client info
             const clientIp = ((_a = req.headers['x-forwarded-for']) === null || _a === void 0 ? void 0 : _a.split(',')[0]) || req.socket.remoteAddress || '';
             const userAgent = req.headers['user-agent'] || '';
-            this.dbManager.addAccessLog({
+            const startTime = Date.now();
+            const originalSend = res.send.bind(res);
+            const originalJson = res.json.bind(res);
+            const accessLog = this.dbManager.addAccessLog({
                 timestamp: Date.now(),
                 method: req.method,
                 path: req.path,
-                headers: this.normalizeHeaders(req.headers),
-                body: req.body ? JSON.stringify(req.body) : undefined,
                 clientIp,
                 userAgent,
-                statusCode: res.statusCode,
             });
-            next();
-        }));
-        // Logging middleware (legacy RequestLog)
-        this.app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
-            const startTime = Date.now();
-            const originalSend = res.send.bind(res);
             res.send = (data) => {
-                var _a;
                 res.send = originalSend;
-                if (!res.locals.skipLog && ((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging)) {
-                    const responseTime = Date.now() - startTime;
-                    this.dbManager.addLog({
-                        timestamp: Date.now(),
-                        method: req.method,
-                        path: req.path,
-                        headers: this.normalizeHeaders(req.headers),
-                        body: req.body ? JSON.stringify(req.body) : undefined,
+                const responseTime = Date.now() - startTime;
+                accessLog.then((accessLogId) => {
+                    this.dbManager.updateAccessLog(accessLogId, {
+                        responseTime,
                         statusCode: res.statusCode,
+                    });
+                });
+                return originalSend(data);
+            };
+            res.json = (data) => {
+                res.json = originalJson;
+                const responseTime = Date.now() - startTime;
+                accessLog.then((accessLogId) => {
+                    this.dbManager.updateAccessLog(accessLogId, {
                         responseTime,
+                        statusCode: res.statusCode,
                     });
-                }
-                return res.send(data);
+                });
+                return originalJson(data);
             };
+            res.on('error', (err) => {
+                accessLog.then((accessLogId) => {
+                    this.dbManager.updateAccessLog(accessLogId, {
+                        statusCode: res.statusCode,
+                        error: err.message,
+                    });
+                });
+            });
+            next();
+        }));
+        // Logging middleware (legacy RequestLog)
+        this.app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
+            const startTime = Date.now();
+            const originalSend = res.send.bind(res);
+            if (SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+                res.send = (data) => {
+                    var _a;
+                    res.send = originalSend;
+                    if (!res.locals.skipLog && ((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+                        const responseTime = Date.now() - startTime;
+                        this.dbManager.addLog({
+                            timestamp: Date.now(),
+                            method: req.method,
+                            path: req.path,
+                            headers: this.normalizeHeaders(req.headers),
+                            body: req.body ? JSON.stringify(req.body) : undefined,
+                            statusCode: res.statusCode,
+                            responseTime,
+                        });
+                    }
+                    return res.send(data);
+                };
+            }
             next();
         }));
         // Fixed route handlers
@@ -109,8 +142,12 @@ class ProxyServer {
         this.app.use('/codex/', this.createFixedRouteHandler('codex'));
         this.app.use('/codex', this.createFixedRouteHandler('codex'));
         // Dynamic proxy middleware
-        this.app.use((req, res, _next) => __awaiter(this, void 0, void 0, function* () {
+        this.app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
             var _a;
+            // 根路径 / 不应该被代理中间件处理，应该传递给静态文件服务
+            if (req.path === '/') {
+                return next();
+            }
             try {
                 const route = this.findMatchingRoute(req);
                 if (!route) {
@@ -128,7 +165,7 @@ class ProxyServer {
             }
             catch (error) {
                 console.error('Proxy error:', error);
-                if ((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging) {
+                if (((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                     yield this.dbManager.addLog({
                         timestamp: Date.now(),
                         method: req.method,
@@ -181,7 +218,7 @@ class ProxyServer {
             }
             catch (error) {
                 console.error(`Fixed route error for ${targetType}:`, error);
-                if ((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging) {
+                if (((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                     yield this.dbManager.addLog({
                         timestamp: Date.now(),
                         method: req.method,
@@ -218,9 +255,29 @@ class ProxyServer {
         const rules = this.rules.get(routeId);
         if (!rules)
             return undefined;
-        // Determine content type from request
+        const body = req.body;
+        const requestModel = body === null || body === void 0 ? void 0 : body.model;
+        // 1. 首先查找 model-mapping 类型的规则，按 sortOrder 降序匹配
+        if (requestModel) {
+            const modelMappingRules = rules.filter(rule => rule.contentType === 'model-mapping' &&
+                rule.replacedModel &&
+                requestModel.includes(rule.replacedModel));
+            if (modelMappingRules.length > 0) {
+                return modelMappingRules[0]; // 已按 sortOrder 降序排序
+            }
+        }
+        // 2. 查找其他内容类型的规则
         const contentType = this.determineContentType(req);
-        return rules.find(rule => rule.contentType === contentType) || rules.find(rule => rule.contentType === 'default');
+        const contentTypeRules = rules.filter(rule => rule.contentType === contentType);
+        if (contentTypeRules.length > 0) {
+            return contentTypeRules[0]; // 已按 sortOrder 降序排序
+        }
+        // 3. 最后返回 default 规则
+        const defaultRules = rules.filter(rule => rule.contentType === 'default');
+        if (defaultRules.length > 0) {
+            return defaultRules[0]; // 已按 sortOrder 降序排序
+        }
+        return undefined;
     }
     determineContentType(req) {
         const body = req.body;
@@ -596,10 +653,15 @@ class ProxyServer {
             let responseBodyForLog;
             let streamChunksForLog;
             const finalizeLog = (statusCode, error) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
+                var _a, _b;
                 if (logged || !((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging))
                     return;
                 logged = true;
+                // 获取供应商信息
+                const vendors = this.dbManager.getVendors();
+                const vendor = vendors.find(v => v.id === service.vendorId);
+                // 从请求体中提取模型信息
+                const requestModel = (_b = req.body) === null || _b === void 0 ? void 0 : _b.model;
                 yield this.dbManager.addLog({
                     timestamp: Date.now(),
                     method: req.method,
@@ -616,6 +678,9 @@ class ProxyServer {
                     targetServiceId: service.id,
                     targetServiceName: service.name,
                     targetModel: rule.targetModel,
+                    vendorId: service.vendorId,
+                    vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
+                    requestModel,
                     responseHeaders: responseHeadersForLog,
                     responseBody: responseBodyForLog,
                     streamChunks: streamChunksForLog,
@@ -780,6 +845,26 @@ class ProxyServer {
                     this.copyResponseHeaders(responseHeaders, res);
                     res.on('finish', () => {
                         streamChunksForLog = chunkCollector.getChunks();
+                        // 尝试从stream chunks中解析usage信息
+                        if (streamChunksForLog && streamChunksForLog.length > 0) {
+                            // 合并所有chunks并尝试解析usage
+                            const allChunks = streamChunksForLog.join('');
+                            // 查找包含usage信息的部分
+                            const usageMatch = allChunks.match(/usage[\s\S]*?\{[\s\S]*?\}/);
+                            if (usageMatch) {
+                                try {
+                                    // 尝试解析usage信息
+                                    const usageStr = usageMatch[0];
+                                    const jsonStart = usageStr.indexOf('{');
+                                    const jsonEnd = usageStr.lastIndexOf('}') + 1;
+                                    const usageJson = JSON.parse(usageStr.slice(jsonStart, jsonEnd));
+                                    usageForLog = this.extractTokenUsage(usageJson);
+                                }
+                                catch (e) {
+                                    console.error('Failed to parse usage from stream chunks:', e);
+                                }
+                            }
+                        }
                         void finalizeLog(res.statusCode);
                     });
                     (0, stream_1.pipeline)(response.data, chunkCollector, res, (error) => {
@@ -853,7 +938,25 @@ class ProxyServer {
             catch (error) {
                 console.error('Proxy error:', error);
                 yield finalizeLog(500, error.message);
-                res.status(500).json({ error: error.message });
+                // 根据请求类型返回适当格式的错误响应
+                const streamRequested = this.isStreamRequested(req, req.body || {});
+                if (streamRequested && route.targetType === 'claude-code') {
+                    // 对于 Claude Code 的流式请求，返回 SSE 格式的错误响应
+                    res.setHeader('Content-Type', 'text/event-stream');
+                    res.setHeader('Cache-Control', 'no-cache');
+                    res.setHeader('Connection', 'keep-alive');
+                    res.status(500);
+                    // 发送错误事件
+                    const errorEvent = `event: error\ndata: ${JSON.stringify({ error: error.message })}\n\n`;
+                    const doneEvent = `data: [DONE]\n\n`;
+                    res.write(errorEvent);
+                    res.write(doneEvent);
+                    res.end();
+                }
+                else {
+                    // 对于非流式请求，返回 JSON 格式的错误响应
+                    res.status(500).json({ error: error.message });
+                }
             }
         });
     }
@@ -863,7 +966,9 @@ class ProxyServer {
             this.rules.clear();
             for (const route of this.routes) {
                 const routeRules = this.dbManager.getRules(route.id);
-                this.rules.set(route.id, routeRules);
+                // 确保按 sortOrder 降序排序（database 层已处理，但再次确保）
+                const sortedRules = [...routeRules].sort((a, b) => (b.sortOrder || 0) - (a.sortOrder || 0));
+                this.rules.set(route.id, sortedRules);
             }
             // Load all services
             const allServices = this.dbManager.getAPIServices();