panrouter 5.4.0 → 5.4.2

package/package.json

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

package/pool-worker.mjs

@@ -74,6 +74,7 @@ const FINGERPRINT = getFingerprint();
 const DEVICE_TYPE = detectDeviceType();
 const SERVER_PORT = 50816;
 const PID_FILE = path.join(os.tmpdir(), "panrouter-pool-worker.pid");
+const RUNTIME_DIR = path.join(HOME_DIR, ".panrouter-runtime");
 
 // ─── 重连参数 ────────────────────────────────────────────────────────────────
 const WS_RECONNECT_BASE = 1000;
@@ -177,7 +178,7 @@ function scheduleReconnect() {
 
 function handleUpgrade() {
   log("收到主控升级指令，开始升级...", "WARN");
-  // 断开连接，不再接新任务
+  // 断开连接
   if (ws) {
     try { ws.close(1000, "Upgrading"); } catch {}
     ws = null;
@@ -192,17 +193,23 @@ function handleUpgrade() {
     log(`升级失败: ${e.message}，仍尝试重启`, "ERR");
   }
 
-  // 杀死当前进程，由外部进程管理器/用户重新启动
-  // 通过 spawn 启动自身的新实例，然后退出当前进程
+  // 写 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 {}
+
+  // 清理旧的 server.mjs，确保新实例用最新代码
+  log("正在重启代理服务...");
+  killPort(SERVER_PORT);
+
+  // 启动新实例，在当前终端前台运行
   const child = spawn(process.execPath, [process.argv[1], "--pool"], {
     cwd: __dirname,
-    stdio: "ignore",
-    detached: true,
-    windowsHide: true,
+    stdio: "inherit",
   });
-  child.unref();
 
-  log("新实例已启动，旧进程退出", "OFF");
+  log("新实例已在后台启动", "OFF");
   process.exit(0);
 }
 
@@ -296,6 +303,39 @@ function stopHeartbeat() {
   }
 }
 
+// ─── 端口清理 ────────────────────────────────────────────────────────────────
+
+function killPort(port) {
+  if (process.platform === 'win32') {
+    try {
+      const out = execSync(`netstat -ano | findstr :${port}`, { stdio: 'pipe', timeout: 3000 }).toString();
+      const lines = out.split('\n').filter(l => l.includes('LISTENING'));
+      for (const line of lines) {
+        const parts = line.trim().split(/\s+/);
+        const pid = parts[parts.length - 1];
+        if (pid && pid !== '0') {
+          try { execSync(`taskkill /F /PID ${pid}`, { stdio: 'pipe' }); log(`已终止端口 ${port} 上的进程 PID ${pid}`, "OK"); } catch {}
+        }
+      }
+    } catch {}
+  } else {
+    try {
+      execSync(`lsof -ti:${port} | xargs -r kill -9 2>/dev/null`, { stdio: 'pipe' });
+    } catch {}
+  }
+}
+
+function killPid(pid) {
+  if (!pid) return;
+  try {
+    if (process.platform === 'win32') {
+      execSync(`taskkill /F /PID ${pid}`, { stdio: 'pipe', timeout: 3000 });
+    } else {
+      try { process.kill(parseInt(pid), 9); } catch {}
+    }
+  } catch {}
+}
+
 // ─── 检查端口 ────────────────────────────────────────────────────────────────
 
 function isPortOpen(port) {
@@ -310,9 +350,16 @@ function isPortOpen(port) {
 // ─── 确保 server.mjs 在运行 ──────────────────────────────────────────────
 
 async function ensureServer() {
+  // 不管端口是否被占用，都先杀掉确保用最新代码启动
+  // 这是因为 cleanupStaleSelf 可能没清干净，或者旧版 server 残留
   if (await isPortOpen(SERVER_PORT)) {
-    log(`端口 ${SERVER_PORT} 已有服务在运行`, "OK");
-    return true;
+    log(`端口 ${SERVER_PORT} 已被占用，正在释放...`, "WARN");
+    killPort(SERVER_PORT);
+    // 等端口真正释放
+    for (let i = 0; i < 10; i++) {
+      if (!(await isPortOpen(SERVER_PORT))) break;
+      await new Promise((r) => setTimeout(r, 500));
+    }
   }
 
   const serverPath = path.join(__dirname, "server.mjs");
@@ -346,10 +393,28 @@ async function ensureServer() {
 
 function writePid() {
   try {
+    if (!fs.existsSync(RUNTIME_DIR)) fs.mkdirSync(RUNTIME_DIR, { recursive: true });
     fs.writeFileSync(PID_FILE, String(process.pid), "utf-8");
   } catch {}
 }
 
+// ─── 清理之前的 pool-worker 实例 ──────────────────────────────────────────
+
+function cleanupStaleSelf() {
+  // 1. 检查 PID 文件
+  try {
+    if (fs.existsSync(PID_FILE)) {
+      const oldPid = fs.readFileSync(PID_FILE, "utf-8").trim();
+      if (oldPid && String(process.pid) !== oldPid) {
+        log(`发现之前的 pool-worker (PID ${oldPid})，正在清理...`, "WARN");
+        killPid(oldPid);
+      }
+    }
+  } catch {}
+  // 2. 清理端口 50816（确保 server.mjs 会以最新版本重启）
+  killPort(SERVER_PORT);
+}
+
 // ─── 优雅退出 ────────────────────────────────────────────────────────────────
 
 function gracefulShutdown() {
@@ -370,11 +435,10 @@ function gracefulShutdown() {
   }
 
   try { fs.unlinkSync(PID_FILE); } catch {}
+  killPort(SERVER_PORT);
 
-  setTimeout(() => {
-    log("节点已安全下线，再见！", "OFF");
-    process.exit(0);
-  }, 500);
+  log("节点已安全下线，再见！", "OFF");
+  process.exit(0);
 }
 
 // ─── 入口 ────────────────────────────────────────────────────────────────────
@@ -385,6 +449,9 @@ export async function start() {
   log(`设备类型: ${DEVICE_TYPE}`);
   if (assignedId) log(`已注册编号: ${assignedId}`);
 
+  // 清理残留进程，确保 100% 干净启动
+  cleanupStaleSelf();
+
   const serverOk = await ensureServer();
   if (!serverOk) {
     log("无法启动代理服务，终止接入", "ERR");