panrouter 1.7.1 → 1.8.0

package/cli.mjs

@@ -141,16 +141,17 @@ async function startServer() {
 // ─── 4. 以托盘模式启动 ──────────────────────────────────────────────────
 
 function startTray() {
-  const daemonPath = path.join(__dirname, "daemon.mjs");
+  const vbsPath = path.join(__dirname, "panrouter-tray.vbs");
 
-  if (!fs.existsSync(daemonPath)) {
-    log("!!", "未找到 daemon.mjs", "red");
+  if (!fs.existsSync(vbsPath)) {
+    log("!!", "未找到 panrouter-tray.vbs", "red");
     process.exit(1);
   }
 
   log("..", "正在以托盘模式启动 Pan Router...", "yellow");
 
-  const child = spawn(process.execPath, [daemonPath], {
+  // cmd /c start /B → VBS 在新进程树中运行, 有 Window Station
+  const child = spawn("cmd.exe", ["/c", "start", "/B", "wscript.exe", "//B", "//NoLogo", vbsPath], {
     cwd: __dirname,
     stdio: "ignore",
     windowsHide: true,
@@ -159,15 +160,9 @@ function startTray() {
   });
   child.unref();
 
-  log("OK", "Pan Router 托盘服务已启动", "green");
-  console.log("");
-  console.log("  \x1b[33m实时查看日志:\x1b[0m");
-  console.log("    powershell -Command \"Get-Content -Wait -Tail 20 $env:TEMP\\panrouter-daemon.log\"");
-  console.log("");
-  console.log("  \x1b[33m查看全部日志:\x1b[0m");
-  console.log("    notepad %TEMP%\\panrouter-daemon.log");
-  console.log("");
-  console.log("  若 10 秒后图标未出现，请查看日志并反馈");
+  log("OK", "Pan Router 托盘已启动", "green");
+  console.log("   图标在右下角, 右键可退出");
+}
 
 // ─── 主流程 ──────────────────────────────────────────────────────────────
 

package/package.json

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

package/panrouter-tray.vbs

@@ -0,0 +1,13 @@
+' Pan Router Tray Launcher
+' 由 cli.mjs --tray 通过 cmd /c start /B 启动
+' 与 daemon 进程树无关, 独立 Window Station
+
+Dim WshShell, FSO, ScriptDir
+Set WshShell = CreateObject("WScript.Shell")
+Set FSO = CreateObject("Scripting.FileSystemObject")
+
+ScriptDir = FSO.GetParentFolderName(WScript.ScriptFullName)
+
+' 后台隐藏启动 PS 托盘 (自包含: 启动 server + 图标 + 菜单)
+' 0 = 隐藏窗口, False = 不等待返回
+WshShell.Run "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File """ & ScriptDir & "\tray-daemon.ps1" & """", 0, False

package/tray-daemon.ps1

@@ -1,29 +1,45 @@
 <#
 .SYNOPSIS
-  Pan Router 托盘进程 (仅托盘 + 健康检查, 不启动服务器)
-
-  由 panrouter-tray.vbs 启动。
-  服务器已经由 VBS 启动, PS 只负责:
-  - NotifyIcon (右下角)
-  - 右键菜单 (开机自启动 / 退出)
-  - 健康检查 + 自动重启
-
-  用法:
-    powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File tray-daemon.ps1
+  Pan Router 托盘 (自包含: 启动服务器 + 托盘图标 + 菜单)
+  ⚠ 必须从 WScript.Shell.Run (VBS) 或正常控制台启动, 不能从 detached Node 进程启动
 #>
 
-$scriptDir = Split-Path $MyInvocation.MyCommand.Path -Parent
+$scriptPath = $MyInvocation.MyCommand.Path
+$scriptDir = Split-Path $scriptPath -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 ==="
+$now = Get-Date -Format "HH:mm:ss"
+
+"$now === PanRouter Tray START ===" | Out-File $logFile
+"$now PID=$pid" | Out-File -Append $logFile
+"$now serverPath=$serverPath" | Out-File -Append $logFile
+
+# ─── 杀掉旧 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') {
+            Stop-Process -Id $Matches[1] -Force -ErrorAction SilentlyContinue
+            "$now Killed old server PID=$($Matches[1])" | Out-File -Append $logFile
+        }
+    }
+} catch {}
+
+# ─── 启动 server.mjs (用 node 完整路径) ─────────
+try {
+    $nodePath = (Get-Command node).Source
+    "$now nodePath=$nodePath" | Out-File -Append $logFile
+    $p = Start-Process -FilePath $nodePath -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden -PassThru -NoNewWindow
+    if ($p -and $p.Id) { "$now Server started PID=$($p.Id)" | Out-File -Append $logFile }
+} catch {
+    "$now Server start FAILED: $_" | Out-File -Append $logFile
+}
 
+# ─── WinForms ────────────────────────────────────
 Add-Type -AssemblyName System.Windows.Forms
 Add-Type -AssemblyName System.Drawing
 
-# ─── 生成图标 ──────────────────────────────────────
+# ─── 图标 ────────────────────────────────────────
 $bmp = New-Object System.Drawing.Bitmap(16, 16)
 $g = [System.Drawing.Graphics]::FromImage($bmp)
 $g.SmoothingMode = 'HighQuality'
@@ -38,153 +54,71 @@ $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"
 
-# ─── 右键菜单 (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.ToolStripMenuItem("Pan Router - :50816") { Enabled = $false; Font = New-Object System.Drawing.Font("Segoe UI", 9, [System.Drawing.FontStyle]::Bold) }))
 [void]$menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator))
 
-$autoItem = New-Object System.Windows.Forms.ToolStripMenuItem
-$autoItem.Text = "开机自启动"
-$autoItem.Checked = Get-Autostart
+$autoItem = New-Object System.Windows.Forms.ToolStripMenuItem("开机自启动")
+try { $autoItem.Checked = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name PanRouter -ErrorAction Stop).PanRouter -ne $null } catch {}
 $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)
+    if ($autoItem.Checked) {
+        reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /f 2>&1 | Out-Null
+        $autoItem.Checked = $false
+        $notifyIcon.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)
+        reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /t REG_SZ /d "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File `"$scriptPath`"" /f 2>&1 | Out-Null
+        $autoItem.Checked = $true
+        $notifyIcon.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 = New-Object System.Windows.Forms.ToolStripMenuItem("退出")
 $exitItem.Add_Click({
-    Write-Log "Exit clicked"
     $notifyIcon.Visible = $false
+    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 {}
     [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")
-        $req.Timeout = 1500
-        $resp = $req.GetResponse()
-        $resp.Close()
-        return $true
-    } catch { return $false }
-}
 
-function Start-Server {
-    try {
-        # 杀旧的 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 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: $_" }
-}
-
-# ═══════════ 主流程 ═══════════
-
-# 等待服务器就绪 (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)
-    }
-}
-
-# 左键: 状态
+# ─── 左键 ────────────────────────────────────────
 $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) }
+        try { $req = [System.Net.WebRequest]::Create("http://127.0.0.1:50816/health"); $req.Timeout = 1500; $resp = $req.GetResponse(); $resp.Close(); $notifyIcon.ShowBalloonTip(2000, "Pan Router", "运行正常 ✓ (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info) }
+        catch { $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) }
+    try { $req = [System.Net.WebRequest]::Create("http://127.0.0.1:50816/health"); $req.Timeout = 1500; $resp = $req.GetResponse(); $resp.Close() }
+    catch {
+        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 {}
+        try { Start-Process -FilePath (Get-Command node).Source -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden -NoNewWindow } catch {}
     }
 })
 $healthTimer.Start()
+"$now Health timer started" | Out-File -Append $logFile
 
-# 退出清理
-[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-Log "Message loop"
+# ═══ 进入消息循环 ═══
+$notifyIcon.Visible = $true
+"$now Icon visible, entering message loop" | Out-File -Append $logFile
 [System.Windows.Forms.Application]::Run()
-Write-Log "Exited"
+"$now Exited message loop" | Out-File -Append $logFile
+
+# 清理
+$healthTimer.Stop()
+$notifyIcon.Dispose()
+[System.Runtime.InteropServices.Marshal]::DestroyIcon($hIcon)
+$icon.Dispose()

package/daemon.mjs

@@ -1,133 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Pan Router Daemon (v5)
- *
- *   1. spawn server.mjs (detached, hidden) — 正常
- *   2. 用 VBS 启动 PS tray（解决 detached 进程无法创建通知图标的问题）
- *   3. 保持存活，30s 健康检查
- */
-
-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;
-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 v5 ===");
-log(`nodeExe=${nodeExe}`);
-
-// ─── 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 PID=${m[1]}`); } catch {} }
-    }
-  }
-} catch {}
-
-// ─── 2. 启动 server.mjs ──────────────────────────
-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. 用 VBS 启动 PS 托盘 ─────────────────────
-  log("Starting PS tray via VBS...");
-
-  if (fs.existsSync(trayPsPath)) {
-    log(`trayPsPath exists: ${trayPsPath}`);
-
-    // 创建临时的 VBS 启动器
-    const vbsContent = `Set WshShell = CreateObject("WScript.Shell")
-Set FSO = CreateObject("Scripting.FileSystemObject")
-' 写诊断日志
-On Error Resume Next
-Dim f : Set f = FSO.OpenTextFile("${(process.env.TEMP || "/tmp").replace(/\\/g, "\\\\")}\\panrouter-vbs.log", 2, True)
-f.WriteLine Now & " VBS started"
-f.Close
-' 启动 PS 托盘
-WshShell.Run "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File """ & "${trayPsPath.replace(/\\/g, "\\\\")}" & """", 0, False
-If Err.Number <> 0 Then
-  Set f = FSO.OpenTextFile("${(process.env.TEMP || "/tmp").replace(/\\/g, "\\\\")}\\panrouter-vbs.log", 8, True)
-  f.WriteLine Now & " ERROR: " & Err.Description
-  f.Close
-End If
-`;
-    const vbsPath = path.join(process.env.TEMP || "/tmp", "panrouter-tray-launcher.vbs");
-    try {
-      fs.writeFileSync(vbsPath, vbsContent, "utf8");
-      log(`VBS written: ${vbsPath}`);
-    } catch (e) {
-      log(`VBS write FAILED: ${e.message}`);
-    }
-
-    log(`VBS content:\n${vbsContent}`);
-
-    // 先试 wscript //B
-    try {
-      const vbs = spawn("wscript.exe", ["//B", "//NoLogo", vbsPath], {
-        stdio: "ignore", windowsHide: true, shell: false,
-      });
-      vbs.unref();
-      log(`VBS spawned via wscript`);
-    } catch (e) {
-      log(`VBS via wscript FAILED: ${e.message}`);
-    }
-  } else {
-    log(`WARN: tray-daemon.ps1 NOT FOUND at ${trayPsPath}`);
-  }
-
-  // ─── 5. 保持存活 ────────────────────────────────
-  log("Daemon running");
-  process.stdin.resume();
-
-  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);
-})();