aicodeswitch 4.0.0 → 4.0.2

package/dist/server/proxy-server.js

@@ -2175,7 +2175,7 @@ class ProxyServer {
             }
         }
         if (!headers['content-type']) {
-            headers['content-type'] = 'application/json';
+            headers['content-type'] = 'application/json; charset=utf-8';
         }
         // 添加 content-length（对于有请求体的方法）
         if (requestBody && ['POST', 'PUT', 'PATCH'].includes(req.method.toUpperCase())) {
@@ -2260,11 +2260,14 @@ class ProxyServer {
     readStreamBody(stream) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                let data = '';
+                const chunks = [];
                 stream.on('data', (chunk) => {
-                    data += chunk.toString();
+                    chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+                });
+                stream.on('end', () => {
+                    const fullBuffer = Buffer.concat(chunks);
+                    resolve(fullBuffer.toString('utf8'));
                 });
-                stream.on('end', () => resolve(data));
                 stream.on('error', reject);
             });
         });
@@ -2286,7 +2289,8 @@ class ProxyServer {
         var _a, _b;
         if (type === 'claude-code') {
             // Claude Code 使用 metadata.user_id
-            return ((_b = (_a = request.body) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.user_id) || null;
+            const rawUserId = (_b = (_a = request.body) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.user_id;
+            return ProxyServer.extractSessionIdFromUserId(rawUserId);
         }
         else if (type === 'codex') {
             // Codex 使用 headers.session_id
@@ -2300,6 +2304,25 @@ class ProxyServer {
         }
         return null;
     }
+    /**
+     * 从 metadata.user_id 中提取 session ID
+     * 新版本格式: JSON 字符串 {"device_id":"...","account_uuid":"...","session_id":"..."}
+     * 旧版本格式: 纯字符串 session ID
+     */
+    static extractSessionIdFromUserId(rawUserId) {
+        if (!rawUserId || typeof rawUserId !== 'string')
+            return null;
+        try {
+            const parsed = JSON.parse(rawUserId);
+            if (parsed && typeof parsed === 'object' && parsed.session_id) {
+                return parsed.session_id;
+            }
+        }
+        catch (_a) {
+            // 不是 JSON，按旧版本纯字符串处理
+        }
+        return rawUserId;
+    }
     /**
      * 提取会话标题（默认方法）
      * 对于新会话，尝试从第一条消息的内容中提取标题
@@ -2307,44 +2330,75 @@ class ProxyServer {
      * 对于结构化内容（数组），从最后一个元素取值
      */
     defaultExtractSessionTitle(request, sessionId) {
-        var _a;
+        var _a, _b;
         const existingSession = this.dbManager.getSession(sessionId);
         if (existingSession) {
             // 已存在的会话，保持原有标题
             return existingSession.title;
         }
-        // 新会话，从消息内容提取标题
-        const messages = (_a = request.body) === null || _a === void 0 ? void 0 : _a.messages;
-        if (Array.isArray(messages) && messages.length > 0) {
-            // 查找第一条 user 消息
-            const firstUserMessage = messages.find((msg) => msg.role === 'user');
-            if (firstUserMessage) {
-                const content = firstUserMessage.content;
-                let rawText = '';
-                if (typeof content === 'string') {
-                    rawText = content;
-                }
-                else if (Array.isArray(content) && content.length > 0) {
-                    // 处理结构化内容（如图片+文本）
-                    // 从最后一个元素取值，通常最后的文本才是真正的用户输入
-                    const lastBlock = content[content.length - 1];
-                    if ((lastBlock === null || lastBlock === void 0 ? void 0 : lastBlock.type) === 'text' && (lastBlock === null || lastBlock === void 0 ? void 0 : lastBlock.text)) {
-                        rawText = lastBlock.text;
-                    }
-                    else {
-                        // 如果最后一个不是 text 类型，尝试找到第一个 text 类型作为备用
-                        const textBlock = content.find((block) => (block === null || block === void 0 ? void 0 : block.type) === 'text');
-                        if (textBlock === null || textBlock === void 0 ? void 0 : textBlock.text) {
-                            rawText = textBlock.text;
-                        }
+        // 1. Claude Code 格式：从 messages 数组提取
+        const rawText = this.extractTitleFromMessages((_a = request.body) === null || _a === void 0 ? void 0 : _a.messages)
+            || this.extractTitleFromInput((_b = request.body) === null || _b === void 0 ? void 0 : _b.input)
+            || null;
+        if (rawText) {
+            return this.formatSessionTitle(rawText);
+        }
+        return undefined;
+    }
+    /**
+     * 从 messages 数组提取标题（Claude Code / OpenAI Chat 格式）
+     */
+    extractTitleFromMessages(messages) {
+        if (!Array.isArray(messages) || messages.length === 0)
+            return null;
+        const firstUserMessage = messages.find((msg) => msg.role === 'user');
+        if (!firstUserMessage)
+            return null;
+        const content = firstUserMessage.content;
+        if (typeof content === 'string') {
+            return content;
+        }
+        else if (Array.isArray(content) && content.length > 0) {
+            const lastBlock = content[content.length - 1];
+            if ((lastBlock === null || lastBlock === void 0 ? void 0 : lastBlock.type) === 'text' && (lastBlock === null || lastBlock === void 0 ? void 0 : lastBlock.text)) {
+                return lastBlock.text;
+            }
+            const textBlock = content.find((block) => (block === null || block === void 0 ? void 0 : block.type) === 'text');
+            if (textBlock === null || textBlock === void 0 ? void 0 : textBlock.text)
+                return textBlock.text;
+        }
+        return null;
+    }
+    /**
+     * 从 input 数组提取标题（Codex Responses API 格式）
+     * 忽略 developer 消息和系统级内容（AGENTS.md、<tag> 包裹的内容），
+     * 使用最后一条有效的用户输入作为标题
+     */
+    extractTitleFromInput(input) {
+        if (!Array.isArray(input) || input.length === 0)
+            return null;
+        const userMessages = input.filter((item) => item.type === 'message' && item.role === 'user');
+        for (let i = userMessages.length - 1; i >= 0; i--) {
+            const msg = userMessages[i];
+            const content = msg.content;
+            if (!Array.isArray(content))
+                continue;
+            // 拼接所有 input_text，排除 AGENTS.md 和 <tag> 包裹的内容
+            const textParts = [];
+            for (const block of content) {
+                if (block.type === 'input_text' && typeof block.text === 'string') {
+                    const text = block.text.trim();
+                    if (text.startsWith('# AGENTS.md') || text.startsWith('<environment_context>') || /^<\w+>/.test(text)) {
+                        continue;
                     }
+                    textParts.push(text);
                 }
-                if (rawText) {
-                    return this.formatSessionTitle(rawText);
-                }
+            }
+            if (textParts.length > 0) {
+                return textParts.join(' ');
             }
         }
-        return undefined;
+        return null;
     }
     /**
      * 格式化会话标题
@@ -2617,7 +2671,7 @@ class ProxyServer {
         // Claude：responseData 可能是 usage 对象本身，也可能包含 usage 字段
         if (this.isClaudeSource(sourceType) || this.isClaudeChatSource(sourceType)) {
             // 如果 responseData 直接包含 input_tokens/output_tokens，说明它本身就是 usage 对象
-            if (typeof responseData.input_tokens === 'number' || typeof responseData.output_tokens === 'number') {
+            if (typeof (responseData === null || responseData === void 0 ? void 0 : responseData.input_tokens) === 'number' || typeof (responseData === null || responseData === void 0 ? void 0 : responseData.output_tokens) === 'number') {
                 return (0, transformers_1.extractTokenUsageFromClaudeUsage)(responseData);
             }
             // 否则尝试从 usage 字段提取
@@ -2627,24 +2681,27 @@ class ProxyServer {
         if (!usage)
             return undefined;
         // OpenAI 使用 prompt_tokens 和 completion_tokens
-        if (typeof usage.prompt_tokens === 'number' || typeof usage.completion_tokens === 'number') {
+        if (typeof (usage === null || usage === void 0 ? void 0 : usage.prompt_tokens) === 'number' || typeof (usage === null || usage === void 0 ? void 0 : usage.completion_tokens) === 'number') {
             return (0, transformers_1.extractTokenUsageFromOpenAIUsage)(usage);
         }
         // Claude 使用 input_tokens 和 output_tokens
-        if (typeof usage.input_tokens === 'number' || typeof usage.output_tokens === 'number') {
+        if (typeof (usage === null || usage === void 0 ? void 0 : usage.input_tokens) === 'number' || typeof (usage === null || usage === void 0 ? void 0 : usage.output_tokens) === 'number') {
             return (0, transformers_1.extractTokenUsageFromClaudeUsage)(usage);
         }
         return undefined;
     }
     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, _f, _g;
             res.locals.skipLog = true;
             const startTime = Date.now();
             const rawSourceType = service.sourceType || 'openai-chat';
             // 标准化 sourceType，将旧类型转换为新类型（向下兼容）
             const sourceType = (0, type_migration_1.normalizeSourceType)(rawSourceType);
             const targetType = route.targetType;
+            const sessionId = this.defaultExtractSessionId(req, targetType) || '-';
+            const vendor = this.dbManager.getVendorByServiceId(service.id);
+            console.log(`\x1b[32m[Request Start]\x1b[0m client=${targetType}, session=${sessionId}, rule=${rule.id}(${rule.contentType}), vendor=${(vendor === null || vendor === void 0 ? void 0 : vendor.name) || '-'}, service=${service.name}, model=${rule.targetModel || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.model) || '-'}`);
             const failoverEnabled = (options === null || options === void 0 ? void 0 : options.failoverEnabled) === true;
             const forwardedToServiceName = options === null || options === void 0 ? void 0 : options.forwardedToServiceName;
             const useOriginalConfig = (options === null || options === void 0 ? void 0 : options.useOriginalConfig) === true;
@@ -2783,15 +2840,22 @@ class ProxyServer {
                 var _a, _b;
                 if (logged)
                     return;
+                const isError = statusCode >= 400;
+                if (isError) {
+                    console.log(`\x1b[31m[Request Error]\x1b[0m client=${targetType}, session=${sessionId}, rule=${rule.id}(${rule.contentType}), vendor=${(vendor === null || vendor === void 0 ? void 0 : vendor.name) || '-'}, service=${service.name}, status=${statusCode}, time=${Date.now() - startTime}ms${error ? `, error=${error}` : ''}`);
+                }
+                else {
+                    console.log(`\x1b[33m[Request End]\x1b[0m client=${targetType}, session=${sessionId}, rule=${rule.id}(${rule.contentType}), vendor=${(vendor === null || vendor === void 0 ? void 0 : vendor.name) || '-'}, service=${service.name}, status=${statusCode}, time=${Date.now() - startTime}ms`);
+                }
                 // 检查是否启用日志记录（默认启用）
                 const enableLogging = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging) !== false; // 默认为 true
                 if (!enableLogging) {
                     return;
                 }
                 logged = true;
-                // 获取供应商信息
+                // 供应商信息已在函数顶部获取
                 const vendors = this.dbManager.getVendors();
-                const vendor = vendors.find(v => v.id === service.vendorId);
+                const vendorForLog = vendors.find(v => v.id === service.vendorId);
                 // 从请求体中提取模型信息
                 const requestModel = (_b = req.body) === null || _b === void 0 ? void 0 : _b.model;
                 const tagsForLog = this.buildRelayTags(relayedForLog, useOriginalConfig);
@@ -2817,7 +2881,7 @@ class ProxyServer {
                     targetServiceName: service.name,
                     targetModel: rule.targetModel || requestModel,
                     vendorId: service.vendorId,
-                    vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
+                    vendorName: vendorForLog === null || vendorForLog === void 0 ? void 0 : vendorForLog.name,
                     requestModel,
                     tags: tagsForLog,
                     responseHeaders: responseHeadersForLog,
@@ -2827,8 +2891,7 @@ class ProxyServer {
                     downstreamResponseBody: downstreamResponseBodyForLog !== null && downstreamResponseBodyForLog !== void 0 ? downstreamResponseBodyForLog : responseBodyForLog,
                 });
                 // Session 索引逻辑
-                const sessionId = this.defaultExtractSessionId(req, targetType);
-                if (sessionId) {
+                if (sessionId && sessionId !== '-') {
                     // 正确计算当前请求的tokens：优先使用totalTokens，否则使用input+output
                     const totalTokens = (usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.totalTokens) ||
                         (((usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.inputTokens) || 0) + ((usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.outputTokens) || 0));
@@ -2841,7 +2904,7 @@ class ProxyServer {
                         firstRequestAt: startTime,
                         lastRequestAt: Date.now(),
                         vendorId: service.vendorId,
-                        vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
+                        vendorName: vendorForLog === null || vendorForLog === void 0 ? void 0 : vendorForLog.name,
                         serviceId: service.id,
                         serviceName: service.name,
                         model: requestModel || rule.targetModel,
@@ -2859,10 +2922,10 @@ class ProxyServer {
                         ((usageForLog.inputTokens || 0) + (usageForLog.outputTokens || 0));
                     if (totalTokens > 0) {
                         this.dbManager.incrementRuleTokenUsage(rule.id, totalTokens);
-                        // 获取更新后的规则数据并广播
+                        // 获取更新后的规则数据并更新状态
                         const updatedRule = this.dbManager.getRule(rule.id);
                         if (updatedRule) {
-                            rules_status_service_1.rulesStatusBroadcaster.broadcastUsageUpdate(rule.id, updatedRule.totalTokensUsed || 0, updatedRule.totalRequestsUsed || 0);
+                            rules_status_service_1.rulesStatusBroadcaster.updateRuleUsage(rule.id, updatedRule.totalTokensUsed || 0, updatedRule.totalRequestsUsed || 0);
                         }
                     }
                 }
@@ -2875,10 +2938,10 @@ class ProxyServer {
                         this.dbManager.incrementRuleRequestCount(rule.id, 1);
                         // 更新频率限制跟踪
                         this.recordRequest(rule.id);
-                        // 获取更新后的规则数据并广播
+                        // 获取更新后的规则数据并更新状态
                         const updatedRule = this.dbManager.getRule(rule.id);
                         if (updatedRule) {
-                            rules_status_service_1.rulesStatusBroadcaster.broadcastUsageUpdate(rule.id, updatedRule.totalTokensUsed || 0, updatedRule.totalRequestsUsed || 0);
+                            rules_status_service_1.rulesStatusBroadcaster.updateRuleUsage(rule.id, updatedRule.totalTokensUsed || 0, updatedRule.totalRequestsUsed || 0);
                         }
                     }
                     // 定期清理过期缓存
@@ -2974,7 +3037,7 @@ class ProxyServer {
                     totalTokens: inputTokens,
                 };
                 responseHeadersForLog = {
-                    'content-type': 'application/json',
+                    'content-type': 'application/json; charset=utf-8',
                 };
                 responseBodyForLog = JSON.stringify(localTokenResponse);
                 streamChunksForLog = undefined;
@@ -3003,7 +3066,7 @@ class ProxyServer {
             try {
                 // 使用统一的请求转换方法
                 const transformedRequestBody = this.transformRequestToUpstream(targetType, sourceType, requestBody, rule.targetModel);
-                requestBody = (_a = transformedRequestBody !== null && transformedRequestBody !== void 0 ? transformedRequestBody : requestBody) !== null && _a !== void 0 ? _a : {};
+                requestBody = (_b = transformedRequestBody !== null && transformedRequestBody !== void 0 ? transformedRequestBody : requestBody) !== null && _b !== void 0 ? _b : {};
                 // 应用 max_output_tokens 限制
                 requestBody = this.applyMaxOutputTokensLimit(requestBody, service);
                 if (this.shouldDefaultStreamingForClaudeBridge(req, targetType, sourceType, requestBody)
@@ -3099,7 +3162,7 @@ class ProxyServer {
                     let errorResponseData = response.data;
                     if (streamRequested && response.data && typeof response.data.on === 'function') {
                         const raw = yield this.readStreamBody(response.data);
-                        errorResponseData = (_b = this.safeJsonParse(raw)) !== null && _b !== void 0 ? _b : raw;
+                        errorResponseData = (_c = this.safeJsonParse(raw)) !== null && _c !== void 0 ? _c : raw;
                     }
                     responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
                     yield handleUpstreamHttpError(response.status, errorResponseData, responseHeaders, contentType);
@@ -3110,7 +3173,7 @@ class ProxyServer {
                     // 统一走默认流式链路（transformSSEToTool + 统一断连保护），避免历史分支行为不一致
                     const useLegacySpecialSSEBranches = false;
                     if (useLegacySpecialSSEBranches && targetType === 'claude-code' && this.isOpenAIType(sourceType)) {
-                        res.setHeader('Content-Type', 'text/event-stream');
+                        res.setHeader('Content-Type', 'text/event-stream; charset=utf-8');
                         res.setHeader('Cache-Control', 'no-cache');
                         res.setHeader('Connection', 'keep-alive');
                         const parser = new streaming_1.SSEParserTransform();
@@ -3217,7 +3280,7 @@ class ProxyServer {
                         return;
                     }
                     if (useLegacySpecialSSEBranches && targetType === 'codex' && this.isClaudeSource(sourceType)) {
-                        res.setHeader('Content-Type', 'text/event-stream');
+                        res.setHeader('Content-Type', 'text/event-stream; charset=utf-8');
                         res.setHeader('Cache-Control', 'no-cache');
                         res.setHeader('Connection', 'keep-alive');
                         const parser = new streaming_1.SSEParserTransform();
@@ -3319,7 +3382,7 @@ class ProxyServer {
                     }
                     // Gemini / Gemini Chat -> Claude Code 流式转换
                     if (useLegacySpecialSSEBranches && targetType === 'claude-code' && (this.isGeminiSource(sourceType) || this.isGeminiChatSource(sourceType))) {
-                        res.setHeader('Content-Type', 'text/event-stream');
+                        res.setHeader('Content-Type', 'text/event-stream; charset=utf-8');
                         res.setHeader('Cache-Control', 'no-cache');
                         res.setHeader('Connection', 'keep-alive');
                         const parser = new streaming_1.SSEParserTransform();
@@ -3331,9 +3394,9 @@ class ProxyServer {
                             const usage = converter.getUsage();
                             if (usage) {
                                 usageForLog = {
-                                    inputTokens: usage.input_tokens,
-                                    outputTokens: usage.output_tokens,
-                                    cacheReadInputTokens: usage.cache_read_input_tokens,
+                                    inputTokens: (usage === null || usage === void 0 ? void 0 : usage.input_tokens) || 0,
+                                    outputTokens: (usage === null || usage === void 0 ? void 0 : usage.output_tokens) || 0,
+                                    cacheReadInputTokens: (usage === null || usage === void 0 ? void 0 : usage.cache_read_input_tokens) || 0,
                                 };
                             }
                             else {
@@ -3415,7 +3478,7 @@ class ProxyServer {
                     }
                     // Gemini / Gemini Chat -> Codex 流式转换
                     if (useLegacySpecialSSEBranches && targetType === 'codex' && (this.isGeminiSource(sourceType) || this.isGeminiChatSource(sourceType))) {
-                        res.setHeader('Content-Type', 'text/event-stream');
+                        res.setHeader('Content-Type', 'text/event-stream; charset=utf-8');
                         res.setHeader('Cache-Control', 'no-cache');
                         res.setHeader('Connection', 'keep-alive');
                         const parser = new streaming_1.SSEParserTransform();
@@ -3620,7 +3683,7 @@ class ProxyServer {
                 let responseData = response.data;
                 if (streamRequested && response.data && typeof response.data.on === 'function' && !isEventStream) {
                     const raw = yield this.readStreamBody(response.data);
-                    responseData = (_c = this.safeJsonParse(raw)) !== null && _c !== void 0 ? _c : raw;
+                    responseData = (_d = this.safeJsonParse(raw)) !== null && _d !== void 0 ? _d : raw;
                 }
                 // 收集响应头
                 responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
@@ -3662,7 +3725,7 @@ class ProxyServer {
                 console.error('Proxy error:', error);
                 // 检测是否是 timeout 错误
                 const isTimeout = error.code === 'ECONNABORTED' ||
-                    ((_d = error.message) === null || _d === void 0 ? void 0 : _d.toLowerCase().includes('timeout')) ||
+                    ((_e = error.message) === null || _e === void 0 ? void 0 : _e.toLowerCase().includes('timeout')) ||
                     (error.errno && error.errno === 'ETIMEDOUT');
                 const baseErrorMessage = isTimeout
                     ? 'Request timeout - the upstream API took too long to respond'
@@ -3687,10 +3750,10 @@ 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 || ((_f = req.body) === null || _f === void 0 ? void 0 : _f.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: (_g = req.body) === null || _g === void 0 ? void 0 : _g.model,
                     upstreamRequest: upstreamRequestForLog,
                     responseTime: Date.now() - startTime,
                 });
@@ -3714,7 +3777,7 @@ class ProxyServer {
                     };
                     if (streamRequested) {
                         // 流式请求：使用 SSE 格式
-                        res.setHeader('Content-Type', 'text/event-stream');
+                        res.setHeader('Content-Type', 'text/event-stream; charset=utf-8');
                         res.setHeader('Cache-Control', 'no-cache');
                         res.setHeader('Connection', 'keep-alive');
                         res.status(200);