npm - panrouter - Versions diffs - 1.1.0 → 1.1.1 - Mend

panrouter 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/tray-manager.ps1 +179 -193

package/package.json CHANGED Viewed

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

package/tray-manager.ps1 CHANGED Viewed

@@ -6,232 +6,218 @@
   右键菜单: 状态, 开机自启动开关, 退出
   用法:
-    powershell -STA -File tray-manager.ps1 -ServerPath "server.mjs"
+    powershell -ExecutionPolicy Bypass -STA -File tray-manager.ps1 -ServerPath "server.mjs"
 #>
 param(
     [string]$ServerPath
 )
-# ─── STA 检查 ──────────────────────────────────
-if ([System.Threading.Thread]::CurrentThread.GetApartmentState() -ne "STA") {
-    $r = [System.Windows.Forms.MessageBox]::Show(
-        "Pan Router 需要 STA 模式运行。`n是否自动以 STA 模式重新启动？",
-        "Pan Router",
-        "YesNo",
-        "Warning"
-    )
-    if ($r -eq "Yes") {
-        powershell -STA -File $MyInvocation.MyCommand.Path -ServerPath $ServerPath
-    }
-    exit 1
-}
+# ─── 日志辅助 ──────────────────────────────────
+$logFile = "$env:TEMP\panrouter-tray.log"
+function Write-Log { param([string]$m) "$([DateTime]::Now.ToString('HH:mm:ss')) $m" | Out-File -Append -Encoding utf8 $logFile }
-Add-Type -AssemblyName System.Windows.Forms
-Add-Type -AssemblyName System.Drawing
+try {
+    Write-Log "==== Pan Router Tray Started ===="
+    Write-Log "ServerPath: $ServerPath"
+    Write-Log "PSVersion: $($PSVersionTable.PSVersion)"
-# ─── 常量 ──────────────────────────────────────
-$scriptPath = $MyInvocation.MyCommand.Path
-$autostartName = "PanRouter"
-$runKeyPath = "Software\Microsoft\Windows\CurrentVersion\Run"
+    Add-Type -AssemblyName System.Windows.Forms
+    Add-Type -AssemblyName System.Drawing
-# 取 npm 全局安装目录作为图标标题提示
-$pkgDir = Split-Path (Split-Path $ServerPath -Parent) -Parent
-$pkgName = Split-Path $pkgDir -Leaf
-$tooltipText = "Pan Router`n端口 50816 | 运行中"
+    # ─── 常量 ──────────────────────────────────
+    $scriptPath = $MyInvocation.MyCommand.Path
+    $autostartName = "PanRouter"
+    $runKeyPath = "Software\Microsoft\Windows\CurrentVersion\Run"
-# ─── 图标生成 ──────────────────────────────────
-function New-TrayIcon {
+    # ─── 生成图标 ──────────────────────────────
     $bmp = New-Object System.Drawing.Bitmap(16, 16)
     $g = [System.Drawing.Graphics]::FromImage($bmp)
     $g.SmoothingMode = 'HighQuality'
     $g.Clear([System.Drawing.Color]::Transparent)
-    # 蓝色圆底
     $brush = New-Object System.Drawing.SolidBrush([System.Drawing.Color]::FromArgb(0, 120, 215))
     $g.FillEllipse($brush, 0, 0, 15, 15)
-    # 白色 "P" 字
     $font = New-Object System.Drawing.Font("Segoe UI", 8.5, [System.Drawing.FontStyle]::Bold)
     $fg = New-Object System.Drawing.SolidBrush([System.Drawing.Color]::White)
     $g.DrawString("P", $font, $fg, 3, 1.5)
-    $font.Dispose()
-    $fg.Dispose()
-    $brush.Dispose()
-    $g.Dispose()
+    $font.Dispose(); $fg.Dispose(); $brush.Dispose(); $g.Dispose()
     $hIcon = $bmp.GetHicon()
     $icon = [System.Drawing.Icon]::FromHandle($hIcon)
     $bmp.Dispose()
-    return $icon, $hIcon
-}
+    Write-Log "Icon created"
+    # ─── NotifyIcon ────────────────────────────
+    $notifyIcon = New-Object System.Windows.Forms.NotifyIcon
+    $notifyIcon.Icon = $icon
+    $notifyIcon.Text = "Pan Router`n端口 50816 | 运行中"
+    $notifyIcon.Visible = $true
+    Write-Log "NotifyIcon created and visible"
+    # ─── 用 UseShellExecute 启动服务器（避免输出缓冲死锁） ──
+    function Start-ServerNohup {
+        param([string]$ServerPath)
+        $serverDir = Split-Path $ServerPath -Parent
+        try {
+            $psi = New-Object System.Diagnostics.ProcessStartInfo
+            $psi.FileName = "node"
+            $psi.Arguments = "`"$ServerPath`""
+            $psi.WorkingDirectory = $serverDir
+            $psi.WindowStyle = [System.Diagnostics.ProcessWindowStyle]::Hidden
+            $psi.CreateNoWindow = $true
+            # UseShellExecute=$true 避免重定向缓冲死锁
+            $psi.UseShellExecute = $true
+            $proc = [System.Diagnostics.Process]::Start($psi)
+            Write-Log "Server started PID=$($proc.Id)"
+            return $proc
+        } catch {
+            Write-Log "Server start FAILED: $_"
+            return $null
+        }
+    }
-# ─── 启动隐藏的 Node 服务器 ─────────────────────
-function Start-ServerHidden {
-    param([string]$ServerPath)
-    $serverDir = Split-Path $ServerPath -Parent
-    $psi = New-Object System.Diagnostics.ProcessStartInfo
-    $psi.FileName = "node"
-    $psi.Arguments = "`"$ServerPath`""
-    $psi.WorkingDirectory = $serverDir
-    $psi.WindowStyle = [System.Diagnostics.ProcessWindowStyle]::Hidden
-    $psi.CreateNoWindow = $true
-    $psi.UseShellExecute = $false
-    $psi.RedirectStandardOutput = $true
-    $psi.RedirectStandardError = $true
-    try {
-        $proc = [System.Diagnostics.Process]::Start($psi)
-        return $proc
-    } catch {
-        return $null
+    # ─── 杀掉旧进程 (wmic 兼容 PS5.1) ──────────
+    function Stop-OldServer {
+        try {
+            $old = Get-WmiObject Win32_Process -Filter "Name='node.exe'" -ErrorAction Stop |
+                Where-Object { $_.CommandLine -match "server\.mjs" }
+            foreach ($p in $old) {
+                Write-Log "Killing old server PID=$($p.ProcessId)"
+                Stop-Process -Id $p.ProcessId -Force -ErrorAction SilentlyContinue
+            }
+        } catch { Write-Log "Stop-OldServer: $_" }
     }
-}
-# ─── 检查服务器是否在线 ─────────────────────────
-function Test-ServerOnline {
-    try {
-        $req = [System.Net.HttpWebRequest]::Create("http://127.0.0.1:50816/health")
-        $req.Method = "GET"
-        $req.Timeout = 1500
-        $resp = $req.GetResponse()
-        $resp.Close()
-        return $true
-    } catch {
-        return $false
+    # ─── 健康检查 ──────────────────────────────
+    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 }
     }
-}
-# ─── 杀掉旧 Pan Router 进程 (WMI 方式, 兼容 PS5.1) ──────────
-function Stop-OldServer {
-    try {
-        $existing = Get-CimInstance -ClassName Win32_Process -Filter "Name='node.exe'" -ErrorAction SilentlyContinue |
-            Where-Object { $_.CommandLine -match "server\.mjs" }
-        foreach ($p in $existing) {
-            $pid = $p.ProcessId
-            Stop-Process -Id $pid -Force -ErrorAction SilentlyContinue
-        }
-    } catch {}
-}
+    # ─── 启动流程 ──────────────────────────────
+    Stop-OldServer
+    $serverProcess = Start-ServerNohup -ServerPath $ServerPath
-# ═══════════════════════════════════════════════
-#  主流程
-# ═══════════════════════════════════════════════
-# 1. 杀掉旧服务器
-Stop-OldServer
-# 2. 生成图标
-$icon, $hIcon = New-TrayIcon
-# 3. 创建 NotifyIcon
-$notifyIcon = New-Object System.Windows.Forms.NotifyIcon
-$notifyIcon.Icon = $icon
-$notifyIcon.Text = $tooltipText
-$notifyIcon.Visible = $true
-# 4. 启动隐藏服务器进程
-$serverProcess = Start-ServerHidden -ServerPath $ServerPath
-# 5. 等待服务器就绪（后台检查，不阻塞 UI）
-$checkTimer = New-Object System.Windows.Forms.Timer
-$checkTimer.Interval = 500
-$checkCount = 0
-$checkTimer.Add_Tick({
-    $checkCount++
-    if (Test-ServerOnline) {
-        $checkTimer.Stop()
-        $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已就绪 (端口 50816)", "Info")
-    } elseif ($checkCount -ge 10) {
-        $checkTimer.Stop()
-        $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器启动可能较慢，尝试访问中...", "Warning")
+    # 前台等待服务器就绪（超时 10 秒）
+    $ready = $false
+    for ($i = 0; $i -lt 20; $i++) {
+        Start-Sleep -Milliseconds 500
+        if (Test-Online) { $ready = $true; break }
     }
-})
-$checkTimer.Start()
-# 6. 左键点击: 弹气泡提示状态
-$notifyIcon.Add_MouseClick({
-    param($sender, $e)
-    if ($e.Button -eq [System.Windows.Forms.MouseButtons]::Left) {
-        $online = Test-ServerOnline
-        if ($online) {
-            $notifyIcon.ShowBalloonTip(3000, "Pan Router", "运行正常 ✓ (端口 50816)", "Info")
-        } else {
-            $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器未响应 ⚠", "Error")
-        }
+    Write-Log "Server ready=$ready"
+    if ($ready) {
+        $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已就绪 (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info)
     }
-})
-# 7. 右键菜单
-$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)
-$menu.Items.Add($titleItem)
-$menu.Items.Add("-")
-# 开机自启动
-$autoStartItem = New-Object System.Windows.Forms.ToolStripMenuItem
-$autoStartItem.Text = "开机自启动"
-$runKey = [Microsoft.Win32.Registry]::CurrentUser.OpenSubKey($runKeyPath, $true)
-$autoStartItem.Checked = ($runKey.GetValue($autostartName) -ne $null)
-$runKey.Close()
-$autoStartItem.Add_Click({
+    # ─── 后台定时健康检查 ──────────────────────
+    $healthTimer = New-Object System.Windows.Forms.Timer
+    $healthTimer.Interval = 30000
+    $healthTimer.Add_Tick({
+        if (-not (Test-Online)) {
+            Write-Log "Health check FAILED, restarting..."
+            Stop-OldServer
+            $script:serverProcess = Start-ServerNohup -ServerPath $ServerPath
+            Start-Sleep -Seconds 3
+            if (Test-Online) {
+                $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已自动重启", [System.Windows.Forms.ToolTipIcon]::Info)
+            }
+        }
+    })
+    $healthTimer.Start()
+    Write-Log "Health timer started"
+    # ─── 左键: 状态气泡 ────────────────────────
+    $notifyIcon.Add_MouseClick({
+        if ($_.Button -eq [System.Windows.Forms.MouseButtons]::Left) {
+            $online = Test-Online
+            if ($online) {
+                $notifyIcon.ShowBalloonTip(2000, "Pan Router", "运行正常 ✓ (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info)
+            } else {
+                $notifyIcon.ShowBalloonTip(2000, "Pan Router", "服务器未响应 ⚠", [System.Windows.Forms.ToolTipIcon]::Error)
+            }
+        }
+    })
+    # ─── 右键菜单 ──────────────────────────────
+    $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)
+    $menu.Items.Add($titleItem)
+    $menu.Items.Add("-")
+    $autoStartItem = New-Object System.Windows.Forms.ToolStripMenuItem
+    $autoStartItem.Text = "开机自启动"
     $rk = [Microsoft.Win32.Registry]::CurrentUser.OpenSubKey($runKeyPath, $true)
-    if ($autoStartItem.Checked) {
-        $rk.DeleteValue($autostartName, $false)
-        $autoStartItem.Checked = $false
-        $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已关闭", "Info")
-    } else {
-        $cmd = "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File `"$scriptPath`" -ServerPath `"$ServerPath`""
-        $rk.SetValue($autostartName, $cmd)
-        $autoStartItem.Checked = $true
-        $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已开启 ✓", "Info")
-    }
+    $autoStartItem.Checked = ($rk.GetValue($autostartName) -ne $null)
     $rk.Close()
-})
-$menu.Items.Add($autoStartItem)
-$menu.Items.Add("-")
-# 退出
-$exitItem = New-Object System.Windows.Forms.ToolStripMenuItem
-$exitItem.Text = "退出"
-$exitItem.Add_Click({
-    $notifyIcon.Visible = $false
-    [System.Windows.Forms.Application]::Exit()
-})
-$menu.Items.Add($exitItem)
-$notifyIcon.ContextMenuStrip = $menu
-# 8. 退出清理
-$cleanup = {
-    try {
-        if ($checkTimer) { $checkTimer.Stop(); $checkTimer.Dispose() }
-        if ($serverProcess -and !$serverProcess.HasExited) {
-            $serverProcess.Kill()
-            $serverProcess.WaitForExit(3000)
-            $serverProcess.Dispose()
+    $autoStartItem.Add_Click({
+        $rk2 = [Microsoft.Win32.Registry]::CurrentUser.OpenSubKey($runKeyPath, $true)
+        if ($autoStartItem.Checked) {
+            $rk2.DeleteValue($autostartName, $false)
+            $autoStartItem.Checked = $false
+            $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已关闭", [System.Windows.Forms.ToolTipIcon]::Info)
+            Write-Log "Autostart OFF"
+        } else {
+            $cmd = "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File `"$scriptPath`" -ServerPath `"$ServerPath`""
+            $rk2.SetValue($autostartName, $cmd)
+            $autoStartItem.Checked = $true
+            $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已开启 ✓", [System.Windows.Forms.ToolTipIcon]::Info)
+            Write-Log "Autostart ON"
         }
-        # 再补一刀: 确保无残留
-        Stop-OldServer
-    } catch {}
-}
+        $rk2.Close()
+    })
+    $menu.Items.Add($autoStartItem)
+    $menu.Items.Add("-")
+    $exitItem = New-Object System.Windows.Forms.ToolStripMenuItem
+    $exitItem.Text = "退出"
+    $exitItem.Add_Click({
+        Write-Log "Exit clicked"
+        $notifyIcon.Visible = $false
+        [System.Windows.Forms.Application]::Exit()
+    })
+    $menu.Items.Add($exitItem)
+    $notifyIcon.ContextMenuStrip = $menu
+    # ─── 退出清理 ──────────────────────────────
+    $cleanup = {
+        try {
+            Write-Log "Cleanup started"
+            $healthTimer.Stop()
+            $healthTimer.Dispose()
+            if (-not $serverProcess.HasExited) {
+                $serverProcess.Kill()
+                $serverProcess.WaitForExit(3000)
+                $serverProcess.Dispose()
+                Write-Log "Server killed"
+            }
+            Stop-OldServer
+            Write-Log "Cleanup done"
+        } catch { Write-Log "Cleanup error: $_" }
+    }
-[System.Windows.Forms.Application]::ApplicationExit += {
-    & $cleanup
-    $notifyIcon.Dispose()
-    [System.Runtime.InteropServices.Marshal]::DestroyIcon($hIcon)
-    $icon.Dispose()
-}
+    [System.Windows.Forms.Application]::ApplicationExit += {
+        & $cleanup
+        $notifyIcon.Dispose()
+        [System.Runtime.InteropServices.Marshal]::DestroyIcon($hIcon)
+        $icon.Dispose()
+    }
-# 9. 运行消息循环
-[System.Windows.Forms.Application]::Run()
+    Write-Log "Entering message loop"
+    [System.Windows.Forms.Application]::Run()
+    Write-Log "Message loop exited"
+    & $cleanup
-# 10. 循环结束后再次清理
-& $cleanup
+} catch {
+    $errMsg = "UNHANDLED ERROR: $_"
+    Write-Log $errMsg
+    try { [System.Windows.Forms.MessageBox]::Show($errMsg, "Pan Router Error") } catch {}
+}