aicodeswitch 1.6.2 → 1.7.0

package/CLAUDE.md

@@ -92,14 +92,13 @@ aicos version            # Show current version information
 #### 2. Proxy Server - `server/proxy-server.ts`
 - **Route Matching**: Finds active route based on target type (claude-code/codex)
 - **Rule Matching**: Determines content type from request (image-understanding/thinking/long-context/background/default)
-- **Request Transformation**: Converts between different API formats (Claude ↔ OpenAI ↔ OpenAI Responses)
+- **Request Transformation**: Converts between different API formats (Claude ↔ OpenAI Chat)
 - **Streaming**: Handles SSE (Server-Sent Events) streaming responses with real-time transformation
 - **Logging**: Tracks requests, responses, and errors
 
 #### 3. Transformers - `server/transformers/`
 - **streaming.ts**: SSE parsing/serialization and event transformation
 - **claude-openai.ts**: Claude ↔ OpenAI Chat format conversion
-- **openai-responses.ts**: OpenAI Responses format conversion
 - **chunk-collector.ts**: Collects streaming chunks for logging
 
 #### 4. Database - `server/database.ts`

package/README.md

@@ -199,6 +199,10 @@ PORT=4567
 *   [indb](https://github.com/tangshuang/indb): 网页端轻量kv数据库操作库
 *   [Formast](https://github.com/tangshuang/formast): 复杂业务场景下的企业级JSON驱动表单框架
 
+## 关联资源
+
+*   [Claude Code 深度教程](https://claudecode.tangshuang.net): 100%免费的Claude Code入门到精通教程
+
 ## 支持我
 
 ![](public/donate-to-me.png)

package/dist/server/proxy-server.js

@@ -18,7 +18,6 @@ const stream_1 = require("stream");
 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) {
@@ -34,6 +33,8 @@ class ProxyServer {
             writable: true,
             value: void 0
         });
+        // 以下字段用于缓存备份（将来可能用于性能优化）
+        // 实际使用时，所有配置都从数据库实时读取
         Object.defineProperty(this, "routes", {
             enumerable: true,
             configurable: true,
@@ -161,7 +162,7 @@ class ProxyServer {
                     if (!rule) {
                         return res.status(404).json({ error: 'No matching rule found' });
                     }
-                    const service = this.services.get(rule.targetServiceId);
+                    const service = this.getServiceById(rule.targetServiceId);
                     if (!service) {
                         return res.status(500).json({ error: 'Target service not configured' });
                     }
@@ -176,7 +177,7 @@ class ProxyServer {
                 // 尝试每个规则,直到成功或全部失败
                 let lastError = null;
                 for (const rule of allRules) {
-                    const service = this.services.get(rule.targetServiceId);
+                    const service = this.getServiceById(rule.targetServiceId);
                     if (!service)
                         continue;
                     // 检查黑名单
@@ -283,7 +284,7 @@ class ProxyServer {
                     if (!rule) {
                         return res.status(404).json({ error: 'No matching rule found' });
                     }
-                    const service = this.services.get(rule.targetServiceId);
+                    const service = this.getServiceById(rule.targetServiceId);
                     if (!service) {
                         return res.status(500).json({ error: 'Target service not configured' });
                     }
@@ -298,7 +299,7 @@ class ProxyServer {
                 // 尝试每个规则,直到成功或全部失败
                 let lastError = null;
                 for (const rule of allRules) {
-                    const service = this.services.get(rule.targetServiceId);
+                    const service = this.getServiceById(rule.targetServiceId);
                     if (!service)
                         continue;
                     // 检查黑名单
@@ -381,18 +382,45 @@ class ProxyServer {
             }
         });
     }
+    /**
+     * 从数据库实时获取所有活跃路由
+     * @returns 活跃路由列表
+     */
+    getActiveRoutes() {
+        return this.dbManager.getRoutes().filter(route => route.isActive);
+    }
+    /**
+     * 从数据库实时获取指定路由的规则
+     * @param routeId 路由ID
+     * @returns 规则列表（按 sortOrder 降序排序）
+     */
+    getRulesByRouteId(routeId) {
+        const routeRules = this.dbManager.getRules(routeId);
+        return routeRules.sort((a, b) => (b.sortOrder || 0) - (a.sortOrder || 0));
+    }
     findMatchingRoute(_req) {
         // Find active route based on targetType - for now, return the first active route
         // This can be extended later based on specific routing logic
-        return this.routes.find(route => route.isActive);
+        const activeRoutes = this.getActiveRoutes();
+        return activeRoutes.find(route => route.isActive);
     }
     findRouteByTargetType(targetType) {
-        return this.routes.find(route => route.targetType === targetType && route.isActive);
+        const activeRoutes = this.getActiveRoutes();
+        return activeRoutes.find(route => route.targetType === targetType && route.isActive);
+    }
+    /**
+     * 从数据库实时获取服务配置
+     * @param serviceId 服务ID
+     * @returns 服务配置，如果不存在则返回 undefined
+     */
+    getServiceById(serviceId) {
+        const allServices = this.dbManager.getAPIServices();
+        return allServices.find(service => service.id === serviceId);
     }
     findMatchingRule(routeId, req) {
         return __awaiter(this, void 0, void 0, function* () {
-            const rules = this.rules.get(routeId);
-            if (!rules)
+            const rules = this.getRulesByRouteId(routeId);
+            if (!rules || rules.length === 0)
                 return undefined;
             const body = req.body;
             const requestModel = body === null || body === void 0 ? void 0 : body.model;
@@ -432,8 +460,8 @@ class ProxyServer {
         });
     }
     getAllMatchingRules(routeId, req) {
-        const rules = this.rules.get(routeId);
-        if (!rules)
+        const rules = this.getRulesByRouteId(routeId);
+        if (!rules || rules.length === 0)
             return [];
         const body = req.body;
         const requestModel = body === null || body === void 0 ? void 0 : body.model;
@@ -693,13 +721,10 @@ class ProxyServer {
         return length;
     }
     isClaudeSource(sourceType) {
-        return sourceType === 'claude-chat' || sourceType === 'claude-code';
+        return sourceType === 'claude-chat';
     }
     isOpenAIChatSource(sourceType) {
-        return sourceType === 'openai-chat' || sourceType === 'openai-code' || sourceType === 'deepseek-chat';
-    }
-    isOpenAIResponsesSource(sourceType) {
-        return sourceType === 'openai-responses';
+        return sourceType === 'openai-chat' || sourceType === 'deepseek-chat';
     }
     applyModelOverride(body, rule) {
         // 如果 targetModel 为空或不存在,保留原始 model(透传)
@@ -803,9 +828,6 @@ class ProxyServer {
     extractTokenUsage(usage) {
         if (!usage)
             return undefined;
-        if (typeof usage.input_tokens === 'number' && typeof usage.output_tokens === 'number' && usage.prompt_tokens === undefined) {
-            return (0, openai_responses_1.extractTokenUsageFromOpenAIResponsesUsage)(usage);
-        }
         if (typeof usage.prompt_tokens === 'number' || typeof usage.completion_tokens === 'number') {
             return (0, claude_openai_1.extractTokenUsageFromOpenAIUsage)(usage);
         }
@@ -833,25 +855,17 @@ class ProxyServer {
                 // Claude → OpenAI Chat: /v1/messages → /v1/chat/completions
                 return originalPath.replace(/\/v1\/messages\b/, '/v1/chat/completions');
             }
-            else if (this.isOpenAIResponsesSource(targetSourceType)) {
-                // Claude → OpenAI Responses: /v1/messages → /v1/responses/completions
-                return originalPath.replace(/\/v1\/messages\b/, '/v1/responses/completions');
-            }
         }
         // Codex 发起的请求
         if (sourceTool === 'codex') {
-            // Codex 默认使用 OpenAI Responses API 格式
-            if (this.isOpenAIResponsesSource(targetSourceType)) {
-                // OpenAI Responses → OpenAI Responses: 直接透传路径
+            // Codex 默认使用 OpenAI Chat API 格式
+            if (this.isOpenAIChatSource(targetSourceType)) {
+                // OpenAI Chat → OpenAI Chat: 直接透传路径
                 return originalPath;
             }
-            else if (this.isOpenAIChatSource(targetSourceType)) {
-                // OpenAI Responses → OpenAI Chat: /v1/responses/completions → /v1/chat/completions
-                return originalPath.replace(/\/v1\/responses\/completions\b/, '/v1/chat/completions');
-            }
             else if (this.isClaudeSource(targetSourceType)) {
-                // OpenAI Responses → Claude: /v1/responses/completions → /v1/messages
-                return originalPath.replace(/\/v1\/responses\/completions\b/, '/v1/messages');
+                // OpenAI Chat → Claude: /v1/chat/completions → /v1/messages
+                return originalPath.replace(/\/v1\/chat\/completions\b/, '/v1/messages');
             }
         }
         // 默认:直接返回原始路径
@@ -915,9 +929,6 @@ class ProxyServer {
                     else if (this.isOpenAIChatSource(sourceType)) {
                         requestBody = (0, claude_openai_1.transformClaudeRequestToOpenAIChat)(requestBody, rule.targetModel);
                     }
-                    else if (this.isOpenAIResponsesSource(sourceType)) {
-                        requestBody = (0, openai_responses_1.transformClaudeRequestToOpenAIResponses)(requestBody, rule.targetModel);
-                    }
                     else {
                         res.status(400).json({ error: 'Unsupported source type for Claude Code.' });
                         yield finalizeLog(400, 'Unsupported source type for Claude Code');
@@ -925,17 +936,14 @@ class ProxyServer {
                     }
                 }
                 else if (targetType === 'codex') {
-                    if (this.isOpenAIResponsesSource(sourceType)) {
+                    if (this.isOpenAIChatSource(sourceType)) {
                         requestBody = this.applyModelOverride(requestBody, rule);
                     }
-                    else if (this.isOpenAIChatSource(sourceType)) {
-                        requestBody = (0, openai_responses_1.transformOpenAIResponsesRequestToOpenAIChat)(requestBody, rule.targetModel);
-                    }
                     else if (this.isClaudeSource(sourceType)) {
-                        requestBody = (0, openai_responses_1.transformOpenAIResponsesRequestToClaude)(requestBody, rule.targetModel);
+                        requestBody = (0, claude_openai_1.transformClaudeRequestToOpenAIChat)(requestBody, rule.targetModel);
                     }
                     else {
-                        res.status(400).json({ error: 'Codex requires an OpenAI Responses compatible source.' });
+                        res.status(400).json({ error: 'Unsupported source type for Codex.' });
                         yield finalizeLog(400, 'Unsupported source type for Codex');
                         return;
                     }
@@ -955,7 +963,7 @@ class ProxyServer {
                     method: req.method,
                     url: `${service.apiUrl}${mappedPath}`,
                     headers: this.buildUpstreamHeaders(req, service, sourceType, streamRequested),
-                    timeout: service.timeout || 30000,
+                    timeout: service.timeout || 3000000, // 默认300秒
                     validateStatus: () => true,
                     responseType: streamRequested ? 'stream' : 'json',
                 };
@@ -1009,50 +1017,19 @@ class ProxyServer {
                         });
                         return;
                     }
-                    if (targetType === 'claude-code' && this.isOpenAIResponsesSource(sourceType)) {
-                        res.setHeader('Content-Type', 'text/event-stream');
-                        res.setHeader('Cache-Control', 'no-cache');
-                        res.setHeader('Connection', 'keep-alive');
-                        const parser = new streaming_1.SSEParserTransform();
-                        const eventCollector = new chunk_collector_1.SSEEventCollectorTransform();
-                        const converter = new streaming_1.OpenAIResponsesToClaudeEventTransform({ model: requestBody === null || requestBody === void 0 ? void 0 : requestBody.model });
-                        const serializer = new streaming_1.SSESerializerTransform();
-                        responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
-                        res.on('finish', () => {
-                            const usage = converter.getUsage();
-                            if (usage) {
-                                usageForLog = (0, claude_openai_1.extractTokenUsageFromClaudeUsage)(usage);
-                            }
-                            else {
-                                // 尝试从event collector中提取usage
-                                const extractedUsage = eventCollector.extractUsage();
-                                if (extractedUsage) {
-                                    usageForLog = this.extractTokenUsage(extractedUsage);
-                                }
-                            }
-                            streamChunksForLog = eventCollector.getChunks();
-                            void finalizeLog(res.statusCode);
-                        });
-                        (0, stream_1.pipeline)(response.data, parser, eventCollector, converter, serializer, res, (error) => {
-                            if (error) {
-                                void finalizeLog(500, error.message);
-                            }
-                        });
-                        return;
-                    }
                     if (targetType === 'codex' && this.isClaudeSource(sourceType)) {
                         res.setHeader('Content-Type', 'text/event-stream');
                         res.setHeader('Cache-Control', 'no-cache');
                         res.setHeader('Connection', 'keep-alive');
                         const parser = new streaming_1.SSEParserTransform();
                         const eventCollector = new chunk_collector_1.SSEEventCollectorTransform();
-                        const converter = new streaming_1.ClaudeToOpenAIResponsesEventTransform({ model: requestBody === null || requestBody === void 0 ? void 0 : requestBody.model });
+                        const converter = new streaming_1.ClaudeToOpenAIChatEventTransform({ model: requestBody === null || requestBody === void 0 ? void 0 : requestBody.model });
                         const serializer = new streaming_1.SSESerializerTransform();
                         responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
                         res.on('finish', () => {
                             const usage = converter.getUsage();
                             if (usage) {
-                                usageForLog = (0, claude_openai_1.extractTokenUsageFromClaudeUsage)(usage);
+                                usageForLog = (0, claude_openai_1.extractTokenUsageFromOpenAIUsage)(usage);
                             }
                             else {
                                 // 尝试从event collector中提取usage
@@ -1071,38 +1048,6 @@ class ProxyServer {
                         });
                         return;
                     }
-                    if (targetType === 'codex' && this.isOpenAIChatSource(sourceType)) {
-                        res.setHeader('Content-Type', 'text/event-stream');
-                        res.setHeader('Cache-Control', 'no-cache');
-                        res.setHeader('Connection', 'keep-alive');
-                        const parser = new streaming_1.SSEParserTransform();
-                        const eventCollector = new chunk_collector_1.SSEEventCollectorTransform();
-                        const toClaude = new streaming_1.OpenAIToClaudeEventTransform({ model: requestBody === null || requestBody === void 0 ? void 0 : requestBody.model });
-                        const toResponses = new streaming_1.ClaudeToOpenAIResponsesEventTransform({ model: requestBody === null || requestBody === void 0 ? void 0 : requestBody.model });
-                        const serializer = new streaming_1.SSESerializerTransform();
-                        responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
-                        res.on('finish', () => {
-                            const usage = toResponses.getUsage();
-                            if (usage) {
-                                usageForLog = (0, claude_openai_1.extractTokenUsageFromClaudeUsage)(usage);
-                            }
-                            else {
-                                // 尝试从event collector中提取usage
-                                const extractedUsage = eventCollector.extractUsage();
-                                if (extractedUsage) {
-                                    usageForLog = this.extractTokenUsage(extractedUsage);
-                                }
-                            }
-                            streamChunksForLog = eventCollector.getChunks();
-                            void finalizeLog(res.statusCode);
-                        });
-                        (0, stream_1.pipeline)(response.data, parser, eventCollector, toClaude, toResponses, serializer, res, (error) => {
-                            if (error) {
-                                void finalizeLog(500, error.message);
-                            }
-                        });
-                        return;
-                    }
                     // 默认stream处理(无转换)
                     const eventCollector = new chunk_collector_1.SSEEventCollectorTransform();
                     responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
@@ -1151,25 +1096,12 @@ class ProxyServer {
                     responseBodyForLog = JSON.stringify(converted);
                     res.status(response.status).json(converted);
                 }
-                else if (targetType === 'claude-code' && this.isOpenAIResponsesSource(sourceType)) {
-                    const converted = (0, openai_responses_1.transformOpenAIResponsesToClaude)(responseData);
-                    usageForLog = (0, openai_responses_1.extractTokenUsageFromOpenAIResponsesUsage)(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
-                    responseBodyForLog = JSON.stringify(converted);
-                    res.status(response.status).json(converted);
-                }
                 else if (targetType === 'codex' && this.isClaudeSource(sourceType)) {
-                    const converted = (0, openai_responses_1.transformClaudeResponseToOpenAIResponses)(responseData);
+                    const converted = (0, claude_openai_1.transformClaudeResponseToOpenAIChat)(responseData);
                     usageForLog = (0, claude_openai_1.extractTokenUsageFromClaudeUsage)(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
                     responseBodyForLog = JSON.stringify(converted);
                     res.status(response.status).json(converted);
                 }
-                else if (targetType === 'codex' && this.isOpenAIChatSource(sourceType)) {
-                    const claudeResponse = (0, claude_openai_1.transformOpenAIChatResponseToClaude)(responseData);
-                    const converted = (0, openai_responses_1.transformClaudeResponseToOpenAIResponses)(claudeResponse);
-                    usageForLog = (0, claude_openai_1.extractTokenUsageFromOpenAIUsage)(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
-                    responseBodyForLog = JSON.stringify(converted);
-                    res.status(response.status).json(converted);
-                }
                 else {
                     usageForLog = this.extractTokenUsage(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
                     // 记录原始响应体
@@ -1211,21 +1143,30 @@ class ProxyServer {
     }
     reloadRoutes() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.routes = this.dbManager.getRoutes().filter((g) => g.isActive);
-            this.rules.clear();
-            for (const route of this.routes) {
-                const routeRules = this.dbManager.getRules(route.id);
-                // 确保按 sortOrder 降序排序（database 层已处理，但再次确保）
-                const sortedRules = [...routeRules].sort((a, b) => (b.sortOrder || 0) - (a.sortOrder || 0));
-                this.rules.set(route.id, sortedRules);
-            }
-            // Load all services
+            // 注意：所有配置（路由、规则、服务）现在都在每次请求时实时从数据库读取
+            // 这个方法主要用于初始化和日志记录
+            // 修改数据库后无需调用此方法，配置会自动生效
+            const allRoutes = this.dbManager.getRoutes();
+            const activeRoutes = allRoutes.filter((g) => g.isActive);
             const allServices = this.dbManager.getAPIServices();
-            this.services.clear();
-            allServices.forEach((service) => {
-                this.services.set(service.id, service);
-            });
-            console.log(`Loaded ${this.routes.length} active routes and ${this.services.size} services`);
+            // 保留缓存以备将来可能的性能优化需求
+            this.routes = activeRoutes;
+            if (this.rules) {
+                this.rules.clear();
+                for (const route of activeRoutes) {
+                    const routeRules = this.dbManager.getRules(route.id);
+                    const sortedRules = [...routeRules].sort((a, b) => (b.sortOrder || 0) - (a.sortOrder || 0));
+                    this.rules.set(route.id, sortedRules);
+                }
+            }
+            if (this.services) {
+                const services = this.services;
+                services.clear();
+                allServices.forEach((service) => {
+                    services.set(service.id, service);
+                });
+            }
+            console.log(`Initialized with ${activeRoutes.length} active routes and ${allServices.length} services (all config read from database in real-time)`);
         });
     }
     updateConfig(config) {

package/dist/server/transformers/claude-openai.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractTokenUsageFromClaudeUsage = exports.extractTokenUsageFromOpenAIUsage = exports.transformOpenAIChatResponseToClaude = exports.transformClaudeRequestToOpenAIChat = exports.mapStopReason = exports.convertOpenAIUsageToClaude = void 0;
+exports.extractTokenUsageFromClaudeUsage = exports.extractTokenUsageFromOpenAIUsage = exports.transformClaudeResponseToOpenAIChat = exports.transformOpenAIChatResponseToClaude = exports.transformClaudeRequestToOpenAIChat = exports.mapStopReason = exports.convertOpenAIUsageToClaude = void 0;
 const toTextContent = (content) => {
     if (typeof content === 'string')
         return content;
@@ -203,6 +203,51 @@ const transformOpenAIChatResponseToClaude = (body) => {
     };
 };
 exports.transformOpenAIChatResponseToClaude = transformOpenAIChatResponseToClaude;
+const transformClaudeResponseToOpenAIChat = (body) => {
+    const content = (body === null || body === void 0 ? void 0 : body.content) || [];
+    let textContent = '';
+    const toolCalls = [];
+    for (const block of content) {
+        if ((block === null || block === void 0 ? void 0 : block.type) === 'text') {
+            textContent += block.text || '';
+        }
+        else if ((block === null || block === void 0 ? void 0 : block.type) === 'tool_use') {
+            toolCalls.push({
+                id: block.id,
+                type: 'function',
+                function: {
+                    name: block.name || 'tool',
+                    arguments: typeof block.input === 'string' ? block.input : JSON.stringify(block.input || {}),
+                },
+            });
+        }
+    }
+    const message = {
+        role: 'assistant',
+        content: textContent,
+    };
+    if (toolCalls.length > 0) {
+        message.tool_calls = toolCalls;
+    }
+    const usage = (body === null || body === void 0 ? void 0 : body.usage) ? {
+        prompt_tokens: body.usage.input_tokens || 0,
+        completion_tokens: body.usage.output_tokens || 0,
+        total_tokens: (body.usage.input_tokens || 0) + (body.usage.output_tokens || 0),
+    } : undefined;
+    return {
+        id: body === null || body === void 0 ? void 0 : body.id,
+        object: 'chat.completion',
+        created: Math.floor(Date.now() / 1000),
+        model: body === null || body === void 0 ? void 0 : body.model,
+        choices: [{
+                index: 0,
+                message,
+                finish_reason: (0, exports.mapStopReason)(body === null || body === void 0 ? void 0 : body.stop_reason),
+            }],
+        usage,
+    };
+};
+exports.transformClaudeResponseToOpenAIChat = transformClaudeResponseToOpenAIChat;
 const extractTokenUsageFromOpenAIUsage = (usage) => {
     if (!usage)
         return undefined;