dsh-pocket 1.0.28 → 1.0.29

package/lib/tunnel.mjs

@@ -4,7 +4,7 @@
 // 无密码模式：URL 即钥匙（dsh web 能执行代码，请勿把二维码/URL 发给别人）。
 
 import { spawn, execSync } from 'node:child_process';
-import { mkdir, access, chmod, rm, stat } from 'node:fs/promises';
+import { mkdir, access, chmod, rm, stat, rename, cp } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
 import { pipeline } from 'node:stream/promises';
@@ -21,68 +21,146 @@ function platformBinary() {
 }
 
 /**
- * cloudflared 下载源（依次尝试）。
- * 官方源在国内直连经常失败（GitHub releases 被墙/不稳定），
- * 后面几个是常见的 GitHub 加速镜像——多源尝试提高国内成功率。
+ * cloudflared 下载源。
+ * 优先：清华 TUNA 镜像的 Homebrew bottle（国内 CDN，实测 ~3MB/s）——仅 macOS/Linux
+ * 且有对应 bottle 时可用（Windows 无 Homebrew，自动跳过）。
+ * 兜底：官方 GitHub + 国内加速源（ghproxy.net / gh.ddlc.top / gh-proxy.com，2026-08
+ * 实测可达）。npmmirror（淘宝）没有 cloudflared 镜像（已实测 404）。
  */
 const CLOUDFLARED_MIRRORS = [
   (asset) => `https://github.com/cloudflare/cloudflared/releases/latest/download/${asset}`,
-  (asset) => `https://ghfast.top/https://github.com/cloudflare/cloudflared/releases/latest/download/${asset}`,
+  (asset) => `https://ghproxy.net/https://github.com/cloudflare/cloudflared/releases/latest/download/${asset}`,
+  (asset) => `https://gh.ddlc.top/https://github.com/cloudflare/cloudflared/releases/latest/download/${asset}`,
   (asset) => `https://gh-proxy.com/https://github.com/cloudflare/cloudflared/releases/latest/download/${asset}`,
-  (asset) => `https://mirror.ghproxy.com/https://github.com/cloudflare/cloudflared/releases/latest/download/${asset}`,
 ];
 
+const TUNA_BOTTLES = 'https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles/';
+
 function hostOf(url) {
   try { return new URL(url).host; } catch { return url; }
 }
 
+/**
+ * 清华 TUNA 镜像的 cloudflared Homebrew bottle URL（国内 CDN，实测 ~3MB/s）。
+ * 只覆盖 macOS/Linux（Windows 无 Homebrew bottle，返回 null）。
+ * 匹配按 CPU 架构取清华目录里版本号最新的 bottle——Homebrew 构建时部署目标
+ * 设得较老、向后兼容，所以旧系统（如 Ventura）也能用新一点的 bottle。
+ * 抓目录失败/无匹配 → null（调用方回退 GitHub/加速源，不影响可用性）。
+ */
+async function tsinghuaBottleUrl({ os, a }) {
+  if (os !== 'darwin' && os !== 'linux') return null;
+  let res;
+  try {
+    res = await fetch(TUNA_BOTTLES, { signal: AbortSignal.timeout(20_000) });
+  } catch { return null; }
+  if (!res.ok) return null;
+  let html;
+  try { html = await res.text(); } catch { return null; }
+  // macOS: arm64_<代号> 或 <代号>（Intel 无前缀），代号白名单排除 linux；Linux: arm64_linux / x86_64_linux
+  const MACOS_CODES = 'monterey|ventura|sonoma|sequoia|tahoe';
+  const pattern = os === 'darwin'
+    ? new RegExp(`cloudflared-([0-9.]+)\\.${a === 'arm64' ? 'arm64_' : ''}(${MACOS_CODES})\\.bottle\\.tar\\.gz`, 'g')
+    : new RegExp(`cloudflared-([0-9.]+)\\.${a === 'arm64' ? 'arm64' : 'x86_64'}_linux\\.bottle\\.tar\\.gz`, 'g');
+  let best = null;
+  let bestV = '';
+  for (const m of html.matchAll(pattern)) {
+    if (m[1] > bestV) { bestV = m[1]; best = m[0]; }
+  }
+  return best ? `${TUNA_BOTTLES}${best}` : null;
+}
+
 async function downloadCloudflared(binPath, signal) {
   const { os, a, ext } = platformBinary();
-  // cloudflared 新版发布资产是 .tgz 压缩包（内含 cloudflared 二进制）
-  const asset = `cloudflared-${os}-${a}.tgz`;
   const dir = dirname(binPath);
-  const tgz = join(dir, `cloudflared.tgz`);
+  const tmpFile = join(dir, `cloudflared.download`);
+  const isWindows = os === 'windows';
+  // 发布资产：Windows 是 .exe（下载即二进制），macOS/Linux 是 .tgz（需解压）
+  const asset = isWindows ? `cloudflared-windows-${a}.exe` : `cloudflared-${os}-${a}.tgz`;
   const fetchSignal = signal
-    ? AbortSignal.any([signal, AbortSignal.timeout(90_000)])
-    : AbortSignal.timeout(90_000);
+    ? AbortSignal.any([signal, AbortSignal.timeout(120_000)])
+    : AbortSignal.timeout(120_000);
+
+  // 构建有序源列表：[{url, host}]；清华（如有，仅 macOS/Linux）排第一，再官方 + 加速源
+  const sources = [];
+  if (!isWindows) {
+    const tua = await tsinghuaBottleUrl({ os, a }).catch(() => null);
+    if (tua) sources.push({ url: tua, host: 'mirrors.tuna.tsinghua.edu.cn' });
+  }
+  for (const m of CLOUDFLARED_MIRRORS) sources.push({ url: m(asset), host: hostOf(m(asset)) });
 
   let lastErr = null;
-  for (let i = 0; i < CLOUDFLARED_MIRRORS.length; i++) {
-    const url = CLOUDFLARED_MIRRORS[i](asset);
-    console.log(`⬇️  下载 cloudflared（${i + 1}/${CLOUDFLARED_MIRRORS.length}：${hostOf(url)}）…`);
+  for (let i = 0; i < sources.length; i++) {
+    const { url, host } = sources[i];
+    console.log(`⬇️  下载 cloudflared（${i + 1}/${sources.length}：${host}）…`);
     try {
       const res = await fetch(url, { signal: fetchSignal });
       if (!res.ok) throw new Error(`HTTP ${res.status}`);
-      await pipeline(Readable.fromWeb(res.body), createWriteStream(tgz));
+      await pipeline(Readable.fromWeb(res.body), createWriteStream(tmpFile));
       // 简单校验：空文件/极小文件视为下载失败（可能是镜像返回了错误页）
-      const st = await stat(tgz);
+      const st = await stat(tmpFile);
       if (st.size < 1024 * 1024) throw new Error(`文件异常小（${st.size} 字节），疑似镜像错误页`);
       lastErr = null;
       break; // 下载成功
     } catch (err) {
       lastErr = err;
-      await rm(tgz, { force: true }).catch(() => {}); // 清掉半截文件
+      await rm(tmpFile, { force: true }).catch(() => {}); // 清掉半截文件
       console.warn(`  ⚠️ 源 ${i + 1} 失败：${err?.message ?? err}，尝试下一个…`);
     }
   }
   if (lastErr) {
     throw new Error(
-      `cloudflared 下载失败：所有镜像源都不通（最后错误：${lastErr?.message ?? lastErr}）。`
-      + `可手动安装后重试：npm i -g cloudflared（装好命令行 cloudflared 即可，无需下载）；`
-      + `或开启代理/换网络后重试 | all mirrors failed — install cloudflared manually: npm i -g cloudflared, then retry`,
+      `cloudflared 下载失败：所有源都不通（最后错误：${lastErr?.message ?? lastErr}）。`
+      + (isWindows
+        ? `Windows 可手动安装后重试：winget install cloudflared；或下载 ${asset} 放到 ${dir} 目录 | download failed — try: winget install cloudflared, or put the exe into ${dir}`
+        : `可手动安装后重试：npm i -g cloudflared（装好命令行 cloudflared 即可，无需下载）；或开启代理/换网络后重试 | all mirrors failed — install cloudflared manually: npm i -g cloudflared, then retry`),
     );
   }
 
-  // 解压 tar.gz → 目录下的 cloudflared 二进制
-  await new Promise((resolve, reject) => {
-    const child = spawn('tar', ['-xzf', tgz, '-C', dir], { stdio: 'ignore' });
-    child.once('exit', (code) => code === 0 ? resolve() : reject(new Error(`cloudflared 解压失败（code=${code}）`)));
-    child.once('error', reject);
-  });
-  const extracted = join(dir, `cloudflared${ext}`);
-  if (os !== 'windows') await chmod(extracted, 0o755);
-  // 解压成功就删掉 ~20MB 的 tgz，避免长期占用缓存目录
-  await rm(tgz, { force: true }).catch(() => {});
+  let extracted = join(dir, `cloudflared${ext}`);
+  if (isWindows) {
+    // Windows：exe 直接就是二进制，无需解压
+    await rename(tmpFile, extracted).catch(async () => {
+      await cp(tmpFile, extracted).catch(() => {});
+    });
+  } else {
+    // 解压到独立临时子目录（bottle 解压产物会占用 cacheDir/cloudflared 这个名字，
+    // 直接解压到 dir 会让目标路径变成目录，rename 失败）
+    const extractDir = join(dir, `.extract-${process.pid}-${Date.now()}`);
+    await mkdir(extractDir, { recursive: true });
+    try {
+      await new Promise((resolve, reject) => {
+        const child = spawn('tar', ['-xzf', tmpFile, '-C', extractDir], { stdio: 'ignore' });
+        child.once('exit', (code) => code === 0 ? resolve() : reject(new Error(`cloudflared 解压失败（code=${code}）`)));
+        child.once('error', reject);
+      });
+      // 找真实的二进制**文件**（排除目录）：
+      // - GitHub tgz：extractDir/cloudflared
+      // - Homebrew bottle（清华）：extractDir/cloudflared/<版本>/bin/cloudflared
+      const { readdir } = await import('node:fs/promises');
+      let found = null;
+      const direct = join(extractDir, `cloudflared${ext}`);
+      try { if ((await stat(direct)).isFile()) found = direct; } catch { /* 不存在 */ }
+      if (!found) {
+        const verDir = join(extractDir, 'cloudflared');
+        try {
+          const vers = await readdir(verDir);
+          for (const v of vers) {
+            const bin = join(verDir, v, 'bin', `cloudflared${ext}`);
+            try { if ((await stat(bin)).isFile()) { found = bin; break; } } catch { /* 继续 */ }
+          }
+        } catch { /* 无此目录 */ }
+      }
+      if (!found) throw new Error('cloudflared 解压成功但未找到二进制 | binary not found after extract');
+      if (found !== extracted) {
+        await rename(found, extracted).catch(async () => { await cp(found, extracted).catch(() => {}); });
+      }
+    } finally {
+      await rm(extractDir, { recursive: true, force: true }).catch(() => {});
+    }
+  }
+  if (!isWindows) await chmod(extracted, 0o755);
+  // 解压/搬移完成就删掉临时下载文件，避免长期占用缓存目录
+  await rm(tmpFile, { force: true }).catch(() => {});
   return extracted;
 }
 
@@ -104,6 +182,8 @@ let downloading = null;
  * 优先：PATH 已有 → 直接用；否则用持久缓存（$DSH_HOME/dsh-pocket/cloudflared），
  * 只有缓存缺失才下载——避免每次开启公网都重新下 20MB。
  */
+export { tsinghuaBottleUrl };
+
 export async function resolveCloudflared({ home, onPhase = () => {}, signal } = {}) {
   if (cloudflaredOnPath()) return 'cloudflared';
   const dshHome = home ?? process.env.DSH_HOME ?? join(homedir(), '.dsh');

package/package.json

@@ -76,5 +76,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.0.28"
+  "version": "1.0.29"
 }