panrouter 4.0.0 → 4.1.0

package/cli.mjs

@@ -66,43 +66,31 @@ async function isPortOpen() {
 function stopAll() {
   log("..", "正在停止所有 Pan Router 进程...", "yellow");
   try {
-    execSync('taskkill /f /fi "WINDOWTITLE eq Pan Router*" >nul 2>&1', { stdio: "pipe" });
-  } catch {}
-  try {
-    execSync("taskkill /f /im powershell.exe >nul 2>&1", { stdio: "pipe" });
-  } catch {}
-  try {
-    const out = execSync(
-      'wmic process where "name=\'node.exe\'" get ProcessId,CommandLine /format:csv 2>nul',
-      { encoding: "utf8", windowsHide: true, timeout: 5000 }
-    );
-    for (const line of out.split("\n")) {
-      if (line.includes("server.mjs")) {
-        const m = line.match(/(\d+),.*?server\.mjs/);
-        if (m) try { process.kill(parseInt(m[1]), "SIGKILL"); } catch {}
-      }
+    if (process.platform === "win32") {
+      execSync('wmic process where "name=\'node.exe\' and CommandLine like \'%server.mjs%\'" call terminate >nul 2>&1', { stdio: "pipe" });
+      execSync('wmic process where "name=\'powershell.exe\' and CommandLine like \'%tray-daemon.ps1%\'" call terminate >nul 2>&1', { stdio: "pipe" });
     }
-  } catch {}
-  log("OK", "已停止所有进程", "green");
+    log("OK", "已停止所有进程", "green");
+  } catch (e) {
+    log("!!", "停止进程时遇到问题", "red");
+  }
 }
 
 function showStatus() {
   console.log(`\n\x1b[36m=== Pan Router 状态 ===\x1b[0m\n`);
   try {
-    const out = execSync(
-      'wmic process where "name=\'node.exe\'" get ProcessId,CommandLine /format:csv 2>nul',
-      { encoding: "utf8", timeout: 5000 }
-    );
-    const nodePids = [];
-    for (const line of out.split("\n")) {
-      if (line.includes("server.mjs")) {
-        const m = line.match(/(\d+),/);
-        if (m) nodePids.push(m[1]);
-      }
-    }
-    if (nodePids.length > 0) log("OK", `代理服务 (Node): 运行中 [PID: ${nodePids.join(", ")}]`, "green");
+    const nodeOut = execSync('wmic process where "name=\'node.exe\' and CommandLine like \'%server.mjs%\'" get ProcessId 2>nul').toString();
+    const psOut = execSync('wmic process where "name=\'powershell.exe\' and CommandLine like \'%tray-daemon.ps1%\'" get ProcessId 2>nul').toString();
+
+    const nodePids = nodeOut.match(/\d+/g) || [];
+    const psPids = psOut.match(/\d+/g) || [];
+
+    if (nodePids.length > 0) log("OK", `代理服务 (Node): 运行中 [PID: ${nodePids.join(', ')}]`, "green");
     else log("!!", "代理服务 (Node): 未运行", "red");
-  } catch {
+
+    if (psPids.length > 0) log("OK", `系统托盘 (PowerShell): 运行中 [PID: ${psPids.join(', ')}]`, "green");
+    else log("!!", "系统托盘 (PowerShell): 未运行", "red");
+  } catch (e) {
     log("!!", "无法获取状态", "red");
   }
   console.log("");
@@ -112,6 +100,7 @@ function openLogs() {
   const logFile = path.join(process.env.TEMP, "panrouter_tray.log");
   if (fs.existsSync(logFile)) {
     execSync(`start notepad "${logFile}"`);
+    log("OK", "日志已在记事本中打开", "green");
   } else {
     log("!!", "暂无托盘日志文件", "red");
   }
@@ -122,7 +111,11 @@ async function startServer() {
   stopAll();
 
   log("..", "正在启动代理...", "yellow");
-  execSync(`start "Pan Router" cmd /c "node ${serverPath} & pause"`, { stdio: "pipe" });
+  if (process.platform === "win32") {
+    execSync(`start "Pan Router" cmd /c "node ${serverPath} & pause"`, { stdio: "pipe" });
+  } else {
+    spawn("node", [serverPath], { cwd: __dirname, stdio: "ignore", detached: true }).unref();
+  }
 
   for (let i = 0; i < 15; i++) {
     if (await isPortOpen()) break;
@@ -138,17 +131,20 @@ async function startTray() {
   stopAll();
   log("..", "正在后台启动代理...", "yellow");
 
-  // UTF-8 BOM
+  // 追加 UTF-8 BOM 修复乱码
   try {
     const psContent = fs.readFileSync(psPath, "utf8");
-    if (psContent.charCodeAt(0) !== 0xFEFF) {
+    if (!psContent.startsWith("")) {
       const bom = Buffer.from([0xEF, 0xBB, 0xBF]);
       fs.writeFileSync(psPath, Buffer.concat([bom, Buffer.from(psContent, "utf8")]));
     }
-  } catch {}
+  } catch (e) { }
 
   const srv = spawn(process.execPath, [serverPath], {
-    cwd: __dirname, stdio: "ignore", windowsHide: true, detached: true
+    cwd: __dirname,
+    stdio: "ignore",
+    windowsHide: true,
+    detached: true
   });
   srv.unref();
 
@@ -161,15 +157,20 @@ async function startTray() {
   if (ok) log("OK", "代理服务已就绪！(端口 50816)", "green");
   else log("!!", "服务启动超时，但仍将尝试加载托盘", "red");
 
-  log("..", "正在加载系统托盘...", "yellow");
+  log("..", "正在加载系统托盘与控制台引擎...", "yellow");
 
   const tray = spawn("powershell.exe", [
-    "-NoProfile", "-STA", "-ExecutionPolicy", "Bypass",
-    "-WindowStyle", "Hidden", "-File", `"${psPath}"`,
+    "-NoProfile",
+    "-STA",
+    "-ExecutionPolicy", "Bypass",
+    "-WindowStyle", "Hidden",
+    "-File", `"${psPath}"`
   ], {
-    cwd: __dirname, stdio: ["ignore", "pipe", "pipe"],
-    windowsHide: true, shell: true,
-    env: { ...process.env, PANROUTER_NODE: process.execPath },
+    cwd: __dirname,
+    stdio: ['ignore', 'pipe', 'pipe'],
+    windowsHide: true,
+    shell: true,
+    env: { ...process.env, PANROUTER_NODE: process.execPath }
   });
 
   let psOutput = "";
@@ -193,10 +194,11 @@ function printHelp() {
 
 | 指令 | 功能 |
 |------|------|
-| \x1b[33mpanrouter\x1b[0m | 自动检测 Claude Code → 安装(如需要) → 配路由 → 启托盘 |
+| \x1b[33mpanrouter\x1b[0m | 🔥 自动检测 Claude Code → 安装(如需要) → 配路由 → 启托盘 |
 | \x1b[33mpanrouter --setup\x1b[0m | 只配路由（恢复配置用） |
 | \x1b[33mpanrouter --status\x1b[0m | 查看运行状态 + PID |
 | \x1b[33mpanrouter --stop\x1b[0m | 停止所有进程 |
+| \x1b[33mpanrouter --restart\x1b[0m | 重启托盘 |
 | \x1b[33mpanrouter --server\x1b[0m | 前台窗口模式 |
 | \x1b[33mpanrouter --logs\x1b[0m | 打开日志 |
 | \x1b[33mpanrouter --version\x1b[0m | 版本号 |
@@ -208,7 +210,7 @@ async function main() {
   const args = process.argv.slice(2);
   const cmd = args[0];
 
-  switch (cmd) {
+  switch(cmd) {
     case "--help":
     case "-h":
       printHelp();
@@ -229,6 +231,9 @@ async function main() {
     case "--logs":
       openLogs();
       break;
+    case "--restart":
+      await startTray();
+      break;
     case "--server":
       await startServer();
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "panrouter",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "让 Claude Code 免费使用 DeepSeek 等模型，无需 API Key",
   "type": "module",
   "bin": {

package/server.mjs

@@ -305,6 +305,7 @@ const server = http.createServer(async (req, res) => {
       }
     } catch(e) {}
 
+    // 按时间倒序，返回最近 100 条给前端展示
     history.sort((a,b) => b.ts - a.ts);
     const recent = history.slice(0, 100);
 
@@ -380,6 +381,7 @@ const server = http.createServer(async (req, res) => {
       }
     });
 
+    // 请求结束时记录统计数据
     upstream.stream.on("end", () => {
       if (state.model) {
         const inTokens = state.usage?.input_tokens || 0;

package/tray-daemon.ps1

@@ -1,6 +1,6 @@
 <#
 .SYNOPSIS
-  Pan Router 托盘守护脚本 (原生桌面控制台版)
+  Pan Router 托盘守护脚本 (原生桌面控制台版 - 作用域修复)
 #>
 $ErrorActionPreference = "Stop"
 
@@ -68,8 +68,13 @@ try {
         $notifyIcon.Icon = [System.Drawing.SystemIcons]::Shield
     }
 
-    # ====== 原生 WinForms 数据面板 ======
+    # ====== 【原生 WinForms 数据面板 (修复变量回收 Bug)】 ======
     $global:dashForm = $null
+    $script:lblReq = $null
+    $script:lblIn = $null
+    $script:lblOut = $null
+    $script:cmbPeriod = $null
+    $script:lv = $null
 
     function Show-Dashboard {
         if ($global:dashForm -ne $null -and -not $global:dashForm.IsDisposed) {
@@ -93,25 +98,25 @@ try {
         $grpSummary.Size = New-Object System.Drawing.Size(515, 65)
         $form.Controls.Add($grpSummary)
 
-        $lblReq = New-Object System.Windows.Forms.Label
-        $lblReq.Location = New-Object System.Drawing.Point(20, 28)
-        $lblReq.Size = New-Object System.Drawing.Size(140, 20)
-        $lblReq.Text = "请求总数: -"
-        $grpSummary.Controls.Add($lblReq)
-
-        $lblIn = New-Object System.Windows.Forms.Label
-        $lblIn.Location = New-Object System.Drawing.Point(160, 28)
-        $lblIn.Size = New-Object System.Drawing.Size(160, 20)
-        $lblIn.Text = "输入 Token: -"
-        $lblIn.ForeColor = [System.Drawing.Color]::MediumBlue
-        $grpSummary.Controls.Add($lblIn)
-
-        $lblOut = New-Object System.Windows.Forms.Label
-        $lblOut.Location = New-Object System.Drawing.Point(340, 28)
-        $lblOut.Size = New-Object System.Drawing.Size(160, 20)
-        $lblOut.Text = "输出 Token: -"
-        $lblOut.ForeColor = [System.Drawing.Color]::ForestGreen
-        $grpSummary.Controls.Add($lblOut)
+        $script:lblReq = New-Object System.Windows.Forms.Label
+        $script:lblReq.Location = New-Object System.Drawing.Point(20, 28)
+        $script:lblReq.Size = New-Object System.Drawing.Size(140, 20)
+        $script:lblReq.Text = "请求总数: -"
+        $grpSummary.Controls.Add($script:lblReq)
+
+        $script:lblIn = New-Object System.Windows.Forms.Label
+        $script:lblIn.Location = New-Object System.Drawing.Point(160, 28)
+        $script:lblIn.Size = New-Object System.Drawing.Size(160, 20)
+        $script:lblIn.Text = "输入 Token: -"
+        $script:lblIn.ForeColor = [System.Drawing.Color]::MediumBlue
+        $grpSummary.Controls.Add($script:lblIn)
+
+        $script:lblOut = New-Object System.Windows.Forms.Label
+        $script:lblOut.Location = New-Object System.Drawing.Point(340, 28)
+        $script:lblOut.Size = New-Object System.Drawing.Size(160, 20)
+        $script:lblOut.Text = "输出 Token: -"
+        $script:lblOut.ForeColor = [System.Drawing.Color]::ForestGreen
+        $grpSummary.Controls.Add($script:lblOut)
 
         $lblFilter = New-Object System.Windows.Forms.Label
         $lblFilter.Text = "时间筛选:"
@@ -119,55 +124,58 @@ try {
         $lblFilter.AutoSize = $true
         $form.Controls.Add($lblFilter)
 
-        $cmbPeriod = New-Object System.Windows.Forms.ComboBox
-        $cmbPeriod.Items.AddRange(@("最近 1 天", "最近 7 天", "最近 30 天", "全部时间"))
-        $cmbPeriod.SelectedIndex = 3
-        $cmbPeriod.Location = New-Object System.Drawing.Point(80, 85)
-        $cmbPeriod.Size = New-Object System.Drawing.Size(120, 20)
-        $cmbPeriod.DropDownStyle = 'DropDownList'
-        $form.Controls.Add($cmbPeriod)
-
-        $lv = New-Object System.Windows.Forms.ListView
-        $lv.Location = New-Object System.Drawing.Point(15, 115)
-        $lv.Size = New-Object System.Drawing.Size(515, 310)
-        $lv.View = 'Details'
-        $lv.FullRowSelect = $true
-        $lv.GridLines = $true
-        $lv.Columns.Add("时间", 135) | Out-Null
-        $lv.Columns.Add("模型", 185) | Out-Null
-        $lv.Columns.Add("输入", 85) | Out-Null
-        $lv.Columns.Add("输出", 85) | Out-Null
-        $form.Controls.Add($lv)
+        $script:cmbPeriod = New-Object System.Windows.Forms.ComboBox
+        $script:cmbPeriod.Items.AddRange(@("最近 1 天", "最近 7 天", "最近 30 天", "全部时间"))
+        $script:cmbPeriod.SelectedIndex = 3
+        $script:cmbPeriod.Location = New-Object System.Drawing.Point(80, 85)
+        $script:cmbPeriod.Size = New-Object System.Drawing.Size(120, 20)
+        $script:cmbPeriod.DropDownStyle = 'DropDownList'
+        $form.Controls.Add($script:cmbPeriod)
+
+        $script:lv = New-Object System.Windows.Forms.ListView
+        $script:lv.Location = New-Object System.Drawing.Point(15, 115)
+        $script:lv.Size = New-Object System.Drawing.Size(515, 310)
+        $script:lv.View = 'Details'
+        $script:lv.FullRowSelect = $true
+        $script:lv.GridLines = $true
+        $script:lv.Columns.Add("时间", 135) | Out-Null
+        $script:lv.Columns.Add("模型", 185) | Out-Null
+        $script:lv.Columns.Add("输入", 85) | Out-Null
+        $script:lv.Columns.Add("输出", 85) | Out-Null
+        $form.Controls.Add($script:lv)
 
         $updateData = {
+            if ($null -eq $script:cmbPeriod -or $null -eq $script:cmbPeriod.SelectedItem) { return }
+
             $map = @{"最近 1 天"="1"; "最近 7 天"="7"; "最近 30 天"="30"; "全部时间"="all"}
-            $p = $map[$cmbPeriod.SelectedItem.ToString()]
+            $p = $map[$script:cmbPeriod.SelectedItem.ToString()]
+
             try {
                 $data = Invoke-RestMethod -Uri "http://127.0.0.1:50816/api/stats?period=$p" -Method Get -ErrorAction Stop
 
-                $lblReq.Text = "请求总数: {0:N0}" -f $data.totalReq
-                $lblIn.Text  = "输入 Token: {0:N0}" -f $data.totalIn
-                $lblOut.Text = "输出 Token: {0:N0}" -f $data.totalOut
+                $script:lblReq.Text = "请求总数: {0:N0}" -f $data.totalReq
+                $script:lblIn.Text  = "输入 Token: {0:N0}" -f $data.totalIn
+                $script:lblOut.Text = "输出 Token: {0:N0}" -f $data.totalOut
 
-                $lv.Items.Clear()
+                $script:lv.Items.Clear()
                 if ($data.recent) {
-                    $lv.BeginUpdate()
+                    $script:lv.BeginUpdate()
                     foreach ($r in $data.recent) {
                         $dt = [timezone]::CurrentTimeZone.ToLocalTime(([datetime]'1/1/1970').AddMilliseconds($r.ts))
                         $item = New-Object System.Windows.Forms.ListViewItem($dt.ToString("yyyy-MM-dd HH:mm:ss"))
                         $item.SubItems.Add($r.m) | Out-Null
                         $item.SubItems.Add(("{0:N0} ↑" -f $r.i)) | Out-Null
                         $item.SubItems.Add(("{0:N0} ↓" -f $r.o)) | Out-Null
-                        $lv.Items.Add($item) | Out-Null
+                        $script:lv.Items.Add($item) | Out-Null
                     }
-                    $lv.EndUpdate()
+                    $script:lv.EndUpdate()
                 }
             } catch {
-                $lblReq.Text = "无法连接统计接口"
+                $script:lblReq.Text = "无法连接统计接口，请检查服务状态"
             }
         }
 
-        $cmbPeriod.Add_SelectedIndexChanged($updateData)
+        $script:cmbPeriod.Add_SelectedIndexChanged($updateData)
         & $updateData
 
         $form.Show()