panrouter 1.3.0 → 1.4.1

package/cli.mjs

@@ -138,41 +138,42 @@ async function startServer() {
   console.log("\n  现在可以运行: \x1b[33mclaude \"你好\"\x1b[0m\n");
 }
 
-// ─── 4. 以托盘模式启动（VBS 启动器 + 自包含 PS 托盘） ─────────────────────
+// ─── 4. 以托盘模式启动 ──────────────────────────────────────────────────
 
 /**
- * 启动策略 (参考 9Router):
- *   1. tray-launcher.vbs 启动 tray-daemon.ps1 (WshShell.Run, 完全隐藏)
- *   2. tray-daemon.ps1 自包含:
- *      - 隐藏启动 server.mjs
- *      - NotifyIcon (右下角)
- *      - 右键菜单 (开机自启动 / 退出)
- *      - 30秒健康检查自动重启
- *   3. 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 launcherPath = path.join(__dirname, "tray-launcher.vbs");
-
-  if (!fs.existsSync(launcherPath)) {
-    log("!!", "未找到 tray-launcher.vbs", "red");
+  const daemonPath = path.join(__dirname, "daemon.mjs");
+  if (!fs.existsSync(daemonPath)) {
+    log("!!", "未找到 daemon.mjs", "red");
     process.exit(1);
   }
 
   log("..", "正在以托盘模式启动 Pan Router...", "yellow");
 
-  // wscript.exe //B = 无窗口, 自动退出
-  const child = spawn("wscript.exe", [
-    "//B", "//NoLogo",
-    launcherPath,
+  const child = spawn(process.execPath, [
+    daemonPath,
+    `--serverPath="${path.join(__dirname, "server.mjs")}"`,
+    `--trayPsPath="${path.join(__dirname, "tray-daemon.ps1")}"`,
   ], {
     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

@@ -0,0 +1,148 @@
+#!/usr/bin/env node
+
+/**
+ * Pan Router Daemon — 后台守护进程
+ *
+ * 用法 (由 cli.mjs --tray 调用):
+ *   node daemon.mjs --serverPath="..." --trayPsPath="..."
+ *
+ * 架构 (参考 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";
+import { createInterface } from "node:readline";
+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 = process.argv.find(a => a.startsWith("--serverPath="))?.split("=")[1];
+const trayPsPath = process.argv.find(a => a.startsWith("--trayPsPath="))?.split("=")[1];
+if (!serverPath || !trayPsPath) { process.exit(1); }
+
+const appDir = path.dirname(serverPath);
+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 => {
+    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); });
+  });
+}
+
+// ─── 启动隐藏的 server.mjs ────────────────────────
+const serverProcess = (() => {
+  // 先杀旧的
+  try {
+    const wmic = spawn("wmic", [
+      "process", "where", "name='node.exe'", "get", "ProcessId,CommandLine", "/format:csv"
+    ], { stdio: ["ignore", "pipe", "ignore"] });
+    let out = "";
+    wmic.stdout.on("data", d => out += d.toString());
+    wmic.on("close", () => {
+      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"); } catch {} }
+        }
+      }
+    });
+  } catch {}
+
+  log("Starting server...");
+  // 用 node 直接 spawn 子进程, 避免 cmd /c 的额外 shell
+  const child = spawn(process.execPath, [serverPath], {
+    cwd: appDir,
+    stdio: "ignore",
+    windowsHide: true,
+    detached: true,
+    shell: false,
+  });
+  child.unref();
+  log(`Server started PID=${child.pid}`);
+  return child;
+})();
+
+// ─── 等服务器就绪 ─────────────────────────────────
+(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 ready=${ready}`);
+
+  // ─── 启动 PS 托盘 (pipe, 不 detached!) ──────────
+  // 关键: 9Router 的做法 - PS 必须与 daemon 同 session
+  log("Starting PS tray...");
+  const psProcess = spawn("powershell.exe", [
+    "-NoProfile",
+    "-ExecutionPolicy", "Bypass",
+    "-WindowStyle", "Hidden",
+    "-File", trayPsPath,
+  ], {
+    stdio: ["pipe", "pipe", "pipe"],
+    windowsHide: true,
+    shell: false,
+    // ⚠ 没有 detached: true — PS 进程保持子进程身份
+  });
+
+  // IPC 读取 PS 事件
+  createInterface({ input: psProcess.stdout }).on("line", (line) => {
+    try {
+      const evt = JSON.parse(line);
+      log(`PS event: ${evt.type} idx=${evt.index}`);
+      if (evt.type === "click") {
+        if (evt.index === 2) { // 退出
+          log("Exit from PS menu");
+          psSend({ action: "kill" });
+          setTimeout(() => process.exit(0), 500);
+        }
+      }
+    } catch (e) { log(`PS parse err: ${e.message}`); }
+  });
+
+  psProcess.on("error", err => log(`PS error: ${err.message}`));
+  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 running — keeping session alive");
+  process.stdin.resume(); // keep alive
+})();
+
+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.3.0",
+  "version": "1.4.1",
   "description": "让 Claude Code 免费使用 DeepSeek 等模型，无需 API Key",
   "type": "module",
   "bin": {
@@ -8,9 +8,9 @@
   },
   "files": [
     "cli.mjs",
+    "daemon.mjs",
     "server.mjs",
-    "tray-daemon.ps1",
-    "tray-launcher.vbs"
+    "tray-daemon.ps1"
   ],
   "license": "MIT"
 }

package/tray-daemon.ps1

@@ -1,38 +1,28 @@
 <#
 .SYNOPSIS
-  Pan Router Tray Daemon — 完全自包含的托盘进程
+  Pan Router 托盘进程 — 纯 NotifyIcon IPC 包装器
 
-  功能:
-  - 隐藏启动 server.mjs (node)
-  - 右下角 NotifyIcon
-  - 右键菜单: 开机自启动 / 退出
-  - 30秒健康检查, 自动重启
-  - 日志到 %TEMP%\panrouter-tray.log
+  IPC: stdin JSON 命令, stdout JSON 事件
 
-  用法 (由 tray-launcher.vbs 调用):
-    powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File tray-daemon.ps1
+  命令 (stdin):
+    {"action":"add-item","index":0,"title":"...","enabled":true}
+    {"action":"update-item","index":0,"title":"...","enabled":true}
+    {"action":"set-tooltip","text":"..."}
+    {"action":"kill"}
 
-  也可直接测试:
-    powershell -ExecutionPolicy Bypass -STA -File tray-daemon.ps1
+  事件 (stdout):
+    {"type":"started"}
+    {"type":"click","index":0}
+    {"type":"error","message":"..."}
 #>
 
-$logFile = "$env:TEMP\panrouter-tray.log"
-function Write-Log($m) { "$(Get-Date -Format 'HH:mm:ss') $m" | Out-File -Append -Encoding utf8 $logFile }
-
-Write-Log "=== PanRouter Tray Daemon ==="
-
-# ─── 路径 (与脚本同目录) ────────────────────────
-$scriptDir = Split-Path $MyInvocation.MyCommand.Path -Parent
-$serverPath = Join-Path $scriptDir "server.mjs"
-
-# ─── 加载 WinForms ─────────────────────────────
 Add-Type -AssemblyName System.Windows.Forms
 Add-Type -AssemblyName System.Drawing
-Write-Log "Assemblies loaded"
 
-# ═══════════════════════════════════════════════════════════
-#  1. 生成托盘图标 (蓝色底 P)
-# ═══════════════════════════════════════════════════════════
+$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'
@@ -46,206 +36,64 @@ $font.Dispose(); $fg.Dispose(); $brush.Dispose(); $g.Dispose()
 $hIcon = $bmp.GetHicon()
 $icon = [System.Drawing.Icon]::FromHandle($hIcon)
 $bmp.Dispose()
-Write-Log "Icon created"
 
-# ═══════════════════════════════════════════════════════════
-#  2. NotifyIcon
-# ═══════════════════════════════════════════════════════════
+# ─── NotifyIcon ──────────────────────────────────
 $notifyIcon = New-Object System.Windows.Forms.NotifyIcon
 $notifyIcon.Icon = $icon
 $notifyIcon.Text = "Pan Router | 端口 50816"
 $notifyIcon.Visible = $true
-Write-Log "NotifyIcon visible"
-
-# ═══════════════════════════════════════════════════════════
-#  3. 隐藏启动 server.mjs
-# ═══════════════════════════════════════════════════════════
-function Start-Server {
-    # 杀掉旧 server
-    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') {
-                $pid = $Matches[1]
-                Write-Log "Kill old server PID=$pid"
-                Stop-Process -Id $pid -Force -ErrorAction SilentlyContinue
-            }
-        }
-    } catch {}
-
-    # UseShellExecute=$true 避免输出缓冲死锁
-    $psi = New-Object System.Diagnostics.ProcessStartInfo
-    $psi.FileName = "node"
-    $psi.Arguments = "`"$serverPath`""
-    $psi.WorkingDirectory = $scriptDir
-    $psi.WindowStyle = [System.Diagnostics.ProcessWindowStyle]::Hidden
-    $psi.CreateNoWindow = $true
-    $psi.UseShellExecute = $true
-    try {
-        $p = [System.Diagnostics.Process]::Start($psi)
-        Write-Log "Server started PID=$($p.Id)"
-        return $p
-    } catch {
-        Write-Log "Server start FAILED: $_"
-        return $null
-    }
-}
-
-# ═══════════════════════════════════════════════════════════
-#  4. 健康检查
-# ═══════════════════════════════════════════════════════════
-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 }
-}
 
-# ═══════════════════════════════════════════════════════════
-#  5. 开机自启动 (Registry)
-# ═══════════════════════════════════════════════════════════
-$autostartName = "PanRouter"
-$runKey = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run"
+$menu = New-Object System.Windows.Forms.ContextMenuStrip
+$notifyIcon.ContextMenuStrip = $menu
+$items = @()
 
-function Get-Autostart {
+function Write-Event($obj) {
     try {
-        $val = Get-ItemProperty -Path $runKey -Name $autostartName -ErrorAction Stop
-        return $val.$autostartName -ne $null
-    } catch { return $false }
+        [Console]::Out.WriteLine(($obj | ConvertTo-Json -Compress))
+        [Console]::Out.Flush()
+    } catch {}
 }
 
-function Set-Autostart($enable) {
-    if ($enable) {
-        $vbsPath = Join-Path $scriptDir "tray-launcher.vbs"
-        reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v $autostartName /t REG_SZ /d "wscript.exe //B `"$vbsPath`"" /f 2>&1 | Out-Null
-        Write-Log "Autostart ON: $vbsPath"
-    } else {
-        reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v $autostartName /f 2>&1 | Out-Null
-        Write-Log "Autostart OFF"
-    }
+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
 }
 
-# ═══════════════════════════════════════════════════════════
-#  ══ 启动流程 ══
-# ═══════════════════════════════════════════════════════════
-
-# 启动服务器
-$serverProcess = Start-Server
-
-# 等待就绪 (10秒)
-$ready = $false
-for ($i = 0; $i -lt 20; $i++) {
-    Start-Sleep -Milliseconds 500
-    if (Test-Online) { $ready = $true; break }
-}
-Write-Log "Server ready=$ready"
-if ($ready) {
-    $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已就绪 (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info)
-} else {
-    $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器启动失败, 查看日志", [System.Windows.Forms.ToolTipIcon]::Error)
+function Set-Tooltip($text) {
+    if ($text.Length -gt 63) { $text = $text.Substring(0, 63) }
+    $notifyIcon.Text = $text
 }
 
-# ═══════════════════════════════════════════════════════════
-#  ══ 右键菜单 ══
-# ═══════════════════════════════════════════════════════════
-$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 clicked"
-    $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 check FAILED, restarting server..."
-        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 "AppExit cleanup"
-    $healthTimer.Stop()
-    try {
-        if ($serverProcess -and !$serverProcess.HasExited) {
-            $serverProcess.Kill()
-            $serverProcess.WaitForExit(3000)
-        }
-    } catch {}
-    # 补刀: 杀残留
+# ─── stdin 轮询 (9Router 做法: 100ms Timer) ──────
+$timer = New-Object System.Windows.Forms.Timer
+$timer.Interval = 100
+$timer.Add_Tick({
     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 }
+        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 {}
-    $notifyIcon.Dispose()
-    [System.Runtime.InteropServices.Marshal]::DestroyIcon($hIcon)
-    $icon.Dispose()
-    Write-Log "Cleanup done"
-}
+    } catch { Write-Event @{type="error"; message=$_.Exception.Message} }
+})
+$timer.Start()
 
-# ═══════════════════════════════════════════════════════════
-#  ══ 消息循环 ══
-# ═══════════════════════════════════════════════════════════
-Write-Log "Entering message loop"
+Write-Event @{type="started"}
 [System.Windows.Forms.Application]::Run()
-Write-Log "Message loop exited"

package/tray-launcher.vbs

@@ -1,14 +0,0 @@
-' Pan Router Tray Launcher
-' Windows 原生无窗口启动器（VBScript 内置, 无需任何运行时）
-' 用法: wscript.exe tray-launcher.vbs
-'   或  cscript.exe //nologo tray-launcher.vbs
-
-Dim WshShell, FSO, ScriptDir
-Set WshShell = CreateObject("WScript.Shell")
-Set FSO = CreateObject("Scripting.FileSystemObject")
-
-ScriptDir = FSO.GetParentFolderName(WScript.ScriptFullName)
-PS1Path = ScriptDir & "\tray-daemon.ps1"
-
-' 用 PowerShell 启动托盘守护进程 (0 = 隐藏窗口, False = 不等待返回)
-WshShell.Run "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File """ & PS1Path & """", 0, False