panrouter 1.2.0 → 1.4.0

package/cli.mjs

@@ -138,19 +138,21 @@ async function startServer() {
   console.log("\n  现在可以运行: \x1b[33mclaude \"你好\"\x1b[0m\n");
 }
 
-// ─── 4. 以托盘模式启动（后台守护进程 + 系统托盘） ──────────────────────────
+// ─── 4. 以托盘模式启动 ──────────────────────────────────────────────────
 
 /**
- * 启动策略:
- *   1. 启动 daemon.mjs (detached, 无窗口)
- *      → daemon 启动隐藏的 server.mjs
- *      → daemon 启动 tray-manager.ps1 (pipe IPC)
- *      → daemon 保持存活直到用户点"退出"
- *   2. cli.mjs 进程立刻退出
+ * 启动策略 (参考 9Router Windows 托盘):
+ *
+ *   cli.mjs ─spawn(detached)──→ node daemon.mjs         (无窗口, 常驻)
+ *                                   ├─ cmd /c start /B → node server.mjs (隐藏)
+ *                                   └─ spawn(pipe) ───→ powershell tray-daemon.ps1
+ *                                                        └─ NotifyIcon ✓
+ *
+ *   关键: PS 必须用 pipe 连接(不 detached), 保持与 daemon 的 Window Station
+ *   连接, 否则无法创建通知区图标。
  */
 function startTray() {
   const daemonPath = path.join(__dirname, "daemon.mjs");
-
   if (!fs.existsSync(daemonPath)) {
     log("!!", "未找到 daemon.mjs", "red");
     process.exit(1);
@@ -158,23 +160,20 @@ function startTray() {
 
   log("..", "正在以托盘模式启动 Pan Router...", "yellow");
 
-  const serverPath = path.join(__dirname, "server.mjs");
-  const trayPath   = path.join(__dirname, "tray-manager.ps1");
-
   const child = spawn(process.execPath, [
     daemonPath,
-    `--serverPath="${serverPath}"`,
-    `--trayPath="${trayPath}"`,
+    `--serverPath="${path.join(__dirname, "server.mjs")}"`,
+    `--trayPsPath="${path.join(__dirname, "tray-daemon.ps1")}"`,
   ], {
-    cwd: __dirname,
     stdio: "ignore",
-    detached: true,
     windowsHide: true,
+    detached: true,
     shell: false,
   });
   child.unref();
 
-  log("OK", "Pan Router 托盘已启动（图标在任务栏右下角）", "green");
+  log("OK", "Pan Router 托盘已启动", "green");
+  console.log("   图标在任务栏右下角, 右键菜单可退出");
 }
 
 // ─── 主流程 ──────────────────────────────────────────────────────────────

package/daemon.mjs

@@ -3,11 +3,17 @@
 /**
  * Pan Router Daemon — 后台守护进程
  *
- * 由 cli.mjs 以 --tray 参数启动 (detached, hidden)。
- * 管理 server.mjs + tray-manager.ps1, 通过 stdin/stdout JSON 通信。
+ * 用法 (由 cli.mjs --tray 调用):
+ *   node daemon.mjs --serverPath="..." --trayPsPath="..."
  *
- * 用法(由 cli.mjs 调用):
- *   node daemon.mjs --serverPath="..." --trayPath="..."
+ * 架构 (参考 9Router):
+ *   daemon.mjs (无窗口, 常驻)
+ *     ├─ spawn server.mjs (hidden, UseShellExecute=true)
+ *     └─ spawn powershell tray-daemon.ps1 (pipe, NOT detached)
+ *          └─ NotifyIcon (右下角)
+ *
+ *   关键: PS 子进程不 detached, 保持与 daemon 的 session 连接,
+ *   否则失去 Window Station 无法创建 UI 通知区图标。
  */
 
 import { spawn, execSync } from "node:child_process";
@@ -21,22 +27,19 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 // ─── 解析参数 ────────────────────────────────────
 const serverPath = process.argv.find(a => a.startsWith("--serverPath="))?.split("=")[1];
-const trayPath   = process.argv.find(a => a.startsWith("--trayPath="))?.split("=")[1];
-if (!serverPath || !trayPath) { process.exit(1); }
+const trayPsPath = process.argv.find(a => a.startsWith("--trayPsPath="))?.split("=")[1];
+if (!serverPath || !trayPsPath) { process.exit(1); }
 
 const appDir = path.dirname(serverPath);
-const AUTOSTART_NAME = "PanRouter";
-const RUN_KEY = "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
-
-let serverProcess = null;
-let psProcess = null;
-
-// ─── 日志 ────────────────────────────────────────
 const LOG = path.join(process.env.TEMP || "/tmp", "panrouter-daemon.log");
+
 function log(msg) {
   try { fs.appendFileSync(LOG, `${new Date().toISOString().slice(11,19)} ${msg}\n`); } catch {}
 }
 
+log("=== PanRouter Daemon (v2) ===");
+log(`serverPath=${serverPath}`);
+
 // ─── 健康检查 ─────────────────────────────────────
 function isOnline() {
   return new Promise(rs => {
@@ -47,8 +50,9 @@ function isOnline() {
   });
 }
 
-// ─── 杀掉旧 server 进程 ──────────────────────────
-function killOldServers() {
+// ─── 启动隐藏的 server.mjs ────────────────────────
+const serverProcess = (() => {
+  // 先杀旧的
   try {
     const wmic = spawn("wmic", [
       "process", "where", "name='node.exe'", "get", "ProcessId,CommandLine", "/format:csv"
@@ -64,66 +68,20 @@ function killOldServers() {
       }
     });
   } catch {}
-}
 
-// ─── 隐藏启动 server.mjs ─────────────────────────
-function startServer() {
-  killOldServers();
-  serverProcess = spawn("node", [serverPath], {
-    cwd: appDir, stdio: ["ignore", "pipe", "pipe"], windowsHide: true, shell: false,
+  log("Starting server...");
+  const child = spawn("cmd.exe", ["/c", "start", "/B", "node", serverPath], {
+    cwd: appDir,
+    stdio: "ignore",
+    windowsHide: true,
+    shell: false,
   });
-  serverProcess.stdout.on("data", d => log("[srv] " + d.toString().trim()));
-  serverProcess.stderr.on("data", d => log("[srv-err] " + d.toString().trim()));
-  serverProcess.on("exit", code => log(`Server exited code=${code}`));
-  log(`Server started PID=${serverProcess.pid}`);
-}
-
-// ─── 命令 → PS 托盘 ─────────────────────────────
-function psSend(cmd) {
-  if (psProcess?.stdin?.writable) {
-    psProcess.stdin.write(JSON.stringify(cmd) + "\n");
-  }
-}
-
-// ─── 开机自启动操作 (reg.exe) ────────────────────
-function toggleAutostart() {
-  try {
-    const out = execSync(`reg query ${RUN_KEY} /v ${AUTOSTART_NAME} 2>nul`, {
-      encoding: "utf8", windowsHide: true, timeout: 3000,
-    });
-    const isOn = !out.toLowerCase().includes("error");
-    if (isOn) {
-      execSync(`reg delete ${RUN_KEY} /v ${AUTOSTART_NAME} /f 2>nul`, { windowsHide: true, timeout: 3000 });
-      psSend({ action: "update-item", index: 2, title: "开机自启动", enabled: true });
-      log("Autostart OFF");
-    } else {
-      const exe = process.execPath;
-      const daemon = path.join(__dirname, "daemon.mjs");
-      const cmd = `"${exe}" "${daemon}" --serverPath="${serverPath}" --trayPath="${trayPath}"`;
-      execSync(`reg add ${RUN_KEY} /v ${AUTOSTART_NAME} /t REG_SZ /d "${cmd}" /f 2>nul`, { windowsHide: true, timeout: 3000 });
-      psSend({ action: "update-item", index: 2, title: "✓ 开机自启动", enabled: true });
-      log("Autostart ON");
-    }
-  } catch (e) { log(`Autostart error: ${e.message}`); }
-}
-
-// ─── 退出清理 ────────────────────────────────────
-function cleanup() {
-  log("Cleanup...");
-  try { if (serverProcess && !serverProcess.killed) serverProcess.kill("SIGKILL"); } catch {}
-  killOldServers();
-}
-
-// ═══════════════ 主流程 ═══════════════
-
-log("=== PanRouter Daemon ===");
-log(`serverPath=${serverPath}`);
-log(`trayPath=${trayPath}`);
-
-// 1. 启动服务器
-startServer();
+  child.unref();
+  log(`Server started via cmd /c start /B`);
+  return child;
+})();
 
-// 2. 等服务器就绪, 启动托盘
+// ─── 等服务器就绪 ─────────────────────────────────
 (async () => {
   let ready = false;
   for (let i = 0; i < 20; i++) {
@@ -132,47 +90,58 @@ startServer();
   }
   log(`Server ready=${ready}`);
 
-  // 3. 启动 PS 托盘 (pipe 连接, 保持 IPC)
-  psProcess = spawn("powershell.exe", [
-    "-NoProfile", "-ExecutionPolicy", "Bypass",
+  // ─── 启动 PS 托盘 (pipe, 不 detached!) ──────────
+  // 关键: 9Router 的做法 - PS 必须与 daemon 同 session
+  log("Starting PS tray...");
+  const psProcess = spawn("powershell.exe", [
+    "-NoProfile",
+    "-ExecutionPolicy", "Bypass",
     "-WindowStyle", "Hidden",
-    "-File", trayPath,
+    "-File", trayPsPath,
   ], {
-    stdio: ["pipe", "pipe", "pipe"], windowsHide: true, shell: false,
+    stdio: ["pipe", "pipe", "pipe"],
+    windowsHide: true,
+    shell: false,
+    // ⚠ 没有 detached: true — PS 进程保持子进程身份
   });
 
-  // 读取 PS 事件
+  // IPC 读取 PS 事件
   createInterface({ input: psProcess.stdout }).on("line", (line) => {
     try {
       const evt = JSON.parse(line);
-      log(`PS: ${line}`);
-      if (evt.type === "started") {
-        // 发送菜单配置
-        psSend({ action: "add-item", index: 0, title: "Pan Router - :50816", enabled: false });
-        psSend({ action: "add-item", index: 1, title: "─".repeat(19), enabled: false });
-        psSend({ action: "add-item", index: 2, title: "开机自启动", enabled: true });
-        psSend({ action: "add-item", index: 3, title: "─".repeat(19), enabled: false });
-        psSend({ action: "add-item", index: 4, title: "退出", enabled: true });
-        psSend({ action: "set-tooltip", text: "Pan Router | 端口 50816" });
-        log("Menu configured");
-      }
-      if (evt.type === "click" && evt.index === 2) toggleAutostart();
-      if (evt.type === "click" && evt.index === 4) {
-        log("Exit requested");
-        cleanup();
-        psSend({ action: "kill" });
-        setTimeout(() => process.exit(0), 500);
+      log(`PS event: ${evt.type} idx=${evt.index}`);
+      if (evt.type === "click") {
+        if (evt.index === 2) { // 退出
+          log("Exit from PS menu");
+          try { if (serverProcess && !serverProcess.killed) serverProcess.kill(); } catch {}
+          psSend({ action: "kill" });
+          setTimeout(() => process.exit(0), 500);
+        }
       }
-    } catch (e) { log(`PS parse error: ${e.message}`); }
+    } catch (e) { log(`PS parse err: ${e.message}`); }
   });
 
   psProcess.on("error", err => log(`PS error: ${err.message}`));
-  psProcess.stderr.on("data", d => log(`[ps-err] ${d.toString().trim()}`));
-  psProcess.on("exit", code => { log(`PS exited code=${code}`); process.exit(0); });
+  psProcess.stderr.on("data", d => log(`[ps] ${d.toString().trim()}`));
+  psProcess.on("exit", code => {
+    log(`PS exited code=${code}`);
+    process.exit(0);
+  });
+
+  // ─── 发送菜单配置到 PS ──────────────────────────
+  function psSend(cmd) {
+    if (psProcess?.stdin?.writable) {
+      psProcess.stdin.write(JSON.stringify(cmd) + "\n");
+    }
+  }
+  psSend({ action: "add-item", index: 0, title: "Pan Router - :50816", enabled: false });
+  psSend({ action: "add-item", index: 1, title: "─".repeat(19), enabled: false });
+  psSend({ action: "add-item", index: 2, title: "退出", enabled: true });
+  psSend({ action: "set-tooltip", text: "Pan Router | 端口 50816" });
 
-  log("Daemon ready");
-  process.stdin.resume(); // 保持进程存活
+  log("Daemon running — keeping session alive");
+  process.stdin.resume(); // keep alive
 })();
 
-process.on("SIGTERM", () => { cleanup(); setTimeout(() => process.exit(0), 300); });
-process.on("SIGINT",  () => { cleanup(); setTimeout(() => process.exit(0), 300); });
+process.on("SIGTERM", () => { log("SIGTERM"); process.exit(0); });
+process.on("SIGINT", () => { log("SIGINT"); process.exit(0); });

package/package.json

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

package/{tray-manager.ps1 → tray-daemon.ps1}

@@ -1,10 +1,10 @@
 <#
 .SYNOPSIS
-  Pan Router 托盘管理器 (IPC 版)
-.DESCRIPTION
-  纯 NotifyIcon 包装器, 通过 stdin/stdout JSON 与父进程通信
+  Pan Router 托盘进程 — 纯 NotifyIcon IPC 包装器
 
-  支持命令 (stdin):
+  IPC: stdin JSON 命令, stdout JSON 事件
+
+  命令 (stdin):
     {"action":"add-item","index":0,"title":"...","enabled":true}
     {"action":"update-item","index":0,"title":"...","enabled":true}
     {"action":"set-tooltip","text":"..."}
@@ -12,34 +12,17 @@
 
   事件 (stdout):
     {"type":"started"}
-    {"type":"ready"}      <- PS 就绪 + STA 已确认
     {"type":"click","index":0}
     {"type":"error","message":"..."}
 #>
 
-param()
-
 Add-Type -AssemblyName System.Windows.Forms
 Add-Type -AssemblyName System.Drawing
 
 $ErrorActionPreference = "Stop"
 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8
 
-$script:notifyIcon = New-Object System.Windows.Forms.NotifyIcon
-$script:notifyIcon.Visible = $true
-$script:menu = New-Object System.Windows.Forms.ContextMenuStrip
-$script:notifyIcon.ContextMenuStrip = $script:menu
-$script:items = @()
-
-function Write-Event($obj) {
-    $json = $obj | ConvertTo-Json -Compress
-    try {
-        [Console]::Out.WriteLine($json)
-        [Console]::Out.Flush()
-    } catch {}
-}
-
-# ─── 生成蓝色 P 图标 (纯内存, 无需 .ico 文件) ──
+# ─── 生成图标 (蓝色 P, 纯内存) ────────────────────
 $bmp = New-Object System.Drawing.Bitmap(16, 16)
 $g = [System.Drawing.Graphics]::FromImage($bmp)
 $g.SmoothingMode = 'HighQuality'
@@ -54,8 +37,22 @@ $hIcon = $bmp.GetHicon()
 $icon = [System.Drawing.Icon]::FromHandle($hIcon)
 $bmp.Dispose()
 
-$script:notifyIcon.Icon = $icon
-$script:notifyIcon.Text = "Pan Router"
+# ─── NotifyIcon ──────────────────────────────────
+$notifyIcon = New-Object System.Windows.Forms.NotifyIcon
+$notifyIcon.Icon = $icon
+$notifyIcon.Text = "Pan Router | 端口 50816"
+$notifyIcon.Visible = $true
+
+$menu = New-Object System.Windows.Forms.ContextMenuStrip
+$notifyIcon.ContextMenuStrip = $menu
+$items = @()
+
+function Write-Event($obj) {
+    try {
+        [Console]::Out.WriteLine(($obj | ConvertTo-Json -Compress))
+        [Console]::Out.Flush()
+    } catch {}
+}
 
 function Add-MenuItem($index, $title, $enabled) {
     $item = New-Object System.Windows.Forms.ToolStripMenuItem
@@ -63,26 +60,19 @@ function Add-MenuItem($index, $title, $enabled) {
     $item.Enabled = $enabled
     $idx = $index
     $item.Add_Click({ Write-Event @{type="click"; index=$idx} }.GetNewClosure())
-    $script:menu.Items.Add($item) | Out-Null
-    $script:items += $item
-}
-
-function Update-MenuItem($index, $title, $enabled) {
-    if ($index -lt $script:items.Count) {
-        $script:items[$index].Text = $title
-        $script:items[$index].Enabled = $enabled
-    }
+    $menu.Items.Add($item) | Out-Null
+    $items += $item
 }
 
 function Set-Tooltip($text) {
     if ($text.Length -gt 63) { $text = $text.Substring(0, 63) }
-    $script:notifyIcon.Text = $text
+    $notifyIcon.Text = $text
 }
 
-# ─── stdin 轮询 (100ms 间隔) ────────────────────
-$script:timer = New-Object System.Windows.Forms.Timer
-$script:timer.Interval = 100
-$script:timer.Add_Tick({
+# ─── 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()
@@ -90,22 +80,20 @@ $script:timer.Add_Tick({
             $cmd = $line | ConvertFrom-Json
             switch ($cmd.action) {
                 "add-item"    { Add-MenuItem $cmd.index $cmd.title $cmd.enabled }
-                "update-item" { Update-MenuItem $cmd.index $cmd.title $cmd.enabled }
+                "update-item" {  }
                 "set-tooltip" { Set-Tooltip $cmd.text }
                 "kill"        {
-                    $script:notifyIcon.Visible = $false
-                    $script:notifyIcon.Dispose()
+                    $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}
-    }
+    } catch { Write-Event @{type="error"; message=$_.Exception.Message} }
 })
-$script:timer.Start()
+$timer.Start()
 
 Write-Event @{type="started"}
 [System.Windows.Forms.Application]::Run()