aicodeswitch 3.9.3 → 3.9.4

package/dist/server/fs-database.js

@@ -209,6 +209,8 @@ class FileSystemDatabaseManager {
             yield this.loadAllData();
             // 执行数据源类型迁移（在加载数据之后）
             yield this.migrateSourceTypes();
+            // OpenAI base URL 迁移：将末尾 /v1 自动移除
+            yield this.migrateOpenAIBaseUrls();
             // 确保默认配置
             yield this.ensureDefaultConfig();
         });
@@ -357,6 +359,41 @@ class FileSystemDatabaseManager {
             console.log(`[TypeMigration] Migration completed. Migrated ${migratedCount} services.`);
         });
     }
+    /**
+     * 迁移 OpenAI base URL（在初始化时执行）
+     * 仅处理 sourceType=openai 且 apiUrl 末尾为 /v1 的服务
+     */
+    migrateOpenAIBaseUrls() {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log('[OpenAIBaseUrlMigration] Checking for OpenAI base URL migration...');
+            let migratedCount = 0;
+            for (const vendor of this.vendors) {
+                if (!vendor.services)
+                    continue;
+                for (const service of vendor.services) {
+                    if (service.sourceType !== 'openai' || typeof service.apiUrl !== 'string') {
+                        continue;
+                    }
+                    const trimmedUrl = service.apiUrl.trim();
+                    if (!/\/v1\/?$/i.test(trimmedUrl)) {
+                        continue;
+                    }
+                    const migratedUrl = trimmedUrl.replace(/\/v1\/?$/i, '');
+                    if (migratedUrl && migratedUrl !== service.apiUrl) {
+                        console.log(`[OpenAIBaseUrlMigration] Migrated service "${service.name}": ${service.apiUrl} -> ${migratedUrl}`);
+                        service.apiUrl = migratedUrl;
+                        migratedCount++;
+                    }
+                }
+            }
+            if (migratedCount === 0) {
+                console.log('[OpenAIBaseUrlMigration] No migration needed');
+                return;
+            }
+            yield this.saveVendors();
+            console.log(`[OpenAIBaseUrlMigration] Migration completed. Migrated ${migratedCount} services.`);
+        });
+    }
     /**
      * 迁移导入数据中的类型
      * 用于导入功能，自动将旧类型转换为新类型
@@ -364,7 +401,13 @@ class FileSystemDatabaseManager {
     migrateVendorsOnImport(vendors) {
         return vendors.map(vendor => {
             var _a;
-            return (Object.assign(Object.assign({}, vendor), { services: (_a = vendor.services) === null || _a === void 0 ? void 0 : _a.map(service => (Object.assign(Object.assign({}, service), { sourceType: service.sourceType ? (0, type_migration_1.normalizeSourceType)(service.sourceType) : undefined }))) }));
+            return (Object.assign(Object.assign({}, vendor), { services: (_a = vendor.services) === null || _a === void 0 ? void 0 : _a.map(service => {
+                    const normalizedSourceType = service.sourceType ? (0, type_migration_1.normalizeSourceType)(service.sourceType) : undefined;
+                    const normalizedApiUrl = normalizedSourceType === 'openai' && typeof service.apiUrl === 'string'
+                        ? service.apiUrl.trim().replace(/\/v1\/?$/i, '')
+                        : service.apiUrl;
+                    return Object.assign(Object.assign({}, service), { sourceType: normalizedSourceType, apiUrl: normalizedApiUrl });
+                }) }));
         });
     }
     saveVendors() {

package/dist/server/main.js

@@ -104,6 +104,31 @@ const asyncHandler = (handler) => (req, res, next) => {
         next(err);
     });
 };
+const OPENAI_V1_SUFFIX_RE = /\/v1\/?$/i;
+const validateOpenAIServiceBaseUrl = (service) => {
+    if ((service === null || service === void 0 ? void 0 : service.sourceType) !== 'openai') {
+        return null;
+    }
+    if (typeof service.apiUrl !== 'string') {
+        return null;
+    }
+    if (!OPENAI_V1_SUFFIX_RE.test(service.apiUrl.trim())) {
+        return null;
+    }
+    return 'OpenAI 数据源请填写不包含 /v1 的 base URL，例如：https://api.openai.com';
+};
+const validateOpenAIServiceBaseUrlsInVendorPayload = (vendorBody) => {
+    if (!Array.isArray(vendorBody === null || vendorBody === void 0 ? void 0 : vendorBody.services)) {
+        return null;
+    }
+    for (const service of vendorBody.services) {
+        const error = validateOpenAIServiceBaseUrl(service);
+        if (error) {
+            return error;
+        }
+    }
+    return null;
+};
 const writeClaudeConfig = (dbManager, enableAgentTeams, enableBypassPermissionsSupport) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const homeDir = os_1.default.homedir();
@@ -902,8 +927,22 @@ const registerRoutes = (dbManager, proxyServer) => {
         }
     });
     app.get('/api/vendors', (_req, res) => res.json(dbManager.getVendors()));
-    app.post('/api/vendors', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () { return res.json(yield dbManager.createVendor(req.body)); })));
-    app.put('/api/vendors/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () { return res.json(yield dbManager.updateVendor(req.params.id, req.body)); })));
+    app.post('/api/vendors', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const error = validateOpenAIServiceBaseUrlsInVendorPayload(req.body);
+        if (error) {
+            res.status(400).json({ error });
+            return;
+        }
+        res.json(yield dbManager.createVendor(req.body));
+    })));
+    app.put('/api/vendors/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const error = validateOpenAIServiceBaseUrlsInVendorPayload(req.body);
+        if (error) {
+            res.status(400).json({ error });
+            return;
+        }
+        res.json(yield dbManager.updateVendor(req.params.id, req.body));
+    })));
     app.delete('/api/vendors/:id', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const result = yield dbManager.deleteVendor(req.params.id);
@@ -921,11 +960,29 @@ const registerRoutes = (dbManager, proxyServer) => {
     });
     app.post('/api/services', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         console.log('[创建服务] 请求数据:', JSON.stringify(req.body, null, 2));
+        const error = validateOpenAIServiceBaseUrl(req.body);
+        if (error) {
+            res.status(400).json({ error });
+            return;
+        }
         const result = yield dbManager.createAPIService(req.body);
         console.log('[创建服务] 创建结果:', JSON.stringify(result, null, 2));
         res.json(result);
     })));
-    app.put('/api/services/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () { return res.json(yield dbManager.updateAPIService(req.params.id, req.body)); })));
+    app.put('/api/services/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const existingService = dbManager.getAPIService(req.params.id);
+        if (!existingService) {
+            res.status(404).json({ error: '服务不存在' });
+            return;
+        }
+        const mergedService = Object.assign(Object.assign({}, existingService), req.body);
+        const error = validateOpenAIServiceBaseUrl(mergedService);
+        if (error) {
+            res.status(400).json({ error });
+            return;
+        }
+        res.json(yield dbManager.updateAPIService(req.params.id, req.body));
+    })));
     app.delete('/api/services/:id', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         console.log('[删除服务] 请求 ID:', req.params.id);
         try {

package/dist/server/proxy-server.js

@@ -1714,19 +1714,15 @@ class ProxyServer {
     }
     /**
      * 构建 OpenAI Responses 类型的完整 URL
-     * - baseUrl 以 /v{number} 结尾时，直接拼接请求路径
-     * - baseUrl 不带版本时，自动补 /v1 再拼接请求路径
-     * - 兼容请求路径本身已携带版本前缀（如 /v1/responses）场景
+     * - 用户填写不含 /v1 的 baseUrl
+     * - 服务端固定拼接 /v1 + 请求路径
      */
     buildOpenAIResponsesUrl(baseUrl, mappedPath) {
         const trimmedBase = baseUrl.trim().replace(/\/+$/, '');
         const normalizedPath = mappedPath.startsWith('/') || mappedPath === '' ? mappedPath : `/${mappedPath}`;
-        const baseHasVersionSuffix = /\/v\d+$/i.test(trimmedBase);
-        const pathHasVersionPrefix = /^\/v\d+(?:\/|$)/i.test(normalizedPath);
-        if (baseHasVersionSuffix || pathHasVersionPrefix) {
-            return `${trimmedBase}${normalizedPath}`;
-        }
-        return `${trimmedBase}/v1${normalizedPath}`;
+        const pathWithoutVersionPrefix = normalizedPath.replace(/^\/v\d+(?=\/|$)/i, '');
+        const normalizedResponsesPath = pathWithoutVersionPrefix || '/responses';
+        return `${trimmedBase}/v1${normalizedResponsesPath}`;
     }
     /**
      * 构建 Gemini API 的完整 URL
@@ -2470,7 +2466,13 @@ class ProxyServer {
                     upstreamUrl = this.buildGeminiUrl(service.apiUrl, model, streamRequested);
                 }
                 else if (sourceType === 'openai') {
-                    // OpenAI Responses 兼容模式：自动处理 baseUrl 是否包含 /v{number}
+                    if (/\/v1\/?$/i.test(service.apiUrl.trim())) {
+                        const error = 'OpenAI 数据源请填写不包含 /v1 的 base URL，例如：https://api.openai.com';
+                        res.status(400).json({ error });
+                        yield finalizeLog(400, error);
+                        return;
+                    }
+                    // OpenAI Responses：固定拼接为 {baseUrl}/v1/*
                     upstreamUrl = this.buildOpenAIResponsesUrl(service.apiUrl, mappedPath);
                 }
                 else if (this.isChatType(sourceType) || this.isGeminiChatSource(sourceType)) {