dsh-pocket 1.0.29 → 1.2.0

package/README.en.md

@@ -121,7 +121,10 @@ Such tools take over all traffic and often cut cloudflared's tunnel-edge connect
 
 **Other causes**: corporate firewalls / campus networks blocking outbound — ask IT to allow it, or use a hotspot.
 
-**First run: "Downloading cloudflared" fails or hangs**: cloudflared (~20MB) downloads from GitHub releases, which is often unreachable from mainland China. The plugin tries several GitHub acceleration mirrors in order; if all fail, the settings page shows a hint. Alternatives (any one):
+**First run: "Downloading cloudflared" fails or hangs**:
+- **macOS/Linux**: the plugin first downloads from the **Tsinghua mirror** (measured ~3MB/s, done in seconds); falls back to official GitHub + acceleration mirrors if it fails.
+- **Windows**: no Tsinghua mirror (Homebrew doesn't support Windows) — downloads the ~50MB exe from GitHub directly; **single-threaded, so it's slower — that's expected**, wait a few minutes, or use a proxy.
+- If all sources fail, the settings page shows a hint. Alternatives (any one):
 1. Install the `cloudflared` command and retry (the plugin then uses the PATH binary, no download):
    - macOS: `brew install cloudflared`; Linux: `sudo apt install cloudflared` or from the official site
    - Windows: `winget install cloudflared` or from the official site

package/README.md

@@ -122,7 +122,10 @@ npx @deepseek-ai/dsh web
 
 **其他可能**：企业防火墙/校园网拦截出站；此时请让 IT 放行或改用热点。
 
-**首次开启时「下载 cloudflared」失败/卡住**：cloudflared 从 GitHub 发布页下载（约 20MB），国内直连经常失败。插件会自动依次尝试多个 GitHub 加速镜像；全部失败时设置页会给出提示。备选方案（任选其一）：
+**首次开启时「下载 cloudflared」失败/卡住**：
+- **macOS/Linux**：优先走**清华镜像**（实测 ~3MB/s，几秒下完）；失败自动回退官方 GitHub + 加速源。
+- **Windows**：无清华镜像（Homebrew 不支持 Windows），走官方直连下载（约 50MB，**单线程会慢，属正常**，耐心等几分钟；也可挂代理加速）。
+- 全部失败时设置页会给出提示。备选方案（任选其一）：
 1. 手动装好命令行 cloudflared 后重试（装好后 dsh-pocket 直接用 PATH 里的，不再下载）：
    - macOS：`brew install cloudflared`；Linux：`sudo apt install cloudflared` 或官网下载
    - Windows：`winget install cloudflared` 或官网下载

package/lib/tunnel.mjs

@@ -36,10 +36,114 @@ const CLOUDFLARED_MIRRORS = [
 
 const TUNA_BOTTLES = 'https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles/';
 
+/** 多线程分块下载的并发段数（Windows 官方源单线程 ~200KB/s，8 并发 ≈ 1.6MB/s）。 */
+const PARALLEL_SEGMENTS = 8;
+/** 小于该字节数的文件不值得分块（直接用单线程）。 */
+const MIN_PARALLEL_SIZE = 8 * 1024 * 1024;
+/** 探针大小：单线程先下这么多测速。 */
+const PROBE_SIZE = 2 * 1024 * 1024;
+/** 探针测速阈值（bytes/ms）：低于它认为慢网络，切多线程。300KB/s = 0.3。 */
+const SLOW_SPEED_THRESHOLD = 0.3;
+
 function hostOf(url) {
   try { return new URL(url).host; } catch { return url; }
 }
 
+/** 合并多个分段文件为一个目标文件（顺序拼接后统一结束）。 */
+async function mergeParts(partFiles, dest) {
+  const { createReadStream } = await import('node:fs');
+  const out = createWriteStream(dest);
+  try {
+    for (const f of partFiles) {
+      await new Promise((resolve, reject) => {
+        const rs = createReadStream(f);
+        rs.on('error', reject);
+        rs.pipe(out, { end: false });
+        rs.on('end', resolve);
+      });
+    }
+  } finally {
+    await new Promise((r) => out.end(r));
+  }
+}
+
+/**
+ * 下载文件到 dest（自适应）：
+ * 1. 服务器不支持 Range 或文件小 → 单线程；
+ * 2. 单线程下载探针（PROBE_SIZE）测速——速度够快 → 继续单线程（多线程在部分网络/
+ *    服务器上反而更慢，如 GitHub CDN 并发限速）；
+ * 3. 探针速度低于阈值（典型慢网络，如 Windows 用户官方源 ~200KB/s）→ 丢弃探针，
+ *    改 8 段并发分块（可把 200KB/s 拉到 1.6MB/s）。
+ * 返回实际下载字节数。
+ */
+export async function downloadFile(url, dest, { signal, segments = PARALLEL_SEGMENTS } = {}) {
+  // HEAD 探测：Content-Length + Accept-Ranges
+  let head = null;
+  try { head = await fetch(url, { method: 'HEAD', signal }); } catch { head = null; }
+  const len = head ? Number(head.headers.get('content-length') || 0) : 0;
+  const acceptsRanges = head ? String(head.headers.get('accept-ranges') || '').toLowerCase() === 'bytes' : false;
+
+  if (!head || !acceptsRanges || len < MIN_PARALLEL_SIZE) {
+    // 单线程
+    const res = await fetch(url, { signal });
+    if (!res.ok) throw new Error(`HTTP ${res.status}`);
+    await pipeline(Readable.fromWeb(res.body), createWriteStream(dest));
+    return len || 0;
+  }
+
+  // 探针测速：单线程下载前 PROBE_SIZE，计时
+  const probeBytes = Math.min(PROBE_SIZE, len);
+  const probeStart = Date.now();
+  try {
+    const probeRes = await fetch(url, { signal, headers: { Range: `bytes=0-${probeBytes - 1}` } });
+    if (!probeRes.ok) throw new Error(`HTTP ${probeRes.status} (probe)`);
+    const probeBody = await probeRes.arrayBuffer();
+    const probeMs = Date.now() - probeStart;
+    const probeSpeed = probeMs > 0 ? probeBytes / probeMs : Infinity; // bytes/ms
+    if (probeMs < 500 || probeSpeed >= SLOW_SPEED_THRESHOLD) {
+      // 够快 → 单线程下完剩余部分（探针字节已拿到，写入 dest）
+      const { createWriteStream, createReadStream } = await import('node:fs');
+      const w = createWriteStream(dest);
+      await new Promise((resolve, reject) => {
+        w.on('error', reject);
+        w.write(Buffer.from(probeBody));
+        w.end(resolve);
+      });
+      const restRes = await fetch(url, { signal, headers: { Range: `bytes=${probeBytes}-${len - 1}` } });
+      if (!restRes.ok) throw new Error(`HTTP ${restRes.status} (rest)`);
+      await pipeline(Readable.fromWeb(restRes.body), createWriteStream(dest, { flags: 'a' }));
+      return len;
+    }
+    // 慢 → 丢弃探针，转分块并发（从 0 开始全量分块）
+    await rm(dest, { force: true }).catch(() => {});
+  } catch (err) {
+    await rm(dest, { force: true }).catch(() => {});
+    if (!/HTTP|fetch/i.test(String(err?.message ?? ''))) throw err; // 探针网络异常 → 抛给上层换源
+    // 探针 HTTP 错误（部分服务器 HEAD 与 GET 行为不一致）→ 直接分块
+  }
+
+  // 分块并发
+  const parts = [];
+  const chunk = Math.ceil(len / segments);
+  for (let i = 0; i < segments; i++) {
+    const start = i * chunk;
+    const end = i === segments - 1 ? len - 1 : Math.min(start + chunk - 1, len - 1);
+    if (start > end) break;
+    parts.push({ start, end, file: `${dest}.part${i}` });
+  }
+  try {
+    await Promise.all(parts.map(async (p) => {
+      const res = await fetch(url, { signal, headers: { Range: `bytes=${p.start}-${p.end}` } });
+      if (!res.ok) throw new Error(`HTTP ${res.status} (range ${p.start}-${p.end})`);
+      await pipeline(Readable.fromWeb(res.body), createWriteStream(p.file));
+    }));
+    await mergeParts(parts.map((p) => p.file), dest);
+  } finally {
+    await Promise.all(parts.map((p) => rm(p.file, { force: true }).catch(() => {})));
+  }
+  return len;
+}
+
 /**
  * 清华 TUNA 镜像的 cloudflared Homebrew bottle URL（国内 CDN，实测 ~3MB/s）。
  * 只覆盖 macOS/Linux（Windows 无 Homebrew bottle，返回 null）。
@@ -93,9 +197,9 @@ async function downloadCloudflared(binPath, signal) {
     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(tmpFile));
+      // 多线程分块（官方 GitHub 支持 Range，Windows 50MB 从几分钟降到几十秒）；
+      // 不支持 Range 的源自动回退单线程
+      await downloadFile(url, tmpFile, { signal: fetchSignal });
       // 简单校验：空文件/极小文件视为下载失败（可能是镜像返回了错误页）
       const st = await stat(tmpFile);
       if (st.size < 1024 * 1024) throw new Error(`文件异常小（${st.size} 字节），疑似镜像错误页`);

package/package.json

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