panrouter 1.5.0 → 1.5.2

package/cli.mjs

@@ -141,28 +141,29 @@ async function startServer() {
 // ─── 4. 以托盘模式启动 ──────────────────────────────────────────────────
 
 /**
- * 启动策略 (Windows BAT 原生方式):
+ * 用 VBS 隐藏启动 server + PS tray (Windows 原生, 最可靠)
  *
- *   cli.mjs ─spawn(detached)──→ cmd /c panrouter-tray.bat
- *                                   ├─ start /B → node server.mjs (后台隐藏)
- *                                   └─ start /B → powershell tray-daemon.ps1 (后台无窗口)
- *                                                    └─ NotifyIcon ✓
+ *   panrouter --tray
+ *     └─ wscript.exe panrouter-tray.vbs (WScript.Shell.Run, 隐藏)
+ *           ├─ node server.mjs          (run 0 = 完全隐藏)
+ *           └─ powershell tray-daemon.ps1 (run 0 = 完全隐藏)
+ *                  └─ NotifyIcon ✓
  *
- *   用 cmd /c start /B 是 Windows 最原生的后台/隐藏启动方式,
- *   不依赖 detached vs non-detached 的 Window Station 差异。
+ *   WScript.Shell.Run 0 是 Windows 最可靠的隐藏启动方式,
+ *   不依赖 spawn 的 detached/Window Station 行为。
  */
 function startTray() {
-  const batPath = path.join(__dirname, "panrouter-tray.bat");
+  const vbsPath = path.join(__dirname, "panrouter-tray.vbs");
 
-  if (!fs.existsSync(batPath)) {
-    log("!!", "未找到 panrouter-tray.bat", "red");
+  if (!fs.existsSync(vbsPath)) {
+    log("!!", "未找到 panrouter-tray.vbs", "red");
     process.exit(1);
   }
 
   log("..", "正在以托盘模式启动 Pan Router...", "yellow");
 
-  const child = spawn("cmd.exe", ["/c", batPath], {
-    cwd: __dirname,
+  // wscript //B = 批处理模式 (无窗口, 无交互)
+  const child = spawn("wscript.exe", ["//B", "//NoLogo", vbsPath], {
     stdio: "ignore",
     windowsHide: true,
     detached: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "panrouter",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "让 Claude Code 免费使用 DeepSeek 等模型，无需 API Key",
   "type": "module",
   "bin": {
@@ -10,7 +10,7 @@
     "cli.mjs",
     "server.mjs",
     "tray-daemon.ps1",
-    "panrouter-tray.bat"
+    "panrouter-tray.vbs"
   ],
   "license": "MIT"
 }

package/panrouter-tray.vbs

@@ -0,0 +1,18 @@
+' Pan Router 隐藏启动器
+' 用 WScript.Shell.Run 的 0 (隐藏) 启动后台进程
+' Windows 原生, 最可靠的方式
+
+Dim WshShell, FSO, ScriptDir
+Set WshShell = CreateObject("WScript.Shell")
+Set FSO = CreateObject("Scripting.FileSystemObject")
+
+ScriptDir = FSO.GetParentFolderName(WScript.ScriptFullName)
+
+' 0 = 隐藏窗口, False = 不等待返回
+WshShell.Run "node """ & ScriptDir & "\server.mjs""", 0, False
+
+' 等 3 秒让服务器启动
+WScript.Sleep 3000
+
+' 启动 PS 托盘 (无窗口)
+WshShell.Run "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File """ & ScriptDir & "\tray-daemon.ps1""", 0, False

package/tray-daemon.ps1

@@ -1,28 +1,29 @@
 <#
 .SYNOPSIS
-  Pan Router 托盘进程 — 纯 NotifyIcon IPC 包装器
+  Pan Router 托盘进程 (仅托盘 + 健康检查, 不启动服务器)
 
-  IPC: stdin JSON 命令, stdout JSON 事件
+  由 panrouter-tray.vbs 启动。
+  服务器已经由 VBS 启动, PS 只负责:
+  - NotifyIcon (右下角)
+  - 右键菜单 (开机自启动 / 退出)
+  - 健康检查 + 自动重启
 
-  命令 (stdin):
-    {"action":"add-item","index":0,"title":"...","enabled":true}
-    {"action":"update-item","index":0,"title":"...","enabled":true}
-    {"action":"set-tooltip","text":"..."}
-    {"action":"kill"}
-
-  事件 (stdout):
-    {"type":"started"}
-    {"type":"click","index":0}
-    {"type":"error","message":"..."}
+  用法:
+    powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File tray-daemon.ps1
 #>
 
+$scriptDir = Split-Path $MyInvocation.MyCommand.Path -Parent
+$serverPath = Join-Path $scriptDir "server.mjs"
+$logFile = "$env:TEMP\panrouter-tray.log"
+$autostartName = "PanRouter"
+
+function Write-Log($m) { "$(Get-Date -Format 'HH:mm:ss') $m" | Out-File -Append -Encoding utf8 $logFile }
+Write-Log "=== PanRouter Tray ==="
+
 Add-Type -AssemblyName System.Windows.Forms
 Add-Type -AssemblyName System.Drawing
 
-$ErrorActionPreference = "Stop"
-[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
-
-# ─── 生成图标 (蓝色 P, 纯内存) ────────────────────
+# ─── 生成图标 ──────────────────────────────────────
 $bmp = New-Object System.Drawing.Bitmap(16, 16)
 $g = [System.Drawing.Graphics]::FromImage($bmp)
 $g.SmoothingMode = 'HighQuality'
@@ -37,63 +38,139 @@ $hIcon = $bmp.GetHicon()
 $icon = [System.Drawing.Icon]::FromHandle($hIcon)
 $bmp.Dispose()
 
-# ─── NotifyIcon ──────────────────────────────────
+# ─── NotifyIcon ────────────────────────────────────
 $notifyIcon = New-Object System.Windows.Forms.NotifyIcon
 $notifyIcon.Icon = $icon
 $notifyIcon.Text = "Pan Router | 端口 50816"
 $notifyIcon.Visible = $true
+Write-Log "NotifyIcon visible"
 
-$menu = New-Object System.Windows.Forms.ContextMenuStrip
-$notifyIcon.ContextMenuStrip = $menu
-$items = @()
+# ─── 健康检查 ──────────────────────────────────────
+function Test-Online {
+    try {
+        $req = [System.Net.WebRequest]::Create("http://127.0.0.1:50816/health")
+        $req.Timeout = 1500
+        $resp = $req.GetResponse()
+        $resp.Close()
+        return $true
+    } catch { return $false }
+}
 
-function Write-Event($obj) {
+function Start-Server {
     try {
-        [Console]::Out.WriteLine(($obj | ConvertTo-Json -Compress))
-        [Console]::Out.Flush()
+        # 杀旧的 server.mjs 进程
+        $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
+                Write-Log "Killed old server PID=$($Matches[1])"
+            }
+        }
     } catch {}
+    try {
+        $p = Start-Process -FilePath "node" -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden -PassThru -NoNewWindow
+        Write-Log "Server started PID=$($p.Id)"
+    } catch { Write-Log "Server start FAILED: $_" }
 }
 
-function Add-MenuItem($index, $title, $enabled) {
-    $item = New-Object System.Windows.Forms.ToolStripMenuItem
-    $item.Text = $title
-    $item.Enabled = $enabled
-    $idx = $index
-    $item.Add_Click({ Write-Event @{type="click"; index=$idx} }.GetNewClosure())
-    $menu.Items.Add($item) | Out-Null
-    $items += $item
+# ─── 开机自启动 ────────────────────────────────────
+function Get-Autostart {
+    try { $val = Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name $autostartName -ErrorAction Stop; return $val.$autostartName -ne $null }
+    catch { return $false }
+}
+function Set-Autostart($enable) {
+    try {
+        if ($enable) {
+            reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v $autostartName /t REG_SZ /d "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File `"$($MyInvocation.MyCommand.Path)`"" /f 2>&1 | Out-Null
+            Write-Log "Autostart ON"
+        } else {
+            reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v $autostartName /f 2>&1 | Out-Null
+            Write-Log "Autostart OFF"
+        }
+    } catch { Write-Log "Autostart error: $_" }
 }
 
-function Set-Tooltip($text) {
-    if ($text.Length -gt 63) { $text = $text.Substring(0, 63) }
-    $notifyIcon.Text = $text
+# ═══════════ 主流程 ═══════════
+
+# 等待服务器就绪 (VBS 已启动 server, 但可能还没完全起来)
+$ready = $false
+for ($i = 0; $i -lt 20; $i++) {
+    Start-Sleep -Milliseconds 500
+    if (Test-Online) { $ready = $true; break }
+}
+Write-Log "Server online=$ready"
+if ($ready) {
+    $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已就绪 ✓ (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info)
+} else {
+    Write-Log "Server not online, starting ourselves..."
+    Start-Server
+    for ($i = 0; $i -lt 20; $i++) {
+        Start-Sleep -Milliseconds 500
+        if (Test-Online) { $ready = $true; break }
+    }
+    if ($ready) {
+        $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已就绪 ✓", [System.Windows.Forms.ToolTipIcon]::Info)
+    } else {
+        $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器启动失败 ⚠", [System.Windows.Forms.ToolTipIcon]::Error)
+    }
 }
 
-# ─── stdin 轮询 (9Router 做法: 100ms Timer) ──────
-$timer = New-Object System.Windows.Forms.Timer
-$timer.Interval = 100
-$timer.Add_Tick({
-    try {
-        while ([Console]::In.Peek() -ne -1) {
-            $line = [Console]::In.ReadLine()
-            if ([string]::IsNullOrWhiteSpace($line)) { continue }
-            $cmd = $line | ConvertFrom-Json
-            switch ($cmd.action) {
-                "add-item"    { Add-MenuItem $cmd.index $cmd.title $cmd.enabled }
-                "update-item" {  }
-                "set-tooltip" { Set-Tooltip $cmd.text }
-                "kill"        {
-                    $notifyIcon.Visible = $false
-                    $notifyIcon.Dispose()
-                    $icon.Dispose()
-                    [System.Runtime.InteropServices.Marshal]::DestroyIcon($hIcon)
-                    [System.Windows.Forms.Application]::Exit()
-                }
-            }
-        }
-    } catch { Write-Event @{type="error"; message=$_.Exception.Message} }
+# 右键菜单
+$menu = New-Object System.Windows.Forms.ContextMenuStrip
+$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)
+$menu.Items.Add("-")
+
+$autoItem = New-Object System.Windows.Forms.ToolStripMenuItem("开机自启动")
+$autoItem.Checked = Get-Autostart
+$autoItem.Add_Click({
+    if ($autoItem.Checked) { Set-Autostart $false; $autoItem.Checked = $false; $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已关闭", [System.Windows.Forms.ToolTipIcon]::Info) }
+    else { Set-Autostart $true; $autoItem.Checked = $true; $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已开启 ✓", [System.Windows.Forms.ToolTipIcon]::Info) }
 })
-$timer.Start()
+$menu.Items.Add($autoItem)
+$menu.Items.Add("-")
+
+$exitItem = New-Object System.Windows.Forms.ToolStripMenuItem("退出")
+$exitItem.Add_Click({ Write-Log "Exit"; $notifyIcon.Visible = $false; [System.Windows.Forms.Application]::Exit() })
+$menu.Items.Add($exitItem)
+$notifyIcon.ContextMenuStrip = $menu
+
+# 左键: 状态
+$notifyIcon.Add_MouseClick({
+    if ($_.Button -eq [System.Windows.Forms.MouseButtons]::Left) {
+        if (Test-Online) { $notifyIcon.ShowBalloonTip(2000, "Pan Router", "运行正常 ✓ (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info) }
+        else { $notifyIcon.ShowBalloonTip(2000, "Pan Router", "服务器未响应 ⚠", [System.Windows.Forms.ToolTipIcon]::Error) }
+    }
+})
+
+# 健康检查 (30秒)
+$healthTimer = New-Object System.Windows.Forms.Timer
+$healthTimer.Interval = 30000
+$healthTimer.Add_Tick({
+    if (-not (Test-Online)) {
+        Write-Log "Health FAILED, restarting..."
+        Start-Server
+        Start-Sleep -Seconds 3
+        if (Test-Online) { $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已自动重启", [System.Windows.Forms.ToolTipIcon]::Info) }
+    }
+})
+$healthTimer.Start()
+
+# 退出清理
+[System.Windows.Forms.Application]::ApplicationExit += {
+    Write-Log "Cleanup"
+    $healthTimer.Stop()
+    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 {}
+    $notifyIcon.Dispose()
+    [System.Runtime.InteropServices.Marshal]::DestroyIcon($hIcon)
+    $icon.Dispose()
+}
 
-Write-Event @{type="started"}
+Write-Log "Message loop"
 [System.Windows.Forms.Application]::Run()
+Write-Log "Exited"

package/panrouter-tray.bat

@@ -1,26 +0,0 @@
-@echo off
-rem Pan Router Tray Launcher (Windows 原生 BAT, 最可靠方式)
-
-setlocal
-set "SCRIPT_DIR=%~dp0"
-
-rem 1. 清理旧 server.mjs 进程
-for /f "tokens=2 delims=," %%a in ('wmic process where "name='node.exe'" get ProcessId^,CommandLine /format:csv 2^>nul ^| findstr "server.mjs"') do (
-  taskkill /f /pid %%a >nul 2>&1
-)
-
-rem 2. 后台隐藏启动 server.mjs (start /B = 不创建新窗口, 同一控制台后台)
-start /B node "%SCRIPT_DIR%server.mjs"
-
-rem 3. 等待服务器就绪 (最久 5 秒)
-for /l %%i in (1,1,5) do (
-  >nul 2>&1 %WINDIR%\System32\curl.exe -s http://127.0.0.1:50816/health && goto :ready
-  >nul 2>&1 %WINDIR%\System32\timeout.exe /t 1 /nobreak
-)
-
-:ready
-
-rem 4. 启动 PS 托盘 (无窗口后台)
-start /B powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File "%SCRIPT_DIR%tray-daemon.ps1"
-
-rem 5. BAT 立即结束 (不影响后台进程)