protocol-proxy 2.0.6 → 2.1.0

package/lib/config-store.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const crypto = require('crypto');
 
 const CONFIG_PATH = path.join(os.homedir(), '.protocol-proxy', 'proxies.json');
 
@@ -15,7 +16,7 @@ function migrateOldConfig() {
     const dir = path.dirname(CONFIG_PATH);
     if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
     fs.copyFileSync(OLD_CONFIG_PATH, CONFIG_PATH);
-  } catch {}
+  } catch (err) { console.error('[Config] 迁移旧配置失败:', err.message); }
 }
 migrateOldConfig();
 
@@ -33,7 +34,7 @@ function migrateTargetToProvider(config) {
     if (!proxy.providerId) {
       const t = proxy.target;
       const provider = {
-        id: 'provider-' + Date.now(),
+        id: crypto.randomUUID(),
         name: t.providerName || t.providerUrl,
         url: t.providerUrl,
         protocol: t.protocol || 'openai',
@@ -119,7 +120,9 @@ function saveConfig(config) {
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
     }
-    fs.writeFileSync(CONFIG_PATH, JSON.stringify(normalizedConfig, null, 2), 'utf-8');
+    const tmpPath = CONFIG_PATH + '.tmp';
+    fs.writeFileSync(tmpPath, JSON.stringify(normalizedConfig, null, 2), 'utf-8');
+    fs.renameSync(tmpPath, CONFIG_PATH);
     configCache = normalizedConfig;
     return true;
   } catch (err) {
@@ -141,7 +144,7 @@ function getProviderById(id) {
 function addProvider(provider) {
   const config = loadConfig();
   config.providers = config.providers || [];
-  provider.id = provider.id || 'provider-' + Date.now();
+  provider.id = provider.id || crypto.randomUUID();
   provider.models = normalizeModels(provider.models);
   config.providers.push(provider);
   saveConfig(config);
@@ -182,7 +185,7 @@ function getProxyById(id) {
 function addProxy(proxy) {
   const config = loadConfig();
   config.proxies = config.proxies || [];
-  proxy.id = proxy.id || 'proxy-' + Date.now();
+  proxy.id = proxy.id || crypto.randomUUID();
   config.proxies.push(proxy);
   saveConfig(config);
   return proxy;

package/lib/converters/anthropic-to-openai.js

@@ -2,7 +2,7 @@
  * Anthropic → OpenAI 协议转换
  */
 
-const { encodeOpenAIEvent, encodeOpenAIDone, encodeAnthropicEvent } = require('./sse-helpers');
+const { encodeAnthropicEvent } = require('./sse-helpers');
 
 // ==================== 请求转换 ====================
 
@@ -175,11 +175,17 @@ function convertResponse(openaiBody) {
   // tool_calls → tool_use
   if (message.tool_calls) {
     for (const tc of message.tool_calls) {
+      let input = {};
+      try {
+        input = tc.function?.arguments ? JSON.parse(tc.function.arguments) : {};
+      } catch {
+        input = {};
+      }
       content.push({
         type: 'tool_use',
         id: tc.id,
         name: tc.function?.name,
-        input: tc.function?.arguments ? JSON.parse(tc.function.arguments) : {},
+        input,
       });
     }
   }

package/lib/converters/openai-to-anthropic.js

@@ -76,11 +76,17 @@ function convertMessage(msg) {
       content.push({ type: 'text', text: msg.content });
     }
     for (const tc of msg.tool_calls) {
+      let input = {};
+      try {
+        input = tc.function?.arguments ? JSON.parse(tc.function.arguments) : {};
+      } catch {
+        input = {};
+      }
       content.push({
         type: 'tool_use',
         id: tc.id,
         name: tc.function?.name,
-        input: tc.function?.arguments ? JSON.parse(tc.function.arguments) : {},
+        input,
       });
     }
     return { role: 'assistant', content };

package/lib/converters/sse-helpers.js

@@ -2,35 +2,6 @@
  * SSE 解析与编码辅助函数
  */
 
-function parseSSELines(buffer) {
-  const lines = buffer.split('\n');
-  const events = [];
-  let currentEvent = { event: null, data: null };
-
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (trimmed === '') {
-      // 空行表示一个事件结束
-      if (currentEvent.data !== null) {
-        events.push(currentEvent);
-      }
-      currentEvent = { event: null, data: null };
-      continue;
-    }
-    if (trimmed.startsWith('event:')) {
-      currentEvent.event = trimmed.slice(6).trim();
-    } else if (trimmed.startsWith('data:')) {
-      const data = trimmed.slice(5).trim();
-      currentEvent.data = currentEvent.data === null ? data : currentEvent.data + '\n' + data;
-    }
-  }
-
-  // 如果最后一行没有空行结束，保留未完成的事件
-  const remainder = currentEvent.data !== null ? currentEvent : null;
-
-  return { events, remainder };
-}
-
 function encodeOpenAIEvent(obj) {
   return `data: ${JSON.stringify(obj)}\n\n`;
 }
@@ -44,7 +15,6 @@ function encodeAnthropicEvent(eventName, obj) {
 }
 
 module.exports = {
-  parseSSELines,
   encodeOpenAIEvent,
   encodeOpenAIDone,
   encodeAnthropicEvent,

package/lib/detector.js

@@ -31,8 +31,8 @@ function detectInboundProtocol(req, body) {
     }
   }
 
-  // 无法确定时，默认 openai
-  return 'openai';
+  // 无法确定时，返回 null，由调用方决定是否透传
+  return null;
 }
 
 module.exports = { detectInboundProtocol };

package/lib/proxy-manager.js

@@ -38,10 +38,10 @@ class ProxyManager {
 
     return new Promise((resolve) => {
       entry.server.close(() => {
+        this.servers.delete(id);
         console.log(`[Proxy] ${entry.config.name} stopped on port ${entry.config.port}`);
         resolve(true);
       });
-      this.servers.delete(id);
     });
   }
 

package/lib/proxy-server.js

@@ -15,24 +15,31 @@ function createProxyApp(proxyConfigOrGetter) {
   const reasoningCache = new Map();
   const MAX_CACHE_SIZE = 100;
 
-  function setReasoning(content, reasoning) {
-    if (!content || !reasoning) return;
+  function getReasoningKey(msg) {
+    const toolIds = msg.tool_calls?.map(t => t.id).join(',') || '';
+    return msg.content + '|' + toolIds;
+  }
+
+  function setReasoning(msg, reasoning) {
+    if (!msg?.content || !reasoning) return;
+    const key = getReasoningKey(msg);
     if (reasoningCache.size >= MAX_CACHE_SIZE) {
       const firstKey = reasoningCache.keys().next().value;
       reasoningCache.delete(firstKey);
     }
-    reasoningCache.set(content, reasoning);
+    reasoningCache.set(key, reasoning);
   }
 
-  function getReasoning(content) {
-    return reasoningCache.get(content);
+  function getReasoning(msg) {
+    if (!msg?.content) return undefined;
+    return reasoningCache.get(getReasoningKey(msg));
   }
 
   function injectReasoningToMessages(messages) {
     if (!Array.isArray(messages)) return;
     for (const msg of messages) {
-      if (msg.role === 'assistant') {
-        const reasoning = getReasoning(msg.content);
+      if (msg.role === 'assistant' && msg.reasoning_content === undefined) {
+        const reasoning = getReasoning(msg);
         // DeepSeek 等 reasoning model 要求 assistant message 必须包含 reasoning_content 字段
         msg.reasoning_content = reasoning || '';
       }
@@ -43,7 +50,7 @@ function createProxyApp(proxyConfigOrGetter) {
     const choice = body.choices?.[0];
     const message = choice?.message;
     if (message?.role === 'assistant' && message.reasoning_content) {
-      setReasoning(message.content, message.reasoning_content);
+      setReasoning(message, message.reasoning_content);
     }
   }
 
@@ -85,7 +92,7 @@ function createProxyApp(proxyConfigOrGetter) {
       const targetProtocol = target.protocol;
       const isStream = req.body?.stream === true;
 
-      console.log(`[${requestId}] ⬅️  ${inboundProtocol.toUpperCase()} → ${targetProtocol.toUpperCase()} | path=${req.path}`);
+      console.log(`[${requestId}] ⬅️  ${(inboundProtocol || 'unknown').toUpperCase()} → ${targetProtocol.toUpperCase()} | path=${req.path}`);
 
       // 决定转换方向
       let convertReq, convertRes, createSSEConv;
@@ -158,6 +165,10 @@ function createProxyApp(proxyConfigOrGetter) {
         const reader = fetchRes.body.getReader();
         const decoder = new TextDecoder();
 
+        req.on('close', () => {
+          try { reader.cancel(); } catch (err) { /* ignore */ }
+        });
+
         try {
           while (true) {
             const { done, value } = await reader.read();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protocol-proxy",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "description": "OpenAI / Anthropic 协议转换透明代理",
   "main": "server.js",
   "bin": {
@@ -40,11 +40,11 @@
       "public/**/*"
     ],
     "targets": [
-      "node18-win-x64"
+      "node20-win-x64"
     ],
     "outputPath": "dist",
     "options": [
-      "--experimental-fetch"
+
     ]
   },
   "engines": {

package/public/app.js

@@ -40,6 +40,7 @@ function initProviderDropdown() {
   const dropdown = document.getElementById('provider-dropdown');
   const addNameInput = document.getElementById('provider-add-name');
   const addUrlInput = document.getElementById('provider-add-url');
+  const addKeyInput = document.getElementById('provider-add-key');
   const addBtn = document.getElementById('provider-add-btn');
 
   trigger.addEventListener('click', (e) => {
@@ -49,6 +50,7 @@ function initProviderDropdown() {
       editingProviderId = null;
       addNameInput.value = '';
       addUrlInput.value = '';
+      addKeyInput.value = '';
       addUrlInput.disabled = false;
       addBtn.textContent = '添加';
       renderProviderOptions();
@@ -80,10 +82,13 @@ function initProviderDropdown() {
         });
       } else {
         // 新增模式
+        const body = { name, url };
+        const key = addKeyInput.value.trim();
+        if (key) body.apiKey = key;
         res = await fetch('/api/providers', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ name, url }),
+          body: JSON.stringify(body),
         });
       }
       if (!res.ok) {
@@ -199,7 +204,9 @@ function selectProvider(id) {
   document.getElementById('provider-dropdown-value').textContent = provider
     ? (provider.name !== provider.url ? `${provider.name} - ${provider.url}` : provider.url)
     : '选择供应商...';
-  renderModelOptions();
+  // 切换供应商后模型自动选为该供应商模型列表的第一个
+  const models = provider?.models || [];
+  selectModel(models[0] || '');
   updateModelAddState();
   // 加载供应商的 API Key
   if (id) {
@@ -520,6 +527,7 @@ function closeModal() {
   document.getElementById('model-dropdown').classList.remove('open');
   document.getElementById('provider-dropdown').classList.remove('open');
   editingId = null;
+  editingProviderId = null;
 }
 
 async function handleSubmit(e) {
@@ -549,13 +557,19 @@ async function handleSubmit(e) {
   if (protocol) providerUpdates.protocol = protocol;
   if (Object.keys(providerUpdates).length > 0) {
     try {
-      await fetch(`/api/providers/${providerId}`, {
+      const res = await fetch(`/api/providers/${providerId}`, {
         method: 'PUT',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(providerUpdates),
       });
+      if (!res.ok) {
+        const err = await res.json();
+        showToast('供应商配置保存失败: ' + (err.error || '未知错误'), true);
+      }
       await loadProviders();
-    } catch {}
+    } catch (err) {
+      showToast('供应商配置保存失败: ' + err.message, true);
+    }
   }
 
   const payload = {
@@ -599,7 +613,7 @@ async function startProxy(id) {
     await fetch(`/api/proxies/${id}/start`, { method: 'POST' });
     await loadProxies();
   } catch (err) {
-    alert('启动失败: ' + err.message);
+    showToast('启动失败: ' + err.message, true);
   }
 }
 
@@ -608,7 +622,7 @@ async function stopProxy(id) {
     await fetch(`/api/proxies/${id}/stop`, { method: 'POST' });
     await loadProxies();
   } catch (err) {
-    alert('停止失败: ' + err.message);
+    showToast('停止失败: ' + err.message, true);
   }
 }
 

package/public/index.html

@@ -84,7 +84,8 @@
                       <div class="model-dropdown-options" id="provider-dropdown-options"></div>
                       <div class="model-add-section">
                         <input type="text" class="model-add-input" id="provider-add-name" placeholder="供应商名称">
-                        <input type="url" class="model-add-input" id="provider-add-url" placeholder="https://api.example.com">
+                        <input type="text" class="model-add-input" id="provider-add-url" placeholder="https://api.example.com">
+                        <input type="password" class="model-add-input" id="provider-add-key" placeholder="API Key (可选)">
                         <button type="button" class="btn btn-primary btn-sm" id="provider-add-btn">添加</button>
                       </div>
                     </div>

package/server.js

@@ -10,7 +10,9 @@ const PID_FILE = path.join(os.tmpdir(), 'protocol-proxy.pid');
 const pkg = require('./package.json');
 
 function writePid() {
-  try { fs.writeFileSync(PID_FILE, String(process.pid)); } catch {}
+  try { fs.writeFileSync(PID_FILE, String(process.pid)); } catch (err) {
+    console.error('[PID] 写入失败:', err.message);
+  }
 }
 
 function readPid() {
@@ -18,7 +20,9 @@ function readPid() {
 }
 
 function removePid() {
-  try { fs.unlinkSync(PID_FILE); } catch {}
+  try { fs.unlinkSync(PID_FILE); } catch (err) {
+    console.error('[PID] 删除失败:', err.message);
+  }
 }
 
 function isProcessAlive(pid) {
@@ -136,6 +140,17 @@ async function init() {
 
   app.use(cors());
   app.use(express.json());
+
+  // 访问日志
+  app.use((req, res, next) => {
+    const start = Date.now();
+    res.on('finish', () => {
+      const duration = Date.now() - start;
+      console.log(`[HTTP] ${req.method} ${req.path} - ${res.statusCode} (${duration}ms)`);
+    });
+    next();
+  });
+
   app.use(express.static(path.join(__dirname, 'public')));
 
   // ==================== 辅助函数 ====================
@@ -383,6 +398,19 @@ async function init() {
     });
   });
 
+  // 健康检查
+  app.get('/api/health', (req, res) => {
+    res.json({
+      status: 'ok',
+      version: pkg.version,
+      uptime: process.uptime(),
+      proxies: {
+        total: configStore.getProxies().length,
+        running: proxyManager.getRunningPorts().length,
+      },
+    });
+  });
+
   // 前端首页
   app.get('/', (req, res) => {
     res.sendFile(path.join(__dirname, 'public', 'index.html'));
@@ -393,13 +421,13 @@ async function init() {
 
   // 启动所有已配置的代理
   const proxies = configStore.getProxies();
-  for (const proxy of proxies) {
+  await Promise.all(proxies.map(async (proxy) => {
     try {
       await startProxyWithProvider(proxy);
     } catch (err) {
       console.error(`[Init] Failed to start proxy ${proxy.name}:`, err.message);
     }
-  }
+  }));
 
   app.listen(PORT, () => {
     const adminUrl = `http://localhost:${PORT}`;
@@ -416,7 +444,9 @@ process.on('SIGINT', async () => {
   try {
     const proxyManager = require('./lib/proxy-manager');
     await proxyManager.stopAll();
-  } catch {}
+  } catch (err) {
+    console.error('[Shutdown] stopAll error:', err.message);
+  }
   process.exit(0);
 });
 
@@ -425,7 +455,9 @@ process.on('SIGTERM', async () => {
   try {
     const proxyManager = require('./lib/proxy-manager');
     await proxyManager.stopAll();
-  } catch {}
+  } catch (err) {
+    console.error('[Shutdown] stopAll error:', err.message);
+  }
   process.exit(0);
 });