protocol-proxy 2.3.4 → 2.4.0

package/public/style.css

@@ -249,7 +249,7 @@ header p {
 .proxy-header {
   display: flex;
   justify-content: space-between;
-  align-items: flex-start;
+  align-items: center;
   margin-bottom: 14px;
 }
 
@@ -314,13 +314,16 @@ header p {
 }
 
 .target-table th:nth-child(1),
-.target-table td:nth-child(1) { width: 55%; }
+.target-table td:nth-child(1) { width: 25%; }
 
 .target-table th:nth-child(2),
-.target-table td:nth-child(2) { width: 15%; }
+.target-table td:nth-child(2) { width: 25%; }
 
 .target-table th:nth-child(3),
-.target-table td:nth-child(3) { width: 30%; }
+.target-table td:nth-child(3) { width: 25%; }
+
+.target-table th:nth-child(4),
+.target-table td:nth-child(4) { width: 25%; text-align: center; }
 
 .target-table th,
 .target-table td {
@@ -1187,3 +1190,155 @@ form {
     font-size: 2rem;
   }
 }
+
+.proxy-routing-badge {
+  font-size: 0.75rem;
+  padding: 3px 10px;
+  border-radius: 6px;
+  background: rgba(51, 65, 85, 0.5);
+  color: #94a3b8;
+  font-weight: 500;
+  white-space: nowrap;
+}
+
+.provider-tag {
+  font-size: 0.7rem;
+  padding: 1px 6px;
+  border-radius: 4px;
+  background: rgba(148, 163, 184, 0.15);
+  color: #94a3b8;
+  margin-left: 6px;
+  vertical-align: middle;
+}
+
+.provider-pool-group {
+  grid-column: 1 / -1;
+}
+
+.provider-pool-picker {
+  margin-bottom: 12px;
+}
+
+.provider-pool-list {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.provider-pool-empty {
+  padding: 12px 14px;
+  border: 1px dashed rgba(71, 85, 105, 0.6);
+  border-radius: 10px;
+  color: #64748b;
+  font-size: 0.9rem;
+  background: rgba(6, 8, 15, 0.35);
+}
+
+.provider-pool-item {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) 140px 120px auto;
+  gap: 12px;
+  align-items: center;
+  padding: 12px 14px;
+  border: 1px solid rgba(51, 65, 85, 0.5);
+  border-radius: 12px;
+  background: rgba(6, 8, 15, 0.45);
+}
+
+.provider-pool-main {
+  min-width: 0;
+}
+
+.provider-pool-name {
+  color: #e2e8f0;
+  font-weight: 600;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.provider-pool-meta {
+  color: #64748b;
+  font-size: 0.82rem;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.provider-pool-model label {
+  display: block;
+  margin-bottom: 4px;
+  font-size: 0.75rem;
+  color: #94a3b8;
+}
+
+.provider-pool-model-value {
+  color: #e2e8f0;
+  font-size: 0.85rem;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: block;
+}
+
+.pool-provider-group {
+  position: relative;
+}
+
+.pool-provider-trigger {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.pool-provider-arrow {
+  margin-left: auto;
+  font-size: 12px;
+  color: #64748b;
+  transition: transform 0.15s;
+}
+
+.pool-provider-group.open > .pool-provider-trigger .pool-provider-arrow {
+  transform: rotate(90deg);
+}
+
+.pool-model-sublist {
+  display: none;
+  padding-left: 16px;
+  border-left: 2px solid rgba(71, 85, 105, 0.3);
+  margin-left: 8px;
+}
+
+.pool-provider-group.open > .pool-model-sublist {
+  display: block;
+}
+
+.pool-model-sublist .model-option {
+  font-size: 13px;
+  padding: 6px 12px;
+}
+
+.provider-pool-weight label {
+  display: block;
+  margin-bottom: 4px;
+  font-size: 0.75rem;
+  color: #94a3b8;
+}
+
+.provider-pool-weight input {
+  width: 100%;
+}
+
+.provider-pool-remove {
+  padding: 8px 12px;
+  border-radius: 10px;
+  border: 1px solid rgba(127, 29, 29, 0.6);
+  background: rgba(127, 29, 29, 0.2);
+  color: #fca5a5;
+  cursor: pointer;
+}
+
+.provider-pool-remove:hover {
+  background: rgba(127, 29, 29, 0.35);
+  border-color: rgba(248, 113, 113, 0.8);
+}

package/server.js

@@ -3,6 +3,7 @@ const path = require('path');
 const { exec, spawn } = require('child_process');
 const os = require('os');
 const fs = require('fs');
+const logger = require('./lib/logger');
 
 // ==================== CLI ====================
 
@@ -137,7 +138,7 @@ async function init() {
       command = `xdg-open "${url}"`;
     }
     exec(command, (err) => {
-      if (err) console.error('[Browser] 打开浏览器失败:', err.message);
+      if (err) logger.error('[Browser] 打开浏览器失败:', err.message);
     });
   }
 
@@ -149,7 +150,7 @@ async function init() {
     const start = Date.now();
     res.on('finish', () => {
       const duration = Date.now() - start;
-      console.log(`[HTTP] ${req.method} ${req.path} - ${res.statusCode} (${duration}ms)`);
+      logger.log(`[HTTP] ${req.method} ${req.path} - ${res.statusCode} (${duration}ms)`);
     });
     next();
   });
@@ -159,20 +160,90 @@ async function init() {
   // ==================== 辅助函数 ====================
 
   function resolveTarget(proxy) {
-    const provider = configStore.getProviderById(proxy.providerId);
-    if (!provider) return null;
+    const primaryProvider = configStore.getProviderById(proxy.providerId);
+    if (!primaryProvider) return null;
+
+    const pool = [];
+    const seen = new Set();
+
+    // Primary provider (no model override)
+    const primaryKey = `${primaryProvider.id}\0`;
+    seen.add(primaryKey);
+    pool.push({
+      providerId: primaryProvider.id,
+      providerName: primaryProvider.name,
+      providerUrl: primaryProvider.url,
+      protocol: primaryProvider.protocol,
+      apiKey: primaryProvider.apiKey,
+      models: primaryProvider.models,
+      azureDeployment: primaryProvider.azureDeployment || '',
+      azureApiVersion: primaryProvider.azureApiVersion || '',
+      model: '',
+      weight: Math.max(1, parseInt(proxy.providerWeight, 10) || 1),
+    });
+
+    // Pool entries (may include model override)
+    for (const entry of (proxy.providerPool || [])) {
+      if (!entry || !entry.providerId) continue;
+      const model = typeof entry.model === 'string' ? entry.model.trim() : '';
+      const key = `${entry.providerId}\0${model}`;
+      if (seen.has(key)) continue;
+      seen.add(key);
+      const provider = configStore.getProviderById(entry.providerId);
+      if (!provider) continue;
+      pool.push({
+        providerId: provider.id,
+        providerName: provider.name,
+        providerUrl: provider.url,
+        protocol: provider.protocol,
+        apiKey: provider.apiKey,
+        models: provider.models,
+        azureDeployment: provider.azureDeployment || '',
+        azureApiVersion: provider.azureApiVersion || '',
+        model,
+        weight: Math.max(1, parseInt(entry.weight, 10) || 1),
+      });
+    }
+
+    if (pool.length === 0) return null;
+    const protocol = pool[0].protocol;
+    if (pool.some(p => p.protocol !== protocol)) return null;
+
     return {
-      providerUrl: provider.url,
-      providerName: provider.name,
-      protocol: provider.protocol,
-      apiKey: provider.apiKey,
+      protocol,
+      routingStrategy: proxy.routingStrategy || 'primary_fallback',
+      providerPool: pool,
       defaultModel: proxy.defaultModel,
-      models: provider.models,
-      azureDeployment: provider.azureDeployment || '',
-      azureApiVersion: provider.azureApiVersion || '',
     };
   }
 
+  function normalizeProviderPoolInput(pool) {
+    if (!Array.isArray(pool)) return [];
+    const seen = new Set();
+    const result = [];
+    for (const item of pool) {
+      if (!item || typeof item !== 'object') continue;
+      const providerId = typeof item.providerId === 'string' ? item.providerId.trim() : '';
+      if (!providerId) continue;
+      const model = typeof item.model === 'string' ? item.model.trim() : '';
+      const key = `${providerId}\0${model}`;
+      if (seen.has(key)) continue;
+      seen.add(key);
+      result.push({
+        providerId,
+        model,
+        weight: Math.max(1, parseInt(item.weight, 10) || 1),
+      });
+    }
+    return result;
+  }
+
+  function normalizeRoutingStrategyInput(strategy) {
+    return ['primary_fallback', 'round_robin', 'weighted', 'fastest'].includes(strategy)
+      ? strategy
+      : 'primary_fallback';
+  }
+
   async function startProxyWithProvider(proxy) {
     const target = resolveTarget(proxy);
     if (!target) throw new Error(`供应商 ${proxy.providerId} 不存在`);
@@ -269,6 +340,9 @@ async function init() {
         providerUrl: provider?.url || '',
         protocol: provider?.protocol || '',
         defaultModel: p.defaultModel || '',
+        providerWeight: Math.max(1, parseInt(p.providerWeight, 10) || 1),
+        routingStrategy: p.routingStrategy || 'primary_fallback',
+        providerPool: Array.isArray(p.providerPool) ? p.providerPool : [],
         hasApiKey: !!provider?.apiKey,
         running: proxyManager.isRunning(p.id),
       };
@@ -286,13 +360,15 @@ async function init() {
       providerName: provider?.name || '',
       providerUrl: provider?.url || '',
       protocol: provider?.protocol || '',
+      routingStrategy: proxy.routingStrategy || 'primary_fallback',
+      providerPool: Array.isArray(proxy.providerPool) ? proxy.providerPool : [],
       hasApiKey: !!provider?.apiKey,
     });
   });
 
   // 创建代理
   app.post('/api/proxies', async (req, res) => {
-    const { name, port, requireAuth, authToken, providerId, defaultModel } = req.body;
+    const { name, port, requireAuth, authToken, providerId, defaultModel, routingStrategy, providerPool, providerWeight } = req.body;
 
     if (!name || !port || !providerId) {
       return res.status(400).json({ error: 'name, port and providerId are required' });
@@ -317,6 +393,9 @@ async function init() {
       authToken: authToken || null,
       providerId,
       defaultModel: defaultModel || '',
+      providerWeight: Math.max(1, parseInt(providerWeight, 10) || 1),
+      routingStrategy: normalizeRoutingStrategyInput(routingStrategy),
+      providerPool: normalizeProviderPoolInput(providerPool),
     });
 
     try {
@@ -345,6 +424,9 @@ async function init() {
       updates.providerId = req.body.providerId;
     }
     if (req.body.defaultModel !== undefined) updates.defaultModel = req.body.defaultModel;
+    if (req.body.providerWeight !== undefined) updates.providerWeight = Math.max(1, parseInt(req.body.providerWeight, 10) || 1);
+    if (req.body.routingStrategy !== undefined) updates.routingStrategy = normalizeRoutingStrategyInput(req.body.routingStrategy);
+    if (req.body.providerPool !== undefined) updates.providerPool = normalizeProviderPoolInput(req.body.providerPool);
 
     const needRestart = updates.port !== undefined && updates.port !== existing.port;
     if (needRestart) {
@@ -453,6 +535,8 @@ async function init() {
         authToken: p.authToken,
         providerId: p.providerId,
         defaultModel: p.defaultModel || '',
+        routingStrategy: p.routingStrategy || 'primary_fallback',
+        providerPool: Array.isArray(p.providerPool) ? p.providerPool : [],
         providerName: provider?.name || '',
       };
     });
@@ -502,6 +586,8 @@ async function init() {
           authToken: p.authToken || null,
           providerId: p.providerId,
           defaultModel: p.defaultModel || '',
+          routingStrategy: normalizeRoutingStrategyInput(p.routingStrategy),
+          providerPool: normalizeProviderPoolInput(p.providerPool),
         })),
       };
       configStore.saveConfig(newConfig);
@@ -521,6 +607,8 @@ async function init() {
         protocol: p.protocol,
         apiKey: p.apiKey || '',
         models: Array.isArray(p.models) ? p.models : [],
+        routingStrategy: normalizeRoutingStrategyInput(p.routingStrategy),
+        providerPool: normalizeProviderPoolInput(p.providerPool),
       });
     }
 
@@ -535,16 +623,18 @@ async function init() {
           error: `端口 ${p.port} 已被代理「${conflict.name}」占用，无法导入代理「${p.name}」`,
         });
       }
-      proxyMap.set(p.id, {
-        id: p.id,
-        name: p.name,
-        port: p.port,
-        requireAuth: !!p.requireAuth,
-        authToken: p.authToken || null,
-        providerId: p.providerId,
-        defaultModel: p.defaultModel || '',
-      });
-    }
+        proxyMap.set(p.id, {
+          id: p.id,
+          name: p.name,
+          port: p.port,
+          requireAuth: !!p.requireAuth,
+          authToken: p.authToken || null,
+          providerId: p.providerId,
+          defaultModel: p.defaultModel || '',
+          routingStrategy: normalizeRoutingStrategyInput(p.routingStrategy),
+          providerPool: normalizeProviderPoolInput(p.providerPool),
+        });
+      }
 
     const merged = {
       providers: Array.from(providerMap.values()),
@@ -570,6 +660,7 @@ async function init() {
   });
 
   // 启动
+  logger.init();
   writePid();
 
   // 启动所有已配置的代理
@@ -578,21 +669,22 @@ async function init() {
     try {
       await startProxyWithProvider(proxy);
     } catch (err) {
-      console.error(`[Init] Failed to start proxy ${proxy.name}:`, err.message);
+      logger.error(`[Init] Failed to start proxy ${proxy.name}:`, err.message);
     }
   }));
 
   app.listen(PORT, () => {
     const adminUrl = `http://localhost:${PORT}`;
-    console.log(`[Admin] Management server running on ${adminUrl}`);
-    console.log(`[Admin] ${proxies.length} proxy config(s) loaded`);
+    logger.log(`[Admin] Management server running on ${adminUrl}`);
+    logger.log(`[Admin] ${proxies.length} proxy config(s) loaded`);
+    logger.log(`[Admin] 日志文件: ${logger.LOG_FILE}`);
     openBrowser(adminUrl);
   });
 }
 
 // 优雅关闭
 process.on('SIGINT', async () => {
-  console.log('\nShutting down...');
+  logger.log('[Shutdown] Shutting down...');
   removePid();
   try {
     const proxyManager = require('./lib/proxy-manager');
@@ -600,7 +692,7 @@ process.on('SIGINT', async () => {
     statsStore.flush();
     await proxyManager.stopAll();
   } catch (err) {
-    console.error('[Shutdown] stopAll error:', err.message);
+    logger.error('[Shutdown] stopAll error:', err.message);
   }
   process.exit(0);
 });
@@ -613,7 +705,7 @@ process.on('SIGTERM', async () => {
     statsStore.flush();
     await proxyManager.stopAll();
   } catch (err) {
-    console.error('[Shutdown] stopAll error:', err.message);
+    logger.error('[Shutdown] stopAll error:', err.message);
   }
   process.exit(0);
 });