aicodeswitch 5.1.0 → 5.1.2

package/dist/server/proxy-server.js

@@ -2761,10 +2761,10 @@ class ProxyServer {
      * @param targetModel 目标模型名称（可选）
      * @returns 转换后往服务商API接口的数据
      */
-    transformRequestToUpstream(tool, source, payloadData, targetModel, providerConfig) {
+    transformRequestToUpstream(tool, source, payloadData, targetModel, providerConfig, serverToolConfig) {
         const clientFormat = tool === 'codex' ? 'responses' : 'claude';
         const upstreamFormat = (0, index_1.sourceTypeToFormat)(source);
-        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig });
+        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig, serverToolConfig });
         const body = result.body;
         // 模型覆盖：OpenAI 模型族保持原样，其余覆盖为 targetModel
         if (targetModel) {
@@ -2898,6 +2898,12 @@ class ProxyServer {
             const useOriginalConfig = (options === null || options === void 0 ? void 0 : options.useOriginalConfig) === true;
             let relayedForLog = !useOriginalConfig;
             let originalToolRequestBody = this.cloneRequestBody(req.body || {});
+            // 请求体安全性清理：修复控制字符、无效 JSON arguments、undefined 值等问题
+            const sanitizeResult = (0, index_1.sanitizeRequestBody)(originalToolRequestBody);
+            if (sanitizeResult.changes.length > 0) {
+                console.log(`[Body-Sanitize] ${sanitizeResult.changes.length} fix(es): ${sanitizeResult.changes.join('; ')}`);
+            }
+            originalToolRequestBody = sanitizeResult.body;
             let requestBody = this.cloneRequestBody(originalToolRequestBody) || {};
             let usageForLog;
             let logged = false;
@@ -3286,7 +3292,8 @@ class ProxyServer {
                 const effectiveApiUrl = this.resolveEffectiveApiUrl(service);
                 const effectiveModel = rule.targetModel || (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model);
                 const providerConfig = (0, index_1.getReasoningConfig)(service.name || '', effectiveApiUrl || '', effectiveModel || '');
-                const transformedRequestBody = this.transformRequestToUpstream(targetType, sourceType, payloadForTransform, rule.targetModel, providerConfig);
+                const serverToolConfig = (0, index_1.getServerToolSupport)(service.name || '', effectiveApiUrl || '');
+                const transformedRequestBody = this.transformRequestToUpstream(targetType, sourceType, payloadForTransform, rule.targetModel, providerConfig, serverToolConfig);
                 requestBody = (_b = transformedRequestBody !== null && transformedRequestBody !== void 0 ? transformedRequestBody : this.cloneRequestBody(originalToolRequestBody)) !== null && _b !== void 0 ? _b : {};
                 // 对最终即将发送到上游的 Claude compact 请求再做一次兜底清理，
                 // 避免中间转换/覆盖步骤重新引入未配对的 tool_use。
@@ -3921,6 +3928,12 @@ class ProxyServer {
             console.log(`\x1b[32m[ApiPathProxy]\x1b[0m path=${apiPath}, clientFormat=${clientFormat}, session=-, rule=${rule.id}(${rule.contentType}), vendor=${(vendor === null || vendor === void 0 ? void 0 : vendor.name) || '-'}, service=${service.name}`);
             const failoverEnabled = (options === null || options === void 0 ? void 0 : options.failoverEnabled) === true;
             let requestBody = this.cloneRequestBody(req.body || {});
+            // 请求体安全性清理：修复控制字符、无效 JSON arguments、undefined 值等问题
+            const sanitizeResult = (0, index_1.sanitizeRequestBody)(requestBody);
+            if (sanitizeResult.changes.length > 0) {
+                console.log(`[Body-Sanitize] ${sanitizeResult.changes.length} fix(es): ${sanitizeResult.changes.join('; ')}`);
+            }
+            requestBody = sanitizeResult.body;
             let usageForLog;
             let responseBodyForLog;
             let downstreamResponseBodyForLog;
@@ -3972,7 +3985,8 @@ class ProxyServer {
             const effectiveApiUrl = this.resolveEffectiveApiUrl(service);
             const effectiveModel = rule.targetModel || (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model);
             const providerConfig = (0, index_1.getReasoningConfig)(service.name || '', effectiveApiUrl || '', effectiveModel || '');
-            const transformedRequestBody = this.transformRequestByFormat(clientFormat, sourceType, payloadForTransform, rule.targetModel, providerConfig);
+            const serverToolConfig = (0, index_1.getServerToolSupport)(service.name || '', effectiveApiUrl || '');
+            const transformedRequestBody = this.transformRequestByFormat(clientFormat, sourceType, payloadForTransform, rule.targetModel, providerConfig, serverToolConfig);
             requestBody = (_a = transformedRequestBody !== null && transformedRequestBody !== void 0 ? transformedRequestBody : this.cloneRequestBody(requestBody)) !== null && _a !== void 0 ? _a : {};
             // Compact final sanitize
             if (rule.contentType === 'compact' && clientFormat === 'claude' && Array.isArray(requestBody === null || requestBody === void 0 ? void 0 : requestBody.messages)) {
@@ -4184,9 +4198,9 @@ class ProxyServer {
     /**
      * 使用显式 clientFormat 进行请求转换（取代 tool → format 的硬编码映射）
      */
-    transformRequestByFormat(clientFormat, source, payloadData, targetModel, providerConfig) {
+    transformRequestByFormat(clientFormat, source, payloadData, targetModel, providerConfig, serverToolConfig) {
         const upstreamFormat = (0, index_1.sourceTypeToFormat)(source);
-        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig });
+        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig, serverToolConfig });
         const body = result.body;
         if (targetModel) {
             const isOpenAIModel = /^gpt-|o[123]/i.test(targetModel);