protocol-proxy 2.5.1 → 2.7.0

package/lib/config-store.js

@@ -154,20 +154,35 @@ function normalizeConfig(config) {
 function loadConfig() {
   try {
     if (!fs.existsSync(CONFIG_PATH)) {
-      configCache = { providers: [], proxies: [] };
+      configCache = { providers: [], proxies: [], settings: {} };
       return configCache;
     }
     const raw = fs.readFileSync(CONFIG_PATH, 'utf-8');
     let config = normalizeConfig(JSON.parse(raw));
     config = migrateTargetToProvider(config);
+    if (!config.settings) config.settings = {};
     configCache = config;
     return configCache;
   } catch (err) {
     console.error('加载配置失败:', err.message);
-    return configCache || { providers: [], proxies: [] };
+    return configCache || { providers: [], proxies: [], settings: {} };
   }
 }
 
+function getSettings() {
+  return loadConfig().settings || {};
+}
+
+function setSetting(key, value) {
+  const config = loadConfig();
+  if (!config.settings) config.settings = {};
+  config.settings[key] = value;
+  saveConfig(config);
+}
+
+const SNAPSHOT_DIR = path.join(os.homedir(), '.protocol-proxy', 'snapshots');
+const MAX_SNAPSHOTS = 30;
+
 function saveConfig(config) {
   try {
     const normalizedConfig = normalizeConfig(config);
@@ -186,6 +201,67 @@ function saveConfig(config) {
   }
 }
 
+function saveSnapshot(reason) {
+  try {
+    if (!fs.existsSync(CONFIG_PATH)) return;
+    if (!fs.existsSync(SNAPSHOT_DIR)) fs.mkdirSync(SNAPSHOT_DIR, { recursive: true });
+    const ts = new Date().toISOString().replace(/[:.]/g, '-');
+    const name = `${ts}_${reason || 'save'}.json`;
+    fs.copyFileSync(CONFIG_PATH, path.join(SNAPSHOT_DIR, name));
+    // 清理旧快照
+    const files = fs.readdirSync(SNAPSHOT_DIR)
+      .filter(f => f.endsWith('.json'))
+      .sort();
+    while (files.length > MAX_SNAPSHOTS) {
+      const oldest = files.shift();
+      fs.unlinkSync(path.join(SNAPSHOT_DIR, oldest));
+    }
+  } catch (err) {
+    console.error('[Snapshot] 保存快照失败:', err.message);
+  }
+}
+
+function getSnapshots() {
+  try {
+    if (!fs.existsSync(SNAPSHOT_DIR)) return [];
+    return fs.readdirSync(SNAPSHOT_DIR)
+      .filter(f => f.endsWith('.json'))
+      .sort().reverse()
+      .map(f => {
+        const fullPath = path.join(SNAPSHOT_DIR, f);
+        const stat = fs.statSync(fullPath);
+        const name = f.replace('.json', '');
+        const [ts, ...reasonParts] = name.split('_');
+        return {
+          file: f,
+          timestamp: stat.mtime.toISOString(),
+          reason: reasonParts.join('_') || 'save',
+          size: stat.size,
+        };
+      });
+  } catch (err) {
+    console.error('[Snapshot] 读取快照列表失败:', err.message);
+    return [];
+  }
+}
+
+function restoreSnapshot(file) {
+  try {
+    if (!/^[\w\-]+\.json$/.test(file)) return { error: '非法文件名' };
+    const snapshotPath = path.join(SNAPSHOT_DIR, file);
+    if (!fs.existsSync(snapshotPath)) return { error: '快照不存在' };
+    const content = fs.readFileSync(snapshotPath, 'utf-8');
+    const config = JSON.parse(content);
+    // 先对当前配置做快照，以便回滚本次操作
+    saveSnapshot('before-rollback');
+    saveConfig(config);
+    return { success: true };
+  } catch (err) {
+    console.error('[Snapshot] 恢复快照失败:', err.message);
+    return { error: err.message };
+  }
+}
+
 // ==================== 供应商 CRUD ====================
 
 function getProviders() {
@@ -280,6 +356,11 @@ function removeProxy(id) {
 module.exports = {
   loadConfig,
   saveConfig,
+  saveSnapshot,
+  getSnapshots,
+  restoreSnapshot,
+  getSettings,
+  setSetting,
   getProviders,
   getProviderById,
   addProvider,

package/package.json

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

package/public/app.js

@@ -7,6 +7,49 @@ let statsRange = 'daily';
 let statsProxyId = '';
 let providerPoolItems = [];
 
+// ==================== 主题切换 ====================
+
+const THEMES = [
+  { id: 'dark',       icon: '☾',  label: '深色' },
+  { id: 'light',      icon: '☀',  label: '浅色' },
+  { id: 'pure-black', icon: '●',  label: '纯黑' },
+  { id: 'neon',       icon: '⚡',  label: '霓虹' },
+  { id: 'amber',      icon: '◈',  label: '琥珀' },
+];
+
+function applyTheme(theme) {
+  const t = THEMES.find(t => t.id === theme) || THEMES[0];
+  document.documentElement.setAttribute('data-theme', t.id);
+  const icon = document.getElementById('theme-icon');
+  const label = document.getElementById('theme-label');
+  if (icon) icon.textContent = t.icon;
+  if (label) label.textContent = t.label;
+  localStorage.setItem('theme', t.id);
+}
+
+function toggleTheme() {
+  const current = document.documentElement.getAttribute('data-theme') || 'dark';
+  const idx = THEMES.findIndex(t => t.id === current);
+  const next = THEMES[(idx + 1) % THEMES.length];
+  applyTheme(next.id);
+  fetch('/api/settings', {
+    method: 'PUT',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ theme: next.id }),
+  }).catch(() => {});
+}
+
+// 初始化主题：优先服务端，fallback 到 localStorage
+(async () => {
+  try {
+    const res = await fetch('/api/settings');
+    const settings = await res.json();
+    applyTheme(settings.theme || localStorage.getItem('theme') || 'dark');
+  } catch {
+    applyTheme(localStorage.getItem('theme') || 'dark');
+  }
+})();
+
 // ==================== 数据加载 ====================
 
 async function loadProxies() {
@@ -587,6 +630,59 @@ function initModelDropdown() {
   });
 }
 
+async function importModels() {
+  const providerId = document.getElementById('provider-id').value;
+  if (!providerId) {
+    showToast('请先选择供应商', true);
+    return;
+  }
+  const btn = document.getElementById('model-import-btn');
+  btn.disabled = true;
+  btn.textContent = '导入中...';
+  try {
+    const apiKeys = collectApiKeys();
+    const res = await fetch(`/api/providers/${providerId}/available-models`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ apiKeys }),
+    });
+    const data = await res.json();
+    if (!data.models || data.models.length === 0) {
+      showToast(data.message || '未获取到模型', true);
+      return;
+    }
+    const provider = providers.find(p => p.id === providerId);
+    const existing = new Set(provider?.models || []);
+    const newModels = data.models.filter(m => !existing.has(m));
+    if (newModels.length === 0) {
+      showToast(`已全部存在，共 ${data.models.length} 个模型`);
+      // 即使没有新模型，也尝试自动选择第一个
+      if (!document.getElementById('target-model').value && data.models.length > 0) {
+        selectModel(data.models[0]);
+      }
+      return;
+    }
+    const merged = [...(provider?.models || []), ...newModels];
+    await fetch(`/api/providers/${providerId}`, {
+      method: 'PUT',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ models: merged }),
+    });
+    await loadProviders();
+    renderModelOptions();
+    // 自动选择默认模型
+    if (!document.getElementById('target-model').value) {
+      selectModel(newModels[0] || data.models[0]);
+    }
+    showToast(`已导入 ${newModels.length} 个新模型（共 ${data.models.length} 个）`);
+  } catch (err) {
+    showToast('导入失败: ' + err.message, true);
+  } finally {
+    btn.disabled = false;
+    btn.textContent = '自动导入';
+  }
+}
+
 function renderModelOptions() {
   const container = document.getElementById('model-dropdown-options');
   const providerId = document.getElementById('provider-id').value;
@@ -983,6 +1079,33 @@ async function init() {
   // 初始状态：根据当前协议值决定 Azure 字段显示
   const initProto = document.getElementById('target-protocol').value;
   document.getElementById('azure-fields').style.display = initProto === 'openai' ? '' : 'none';
+
+  // 快捷键
+  document.addEventListener('keydown', (e) => {
+    // Esc 关闭最上层弹窗
+    if (e.key === 'Escape') {
+      if (document.getElementById('confirm-modal').classList.contains('active')) return;
+      if (document.getElementById('log-modal').classList.contains('active')) { closeLogViewer(); return; }
+      if (document.getElementById('history-modal').classList.contains('active')) { closeHistoryViewer(); return; }
+      if (document.getElementById('test-result-modal').classList.contains('active')) { document.getElementById('test-result-modal').classList.remove('active'); return; }
+      if (document.getElementById('import-modal').classList.contains('active')) { closeImportModal(); return; }
+      if (document.getElementById('modal').classList.contains('active')) { closeModal(); return; }
+    }
+    // Ctrl+S 保存表单
+    if ((e.ctrlKey || e.metaKey) && e.key === 's') {
+      if (document.getElementById('modal').classList.contains('active')) {
+        e.preventDefault();
+        document.getElementById('proxy-form').requestSubmit();
+      }
+    }
+    // Ctrl+N 新建代理
+    if ((e.ctrlKey || e.metaKey) && e.key === 'n') {
+      if (!document.getElementById('modal').classList.contains('active')) {
+        e.preventDefault();
+        openModal();
+      }
+    }
+  });
 }
 
 // ==================== 代理地址复制 ====================
@@ -1037,6 +1160,149 @@ function showToast(msg, isError) {
   setTimeout(() => toast.remove(), 2000);
 }
 
+// ==================== 批量操作 ====================
+
+async function startAllProxies() {
+  try {
+    const res = await fetch('/api/proxies/start-all', { method: 'POST' });
+    const data = await res.json();
+    await loadProxies();
+    const started = data.results.filter(r => r.success).length;
+    const skipped = data.results.filter(r => r.skipped).length;
+    const failed = data.results.filter(r => !r.success && !r.skipped).length;
+    let msg = `启动完成：${started} 个启动`;
+    if (skipped > 0) msg += `，${skipped} 个已在运行`;
+    if (failed > 0) msg += `，${failed} 个失败`;
+    showToast(msg, failed > 0);
+  } catch (err) {
+    showToast('批量启动失败: ' + err.message, true);
+  }
+}
+
+async function stopAllProxies() {
+  const ok = await showConfirm('确定要停止所有运行中的代理吗？', '全部停止');
+  if (!ok) return;
+  try {
+    const res = await fetch('/api/proxies/stop-all', { method: 'POST' });
+    const data = await res.json();
+    await loadProxies();
+    showToast(`已停止 ${data.results.length} 个代理`);
+  } catch (err) {
+    showToast('批量停止失败: ' + err.message, true);
+  }
+}
+
+// ==================== 日志查看 ====================
+
+async function openLogViewer() {
+  document.getElementById('log-modal').classList.add('active');
+  await loadLogs();
+}
+
+function closeLogViewer() {
+  document.getElementById('log-modal').classList.remove('active');
+}
+
+async function loadLogs() {
+  const container = document.getElementById('log-content');
+  const lines = document.getElementById('log-lines-select').value;
+  container.textContent = '加载中...';
+  try {
+    const res = await fetch(`/api/logs?lines=${lines}`);
+    const data = await res.json();
+    document.getElementById('log-total').textContent = data.total ? `(共 ${data.total} 行)` : '';
+    if (!data.lines || data.lines.length === 0) {
+      container.textContent = '暂无日志';
+      return;
+    }
+    container.innerHTML = data.lines.map(line => {
+      let cls = 'log-line';
+      if (/error|fail|失败/i.test(line)) cls += ' log-error';
+      else if (/warn|警告/i.test(line)) cls += ' log-warn';
+      return `<div class="${cls}">${escapeHtml(line)}</div>`;
+    }).join('');
+    container.scrollTop = container.scrollHeight;
+  } catch (err) {
+    container.textContent = '加载失败: ' + err.message;
+  }
+}
+
+// ==================== 版本历史 ====================
+
+async function openHistoryViewer() {
+  document.getElementById('history-modal').classList.add('active');
+  await loadHistory();
+}
+
+function closeHistoryViewer() {
+  document.getElementById('history-modal').classList.remove('active');
+}
+
+async function loadHistory() {
+  const container = document.getElementById('history-content');
+  container.textContent = '加载中...';
+  try {
+    const res = await fetch('/api/config/history');
+    const data = await res.json();
+    if (!data.snapshots || data.snapshots.length === 0) {
+      container.innerHTML = '<div class="empty">暂无历史版本</div>';
+      return;
+    }
+    const REASON_LABELS = {
+      'create-proxy': '创建代理',
+      'update-proxy': '更新代理',
+      'delete-proxy': '删除代理',
+      'import-merge': '导入配置（合并）',
+      'import-overwrite': '导入配置（覆盖）',
+      'before-rollback': '回滚前备份',
+      'save': '保存',
+    };
+    container.innerHTML = `<div class="history-list">` + data.snapshots.map(s => {
+      const date = new Date(s.timestamp);
+      const timeStr = date.toLocaleString('zh-CN', { hour12: false });
+      const label = REASON_LABELS[s.reason] || s.reason;
+      const sizeStr = s.size > 1024 ? `${(s.size / 1024).toFixed(1)} KB` : `${s.size} B`;
+      return `
+        <div class="history-item">
+          <div class="history-info">
+            <span class="history-time">${timeStr}</span>
+            <span class="history-reason">${escapeHtml(label)}</span>
+            <span class="history-size">${sizeStr}</span>
+          </div>
+          <button class="btn btn-sm history-rollback-btn" data-file="${escapeHtml(s.file)}">恢复</button>
+        </div>
+      `;
+    }).join('') + '</div>';
+    container.querySelectorAll('.history-rollback-btn').forEach(btn => {
+      btn.addEventListener('click', () => rollbackToSnapshot(btn.dataset.file));
+    });
+  } catch (err) {
+    container.textContent = '加载失败: ' + err.message;
+  }
+}
+
+async function rollbackToSnapshot(file) {
+  const ok = await showConfirm('确认恢复到此版本？<br>当前配置会先自动备份。', '确认恢复');
+  if (!ok) return;
+  try {
+    const res = await fetch('/api/config/rollback', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ file }),
+    });
+    const data = await res.json();
+    if (!res.ok) {
+      showToast(data.error || '恢复失败', true);
+      return;
+    }
+    closeHistoryViewer();
+    await Promise.all([loadProxies(), loadProviders()]);
+    showToast('已恢复到历史版本');
+  } catch (err) {
+    showToast('恢复失败: ' + err.message, true);
+  }
+}
+
 // ==================== 渲染代理列表 ====================
 
 const ROUTING_LABELS = {
@@ -1046,14 +1312,34 @@ const ROUTING_LABELS = {
   fastest: '最快优先',
 };
 
+function getFilteredProxies() {
+  const q = (document.getElementById('proxy-search-input')?.value || '').trim().toLowerCase();
+  if (!q) return proxies;
+  return proxies.filter(p => {
+    const name = (p.name || '').toLowerCase();
+    const port = String(p.port || '');
+    const provider = (p.providerName || '').toLowerCase();
+    return name.includes(q) || port.includes(q) || provider.includes(q);
+  });
+}
+
+function filterProxies() {
+  renderProxies();
+}
+
 function renderProxies() {
   const container = document.getElementById('proxy-list');
+  const list = getFilteredProxies();
   if (proxies.length === 0) {
     container.innerHTML = '<div class="empty">暂无代理配置，点击右上角创建</div>';
     return;
   }
+  if (list.length === 0) {
+    container.innerHTML = '<div class="empty">没有匹配的代理</div>';
+    return;
+  }
 
-  container.innerHTML = proxies.map(p => {
+  container.innerHTML = list.map(p => {
     // Build unified provider rows: primary first, then pool entries
     const primaryRow = {
       name: p.providerName || p.providerUrl || '-',
@@ -1201,6 +1487,140 @@ function closeModal() {
   editingProviderId = null;
 }
 
+function showTestResultModal(data) {
+  const modal = document.getElementById('test-result-modal');
+  const icon = document.getElementById('test-result-icon');
+  const summary = document.getElementById('test-result-summary');
+  const list = document.getElementById('test-result-list');
+  const closeBtn = document.getElementById('test-result-close');
+
+  if (data.failed === 0) {
+    icon.textContent = '✓';
+    icon.style.background = 'rgba(6, 78, 59, 0.4)';
+    icon.style.color = '#34d399';
+    icon.style.borderColor = 'rgba(52, 211, 153, 0.15)';
+    summary.innerHTML = `<strong>${data.total}</strong> 条 API Key 全部测试通过`;
+  } else if (data.passed === 0) {
+    icon.textContent = '✗';
+    icon.style.background = 'rgba(127, 29, 29, 0.4)';
+    icon.style.color = '#f87171';
+    icon.style.borderColor = 'rgba(248, 113, 113, 0.15)';
+    summary.innerHTML = `<strong>${data.total}</strong> 条 API Key 全部测试失败`;
+  } else {
+    icon.textContent = '!';
+    icon.style.background = 'rgba(69, 26, 3, 0.4)';
+    icon.style.color = '#fbbf24';
+    icon.style.borderColor = 'rgba(251, 191, 36, 0.15)';
+    summary.innerHTML = `<strong>${data.passed}</strong> 条通过，<strong>${data.failed}</strong> 条失败`;
+  }
+
+  list.innerHTML = data.results.map(r => `
+    <div class="test-result-item ${r.ok ? 'test-ok' : 'test-fail'}">
+      <div class="test-result-row">
+        <span class="test-result-status">${r.ok ? '✓' : '✗'}</span>
+        <span class="test-result-alias">${escapeHtml(r.alias || `Key #${r.index + 1}`)}</span>
+        ${r.latencyMs != null ? `<span class="test-result-latency">${r.latencyMs}ms</span>` : ''}
+      </div>
+      ${r.message ? `<div class="test-result-error">${escapeHtml(r.message)}</div>` : ''}
+    </div>
+  `).join('');
+
+  modal.classList.add('active');
+  closeBtn.onclick = () => modal.classList.remove('active');
+}
+
+function clearKeyErrors() {
+  document.querySelectorAll('#api-keys-list .api-key-entry').forEach(row => {
+    row.querySelector('.api-key-input')?.style.removeProperty('border-color');
+    row.querySelector('.api-key-display')?.style.removeProperty('border-color');
+    row.querySelector('.api-key-error')?.remove();
+  });
+}
+
+function markKeyErrors(data) {
+  const rows = document.querySelectorAll('#api-keys-list .api-key-entry');
+  for (const r of data.results) {
+    if (!r.ok) {
+      const row = rows[r.index];
+      if (row) {
+        const el = row.querySelector('.api-key-input') || row.querySelector('.api-key-display');
+        if (el) el.style.borderColor = '#ef4444';
+        if (r.message) {
+          const errDiv = document.createElement('div');
+          errDiv.className = 'api-key-error';
+          errDiv.textContent = r.message;
+          // Insert after the API Key form-group
+          const keyGroup = row.querySelectorAll('.form-group')[1];
+          if (keyGroup) keyGroup.appendChild(errDiv);
+        }
+      }
+    }
+  }
+}
+
+async function testConnection() {
+  const providerId = document.getElementById('provider-id').value;
+  if (!providerId) {
+    showToast('请先选择供应商', true);
+    return;
+  }
+  const protocol = document.getElementById('target-protocol').value;
+  const apiKeys = collectApiKeys();
+  const model = document.getElementById('target-model').value.trim() || '';
+  const btn = document.getElementById('test-connection-btn');
+  btn.disabled = true;
+  btn.textContent = '测试中...';
+  clearKeyErrors();
+  try {
+    const res = await fetch(`/api/providers/${providerId}/test`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ protocol, apiKeys, model }),
+    });
+    const data = await res.json();
+    if (!data.results || data.results.length === 0) {
+      showToast(data.message || '没有可用的 API Key', true);
+      return;
+    }
+    markKeyErrors(data);
+    showTestResultModal(data);
+  } catch (err) {
+    showToast('测试请求失败: ' + err.message, true);
+  } finally {
+    btn.disabled = false;
+    btn.textContent = '测试连接';
+  }
+}
+
+async function autoTestForSave() {
+  const providerId = document.getElementById('provider-id').value;
+  if (!providerId) return true;
+  const protocol = document.getElementById('target-protocol').value;
+  const apiKeys = collectApiKeys();
+  const model = document.getElementById('target-model').value.trim() || '';
+  clearKeyErrors();
+  try {
+    const res = await fetch(`/api/providers/${providerId}/test`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ protocol, apiKeys, model }),
+    });
+    const data = await res.json();
+    if (!data.results || data.results.length === 0) return true;
+    if (data.failed === 0) {
+      showToast(`${data.total} 条 API Key 测试通过`);
+      return true;
+    }
+    markKeyErrors(data);
+    return await showConfirm(
+      `${data.passed} 条通过，${data.failed} 条失败。<br><br>是否仍然保存？`,
+      '仍然保存'
+    );
+  } catch (err) {
+    return true;
+  }
+}
+
 async function handleSubmit(e) {
   e.preventDefault();
 
@@ -1210,6 +1630,21 @@ async function handleSubmit(e) {
     return;
   }
 
+  // 保存前自动测试：如果有 API Key 被修改，先测试连接
+  const hasModifiedKeys = !!document.querySelector('#api-keys-list .api-key-entry[data-masked="false"], #api-keys-list .api-key-entry[data-new="true"]');
+  if (hasModifiedKeys) {
+    const saveBtn = document.querySelector('.modal-footer .btn-primary');
+    saveBtn.disabled = true;
+    saveBtn.textContent = '测试中...';
+    try {
+      const canProceed = await autoTestForSave();
+      if (!canProceed) return;
+    } finally {
+      saveBtn.disabled = false;
+      saveBtn.textContent = '保存';
+    }
+  }
+
   const port = parseInt(document.getElementById('proxy-port').value);
 
   const conflict = proxies.find(p => p.id !== editingId && p.port === port);