panrouter 5.2.0 → 5.3.0

package/package.json

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

package/pool-worker.mjs

@@ -118,7 +118,7 @@ function isPortOpen(port) {
   });
 }
 
-// ─── 查找 cloudflared ────────────────────────────────────────────────────────
+// ─── 查找 & 自动安装 cloudflared ────────────────────────────────────────────
 function findCloudflared() {
   const candidates = ["cloudflared", "cloudflared.exe"];
   for (const name of candidates) {
@@ -138,6 +138,56 @@ function findCloudflared() {
   return null;
 }
 
+async function installCloudflared() {
+  log("正在自动安装 cloudflared...");
+  const platform = process.platform;
+  try {
+    if (platform === "win32") {
+      const dir = path.join(process.env.USERPROFILE || "C:/Users/default", "AppData", "Local", "cloudflared");
+      const exe = path.join(dir, "cloudflared.exe");
+      if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+      log("正在下载 cloudflared (Windows)...");
+      const url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-windows-amd64.exe";
+      spawnSync("curl.exe", ["-L", "-o", exe, url], { stdio: "pipe", timeout: 120000 });
+      if (fs.existsSync(exe)) {
+        // 添加至用户 PATH（下次终端生效）
+        const currentPath = process.env.PATH || "";
+        if (!currentPath.includes(dir)) {
+          try {
+            spawnSync("powershell.exe", [
+              "-Command", `[Environment]::SetEnvironmentVariable("Path", [Environment]::GetEnvironmentVariable("Path","User") + ";${dir}", "User")`
+            ], { stdio: "pipe", timeout: 10000 });
+          } catch {}
+        }
+        log("cloudflared 安装完成", "OK");
+        return exe;
+      }
+    } else if (platform === "darwin") {
+      log("正在通过 Homebrew 安装 cloudflared...");
+      spawnSync("brew", ["install", "cloudflare/cloudflare/cloudflared"], { stdio: "inherit", timeout: 120000 });
+      const r = spawnSync("which", ["cloudflared"], { stdio: "pipe", timeout: 5000 });
+      if (r.status === 0) { log("cloudflared 安装完成", "OK"); return "cloudflared"; }
+    } else {
+      // Linux / Termux
+      const isTermux = fs.existsSync("/data/data/com.termux");
+      if (isTermux) {
+        log("正在通过 pkg 安装 cloudflared (Termux)...");
+        spawnSync("pkg", ["install", "cloudflared", "-y"], { stdio: "inherit", timeout: 120000 });
+      } else {
+        log("正在下载 cloudflared (Linux)...");
+        const url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64";
+        spawnSync("curl", ["-L", "-o", "/usr/local/bin/cloudflared", url], { stdio: "pipe", timeout: 120000 });
+        spawnSync("chmod", ["+x", "/usr/local/bin/cloudflared"], { stdio: "pipe", timeout: 5000 });
+      }
+      const r = spawnSync("which", ["cloudflared"], { stdio: "pipe", timeout: 5000 });
+      if (r.status === 0) { log("cloudflared 安装完成", "OK"); return "cloudflared"; }
+    }
+  } catch (e) {
+    log(`自动安装失败: ${e.message}`, "ERR");
+  }
+  return null;
+}
+
 // ─── 确保 server.mjs 在运行 ──────────────────────────────────────────────
 async function ensureServer() {
   if (await isPortOpen(SERVER_PORT)) {
@@ -176,12 +226,26 @@ async function ensureServer() {
 function startTunnel() {
   if (isShuttingDown) return;
 
-  const cfPath = findCloudflared();
+  let cfPath = findCloudflared();
   if (!cfPath) {
-    log("未找到 cloudflared，请先安装", "ERR");
+    log("未找到 cloudflared，尝试自动安装...");
+    // 异步安装，不阻塞隧道循环
+    installCloudflared().then((installed) => {
+      if (installed) {
+        log("安装成功，正在启动隧道...");
+        doStartTunnel(installed);
+      } else {
+        log("自动安装失败，请手动安装 cloudflared", "ERR");
+      }
+    });
     return;
   }
 
+  doStartTunnel(cfPath);
+}
+
+function doStartTunnel(cfPath) {
+
   log("正在请求匿名公网入口...");
 
   cfProcess = spawn(cfPath, ["tunnel", "--url", `http://127.0.0.1:${SERVER_PORT}`], {
@@ -222,7 +286,11 @@ function startTunnel() {
     // 自动复活
     if (!isShuttingDown) {
       log("准备在 5 秒后自动重启隧道...", "WARN");
-      setTimeout(startTunnel, 5000);
+      setTimeout(() => {
+        const cf = findCloudflared();
+        if (cf) doStartTunnel(cf);
+        else startTunnel();
+      }, 5000);
     }
   });