aicodeswitch 1.9.0 → 1.10.2

package/dist/server/main.js

@@ -283,6 +283,54 @@ const registerRoutes = (dbManager, proxyServer) => {
     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.put('/api/rules/:id/reset-requests', (req, res) => res.json(dbManager.resetRuleRequestCount(req.params.id)));
+    // 解除规则的黑名单状态
+    app.put('/api/rules/:id/clear-blacklist', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const { id } = req.params;
+        const rule = dbManager.getRule(id);
+        if (!rule) {
+            res.status(404).json({ error: 'Rule not found' });
+            return;
+        }
+        // 找到该规则所属的路由
+        const routes = dbManager.getRoutes();
+        const route = routes.find(r => {
+            const rules = dbManager.getRules(r.id);
+            return rules.some(r => r.id === id);
+        });
+        if (!route) {
+            res.status(404).json({ error: 'Route not found' });
+            return;
+        }
+        try {
+            yield dbManager.removeFromBlacklist(rule.targetServiceId, route.id, rule.contentType);
+            res.json({ success: true });
+        }
+        catch (error) {
+            console.error('Error clearing blacklist:', error);
+            res.status(500).json({ error: 'Failed to clear blacklist' });
+        }
+    })));
+    // 获取规则的黑名单状态
+    app.get('/api/rules/:routeId/blacklist-status', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const { routeId } = req.params;
+        const rules = dbManager.getRules(routeId);
+        try {
+            const results = yield Promise.all(rules.map((rule) => __awaiter(void 0, void 0, void 0, function* () {
+                const blacklistStatus = yield dbManager.getRuleBlacklistStatus(rule.targetServiceId, routeId, rule.contentType);
+                return {
+                    ruleId: rule.id,
+                    isBlacklisted: blacklistStatus !== null,
+                    blacklistEntry: blacklistStatus,
+                };
+            })));
+            res.json(results);
+        }
+        catch (error) {
+            console.error('Error getting blacklist status:', error);
+            res.status(500).json({ error: 'Failed to get blacklist status' });
+        }
+    })));
     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;
@@ -319,6 +367,18 @@ const registerRoutes = (dbManager, proxyServer) => {
         yield dbManager.clearErrorLogs();
         res.json(true);
     })));
+    app.get('/api/logs/count', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const count = yield dbManager.getLogsCount();
+        res.json({ count });
+    })));
+    app.get('/api/access-logs/count', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const count = yield dbManager.getAccessLogsCount();
+        res.json({ count });
+    })));
+    app.get('/api/error-logs/count', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const count = yield dbManager.getErrorLogsCount();
+        res.json({ count });
+    })));
     app.get('/api/config', (_req, res) => res.json(dbManager.getConfig()));
     app.put('/api/config', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const config = req.body;

package/dist/server/proxy-server.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -19,6 +52,18 @@ const streaming_1 = require("./transformers/streaming");
 const chunk_collector_1 = require("./transformers/chunk-collector");
 const claude_openai_1 = require("./transformers/claude-openai");
 const SUPPORTED_TARGETS = ['claude-code', 'codex'];
+// 需要排除的路径模式（非业务请求）
+const IGNORED_PATHS = [
+    '/favicon.ico',
+    '/robots.txt',
+    '/sitemap.xml',
+];
+/**
+ * 检查路径是否应该被忽略
+ */
+function shouldIgnorePath(path) {
+    return IGNORED_PATHS.some(ignored => path === ignored || path.startsWith(ignored + '?'));
+}
 class ProxyServer {
     constructor(dbManager, app) {
         Object.defineProperty(this, "app", {
@@ -67,6 +112,10 @@ class ProxyServer {
         // Access logging middleware
         this.app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
             var _a;
+            // 忽略非业务请求
+            if (shouldIgnorePath(req.path)) {
+                return next();
+            }
             // Capture client info
             const clientIp = ((_a = req.headers['x-forwarded-for']) === null || _a === void 0 ? void 0 : _a.split(',')[0]) || req.socket.remoteAddress || '';
             const userAgent = req.headers['user-agent'] || '';
@@ -80,35 +129,61 @@ class ProxyServer {
                 clientIp,
                 userAgent,
             });
-            res.send = (data) => {
-                res.send = originalSend;
+            const updateLog = (res, data) => {
                 const responseTime = Date.now() - startTime;
                 accessLog.then((accessLogId) => {
-                    this.dbManager.updateAccessLog(accessLogId, {
+                    const updateData = {
                         responseTime,
-                        statusCode: res.statusCode,
-                    });
+                    };
+                    let errorMessage = '';
+                    if (res instanceof Error) {
+                        updateData.error = res.message;
+                        errorMessage = res.message;
+                    }
+                    else if (res.statusCode >= 400) {
+                        updateData.statusCode = res.statusCode;
+                        updateData.error = res.statusMessage;
+                        // @ts-ignore
+                        updateData.responseHeaders = this.normalizeResponseHeaders(res.headers || {});
+                        errorMessage = res.statusMessage;
+                    }
+                    else {
+                        updateData.statusCode = res.statusCode;
+                        // @ts-ignore
+                        updateData.responseHeaders = this.normalizeResponseHeaders(res.headers || {});
+                        updateData.responseBody = data ? JSON.stringify(data) : undefined;
+                    }
+                    this.dbManager.updateAccessLog(accessLogId, updateData);
+                    // 记录错误日志
+                    if (res instanceof Error || res.statusCode >= 400) {
+                        this.dbManager.addErrorLog({
+                            timestamp: Date.now(),
+                            method: req.method,
+                            path: req.path,
+                            statusCode: 503,
+                            errorMessage,
+                            requestHeaders: this.normalizeHeaders(req.headers),
+                            requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                            responseBody: data ? JSON.stringify(data) : undefined,
+                            // @ts-ignore
+                            responseHeaders: res.headers ? this.normalizeResponseHeaders(res.headers) : undefined,
+                            responseTime,
+                        });
+                    }
                 });
+            };
+            res.send = (data) => {
+                res.send = originalSend;
+                updateLog(res, data);
                 return originalSend(data);
             };
             res.json = (data) => {
                 res.json = originalJson;
-                const responseTime = Date.now() - startTime;
-                accessLog.then((accessLogId) => {
-                    this.dbManager.updateAccessLog(accessLogId, {
-                        responseTime,
-                        statusCode: res.statusCode,
-                    });
-                });
+                updateLog(res, data);
                 return originalJson(data);
             };
             res.on('error', (err) => {
-                accessLog.then((accessLogId) => {
-                    this.dbManager.updateAccessLog(accessLogId, {
-                        statusCode: res.statusCode,
-                        error: err.message,
-                    });
-                });
+                updateLog(err);
             });
             next();
         }));
@@ -116,7 +191,8 @@ class ProxyServer {
         this.app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
             const originalSend = res.send.bind(res);
-            if (SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+            // 忽略非业务请求，并且只记录支持的编程工具请求
+            if (!shouldIgnorePath(req.path) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                 res.send = (data) => {
                     var _a;
                     res.send = originalSend;
@@ -144,7 +220,7 @@ class ProxyServer {
         this.app.use('/codex', this.createFixedRouteHandler('codex'));
         // Dynamic proxy middleware
         this.app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             // 根路径 / 不应该被代理中间件处理,应该传递给静态文件服务
             if (req.path === '/') {
                 return next();
@@ -194,11 +270,24 @@ class ProxyServer {
                     catch (error) {
                         console.error(`Service ${service.name} failed:`, error.message);
                         lastError = error;
-                        // 判断是否应该加入黑名单 (4xx + 5xx)
-                        const statusCode = ((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) || 500;
-                        if (statusCode >= 400) {
-                            yield this.dbManager.addToBlacklist(service.id, route.id, rule.contentType, error.message, statusCode);
-                            console.log(`Service ${service.name} added to blacklist (${route.id}:${rule.contentType}:${service.id})`);
+                        // 检测是否是 timeout 错误
+                        const isTimeout = error.code === 'ECONNABORTED' ||
+                            ((_b = error.message) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes('timeout')) ||
+                            (error.errno && error.errno === 'ETIMEDOUT');
+                        // 判断错误类型并加入黑名单
+                        if (isTimeout) {
+                            // Timeout错误，加入黑名单
+                            yield this.dbManager.addToBlacklist(service.id, route.id, rule.contentType, 'Request timeout - the upstream API took too long to respond', undefined, // timeout没有HTTP状态码
+                            'timeout');
+                            console.log(`Service ${service.name} added to blacklist due to timeout (${route.id}:${rule.contentType}:${service.id})`);
+                        }
+                        else {
+                            // HTTP错误，检查状态码
+                            const statusCode = ((_c = error.response) === null || _c === void 0 ? void 0 : _c.status) || 500;
+                            if (statusCode >= 400) {
+                                yield this.dbManager.addToBlacklist(service.id, route.id, rule.contentType, error.message, statusCode, 'http');
+                                console.log(`Service ${service.name} added to blacklist due to HTTP error ${statusCode} (${route.id}:${rule.contentType}:${service.id})`);
+                            }
                         }
                         // 继续尝试下一个服务
                         continue;
@@ -207,7 +296,7 @@ class ProxyServer {
                 // 所有服务都失败了
                 console.error('All services failed');
                 // 记录日志
-                if (((_c = this.config) === null || _c === void 0 ? void 0 : _c.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+                if (((_d = this.config) === null || _d === void 0 ? void 0 : _d.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                     yield this.dbManager.addLog({
                         timestamp: Date.now(),
                         method: req.method,
@@ -249,7 +338,7 @@ class ProxyServer {
             }
             catch (error) {
                 console.error('Proxy error:', error);
-                if (((_d = this.config) === null || _d === void 0 ? void 0 : _d.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+                if (((_e = this.config) === null || _e === void 0 ? void 0 : _e.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                     yield this.dbManager.addLog({
                         timestamp: Date.now(),
                         method: req.method,
@@ -290,7 +379,7 @@ class ProxyServer {
     }
     createFixedRouteHandler(targetType) {
         return (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             try {
                 // 检查API Key验证
                 if (this.config.apiKey) {
@@ -344,11 +433,24 @@ class ProxyServer {
                     catch (error) {
                         console.error(`Service ${service.name} failed:`, error.message);
                         lastError = error;
-                        // 判断是否应该加入黑名单 (4xx + 5xx)
-                        const statusCode = ((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) || 500;
-                        if (statusCode >= 400) {
-                            yield this.dbManager.addToBlacklist(service.id, route.id, rule.contentType, error.message, statusCode);
-                            console.log(`Service ${service.name} added to blacklist (${route.id}:${rule.contentType}:${service.id})`);
+                        // 检测是否是 timeout 错误
+                        const isTimeout = error.code === 'ECONNABORTED' ||
+                            ((_b = error.message) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes('timeout')) ||
+                            (error.errno && error.errno === 'ETIMEDOUT');
+                        // 判断错误类型并加入黑名单
+                        if (isTimeout) {
+                            // Timeout错误，加入黑名单
+                            yield this.dbManager.addToBlacklist(service.id, route.id, rule.contentType, 'Request timeout - the upstream API took too long to respond', undefined, // timeout没有HTTP状态码
+                            'timeout');
+                            console.log(`Service ${service.name} added to blacklist due to timeout (${route.id}:${rule.contentType}:${service.id})`);
+                        }
+                        else {
+                            // HTTP错误，检查状态码
+                            const statusCode = ((_c = error.response) === null || _c === void 0 ? void 0 : _c.status) || 500;
+                            if (statusCode >= 400) {
+                                yield this.dbManager.addToBlacklist(service.id, route.id, rule.contentType, error.message, statusCode, 'http');
+                                console.log(`Service ${service.name} added to blacklist due to HTTP error ${statusCode} (${route.id}:${rule.contentType}:${service.id})`);
+                            }
                         }
                         // 继续尝试下一个服务
                         continue;
@@ -357,7 +459,7 @@ class ProxyServer {
                 // 所有服务都失败了
                 console.error('All services failed');
                 // 记录日志
-                if (((_c = this.config) === null || _c === void 0 ? void 0 : _c.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+                if (((_d = this.config) === null || _d === void 0 ? void 0 : _d.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                     yield this.dbManager.addLog({
                         timestamp: Date.now(),
                         method: req.method,
@@ -399,7 +501,7 @@ class ProxyServer {
             }
             catch (error) {
                 console.error(`Fixed route error for ${targetType}:`, error);
-                if (((_d = this.config) === null || _d === void 0 ? void 0 : _d.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+                if (((_e = this.config) === null || _e === void 0 ? void 0 : _e.enableLogging) && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                     yield this.dbManager.addLog({
                         timestamp: Date.now(),
                         method: req.method,
@@ -450,6 +552,29 @@ class ProxyServer {
         const activeRoutes = this.getActiveRoutes();
         return activeRoutes.find(route => route.targetType === targetType && route.isActive);
     }
+    /**
+     * 根据GLM计费逻辑判断请求是否应该计费
+     * 核心规则：
+     * 1. 最后一条消息必须是 role: "user"
+     * 2. 上一条消息不能是包含 tool_calls 的 assistant 消息（即不是工具回传）
+     */
+    shouldChargeRequest(requestBody) {
+        const messages = requestBody === null || requestBody === void 0 ? void 0 : requestBody.messages;
+        if (!messages || !Array.isArray(messages) || messages.length === 0) {
+            return false;
+        }
+        const lastMessage = messages[messages.length - 1];
+        if (lastMessage.role !== 'user') {
+            return false;
+        }
+        if (messages.length > 1) {
+            const previousMessage = messages[messages.length - 2];
+            if (previousMessage.role === 'assistant' && previousMessage.tool_calls) {
+                return false;
+            }
+        }
+        return true;
+    }
     /**
      * 从数据库实时获取服务配置
      * @param serviceId 服务ID
@@ -484,10 +609,15 @@ class ProxyServer {
                     }
                     // 检查并重置到期的规则
                     this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+                    this.dbManager.checkAndResetRequestCountIfNeeded(rule.id);
                     // 检查token限制
                     if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit) {
                         continue; // 跳过超限规则
                     }
+                    // 检查请求次数限制
+                    if (rule.requestCountLimit && rule.totalRequestsUsed !== undefined && rule.totalRequestsUsed >= rule.requestCountLimit) {
+                        continue; // 跳过超限规则
+                    }
                     return rule;
                 }
             }
@@ -502,10 +632,15 @@ class ProxyServer {
                 }
                 // 检查并重置到期的规则
                 this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+                this.dbManager.checkAndResetRequestCountIfNeeded(rule.id);
                 // 检查token限制
                 if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit) {
                     continue; // 跳过超限规则
                 }
+                // 检查请求次数限制
+                if (rule.requestCountLimit && rule.totalRequestsUsed !== undefined && rule.totalRequestsUsed >= rule.requestCountLimit) {
+                    continue; // 跳过超限规则
+                }
                 return rule;
             }
             // 3. 最后返回 default 规则
@@ -518,10 +653,15 @@ class ProxyServer {
                 }
                 // 检查并重置到期的规则
                 this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+                this.dbManager.checkAndResetRequestCountIfNeeded(rule.id);
                 // 检查token限制
                 if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit) {
                     continue; // 跳过超限规则
                 }
+                // 检查请求次数限制
+                if (rule.requestCountLimit && rule.totalRequestsUsed !== undefined && rule.totalRequestsUsed >= rule.requestCountLimit) {
+                    continue; // 跳过超限规则
+                }
                 return rule;
             }
             return undefined;
@@ -551,12 +691,22 @@ class ProxyServer {
         // 4. 检查并重置到期的规则
         candidates.forEach(rule => {
             this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+            this.dbManager.checkAndResetRequestCountIfNeeded(rule.id);
         });
-        // 5. 过滤掉超过token限制的规则（仅在有多个候选规则时）
+        // 5. 过滤掉超过限制的规则（仅在有多个候选规则时）
         if (candidates.length > 1) {
             const filteredCandidates = candidates.filter(rule => {
+                // 检查token限制
                 if (rule.tokenLimit && rule.totalTokensUsed !== undefined) {
-                    return rule.totalTokensUsed < rule.tokenLimit;
+                    if (rule.totalTokensUsed >= rule.tokenLimit) {
+                        return false;
+                    }
+                }
+                // 检查请求次数限制
+                if (rule.requestCountLimit && rule.totalRequestsUsed !== undefined) {
+                    if (rule.totalRequestsUsed >= rule.requestCountLimit) {
+                        return false;
+                    }
                 }
                 return true; // 没有设置限制的规则总是可用
             });
@@ -1042,6 +1192,7 @@ class ProxyServer {
             let responseBodyForLog;
             let streamChunksForLog;
             let upstreamRequestForLog;
+            let actuallyUsedProxy = false; // 标记是否实际使用了代理
             const finalizeLog = (statusCode, error) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
                 if (logged || !((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging))
@@ -1088,6 +1239,10 @@ class ProxyServer {
                         this.dbManager.incrementRuleTokenUsage(rule.id, totalTokens);
                     }
                 }
+                // 更新规则的请求次数（只在成功请求时更新）
+                if (statusCode < 400 && this.shouldChargeRequest(req.body)) {
+                    this.dbManager.incrementRuleRequestCount(rule.id, 1);
+                }
             });
             try {
                 if (targetType === 'claude-code') {
@@ -1143,6 +1298,35 @@ class ProxyServer {
                 if (['POST', 'PUT', 'PATCH'].includes(req.method.toUpperCase())) {
                     config.data = requestBody;
                 }
+                // 应用代理配置
+                if (service.enableProxy) {
+                    const appConfig = this.dbManager.getConfig();
+                    if (appConfig.proxyEnabled && appConfig.proxyUrl) {
+                        try {
+                            const { HttpsProxyAgent } = yield Promise.resolve().then(() => __importStar(require('https-proxy-agent')));
+                            const proxyAuth = appConfig.proxyUsername && appConfig.proxyPassword
+                                ? `${appConfig.proxyUsername}:${appConfig.proxyPassword}@`
+                                : '';
+                            let proxyUrl = appConfig.proxyUrl;
+                            if (!proxyUrl.startsWith('http://') && !proxyUrl.startsWith('https://')) {
+                                proxyUrl = `http://${proxyAuth}${proxyUrl}`;
+                            }
+                            else if (proxyAuth) {
+                                // 如果 URL 已经包含协议，需要插入认证信息
+                                const urlObj = new URL(proxyUrl);
+                                urlObj.username = appConfig.proxyUsername;
+                                urlObj.password = appConfig.proxyPassword;
+                                proxyUrl = urlObj.toString();
+                            }
+                            config.httpsAgent = new HttpsProxyAgent(proxyUrl);
+                            config.httpAgent = new HttpsProxyAgent(proxyUrl);
+                            actuallyUsedProxy = true; // 标记实际使用了代理
+                        }
+                        catch (error) {
+                            console.error('[Proxy] Failed to create proxy agent:', error);
+                        }
+                    }
+                }
                 // 记录实际发出的请求信息作为日志的一部分
                 const actualModel = (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model) || '';
                 const maxTokensFieldName = this.getMaxTokensFieldName(actualModel);
@@ -1150,9 +1334,11 @@ class ProxyServer {
                 upstreamRequestForLog = {
                     url: `${service.apiUrl}${mappedPath}`,
                     model: actualModel,
-                    maxTokens: actualMaxTokens,
-                    maxTokensField: maxTokensFieldName,
+                    [maxTokensFieldName]: actualMaxTokens,
                 };
+                if (actuallyUsedProxy) {
+                    upstreamRequestForLog.useProxy = true;
+                }
                 const response = yield (0, axios_1.default)(config);
                 const responseHeaders = response.headers || {};
                 const contentType = typeof responseHeaders['content-type'] === 'string' ? responseHeaders['content-type'] : '';