aicodeswitch 3.0.18 → 3.0.20

package/README.md

@@ -30,6 +30,10 @@ AI Code Switch 是帮助你在本地管理 AI 编程工具接入大模型的工
 * 自定义API Key，支持B/S架构，让aicodeswitch成为在线服务，提供给团队使用
 * 数据完全本地，自主可控
 
+## 桌面客户端
+
+[进入下载](https://github.com/tangshuang/aicodeswitch/releases)
+
 ## 命令行工具
 
 ### 安装

package/dist/server/proxy-server.js

@@ -111,6 +111,14 @@ class ProxyServer {
             writable: true,
             value: 60000
         }); // 去重缓存1分钟过期
+        // 频率限制跟踪：用于跟踪每个规则在当前时间窗口内的请求数
+        // key: ruleId, value: { count: number, windowStart: number }
+        Object.defineProperty(this, "frequencyLimitTracker", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
         this.dbManager = dbManager;
         this.config = dbManager.getConfig();
         this.app = app;
@@ -150,7 +158,8 @@ class ProxyServer {
                 }
                 // 尝试每个规则,直到成功或全部失败
                 let lastError = null;
-                for (const rule of allRules) {
+                for (let index = 0; index < allRules.length; index++) {
+                    const rule = allRules[index];
                     const service = this.getServiceById(rule.targetServiceId);
                     if (!service)
                         continue;
@@ -161,8 +170,12 @@ class ProxyServer {
                         continue;
                     }
                     try {
+                        const nextServiceName = yield this.findNextAvailableServiceName(allRules, index + 1, route.id);
                         // 尝试代理请求
-                        yield this.proxyRequest(req, res, route, rule, service);
+                        yield this.proxyRequest(req, res, route, rule, service, {
+                            failoverEnabled: true,
+                            forwardedToServiceName: nextServiceName,
+                        });
                         return; // 成功,直接返回
                     }
                     catch (error) {
@@ -331,7 +344,8 @@ class ProxyServer {
                 }
                 // 尝试每个规则,直到成功或全部失败
                 let lastError = null;
-                for (const rule of allRules) {
+                for (let index = 0; index < allRules.length; index++) {
+                    const rule = allRules[index];
                     const service = this.getServiceById(rule.targetServiceId);
                     if (!service)
                         continue;
@@ -342,8 +356,12 @@ class ProxyServer {
                         continue;
                     }
                     try {
+                        const nextServiceName = yield this.findNextAvailableServiceName(allRules, index + 1, route.id);
                         // 尝试代理请求
-                        yield this.proxyRequest(req, res, route, rule, service);
+                        yield this.proxyRequest(req, res, route, rule, service, {
+                            failoverEnabled: true,
+                            forwardedToServiceName: nextServiceName,
+                        });
                         return; // 成功,直接返回
                     }
                     catch (error) {
@@ -466,6 +484,9 @@ class ProxyServer {
         const routeRules = this.dbManager.getRules(routeId);
         return routeRules.sort((a, b) => (b.sortOrder || 0) - (a.sortOrder || 0));
     }
+    getRuleById(ruleId) {
+        return this.dbManager.getRule(ruleId);
+    }
     findMatchingRoute(req) {
         // 根据请求路径确定目标类型
         let targetType;
@@ -486,6 +507,36 @@ class ProxyServer {
         const activeRoutes = this.getActiveRoutes();
         return activeRoutes.find(route => route.targetType === targetType && route.isActive);
     }
+    findNextAvailableServiceName(allRules, startIndex, routeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (let index = startIndex; index < allRules.length; index++) {
+                const rule = allRules[index];
+                const service = this.getServiceById(rule.targetServiceId);
+                if (!service)
+                    continue;
+                const isBlacklisted = yield this.dbManager.isServiceBlacklisted(service.id, routeId, rule.contentType);
+                if (isBlacklisted)
+                    continue;
+                return service.name;
+            }
+            return undefined;
+        });
+    }
+    buildFailoverHint(forwardedToServiceName) {
+        if (!forwardedToServiceName) {
+            return '';
+        }
+        return `；已自动转发给 ${forwardedToServiceName} 服务继续处理`;
+    }
+    createFailoverError(message, statusCode, originalError) {
+        const failoverError = new Error(message);
+        failoverError.isFailoverCandidate = true;
+        failoverError.response = { status: statusCode };
+        if (originalError === null || originalError === void 0 ? void 0 : originalError.stack) {
+            failoverError.stack = originalError.stack;
+        }
+        return failoverError;
+    }
     /**
      * 计算请求内容的哈希值，用于去重
      * 基于请求的关键字段生成唯一标识
@@ -564,6 +615,32 @@ class ProxyServer {
             }
         }
     }
+    /**
+     * 清理过期的频率限制跟踪数据
+     */
+    cleanExpiredFrequencyTrackers() {
+        const now = Date.now();
+        const rules = this.dbManager.getRules();
+        const activeRuleIds = new Set(rules.map((r) => r.id));
+        for (const ruleId of this.frequencyLimitTracker.keys()) {
+            // 清理不再存在的规则的跟踪数据
+            if (!activeRuleIds.has(ruleId)) {
+                this.frequencyLimitTracker.delete(ruleId);
+                continue;
+            }
+            // 清理超时的跟踪数据
+            const tracker = this.frequencyLimitTracker.get(ruleId);
+            if (tracker) {
+                const rule = this.dbManager.getRule(ruleId);
+                if (rule && rule.frequencyWindow) {
+                    const windowMs = rule.frequencyWindow * 1000;
+                    if (now - tracker.windowStart > windowMs * 2) {
+                        this.frequencyLimitTracker.delete(ruleId);
+                    }
+                }
+            }
+        }
+    }
     /**
      * 根据GLM计费逻辑判断请求是否应该计费
      * 核心规则：
@@ -678,6 +755,10 @@ class ProxyServer {
                     if (rule.requestCountLimit && rule.totalRequestsUsed !== undefined && rule.totalRequestsUsed >= rule.requestCountLimit) {
                         continue; // 跳过超限规则
                     }
+                    // 检查频率限制
+                    if (this.isFrequencyLimitExceeded(rule)) {
+                        continue; // 跳过达到频率限制的规则
+                    }
                     return rule;
                 }
             }
@@ -701,6 +782,10 @@ class ProxyServer {
                 if (rule.requestCountLimit && rule.totalRequestsUsed !== undefined && rule.totalRequestsUsed >= rule.requestCountLimit) {
                     continue; // 跳过超限规则
                 }
+                // 检查频率限制
+                if (this.isFrequencyLimitExceeded(rule)) {
+                    continue; // 跳过达到频率限制的规则
+                }
                 return rule;
             }
             // 3. 最后返回 default 规则
@@ -722,6 +807,10 @@ class ProxyServer {
                 if (rule.requestCountLimit && rule.totalRequestsUsed !== undefined && rule.totalRequestsUsed >= rule.requestCountLimit) {
                     continue; // 跳过超限规则
                 }
+                // 检查频率限制
+                if (this.isFrequencyLimitExceeded(rule)) {
+                    continue; // 跳过达到频率限制的规则
+                }
                 return rule;
             }
             return undefined;
@@ -772,6 +861,10 @@ class ProxyServer {
                         return false;
                     }
                 }
+                // 检查频率限制
+                if (this.isFrequencyLimitExceeded(rule)) {
+                    return false;
+                }
                 return true; // 没有设置限制的规则总是可用
             });
             // 如果过滤后还有规则，使用过滤后的结果
@@ -781,6 +874,88 @@ class ProxyServer {
         }
         return candidates;
     }
+    /**
+     * 检查规则是否达到频率限制
+     * 如果设置了频率限制(frequencyLimit)和时间窗口(frequencyWindow)，
+     * 则跟踪当前时间窗口内的请求数，超过限制则返回true
+     *
+     * frequencyWindow = 0 表示"同一时刻"，计数器不会按时间窗口重置，
+     * 持续累积直到达到 frequencyLimit
+     */
+    isFrequencyLimitExceeded(rule) {
+        if (!rule.frequencyLimit || rule.frequencyLimit <= 0) {
+            return false; // 没有设置频率限制，不超过限制
+        }
+        // frequencyWindow 为 0 表示"同一时刻"（不按时间窗口重置）
+        const isZeroWindow = rule.frequencyWindow === 0;
+        if (!rule.frequencyWindow && !isZeroWindow) {
+            return false; // 没有设置时间窗口且不是0，不启用频率限制
+        }
+        const now = Date.now();
+        const existing = this.frequencyLimitTracker.get(rule.id);
+        if (!existing) {
+            // 首次请求，创建新记录
+            this.frequencyLimitTracker.set(rule.id, { count: 1, windowStart: now });
+            return false;
+        }
+        // 如果是零窗口（同一时刻），不按时间重置，持续累积
+        if (!isZeroWindow && rule.frequencyWindow) {
+            const windowMs = rule.frequencyWindow * 1000;
+            // 检查是否在当前时间窗口内
+            if (now - existing.windowStart >= windowMs) {
+                // 时间窗口已过，重置计数器
+                this.frequencyLimitTracker.set(rule.id, { count: 1, windowStart: now });
+                return false;
+            }
+        }
+        // 检查是否超过限制
+        if (existing.count >= rule.frequencyLimit) {
+            return true; // 超过频率限制
+        }
+        // 增加计数
+        existing.count++;
+        this.frequencyLimitTracker.set(rule.id, existing);
+        return false;
+    }
+    /**
+     * 记录请求（增加频率计数）
+     * 在请求成功处理后调用
+     * frequencyWindow = 0 表示"同一时刻"，计数器不会按时间窗口重置
+     */
+    recordRequest(ruleId) {
+        const rule = this.getRuleById(ruleId);
+        if (!rule || !rule.frequencyLimit || rule.frequencyLimit <= 0) {
+            return;
+        }
+        // frequencyWindow 为 0 表示"同一时刻"
+        const isZeroWindow = rule.frequencyWindow === 0;
+        // 如果 frequencyWindow 既不是 0 也不是正数，则不记录
+        if (!isZeroWindow && !rule.frequencyWindow) {
+            return;
+        }
+        const now = Date.now();
+        const existing = this.frequencyLimitTracker.get(ruleId);
+        if (!existing) {
+            this.frequencyLimitTracker.set(ruleId, { count: 1, windowStart: now });
+        }
+        else if (isZeroWindow) {
+            // 零窗口：持续累积，不按时间重置
+            existing.count++;
+            this.frequencyLimitTracker.set(ruleId, existing);
+        }
+        else if (rule.frequencyWindow) {
+            const windowMs = rule.frequencyWindow * 1000;
+            if (now - existing.windowStart < windowMs) {
+                // 在时间窗口内，增加计数
+                existing.count++;
+                this.frequencyLimitTracker.set(ruleId, existing);
+            }
+            else {
+                // 时间窗口已过，重置
+                this.frequencyLimitTracker.set(ruleId, { count: 1, windowStart: now });
+            }
+        }
+    }
     determineContentType(req) {
         const body = req.body;
         if (!body)
@@ -1424,13 +1599,15 @@ class ProxyServer {
         // 默认:直接返回原始路径
         return originalPath;
     }
-    proxyRequest(req, res, route, rule, service) {
+    proxyRequest(req, res, route, rule, service, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             res.locals.skipLog = true;
             const startTime = Date.now();
             const sourceType = (service.sourceType || 'openai-chat');
             const targetType = route.targetType;
+            const failoverEnabled = (options === null || options === void 0 ? void 0 : options.failoverEnabled) === true;
+            const forwardedToServiceName = options === null || options === void 0 ? void 0 : options.forwardedToServiceName;
             let requestBody = req.body || {};
             let usageForLog;
             let logged = false;
@@ -1595,7 +1772,7 @@ class ProxyServer {
                     targetType,
                     targetServiceId: service.id,
                     targetServiceName: service.name,
-                    targetModel: rule.targetModel,
+                    targetModel: rule.targetModel || requestModel,
                     vendorId: service.vendorId,
                     vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
                     requestModel,
@@ -1643,6 +1820,8 @@ class ProxyServer {
                     // 检查是否是重复请求（如网络重试）
                     if (!this.isRequestProcessed(requestHash)) {
                         this.dbManager.incrementRuleRequestCount(rule.id, 1);
+                        // 更新频率限制跟踪
+                        this.recordRequest(rule.id);
                         // 获取更新后的规则数据并广播
                         const updatedRule = this.dbManager.getRule(rule.id);
                         if (updatedRule) {
@@ -1654,12 +1833,72 @@ class ProxyServer {
                         this.cleanExpiredDedupeCache();
                     }
                 }
+                // 定期清理过期的频率限制跟踪数据
+                if (Math.random() < 0.01) { // 1%概率清理
+                    this.cleanExpiredFrequencyTrackers();
+                }
                 // 清理 MCP 临时图片文件
                 if (tempImageFiles.length > 0) {
                     (0, mcp_image_handler_1.cleanupTempImages)(tempImageFiles);
                     console.log(`[MCP] Cleaned up ${tempImageFiles.length} temporary image files`);
                 }
             });
+            const handleUpstreamHttpError = (statusCode, responseData, responseHeaders, contentType) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                usageForLog = this.extractTokenUsage(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
+                responseBodyForLog = typeof responseData === 'string' ? responseData : JSON.stringify(responseData);
+                let errorDetail;
+                if (typeof (responseData === null || responseData === void 0 ? void 0 : responseData.error) === 'string') {
+                    errorDetail = responseData.error;
+                }
+                else if (typeof (responseData === null || responseData === void 0 ? void 0 : responseData.message) === 'string') {
+                    errorDetail = responseData.message;
+                }
+                else if (responseData === null || responseData === void 0 ? void 0 : responseData.error) {
+                    errorDetail = JSON.stringify(responseData.error);
+                }
+                else {
+                    errorDetail = JSON.stringify(responseData);
+                }
+                const failoverHint = failoverEnabled ? this.buildFailoverHint(forwardedToServiceName) : '';
+                const upstreamErrorMessage = `Upstream API returned ${statusCode}: ${errorDetail}${failoverHint}`;
+                const vendors = this.dbManager.getVendors();
+                const vendor = vendors.find(v => v.id === service.vendorId);
+                yield this.dbManager.addErrorLog({
+                    timestamp: Date.now(),
+                    method: req.method,
+                    path: req.path,
+                    statusCode,
+                    errorMessage: upstreamErrorMessage,
+                    errorStack: undefined,
+                    requestHeaders: this.normalizeHeaders(req.headers),
+                    requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                    responseHeaders: responseHeadersForLog,
+                    responseBody: responseBodyForLog,
+                    ruleId: rule.id,
+                    targetType,
+                    targetServiceId: service.id,
+                    targetServiceName: service.name,
+                    targetModel: rule.targetModel || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.model),
+                    vendorId: service.vendorId,
+                    vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
+                    requestModel: (_b = req.body) === null || _b === void 0 ? void 0 : _b.model,
+                    upstreamRequest: upstreamRequestForLog,
+                    responseTime: Date.now() - startTime,
+                });
+                if (failoverEnabled) {
+                    yield finalizeLog(statusCode, upstreamErrorMessage);
+                    throw this.createFailoverError(upstreamErrorMessage, statusCode);
+                }
+                this.copyResponseHeaders(responseHeaders, res);
+                if (contentType.includes('application/json')) {
+                    res.status(statusCode).json(responseData);
+                }
+                else {
+                    res.status(statusCode).send(responseData);
+                }
+                yield finalizeLog(res.statusCode);
+            });
             try {
                 if (targetType === 'claude-code') {
                     if (this.isClaudeSource(sourceType)) {
@@ -1781,6 +2020,17 @@ class ProxyServer {
                 const responseHeaders = response.headers || {};
                 const contentType = typeof responseHeaders['content-type'] === 'string' ? responseHeaders['content-type'] : '';
                 const isEventStream = streamRequested && contentType.includes('text/event-stream');
+                // 先处理 4xx/5xx：在故障切换模式下抛错，由上层继续切换下一服务
+                if (response.status >= 400) {
+                    let errorResponseData = response.data;
+                    if (streamRequested && response.data && typeof response.data.on === 'function') {
+                        const raw = yield this.readStreamBody(response.data);
+                        errorResponseData = (_a = this.safeJsonParse(raw)) !== null && _a !== void 0 ? _a : raw;
+                    }
+                    responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
+                    yield handleUpstreamHttpError(response.status, errorResponseData, responseHeaders, contentType);
+                    return;
+                }
                 if (isEventStream && response.data) {
                     res.status(response.status);
                     if (targetType === 'claude-code' && this.isOpenAIChatSource(sourceType)) {
@@ -1832,7 +2082,7 @@ class ProxyServer {
                             console.error('[Proxy] Response stream error:', err);
                         });
                         (0, stream_1.pipeline)(response.data, parser, eventCollector, converter, serializer, res, (error) => __awaiter(this, void 0, void 0, function* () {
-                            var _a;
+                            var _a, _b;
                             if (error) {
                                 console.error('[Proxy] Pipeline error for claude-code:', error);
                                 // 记录到错误日志 - 包含请求详情和实际转发信息
@@ -1855,10 +2105,10 @@ class ProxyServer {
                                         targetType,
                                         targetServiceId: service.id,
                                         targetServiceName: service.name,
-                                        targetModel: rule.targetModel,
+                                        targetModel: rule.targetModel || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.model),
                                         vendorId: service.vendorId,
                                         vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
-                                        requestModel: (_a = req.body) === null || _a === void 0 ? void 0 : _a.model,
+                                        requestModel: (_b = req.body) === null || _b === void 0 ? void 0 : _b.model,
                                         responseTime: Date.now() - startTime,
                                     });
                                 }
@@ -1934,7 +2184,7 @@ class ProxyServer {
                             console.error('[Proxy] Response stream error:', err);
                         });
                         (0, stream_1.pipeline)(response.data, parser, eventCollector, converter, serializer, res, (error) => __awaiter(this, void 0, void 0, function* () {
-                            var _a;
+                            var _a, _b;
                             if (error) {
                                 console.error('[Proxy] Pipeline error for codex:', error);
                                 // 记录到错误日志 - 包含请求详情和实际转发信息
@@ -1957,10 +2207,10 @@ class ProxyServer {
                                         targetType,
                                         targetServiceId: service.id,
                                         targetServiceName: service.name,
-                                        targetModel: rule.targetModel,
+                                        targetModel: rule.targetModel || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.model),
                                         vendorId: service.vendorId,
                                         vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
-                                        requestModel: (_a = req.body) === null || _a === void 0 ? void 0 : _a.model,
+                                        requestModel: (_b = req.body) === null || _b === void 0 ? void 0 : _b.model,
                                         responseTime: Date.now() - startTime,
                                     });
                                 }
@@ -2030,7 +2280,7 @@ class ProxyServer {
                             console.error('[Proxy] Response stream error:', err);
                         });
                         (0, stream_1.pipeline)(response.data, parser, eventCollector, converter, serializer, res, (error) => __awaiter(this, void 0, void 0, function* () {
-                            var _a;
+                            var _a, _b;
                             if (error) {
                                 console.error('[Proxy] Pipeline error for gemini->claude-code:', error);
                                 try {
@@ -2050,10 +2300,10 @@ class ProxyServer {
                                         targetType,
                                         targetServiceId: service.id,
                                         targetServiceName: service.name,
-                                        targetModel: rule.targetModel,
+                                        targetModel: rule.targetModel || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.model),
                                         vendorId: service.vendorId,
                                         vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
-                                        requestModel: (_a = req.body) === null || _a === void 0 ? void 0 : _a.model,
+                                        requestModel: (_b = req.body) === null || _b === void 0 ? void 0 : _b.model,
                                         responseTime: Date.now() - startTime,
                                     });
                                 }
@@ -2126,7 +2376,7 @@ class ProxyServer {
                             console.error('[Proxy] Response stream error:', err);
                         });
                         (0, stream_1.pipeline)(response.data, parser, eventCollector, converter, serializer, res, (error) => __awaiter(this, void 0, void 0, function* () {
-                            var _a;
+                            var _a, _b;
                             if (error) {
                                 console.error('[Proxy] Pipeline error for gemini->codex:', error);
                                 try {
@@ -2146,10 +2396,10 @@ class ProxyServer {
                                         targetType,
                                         targetServiceId: service.id,
                                         targetServiceName: service.name,
-                                        targetModel: rule.targetModel,
+                                        targetModel: rule.targetModel || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.model),
                                         vendorId: service.vendorId,
                                         vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
-                                        requestModel: (_a = req.body) === null || _a === void 0 ? void 0 : _a.model,
+                                        requestModel: (_b = req.body) === null || _b === void 0 ? void 0 : _b.model,
                                         responseTime: Date.now() - startTime,
                                     });
                                 }
@@ -2238,65 +2488,10 @@ class ProxyServer {
                 let responseData = response.data;
                 if (streamRequested && response.data && typeof response.data.on === 'function' && !isEventStream) {
                     const raw = yield this.readStreamBody(response.data);
-                    responseData = (_a = this.safeJsonParse(raw)) !== null && _a !== void 0 ? _a : raw;
+                    responseData = (_b = this.safeJsonParse(raw)) !== null && _b !== void 0 ? _b : raw;
                 }
                 // 收集响应头
                 responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
-                if (response.status >= 400) {
-                    usageForLog = this.extractTokenUsage(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
-                    // 记录错误响应体
-                    responseBodyForLog = typeof responseData === 'string' ? responseData : JSON.stringify(responseData);
-                    // 将 4xx/5xx 错误记录到错误日志
-                    // 确保 errorDetail 总是字符串类型
-                    let errorDetail;
-                    if (typeof (responseData === null || responseData === void 0 ? void 0 : responseData.error) === 'string') {
-                        errorDetail = responseData.error;
-                    }
-                    else if (typeof (responseData === null || responseData === void 0 ? void 0 : responseData.message) === 'string') {
-                        errorDetail = responseData.message;
-                    }
-                    else if (responseData === null || responseData === void 0 ? void 0 : responseData.error) {
-                        errorDetail = JSON.stringify(responseData.error);
-                    }
-                    else {
-                        errorDetail = JSON.stringify(responseData);
-                    }
-                    // 获取供应商信息
-                    const vendors = this.dbManager.getVendors();
-                    const vendor = vendors.find(v => v.id === service.vendorId);
-                    yield this.dbManager.addErrorLog({
-                        timestamp: Date.now(),
-                        method: req.method,
-                        path: req.path,
-                        statusCode: response.status,
-                        errorMessage: `Upstream API returned ${response.status}: ${errorDetail}`,
-                        errorStack: undefined,
-                        requestHeaders: this.normalizeHeaders(req.headers),
-                        requestBody: req.body ? JSON.stringify(req.body) : undefined,
-                        responseHeaders: responseHeadersForLog,
-                        responseBody: responseBodyForLog,
-                        // 添加请求详情和实际转发信息
-                        ruleId: rule.id,
-                        targetType,
-                        targetServiceId: service.id,
-                        targetServiceName: service.name,
-                        targetModel: rule.targetModel,
-                        vendorId: service.vendorId,
-                        vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
-                        requestModel: (_b = req.body) === null || _b === void 0 ? void 0 : _b.model,
-                        upstreamRequest: upstreamRequestForLog,
-                        responseTime: Date.now() - startTime,
-                    });
-                    this.copyResponseHeaders(responseHeaders, res);
-                    if (contentType.includes('application/json')) {
-                        res.status(response.status).json(responseData);
-                    }
-                    else {
-                        res.status(response.status).send(responseData);
-                    }
-                    yield finalizeLog(res.statusCode);
-                    return;
-                }
                 if (targetType === 'claude-code' && this.isOpenAIChatSource(sourceType)) {
                     const converted = (0, claude_openai_1.transformOpenAIChatResponseToClaude)(responseData);
                     usageForLog = (0, claude_openai_1.extractTokenUsageFromOpenAIUsage)(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
@@ -2338,14 +2533,19 @@ class ProxyServer {
                 yield finalizeLog(res.statusCode);
             }
             catch (error) {
+                if (failoverEnabled && (error === null || error === void 0 ? void 0 : error.isFailoverCandidate)) {
+                    throw error;
+                }
                 console.error('Proxy error:', error);
                 // 检测是否是 timeout 错误
                 const isTimeout = error.code === 'ECONNABORTED' ||
                     ((_c = error.message) === null || _c === void 0 ? void 0 : _c.toLowerCase().includes('timeout')) ||
                     (error.errno && error.errno === 'ETIMEDOUT');
-                const errorMessage = isTimeout
+                const baseErrorMessage = isTimeout
                     ? 'Request timeout - the upstream API took too long to respond'
                     : (error.message || 'Internal server error');
+                const failoverHint = failoverEnabled ? this.buildFailoverHint(forwardedToServiceName) : '';
+                const errorMessage = `${baseErrorMessage}${failoverHint}`;
                 // 将错误记录到错误日志 - 包含请求详情和实际转发信息
                 // 获取供应商信息
                 const vendors = this.dbManager.getVendors();
@@ -2364,14 +2564,17 @@ class ProxyServer {
                     targetType,
                     targetServiceId: service.id,
                     targetServiceName: service.name,
-                    targetModel: rule.targetModel,
+                    targetModel: rule.targetModel || ((_d = req.body) === null || _d === void 0 ? void 0 : _d.model),
                     vendorId: service.vendorId,
                     vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
-                    requestModel: (_d = req.body) === null || _d === void 0 ? void 0 : _d.model,
+                    requestModel: (_e = req.body) === null || _e === void 0 ? void 0 : _e.model,
                     upstreamRequest: upstreamRequestForLog,
                     responseTime: Date.now() - startTime,
                 });
                 yield finalizeLog(isTimeout ? 504 : 500, errorMessage);
+                if (failoverEnabled) {
+                    throw this.createFailoverError(errorMessage, isTimeout ? 504 : 500, error);
+                }
                 // 根据请求类型返回适当格式的错误响应
                 const streamRequested = this.isStreamRequested(req, req.body || {});
                 if (route.targetType === 'claude-code') {