panrouter 5.4.4 → 5.4.6

package/package.json

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

package/pool-worker.mjs

@@ -178,21 +178,41 @@ function scheduleReconnect() {
 
 function handleUpgrade() {
   log("收到主控升级指令，开始升级...", "WARN");
-  // 设关闭标志，避免 ws.close → onclose → scheduleReconnect 启动重连
-  isShuttingDown = true;
+  // 彻底断开——remove 所有 ws 事件监听，不让 close 事件触发 reconnect
+  stopHeartbeat();
+  if (reconnectTimer) {
+    clearTimeout(reconnectTimer);
+    reconnectTimer = null;
+  }
   if (ws) {
+    ws.removeAllListeners();
     try { ws.close(1000, "Upgrading"); } catch {}
     ws = null;
   }
-  stopHeartbeat();
 
   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 ...`);
+  log(`当前版本: v${oldVersion}`);
+
+  // 先检查 npm registry 是否有新版，避免 Windows 下 EBUSY
+  let hasNewer = false;
   try {
-    execSync("npm install -g panrouter@latest", { stdio: "inherit", timeout: 120000 });
-  } catch (e) {
-    log(`升级失败: ${e.message}，仍尝试重启`, "ERR");
+    const latest = execSync("npm view panrouter version", { stdio: 'pipe', timeout: 10000 }).toString().trim();
+    hasNewer = latest !== oldVersion;
+    if (!hasNewer) {
+      log(`已是 v${latest}（最新版），跳过 npm install`, "OK");
+    }
+  } catch {
+    // 网络问题等，保守假设有新版本
+    hasNewer = true;
+  }
+
+  if (hasNewer) {
+    try {
+      execSync("npm install -g panrouter@latest", { stdio: "inherit", timeout: 120000 });
+    } catch (e) {
+      log(`升级失败: ${e.message}，仍尝试重启`, "ERR");
+    }
   }
 
   // 从磁盘重新读（跳过 require 缓存）
@@ -203,13 +223,19 @@ function handleUpgrade() {
   killPort(SERVER_PORT);
 
   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(`版本变更: 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",
@@ -225,6 +251,11 @@ function handleUpgrade() {
 
 async function doRestart() {
   isShuttingDown = false;
+  // 确保重连定时器已经清掉，避免和 connectToHub 竞态
+  if (reconnectTimer) {
+    clearTimeout(reconnectTimer);
+    reconnectTimer = null;
+  }
   const serverOk = await ensureServer();
   if (!serverOk) {
     log("代理服务重启失败", "ERR");