panrouter 5.4.2 → 5.4.4

package/package.json

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

package/pool-worker.mjs

@@ -178,39 +178,62 @@ function scheduleReconnect() {
 
 function handleUpgrade() {
   log("收到主控升级指令，开始升级...", "WARN");
-  // 断开连接
+  // 设关闭标志，避免 ws.close → onclose → scheduleReconnect 启动重连
+  isShuttingDown = true;
   if (ws) {
     try { ws.close(1000, "Upgrading"); } catch {}
     ws = null;
   }
   stopHeartbeat();
 
-  log("正在执行 npm install -g panrouter@latest ...");
+  const pkgPath = path.join(__dirname, "package.json");
+  const oldVersion = JSON.parse(fs.readFileSync(pkgPath, "utf-8")).version;
+  log(`当前版本: v${oldVersion}，正在执行 npm install -g panrouter@latest ...`);
   try {
     execSync("npm install -g panrouter@latest", { stdio: "inherit", timeout: 120000 });
-    log("升级完成，正在重启...", "OK");
   } catch (e) {
     log(`升级失败: ${e.message}，仍尝试重启`, "ERR");
   }
 
-  // 写 PID 文件让新进程可追踪（旧 PID 文件被 cleanupStaleSelf 覆盖）
-  try {
-    if (!fs.existsSync(RUNTIME_DIR)) fs.mkdirSync(RUNTIME_DIR, { recursive: true });
-    fs.writeFileSync(PID_FILE, String(process.pid), "utf-8");
-  } catch {}
+  // 从磁盘重新读（跳过 require 缓存）
+  const newVersion = JSON.parse(fs.readFileSync(pkgPath, "utf-8")).version;
 
-  // 清理旧的 server.mjs，确保新实例用最新代码
+  // 清理旧 server.mjs
   log("正在重启代理服务...");
   killPort(SERVER_PORT);
 
-  // 启动新实例，在当前终端前台运行
-  const child = spawn(process.execPath, [process.argv[1], "--pool"], {
-    cwd: __dirname,
-    stdio: "inherit",
-  });
+  if (oldVersion !== newVersion) {
+    // 版本变了 → spawn 新进程加载新代码
+    log(`版本变更: v${oldVersion} → v${newVersion}，启动新进程`, "OK");
+    try {
+      if (!fs.existsSync(RUNTIME_DIR)) fs.mkdirSync(RUNTIME_DIR, { recursive: true });
+      fs.writeFileSync(PID_FILE, String(process.pid), "utf-8");
+    } catch {}
 
-  log("新实例已在后台启动", "OFF");
-  process.exit(0);
+    spawn(process.execPath, [process.argv[1], "--pool"], {
+      cwd: __dirname,
+      stdio: "inherit",
+    });
+    log("新实例已启动，旧进程退出", "OFF");
+    process.exit(0);
+  } else {
+    // 版本没变 → 在当前进程内直接重启连接
+    log(`版本未变更 (v${oldVersion})，在当前进程内重新连接`, "OK");
+    doRestart();
+  }
+}
+
+async function doRestart() {
+  isShuttingDown = false;
+  const serverOk = await ensureServer();
+  if (!serverOk) {
+    log("代理服务重启失败", "ERR");
+    process.exit(1);
+  }
+  reconnectDelay = WS_RECONNECT_BASE;
+  writePid();
+  connectToHub();
+  log("节点看门狗已启动，等待公网入口...", "ON");
 }
 
 // ─── 处理来自主控的请求 ─────────────────────────────────────────────────────