@adversity/coding-tool-x 3.1.1 → 3.1.3

package/src/server/codex-proxy-server.js

@@ -7,11 +7,11 @@ const { allocateChannel, releaseChannel, getSchedulerState } = require('./servic
 const { recordSuccess, recordFailure } = require('./services/channel-health');
 const { loadConfig } = require('../config/loader');
 const DEFAULT_CONFIG = require('../config/default');
-const { resolvePricing } = require('./utils/pricing');
+const { resolveModelPricing } = require('./utils/pricing');
 const { recordRequest: recordCodexRequest } = require('./services/codex-statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
+const { createDecodedStream } = require('./services/response-decoder');
 const { getEnabledChannels, writeCodexConfigForMultiChannel, getEffectiveApiKey } = require('./services/codex-channels');
-const { CLAUDE_MODEL_PRICING } = require('../config/model-pricing');
 
 let proxyServer = null;
 let proxyApp = null;
@@ -25,7 +25,7 @@ const requestMetadata = new Map();
 const printedRedirectCache = new Map();
 
 // OpenAI 模型定价（每百万 tokens 的价格，单位：美元）
-// Claude 模型使用 config/model-pricing.js 中的集中定价
+// 作为 model-metadata 未覆盖时的兜底值
 const PRICING = {
   'gpt-4o': { input: 2.5, output: 10 },
   'gpt-4o-2024-11-20': { input: 2.5, output: 10 },
@@ -142,61 +142,33 @@ function resolveCodexTarget(baseUrl = '', requestPath = '') {
  * 计算请求成本
  */
 function calculateCost(model, tokens) {
-  let pricing;
-
-  // 首先检查是否是 Claude 模型，使用集中定价
-  if (model.startsWith('claude-') || model.toLowerCase().includes('claude')) {
-    pricing = CLAUDE_MODEL_PRICING[model];
-
-    // 如果没有精确匹配，尝试模糊匹配 Claude 模型
-    if (!pricing) {
-      const modelLower = model.toLowerCase();
-      // 查找最接近的 Claude 模型
-      for (const [key, value] of Object.entries(CLAUDE_MODEL_PRICING)) {
-        if (key.toLowerCase().includes(modelLower) || modelLower.includes(key.toLowerCase())) {
-          pricing = value;
-          break;
-        }
-      }
-    }
-
-    // 如果仍然没有找到，使用默认 Sonnet 定价
-    if (!pricing) {
-      pricing = CLAUDE_MODEL_PRICING['claude-sonnet-4-5-20250929'];
-    }
-  } else {
-    // 非 Claude 模型，使用 PRICING 对象（OpenAI 等）
-    pricing = PRICING[model];
-
-    // 如果没有精确匹配，尝试模糊匹配
-    if (!pricing) {
-      const modelLower = model.toLowerCase();
-      if (modelLower.includes('gpt-4o-mini')) {
-        pricing = PRICING['gpt-4o-mini'];
-      } else if (modelLower.includes('gpt-4o')) {
-        pricing = PRICING['gpt-4o'];
-      } else if (modelLower.includes('gpt-4')) {
-        pricing = PRICING['gpt-4'];
-      } else if (modelLower.includes('gpt-3.5')) {
-        pricing = PRICING['gpt-3.5-turbo'];
-      } else if (modelLower.includes('o1-mini')) {
-        pricing = PRICING['o1-mini'];
-      } else if (modelLower.includes('o1-pro')) {
-        pricing = PRICING['o1-pro'];
-      } else if (modelLower.includes('o1')) {
-        pricing = PRICING['o1'];
-      } else if (modelLower.includes('o3-mini')) {
-        pricing = PRICING['o3-mini'];
-      } else if (modelLower.includes('o3')) {
-        pricing = PRICING['o3'];
-      } else if (modelLower.includes('o4-mini')) {
-        pricing = PRICING['o4-mini'];
-      }
+  let fallbackPricing = PRICING[model];
+  if (!fallbackPricing) {
+    const modelLower = String(model || '').toLowerCase();
+    if (modelLower.includes('gpt-4o-mini')) {
+      fallbackPricing = PRICING['gpt-4o-mini'];
+    } else if (modelLower.includes('gpt-4o')) {
+      fallbackPricing = PRICING['gpt-4o'];
+    } else if (modelLower.includes('gpt-4')) {
+      fallbackPricing = PRICING['gpt-4'];
+    } else if (modelLower.includes('gpt-3.5')) {
+      fallbackPricing = PRICING['gpt-3.5-turbo'];
+    } else if (modelLower.includes('o1-mini')) {
+      fallbackPricing = PRICING['o1-mini'];
+    } else if (modelLower.includes('o1-pro')) {
+      fallbackPricing = PRICING['o1-pro'];
+    } else if (modelLower.includes('o1')) {
+      fallbackPricing = PRICING['o1'];
+    } else if (modelLower.includes('o3-mini')) {
+      fallbackPricing = PRICING['o3-mini'];
+    } else if (modelLower.includes('o3')) {
+      fallbackPricing = PRICING['o3'];
+    } else if (modelLower.includes('o4-mini')) {
+      fallbackPricing = PRICING['o4-mini'];
     }
   }
 
-  // 默认使用基础定价
-  pricing = resolvePricing('codex', pricing, CODEX_BASE_PRICING);
+  const pricing = resolveModelPricing('codex', model, fallbackPricing, CODEX_BASE_PRICING);
   const inputRate = typeof pricing.input === 'number' ? pricing.input : CODEX_BASE_PRICING.input;
   const outputRate = typeof pricing.output === 'number' ? pricing.output : CODEX_BASE_PRICING.output;
 
@@ -402,14 +374,15 @@ async function startCodexProxyServer(options = {}) {
         totalTokens: 0,
         model: ''
       };
+      const parsedStream = createDecodedStream(proxyRes);
 
-      proxyRes.on('data', (chunk) => {
+      parsedStream.on('data', (chunk) => {
         // 如果响应已关闭，停止处理
         if (isResponseClosed) {
           return;
         }
 
-        buffer += chunk.toString();
+        buffer += chunk.toString('utf8');
 
         // 检查是否是 SSE 流
         if (proxyRes.headers['content-type']?.includes('text/event-stream')) {
@@ -475,7 +448,7 @@ async function startCodexProxyServer(options = {}) {
         }
       });
 
-      proxyRes.on('end', () => {
+      parsedStream.on('end', () => {
         // 如果不是流式响应，尝试从完整响应中解析
         if (!proxyRes.headers['content-type']?.includes('text/event-stream')) {
           try {
@@ -558,7 +531,7 @@ async function startCodexProxyServer(options = {}) {
         }
       });
 
-      proxyRes.on('error', (err) => {
+      parsedStream.on('error', (err) => {
         // 忽略代理响应错误（可能是网络问题）
         if (err.code !== 'EPIPE' && err.code !== 'ECONNRESET') {
           console.error('Proxy response error:', err);

package/src/server/gemini-proxy-server.js

@@ -7,9 +7,10 @@ const { allocateChannel, releaseChannel, getSchedulerState } = require('./servic
 const { recordSuccess, recordFailure } = require('./services/channel-health');
 const { loadConfig } = require('../config/loader');
 const DEFAULT_CONFIG = require('../config/default');
-const { resolvePricing } = require('./utils/pricing');
+const { resolveModelPricing } = require('./utils/pricing');
 const { recordRequest: recordGeminiRequest } = require('./services/gemini-statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
+const { createDecodedStream } = require('./services/response-decoder');
 const { getEffectiveApiKey } = require('./services/gemini-channels');
 
 let proxyServer = null;
@@ -24,6 +25,7 @@ const requestMetadata = new Map();
 const printedGeminiRedirectCache = new Map();
 
 // Gemini 模型定价（每百万 tokens 的价格，单位：美元）
+// 作为 model-metadata 未覆盖时的兜底值
 const PRICING = {
   'gemini-2.5-pro': { input: 1.25, output: 5 },
   'gemini-2.5-flash': { input: 0.075, output: 0.3 },
@@ -78,33 +80,33 @@ function redirectModel(originalModel, channel) {
  */
 function calculateCost(model, tokens) {
   // 尝试精确匹配
-  let pricing = PRICING[model];
+  let fallbackPricing = PRICING[model];
 
   // 如果没有精确匹配，尝试模糊匹配
-  if (!pricing) {
-    const modelLower = model.toLowerCase();
+  if (!fallbackPricing) {
+    const modelLower = String(model || '').toLowerCase();
     if (modelLower.includes('gemini-2.5-pro')) {
-      pricing = PRICING['gemini-2.5-pro'];
+      fallbackPricing = PRICING['gemini-2.5-pro'];
     } else if (modelLower.includes('gemini-2.5-flash')) {
-      pricing = PRICING['gemini-2.5-flash'];
+      fallbackPricing = PRICING['gemini-2.5-flash'];
     } else if (modelLower.includes('gemini-2.0-flash-thinking')) {
-      pricing = PRICING['gemini-2.0-flash-thinking-exp-1219'];
+      fallbackPricing = PRICING['gemini-2.0-flash-thinking-exp-1219'];
     } else if (modelLower.includes('gemini-2.0-flash')) {
-      pricing = PRICING['gemini-2.0-flash-exp'];
+      fallbackPricing = PRICING['gemini-2.0-flash-exp'];
     } else if (modelLower.includes('gemini-1.5-pro')) {
-      pricing = PRICING['gemini-1.5-pro'];
+      fallbackPricing = PRICING['gemini-1.5-pro'];
     } else if (modelLower.includes('gemini-1.5-flash-8b')) {
-      pricing = PRICING['gemini-1.5-flash-8b'];
+      fallbackPricing = PRICING['gemini-1.5-flash-8b'];
     } else if (modelLower.includes('gemini-1.5-flash')) {
-      pricing = PRICING['gemini-1.5-flash'];
+      fallbackPricing = PRICING['gemini-1.5-flash'];
     } else if (modelLower.includes('gemini-1.0-pro')) {
-      pricing = PRICING['gemini-1.0-pro'];
+      fallbackPricing = PRICING['gemini-1.0-pro'];
     } else if (modelLower.includes('gemini-pro')) {
-      pricing = PRICING['gemini-pro'];
+      fallbackPricing = PRICING['gemini-pro'];
     }
   }
 
-  pricing = resolvePricing('gemini', pricing, GEMINI_BASE_PRICING);
+  const pricing = resolveModelPricing('gemini', model, fallbackPricing, GEMINI_BASE_PRICING);
   const inputRate = typeof pricing.input === 'number' ? pricing.input : GEMINI_BASE_PRICING.input;
   const outputRate = typeof pricing.output === 'number' ? pricing.output : GEMINI_BASE_PRICING.output;
 
@@ -289,14 +291,15 @@ async function startGeminiProxyServer(options = {}) {
         totalTokens: 0,
         model: ''
       };
+      const parsedStream = createDecodedStream(proxyRes);
 
-      proxyRes.on('data', (chunk) => {
+      parsedStream.on('data', (chunk) => {
         // 如果响应已关闭，停止处理
         if (isResponseClosed) {
           return;
         }
 
-        buffer += chunk.toString();
+        buffer += chunk.toString('utf8');
 
         // 检查是否是 SSE 流
         if (proxyRes.headers['content-type']?.includes('text/event-stream')) {
@@ -360,7 +363,7 @@ async function startGeminiProxyServer(options = {}) {
         }
       });
 
-      proxyRes.on('end', () => {
+      parsedStream.on('end', () => {
         // 如果不是流式响应，尝试从完整响应中解析
         if (!proxyRes.headers['content-type']?.includes('text/event-stream')) {
           try {
@@ -467,7 +470,7 @@ async function startGeminiProxyServer(options = {}) {
         }
       });
 
-      proxyRes.on('error', (err) => {
+      parsedStream.on('error', (err) => {
         // 忽略代理响应错误（可能是网络问题）
         if (err.code !== 'EPIPE' && err.code !== 'ECONNRESET') {
           console.error('Proxy response error:', err);

package/src/server/index.js

@@ -15,7 +15,7 @@ const { setProxyConfig: setOpenCodeProxyConfig } = require('./services/opencode-
 const { startProxyServer } = require('./proxy-server');
 const { startCodexProxyServer } = require('./codex-proxy-server');
 const { startGeminiProxyServer } = require('./gemini-proxy-server');
-const { startOpenCodeProxyServer } = require('./opencode-proxy-server');
+const { startOpenCodeProxyServer, collectProxyModelList } = require('./opencode-proxy-server');
 const { createRemoteMutationGuard, createRemoteRouteGuard } = require('./services/network-access');
 
 function isInteractivePortConflictMode(options = {}) {
@@ -158,9 +158,6 @@ async function startServer(port, host = '127.0.0.1', options = {}) {
   app.use('/api/opencode/proxy', require('./api/opencode-proxy'));
   app.use('/api/opencode/statistics', require('./api/opencode-statistics'));
 
-  // 会话格式转换 API
-  app.use('/api/convert', require('./api/convert'));
-
   app.use('/api/aliases', require('./api/aliases')());
   app.use('/api/favorites', require('./api/favorites'));
   app.use('/api/ui-config', require('./api/ui-config'));
@@ -269,8 +266,8 @@ async function startServer(port, host = '127.0.0.1', options = {}) {
   // 自动恢复代理状态
   autoRestoreProxies();
 
-  // 启动时执行健康检查
-  performStartupHealthCheck();
+  // 延迟执行健康检查，避免阻塞启动
+  setTimeout(() => performStartupHealthCheck(), 2000);
 
   return server;
 }
@@ -349,7 +346,7 @@ function autoRestoreProxies() {
     console.log(chalk.cyan('\n🔄 检测到 OpenCode 代理状态文件，正在自动启动...'));
     const opencodeProxyPort = config.ports?.opencodeProxy || 20091;
     startOpenCodeProxyServer(opencodeProxyPort)
-      .then((result) => {
+      .then(async (result) => {
         if (result.success) {
           console.log(chalk.green(`✅ OpenCode 代理已自动启动，端口: ${result.port}`));
           try {
@@ -365,6 +362,15 @@ function autoRestoreProxies() {
                 }
               });
             });
+            const detectedModels = await collectProxyModelList(enabledChs, { useCacheOnly: true });
+            if (Array.isArray(detectedModels)) {
+              detectedModels.forEach((m) => {
+                if (typeof m === 'string' && m.trim() && !seen.has(m.trim().toLowerCase())) {
+                  seen.add(m.trim().toLowerCase());
+                  allModels.push(m.trim());
+                }
+              });
+            }
             const firstChannel = enabledChs[0];
             const activeModel = firstChannel && (firstChannel.model || firstChannel.speedTestModel) || null;
             const cfgResult = setOpenCodeProxyConfig(result.port, { model: activeModel, models: allModels });