panrouter 1.5.2 → 1.6.1

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,6 +1,6 @@
 {
   "name": "panrouter",
-  "version": "1.5.2",
+  "version": "1.6.1",
   "description": "让 Claude Code 免费使用 DeepSeek 等模型，无需 API Key",
   "type": "module",
   "bin": {
@@ -8,9 +8,9 @@
   },
   "files": [
     "cli.mjs",
+    "daemon.mjs",
     "server.mjs",
-    "tray-daemon.ps1",
-    "panrouter-tray.vbs"
+    "tray-daemon.ps1"
   ],
   "license": "MIT"
 }

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) {

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