panrouter 1.6.0 → 1.7.0

package/daemon.mjs

@@ -1,14 +1,11 @@
 #!/usr/bin/env node
 
 /**
- * Pan Router Daemon (v4)
+ * Pan Router Daemon (v5)
  *
- * 一个 Node 进程同时:
- *   1. 隐藏启动 server.mjs（子进程）
- *   2. 隐藏启动 tray-daemon.ps1（子进程）
- *   3. 保持存活，守护两者
- *
- * 由 cli.mjs --tray 启动 (detached, 无窗口)。
+ *   1. spawn server.mjs (detached, hidden) — 正常
+ *   2. 用 VBS 启动 PS tray（解决 detached 进程无法创建通知图标的问题）
+ *   3. 保持存活，30s 健康检查
  */
 
 import { spawn, execSync } from "node:child_process";
@@ -20,16 +17,15 @@ 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 nodeExe = process.execPath;
 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("=== Daemon v5 ===");
 log(`nodeExe=${nodeExe}`);
-log(`serverPath=${serverPath}`);
 
 // ─── 1. 杀旧 server ──────────────────────────────
 try {
@@ -40,19 +36,14 @@ try {
   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 {} }
+      if (m) { try { process.kill(parseInt(m[1]), "SIGKILL"); log(`Killed old 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,
+  cwd: __dirname, stdio: "ignore", windowsHide: true, detached: true, shell: false,
 });
 server.unref();
 log(`Server spawned PID=${server.pid || "??"}`);
@@ -77,29 +68,33 @@ function isOnline() {
   }
   log(`Server online=${ready}`);
 
-  // ─── 4. 启动 PS 托盘 ────────────────────────────
+  // ─── 4. 用 VBS 启动 PS 托盘 ─────────────────────
+  // 关键: spawn 的 detached 进程没有 Window Station 访问权限,
+  // 无法创建 NotifyIcon。WScript.Shell.Run 0 是可靠的解决方式。
   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,
+    // 创建临时的 VBS 启动器
+    const vbsContent = `Set WshShell = CreateObject("WScript.Shell")
+WshShell.Run "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File """ & "${trayPsPath.replace(/\\/g, "\\\\")}" & """", 0, False
+`;
+    const vbsPath = path.join(process.env.TEMP || "/tmp", "panrouter-tray-launcher.vbs");
+    try { fs.writeFileSync(vbsPath, vbsContent, "utf8"); } catch {}
+
+    log(`VBS launcher: ${vbsPath}`);
+
+    // wscript //B = 批处理模式, 无交互
+    const vbs = spawn("wscript.exe", ["//B", "//NoLogo", vbsPath], {
+      stdio: "ignore", windowsHide: true, shell: false,
     });
-    ps.unref();
-    log(`PS spawned PID=${ps.pid || "??"}`);
+    vbs.unref();
+    log(`VBS launched`);
   } else {
-    log(`WARN: tray-daemon.ps1 not found at ${trayPsPath}`);
+    log(`WARN: ${trayPsPath} not found`);
   }
 
   // ─── 5. 保持存活 ────────────────────────────────
-  log("Daemon running, keeping session alive");
+  log("Daemon running");
   process.stdin.resume();
 
-  // 定时检查 server, 挂了就重启
   setInterval(() => {
     isOnline().then(ok => {
       if (!ok) {

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "panrouter",
-  "version": "1.5.2",
+  "version": "1.7.0",
   "description": "让 Claude Code 免费使用 DeepSeek 等模型，无需 API Key",
   "type": "module",
   "bin": {
     "panrouter": "cli.mjs"
   },
-  "version": "1.6.0",
   "files": [
     "cli.mjs",
     "daemon.mjs",

package/tray-daemon.ps1

@@ -42,10 +42,46 @@ $bmp.Dispose()
 $notifyIcon = New-Object System.Windows.Forms.NotifyIcon
 $notifyIcon.Icon = $icon
 $notifyIcon.Text = "Pan Router | 端口 50816"
-$notifyIcon.Visible = $true
-Write-Log "NotifyIcon visible"
 
-# ─── 健康检查 ──────────────────────────────────────
+# ─── 右键菜单 (PS5.1 用 .GetNewClosure()) ─────────
+$menu = New-Object System.Windows.Forms.ContextMenuStrip
+
+$titleItem = New-Object System.Windows.Forms.ToolStripMenuItem
+$titleItem.Text = "Pan Router - :50816"
+$titleItem.Enabled = $false
+$titleItem.Font = New-Object System.Drawing.Font("Segoe UI", 9, [System.Drawing.FontStyle]::Bold)
+[void]$menu.Items.Add($titleItem)
+[void]$menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator))
+
+$autoItem = New-Object System.Windows.Forms.ToolStripMenuItem
+$autoItem.Text = "开机自启动"
+$autoItem.Checked = Get-Autostart
+$autoItem.Add_Click({
+    $ni = $notifyIcon
+    $ai = $autoItem
+    if ($ai.Checked) {
+        Set-Autostart $false; $ai.Checked = $false
+        $ni.ShowBalloonTip(2000, "Pan Router", "开机自启动已关闭", [System.Windows.Forms.ToolTipIcon]::Info)
+    } else {
+        Set-Autostart $true; $ai.Checked = $true
+        $ni.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))
+
+$exitItem = New-Object System.Windows.Forms.ToolStripMenuItem
+$exitItem.Text = "退出"
+$exitItem.Add_Click({
+    Write-Log "Exit clicked"
+    $notifyIcon.Visible = $false
+    [System.Windows.Forms.Application]::Exit()
+}.GetNewClosure())
+[void]$menu.Items.Add($exitItem)
+
+$notifyIcon.ContextMenuStrip = $menu
+$notifyIcon.Visible = $true
+Write-Log "NotifyIcon visible with menu"
 function Test-Online {
     try {
         $req = [System.Net.WebRequest]::Create("http://127.0.0.1:50816/health")
@@ -115,28 +151,6 @@ if ($ready) {
     }
 }
 
-# 右键菜单
-$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) }
-})
-$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) {