dsh-pocket 1.0.6 → 1.0.8

package/client/api.js

@@ -40,6 +40,7 @@ export function redactStatus(s) {
     tunnelRunning: s?.tunnelRunning === true,
     tunnelUrl: s?.tunnelUrl ?? null,
     tunnelQr: s?.tunnelQr ?? null,
+    tunnelState: s?.tunnelState ?? { phase: 'idle' },
     dshPort: s?.dshPort ?? null,
   };
 }

package/client/client.js

@@ -68,6 +68,7 @@ function redactStatus(s) {
     tunnelRunning: s?.tunnelRunning === true,
     tunnelUrl: s?.tunnelUrl ?? null,
     tunnelQr: s?.tunnelQr ?? null,
+    tunnelState: s?.tunnelState ?? { phase: "idle" },
     dshPort: s?.dshPort ?? null
   };
 }
@@ -1303,6 +1304,7 @@ function PocketSettingsTab({ rpcCall }) {
   const [error, setError] = (0, import_react2.useState)(null);
   const [pushEnabled, setPushEnabled] = (0, import_react2.useState)(true);
   const [pushState, setPushState] = (0, import_react2.useState)("checking");
+  const [tunnelState, setTunnelState] = (0, import_react2.useState)(null);
   const [updateInfo, setUpdateInfo] = (0, import_react2.useState)(null);
   const call = async (endpoint, payload) => {
     const res = await rpcCall(endpoint, payload);
@@ -1311,7 +1313,9 @@ function PocketSettingsTab({ rpcCall }) {
   };
   const load = async () => {
     try {
-      setStatus(await call(POCKET_ENDPOINTS.status, {}));
+      const s = await call(POCKET_ENDPOINTS.status, {});
+      setStatus(s);
+      setTunnelState(s.tunnelState ?? null);
     } catch {
     }
   };
@@ -1376,6 +1380,7 @@ function PocketSettingsTab({ rpcCall }) {
   const startTunnel = async () => {
     setBusy(true);
     setError(null);
+    setTunnelState({ phase: "starting", detail: "\u6B63\u5728\u5F00\u542F\u2026", startedAt: Date.now() });
     try {
       setStatus(await call(POCKET_ENDPOINTS.tunnelStart, {}));
     } catch (err) {
@@ -1392,6 +1397,10 @@ function PocketSettingsTab({ rpcCall }) {
   };
   const lanUrl = status?.lanUrl;
   const tunnelUrl = status?.tunnelUrl;
+  const tunnelPhase = tunnelState?.phase ?? "idle";
+  const tunnelStarting = ["downloading", "starting", "registering"].includes(tunnelPhase);
+  const tunnelStateDetail = tunnelState?.detail ?? "";
+  const tunnelStateStarted = tunnelState?.startedAt ?? null;
   return (0, import_react2.createElement)(
     "div",
     { style: styles.card },
@@ -1445,8 +1454,12 @@ function PocketSettingsTab({ rpcCall }) {
       ) : (0, import_react2.createElement)(
         "div",
         null,
-        (0, import_react2.createElement)("button", { style: styles.primary, onClick: startTunnel, disabled: busy }, busy ? "\u5F00\u542F\u4E2D\u2026\uFF08\u9996\u6B21\u9700\u4E0B\u8F7D cloudflared\uFF09" : "\u5F00\u542F\u516C\u7F51\u8BBF\u95EE | Enable anywhere"),
-        (0, import_react2.createElement)("div", { style: styles.warn, marginTop: 8 }, "\u26A0\uFE0F DSH \u80FD\u6267\u884C\u7535\u8111\u4EE3\u7801\uFF1A\u4E8C\u7EF4\u7801/URL \u5C31\u662F\u94A5\u5319\uFF0C\u8BF7\u52FF\u53D1\u7ED9\u522B\u4EBA")
+        (0, import_react2.createElement)("button", { style: styles.primary, onClick: startTunnel, disabled: busy || tunnelStarting }, busy ? "\u5F00\u542F\u4E2D\u2026" : "\u5F00\u542F\u516C\u7F51\u8BBF\u95EE | Enable anywhere"),
+        tunnelStarting ? (0, import_react2.createElement)(
+          "div",
+          { style: { marginTop: 8, fontSize: 12, color: "var(--dsw-alias-label-secondary,#6b7280)" } },
+          `\u23F3 ${tunnelStateDetail}\uFF08\u5DF2\u7B49\u5F85 ${Math.floor((Date.now() - (tunnelStateStarted || Date.now())) / 1e3)} \u79D2\uFF09\u2026`
+        ) : (0, import_react2.createElement)("div", { style: styles.warn, marginTop: 8 }, "\u26A0\uFE0F DSH \u80FD\u6267\u884C\u7535\u8111\u4EE3\u7801\uFF1A\u4E8C\u7EF4\u7801/URL \u5C31\u662F\u94A5\u5319\uFF0C\u8BF7\u52FF\u53D1\u7ED9\u522B\u4EBA")
       )
     ),
     // Web Push 状态 + 开关

package/client/index.jsx

@@ -60,6 +60,7 @@ function PocketSettingsTab({ rpcCall }) {
   const [error, setError] = useState(null);
   const [pushEnabled, setPushEnabled] = useState(true); // 宿主开关
   const [pushState, setPushState] = useState('checking'); // checking|on|unsupported|insecure|off
+  const [tunnelState, setTunnelState] = useState(null); // 隧道进度 {phase, detail, startedAt}
   const [updateInfo, setUpdateInfo] = useState(null); // { current, latest, updating, result } | null
 
   const call = async (endpoint, payload) => {
@@ -69,7 +70,11 @@ function PocketSettingsTab({ rpcCall }) {
   };
 
   const load = async () => {
-    try { setStatus(await call(POCKET_ENDPOINTS.status, {})); } catch { /* 忽略瞬时失败 */ }
+    try {
+      const s = await call(POCKET_ENDPOINTS.status, {});
+      setStatus(s);
+      setTunnelState(s.tunnelState ?? null);
+    } catch { /* 忽略瞬时失败 */ }
   };
 
   useEffect(() => {
@@ -139,6 +144,7 @@ function PocketSettingsTab({ rpcCall }) {
   const startTunnel = async () => {
     setBusy(true);
     setError(null);
+    setTunnelState({ phase: 'starting', detail: '正在开启…', startedAt: Date.now() });
     try {
       setStatus(await call(POCKET_ENDPOINTS.tunnelStart, {}));
     } catch (err) {
@@ -154,6 +160,10 @@ function PocketSettingsTab({ rpcCall }) {
 
   const lanUrl = status?.lanUrl;
   const tunnelUrl = status?.tunnelUrl;
+  const tunnelPhase = tunnelState?.phase ?? 'idle';
+  const tunnelStarting = ['downloading', 'starting', 'registering'].includes(tunnelPhase);
+  const tunnelStateDetail = tunnelState?.detail ?? '';
+  const tunnelStateStarted = tunnelState?.startedAt ?? null;
 
   return h('div', { style: styles.card },
     h('div', null,
@@ -198,8 +208,11 @@ function PocketSettingsTab({ rpcCall }) {
           h('button', { style: styles.btn, onClick: stopTunnel }, '关闭公网 | Stop'),
         )
         : h('div', null,
-          h('button', { style: styles.primary, onClick: startTunnel, disabled: busy }, busy ? '开启中…（首次需下载 cloudflared）' : '开启公网访问 | Enable anywhere'),
-          h('div', { style: styles.warn, marginTop: 8 }, '⚠️ DSH 能执行电脑代码：二维码/URL 就是钥匙，请勿发给别人'),
+          h('button', { style: styles.primary, onClick: startTunnel, disabled: busy || tunnelStarting }, busy ? '开启中…' : '开启公网访问 | Enable anywhere'),
+          tunnelStarting
+            ? h('div', { style: { marginTop: 8, fontSize: 12, color: 'var(--dsw-alias-label-secondary,#6b7280)' } },
+              `⏳ ${tunnelStateDetail}（已等待 ${Math.floor((Date.now() - (tunnelStateStarted || Date.now())) / 1000)} 秒）…`)
+            : h('div', { style: styles.warn, marginTop: 8 }, '⚠️ DSH 能执行电脑代码：二维码/URL 就是钥匙，请勿发给别人'),
         ),
     ),
 

package/lib/index.js

@@ -70,6 +70,7 @@ export function apply(ctx, config = {}, internals = {}) {
   const service = internals.service ?? createPocketService({
     dshPort,
     port: internals.port ?? config.port ?? 3081,
+    home: internals.home,
     internals,
   });
 

package/lib/push.mjs

@@ -13,6 +13,9 @@
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
 
 const DATA_REL = join('dsh-pocket', 'push');
 const VAPID_FILE = 'vapid.json';
@@ -20,7 +23,7 @@ const SUBS_FILE = 'subscriptions.json';
 const SETTINGS_FILE = 'settings.json';
 
 function defaultWebPush() {
-  // 动态 require（web-push 是 CJS）
+  // web-push 是 CJS，ESM 里必须经 createRequire 加载
   return require('web-push');
 }
 

package/lib/service.mjs

@@ -39,6 +39,7 @@ function lanIPv4() {
 export function createPocketService({
   dshPort,
   port = 3081,
+  home,
   internals = {},
 } = {}) {
   const createProxy = internals.createProxy ?? createPocketProxy;
@@ -48,6 +49,8 @@ export function createPocketService({
   let proxy = null;
   let tunnel = null;
   let tunnelAbort = null;
+  /** 隧道进度：{ phase: idle|downloading|starting|registering|ready|error, detail, startedAt } */
+  const tunnelState = { phase: 'idle', detail: '', startedAt: null };
 
   return {
     /** 启动局域网代理（幂等）。 */
@@ -61,15 +64,30 @@ export function createPocketService({
       return proxy;
     },
 
-    /** 启动公网隧道（幂等；返回公网 URL）。 */
+    /** 启动公网隧道（幂等；返回公网 URL）。进度写进 tunnelState。 */
     async startTunnel() {
       await this.startProxy();
       if (tunnel) return tunnel.url;
       tunnelAbort = new AbortController();
-      const result = await startTunnel({ port: proxy.port, signal: tunnelAbort.signal });
-      // 归一化：startTunnel 契约返回 {url, kill}（字符串也兼容）
-      tunnel = typeof result === 'string' ? { url: result, kill: () => {} } : result;
-      return tunnel.url;
+      tunnelState.startedAt = Date.now();
+      const onPhase = (phase) => {
+        tunnelState.phase = phase;
+        if (phase === 'downloading') tunnelState.detail = '首次下载 cloudflared（约 20MB）| first run downloads cloudflared (~20MB)';
+        else if (phase === 'starting') tunnelState.detail = '启动隧道进程… | starting tunnel…';
+        else if (phase === 'registering') tunnelState.detail = '连接 Cloudflare 边缘（通常 5-30 秒）| connecting to Cloudflare edge (usually 5-30s)';
+        else if (phase === 'ready') tunnelState.detail = '隧道就绪 | ready';
+      };
+      try {
+        const result = await startTunnel({ port: proxy.port, home, signal: tunnelAbort.signal, onPhase });
+        // 归一化：startTunnel 契约返回 {url, kill}（字符串也兼容）
+        tunnel = typeof result === 'string' ? { url: result, kill: () => {} } : result;
+        tunnelState.phase = 'ready';
+        return tunnel.url;
+      } catch (err) {
+        tunnelState.phase = 'error';
+        tunnelState.detail = err?.message ?? String(err);
+        throw err;
+      }
     },
 
     /** 停止公网隧道（代理保持）。 */
@@ -78,6 +96,9 @@ export function createPocketService({
       tunnelAbort = null;
       if (tunnel) tunnel.kill();
       tunnel = null;
+      tunnelState.phase = 'idle';
+      tunnelState.detail = '';
+      tunnelState.startedAt = null;
     },
 
     /** 状态快照（RPC 返回，不含敏感信息；二维码 data URL 本地生成）。 */
@@ -94,6 +115,7 @@ export function createPocketService({
         tunnelRunning: tunnel !== null,
         tunnelUrl: tunnel?.url ?? null,
         tunnelQr: tunnel?.url ? await encode(tunnel.url) : null,
+        tunnelState: { ...tunnelState },
         dshPort,
       };
     },

package/lib/tunnel.mjs

@@ -4,8 +4,8 @@
 // 无密码模式：URL 即钥匙（dsh web 能执行代码，请勿把二维码/URL 发给别人）。
 
 import { spawn, execSync } from 'node:child_process';
-import { mkdtemp, chmod } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
+import { mkdir, access, chmod } from 'node:fs/promises';
+import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
 import { pipeline } from 'node:stream/promises';
 import { Readable } from 'node:stream';
@@ -51,28 +51,45 @@ function cloudflaredOnPath() {
   }
 }
 
-/** 拿一个可用的 cloudflared 路径（PATH 没有就下载到临时目录）。 */
-async function resolveCloudflared() {
+/**
+ * 拿一个可用的 cloudflared 路径。
+ * 优先：PATH 已有 → 直接用；否则用持久缓存（$DSH_HOME/dsh-pocket/cloudflared），
+ * 只有缓存缺失才下载——避免每次开启公网都重新下 20MB。
+ */
+export async function resolveCloudflared({ home, onPhase = () => {} } = {}) {
   if (cloudflaredOnPath()) return 'cloudflared';
-  const dir = await mkdtemp(join(tmpdir(), 'dsh-pocket-'));
-  return downloadCloudflared(join(dir, `cloudflared${platformBinary().ext}`));
+  const dshHome = home ?? process.env.DSH_HOME ?? join(homedir(), '.dsh');
+  const cacheDir = join(dshHome, 'dsh-pocket', 'bin');
+  const bin = join(cacheDir, `cloudflared${platformBinary().ext}`);
+  try {
+    await access(bin);
+    return bin; // 缓存命中，秒开
+  } catch { /* 缓存缺失，下载 */ }
+  onPhase('downloading');
+  await mkdir(cacheDir, { recursive: true });
+  const downloaded = await downloadCloudflared(bin);
+  return downloaded;
 }
 
 /**
  * 启动 cloudflared 快速隧道，返回公网 URL。
  * @param {object} opts
  * @param {number} opts.port  本机代理端口
+ * @param {string} [opts.home] $DSH_HOME（cloudflared 持久缓存）
  * @param {AbortSignal} [opts.signal]
+ * @param {(phase:string)=>void} [opts.onPhase] 进度回调：downloading→starting→registering→ready
  * @returns {Promise<{url:string, kill:()=>void}>}
  */
-export async function startQuickTunnel({ port, signal }) {
-  const bin = await resolveCloudflared();
+export async function startQuickTunnel({ port, home, signal, onPhase = () => {} }) {
+  const bin = await resolveCloudflared({ home, onPhase });
+  onPhase('starting');
   // 强制 HTTP/2（TCP 443）而不是默认的 QUIC（UDP 7844）：
   // 国内网络/部分企业网常屏蔽 UDP 7844，导致 tunnel 报 error 1033（Tunnel error）；
   // HTTP/2 走 443 更稳。若平台未来恢复 QUIC 可达，可去掉 --protocol http2。
   const child = spawn(bin, ['tunnel', '--url', `http://127.0.0.1:${port}`, '--protocol', 'http2', '--no-autoupdate'], {
     stdio: ['ignore', 'pipe', 'pipe'],
   });
+  onPhase('registering');
 
   const url = await new Promise((resolve, reject) => {
     let buf = '';
@@ -81,6 +98,7 @@ export async function startQuickTunnel({ port, signal }) {
       const m = buf.match(QUICK_TUNNEL_URL_RE);
       if (m) {
         cleanup();
+        onPhase('ready');
         resolve(m[0]);
       }
     };

package/package.json

@@ -77,5 +77,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.0.6"
+  "version": "1.0.8"
 }