panrouter 1.4.1 → 1.4.2

package/cli.mjs

@@ -160,11 +160,7 @@ function startTray() {
 
   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(process.execPath, [daemonPath], {
     stdio: "ignore",
     windowsHide: true,
     detached: true,

package/daemon.mjs

@@ -3,20 +3,17 @@
 /**
  * Pan Router Daemon — 后台守护进程
  *
- * 用法 (由 cli.mjs --tray 调用):
- *   node daemon.mjs --serverPath="..." --trayPsPath="..."
+ * 让 server.mjs + tray-daemon.ps1 在无窗口下运行。
+ * server.mjs 用 detached + windowsHide 启动。
+ * tray-daemon.ps1 用 pipe 连接 (不 detached — 否则失去 Window Station)。
  *
- * 架构 (参考 9Router):
- *   daemon.mjs (无窗口, 常驻)
- *     ├─ spawn server.mjs (hidden, UseShellExecute=true)
- *     └─ spawn powershell tray-daemon.ps1 (pipe, NOT detached)
- *          └─ NotifyIcon (右下角)
+ * 用法 (由 cli.mjs --tray 调用):
+ *   node daemon.mjs
  *
- *   关键: PS 子进程不 detached, 保持与 daemon 的 session 连接,
- *   否则失去 Window Station 无法创建 UI 通知区图标。
+ * 所有路径自动从 __dirname 解析 (同包目录)。
  */
 
-import { spawn, execSync } from "node:child_process";
+import { spawn } from "node:child_process";
 import { createInterface } from "node:readline";
 import { fileURLToPath } from "node:url";
 import path from "node:path";
@@ -24,76 +21,60 @@ import fs from "node:fs";
 import http from "node:http";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const appDir = __dirname;
+const serverPath = path.join(appDir, "server.mjs");
+const trayPsPath = path.join(appDir, "tray-daemon.ps1");
 
-// ─── 解析参数 ────────────────────────────────────
-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("=== PanRouter Daemon (v3) ===");
 log(`serverPath=${serverPath}`);
+log(`trayPsPath=${trayPsPath}`);
 
 // ─── 健康检查 ─────────────────────────────────────
 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); });
+    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); }
   });
 }
 
 // ─── 启动隐藏的 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;
-})();
-
-// ─── 等服务器就绪 ─────────────────────────────────
+log("Starting server...");
+const serverProcess = spawn(process.execPath, [serverPath], {
+  cwd: appDir,
+  stdio: "ignore",
+  windowsHide: true,
+  detached: true,
+  shell: false,
+});
+serverProcess.on("error", (err) => log(`Server spawn ERROR: ${err.message}`));
+serverProcess.unref();
+log(`Server spawned PID=${serverProcess.pid || "(no pid)"}`);
+
+// ─── 等服务器就绪后启动 PS 托盘 ──────────────────
 (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}`);
+  log(`Server online=${ready}`);
+
+  if (!fs.existsSync(trayPsPath)) {
+    log(`ERROR: tray-daemon.ps1 not found at ${trayPsPath}`);
+    return;
+  }
 
   // ─── 启动 PS 托盘 (pipe, 不 detached!) ──────────
-  // 关键: 9Router 的做法 - PS 必须与 daemon 同 session
+  // 9Router 的做法: PS 必须与 daemon 同 session 才能创建通知图标
   log("Starting PS tray...");
   const psProcess = spawn("powershell.exe", [
     "-NoProfile",
@@ -104,37 +85,35 @@ const serverProcess = (() => {
     stdio: ["pipe", "pipe", "pipe"],
     windowsHide: true,
     shell: false,
-    // ⚠ 没有 detached: true — PS 进程保持子进程身份
+    // ⚠ 没有 detached — PS 保持子进程身份才能访问 Window Station
   });
 
-  // IPC 读取 PS 事件
+  psProcess.on("error", (err) => log(`PS spawn ERROR: ${err.message}`));
+
+  // 读取 PS 事件 (stdout)
   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);
-        }
+      log(`PS: ${evt.type} idx=${evt.index}`);
+      if (evt.type === "click" && evt.index === 2) {
+        log("Exit from PS menu");
+        try { psProcess.stdin.write(JSON.stringify({ action: "kill" }) + "\n"); } catch {}
+        setTimeout(() => process.exit(0), 300);
       }
-    } catch (e) { log(`PS parse err: ${e.message}`); }
+    } catch {}
   });
 
-  psProcess.on("error", err => log(`PS error: ${err.message}`));
-  psProcess.stderr.on("data", d => log(`[ps] ${d.toString().trim()}`));
-  psProcess.on("exit", code => {
+  psProcess.stderr.on("data", (d) => log(`[ps-err] ${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");
-    }
+    try { psProcess.stdin.write(JSON.stringify(cmd) + "\n"); } catch {}
   }
+  await new Promise(r => setTimeout(r, 500)); // 等 PS 就绪
   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 });
@@ -145,4 +124,4 @@ const serverProcess = (() => {
 })();
 
 process.on("SIGTERM", () => { log("SIGTERM"); process.exit(0); });
-process.on("SIGINT", () => { log("SIGINT"); process.exit(0); });
+process.on("SIGINT",  () => { log("SIGINT");  process.exit(0); });

package/package.json

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