aicodeswitch 1.8.0 → 1.9.0

package/dist/server/database.js

@@ -100,6 +100,46 @@ class DatabaseManager {
                     console.log('[DB] Migration completed: model_limits column added');
                 }
             }
+            // 检查rules表是否有token相关字段
+            const rulesColumns = this.db.pragma('table_info(rules)');
+            const hasTokenLimit = rulesColumns.some((col) => col.name === 'token_limit');
+            const hasTotalTokensUsed = rulesColumns.some((col) => col.name === 'total_tokens_used');
+            const hasResetInterval = rulesColumns.some((col) => col.name === 'reset_interval');
+            const hasLastResetAt = rulesColumns.some((col) => col.name === 'last_reset_at');
+            if (!hasTokenLimit) {
+                console.log('[DB] Running migration: Adding token_limit column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN token_limit INTEGER;');
+                console.log('[DB] Migration completed: token_limit column added');
+            }
+            if (!hasTotalTokensUsed) {
+                console.log('[DB] Running migration: Adding total_tokens_used column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN total_tokens_used INTEGER DEFAULT 0;');
+                console.log('[DB] Migration completed: total_tokens_used column added');
+            }
+            if (!hasResetInterval) {
+                console.log('[DB] Running migration: Adding reset_interval column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN reset_interval INTEGER;');
+                console.log('[DB] Migration completed: reset_interval column added');
+            }
+            if (!hasLastResetAt) {
+                console.log('[DB] Running migration: Adding last_reset_at column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN last_reset_at INTEGER;');
+                console.log('[DB] Migration completed: last_reset_at column added');
+            }
+            // 检查rules表是否有timeout字段
+            const hasRuleTimeout = rulesColumns.some((col) => col.name === 'timeout');
+            if (!hasRuleTimeout) {
+                console.log('[DB] Running migration: Adding timeout column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN timeout INTEGER;');
+                console.log('[DB] Migration completed: timeout column added to rules');
+            }
+            // 检查api_services表是否有timeout字段，如果有则移除
+            const hasServiceTimeout = columns.some((col) => col.name === 'timeout');
+            if (hasServiceTimeout) {
+                console.log('[DB] Running migration: Removing timeout column from api_services table');
+                yield this.migrateRemoveServiceTimeout();
+                console.log('[DB] Migration completed: timeout column removed from api_services');
+            }
         });
     }
     migrateMaxOutputTokensToModelLimits() {
@@ -138,6 +178,35 @@ class DatabaseManager {
             console.log('[DB] Migration completed: Replaced max_output_tokens with model_limits');
         });
     }
+    migrateRemoveServiceTimeout() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // SQLite 不支持直接删除列，需要重建表
+            this.db.pragma('foreign_keys = OFF');
+            this.db.exec(`
+      CREATE TABLE api_services_new (
+        id TEXT PRIMARY KEY,
+        vendor_id TEXT NOT NULL,
+        name TEXT NOT NULL,
+        api_url TEXT NOT NULL,
+        api_key TEXT NOT NULL,
+        source_type TEXT,
+        supported_models TEXT,
+        model_limits TEXT,
+        created_at INTEGER NOT NULL,
+        updated_at INTEGER NOT NULL,
+        FOREIGN KEY (vendor_id) REFERENCES vendors(id) ON DELETE CASCADE
+      );
+
+      INSERT INTO api_services_new (id, vendor_id, name, api_url, api_key, source_type, supported_models, model_limits, created_at, updated_at)
+      SELECT id, vendor_id, name, api_url, api_key, source_type, supported_models, model_limits, created_at, updated_at
+      FROM api_services;
+
+      DROP TABLE api_services;
+      ALTER TABLE api_services_new RENAME TO api_services;
+    `);
+            this.db.pragma('foreign_keys = ON');
+        });
+    }
     createTables() {
         this.db.exec(`
       CREATE TABLE IF NOT EXISTS vendors (
@@ -154,7 +223,6 @@ class DatabaseManager {
          name TEXT NOT NULL,
          api_url TEXT NOT NULL,
          api_key TEXT NOT NULL,
-         timeout INTEGER,
          source_type TEXT,
          supported_models TEXT,
          created_at INTEGER NOT NULL,
@@ -180,6 +248,11 @@ class DatabaseManager {
         target_model TEXT,
         replaced_model TEXT,
         sort_order INTEGER DEFAULT 0,
+        timeout INTEGER,
+        token_limit INTEGER,
+        total_tokens_used INTEGER DEFAULT 0,
+        reset_interval INTEGER,
+        last_reset_at INTEGER,
         created_at INTEGER NOT NULL,
         updated_at INTEGER NOT NULL,
         FOREIGN KEY (route_id) REFERENCES routes(id) ON DELETE CASCADE,
@@ -252,7 +325,6 @@ class DatabaseManager {
             name: row.name,
             apiUrl: row.api_url,
             apiKey: row.api_key,
-            timeout: row.timeout,
             sourceType: row.source_type,
             supportedModels: row.supported_models ? row.supported_models.split(',').map((model) => model.trim()).filter((model) => model.length > 0) : undefined,
             modelLimits: row.model_limits ? JSON.parse(row.model_limits) : undefined,
@@ -269,18 +341,18 @@ class DatabaseManager {
         const id = crypto_1.default.randomUUID();
         const now = Date.now();
         this.db
-            .prepare('INSERT INTO api_services (id, vendor_id, name, api_url, api_key, timeout, source_type, supported_models, model_limits, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
-            .run(id, service.vendorId, service.name, service.apiUrl, service.apiKey, service.timeout || null, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, service.modelLimits ? JSON.stringify(service.modelLimits) : null, now, now);
+            .prepare('INSERT INTO api_services (id, vendor_id, name, api_url, api_key, source_type, supported_models, model_limits, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
+            .run(id, service.vendorId, service.name, service.apiUrl, service.apiKey, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, service.modelLimits ? JSON.stringify(service.modelLimits) : null, now, now);
         return Object.assign(Object.assign({}, service), { id, createdAt: now, updatedAt: now });
     }
     updateAPIService(id, service) {
         const now = Date.now();
         const result = this.db
-            .prepare('UPDATE api_services SET name = ?, api_url = ?, api_key = ?, timeout = ?, source_type = ?, supported_models = ?, model_limits = ?, updated_at = ? WHERE id = ?')
-            .run(service.name, service.apiUrl, service.apiKey, service.timeout || null, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, service.modelLimits ? JSON.stringify(service.modelLimits) : null, now, id);
+            .prepare('UPDATE api_services SET name = ?, api_url = ?, api_key = ?, source_type = ?, supported_models = ?, model_limits = ?, updated_at = ? WHERE id = ?')
+            .run(service.name, service.apiUrl, service.apiKey, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, service.modelLimits ? JSON.stringify(service.modelLimits) : null, now, id);
         // 调试日志: 记录更新操作
         if (result.changes > 0 && process.env.NODE_ENV === 'development') {
-            console.log(`[DB] Updated service ${id}: ${service.name} -> ${service.apiUrl} (timeout: ${service.timeout})`);
+            console.log(`[DB] Updated service ${id}: ${service.name} -> ${service.apiUrl}`);
         }
         return result.changes > 0;
     }
@@ -348,6 +420,11 @@ class DatabaseManager {
             targetModel: row.target_model,
             replacedModel: row.replaced_model,
             sortOrder: row.sort_order,
+            timeout: row.timeout,
+            tokenLimit: row.token_limit,
+            totalTokensUsed: row.total_tokens_used,
+            resetInterval: row.reset_interval,
+            lastResetAt: row.last_reset_at,
             createdAt: row.created_at,
             updatedAt: row.updated_at,
         }));
@@ -356,21 +433,68 @@ class DatabaseManager {
         const id = crypto_1.default.randomUUID();
         const now = Date.now();
         this.db
-            .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)')
-            .run(id, route.routeId, route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, now, now);
+            .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, timeout, token_limit, total_tokens_used, reset_interval, last_reset_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
+            .run(id, route.routeId, route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, route.timeout || null, route.tokenLimit || null, route.totalTokensUsed || 0, route.resetInterval || null, route.lastResetAt || null, now, now);
         return Object.assign(Object.assign({}, route), { id, createdAt: now, updatedAt: now });
     }
     updateRule(id, route) {
         const now = Date.now();
         const result = this.db
-            .prepare('UPDATE rules SET content_type = ?, target_service_id = ?, target_model = ?, replaced_model = ?, sort_order = ?, updated_at = ? WHERE id = ?')
-            .run(route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, now, id);
+            .prepare('UPDATE rules SET content_type = ?, target_service_id = ?, target_model = ?, replaced_model = ?, sort_order = ?, timeout = ?, token_limit = ?, reset_interval = ?, updated_at = ? WHERE id = ?')
+            .run(route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, route.timeout !== undefined ? route.timeout : null, route.tokenLimit !== undefined ? route.tokenLimit : null, route.resetInterval !== undefined ? route.resetInterval : null, now, id);
         return result.changes > 0;
     }
     deleteRule(id) {
         const result = this.db.prepare('DELETE FROM rules WHERE id = ?').run(id);
         return result.changes > 0;
     }
+    /**
+     * 增加规则的token使用量
+     * @param ruleId 规则ID
+     * @param tokensUsed 使用的token数量
+     * @returns 是否成功
+     */
+    incrementRuleTokenUsage(ruleId, tokensUsed) {
+        const result = this.db
+            .prepare('UPDATE rules SET total_tokens_used = total_tokens_used + ? WHERE id = ?')
+            .run(tokensUsed, ruleId);
+        return result.changes > 0;
+    }
+    /**
+     * 重置规则的token使用量
+     * @param ruleId 规则ID
+     * @returns 是否成功
+     */
+    resetRuleTokenUsage(ruleId) {
+        const now = Date.now();
+        const result = this.db
+            .prepare('UPDATE rules SET total_tokens_used = 0, last_reset_at = ? WHERE id = ?')
+            .run(now, ruleId);
+        return result.changes > 0;
+    }
+    /**
+     * 检查并重置到期的规则
+     * 如果规则设置了reset_interval且已经到了重置时间，则自动重置token使用量
+     * @param ruleId 规则ID
+     * @returns 是否进行了重置
+     */
+    checkAndResetRuleIfNeeded(ruleId) {
+        const rule = this.db
+            .prepare('SELECT reset_interval, last_reset_at FROM rules WHERE id = ?')
+            .get(ruleId);
+        if (!rule || !rule.reset_interval) {
+            return false; // 没有设置重置间隔
+        }
+        const now = Date.now();
+        const resetIntervalMs = rule.reset_interval * 60 * 60 * 1000; // 小时转毫秒
+        const lastResetAt = rule.last_reset_at || 0;
+        // 检查是否已经到了重置时间
+        if (now - lastResetAt >= resetIntervalMs) {
+            this.resetRuleTokenUsage(ruleId);
+            return true;
+        }
+        return false;
+    }
     // Log operations
     addLog(log) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -625,8 +749,8 @@ class DatabaseManager {
                 // Import API services
                 for (const service of importData.apiServices) {
                     this.db
-                        .prepare('INSERT INTO api_services (id, vendor_id, name, api_url, api_key, timeout, source_type, supported_models, model_limits, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
-                        .run(service.id, service.vendorId, service.name, service.apiUrl, service.apiKey, service.timeout || null, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, service.modelLimits ? JSON.stringify(service.modelLimits) : null, service.createdAt, service.updatedAt);
+                        .prepare('INSERT INTO api_services (id, vendor_id, name, api_url, api_key, source_type, supported_models, model_limits, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
+                        .run(service.id, service.vendorId, service.name, service.apiUrl, service.apiKey, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, service.modelLimits ? JSON.stringify(service.modelLimits) : null, service.createdAt, service.updatedAt);
                 }
                 // Import routes
                 for (const route of importData.routes) {
@@ -637,8 +761,8 @@ class DatabaseManager {
                 // Import rules
                 for (const rule of importData.rules) {
                     this.db
-                        .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)')
-                        .run(rule.id, rule.routeId, rule.contentType || 'default', rule.targetServiceId, rule.targetModel || null, rule.replacedModel || null, rule.sortOrder || 0, rule.createdAt, rule.updatedAt);
+                        .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, timeout, token_limit, total_tokens_used, reset_interval, last_reset_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
+                        .run(rule.id, rule.routeId, rule.contentType || 'default', rule.targetServiceId, rule.targetModel || null, rule.replacedModel || null, rule.sortOrder || 0, rule.timeout || null, rule.tokenLimit || null, rule.totalTokensUsed || 0, rule.resetInterval || null, rule.lastResetAt || null, rule.createdAt, rule.updatedAt);
                 }
                 // Update config
                 this.updateConfig(importData.config);

package/dist/server/main.js

@@ -282,6 +282,7 @@ const registerRoutes = (dbManager, proxyServer) => {
     app.post('/api/rules', (req, res) => res.json(dbManager.createRule(req.body)));
     app.put('/api/rules/:id', (req, res) => res.json(dbManager.updateRule(req.params.id, req.body)));
     app.delete('/api/rules/:id', (req, res) => res.json(dbManager.deleteRule(req.params.id)));
+    app.put('/api/rules/:id/reset-tokens', (req, res) => res.json(dbManager.resetRuleTokenUsage(req.params.id)));
     app.get('/api/logs', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const rawLimit = typeof req.query.limit === 'string' ? parseInt(req.query.limit, 10) : NaN;
         const rawOffset = typeof req.query.offset === 'string' ? parseInt(req.query.offset, 10) : NaN;

package/dist/server/proxy-server.js

@@ -476,32 +476,53 @@ class ProxyServer {
                 const modelMappingRules = rules.filter(rule => rule.contentType === 'model-mapping' &&
                     rule.replacedModel &&
                     requestModel.includes(rule.replacedModel));
-                // 过滤黑名单
+                // 过滤黑名单和token限制
                 for (const rule of modelMappingRules) {
                     const isBlacklisted = yield this.dbManager.isServiceBlacklisted(rule.targetServiceId, routeId, rule.contentType);
-                    if (!isBlacklisted) {
-                        return rule;
+                    if (isBlacklisted) {
+                        continue;
+                    }
+                    // 检查并重置到期的规则
+                    this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+                    // 检查token限制
+                    if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit) {
+                        continue; // 跳过超限规则
                     }
+                    return rule;
                 }
             }
             // 2. 查找其他内容类型的规则
             const contentType = this.determineContentType(req);
             const contentTypeRules = rules.filter(rule => rule.contentType === contentType);
-            // 过滤黑名单
+            // 过滤黑名单和token限制
             for (const rule of contentTypeRules) {
                 const isBlacklisted = yield this.dbManager.isServiceBlacklisted(rule.targetServiceId, routeId, contentType);
-                if (!isBlacklisted) {
-                    return rule;
+                if (isBlacklisted) {
+                    continue;
                 }
+                // 检查并重置到期的规则
+                this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+                // 检查token限制
+                if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit) {
+                    continue; // 跳过超限规则
+                }
+                return rule;
             }
             // 3. 最后返回 default 规则
             const defaultRules = rules.filter(rule => rule.contentType === 'default');
-            // 过滤黑名单
+            // 过滤黑名单和token限制
             for (const rule of defaultRules) {
                 const isBlacklisted = yield this.dbManager.isServiceBlacklisted(rule.targetServiceId, routeId, 'default');
-                if (!isBlacklisted) {
-                    return rule;
+                if (isBlacklisted) {
+                    continue;
                 }
+                // 检查并重置到期的规则
+                this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+                // 检查token限制
+                if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit) {
+                    continue; // 跳过超限规则
+                }
+                return rule;
             }
             return undefined;
         });
@@ -527,6 +548,23 @@ class ProxyServer {
         // 3. Default rules
         const defaultRules = rules.filter(rule => rule.contentType === 'default');
         candidates.push(...defaultRules);
+        // 4. 检查并重置到期的规则
+        candidates.forEach(rule => {
+            this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+        });
+        // 5. 过滤掉超过token限制的规则（仅在有多个候选规则时）
+        if (candidates.length > 1) {
+            const filteredCandidates = candidates.filter(rule => {
+                if (rule.tokenLimit && rule.totalTokensUsed !== undefined) {
+                    return rule.totalTokensUsed < rule.tokenLimit;
+                }
+                return true; // 没有设置限制的规则总是可用
+            });
+            // 如果过滤后还有规则，使用过滤后的结果
+            if (filteredCandidates.length > 0) {
+                return filteredCandidates;
+            }
+        }
         return candidates;
     }
     determineContentType(req) {
@@ -1008,6 +1046,10 @@ class ProxyServer {
                 var _a, _b;
                 if (logged || !((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging))
                     return;
+                // 只记录来自编程工具的请求
+                if (!SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+                    return;
+                }
                 logged = true;
                 // 获取供应商信息
                 const vendors = this.dbManager.getVendors();
@@ -1026,6 +1068,7 @@ class ProxyServer {
                     usage: usageForLog,
                     error,
                     // 新增字段
+                    ruleId: rule.id,
                     targetType,
                     targetServiceId: service.id,
                     targetServiceName: service.name,
@@ -1038,6 +1081,13 @@ class ProxyServer {
                     streamChunks: streamChunksForLog,
                     upstreamRequest: upstreamRequestForLog,
                 });
+                // 更新规则的token使用量（只在成功请求时更新）
+                if (usageForLog && statusCode < 400) {
+                    const totalTokens = (usageForLog.inputTokens || 0) + (usageForLog.outputTokens || 0);
+                    if (totalTokens > 0) {
+                        this.dbManager.incrementRuleTokenUsage(rule.id, totalTokens);
+                    }
+                }
             });
             try {
                 if (targetType === 'claude-code') {
@@ -1083,7 +1133,7 @@ class ProxyServer {
                     method: req.method,
                     url: `${service.apiUrl}${mappedPath}`,
                     headers: this.buildUpstreamHeaders(req, service, sourceType, streamRequested),
-                    timeout: service.timeout || 3000000, // 默认300秒
+                    timeout: rule.timeout || 3000000, // 默认300秒
                     validateStatus: () => true,
                     responseType: streamRequested ? 'stream' : 'json',
                 };