aicodeswitch 2.1.5 → 3.0.1

package/dist/server/main.js

@@ -19,7 +19,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const crypto_1 = require("crypto");
 const https_proxy_agent_1 = require("https-proxy-agent");
-const database_1 = require("./database");
+const database_factory_1 = require("./database-factory");
 const proxy_server_1 = require("./proxy-server");
 const os_1 = __importDefault(require("os"));
 const auth_1 = require("./auth");
@@ -33,7 +33,7 @@ const config_1 = require("./config");
 const appDir = path_1.default.join(os_1.default.homedir(), '.aicodeswitch');
 const dataDir = path_1.default.join(appDir, 'data');
 const dotenvPath = path_1.default.resolve(appDir, 'aicodeswitch.conf');
-const migrationHashFilePath = path_1.default.join(appDir, 'migration-hash');
+const upgradeHashFilePath = path_1.default.join(appDir, 'upgrade-hash');
 if (fs_1.default.existsSync(dotenvPath)) {
     dotenv_1.default.config({ path: dotenvPath });
 }
@@ -742,14 +742,14 @@ const registerRoutes = (dbManager, proxyServer) => {
     app.put('/api/routes/:id', (req, res) => res.json(dbManager.updateRoute(req.params.id, req.body)));
     app.delete('/api/routes/:id', (req, res) => res.json(dbManager.deleteRoute(req.params.id)));
     app.post('/api/routes/:id/activate', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        const result = dbManager.activateRoute(req.params.id);
+        const result = yield dbManager.activateRoute(req.params.id);
         if (result) {
             yield proxyServer.reloadRoutes();
         }
         res.json(result);
     })));
     app.post('/api/routes/:id/deactivate', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        const result = dbManager.deactivateRoute(req.params.id);
+        const result = yield dbManager.deactivateRoute(req.params.id);
         if (result) {
             yield proxyServer.reloadRoutes();
         }
@@ -778,7 +778,7 @@ const registerRoutes = (dbManager, proxyServer) => {
         }
         // 步骤3：停用所有激活的路由
         console.log('[Deactivate All Routes] Deactivating all active routes...');
-        const deactivatedCount = dbManager.deactivateAllRoutes();
+        const deactivatedCount = yield dbManager.deactivateAllRoutes();
         if (deactivatedCount > 0) {
             console.log(`[Deactivate All Routes] Deactivated ${deactivatedCount} route(s), reloading routes...`);
             yield proxyServer.reloadRoutes();
@@ -874,6 +874,10 @@ const registerRoutes = (dbManager, proxyServer) => {
         yield dbManager.clearErrorLogs();
         res.json(true);
     })));
+    app.delete('/api/statistics', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        yield dbManager.resetStatistics();
+        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 });
@@ -885,7 +889,7 @@ const registerRoutes = (dbManager, proxyServer) => {
     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;
-        const result = dbManager.updateConfig(config);
+        const result = yield dbManager.updateConfig(config);
         if (result) {
             yield proxyServer.updateConfig(config);
             updateProxyConfig(config);
@@ -1287,11 +1291,11 @@ ${instruction}
         const rawOffset = typeof req.query.offset === 'string' ? parseInt(req.query.offset, 10) : NaN;
         const limit = Number.isFinite(rawLimit) ? rawLimit : 100;
         const offset = Number.isFinite(rawOffset) ? rawOffset : 0;
-        const sessions = dbManager.getSessions(limit, offset);
+        const sessions = yield dbManager.getSessions(undefined, limit, offset);
         res.json(sessions);
     })));
     app.get('/api/sessions/count', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        const count = dbManager.getSessionsCount();
+        const count = yield dbManager.getSessionsCount();
         res.json({ count });
     })));
     app.get('/api/sessions/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
@@ -1334,67 +1338,60 @@ ${instruction}
         const text = yield resp.text();
         res.type('text/plain').send(text);
     })));
-    // 查找 migration.md 文件的路径
-    const findMigrationPath = () => {
-        // 可能的路径列表
-        const possiblePaths = [
-            // 开发环境：src/server/main.ts -> public/migration.md
-            path_1.default.resolve(__dirname, '../../public/migration.md'),
-            // 生产环境：dist/server/main.js -> dist/ui/migration.md
-            path_1.default.resolve(__dirname, '../ui/migration.md'),
-        ];
-        for (const possiblePath of possiblePaths) {
-            if (fs_1.default.existsSync(possiblePath)) {
-                return possiblePath;
-            }
+    app.get('/api/docs/upgrade', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const resp = yield fetch('https://unpkg.com/aicodeswitch/docs/upgrade.md');
+        if (!resp.ok) {
+            res.status(500).send('');
+            return;
         }
-        return null;
-    };
-    app.get('/api/migration', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const text = yield resp.text();
+        res.type('text/plain').send(text);
+    })));
+    app.get('/api/upgrade', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            // 读取 migration.md 文件
-            const migrationPath = findMigrationPath();
-            if (!migrationPath) {
+            // 读取 upgrade.md 文件
+            const upgradePath = path_1.default.resolve(__dirname, '../../UPGRADE.md');
+            if (!upgradePath) {
                 res.json({ shouldShow: false, content: '' });
                 return;
             }
-            const content = fs_1.default.readFileSync(migrationPath, 'utf-8').trim();
+            const content = fs_1.default.readFileSync(upgradePath, 'utf-8').trim();
             // 计算当前内容的 hash
             const currentHash = (0, crypto_1.createHash)('sha256').update(content).digest('hex');
             // 如果 hash 文件不存在，说明是第一次安装
-            if (!fs_1.default.existsSync(migrationHashFilePath)) {
+            if (!fs_1.default.existsSync(upgradeHashFilePath)) {
                 // 第一次安装，直接保存当前 hash，不显示弹窗
-                fs_1.default.writeFileSync(migrationHashFilePath, currentHash, 'utf-8');
+                fs_1.default.writeFileSync(upgradeHashFilePath, currentHash, 'utf-8');
                 res.json({ shouldShow: false, content: '' });
                 return;
             }
             // 读取已保存的 hash
-            const savedHash = fs_1.default.readFileSync(migrationHashFilePath, 'utf-8').trim();
+            const savedHash = fs_1.default.readFileSync(upgradeHashFilePath, 'utf-8').trim();
             // 如果 hash 不同，需要显示弹窗
             const shouldShow = savedHash !== currentHash;
             res.json({ shouldShow, content: shouldShow ? content : '' });
         }
         catch (error) {
-            console.error('Failed to read migration file:', error);
+            console.error('Failed to read upgrade file:', error);
             res.json({ shouldShow: false, content: '' });
         }
     })));
-    app.post('/api/migration/ack', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    app.post('/api/upgrade/ack', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            // 读取 migration.md 文件并计算 hash
-            const migrationPath = findMigrationPath();
-            if (!migrationPath) {
+            // 读取 upgrade.md 文件并计算 hash
+            const upgradePath = path_1.default.resolve(__dirname, '../../UPGRADE.md');
+            if (!upgradePath) {
                 res.json({ success: false });
                 return;
             }
-            const content = fs_1.default.readFileSync(migrationPath, 'utf-8').trim();
+            const content = fs_1.default.readFileSync(upgradePath, 'utf-8').trim();
             const hash = (0, crypto_1.createHash)('sha256').update(content).digest('hex');
             // 保存 hash 到文件
-            fs_1.default.writeFileSync(migrationHashFilePath, hash, 'utf-8');
+            fs_1.default.writeFileSync(upgradeHashFilePath, hash, 'utf-8');
             res.json({ success: true });
         }
         catch (error) {
-            console.error('Failed to acknowledge migration:', error);
+            console.error('Failed to acknowledge upgrade:', error);
             res.json({ success: false });
         }
     })));
@@ -1414,9 +1411,10 @@ ${instruction}
 };
 const start = () => __awaiter(void 0, void 0, void 0, function* () {
     fs_1.default.mkdirSync(dataDir, { recursive: true });
-    const dbManager = new database_1.DatabaseManager(dataDir);
-    // 必须先初始化数据库，否则会报错
-    yield dbManager.initialize();
+    // 自动检测数据库类型并执行迁移（如果需要）
+    console.log('[Server] Initializing database...');
+    const dbManager = yield database_factory_1.DatabaseFactory.createAuto(dataDir);
+    console.log('[Server] Database initialized successfully');
     const proxyServer = new proxy_server_1.ProxyServer(dbManager, app);
     // Initialize proxy server and register proxy routes last
     proxyServer.initialize();

package/dist/server/migrate-to-fs.js

@@ -0,0 +1,253 @@
+"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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateToFileSystem = migrateToFileSystem;
+exports.needsMigration = needsMigration;
+exports.verifyMigration = verifyMigration;
+const path_1 = __importDefault(require("path"));
+const promises_1 = __importDefault(require("fs/promises"));
+/**
+ * 数据库迁移工具
+ * 从 better-sqlite3 和 leveldb 迁移到文件系统数据库
+ */
+function migrateToFileSystem(dataPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log('[Migration] Starting migration to file system database...');
+        try {
+            // 动态导入旧数据库（如果存在）
+            const oldDbPath = path_1.default.join(dataPath, 'app.db');
+            const oldDbExists = yield promises_1.default.access(oldDbPath).then(() => true).catch(() => false);
+            if (!oldDbExists) {
+                console.log('[Migration] No old database found, skipping migration');
+                return;
+            }
+            // 尝试导入旧数据库模块（仅在有 SQLite 依赖时可用）
+            let DatabaseManager;
+            try {
+                const dbModule = yield Promise.resolve().then(() => __importStar(require('./database.js')));
+                DatabaseManager = dbModule.DatabaseManager;
+            }
+            catch (error) {
+                console.log('[Migration] Old database module not available');
+                console.log('[Migration] This is expected if better-sqlite3 is not installed');
+                console.log('[Migration] To migrate old data, please run: yarn add better-sqlite3 level');
+                console.log('[Migration] Then run the migration again');
+                return;
+            }
+            // 创建旧数据库实例
+            console.log('[Migration] Initializing old database...');
+            const oldDb = new DatabaseManager(dataPath);
+            yield oldDb.initialize();
+            // 导出核心数据
+            console.log('[Migration] Exporting core data from old database...');
+            const vendors = oldDb.getVendors();
+            const services = oldDb.getAPIServices();
+            const routes = oldDb.getRoutes();
+            const rules = oldDb.getRules();
+            const config = oldDb.getConfig();
+            console.log(`[Migration] Found ${vendors.length} vendors`);
+            console.log(`[Migration] Found ${services.length} services`);
+            console.log(`[Migration] Found ${routes.length} routes`);
+            console.log(`[Migration] Found ${rules.length} rules`);
+            // 保存核心数据到新的文件系统格式
+            console.log('[Migration] Saving core data to file system...');
+            yield promises_1.default.writeFile(path_1.default.join(dataPath, 'vendors.json'), JSON.stringify(vendors, null, 2));
+            yield promises_1.default.writeFile(path_1.default.join(dataPath, 'services.json'), JSON.stringify(services, null, 2));
+            yield promises_1.default.writeFile(path_1.default.join(dataPath, 'routes.json'), JSON.stringify(routes, null, 2));
+            yield promises_1.default.writeFile(path_1.default.join(dataPath, 'rules.json'), JSON.stringify(rules, null, 2));
+            yield promises_1.default.writeFile(path_1.default.join(dataPath, 'config.json'), JSON.stringify(config, null, 2));
+            // 迁移 sessions（如果存在）
+            try {
+                console.log('[Migration] Migrating sessions...');
+                const sessions = oldDb.getSessions(10000, 0);
+                yield promises_1.default.writeFile(path_1.default.join(dataPath, 'sessions.json'), JSON.stringify(sessions, null, 2));
+                console.log(`[Migration] Migrated ${sessions.length} sessions`);
+            }
+            catch (error) {
+                console.log('[Migration] Could not migrate sessions:', error);
+                // 创建空的 sessions 文件
+                yield promises_1.default.writeFile(path_1.default.join(dataPath, 'sessions.json'), JSON.stringify([], null, 2));
+            }
+            // 迁移请求日志（限制数量以避免文件过大）
+            try {
+                console.log('[Migration] Migrating request logs (last 5000)...');
+                const logs = yield oldDb.getLogs(5000, 0);
+                // 完整迁移所有日志，不进行任何截断
+                if (logs.length > 0) {
+                    // 修复字段名：将 response 改为 responseBody
+                    const cleanedLogs = logs.map((log) => (Object.assign(Object.assign({}, log), { 
+                        // 兼容旧的 response 字段名，重命名为 responseBody
+                        responseBody: log.responseBody || log.response, 
+                        // 移除旧的 response 字段（如果存在）
+                        response: undefined })));
+                    yield promises_1.default.writeFile(path_1.default.join(dataPath, 'logs.json'), JSON.stringify(cleanedLogs, null, 2));
+                    console.log(`[Migration] Migrated ${logs.length} request logs`);
+                }
+                else {
+                    // 创建空的日志文件
+                    yield promises_1.default.writeFile(path_1.default.join(dataPath, 'logs.json'), JSON.stringify([], null, 2));
+                    console.log('[Migration] No request logs to migrate');
+                }
+            }
+            catch (error) {
+                console.log('[Migration] Could not migrate logs:', error instanceof Error ? error.message : error);
+                // 创建空的日志文件
+                yield promises_1.default.writeFile(path_1.default.join(dataPath, 'logs.json'), JSON.stringify([], null, 2));
+            }
+            // 迁移错误日志
+            try {
+                console.log('[Migration] Migrating error logs (last 1000)...');
+                const errorLogs = yield oldDb.getErrorLogs(1000, 0);
+                yield promises_1.default.writeFile(path_1.default.join(dataPath, 'error-logs.json'), JSON.stringify(errorLogs, null, 2));
+                console.log(`[Migration] Migrated ${errorLogs.length} error logs`);
+            }
+            catch (error) {
+                console.log('[Migration] Could not migrate error logs:', error);
+                // 创建空的错误日志文件
+                yield promises_1.default.writeFile(path_1.default.join(dataPath, 'error-logs.json'), JSON.stringify([], null, 2));
+            }
+            // 创建空的黑名单文件
+            yield promises_1.default.writeFile(path_1.default.join(dataPath, 'blacklist.json'), JSON.stringify([], null, 2));
+            // 关闭旧数据库连接
+            try {
+                console.log('[Migration] Closing old database connections...');
+                oldDb.close();
+                // 等待一下确保文件句柄被释放
+                yield new Promise(resolve => setTimeout(resolve, 1000));
+                console.log('[Migration] Old database connections closed');
+            }
+            catch (error) {
+                console.log('[Migration] Warning: Could not close old database:', error instanceof Error ? error.message : error);
+            }
+            // 保留原始数据库文件，不进行备份或重命名
+            // 这样如果迁移失败，用户可以使用老版本继续运行
+            console.log('[Migration] ✅ Migration data export completed successfully!');
+            console.log('[Migration] Original database files preserved for rollback');
+        }
+        catch (error) {
+            console.error('[Migration] ❌ Migration failed:', error);
+            console.error('[Migration] Stack trace:', error.stack);
+            throw error;
+        }
+    });
+}
+/**
+ * 检查是否需要迁移
+ * @param dataPath 数据目录路径
+ * @returns 是否需要迁移
+ */
+function needsMigration(dataPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            // 检查是否存在旧的 SQLite 数据库
+            const oldDbPath = path_1.default.join(dataPath, 'app.db');
+            const oldDbExists = yield promises_1.default.access(oldDbPath).then(() => true).catch(() => false);
+            if (!oldDbExists) {
+                return false;
+            }
+            // 检查是否已经存在新的文件系统数据库
+            const newDbPath = path_1.default.join(dataPath, 'config.json');
+            const newDbExists = yield promises_1.default.access(newDbPath).then(() => true).catch(() => false);
+            // 如果旧数据库存在且新数据库不存在，则需要迁移
+            return oldDbExists && !newDbExists;
+        }
+        catch (error) {
+            console.error('[Migration] Error checking migration status:', error);
+            return false;
+        }
+    });
+}
+/**
+ * 验证迁移结果
+ * @param dataPath 数据目录路径
+ * @returns 验证结果
+ */
+function verifyMigration(dataPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const errors = [];
+        const warnings = [];
+        try {
+            // 检查必需的文件
+            const requiredFiles = [
+                'vendors.json',
+                'services.json',
+                'routes.json',
+                'rules.json',
+                'config.json',
+                'sessions.json',
+                'logs.json',
+                'error-logs.json',
+                'blacklist.json',
+            ];
+            for (const file of requiredFiles) {
+                const filePath = path_1.default.join(dataPath, file);
+                try {
+                    yield promises_1.default.access(filePath);
+                    // 尝试解析 JSON
+                    const content = yield promises_1.default.readFile(filePath, 'utf-8');
+                    JSON.parse(content);
+                }
+                catch (error) {
+                    errors.push(`File ${file} is missing or invalid`);
+                }
+            }
+            return {
+                success: errors.length === 0,
+                errors,
+                warnings,
+            };
+        }
+        catch (error) {
+            errors.push(`Verification failed: ${error.message}`);
+            return {
+                success: false,
+                errors,
+                warnings,
+            };
+        }
+    });
+}

package/dist/server/proxy-server.js

@@ -198,7 +198,7 @@ class ProxyServer {
                         method: req.method,
                         path: req.path,
                         headers: this.normalizeHeaders(req.headers),
-                        body: req.body ? JSON.stringify(req.body) : undefined,
+                        body: req.body,
                         error: (lastError === null || lastError === void 0 ? void 0 : lastError.message) || 'All services failed',
                     });
                 }
@@ -246,7 +246,7 @@ class ProxyServer {
                         method: req.method,
                         path: req.path,
                         headers: this.normalizeHeaders(req.headers),
-                        body: req.body ? JSON.stringify(req.body) : undefined,
+                        body: req.body,
                         error: error.message,
                     });
                 }
@@ -379,7 +379,7 @@ class ProxyServer {
                         method: req.method,
                         path: req.path,
                         headers: this.normalizeHeaders(req.headers),
-                        body: req.body ? JSON.stringify(req.body) : undefined,
+                        body: req.body,
                         error: (lastError === null || lastError === void 0 ? void 0 : lastError.message) || 'All services failed',
                     });
                 }
@@ -425,7 +425,7 @@ class ProxyServer {
                         method: req.method,
                         path: req.path,
                         headers: this.normalizeHeaders(req.headers),
-                        body: req.body ? JSON.stringify(req.body) : undefined,
+                        body: req.body,
                         error: error.message,
                     });
                 }
@@ -1285,6 +1285,7 @@ class ProxyServer {
      * 提取会话标题（默认方法）
      * 对于新会话，尝试从第一条消息的内容中提取标题
      * 优化：使用第一条用户消息的完整内容，并智能截取
+     * 对于结构化内容（数组），从最后一个元素取值
      */
     defaultExtractSessionTitle(request, sessionId) {
         var _a;
@@ -1304,11 +1305,19 @@ class ProxyServer {
                 if (typeof content === 'string') {
                     rawText = content;
                 }
-                else if (Array.isArray(content)) {
+                else if (Array.isArray(content) && content.length > 0) {
                     // 处理结构化内容（如图片+文本）
-                    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;
+                    // 从最后一个元素取值，通常最后的文本才是真正的用户输入
+                    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;
+                        }
                     }
                 }
                 if (rawText) {
@@ -1422,7 +1431,7 @@ class ProxyServer {
                     method: req.method,
                     path: req.path,
                     headers: this.normalizeHeaders(req.headers),
-                    body: req.body ? JSON.stringify(req.body) : undefined,
+                    body: req.body,
                     statusCode,
                     responseTime: Date.now() - startTime,
                     targetProvider: service.name,
@@ -1607,7 +1616,8 @@ class ProxyServer {
                         const serializer = new streaming_1.SSESerializerTransform();
                         // 收集响应头
                         responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
-                        res.on('finish', () => {
+                        // 监听事件收集器的完成事件，确保所有chunks都被收集
+                        const finalizeChunks = () => {
                             const usage = converter.getUsage();
                             if (usage) {
                                 usageForLog = (0, claude_openai_1.extractTokenUsageFromClaudeUsage)(usage);
@@ -1621,8 +1631,24 @@ class ProxyServer {
                             }
                             // 收集stream chunks（每个chunk是一个完整的SSE事件）
                             streamChunksForLog = eventCollector.getChunks();
+                            // 将所有 chunks 合并成完整的响应体用于日志记录
+                            responseBodyForLog = streamChunksForLog.join('\n');
                             console.log('[Proxy] Stream request finished, collected chunks:', (streamChunksForLog === null || streamChunksForLog === void 0 ? void 0 : streamChunksForLog.length) || 0);
+                            console.log('[Proxy] Response body length:', (responseBodyForLog === null || responseBodyForLog === void 0 ? void 0 : responseBodyForLog.length) || 0);
                             void finalizeLog(res.statusCode);
+                        };
+                        // 在pipeline完成且eventCollector flush后执行
+                        eventCollector.on('finish', () => {
+                            console.log('[Proxy] EventCollector finished, collecting chunks...');
+                            finalizeChunks();
+                        });
+                        // 备用：如果eventCollector的finish没有触发，监听res的finish
+                        res.on('finish', () => {
+                            console.log('[Proxy] Response finished');
+                            if (!streamChunksForLog) {
+                                console.log('[Proxy] Chunks not collected yet, forcing collection...');
+                                finalizeChunks();
+                            }
                         });
                         // 监听 res 的错误事件
                         res.on('error', (err) => {
@@ -1693,7 +1719,8 @@ class ProxyServer {
                         const converter = new streaming_1.ClaudeToOpenAIChatEventTransform({ model: requestBody === null || requestBody === void 0 ? void 0 : requestBody.model });
                         const serializer = new streaming_1.SSESerializerTransform();
                         responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
-                        res.on('finish', () => {
+                        // 监听事件收集器的完成事件，确保所有chunks都被收集
+                        const finalizeChunks = () => {
                             const usage = converter.getUsage();
                             if (usage) {
                                 usageForLog = (0, claude_openai_1.extractTokenUsageFromOpenAIUsage)(usage);
@@ -1706,8 +1733,24 @@ class ProxyServer {
                                 }
                             }
                             streamChunksForLog = eventCollector.getChunks();
+                            // 将所有 chunks 合并成完整的响应体用于日志记录
+                            responseBodyForLog = streamChunksForLog.join('\n');
                             console.log('[Proxy] Codex stream request finished, collected chunks:', (streamChunksForLog === null || streamChunksForLog === void 0 ? void 0 : streamChunksForLog.length) || 0);
+                            console.log('[Proxy] Response body length:', (responseBodyForLog === null || responseBodyForLog === void 0 ? void 0 : responseBodyForLog.length) || 0);
                             void finalizeLog(res.statusCode);
+                        };
+                        // 在pipeline完成且eventCollector flush后执行
+                        eventCollector.on('finish', () => {
+                            console.log('[Proxy] EventCollector finished (codex), collecting chunks...');
+                            finalizeChunks();
+                        });
+                        // 备用：如果eventCollector的finish没有触发，监听res的finish
+                        res.on('finish', () => {
+                            console.log('[Proxy] Response finished (codex)');
+                            if (!streamChunksForLog) {
+                                console.log('[Proxy] Chunks not collected yet, forcing collection...');
+                                finalizeChunks();
+                            }
                         });
                         // 监听 res 的错误事件
                         res.on('error', (err) => {
@@ -1766,23 +1809,43 @@ class ProxyServer {
                         return;
                     }
                     // 默认stream处理(无转换)
+                    const parser = new streaming_1.SSEParserTransform();
                     const eventCollector = new chunk_collector_1.SSEEventCollectorTransform();
+                    const serializer = new streaming_1.SSESerializerTransform();
                     responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
                     this.copyResponseHeaders(responseHeaders, res);
-                    // 监听 res 的错误事件
-                    res.on('error', (err) => {
-                        console.error('[Proxy] Response stream error:', err);
-                    });
-                    res.on('finish', () => {
+                    // 监听事件收集器的完成事件，确保所有chunks都被收集
+                    const finalizeChunks = () => {
                         streamChunksForLog = eventCollector.getChunks();
+                        // 将所有 chunks 合并成完整的响应体用于日志记录
+                        responseBodyForLog = streamChunksForLog.join('\n');
                         // 尝试从event collector中提取usage信息
                         const extractedUsage = eventCollector.extractUsage();
                         if (extractedUsage) {
                             usageForLog = this.extractTokenUsage(extractedUsage);
                         }
+                        console.log('[Proxy] Default stream request finished, collected chunks:', (streamChunksForLog === null || streamChunksForLog === void 0 ? void 0 : streamChunksForLog.length) || 0);
+                        console.log('[Proxy] Response body length:', (responseBodyForLog === null || responseBodyForLog === void 0 ? void 0 : responseBodyForLog.length) || 0);
                         void finalizeLog(res.statusCode);
+                    };
+                    // 在pipeline完成且eventCollector flush后执行
+                    eventCollector.on('finish', () => {
+                        console.log('[Proxy] EventCollector finished (default stream), collecting chunks...');
+                        finalizeChunks();
+                    });
+                    // 备用：如果eventCollector的finish没有触发，监听res的finish
+                    res.on('finish', () => {
+                        console.log('[Proxy] Response finished (default stream)');
+                        if (!streamChunksForLog) {
+                            console.log('[Proxy] Chunks not collected yet, forcing collection...');
+                            finalizeChunks();
+                        }
+                    });
+                    // 监听 res 的错误事件
+                    res.on('error', (err) => {
+                        console.error('[Proxy] Response stream error:', err);
                     });
-                    (0, stream_1.pipeline)(response.data, eventCollector, res, (error) => __awaiter(this, void 0, void 0, function* () {
+                    (0, stream_1.pipeline)(response.data, parser, eventCollector, serializer, res, (error) => __awaiter(this, void 0, void 0, function* () {
                         if (error) {
                             console.error('[Proxy] Pipeline error (default stream):', error);
                             // 记录到错误日志

package/dist/server/transformers/chunk-collector.js

@@ -203,7 +203,8 @@ class SSEEventCollectorTransform extends stream_1.Transform {
             this.currentEvent = { dataLines: [], rawLines: [] };
             return;
         }
-        const raw = this.currentEvent.rawLines.join('\n');
+        // SSE格式要求事件以空行结束，所以添加一个空行
+        const raw = this.currentEvent.rawLines.join('\n') + '\n';
         const event = {
             event: this.currentEvent.event,
             id: this.currentEvent.id,