protocol-proxy 2.0.1 → 2.0.3

package/lib/config-store.js

@@ -21,6 +21,50 @@ migrateOldConfig();
 
 let configCache = null;
 
+// 迁移旧格式：target → providerId
+function migrateTargetToProvider(config) {
+  if (!Array.isArray(config.proxies)) return config;
+  let changed = false;
+
+  for (const proxy of config.proxies) {
+    if (!proxy.target) continue;
+
+    // 有 target 但没有 providerId → 从 target 创建供应商
+    if (!proxy.providerId) {
+      const t = proxy.target;
+      const provider = {
+        id: 'provider-' + Date.now(),
+        name: t.providerName || t.providerUrl,
+        url: t.providerUrl,
+        protocol: t.protocol || 'openai',
+        apiKey: t.apiKey || '',
+        models: Array.isArray(t.models) ? t.models : [],
+      };
+      config.providers = config.providers || [];
+      config.providers.push(provider);
+      proxy.providerId = provider.id;
+      proxy.defaultModel = t.defaultModel || '';
+      delete proxy.target;
+      changed = true;
+    } else {
+      // 有 target 也有 providerId → 迁移 apiKey 到供应商，删除 target
+      const provider = (config.providers || []).find(p => p.id === proxy.providerId);
+      if (provider && proxy.target.apiKey && !provider.apiKey) {
+        provider.apiKey = proxy.target.apiKey;
+        changed = true;
+      }
+      delete proxy.target;
+      changed = true;
+    }
+  }
+
+  if (changed) {
+    configCache = config;
+    saveConfig(config);
+  }
+  return config;
+}
+
 function normalizeModels(models) {
   if (!Array.isArray(models)) return [];
   return Array.from(new Set(
@@ -58,7 +102,9 @@ function loadConfig() {
       return configCache;
     }
     const raw = fs.readFileSync(CONFIG_PATH, 'utf-8');
-    configCache = normalizeConfig(JSON.parse(raw));
+    let config = normalizeConfig(JSON.parse(raw));
+    config = migrateTargetToProvider(config);
+    configCache = config;
     return configCache;
   } catch (err) {
     console.error('加载配置失败:', err.message);

package/package.json

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

package/public/app.js

@@ -40,14 +40,19 @@ 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) => {
     e.stopPropagation();
     dropdown.classList.toggle('open');
     if (dropdown.classList.contains('open')) {
+      editingProviderId = null;
       addNameInput.value = '';
       addUrlInput.value = '';
+      addKeyInput.value = '';
+      addUrlInput.disabled = false;
+      addBtn.textContent = '添加';
       renderProviderOptions();
       addNameInput.focus();
     }
@@ -62,27 +67,45 @@ function initProviderDropdown() {
   addBtn.addEventListener('click', async () => {
     const name = addNameInput.value.trim();
     const url = addUrlInput.value.trim();
+    const apiKey = addKeyInput.value.trim();
     if (!name || !url) {
       showToast('请填写供应商名称和地址', true);
       return;
     }
     try {
-      const res = await fetch('/api/providers', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ name, url }),
-      });
+      let res;
+      if (editingProviderId) {
+        // 更新模式
+        res = await fetch(`/api/providers/${editingProviderId}`, {
+          method: 'PUT',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ name, apiKey }),
+        });
+      } else {
+        // 新增模式
+        res = await fetch('/api/providers', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ name, url, apiKey }),
+        });
+      }
       if (!res.ok) {
         const err = await res.json();
-        showToast(err.error || '添加失败', true);
+        showToast(err.error || '操作失败', true);
         return;
       }
       const provider = await res.json();
+      editingProviderId = null;
+      addUrlInput.disabled = false;
+      addBtn.textContent = '添加';
+      addNameInput.value = '';
+      addUrlInput.value = '';
+      addKeyInput.value = '';
       await loadProviders();
       selectProvider(provider.id);
-      dropdown.classList.remove('open');
+      renderProviderOptions();
     } catch (err) {
-      showToast('添加失败: ' + err.message, true);
+      showToast('操作失败: ' + err.message, true);
     }
   });
 
@@ -95,6 +118,8 @@ function initProviderDropdown() {
   });
 }
 
+let editingProviderId = null;
+
 function renderProviderOptions() {
   const container = document.getElementById('provider-dropdown-options');
   const currentId = document.getElementById('provider-id').value;
@@ -103,7 +128,10 @@ function renderProviderOptions() {
     <div class="model-option${p.id === currentId ? ' selected' : ''}" data-id="${escapeHtml(p.id)}">
       <span class="model-option-name">${escapeHtml(p.name)}</span>
       ${p.name !== p.url ? `<span style="color:#64748b;font-size:12px;margin-left:4px">${escapeHtml(p.url)}</span>` : ''}
-      <button type="button" class="model-option-delete" data-delete-id="${escapeHtml(p.id)}" title="删除此供应商">&times;</button>
+      <span style="margin-left:auto;display:flex;gap:4px">
+        <button type="button" class="model-option-delete" data-edit-id="${escapeHtml(p.id)}" title="编辑此供应商" style="color:#60a5fa">&times;</button>
+        <button type="button" class="model-option-delete" data-delete-id="${escapeHtml(p.id)}" title="删除此供应商">&times;</button>
+      </span>
     </div>
   `).join('');
 
@@ -119,7 +147,29 @@ function renderProviderOptions() {
     });
   });
 
-  container.querySelectorAll('.model-option-delete').forEach(btn => {
+  // 编辑供应商
+  container.querySelectorAll('[data-edit-id]').forEach(btn => {
+    btn.addEventListener('click', async (e) => {
+      e.stopPropagation();
+      const id = btn.dataset.editId;
+      try {
+        const res = await fetch(`/api/providers/${id}`);
+        if (!res.ok) throw new Error('加载失败');
+        const p = await res.json();
+        editingProviderId = id;
+        document.getElementById('provider-add-name').value = p.name;
+        document.getElementById('provider-add-url').value = p.url;
+        document.getElementById('provider-add-key').value = p.apiKey || '';
+        document.getElementById('provider-add-url').disabled = true;
+        document.getElementById('provider-add-btn').textContent = '更新';
+      } catch (err) {
+        showToast('加载供应商失败: ' + err.message, true);
+      }
+    });
+  });
+
+  // 删除供应商
+  container.querySelectorAll('[data-delete-id]').forEach(btn => {
     btn.addEventListener('click', async (e) => {
       e.stopPropagation();
       const id = btn.dataset.deleteId;

package/public/index.html

@@ -85,6 +85,7 @@
                       <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="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

@@ -198,7 +198,7 @@ async function init() {
     if (req.body.name !== undefined) updates.name = req.body.name;
     if (req.body.url !== undefined) updates.url = req.body.url;
     if (req.body.protocol !== undefined) updates.protocol = req.body.protocol;
-    if (req.body.apiKey !== undefined) updates.apiKey = req.body.apiKey;
+    if (req.body.apiKey !== undefined && req.body.apiKey !== '') updates.apiKey = req.body.apiKey;
     if (req.body.models !== undefined) updates.models = req.body.models;
 
     const updated = configStore.updateProvider(req.params.id, updates);
@@ -235,7 +235,12 @@ async function init() {
     const proxies = configStore.getProxies().map(p => {
       const provider = configStore.getProviderById(p.providerId);
       return {
-        ...p,
+        id: p.id,
+        name: p.name,
+        port: p.port,
+        requireAuth: p.requireAuth,
+        authToken: p.authToken,
+        providerId: p.providerId,
         providerName: provider?.name || '',
         providerUrl: provider?.url || '',
         protocol: provider?.protocol || '',