aicodeswitch 2.0.10 → 2.1.1

package/dist/server/proxy-server.js

@@ -51,6 +51,7 @@ const stream_1 = require("stream");
 const crypto_1 = __importDefault(require("crypto"));
 const streaming_1 = require("./transformers/streaming");
 const chunk_collector_1 = require("./transformers/chunk-collector");
+const rules_status_service_1 = require("./rules-status-service");
 const claude_openai_1 = require("./transformers/claude-openai");
 const SUPPORTED_TARGETS = ['claude-code', 'codex'];
 class ProxyServer {
@@ -114,7 +115,7 @@ class ProxyServer {
     initialize() {
         // Dynamic proxy middleware
         this.app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g;
             // 仅处理支持的目标路径
             if (!SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                 return next();
@@ -200,7 +201,9 @@ class ProxyServer {
                         error: (lastError === null || lastError === void 0 ? void 0 : lastError.message) || 'All services failed',
                     });
                 }
-                // 记录错误日志
+                // 确定目标类型
+                const targetType = req.path.startsWith('/claude-code/') ? 'claude-code' : 'codex';
+                // 记录错误日志 - 包含请求详情
                 yield this.dbManager.addErrorLog({
                     timestamp: Date.now(),
                     method: req.method,
@@ -210,6 +213,10 @@ class ProxyServer {
                     errorStack: lastError === null || lastError === void 0 ? void 0 : lastError.stack,
                     requestHeaders: this.normalizeHeaders(req.headers),
                     requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                    // 添加请求详情
+                    targetType,
+                    requestModel: (_e = req.body) === null || _e === void 0 ? void 0 : _e.model,
+                    responseTime: 0,
                 });
                 // 根据路径判断目标类型并返回适当的错误格式
                 const isClaudeCode = req.path.startsWith('/claude-code/');
@@ -232,7 +239,7 @@ class ProxyServer {
             }
             catch (error) {
                 console.error('Proxy error:', error);
-                if (((_e = this.config) === null || _e === void 0 ? void 0 : _e.enableLogging) !== false && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+                if (((_f = this.config) === null || _f === void 0 ? void 0 : _f.enableLogging) !== false && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                     yield this.dbManager.addLog({
                         timestamp: Date.now(),
                         method: req.method,
@@ -242,7 +249,8 @@ class ProxyServer {
                         error: error.message,
                     });
                 }
-                // Add error log
+                // Add error log - 包含请求详情
+                const targetType = req.path.startsWith('/claude-code/') ? 'claude-code' : 'codex';
                 yield this.dbManager.addErrorLog({
                     timestamp: Date.now(),
                     method: req.method,
@@ -252,6 +260,10 @@ class ProxyServer {
                     errorStack: error.stack,
                     requestHeaders: this.normalizeHeaders(req.headers),
                     requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                    // 添加请求详情
+                    targetType,
+                    requestModel: (_g = req.body) === null || _g === void 0 ? void 0 : _g.model,
+                    responseTime: 0,
                 });
                 // 根据路径判断目标类型并返回适当的错误格式
                 const isClaudeCode = req.path.startsWith('/claude-code/');
@@ -280,7 +292,7 @@ class ProxyServer {
     }
     createFixedRouteHandler(targetType) {
         return (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g;
             try {
                 // 检查API Key验证
                 if (this.config.apiKey) {
@@ -370,7 +382,7 @@ class ProxyServer {
                         error: (lastError === null || lastError === void 0 ? void 0 : lastError.message) || 'All services failed',
                     });
                 }
-                // 记录错误日志
+                // 记录错误日志 - 包含请求详情（使用函数参数 targetType）
                 yield this.dbManager.addErrorLog({
                     timestamp: Date.now(),
                     method: req.method,
@@ -380,6 +392,10 @@ class ProxyServer {
                     errorStack: lastError === null || lastError === void 0 ? void 0 : lastError.stack,
                     requestHeaders: this.normalizeHeaders(req.headers),
                     requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                    // 添加请求详情
+                    targetType,
+                    requestModel: (_e = req.body) === null || _e === void 0 ? void 0 : _e.model,
+                    responseTime: 0,
                 });
                 // 根据路径判断目标类型并返回适当的错误格式
                 const isClaudeCode = req.path.startsWith('/claude-code/');
@@ -402,7 +418,7 @@ class ProxyServer {
             }
             catch (error) {
                 console.error(`Fixed route error for ${targetType}:`, error);
-                if (((_e = this.config) === null || _e === void 0 ? void 0 : _e.enableLogging) !== false && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+                if (((_f = this.config) === null || _f === void 0 ? void 0 : _f.enableLogging) !== false && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                     yield this.dbManager.addLog({
                         timestamp: Date.now(),
                         method: req.method,
@@ -412,7 +428,7 @@ class ProxyServer {
                         error: error.message,
                     });
                 }
-                // Add error log
+                // Add error log - 包含请求详情（使用函数参数 targetType）
                 yield this.dbManager.addErrorLog({
                     timestamp: Date.now(),
                     method: req.method,
@@ -422,6 +438,10 @@ class ProxyServer {
                     errorStack: error.stack,
                     requestHeaders: this.normalizeHeaders(req.headers),
                     requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                    // 添加请求详情
+                    targetType,
+                    requestModel: (_g = req.body) === null || _g === void 0 ? void 0 : _g.model,
+                    responseTime: 0,
                 });
                 res.status(500).json({ error: error.message });
             }
@@ -762,6 +782,10 @@ class ProxyServer {
         const body = req.body;
         if (!body)
             return 'default';
+        // 检查是否为 count_tokens 请求（后台类型）
+        if (req.path.includes('/count_tokens')) {
+            return 'background';
+        }
         const explicitType = this.getExplicitContentType(req, body);
         if (explicitType) {
             return explicitType;
@@ -890,6 +914,17 @@ class ProxyServer {
     }
     hasBackgroundSignal(body) {
         var _a, _b, _c;
+        // 检测 count tokens 请求：messages 只有一条，role 为 "user"，content 为 "count"
+        const messages = body === null || body === void 0 ? void 0 : body.messages;
+        if (Array.isArray(messages) && messages.length === 1) {
+            const firstMessage = messages[0];
+            if ((firstMessage === null || firstMessage === void 0 ? void 0 : firstMessage.role) === 'user' &&
+                ((firstMessage === null || firstMessage === void 0 ? void 0 : firstMessage.content) === 'count' ||
+                    (typeof (firstMessage === null || firstMessage === void 0 ? void 0 : firstMessage.content) === 'string' && firstMessage.content.trim() === 'count'))) {
+                return true;
+            }
+        }
+        // 检测其他后台信号
         const candidates = [
             body === null || body === void 0 ? void 0 : body.background,
             (_a = body === null || body === void 0 ? void 0 : body.metadata) === null || _a === void 0 ? void 0 : _a.background,
@@ -1345,7 +1380,7 @@ class ProxyServer {
     }
     proxyRequest(req, res, route, rule, service) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c, _d;
             res.locals.skipLog = true;
             const startTime = Date.now();
             const sourceType = (service.sourceType || 'openai-chat');
@@ -1359,6 +1394,8 @@ class ProxyServer {
             let streamChunksForLog;
             let upstreamRequestForLog;
             let actuallyUsedProxy = false; // 标记是否实际使用了代理
+            // 标记规则正在使用
+            rules_status_service_1.rulesStatusBroadcaster.markRuleInUse(route.id, rule.id);
             const finalizeLog = (statusCode, error) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
                 if (logged)
@@ -1428,6 +1465,11 @@ class ProxyServer {
                     const totalTokens = (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);
+                        }
                     }
                 }
                 // 更新规则的请求次数（只在成功请求时更新）
@@ -1437,6 +1479,11 @@ class ProxyServer {
                     // 检查是否是重复请求（如网络重试）
                     if (!this.isRequestProcessed(requestHash)) {
                         this.dbManager.incrementRuleRequestCount(rule.id, 1);
+                        // 获取更新后的规则数据并广播
+                        const updatedRule = this.dbManager.getRule(rule.id);
+                        if (updatedRule) {
+                            rules_status_service_1.rulesStatusBroadcaster.broadcastUsageUpdate(rule.id, updatedRule.totalTokensUsed || 0, updatedRule.totalRequestsUsed || 0);
+                        }
                     }
                     // 定期清理过期缓存
                     if (Math.random() < 0.01) { // 1%概率清理，避免每次都清理
@@ -1580,10 +1627,14 @@ 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;
                             if (error) {
                                 console.error('[Proxy] Pipeline error for claude-code:', error);
-                                // 记录到错误日志
+                                // 记录到错误日志 - 包含请求详情和实际转发信息
                                 try {
+                                    // 获取供应商信息
+                                    const vendors = this.dbManager.getVendors();
+                                    const vendor = vendors.find(v => v.id === service.vendorId);
                                     yield this.dbManager.addErrorLog({
                                         timestamp: Date.now(),
                                         method: req.method,
@@ -1594,6 +1645,16 @@ class ProxyServer {
                                         requestHeaders: this.normalizeHeaders(req.headers),
                                         requestBody: req.body ? JSON.stringify(req.body) : undefined,
                                         upstreamRequest: upstreamRequestForLog,
+                                        // 添加请求详情
+                                        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: (_a = req.body) === null || _a === void 0 ? void 0 : _a.model,
+                                        responseTime: Date.now() - startTime,
                                     });
                                 }
                                 catch (logError) {
@@ -1651,10 +1712,14 @@ 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;
                             if (error) {
                                 console.error('[Proxy] Pipeline error for codex:', error);
-                                // 记录到错误日志
+                                // 记录到错误日志 - 包含请求详情和实际转发信息
                                 try {
+                                    // 获取供应商信息
+                                    const vendors = this.dbManager.getVendors();
+                                    const vendor = vendors.find(v => v.id === service.vendorId);
                                     yield this.dbManager.addErrorLog({
                                         timestamp: Date.now(),
                                         method: req.method,
@@ -1665,6 +1730,16 @@ class ProxyServer {
                                         requestHeaders: this.normalizeHeaders(req.headers),
                                         requestBody: req.body ? JSON.stringify(req.body) : undefined,
                                         upstreamRequest: upstreamRequestForLog,
+                                        // 添加请求详情
+                                        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: (_a = req.body) === null || _a === void 0 ? void 0 : _a.model,
+                                        responseTime: Date.now() - startTime,
                                     });
                                 }
                                 catch (logError) {
@@ -1698,7 +1773,6 @@ class ProxyServer {
                     });
                     res.on('finish', () => {
                         streamChunksForLog = eventCollector.getChunks();
-                        console.log('[Proxy] Default stream request finished, collected chunks:', (streamChunksForLog === null || streamChunksForLog === void 0 ? void 0 : streamChunksForLog.length) || 0);
                         // 尝试从event collector中提取usage信息
                         const extractedUsage = eventCollector.extractUsage();
                         if (extractedUsage) {
@@ -1757,6 +1831,9 @@ class ProxyServer {
                     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,
@@ -1768,6 +1845,17 @@ class ProxyServer {
                         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')) {
@@ -1811,12 +1899,15 @@ class ProxyServer {
                 console.error('Proxy error:', error);
                 // 检测是否是 timeout 错误
                 const isTimeout = error.code === 'ECONNABORTED' ||
-                    ((_b = error.message) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes('timeout')) ||
+                    ((_c = error.message) === null || _c === void 0 ? void 0 : _c.toLowerCase().includes('timeout')) ||
                     (error.errno && error.errno === 'ETIMEDOUT');
                 const errorMessage = isTimeout
                     ? 'Request timeout - the upstream API took too long to respond'
                     : (error.message || 'Internal server error');
-                // 将错误记录到错误日志
+                // 将错误记录到错误日志 - 包含请求详情和实际转发信息
+                // 获取供应商信息
+                const vendors = this.dbManager.getVendors();
+                const vendor = vendors.find(v => v.id === service.vendorId);
                 yield this.dbManager.addErrorLog({
                     timestamp: Date.now(),
                     method: req.method,
@@ -1826,6 +1917,17 @@ class ProxyServer {
                     errorStack: error.stack,
                     requestHeaders: this.normalizeHeaders(req.headers),
                     requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                    // 添加请求详情和实际转发信息
+                    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: (_d = req.body) === null || _d === void 0 ? void 0 : _d.model,
+                    upstreamRequest: upstreamRequestForLog,
+                    responseTime: Date.now() - startTime,
                 });
                 yield finalizeLog(isTimeout ? 504 : 500, errorMessage);
                 // 根据请求类型返回适当格式的错误响应

package/dist/server/rules-status-service.js

@@ -0,0 +1,197 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RulesStatusWS = exports.rulesStatusBroadcaster = exports.RulesStatusBroadcaster = void 0;
+exports.createRulesStatusWSServer = createRulesStatusWSServer;
+// @ts-ignore - ws 类型声明可能需要手动安装 @types/ws
+const ws_1 = require("ws");
+/**
+ * 规则状态 WebSocket 连接管理
+ */
+class RulesStatusWS {
+    constructor(ws, req) {
+        Object.defineProperty(this, "ws", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.ws = ws;
+        console.log(`[RulesStatusWS] 新的 WebSocket 连接: ${req.socket.remoteAddress}`);
+        this.ws.on('close', () => {
+            console.log(`[RulesStatusWS] WebSocket 连接关闭`);
+        });
+        this.ws.on('error', (err) => {
+            console.error(`[RulesStatusWS] WebSocket 错误:`, err);
+        });
+    }
+    /**
+     * 发送规则状态消息到客户端
+     */
+    sendStatus(message) {
+        if (this.ws.readyState === ws_1.WebSocket.OPEN) {
+            this.ws.send(JSON.stringify(message));
+        }
+    }
+}
+exports.RulesStatusWS = RulesStatusWS;
+/**
+ * 规则状态广播服务
+ * 管理所有连接的客户端，负责广播规则使用状态
+ */
+class RulesStatusBroadcaster {
+    constructor() {
+        Object.defineProperty(this, "clients", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Set()
+        });
+        Object.defineProperty(this, "activeRules", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        }); // routeId -> Set of ruleIds
+        Object.defineProperty(this, "ruleTimeouts", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "INACTIVITY_TIMEOUT", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 30000
+        }); // 30秒无活动后标记为空闲
+    }
+    /**
+     * 添加客户端
+     */
+    addClient(client) {
+        this.clients.add(client);
+        console.log(`[RulesStatusBroadcaster] 客户端已连接，当前客户端数: ${this.clients.size}`);
+    }
+    /**
+     * 移除客户端
+     */
+    removeClient(client) {
+        this.clients.delete(client);
+        console.log(`[RulesStatusBroadcaster] 客户端已断开，当前客户端数: ${this.clients.size}`);
+    }
+    /**
+     * 标记规则正在使用
+     */
+    markRuleInUse(routeId, ruleId) {
+        // 添加到活动规则集合
+        if (!this.activeRules.has(routeId)) {
+            this.activeRules.set(routeId, new Set());
+        }
+        this.activeRules.get(routeId).add(ruleId);
+        // 清除之前的超时定时器
+        const timeoutKey = `${routeId}:${ruleId}`;
+        const existingTimeout = this.ruleTimeouts.get(timeoutKey);
+        if (existingTimeout) {
+            clearTimeout(existingTimeout);
+        }
+        // 广播状态
+        this.broadcastStatus({
+            type: 'rule_status',
+            data: {
+                ruleId,
+                status: 'in_use',
+                timestamp: Date.now(),
+            },
+        });
+        // 设置超时定时器，如果30秒内没有新活动则标记为空闲
+        const timeout = setTimeout(() => {
+            this.markRuleIdle(routeId, ruleId);
+        }, this.INACTIVITY_TIMEOUT);
+        this.ruleTimeouts.set(timeoutKey, timeout);
+    }
+    /**
+     * 标记规则空闲
+     */
+    markRuleIdle(routeId, ruleId) {
+        const timeoutKey = `${routeId}:${ruleId}`;
+        // 清除超时定时器
+        const existingTimeout = this.ruleTimeouts.get(timeoutKey);
+        if (existingTimeout) {
+            clearTimeout(existingTimeout);
+            this.ruleTimeouts.delete(timeoutKey);
+        }
+        // 从活动规则集合中移除
+        if (this.activeRules.has(routeId)) {
+            this.activeRules.get(routeId).delete(ruleId);
+            if (this.activeRules.get(routeId).size === 0) {
+                this.activeRules.delete(routeId);
+            }
+        }
+        // 广播空闲状态
+        this.broadcastStatus({
+            type: 'rule_status',
+            data: {
+                ruleId,
+                status: 'idle',
+                timestamp: Date.now(),
+            },
+        });
+    }
+    /**
+     * 广播规则使用量更新
+     */
+    broadcastUsageUpdate(ruleId, totalTokensUsed, totalRequestsUsed) {
+        this.broadcastStatus({
+            type: 'rule_status',
+            data: {
+                ruleId,
+                status: 'in_use',
+                totalTokensUsed,
+                totalRequestsUsed,
+                timestamp: Date.now(),
+            },
+        });
+    }
+    /**
+     * 广播消息到所有客户端
+     */
+    broadcastStatus(message) {
+        const deadClients = [];
+        this.clients.forEach((client) => {
+            try {
+                client.sendStatus(message);
+            }
+            catch (error) {
+                console.error('[RulesStatusBroadcaster] 发送消息失败:', error);
+                deadClients.push(client);
+            }
+        });
+        // 清理断开的客户端
+        deadClients.forEach((client) => {
+            this.removeClient(client);
+        });
+    }
+    /**
+     * 获取当前活动的规则列表
+     */
+    getActiveRules() {
+        return new Map(this.activeRules);
+    }
+}
+exports.RulesStatusBroadcaster = RulesStatusBroadcaster;
+// 全局单例
+exports.rulesStatusBroadcaster = new RulesStatusBroadcaster();
+/**
+ * 创建 WebSocket 服务器用于规则状态
+ */
+function createRulesStatusWSServer() {
+    const wss = new ws_1.WebSocketServer({ noServer: true });
+    wss.on('connection', (ws, req) => {
+        const wsHandler = new RulesStatusWS(ws, req);
+        exports.rulesStatusBroadcaster.addClient(wsHandler);
+        ws.on('close', () => {
+            exports.rulesStatusBroadcaster.removeClient(wsHandler);
+        });
+    });
+    return wss;
+}