protocol-proxy 2.8.3 → 2.10.1

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;

package/lib/skill-store.js

@@ -0,0 +1,150 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+const SYSTEM_DIR = path.join(__dirname, '..', 'skills', 'system');
+const PRESET_DIR = path.join(__dirname, '..', 'skills', 'preset');
+const USER_DIR = path.join(os.homedir(), '.protocol-proxy', 'skills');
+
+let skills = {}; // name → { name, description, content, category }
+
+function parseFrontmatter(text) {
+  const match = text.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)$/);
+  if (!match) return { name: '', description: '', body: text };
+  const meta = match[1];
+  const body = match[2];
+  let name = '', description = '', mcpServers = [];
+  for (const line of meta.split('\n')) {
+    const trimmed = line.trim();
+    const nm = trimmed.match(/^name:\s*['"]?(.+?)['"]?\s*$/);
+    if (nm) name = nm[1];
+    const dm = trimmed.match(/^description:\s*['"]?(.+?)['"]?\s*$/);
+    if (dm) description = dm[1];
+    const mm = trimmed.match(/^mcp:\s*\[([^\]]*)\]/);
+    if (mm) mcpServers = mm[1].split(',').map(s => s.trim()).filter(Boolean);
+  }
+  return { name, description, mcpServers, body };
+}
+
+function listDir(dirPath) {
+  if (!fs.existsSync(dirPath)) return [];
+  const result = [];
+  function walk(dir, prefix) {
+    try {
+      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        if (entry.name.startsWith('.')) continue;
+        const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
+        if (entry.isDirectory()) walk(path.join(dir, entry.name), rel);
+        else result.push(rel);
+      }
+    } catch (err) { console.error(`[skill-store] 读取目录失败:`, err.message); }
+  }
+  walk(dirPath, '');
+  return result;
+}
+
+function loadFromDir(dir, category) {
+  if (!fs.existsSync(dir)) return;
+  try {
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const skillDir = path.join(dir, entry.name);
+      if (category === 'preset' && fs.existsSync(path.join(skillDir, '.deleted'))) continue;
+      const skillFile = path.join(skillDir, 'SKILL.md');
+      if (!fs.existsSync(skillFile)) continue;
+      try {
+        const raw = fs.readFileSync(skillFile, 'utf8');
+        const { name, description, mcpServers, body } = parseFrontmatter(raw);
+        const skillName = name || entry.name;
+        const scripts = listDir(path.join(skillDir, 'scripts'));
+        const references = listDir(path.join(skillDir, 'reference'));
+        skills[skillName] = { name: skillName, description, mcpServers, content: body.trim(), category, dirPath: skillDir, scripts, references };
+      } catch (err) { console.error(`[skill-store] 加载 ${entry.name} 失败:`, err.message); }
+    }
+  } catch (err) { console.error(`[skill-store] 扫描 ${dir} 失败:`, err.message); }
+}
+
+function list() {
+  return Object.values(skills);
+}
+
+function get(name) {
+  return skills[name] || null;
+}
+
+function create(name, description, content) {
+  if (skills[name]) return null; // 已存在
+  const dir = path.join(USER_DIR, name);
+  fs.mkdirSync(dir, { recursive: true });
+  const frontmatter = `---\nname: ${name}\ndescription: ${description}\n---\n\n${content}`;
+  fs.writeFileSync(path.join(dir, 'SKILL.md'), frontmatter, 'utf8');
+  skills[name] = { name, description, content, category: 'user' };
+  return skills[name];
+}
+
+function createFromUpload(files) {
+  const skillMd = files.find(f => f.path === 'SKILL.md');
+  if (!skillMd) return null;
+  const raw = Buffer.from(skillMd.content, 'base64').toString('utf8');
+  const { name: parsedName, description, mcpServers, body } = parseFrontmatter(raw);
+  if (!parsedName) return null;
+  if (skills[parsedName]) return null;
+  const dir = path.join(USER_DIR, parsedName);
+  fs.mkdirSync(dir, { recursive: true });
+  for (const f of files) {
+    const safePath = f.path.replace(/\\/g, '/');
+    if (safePath.includes('..')) continue;
+    const target = path.join(dir, safePath);
+    fs.mkdirSync(path.dirname(target), { recursive: true });
+    fs.writeFileSync(target, Buffer.from(f.content, 'base64'));
+  }
+  const scripts = listDir(path.join(dir, 'scripts'));
+  const references = listDir(path.join(dir, 'reference'));
+  skills[parsedName] = { name: parsedName, description, mcpServers, content: body.trim(), category: 'user', dirPath: dir, scripts, references };
+  return skills[parsedName];
+}
+
+function update(name, description, content) {
+  const skill = skills[name];
+  if (!skill || skill.category !== 'user') return null;
+  const dir = path.join(USER_DIR, name);
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  const frontmatter = `---\nname: ${name}\ndescription: ${description}\n---\n\n${content}`;
+  fs.writeFileSync(path.join(dir, 'SKILL.md'), frontmatter, 'utf8');
+  skill.description = description;
+  skill.content = content;
+  return skill;
+}
+
+function remove(name) {
+  const skill = skills[name];
+  if (!skill || skill.category === 'system') return false;
+  if (skill.category === 'user') {
+    const userPath = path.join(USER_DIR, name);
+    if (fs.existsSync(userPath)) {
+      fs.rmSync(userPath, { recursive: true, force: true });
+      if (fs.existsSync(userPath)) return false; // 删除失败
+    }
+  }
+  if (skill.category === 'preset') {
+    const presetPath = path.join(PRESET_DIR, name, '.deleted');
+    try { fs.writeFileSync(presetPath, '', 'utf8'); } catch (err) { console.error(`[skill-store] 写入 .deleted 失败:`, err.message); }
+    if (!fs.existsSync(presetPath)) return false; // 写入失败（目录只读等）
+  }
+  delete skills[name];
+  return true;
+}
+
+function init() {
+  skills = {};
+  loadFromDir(SYSTEM_DIR, 'system');
+  loadFromDir(PRESET_DIR, 'preset');
+  loadFromDir(USER_DIR, 'user');
+}
+
+function getAvailableForChat() {
+  return Object.values(skills).map(s => ({ name: s.name, description: s.description }));
+}
+
+module.exports = { init, list, get, create, createFromUpload, update, remove, getAvailableForChat };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protocol-proxy",
-  "version": "2.8.3",
+  "version": "2.10.1",
   "description": "OpenAI / Anthropic 协议转换透明代理",
   "main": "server.js",
   "bin": {
@@ -26,6 +26,7 @@
     "build": "pkg . --out-path=dist"
   },
   "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "cors": "^2.8.5",
     "express": "^4.19.2",
     "ws": "^8.20.1"