protocol-proxy 2.8.2 → 2.9.0

package/lib/conversation-store.js

@@ -0,0 +1,108 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+const DATA_DIR = path.join(os.homedir(), '.protocol-proxy', 'conversations');
+
+// 内存缓存：conversationId → { id, proxyId, messages, createdAt, lastActivity }
+let conversations = {};
+
+// debounce 写入：500ms 内同一 conv 只写一次
+const pendingWrites = new Map(); // convId → timer
+
+function scheduleSave(conv) {
+  if (pendingWrites.has(conv.id)) clearTimeout(pendingWrites.get(conv.id));
+  pendingWrites.set(conv.id, setTimeout(() => {
+    pendingWrites.delete(conv.id);
+    fs.writeFile(path.join(DATA_DIR, conv.id + '.json'), JSON.stringify(conv), 'utf8', () => {});
+  }, 500));
+}
+
+function saveImmediate(conv) {
+  if (pendingWrites.has(conv.id)) {
+    clearTimeout(pendingWrites.get(conv.id));
+    pendingWrites.delete(conv.id);
+  }
+  try {
+    fs.writeFileSync(path.join(DATA_DIR, conv.id + '.json'), JSON.stringify(conv), 'utf8');
+  } catch {}
+}
+
+function flushAll() {
+  for (const [id, timer] of pendingWrites) {
+    clearTimeout(timer);
+    const conv = conversations[id];
+    if (conv) {
+      try { fs.writeFileSync(path.join(DATA_DIR, id + '.json'), JSON.stringify(conv), 'utf8'); } catch {}
+    }
+  }
+  pendingWrites.clear();
+}
+
+function init() {
+  if (!fs.existsSync(DATA_DIR)) {
+    fs.mkdirSync(DATA_DIR, { recursive: true });
+  }
+  try {
+    const files = fs.readdirSync(DATA_DIR).filter(f => f.endsWith('.json'));
+    for (const file of files) {
+      try {
+        const data = JSON.parse(fs.readFileSync(path.join(DATA_DIR, file), 'utf8'));
+        if (data.id) conversations[data.id] = data;
+      } catch {}
+    }
+  } catch {}
+}
+
+function get(id) {
+  return conversations[id] || null;
+}
+
+function create(proxyId, maxConversations) {
+  // 超过最大会话数时删除最早的
+  if (maxConversations > 0) {
+    const all = list();
+    while (all.length >= maxConversations) {
+      const oldest = all.shift(); // list() 已按 lastActivity 升序
+      remove(oldest.id);
+    }
+  }
+  const id = 'conv-' + Date.now() + '-' + Math.random().toString(36).slice(2, 8);
+  const conv = { id, proxyId, messages: [], createdAt: Date.now(), lastActivity: Date.now() };
+  conversations[id] = conv;
+  saveImmediate(conv); // 新建立即写入
+  return conv;
+}
+
+function touch(conv) {
+  conv.lastActivity = Date.now();
+  scheduleSave(conv); // debounce 异步写入
+}
+
+function remove(id) {
+  delete conversations[id];
+  if (pendingWrites.has(id)) { clearTimeout(pendingWrites.get(id)); pendingWrites.delete(id); }
+  fs.unlink(path.join(DATA_DIR, id + '.json'), () => {});
+}
+
+// 返回会话列表（按 lastActivity 升序，不含 messages），用于前端展示
+function list() {
+  return Object.values(conversations)
+    .map(c => ({
+      id: c.id,
+      proxyId: c.proxyId,
+      createdAt: c.createdAt,
+      lastActivity: c.lastActivity,
+      messageCount: (c.messages || []).length,
+      // 取第一条 user 消息作为标题预览
+      preview: ((c.messages || []).find(m => m.role === 'user')?.content || '').slice(0, 60),
+    }))
+    .sort((a, b) => a.lastActivity - b.lastActivity);
+}
+
+// 进程退出时确保所有 debounce 中的数据落盘
+process.on('exit', flushAll);
+process.on('SIGINT', () => { flushAll(); process.exit(0); });
+process.on('SIGTERM', () => { flushAll(); process.exit(0); });
+
+module.exports = { init, get, create, touch, remove, list, flushAll };

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

@@ -303,6 +303,10 @@ function processLine(line, state, targetModel) {
         return prefix + encodeOpenAIChunk(state.messageId, targetModel, { content: delta.text });
       }
 
+      if (delta.type === 'thinking_delta' && delta.thinking) {
+        return prefix + encodeOpenAIChunk(state.messageId, targetModel, { reasoning_content: delta.thinking });
+      }
+
       if (delta.type === 'input_json_delta' && delta.partial_json !== undefined) {
         if (!state.sentToolInit) {
           state.sentToolInit = true;

package/lib/proxy-server.js

@@ -351,9 +351,13 @@ function createProxyApp(proxyConfigOrGetter) {
     const requestStart = Date.now();
     const proxyConfig = getProxyConfig();
     const inboundProtocol = detectInboundProtocol(req, req.body);
-    const candidates = buildCandidates(proxyConfig);
+    let candidates = buildCandidates(proxyConfig);
 
-    if (candidates.length === 0) {
+    // 请求级供应商/模型覆盖（来自助手 chat 端点的自定义头）
+    const overrideProviderId = req.headers['x-pp-provider-id'];
+    const overrideModel = req.headers['x-pp-model'];
+
+    if (candidates.length === 0 && !overrideProviderId) {
       return res.status(500).json({ error: 'Proxy target not configured' });
     }
 
@@ -362,8 +366,43 @@ function createProxyApp(proxyConfigOrGetter) {
     const clientIP = req.ip || req.socket?.remoteAddress || '';
     const proxyName = proxyConfig.name || '';
     const inboundModel = req.body?.model;
-    const effectiveModel = proxyConfig.target?.defaultModel || inboundModel;
-    const baseRequestBody = effectiveModel ? { ...req.body, model: effectiveModel } : { ...req.body };
+    let effectiveModel = proxyConfig.target?.defaultModel || inboundModel;
+
+    // 模型覆盖：优先级高于 defaultModel
+    if (overrideModel) {
+      effectiveModel = overrideModel;
+    }
+    let baseRequestBody = effectiveModel ? { ...req.body, model: effectiveModel } : { ...req.body };
+
+    // 供应商覆盖：筛选或动态构建候选
+    if (overrideProviderId) {
+      const filtered = candidates.filter(c => c.providerId === overrideProviderId);
+      if (filtered.length > 0) {
+        candidates = filtered;
+      } else {
+        // 不在代理候选池中 → 用附加头动态构建临时候选
+        const providerUrl = req.headers['x-pp-provider-url'];
+        const providerProtocol = req.headers['x-pp-provider-protocol'];
+        const providerKeys = req.headers['x-pp-provider-keys'];
+        if (providerUrl && providerProtocol) {
+          const tempCandidate = {
+            providerId: overrideProviderId,
+            providerName: overrideProviderId,
+            providerUrl,
+            protocol: providerProtocol,
+            apiKeys: providerKeys ? JSON.parse(providerKeys) : [],
+            models: [],
+            azureDeployment: '',
+            azureApiVersion: '',
+            model: '',
+            weight: 1,
+          };
+          candidates = [tempCandidate];
+        } else {
+          return res.status(400).json({ error: '指定的供应商不在代理候选列表中，且缺少供应商配置' });
+        }
+      }
+    }
 
     // Inject cached reasoning for OpenAI inbound (OpenAI protocol lacks reasoning_content)
     if (inboundProtocol === 'openai') {
@@ -446,7 +485,7 @@ function createProxyApp(proxyConfigOrGetter) {
 
       const targetUrl = buildTargetUrl(candidate, req.path, isStream, candidateModel);
       // Forward client headers (preserve anthropic-beta, user-agent, etc.)
-      const skipHeaders = new Set(['host', 'connection', 'content-length', 'content-type', 'accept', 'authorization', 'x-api-key', 'anthropic-version']);
+      const skipHeaders = new Set(['host', 'connection', 'content-length', 'content-type', 'accept', 'authorization', 'x-api-key', 'anthropic-version', 'x-pp-provider-id', 'x-pp-model', 'x-pp-provider-url', 'x-pp-provider-protocol', 'x-pp-provider-keys']);
       const headers = {};
       for (const [key, val] of Object.entries(req.headers)) {
         if (!skipHeaders.has(key.toLowerCase())) headers[key] = val;
@@ -595,6 +634,8 @@ function createProxyApp(proxyConfigOrGetter) {
               const flushed = sseConverter.flush();
               if (flushed) res.write(flushed);
             }
+
+            res.end();
           } catch (err) {
             recordFailure(proxyId, candidate.providerId);
             logger.error(`[${requestId}] Stream error:`, err.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protocol-proxy",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "description": "OpenAI / Anthropic 协议转换透明代理",
   "main": "server.js",
   "bin": {