@adversity/coding-tool-x 3.0.5 → 3.1.0

package/src/server/proxy-server.js

@@ -13,6 +13,7 @@ const { recordRequest } = require('./services/statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
 const eventBus = require('../plugins/event-bus');
 const { CLAUDE_MODEL_PRICING } = require('../config/model-pricing');
+const { getEffectiveApiKey } = require('./services/channels');
 
 let proxyServer = null;
 let proxyApp = null;
@@ -21,6 +22,10 @@ let currentPort = null;
 // 用于存储每个请求的元数据（用于 WebSocket 日志）
 const requestMetadata = new Map();
 
+// 用于缓存已打印过的模型重定向规则，避免重复打印
+// 格式: { channelId: { "originalModel": "redirectedModel", ... } }
+const printedRedirectCache = new Map();
+
 const CLAUDE_BASE_PRICING = DEFAULT_CONFIG.pricing.claude;
 const ONE_MILLION = 1000000;
 
@@ -181,9 +186,10 @@ async function startProxyServer(options = {}) {
         });
 
         proxyReq.removeHeader('x-api-key');
-        proxyReq.setHeader('x-api-key', selectedChannel.apiKey);
+        const effectiveKey = getEffectiveApiKey(selectedChannel);
+        proxyReq.setHeader('x-api-key', effectiveKey);
         proxyReq.removeHeader('authorization');
-        proxyReq.setHeader('authorization', `Bearer ${selectedChannel.apiKey}`);
+        proxyReq.setHeader('authorization', `Bearer ${effectiveKey}`);
 
         if (!proxyReq.getHeader('anthropic-version')) {
           proxyReq.setHeader('anthropic-version', '2023-06-01');
@@ -225,7 +231,14 @@ async function startProxyServer(options = {}) {
             req.body.model = redirectedModel;
             // 更新 rawBody 以匹配修改后的 body
             req.rawBody = Buffer.from(JSON.stringify(req.body));
-            console.log(`[Model Redirect] ${originalModel} → ${redirectedModel} (channel: ${channel.name})`);
+
+            // 只在重定向规则变化时打印日志（避免每次请求都打印）
+            const cachedRedirects = printedRedirectCache.get(channel.id) || {};
+            if (cachedRedirects[originalModel] !== redirectedModel) {
+              cachedRedirects[originalModel] = redirectedModel;
+              printedRedirectCache.set(channel.id, cachedRedirects);
+              console.log(`[Model Redirect] ${originalModel} → ${redirectedModel} (channel: ${channel.name})`);
+            }
           }
         }
 
@@ -526,8 +539,22 @@ function getProxyStatus() {
   };
 }
 
+/**
+ * 清除指定渠道的模型重定向日志缓存
+ * 用于在渠道配置更新后触发重新打印日志
+ * @param {string} channelId - 渠道 ID
+ */
+function clearRedirectCache(channelId) {
+  if (channelId) {
+    printedRedirectCache.delete(channelId);
+  } else {
+    printedRedirectCache.clear();
+  }
+}
+
 module.exports = {
   startProxyServer,
   stopProxyServer,
-  getProxyStatus
+  getProxyStatus,
+  clearRedirectCache
 };

package/src/server/services/channels.js

@@ -65,6 +65,11 @@ function applyChannelDefaults(channel) {
     normalized.enabled = !!normalized.enabled;
   }
 
+  // OAuth 字段默认值（向后兼容）
+  if (!normalized.authType) {
+    normalized.authType = 'apiKey';
+  }
+
   normalized.weight = normalizeNumber(normalized.weight, 1, 100);
 
   if (normalized.maxConcurrency === undefined ||
@@ -189,7 +194,11 @@ function createChannel(name, baseUrl, apiKey, websiteUrl, extraConfig = {}) {
     modelConfig: extraConfig.modelConfig || null,
     modelRedirects: extraConfig.modelRedirects || [],
     proxyUrl: extraConfig.proxyUrl || '',
-    speedTestModel: extraConfig.speedTestModel || null
+    speedTestModel: extraConfig.speedTestModel || null,
+    // OAuth 支持
+    authType: extraConfig.authType || 'apiKey',
+    oauthProvider: extraConfig.oauthProvider || null,
+    oauthTokenId: extraConfig.oauthTokenId || null
   });
 
   data.channels.push(newChannel);
@@ -381,6 +390,27 @@ function updateClaudeSettings(baseUrl, apiKey) {
   fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
 }
 
+/**
+ * 获取渠道的有效 API Key
+ * 如果渠道使用 OAuth 认证，返回有效的 OAuth 令牌；否则返回静态 API Key
+ *
+ * @param {Object} channel - 渠道对象
+ * @returns {string|null} 有效的 API Key，OAuth 令牌无效/过期时返回 null
+ */
+function getEffectiveApiKey(channel) {
+  if (channel.authType === 'oauth' && channel.oauthTokenId) {
+    const { getToken, isTokenExpired } = require('./oauth-token-storage');
+    const token = getToken(channel.oauthTokenId);
+    if (token && !isTokenExpired(token)) {
+      return token.accessToken;
+    }
+    // OAuth 令牌无效或已过期，返回 null（调用方应处理刷新或报错）
+    console.warn(`[Channels] OAuth token expired or not found for channel ${channel.name}`);
+    return null;
+  }
+  return channel.apiKey;
+}
+
 module.exports = {
   getAllChannels,
   getCurrentSettings,
@@ -390,5 +420,6 @@ module.exports = {
   applyChannelToSettings,
   getBestChannelForRestore,
   updateClaudeSettings,
-  updateClaudeSettingsWithModelConfig
+  updateClaudeSettingsWithModelConfig,
+  getEffectiveApiKey
 };

package/src/server/services/codex-channels.js

@@ -47,7 +47,10 @@ function loadChannels() {
         ...ch,
         enabled: ch.enabled !== false, // 默认启用
         weight: ch.weight || 1,
-        maxConcurrency: ch.maxConcurrency || null
+        maxConcurrency: ch.maxConcurrency || null,
+        modelRedirects: ch.modelRedirects || [],
+        speedTestModel: ch.speedTestModel || null,
+        authType: ch.authType || 'apiKey' // 默认 API Key 认证
       }));
     }
     return data;
@@ -175,6 +178,11 @@ function createChannel(name, providerKey, baseUrl, apiKey, wireApi = 'responses'
     enabled: extraConfig.enabled !== false, // 默认启用
     weight: extraConfig.weight || 1,
     maxConcurrency: extraConfig.maxConcurrency || null,
+    modelRedirects: extraConfig.modelRedirects || [],
+    speedTestModel: extraConfig.speedTestModel || null,
+    authType: extraConfig.authType || 'apiKey',
+    oauthProvider: extraConfig.oauthProvider || null,
+    oauthTokenId: extraConfig.oauthTokenId || null,
     createdAt: Date.now(),
     updatedAt: Date.now()
   };
@@ -217,11 +225,13 @@ function updateChannel(channelId, updates) {
     }
   }
 
+  const merged = { ...oldChannel, ...updates };
   const newChannel = {
-    ...oldChannel,
-    ...updates,
+    ...merged,
     id: channelId, // 保持 ID 不变
     createdAt: oldChannel.createdAt, // 保持创建时间
+    modelRedirects: merged.modelRedirects || [],
+    speedTestModel: merged.speedTestModel !== undefined ? merged.speedTestModel : (oldChannel.speedTestModel || null),
     updatedAt: Date.now()
   };
 
@@ -643,6 +653,26 @@ try {
   console.warn('[Codex Channels] Auto sync env vars failed:', err.message);
 }
 
+/**
+ * 获取渠道的有效 API Key
+ * 如果渠道使用 OAuth 认证，返回 OAuth 令牌；否则返回静态 API Key
+ *
+ * @param {Object} channel - 渠道对象
+ * @returns {string|null} 有效的 API Key
+ */
+function getEffectiveApiKey(channel) {
+  if (channel.authType === 'oauth' && channel.oauthTokenId) {
+    const { getToken, isTokenExpired } = require('./oauth-token-storage');
+    const token = getToken(channel.oauthTokenId);
+    if (token && !isTokenExpired(token)) {
+      return token.accessToken;
+    }
+    // OAuth 令牌无效或已过期，返回 null
+    return null;
+  }
+  return channel.apiKey;
+}
+
 module.exports = {
   getChannels,
   createChannel,
@@ -652,5 +682,6 @@ module.exports = {
   saveChannelOrder,
   syncAllChannelEnvVars,
   writeCodexConfigForMultiChannel,
-  applyChannelToSettings
+  applyChannelToSettings,
+  getEffectiveApiKey
 };