aicodeswitch 3.0.19 → 3.0.20

package/dist/server/proxy-server.js

@@ -158,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;
@@ -169,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) {
@@ -339,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;
@@ -350,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) {
@@ -497,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;
+    }
     /**
      * 计算请求内容的哈希值，用于去重
      * 基于请求的关键字段生成唯一标识
@@ -1559,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, _e, _f;
+            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;
@@ -1801,6 +1843,62 @@ class ProxyServer {
                     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)) {
@@ -1922,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)) {
@@ -2379,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 || ((_b = req.body) === null || _b === void 0 ? void 0 : _b.model),
-                        vendorId: service.vendorId,
-                        vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
-                        requestModel: (_c = req.body) === null || _c === void 0 ? void 0 : _c.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);
@@ -2479,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' ||
-                    ((_d = error.message) === null || _d === void 0 ? void 0 : _d.toLowerCase().includes('timeout')) ||
+                    ((_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();
@@ -2505,14 +2564,17 @@ class ProxyServer {
                     targetType,
                     targetServiceId: service.id,
                     targetServiceName: service.name,
-                    targetModel: rule.targetModel || ((_e = req.body) === null || _e === void 0 ? void 0 : _e.model),
+                    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: (_f = req.body) === null || _f === void 0 ? void 0 : _f.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') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicodeswitch",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "description": "A tool to help you manage AI programming tools to access large language models locally. It allows your Claude Code, Codex and other tools to no longer be limited to official models.",
   "author": "tangshuang",
   "license": "GPL-3.0",