protocol-proxy 2.2.0 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protocol-proxy",
-  "version": "2.2.0",
+  "version": "2.3.2",
   "description": "OpenAI / Anthropic 协议转换透明代理",
   "main": "server.js",
   "bin": {
@@ -27,8 +27,7 @@
   },
   "dependencies": {
     "cors": "^2.8.5",
-    "express": "^4.19.2",
-    "puppeteer-core": "^24.43.0"
+    "express": "^4.19.2"
   },
   "devDependencies": {
     "pkg": "^5.8.1"

package/public/app.js

@@ -211,6 +211,8 @@ function selectProvider(id) {
   const models = provider?.models || [];
   selectModel(models[0] || '');
   updateModelAddState();
+  // 同步 API Key placeholder
+  document.getElementById('target-key').placeholder = provider?.apiKey ? '已设置（留空则不修改）' : 'sk-...';
   // 同步 Azure 字段
   document.getElementById('target-azure-deployment').value = provider?.azureDeployment || '';
   document.getElementById('target-azure-version').value = provider?.azureApiVersion || '';
@@ -440,11 +442,16 @@ async function confirmImport() {
 
 async function restartAllProxies() {
   try {
-    for (const p of proxies) {
-      if (p.running) {
-        await fetch(`/api/proxies/${p.id}/stop`, { method: 'POST' });
-      }
+    // 先停掉所有运行中的代理（不管 ID 是否匹配新配置）
+    const statusRes = await fetch('/api/status');
+    const status = await statusRes.json();
+    const runningIds = (status.running || []).map(r => r.id);
+    for (const id of runningIds) {
+      await fetch(`/api/proxies/${id}/stop`, { method: 'POST' });
     }
+    // 重新加载配置
+    await loadProxies();
+    // 按新配置启动所有代理
     for (const p of proxies) {
       await fetch(`/api/proxies/${p.id}/start`, { method: 'POST' });
     }
@@ -466,6 +473,10 @@ async function loadStats() {
   try {
     const params = new URLSearchParams({ range: statsRange });
     if (statsProxyId) params.set('proxyId', statsProxyId);
+    const startDate = document.getElementById('stats-start-date')?.value;
+    const endDate = document.getElementById('stats-end-date')?.value;
+    if (startDate) params.set('startDate', startDate);
+    if (endDate) params.set('endDate', endDate);
     const res = await fetch('/api/stats?' + params);
     const data = await res.json();
     renderStatsSummary(data.summary);
@@ -577,9 +588,15 @@ function initStatsRangeBtns() {
       document.querySelectorAll('.stats-range-btn').forEach(b => b.classList.remove('active'));
       btn.classList.add('active');
       statsRange = btn.dataset.range;
+      // 清空日期选择器，显示全部数据
+      document.getElementById('stats-start-date').value = '';
+      document.getElementById('stats-end-date').value = '';
       loadStats();
     });
   });
+  // 日期选择器变化时自动加载
+  document.getElementById('stats-start-date').addEventListener('change', loadStats);
+  document.getElementById('stats-end-date').addEventListener('change', loadStats);
 }
 
 function generateToken() {
@@ -635,6 +652,9 @@ async function init() {
   initSimpleDropdown('protocol-dropdown', (val) => {
     document.getElementById('azure-fields').style.display = val === 'openai' ? '' : 'none';
   });
+  // 初始状态：根据当前协议值决定 Azure 字段显示
+  const initProto = document.getElementById('target-protocol').value;
+  document.getElementById('azure-fields').style.display = initProto === 'openai' ? '' : 'none';
 }
 
 // ==================== 代理地址复制 ====================

package/public/index.html

@@ -42,6 +42,10 @@
             <button class="btn btn-sm stats-range-btn active" data-range="daily">每日</button>
             <button class="btn btn-sm stats-range-btn" data-range="monthly">每月</button>
             <button class="btn btn-sm stats-range-btn" data-range="yearly">每年</button>
+            <span class="stats-date-sep">|</span>
+            <input type="date" id="stats-start-date" class="stats-date-input" placeholder="开始日期">
+            <span class="stats-date-sep">~</span>
+            <input type="date" id="stats-end-date" class="stats-date-input" placeholder="结束日期">
           </div>
         </div>
       </div>
@@ -160,6 +164,7 @@
                       <div class="model-dropdown-options" id="protocol-dropdown-options">
                         <div class="model-option selected" data-value="openai"><span class="model-option-name">OpenAI</span></div>
                         <div class="model-option" data-value="anthropic"><span class="model-option-name">Anthropic</span></div>
+                        <div class="model-option" data-value="gemini"><span class="model-option-name">Gemini</span></div>
                       </div>
                     </div>
                   </div>
@@ -190,12 +195,12 @@
               </div>
               <div class="form-row" id="azure-fields" style="display:none">
                 <div class="form-group">
-                  <label>Azure Deployment</label>
-                  <input type="text" id="target-azure-deployment" placeholder="gpt-4o">
+                  <label>Azure Deployment <span style="color:#64748b;font-size:0.75rem">（仅 Azure 用户填写）</span></label>
+                  <input type="text" id="target-azure-deployment" placeholder="仅 Azure 用户填写">
                 </div>
                 <div class="form-group">
-                  <label>Azure API Version</label>
-                  <input type="text" id="target-azure-version" placeholder="2024-02-01">
+                  <label>Azure API Version <span style="color:#64748b;font-size:0.75rem">（仅 Azure 用户填写）</span></label>
+                  <input type="text" id="target-azure-version" placeholder="仅 Azure 用户填写">
                 </div>
               </div>
             </div>

package/public/style.css

@@ -954,7 +954,8 @@ form {
 .stats-controls {
   display: flex;
   gap: 12px;
-  align-items: center;
+  flex-wrap: wrap;
+  justify-content: flex-end;  align-items: center;
 }
 
 .stats-controls .model-dropdown {
@@ -970,6 +971,7 @@ form {
 .stats-range-btns {
   display: flex;
   gap: 4px;
+  align-items: center;
   background: rgba(6, 8, 15, 0.4);
   border-radius: 10px;
   padding: 3px;
@@ -995,7 +997,38 @@ form {
 .stats-range-btn.active {
   background: rgba(59, 130, 246, 0.2) !important;
   color: #60a5fa !important;
-  box-shadow: 0 0 8px rgba(59, 130, 246, 0.15) !important;
+}
+
+.stats-date-range {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.stats-date-input {
+  background: rgba(15, 23, 42, 0.6);
+  border: 1px solid rgba(51, 65, 85, 0.5);
+  border-radius: 6px;
+  color: #e2e8f0;
+  padding: 6px 8px;
+  font-size: 0.78rem;
+  outline: none;
+  transition: border-color 0.2s;
+  width: 125px;
+}
+
+.stats-date-input:focus {
+  border-color: #3b82f6;
+}
+
+.stats-date-input::-webkit-calendar-picker-indicator {
+  filter: invert(0.7);
+  cursor: pointer;
+}
+
+.stats-date-sep {
+  color: #475569;
+  font-size: 0.85rem;
 }
 
 .stats-summary {
@@ -1123,6 +1156,15 @@ form {
   .stats-controls .model-dropdown {
     width: 100%;
   }
+
+  .stats-date-range {
+    width: 100%;
+  }
+
+  .stats-date-input {
+    flex: 1;
+    min-width: 0;
+  }
 }
 
 /* Responsive */

package/server.js

@@ -596,6 +596,8 @@ process.on('SIGINT', async () => {
   removePid();
   try {
     const proxyManager = require('./lib/proxy-manager');
+    const statsStore = require('./lib/stats-store');
+    statsStore.flush();
     await proxyManager.stopAll();
   } catch (err) {
     console.error('[Shutdown] stopAll error:', err.message);
@@ -607,6 +609,8 @@ process.on('SIGTERM', async () => {
   removePid();
   try {
     const proxyManager = require('./lib/proxy-manager');
+    const statsStore = require('./lib/stats-store');
+    statsStore.flush();
     await proxyManager.stopAll();
   } catch (err) {
     console.error('[Shutdown] stopAll error:', err.message);