panrouter 3.1.0 → 3.3.0

package/cli.mjs

@@ -91,7 +91,6 @@ async function startTray() {
   const psPath = path.join(__dirname, "tray-daemon.ps1");
   log("..", "正在后台启动代理...", "yellow");
 
-  // 1. 由主程序直接启动 Node 代理，彻底杜绝 PowerShell 启动慢导致的超时
   try {
     if (process.platform === "win32") {
       execSync('taskkill /f /fi "WINDOWTITLE eq Pan Router*" >nul 2>&1', { stdio: "pipe" });
@@ -106,7 +105,6 @@ async function startTray() {
   });
   srv.unref();
 
-  // 2. 验证端口（由于是直接用 Node 启动，这步通常 1 秒内就会通过）
   let ok = false;
   for (let i = 0; i < 15; i++) {
     if (await isPortOpen()) {
@@ -122,23 +120,38 @@ async function startTray() {
     log("!!", "服务启动超时，但仍将尝试加载托盘", "red");
   }
 
-  // 3. 独立拉起系统托盘
   log("..", "正在加载系统托盘...", "yellow");
+
+  // 【核心修复】：增加 -STA 参数防止 UI 线程崩溃，增加 shell:true 确保一定能找到 powershell
   const tray = spawn("powershell.exe", [
     "-NoProfile",
+    "-STA",
     "-ExecutionPolicy", "Bypass",
     "-WindowStyle", "Hidden",
-    "-File", psPath
+    "-File", `"${psPath}"`
   ], {
     cwd: __dirname,
-    stdio: "ignore",
+    stdio: ['ignore', 'pipe', 'pipe'],
     windowsHide: true,
-    detached: true,
+    shell: true,
     env: { ...process.env, PANROUTER_NODE: process.execPath }
   });
-  tray.unref();
 
-  console.log("   API 代理已立即可用。托盘图标稍后将在右下角显示。");
+  let psOutput = "";
+  tray.stdout.on("data", d => psOutput += d.toString());
+  tray.stderr.on("data", d => psOutput += d.toString());
+
+  // 监控 2.5 秒，如果闪退，直接打印错误
+  await new Promise(rs => setTimeout(rs, 2500));
+
+  if (tray.exitCode !== null) {
+    log("!!", "托盘进程未能驻留，发生闪退！", "red");
+    console.log(`\n\x1b[31m=== PowerShell 启动失败原因 ===\x1b[0m\n${psOutput || "(无报错输出，可能是被杀毒软件静默拦截)"}\n\x1b[31m===============================\x1b[0m\n`);
+    console.log("提示：如果代理可用，你可以暂时无视此错误。");
+  } else {
+    tray.unref();
+    console.log("   托盘图标应该已在右下角显示。");
+  }
 }
 
 async function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "panrouter",
-  "version": "3.1.0",
+  "version": "3.3.0",
   "description": "让 Claude Code 免费使用 DeepSeek 等模型，无需 API Key",
   "type": "module",
   "bin": {

package/tray-daemon.ps1

@@ -1,107 +1,132 @@
 <#
 .SYNOPSIS
-  Pan Router 托盘守护脚本 (极简直连版)
+  Pan Router 托盘守护脚本 (终极原生挂载版 + 日志诊断)
 #>
-$ErrorActionPreference = "SilentlyContinue"
+$ErrorActionPreference = "Stop" # 遇到错误直接抛出，由 try-catch 捕获写日志
 
-Add-Type -AssemblyName System.Windows.Forms
-Add-Type -AssemblyName System.Drawing
-[System.Windows.Forms.Application]::EnableVisualStyles()
+$logFile = "$env:TEMP\panrouter_tray.log"
+"--- $(Get-Date -Format 'HH:mm:ss') 托盘脚本启动 ---" | Out-File $logFile
 
-$scriptDir = Split-Path $MyInvocation.MyCommand.Path -Parent
-$serverPath = Join-Path $scriptDir "server.mjs"
-
-# 拿到 Node 路径
-$nodePath = $env:PANROUTER_NODE
-if ([string]::IsNullOrWhiteSpace($nodePath)) { $nodePath = "node" }
-
-# ─── 管理后台代理 ──────────────────────────────────────────
-function Start-Backend {
-    # 杀掉旧代理
-    Get-WmiObject Win32_Process -Filter "Name = 'node.exe'" |
-        Where-Object CommandLine -match "server\.mjs" |
-        ForEach-Object { Stop-Process -Id $_.ProcessId -Force }
-
-    # 启动新代理
-    Start-Process -FilePath $nodePath -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden
-}
-
-# 【核心修复】：不要盲目重启！检查端口如果已经通了，直接跳过耗时的杀进程步骤
-$portOpen = $false
-try {
-    $tcp = New-Object System.Net.Sockets.TcpClient
-    $ar = $tcp.BeginConnect("127.0.0.1", 50816, $null, $null)
-    $portOpen = $ar.AsyncWaitHandle.WaitOne(500, $false)
-    $tcp.Close()
-} catch {}
-
-if (-not $portOpen) {
-    Start-Backend
-}
-
-# ─── 初始化托盘 ────────────────────────────────────────────
-$notifyIcon = New-Object System.Windows.Forms.NotifyIcon
-$notifyIcon.Text = "Pan Router (:50816)"
-
-# 绘图报错是导致图标出不来的元凶之一，这里做强兜底
 try {
-    $bmp = New-Object System.Drawing.Bitmap(16, 16)
-    $g = [System.Drawing.Graphics]::FromImage($bmp)
-    $g.Clear([System.Drawing.Color]::FromArgb(0, 120, 215))
-    $font = New-Object System.Drawing.Font("Arial", 8, [System.Drawing.FontStyle]::Bold)
-    $g.DrawString("P", $font, [System.Drawing.Brushes]::White, 2, 1)
-    $notifyIcon.Icon = [System.Drawing.Icon]::FromHandle($bmp.GetHicon())
-} catch {
-    # 终极兜底：如果上面的画图代码因为 GDI 环境被拦，直接用系统自带的安全盾牌图标
-    $notifyIcon.Icon = [System.Drawing.SystemIcons]::Shield
-}
-
-# ─── 菜单配置 ──────────────────────────────────────────────
-$menu = New-Object System.Windows.Forms.ContextMenuStrip
-
-$titleItem = $menu.Items.Add("Pan Router | :50816")
-$titleItem.Enabled = $false
-$menu.Items.Add("-") | Out-Null
-
-$restartItem = $menu.Items.Add("重启服务")
-$restartItem.Add_Click({
-    Start-Backend
-    $notifyIcon.ShowBalloonTip(2000, "Pan Router", "服务已重启", [System.Windows.Forms.ToolTipIcon]::Info)
-})
-
-$autoItem = $menu.Items.Add("开机自启动")
-try { $autoItem.Checked = (Get-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name PanRouter) -ne $null } catch {}
-$autoItem.Add_Click({
-    if ($autoItem.Checked) {
-        reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /f 2>&1 | Out-Null
-        $autoItem.Checked = $false
-    } else {
-        $cmd = "powershell.exe -WindowStyle Hidden -ExecutionPolicy Bypass -File `"$($MyInvocation.MyCommand.Path)`""
-        reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /t REG_SZ /d $cmd /f 2>&1 | Out-Null
-        $autoItem.Checked = $true
+    Add-Type -AssemblyName System.Windows.Forms
+    Add-Type -AssemblyName System.Drawing
+    [System.Windows.Forms.Application]::EnableVisualStyles()
+    "1. .NET 库加载成功" | Out-File $logFile -Append
+
+    $scriptDir = Split-Path $MyInvocation.MyCommand.Path -Parent
+    $serverPath = Join-Path $scriptDir "server.mjs"
+
+    # 拿到 Node 路径
+    $nodePath = $env:PANROUTER_NODE
+    if ([string]::IsNullOrWhiteSpace($nodePath)) { $nodePath = "node" }
+    "2. Node 路径: $nodePath" | Out-File $logFile -Append
+
+    # ─── 管理后台代理 ──────────────────────────────────────────
+    function Start-Backend {
+        "-> 执行重启后台服务逻辑" | Out-File $logFile -Append
+        Get-WmiObject Win32_Process -Filter "Name = 'node.exe'" |
+            Where-Object CommandLine -match "server\.mjs" |
+            ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }
+
+        Start-Process -FilePath $nodePath -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden
     }
-})
-
-$menu.Items.Add("-") | Out-Null
-
-$exitItem = $menu.Items.Add("退出")
-$exitItem.Add_Click({
-    $notifyIcon.Visible = $false
-    Get-WmiObject Win32_Process -Filter "Name = 'node.exe'" | Where-Object CommandLine -match "server\.mjs" | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }
-    [System.Windows.Forms.Application]::Exit()
-})
 
-$notifyIcon.ContextMenuStrip = $menu
+    # 检查端口
+    $portOpen = $false
+    try {
+        $tcp = New-Object System.Net.Sockets.TcpClient
+        $ar = $tcp.BeginConnect("127.0.0.1", 50816, $null, $null)
+        $portOpen = $ar.AsyncWaitHandle.WaitOne(500, $false)
+        $tcp.Close()
+        "3. 端口探测完成，已开放状态: $portOpen" | Out-File $logFile -Append
+    } catch {
+        "3. 端口探测报错 (忽略并继续): $($_.Exception.Message)" | Out-File $logFile -Append
+    }
 
-# 左键点击直接弹出原生菜单（去除了那些花里胡哨的反射代码）
-$notifyIcon.Add_MouseClick({
-    if ($_.Button -eq [System.Windows.Forms.MouseButtons]::Left) {
-        $notifyIcon.ContextMenuStrip.Show([System.Windows.Forms.Cursor]::Position)
+    if (-not $portOpen) {
+        Start-Backend
     }
-})
 
-$notifyIcon.Visible = $true
+    # ─── 初始化托盘 ────────────────────────────────────────────
+    $notifyIcon = New-Object System.Windows.Forms.NotifyIcon
+    $notifyIcon.Text = "Pan Router (:50816)"
+
+    # 图标兜底处理
+    try {
+        $bmp = New-Object System.Drawing.Bitmap(16, 16)
+        $g = [System.Drawing.Graphics]::FromImage($bmp)
+        $g.Clear([System.Drawing.Color]::FromArgb(0, 120, 215))
+        $font = New-Object System.Drawing.Font("Arial", 8, [System.Drawing.FontStyle]::Bold)
+        $g.DrawString("P", $font, [System.Drawing.Brushes]::White, 2, 1)
+        $notifyIcon.Icon = [System.Drawing.Icon]::FromHandle($bmp.GetHicon())
+        "4. 自定义图标绘制成功" | Out-File $logFile -Append
+    } catch {
+        "4. 画图异常，改用原生盾牌图标: $($_.Exception.Message)" | Out-File $logFile -Append
+        $notifyIcon.Icon = [System.Drawing.SystemIcons]::Shield
+    }
 
-# 保持进程存活的最纯粹方式
-$ctx = New-Object System.Windows.Forms.ApplicationContext
-[System.Windows.Forms.Application]::Run($ctx)
+    # ─── 原生菜单配置 (ContextMenu) ────────────────────────────
+    # 【核心修复】：使用原生的 ContextMenu 代替极易失去焦点的 ContextMenuStrip
+    $menu = New-Object System.Windows.Forms.ContextMenu
+
+    $titleItem = New-Object System.Windows.Forms.MenuItem("Pan Router | :50816")
+    $titleItem.Enabled = $false
+    $menu.MenuItems.Add($titleItem) | Out-Null
+
+    $menu.MenuItems.Add("-") | Out-Null
+
+    $restartItem = New-Object System.Windows.Forms.MenuItem("重启服务")
+    $restartItem.Add_Click({
+        Start-Backend
+        $notifyIcon.ShowBalloonTip(2000, "Pan Router", "服务已重启", [System.Windows.Forms.ToolTipIcon]::Info)
+    })
+    $menu.MenuItems.Add($restartItem) | Out-Null
+
+    $autoItem = New-Object System.Windows.Forms.MenuItem("开机自启动")
+    try { $autoItem.Checked = (Get-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name PanRouter -ErrorAction SilentlyContinue) -ne $null } catch {}
+    $autoItem.Add_Click({
+        if ($autoItem.Checked) {
+            reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /f 2>&1 | Out-Null
+            $autoItem.Checked = $false
+        } else {
+            $cmd = "powershell.exe -WindowStyle Hidden -ExecutionPolicy Bypass -File `"$($MyInvocation.MyCommand.Path)`""
+            reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /t REG_SZ /d $cmd /f 2>&1 | Out-Null
+            $autoItem.Checked = $true
+        }
+    })
+    $menu.MenuItems.Add($autoItem) | Out-Null
+
+    $menu.MenuItems.Add("-") | Out-Null
+
+    $exitItem = New-Object System.Windows.Forms.MenuItem("退出")
+    $exitItem.Add_Click({
+        $notifyIcon.Visible = $false
+        "-> 执行退出清理" | Out-File $logFile -Append
+        Get-WmiObject Win32_Process -Filter "Name = 'node.exe'" | Where-Object CommandLine -match "server\.mjs" | ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }
+        [System.Windows.Forms.Application]::Exit()
+    })
+    $menu.MenuItems.Add($exitItem) | Out-Null
+
+    $notifyIcon.ContextMenu = $menu
+    $notifyIcon.Visible = $true
+    "5. 托盘图标已绑定并设置为可见" | Out-File $logFile -Append
+
+    # ─── 隐形实体主窗口 ─────────────────────────────────────────
+    # 【核心修复】：挂载真实的 Form 窗口，防止 Windows 将该 PowerShell UI 线程当做垃圾回收掉
+    $form = New-Object System.Windows.Forms.Form
+    $form.ShowInTaskbar = $false
+    $form.WindowState = [System.Windows.Forms.FormWindowState]::Minimized
+    $form.Opacity = 0
+    $form.Add_Load({
+        $form.Hide()
+        "6. 实体窗口初始化完毕，正式进入消息挂起循环..." | Out-File $logFile -Append
+    })
+
+    [System.Windows.Forms.Application]::Run($form)
+
+    "7. 程序正常退出" | Out-File $logFile -Append
+} catch {
+    "【致命报错】无法完成执行:" | Out-File $logFile -Append
+    $_.Exception.Message | Out-File $logFile -Append
+    $_.Exception.StackTrace | Out-File $logFile -Append
+}