panrouter 1.4.1 → 1.5.0

package/cli.mjs

@@ -141,30 +141,28 @@ async function startServer() {
 // ─── 4. 以托盘模式启动 ──────────────────────────────────────────────────
 
 /**
- * 启动策略 (参考 9Router Windows 托盘):
+ * 启动策略 (Windows BAT 原生方式):
  *
- *   cli.mjs ─spawn(detached)──→ node daemon.mjs         (无窗口, 常驻)
- *                                   ├─ cmd /c start /B → node server.mjs (隐藏)
- *                                   └─ spawn(pipe) ───→ powershell tray-daemon.ps1
- *                                                        └─ NotifyIcon ✓
+ *   cli.mjs ─spawn(detached)──→ cmd /c panrouter-tray.bat
+ *                                   ├─ start /B → node server.mjs (后台隐藏)
+ *                                   └─ start /B → powershell tray-daemon.ps1 (后台无窗口)
+ *                                                    └─ NotifyIcon ✓
  *
- *   关键: PS 必须用 pipe 连接(不 detached), 保持与 daemon 的 Window Station
- *   连接, 否则无法创建通知区图标。
+ *   用 cmd /c start /B 是 Windows 最原生的后台/隐藏启动方式,
+ *   不依赖 detached vs non-detached 的 Window Station 差异。
  */
 function startTray() {
-  const daemonPath = path.join(__dirname, "daemon.mjs");
-  if (!fs.existsSync(daemonPath)) {
-    log("!!", "未找到 daemon.mjs", "red");
+  const batPath = path.join(__dirname, "panrouter-tray.bat");
+
+  if (!fs.existsSync(batPath)) {
+    log("!!", "未找到 panrouter-tray.bat", "red");
     process.exit(1);
   }
 
   log("..", "正在以托盘模式启动 Pan Router...", "yellow");
 
-  const child = spawn(process.execPath, [
-    daemonPath,
-    `--serverPath="${path.join(__dirname, "server.mjs")}"`,
-    `--trayPsPath="${path.join(__dirname, "tray-daemon.ps1")}"`,
-  ], {
+  const child = spawn("cmd.exe", ["/c", batPath], {
+    cwd: __dirname,
     stdio: "ignore",
     windowsHide: true,
     detached: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "panrouter",
-  "version": "1.4.1",
+  "version": "1.5.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.bat"
   ],
   "license": "MIT"
 }

package/panrouter-tray.bat

@@ -0,0 +1,26 @@
+@echo off
+rem Pan Router Tray Launcher (Windows 原生 BAT, 最可靠方式)
+
+setlocal
+set "SCRIPT_DIR=%~dp0"
+
+rem 1. 清理旧 server.mjs 进程
+for /f "tokens=2 delims=," %%a in ('wmic process where "name='node.exe'" get ProcessId^,CommandLine /format:csv 2^>nul ^| findstr "server.mjs"') do (
+  taskkill /f /pid %%a >nul 2>&1
+)
+
+rem 2. 后台隐藏启动 server.mjs (start /B = 不创建新窗口, 同一控制台后台)
+start /B node "%SCRIPT_DIR%server.mjs"
+
+rem 3. 等待服务器就绪 (最久 5 秒)
+for /l %%i in (1,1,5) do (
+  >nul 2>&1 %WINDIR%\System32\curl.exe -s http://127.0.0.1:50816/health && goto :ready
+  >nul 2>&1 %WINDIR%\System32\timeout.exe /t 1 /nobreak
+)
+
+:ready
+
+rem 4. 启动 PS 托盘 (无窗口后台)
+start /B powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File "%SCRIPT_DIR%tray-daemon.ps1"
+
+rem 5. BAT 立即结束 (不影响后台进程)

package/daemon.mjs

@@ -1,148 +0,0 @@
-#!/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); });