panrouter 6.2.1 → 6.3.2

package/package.json

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

package/pool-worker.mjs

@@ -256,11 +256,7 @@ async function doRestart() {
     clearTimeout(reconnectTimer);
     reconnectTimer = null;
   }
-  const serverOk = await ensureServer();
-  if (!serverOk) {
-    log("代理服务重启失败", "ERR");
-    process.exit(1);
-  }
+  ensureServer();
   reconnectDelay = WS_RECONNECT_BASE;
   writePid();
   connectToHub();
@@ -403,30 +399,49 @@ function isPortOpen(port) {
 
 // ─── 后台确保 9router 在运行（不阻塞注册）───────────────────────────────
 
-let _serverReady = false;  // 9router 是否可用
+let _serverReady = false;
 
 function isServerReady() { return _serverReady; }
 
-async function ensureServer() {
-  if (await isPortOpen(SERVER_PORT)) {
-    _serverReady = true;
-    log(`9router 已就绪 (端口 ${SERVER_PORT})`, "OK");
-    return;
-  }
+function ensureServer() {
+  isPortOpen(SERVER_PORT).then(open => {
+    if (open) { _serverReady = true; log(`9router 已就绪 (端口 ${SERVER_PORT})`, "OK"); return; }
+    _ensureServer();
+  });
+}
 
-  // 跑你的完整脚本（检查→安装→注入DB→启动，全部包了）
+function _ensureServer() {
   const setupScript = path.join(__dirname, "setup-9router.cjs");
-  if (fs.existsSync(setupScript)) {
-    log("正在执行 9router 部署脚本...");
-    spawn(process.execPath, [setupScript], {
-      cwd: __dirname, stdio: "ignore", detached: true,
-    }).unref();
+  if (!fs.existsSync(setupScript)) {
+    log("找不到 setup-9router.cjs，直接尝试启动 9router", "WARN");
+    trySpawn9router();
+    poll9router();
+    return;
   }
 
-  // 一直轮询到 9router 起来为止（不限次数，不阻塞注册）
+  log("正在执行 9router 安装与数据库配置...");
+  const child = spawn(process.execPath, [setupScript], {
+    cwd: __dirname, stdio: "inherit",
+  });
+  child.on("exit", () => {
+    log("部署脚本完成，正在启动 9router...");
+    trySpawn9router();
+  });
+
   poll9router();
 }
 
+function trySpawn9router() {
+  try {
+    const r = spawn("9router", [], {
+      detached: true, windowsHide: true, stdio: "ignore",
+    });
+    r.unref();
+  } catch (e) {
+    log(`启动 9router 失败: ${e.message}`, "ERR");
+  }
+}
+
 async function poll9router() {
   for (let i = 0; ; i++) {
     if (await isPortOpen(SERVER_PORT)) {
@@ -435,7 +450,7 @@ async function poll9router() {
       return;
     }
     if (i < 60) await new Promise((r) => setTimeout(r, 1000));
-    else await new Promise((r) => setTimeout(r, 5000));  // 60秒后放慢频率
+    else await new Promise((r) => setTimeout(r, 5000));
   }
 }
 
@@ -503,7 +518,7 @@ export async function start() {
   cleanupStaleSelf();
 
   // 后台启动 9router（不阻塞注册）
-  await ensureServer();
+  ensureServer();
 
   writePid();
   connectToHub();