panrouter 1.5.1 → 1.6.0

package/cli.mjs

@@ -141,29 +141,28 @@ async function startServer() {
 // ─── 4. 以托盘模式启动 ──────────────────────────────────────────────────
 
 /**
- * 用 VBS 隐藏启动 server + PS tray (Windows 原生, 最可靠)
+ * 启动 daemon (Node 常驻进程, 管理 server + PS tray)
  *
- *   panrouter --tray
- *     └─ wscript.exe panrouter-tray.vbs (WScript.Shell.Run, 隐藏)
- *           ├─ node server.mjs          (run 0 = 完全隐藏)
- *           └─ powershell tray-daemon.ps1 (run 0 = 完全隐藏)
- *                  └─ NotifyIcon ✓
+ *   cli.mjs ─→ node daemon.mjs (detached, hidden)
+ *                ├─ 启动 server.mjs (子进程, detached, hidden)
+ *                └─ 启动 powershell tray-daemon.ps1 (子进程, hidden)
+ *                └─ 保持存活, 30s 健康检查
  *
- *   WScript.Shell.Run 0 是 Windows 最可靠的隐藏启动方式,
- *   不依赖 spawn 的 detached/Window Station 行为。
+ *   key: 用 process.execPath (绝对路径) 启动
+ *   避免 VBS/WScript/CMD 的 PATH 查找问题
  */
 function startTray() {
-  const vbsPath = path.join(__dirname, "panrouter-tray.vbs");
+  const daemonPath = path.join(__dirname, "daemon.mjs");
 
-  if (!fs.existsSync(vbsPath)) {
-    log("!!", "未找到 panrouter-tray.vbs", "red");
+  if (!fs.existsSync(daemonPath)) {
+    log("!!", "未找到 daemon.mjs", "red");
     process.exit(1);
   }
 
   log("..", "正在以托盘模式启动 Pan Router...", "yellow");
 
-  // wscript //B = 批处理模式 (无窗口, 无交互)
-  const child = spawn("wscript.exe", ["//B", "//NoLogo", vbsPath], {
+  const child = spawn(process.execPath, [daemonPath], {
+    cwd: __dirname,
     stdio: "ignore",
     windowsHide: true,
     detached: true,
@@ -172,7 +171,7 @@ function startTray() {
   child.unref();
 
   log("OK", "Pan Router 托盘已启动", "green");
-  console.log("   图标在任务栏右下角, 右键菜单可退出");
+  console.log("   图标出现在右下角后, 即可运行 claude");
 }
 
 // ─── 主流程 ──────────────────────────────────────────────────────────────

package/daemon.mjs

@@ -0,0 +1,115 @@
+#!/usr/bin/env node
+
+/**
+ * Pan Router Daemon (v4)
+ *
+ * 一个 Node 进程同时:
+ *   1. 隐藏启动 server.mjs（子进程）
+ *   2. 隐藏启动 tray-daemon.ps1（子进程）
+ *   3. 保持存活，守护两者
+ *
+ * 由 cli.mjs --tray 启动 (detached, 无窗口)。
+ */
+
+import { spawn, execSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import path from "node:path";
+import fs from "node:fs";
+import http from "node:http";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const serverPath = path.join(__dirname, "server.mjs");
+const trayPsPath = path.join(__dirname, "tray-daemon.ps1");
+const nodeExe = process.execPath;  // ← 绝对路径！不依赖 PATH
+const logPath = path.join(process.env.TEMP || "/tmp", "panrouter-daemon.log");
+
+function log(msg) {
+  try { fs.appendFileSync(logPath, `${new Date().toISOString().slice(11,19)} ${msg}\n`); } catch {}
+}
+
+log("=== Daemon v4 ===");
+log(`nodeExe=${nodeExe}`);
+log(`serverPath=${serverPath}`);
+
+// ─── 1. 杀旧 server ──────────────────────────────
+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"); log(`Killed old server PID=${m[1]}`); } catch {} }
+    }
+  }
+} catch {}
+
+// ─── 2. 启动 server.mjs ──────────────────────────
+// 关键: 用 process.execPath (绝对路径), 不用 "node" (可能找不到 PATH)
+const server = spawn(nodeExe, [serverPath], {
+  cwd: __dirname,
+  stdio: "ignore",
+  windowsHide: true,
+  detached: true,
+  shell: false,
+});
+server.unref();
+log(`Server spawned PID=${server.pid || "??"}`);
+
+// ─── 3. 等就绪 ───────────────────────────────────
+function isOnline() {
+  return new Promise(rs => {
+    try {
+      const req = http.get("http://127.0.0.1:50816/health", () => {});
+      req.on("response", () => { req.destroy(); rs(true); });
+      req.on("error", () => rs(false));
+      req.setTimeout(1500, () => { req.destroy(); rs(false); });
+    } catch { rs(false); }
+  });
+}
+
+(async () => {
+  let ready = false;
+  for (let i = 0; i < 20; i++) {
+    if (await isOnline()) { ready = true; break; }
+    await new Promise(r => setTimeout(r, 500));
+  }
+  log(`Server online=${ready}`);
+
+  // ─── 4. 启动 PS 托盘 ────────────────────────────
+  if (fs.existsSync(trayPsPath)) {
+    log("Starting PS tray...");
+    const ps = spawn("powershell.exe", [
+      "-NoProfile", "-ExecutionPolicy", "Bypass",
+      "-WindowStyle", "Hidden",
+      "-File", trayPsPath,
+    ], {
+      stdio: "ignore",
+      windowsHide: true,
+      shell: false,
+    });
+    ps.unref();
+    log(`PS spawned PID=${ps.pid || "??"}`);
+  } else {
+    log(`WARN: tray-daemon.ps1 not found at ${trayPsPath}`);
+  }
+
+  // ─── 5. 保持存活 ────────────────────────────────
+  log("Daemon running, keeping session alive");
+  process.stdin.resume();
+
+  // 定时检查 server, 挂了就重启
+  setInterval(() => {
+    isOnline().then(ok => {
+      if (!ok) {
+        log("Server offline, restarting...");
+        const s2 = spawn(nodeExe, [serverPath], {
+          cwd: __dirname, stdio: "ignore", windowsHide: true, detached: true, shell: false,
+        });
+        s2.unref();
+        log(`Server restarted PID=${s2.pid || "??"}`);
+      }
+    });
+  }, 30000);
+})();

package/package.json

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

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.vbs

@@ -1,18 +0,0 @@
-' 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