panrouter 6.3.7 → 6.3.9

package/package.json

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

package/pool-worker.mjs

@@ -17,7 +17,13 @@ import path from "node:path";
 import fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import crypto from "node:crypto";
+import { createRequire } from "node:module";
 import WebSocket from "ws";
+
+const _require = createRequire(import.meta.url);
+const _pkg = _require("./package.json");
+const NODE_VERSION = _pkg.version;
+
 const ROUTER_PORT = 20128;
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -109,9 +115,10 @@ function connectToHub() {
 
     const registerMsg = JSON.stringify({
       type: "register",
-      nodeId: assignedId || FINGERPRINT, // 已有分配 ID 就用它
+      nodeId: assignedId || FINGERPRINT,
       fingerprint: FINGERPRINT,
       deviceType: DEVICE_TYPE,
+      version: NODE_VERSION,
       secret: AUTH_SECRET,
     });
     ws.send(registerMsg);
@@ -145,6 +152,9 @@ function connectToHub() {
         ws.send(JSON.stringify({ type: "pong" }));
         break;
 
+      case "pong":
+        break;
+
       case "upgrade":
         handleUpgrade();
         break;
@@ -208,7 +218,9 @@ function handleUpgrade() {
     hasNewer = true;
   }
 
-  if (hasNewer) {
+  // ponytail: Windows 跳过内联 install（当前进程锁着 npm 目录必 EBUSY）
+  // 后续 start /b 脚本在进程退出后再执行 install
+  if (hasNewer && process.platform !== 'win32') {
     try {
       execSync("npm install -g panrouter@latest", { stdio: "inherit", timeout: 120000 });
     } catch (e) {
@@ -216,26 +228,25 @@ function handleUpgrade() {
     }
   }
 
-  // 从磁盘重新读（跳过 require 缓存）
-  const newVersion = JSON.parse(fs.readFileSync(pkgPath, "utf-8")).version;
-
   log("正在重启 9router...");
   killPort(SERVER_PORT);
 
+  // Windows：无论如何走 start /b 脚本（当前进程锁着 npm 目录无法内联升级）
+  if (process.platform === 'win32') {
+    const tmpDir = process.env.TEMP || process.env.TMP || "C:\\Windows\\Temp";
+    // 如果已经是最新版也跳过 install
+    const noInstall = hasNewer ? "" : "& npm cache clean --force 2>nul & npm install -g panrouter@latest";
+    // 先 ping 等当前进程退出锁释放 → 杀残留 node → 切 tmp 目录避免被删 → install → 启动
+    const upgradeCmd = `start /b cmd /c "@ping 127.0.0.1 -n 3 >nul && taskkill /f /im node.exe 2>nul & ping 127.0.0.1 -n 3 >nul & cd /d \"${tmpDir}\"${noInstall} && panrouter --pool"`;
+    try { execSync(upgradeCmd, { stdio: 'pipe', timeout: 5000, shell: true }); } catch {}
+    log("升级脚本已提交 (当前进程退出后自动执行)，旧进程退出", "OFF");
+    process.exit(0);
+  }
+
+  // Unix：检查版本，需要就 install，然后 spawn 新实例
+  const newVersion = JSON.parse(fs.readFileSync(pkgPath, "utf-8")).version;
   if (oldVersion !== newVersion) {
     log(`版本变更: v${oldVersion} → v${newVersion}，升级并重启`, "OK");
-
-    // Windows 下当前进程锁住了 npm 目录 → 先 exit 释放锁再 npm install
-    // 用 start /b 提交一个后台脚本，等 2 秒（进程退出锁释放）后执行升级 + 启动
-    // start /b 的输出会打到当前终端，用户能看到进度
-    if (process.platform === 'win32') {
-      const cmd = `start /b cmd /c "@ping 127.0.0.1 -n 3 >nul && npm install -g panrouter@latest && panrouter --pool"`;
-      try { execSync(cmd, { stdio: 'pipe', timeout: 5000, shell: true }); } catch {}
-      log("升级脚本已提交 (当前进程退出后自动执行)，旧进程退出", "OFF");
-      process.exit(0);
-    }
-
-    // Unix 可以直接 spawn（不会锁）
     spawn(process.execPath, [process.argv[1], "--pool"], {
       cwd: __dirname,
       stdio: "inherit",
@@ -577,13 +588,20 @@ export async function start() {
 
   log("节点看门狗已启动，等待公网入口...", "ON");
 
-  // 等 9router 起来后打开守护
+  // 等 9router 起来后打开守护 + 通知主控就绪
   const checkReady = setInterval(async () => {
     if (_serverReady || (await isPortOpen(SERVER_PORT))) {
       _serverReady = true;
-      clearInterval(checkReady);
       startWatchdog();
-      log("9router 已就绪，节点可正常处理请求", "ON");
+      // 持续发 ready 直到 WebSocket 连通（注册可能还没完成）
+      const tryReady = setInterval(() => {
+        if (ws && ws.readyState === WebSocket.OPEN) {
+          ws.send(JSON.stringify({ type: "ready" }));
+          clearInterval(tryReady);
+          clearInterval(checkReady);
+          log("9router 已就绪，节点可正常处理请求", "ON");
+        }
+      }, 1000);
     }
   }, 3000);
 }