panrouter 1.8.0 → 1.9.0

package/cli.mjs

@@ -150,8 +150,8 @@ function startTray() {
 
   log("..", "正在以托盘模式启动 Pan Router...", "yellow");
 
-  // cmd /c start /B → VBS 在新进程树中运行, 有 Window Station
-  const child = spawn("cmd.exe", ["/c", "start", "/B", "wscript.exe", "//B", "//NoLogo", vbsPath], {
+  // 直接调用 wscript，去掉多余的 cmd.exe 嵌套层级，更稳定
+  const child = spawn("wscript.exe", ["//B", "//NoLogo", vbsPath], {
     cwd: __dirname,
     stdio: "ignore",
     windowsHide: true,
@@ -161,7 +161,7 @@ function startTray() {
   child.unref();
 
   log("OK", "Pan Router 托盘已启动", "green");
-  console.log("   图标在右下角, 右键可退出");
+  console.log("   图标在右下角, 右键可进行管理");
 }
 
 // ─── 主流程 ──────────────────────────────────────────────────────────────
@@ -192,9 +192,10 @@ async function main() {
 
   \x1b[33m托盘模式:\x1b[0m
     在系统通知区（右下角）显示图标，右键菜单:
-    - 开关 开机自启动
-    - 退出 关闭服务器和托盘
-    左键点击图标查看运行状态
+    - 启动/重启服务
+    - 开关开机自启动
+    - 退出关闭服务器和托盘
+    左键点击图标显示菜单
 
   \x1b[33m配置:\x1b[0m
     代理运行在 http://127.0.0.1:50816

package/package.json

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

package/tray-daemon.ps1

@@ -1,45 +1,44 @@
 <#
 .SYNOPSIS
-  Pan Router 托盘 (自包含: 启动服务器 + 托盘图标 + 菜单)
-  ⚠ 必须从 WScript.Shell.Run (VBS) 或正常控制台启动, 不能从 detached Node 进程启动
+  Pan Router 托盘守护脚本
+  去除了导致 UI 假死的同步网络请求，增加了稳定的重试和容错机制。
 #>
 
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
+
+# 抑制全局报错弹窗，防止后台服务因为意外报错直接死掉
+$ErrorActionPreference = "SilentlyContinue"
+
 $scriptPath = $MyInvocation.MyCommand.Path
 $scriptDir = Split-Path $scriptPath -Parent
 $serverPath = Join-Path $scriptDir "server.mjs"
-$logFile = "$env:TEMP\panrouter-tray.log"
-$now = Get-Date -Format "HH:mm:ss"
+$nodePath = (Get-Command node -ErrorAction SilentlyContinue).Source
 
-"$now === PanRouter Tray START ===" | Out-File $logFile
-"$now PID=$pid" | Out-File -Append $logFile
-"$now serverPath=$serverPath" | Out-File -Append $logFile
+# 如果系统环境没装 Node，直接静默退出
+if (-not $nodePath) { Exit }
 
-# ─── 杀掉旧 server ──────────────────────────────
-try {
-    $old = wmic process where "name='node.exe'" get ProcessId,CommandLine /format:csv 2>$null
-    foreach ($line in $old) {
-        if ($line -match '(\d+),.*?server\.mjs') {
-            Stop-Process -Id $Matches[1] -Force -ErrorAction SilentlyContinue
-            "$now Killed old server PID=$($Matches[1])" | Out-File -Append $logFile
+# ─── 核心功能：杀旧启新 ──────────────────────────────
+function Restart-Server {
+    # 强制清理旧的代理进程
+    try {
+        wmic process where "name='node.exe'" get ProcessId,CommandLine /format:csv 2>$null | ForEach-Object {
+            if ($_ -match '(\d+),.*?server\.mjs') {
+                Stop-Process -Id $Matches[1] -Force -ErrorAction SilentlyContinue
+            }
         }
-    }
-} catch {}
+    } catch {}
 
-# ─── 启动 server.mjs (用 node 完整路径) ─────────
-try {
-    $nodePath = (Get-Command node).Source
-    "$now nodePath=$nodePath" | Out-File -Append $logFile
-    $p = Start-Process -FilePath $nodePath -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden -PassThru -NoNewWindow
-    if ($p -and $p.Id) { "$now Server started PID=$($p.Id)" | Out-File -Append $logFile }
-} catch {
-    "$now Server start FAILED: $_" | Out-File -Append $logFile
+    # 无黑框启动新进程
+    try {
+        Start-Process -FilePath $nodePath -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden -PassThru -NoNewWindow | Out-Null
+    } catch {}
 }
 
-# ─── WinForms ────────────────────────────────────
-Add-Type -AssemblyName System.Windows.Forms
-Add-Type -AssemblyName System.Drawing
+# 启动时立刻执行一次
+Restart-Server
 
-# ─── 图标 ────────────────────────────────────────
+# ─── 绘制托盘图标 ────────────────────────────────────────
 $bmp = New-Object System.Drawing.Bitmap(16, 16)
 $g = [System.Drawing.Graphics]::FromImage($bmp)
 $g.SmoothingMode = 'HighQuality'
@@ -49,76 +48,86 @@ $g.FillEllipse($brush, 0, 0, 15, 15)
 $font = New-Object System.Drawing.Font("Segoe UI", 8.5, [System.Drawing.FontStyle]::Bold)
 $fg = New-Object System.Drawing.SolidBrush([System.Drawing.Color]::White)
 $g.DrawString("P", $font, $fg, 3, 1.5)
-$font.Dispose(); $fg.Dispose(); $brush.Dispose(); $g.Dispose()
+
 $hIcon = $bmp.GetHicon()
 $icon = [System.Drawing.Icon]::FromHandle($hIcon)
-$bmp.Dispose()
 
-# ─── NotifyIcon ──────────────────────────────────
+# ─── 初始化托盘对象 ──────────────────────────────────
 $notifyIcon = New-Object System.Windows.Forms.NotifyIcon
 $notifyIcon.Icon = $icon
-$notifyIcon.Text = "Pan Router | 端口 50816"
+$notifyIcon.Text = "Pan Router (端口: 50816)"
 
-# ─── 菜单 ────────────────────────────────────────
 $menu = New-Object System.Windows.Forms.ContextMenuStrip
-[void]$menu.Items.Add((New-Object System.Windows.Forms.ToolStripMenuItem("Pan Router - :50816") { Enabled = $false; Font = New-Object System.Drawing.Font("Segoe UI", 9, [System.Drawing.FontStyle]::Bold) }))
-[void]$menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator))
 
+# 标题 (不可点)
+$titleItem = New-Object System.Windows.Forms.ToolStripMenuItem("Pan Router | :50816")
+$titleItem.Enabled = $false
+$titleItem.Font = New-Object System.Drawing.Font("Segoe UI", 9, [System.Drawing.FontStyle]::Bold)
+$menu.Items.Add($titleItem) | Out-Null
+$menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator)) | Out-Null
+
+# 重启服务选项
+$restartItem = New-Object System.Windows.Forms.ToolStripMenuItem("重启后台服务")
+$restartItem.Add_Click({
+    Restart-Server
+    $notifyIcon.ShowBalloonTip(2000, "Pan Router", "后台代理服务已重新启动 ✓", [System.Windows.Forms.ToolTipIcon]::Info)
+})
+$menu.Items.Add($restartItem) | Out-Null
+
+# 开机自启动选项
 $autoItem = New-Object System.Windows.Forms.ToolStripMenuItem("开机自启动")
-try { $autoItem.Checked = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name PanRouter -ErrorAction Stop).PanRouter -ne $null } catch {}
+try {
+    $regKey = Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name PanRouter -ErrorAction SilentlyContinue
+    $autoItem.Checked = ($regKey -ne $null)
+} catch {}
+
 $autoItem.Add_Click({
     if ($autoItem.Checked) {
         reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /f 2>&1 | Out-Null
         $autoItem.Checked = $false
-        $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已关闭", [System.Windows.Forms.ToolTipIcon]::Info)
     } else {
-        reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /t REG_SZ /d "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File `"$scriptPath`"" /f 2>&1 | Out-Null
+        $vbsPath = Join-Path $scriptDir "panrouter-tray.vbs"
+        $cmd = "wscript.exe //B //NoLogo `"$vbsPath`""
+        reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /t REG_SZ /d $cmd /f 2>&1 | Out-Null
         $autoItem.Checked = $true
-        $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已开启 ✓", [System.Windows.Forms.ToolTipIcon]::Info)
     }
-}.GetNewClosure())
-[void]$menu.Items.Add($autoItem)
-[void]$menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator))
+})
+$menu.Items.Add($autoItem) | Out-Null
+$menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator)) | Out-Null
 
+# 退出选项
 $exitItem = New-Object System.Windows.Forms.ToolStripMenuItem("退出")
 $exitItem.Add_Click({
     $notifyIcon.Visible = $false
-    try { $old = wmic process where "name='node.exe'" get ProcessId,CommandLine /format:csv 2>$null; foreach ($line in $old) { if ($line -match '(\d+),.*?server\.mjs') { Stop-Process -Id $Matches[1] -Force -ErrorAction SilentlyContinue } } } catch {}
+    try { wmic process where "name='node.exe'" get ProcessId,CommandLine /format:csv 2>$null | ForEach-Object { if ($_ -match '(\d+),.*?server\.mjs') { Stop-Process -Id $Matches[1] -Force -ErrorAction SilentlyContinue } } } catch {}
     [System.Windows.Forms.Application]::Exit()
-}.GetNewClosure())
-[void]$menu.Items.Add($exitItem)
+})
+$menu.Items.Add($exitItem) | Out-Null
 
 $notifyIcon.ContextMenuStrip = $menu
 
-# ─── 左键 ────────────────────────────────────────
+# ─── 优化左键操作 ────────────────────────────────────
 $notifyIcon.Add_MouseClick({
     if ($_.Button -eq [System.Windows.Forms.MouseButtons]::Left) {
-        try { $req = [System.Net.WebRequest]::Create("http://127.0.0.1:50816/health"); $req.Timeout = 1500; $resp = $req.GetResponse(); $resp.Close(); $notifyIcon.ShowBalloonTip(2000, "Pan Router", "运行正常 ✓ (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info) }
-        catch { $notifyIcon.ShowBalloonTip(2000, "Pan Router", "服务器未响应 ⚠", [System.Windows.Forms.ToolTipIcon]::Error) }
+        # 利用反射直接呼出右键菜单，取消容易卡死的网络检查
+        $mi = [System.Windows.Forms.NotifyIcon].GetMethod("ShowContextMenu", [System.Reflection.BindingFlags]::NonPublic -bor [System.Reflection.BindingFlags]::Instance)
+        $mi.Invoke($notifyIcon, $null)
     }
 })
 
-# ─── 健康检查 ────────────────────────────────────
-$healthTimer = New-Object System.Windows.Forms.Timer
-$healthTimer.Interval = 30000
-$healthTimer.Add_Tick({
-    try { $req = [System.Net.WebRequest]::Create("http://127.0.0.1:50816/health"); $req.Timeout = 1500; $resp = $req.GetResponse(); $resp.Close() }
-    catch {
-        try { $old = wmic process where "name='node.exe'" get ProcessId,CommandLine /format:csv 2>$null; foreach ($line in $old) { if ($line -match '(\d+),.*?server\.mjs') { Stop-Process -Id $Matches[1] -Force -ErrorAction SilentlyContinue } } } catch {}
-        try { Start-Process -FilePath (Get-Command node).Source -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden -NoNewWindow } catch {}
-    }
-})
-$healthTimer.Start()
-"$now Health timer started" | Out-File -Append $logFile
-
-# ═══ 进入消息循环 ═══
+# ─── 启动与保持运行 ──────────────────────────────────
 $notifyIcon.Visible = $true
-"$now Icon visible, entering message loop" | Out-File -Append $logFile
-[System.Windows.Forms.Application]::Run()
-"$now Exited message loop" | Out-File -Append $logFile
 
-# 清理
-$healthTimer.Stop()
+# 使用 ApplicationContext 保持消息循环，防止脚本在执行完后意外释放托盘图标
+$appContext = New-Object System.Windows.Forms.ApplicationContext
+[System.Windows.Forms.Application]::Run($appContext)
+
+# 清理资源
+$notifyIcon.Visible = $false
 $notifyIcon.Dispose()
+$font.Dispose()
+$fg.Dispose()
+$brush.Dispose()
+$g.Dispose()
 [System.Runtime.InteropServices.Marshal]::DestroyIcon($hIcon)
 $icon.Dispose()