dsh-pocket 1.0.27 → 1.0.29

package/README.en.md

@@ -90,10 +90,10 @@ On the same page click "**Enable anywhere**" → wait for the tunnel (first run
 | `dsh: command not found` / "DSH is not defined" | dsh CLI missing: `npm install -g @deepseek-ai/dsh`, or prefix commands with `npx @deepseek-ai/dsh` |
 | `ERR_PNPM_ADDING_TO_ROOT` | pnpm 9 workspace-root restriction: append `-w` (`--workspace-root`) to install/update commands |
 | Nothing changed after install/update | **You must restart `dsh web`**; the running process still loads the old code |
-| `listen EADDRINUSE ... :3081` | A stale dsh-pocket process holds the port: `lsof -ti :3081 \| xargs kill -9`, then retry |
+| `listen EADDRINUSE ... :3081` | A stale dsh-pocket process holds the port: macOS/Linux `lsof -ti :3081 \| xargs kill -9`; Windows `netstat -ano \| findstr :3081` (find the LISTENING PID) → `taskkill /PID <PID> /F`, then retry |
 | Version stuck below 1.x | `^0.x` ranges never jump to 1.x: update with `--latest` (`dsh plugin --profile web update dsh-pocket --latest -w`) |
 | Public `error 1033` | See "Public tunnel troubleshooting" below — usually a local proxy/VPN (Clash etc. TUN mode) killing the tunnel |
-| After "Restart dsh web", the page says the process is running in the background | The new process from in-page self-restart is a detached background process (not attached to your terminal) — that's the standard way to apply updates in-page; stop it with `lsof -ti :3080 \| xargs kill -9` (logs under `$DSH_HOME` as `dsh-pocket-restart-*.log`) |
+| After "Restart dsh web", the page says the process is running in the background | The new process from in-page self-restart is a detached background process (not attached to your terminal) — that's the standard way to apply updates in-page; stop it: macOS/Linux `lsof -ti :3080 \| xargs kill -9`; Windows `netstat -ano \| findstr :3080` → `taskkill /PID <PID> /F` (logs under `$DSH_HOME` as `dsh-pocket-restart-*.log`) |
 
 ## ⚠️ Public tunnel troubleshooting (read first)
 
@@ -121,6 +121,14 @@ 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):
+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
+   - Any platform: `npm i -g cloudflared`
+2. Enable a proxy (system proxy / Clash etc.) and click "Enable anywhere" again
+3. Manually download the binary into `$DSH_HOME/dsh-pocket/bin/` (`$DSH_HOME` is usually `~/.dsh`, on Windows `%USERPROFILE%\.dsh`)
+
 ## 🗂 Architecture (single package)
 
 | File | Purpose |

package/README.md

@@ -90,10 +90,10 @@ npx @deepseek-ai/dsh web
 | `dsh: command not found` / 提示 DSH 未定义 | dsh CLI 没装：`npm install -g @deepseek-ai/dsh`，或命令前加 `npx @deepseek-ai/dsh` |
 | `ERR_PNPM_ADDING_TO_ROOT` | pnpm 9 对 workspace 根的限制：安装/更新命令**末尾加 `-w`**（`--workspace-root`） |
 | 装完/更新了但界面没变化 | **必须重启 `dsh web`** 才生效；运行中的进程仍加载旧代码 |
-| `listen EADDRINUSE ... :3081` | 旧 dsh-pocket 进程还占着端口：`lsof -ti :3081 \| xargs kill -9` 后重试 |
+| `listen EADDRINUSE ... :3081` | 旧 dsh-pocket 进程还占着端口：macOS/Linux `lsof -ti :3081 \| xargs kill -9`；Windows `netstat -ano \| findstr :3081`（找 LISTENING 的 PID）→ `taskkill /PID <PID> /F`，后重试 |
 | 版本停在 0.x 升不上去 | `^0.x` 范围不允许升到 1.x：更新用 `--latest`（`dsh plugin --profile web update dsh-pocket --latest -w`） |
 | 公网 `error 1033` | 见下方「公网隧道常见问题」——多半是本机代理/VPN（Clash 等 TUN 模式）掐断了隧道 |
-| 点「重启 dsh web」后页面提示进程在后台运行 | 自重启的新进程是 detached 后台进程（不挂终端），是页内更新的标准做法；停止它：`lsof -ti :3080 \| xargs kill -9`（日志在 `$DSH_HOME` 下 `dsh-pocket-restart-*.log`） |
+| 点「重启 dsh web」后页面提示进程在后台运行 | 自重启的新进程是 detached 后台进程（不挂终端），是页内更新的标准做法；停止它：macOS/Linux `lsof -ti :3080 \| xargs kill -9`；Windows `netstat -ano \| findstr :3080` → `taskkill /PID <PID> /F`（日志在 `$DSH_HOME` 下 `dsh-pocket-restart-*.log`） |
 
 ## ⚠️ 公网隧道常见问题（必读）
 
@@ -122,6 +122,14 @@ npx @deepseek-ai/dsh web
 
 **其他可能**：企业防火墙/校园网拦截出站；此时请让 IT 放行或改用热点。
 
+**首次开启时「下载 cloudflared」失败/卡住**：cloudflared 从 GitHub 发布页下载（约 20MB），国内直连经常失败。插件会自动依次尝试多个 GitHub 加速镜像；全部失败时设置页会给出提示。备选方案（任选其一）：
+1. 手动装好命令行 cloudflared 后重试（装好后 dsh-pocket 直接用 PATH 里的，不再下载）：
+   - macOS：`brew install cloudflared`；Linux：`sudo apt install cloudflared` 或官网下载
+   - Windows：`winget install cloudflared` 或官网下载
+   - 任何平台：`npm i -g cloudflared`
+2. 挂代理（系统代理/Clash 等）后重新点「开启公网访问」
+3. 手动下载二进制放到 `$DSH_HOME/dsh-pocket/bin/` 目录（`$DSH_HOME` 一般是 `~/.dsh`，Windows 是 `%USERPROFILE%\.dsh`）
+
 ## 🗂 架构（单包）
 
 | 文件 | 说明 |

package/client/client.js

@@ -1439,7 +1439,7 @@ function PocketSettingsTab({ rpcCall }) {
         (0, import_react2.createElement)("div", { style: { fontWeight: 600, fontSize: 13 } }, "\u{1F504} \u5DF2\u91CD\u542F | Restarted"),
         (0, import_react2.createElement)("button", { style: styles.btn, onClick: () => setRestartNotice(false) }, "\u77E5\u9053\u4E86 | OK")
       ),
-      (0, import_react2.createElement)("div", { style: styles.muted, marginTop: 4, wordBreak: "break-all" }, `\u8FDB\u7A0B\u5728\u540E\u53F0\u8FD0\u884C\uFF08\u4E0D\u6302\u7EC8\u7AEF\uFF09\u3002\u5982\u9700\u505C\u6B62\uFF1Alsof -ti :${status?.dshPort ?? 3080} | xargs kill -9`)
+      (0, import_react2.createElement)("div", { style: styles.muted, marginTop: 4, wordBreak: "break-all" }, `\u8FDB\u7A0B\u5728\u540E\u53F0\u8FD0\u884C\uFF08\u4E0D\u6302\u7EC8\u7AEF\uFF09\u3002\u5982\u9700\u505C\u6B62\uFF1A${status?.killHint ?? `lsof -ti :${status?.dshPort ?? 3080} | xargs kill -9`}`)
     ) : null,
     // 更新提示——左侧黄色色条（提示有新版本）；单状态：有更新/更新中/已更新自动重启，不并存
     updateInfo ? (0, import_react2.createElement)(

package/client/index.jsx

@@ -168,7 +168,7 @@ function PocketSettingsTab({ rpcCall }) {
         h('div', { style: { fontWeight: 600, fontSize: 13 } }, '🔄 已重启 | Restarted'),
         h('button', { style: styles.btn, onClick: () => setRestartNotice(false) }, '知道了 | OK'),
       ),
-      h('div', { style: styles.muted, marginTop: 4, wordBreak: 'break-all' }, `进程在后台运行（不挂终端）。如需停止：lsof -ti :${status?.dshPort ?? 3080} | xargs kill -9`),
+      h('div', { style: styles.muted, marginTop: 4, wordBreak: 'break-all' }, `进程在后台运行（不挂终端）。如需停止：${status?.killHint ?? `lsof -ti :${status?.dshPort ?? 3080} | xargs kill -9`}`),
     ) : null,
 
     // 更新提示——左侧黄色色条（提示有新版本）；单状态：有更新/更新中/已更新自动重启，不并存

package/lib/tunnel.mjs

@@ -4,7 +4,7 @@
 // 无密码模式：URL 即钥匙（dsh web 能执行代码，请勿把二维码/URL 发给别人）。
 
 import { spawn, execSync } from 'node:child_process';
-import { mkdir, access, chmod, rm } 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';
@@ -20,30 +20,147 @@ function platformBinary() {
   return { os, a, ext: os === 'windows' ? '.exe' : '' };
 }
 
+/**
+ * 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://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}`,
+];
+
+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 url = `https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-${os}-${a}.tgz`;
-  console.log(`⬇️  正在下载 cloudflared（首次运行，之后跳过）…`);
-  // 同时响应外部 abort（用户点停止）与 180s 兜底超时
-  const fetchSignal = signal
-    ? AbortSignal.any([signal, AbortSignal.timeout(180_000)])
-    : AbortSignal.timeout(180_000);
-  const res = await fetch(url, { signal: fetchSignal });
-  if (!res.ok) throw new Error(`cloudflared 下载失败（HTTP ${res.status}）`);
   const dir = dirname(binPath);
-  const tgz = join(dir, `cloudflared.tgz`);
-  await pipeline(Readable.fromWeb(res.body), createWriteStream(tgz));
-  // 解压 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(() => {});
+  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(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 < 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(tmpFile));
+      // 简单校验：空文件/极小文件视为下载失败（可能是镜像返回了错误页）
+      const st = await stat(tmpFile);
+      if (st.size < 1024 * 1024) throw new Error(`文件异常小（${st.size} 字节），疑似镜像错误页`);
+      lastErr = null;
+      break; // 下载成功
+    } catch (err) {
+      lastErr = err;
+      await rm(tmpFile, { force: true }).catch(() => {}); // 清掉半截文件
+      console.warn(`  ⚠️ 源 ${i + 1} 失败：${err?.message ?? err}，尝试下一个…`);
+    }
+  }
+  if (lastErr) {
+    throw new Error(
+      `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`),
+    );
+  }
+
+  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;
 }
 
@@ -65,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/lib/web-rpc.js

@@ -16,6 +16,14 @@ function fail(code, message) {
   return { ok: false, error: { code: 'bad-request', message, details: { issues: [{ message }] } } };
 }
 
+/** 各平台停止 dsh web 进程的命令（Windows 没有 lsof/kill）。 */
+export function killHint(port) {
+  if (process.platform === 'win32') {
+    return `netstat -ano | findstr :${port}（找 LISTENING 的 PID）→ taskkill /PID <PID> /F`;
+  }
+  return `lsof -ti :${port} | xargs kill -9`;
+}
+
 /** 注册 /dsh-pocket 逻辑通道（仅本机 loopback 可调）。 */
 export function installPocketRpc(ctx, { service, log = console, runUpdate = null, restart = null, restartNotice = null }) {
   if (!ctx?.connection?.rpc?.handle) {
@@ -25,11 +33,12 @@ export function installPocketRpc(ctx, { service, log = console, runUpdate = null
   return ctx.connection.rpc.handle(POCKET_RPC_CHANNEL, async (endpoint, payload = {}, signal) => {
     if (signal?.aborted) return fail('cancelled', 'The request was cancelled.');
 
-    // status 响应：redact 后的服务状态 + 重启提示（重启后 30 分钟内有效）
+    // status 响应：redact 后的服务状态 + 重启提示（重启后 30 分钟内有效）+ 停止命令（按平台）
     const statusPayload = async () => {
       let notice = null;
       try { notice = (await restartNotice?.()) ?? null; } catch { notice = null; }
-      return ok({ ...redactStatus(await service.status()), restartNotice: notice });
+      const s = await service.status();
+      return ok({ ...redactStatus(s), restartNotice: notice, killHint: killHint(s.dshPort ?? 3080) });
     };
 
     try {
@@ -65,7 +74,7 @@ export function installPocketRpc(ctx, { service, log = console, runUpdate = null
           return fail('bad-request', `重启失败：${result?.error ?? '未知'} | restart failed`);
         }
         const dshPort = service.dshPort ?? 3080;
-        return ok({ ...result, hint: `重启后进程在后台运行；如需停止：lsof -ti :${dshPort} | xargs kill -9` });
+        return ok({ ...result, hint: `重启后进程在后台运行；如需停止：${killHint(dshPort)}` });
       }
       return fail('bad-request', `Unknown endpoint: ${endpoint}`);
     } catch (err) {

package/package.json

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