dsh-pocket 1.0.23 → 1.0.25

package/client/client.js

@@ -55,7 +55,21 @@ function compareVersions(a, b) {
   if (!aPre && !bPre) return 0;
   if (!aPre) return 1;
   if (!bPre) return -1;
-  return aPre < bPre ? -1 : aPre > bPre ? 1 : 0;
+  const aParts = aPre.slice(1).split(".");
+  const bParts = bPre.slice(1).split(".");
+  const len = Math.max(aParts.length, bParts.length);
+  for (let i = 0; i < len; i++) {
+    const ax = aParts[i] ?? "";
+    const bx = bParts[i] ?? "";
+    if (ax === bx) continue;
+    const aNum = /^\d+$/.test(ax);
+    const bNum = /^\d+$/.test(bx);
+    if (aNum && bNum) return Number(ax) - Number(bx);
+    if (aNum) return 1;
+    if (bNum) return -1;
+    return ax < bx ? -1 : 1;
+  }
+  return 0;
 }
 function redactStatus(s) {
   return {
@@ -1287,7 +1301,10 @@ function PocketSettingsTab({ rpcCall }) {
       const s = await call(POCKET_ENDPOINTS.status, {});
       setStatus(s);
       setTunnelState(s.tunnelState ?? null);
-      if (s.restartNotice) setRestartNotice(true);
+      if (s.restartNotice) {
+        setRestartNotice(true);
+        setUpdateInfo(null);
+      }
     } catch {
     }
   };
@@ -1319,10 +1336,14 @@ function PocketSettingsTab({ rpcCall }) {
   const restartPocket = async () => {
     setUpdateInfo((u) => ({ ...u, restarting: true }));
     try {
-      await call(POCKET_ENDPOINTS.restart, {});
+      await Promise.race([
+        call(POCKET_ENDPOINTS.restart, {}),
+        new Promise((_, rej) => setTimeout(() => rej(new Error("restart requested (no reply within 3s)")), 3e3))
+      ]);
+      setUpdateInfo((u) => ({ ...u, restarting: true, result: "ok" }));
     } catch (err) {
       const msg = String(err?.message ?? "");
-      if (/connection|socket|fetch|network|abort|cancelled|ECONN|disconnect|closed/i.test(msg)) {
+      if (/connection|socket|fetch|network|abort|cancelled|ECONN|disconnect|closed|timeout/i.test(msg)) {
         setUpdateInfo((u) => ({ ...u, restarting: true, result: "ok" }));
         return;
       }
@@ -1333,7 +1354,13 @@ function PocketSettingsTab({ rpcCall }) {
     setUpdateInfo((u) => ({ ...u, updating: true, result: null }));
     try {
       const r = await call(POCKET_ENDPOINTS.update, {});
-      setUpdateInfo((u) => ({ ...u, updating: false, result: r.ok ? "ok" : "fail", output: r.output ?? r.error }));
+      setUpdateInfo((u) => ({
+        ...u,
+        updating: false,
+        result: r.ok ? "ok" : "fail",
+        autoRestart: r.autoRestart === true,
+        output: r.output ?? r.error
+      }));
     } catch (err) {
       setUpdateInfo((u) => ({ ...u, updating: false, result: "fail", output: err.message }));
     }
@@ -1390,9 +1417,9 @@ 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 :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\uFF1Alsof -ti :${status?.dshPort ?? 3080} | xargs kill -9`)
     ) : null,
-    // 更新提示——左侧黄色色条（提示有新版本）
+    // 更新提示——左侧黄色色条（提示有新版本）；单状态：有更新/更新中/已更新自动重启，不并存
     updateInfo ? (0, import_react2.createElement)(
       "div",
       { style: { ...styles.block, borderLeft: "4px solid var(--dsw-alias-state-warn-primary,#b45309)", borderRadius: 8, background: "var(--dsw-alias-bg-layer-2,#f3f4f6)", padding: "10px 12px" } },
@@ -1402,14 +1429,14 @@ function PocketSettingsTab({ rpcCall }) {
         (0, import_react2.createElement)(
           "div",
           { style: { fontWeight: 600, fontSize: 13 } },
-          updateInfo.updated ? `\u2705 \u5DF2\u66F4\u65B0 v${updateInfo.current}\uFF0C\u91CD\u542F\u751F\u6548 | Updated \u2014 restart to apply` : `\u{1F4E6} \u65B0\u7248\u672C v${updateInfo.latest} | Update available`
+          updateInfo.updated ? `\u2705 \u5DF2\u66F4\u65B0 v${updateInfo.current}\uFF0C\u91CD\u542F\u751F\u6548 | Updated \u2014 restart to apply` : updateInfo.result === "ok" ? updateInfo.autoRestart ? `\u2705 \u5DF2\u66F4\u65B0 v${updateInfo.latest}\uFF0C\u6B63\u5728\u81EA\u52A8\u91CD\u542F\u2026 | updated \u2014 restarting\u2026` : `\u2705 \u5DF2\u66F4\u65B0 v${updateInfo.latest} | Updated` : `\u{1F4E6} \u65B0\u7248\u672C v${updateInfo.latest} | Update available`
         ),
-        updateInfo.result !== "ok" ? (0, import_react2.createElement)("button", { style: styles.primary, onClick: runUpdate, disabled: updateInfo.updating }, updateInfo.updating ? "\u66F4\u65B0\u4E2D\u2026" : `\u66F4\u65B0\u5230 v${updateInfo.latest} | Update`) : (0, import_react2.createElement)("button", { style: styles.primary, onClick: restartPocket, disabled: updateInfo.restarting }, updateInfo.restarting ? "\u91CD\u542F\u4E2D\u2026" : "\u{1F504} \u91CD\u542F dsh web \u751F\u6548 | Restart now")
+        updateInfo.result !== "ok" ? (0, import_react2.createElement)("button", { style: styles.primary, onClick: runUpdate, disabled: updateInfo.updating }, updateInfo.updating ? "\u66F4\u65B0\u4E2D\u2026" : `\u66F4\u65B0\u5230 v${updateInfo.latest} | Update`) : updateInfo.autoRestart ? (0, import_react2.createElement)("button", { style: styles.btn, disabled: true }, "\u6B63\u5728\u91CD\u542F\u751F\u6548\u2026 | restarting\u2026") : (0, import_react2.createElement)("button", { style: styles.primary, onClick: restartPocket, disabled: updateInfo.restarting }, updateInfo.restarting ? "\u91CD\u542F\u4E2D\u2026" : "\u{1F504} \u91CD\u542F dsh web \u751F\u6548 | Restart now")
       ),
       (0, import_react2.createElement)(
         "div",
         { style: styles.muted, marginTop: 4 },
-        updateInfo.result === "ok" ? "\u2705 \u5DF2\u66F4\u65B0\uFF0C\u91CD\u542F dsh web \u751F\u6548 | updated \u2014 restart dsh web" : updateInfo.result === "fail" ? `\u274C \u5931\u8D25\uFF1A${updateInfo.output || "\u672A\u77E5"}\uFF08\u624B\u52A8\u66F4\u65B0\uFF1Adsh plugin --profile web update dsh-pocket --latest -w\uFF09` : `\u5F53\u524D v${updateInfo.current} \u2192 \u6700\u65B0 v${updateInfo.latest}`
+        updateInfo.result === "ok" ? updateInfo.autoRestart ? "\u2705 \u5DF2\u66F4\u65B0\uFF0C\u6B63\u5728\u81EA\u52A8\u91CD\u542F\u751F\u6548\uFF0C\u8BF7\u7A0D\u5019\u5237\u65B0 | updated \u2014 restarting automatically, refresh shortly" : "\u2705 \u5DF2\u66F4\u65B0\uFF0C\u91CD\u542F dsh web \u751F\u6548 | updated \u2014 restart dsh web" : updateInfo.result === "fail" ? `\u274C \u5931\u8D25\uFF1A${updateInfo.output || "\u672A\u77E5"}\uFF08\u624B\u52A8\u66F4\u65B0\uFF1Adsh plugin --profile web update dsh-pocket --latest -w\uFF09` : `\u5F53\u524D v${updateInfo.current} \u2192 \u6700\u65B0 v${updateInfo.latest}`
       )
     ) : null,
     // 局域网
@@ -1435,7 +1462,8 @@ function PocketSettingsTab({ rpcCall }) {
         null,
         (0, import_react2.createElement)("img", { src: status.tunnelQr, alt: "Tunnel QR", style: styles.qr }),
         (0, import_react2.createElement)("div", { style: styles.code }, tunnelUrl),
-        (0, import_react2.createElement)("div", { style: styles.muted }, "\u4EFB\u4F55\u7F51\u7EDC\u626B\u7801\u5373\u7528\uFF08URL \u6BCF\u6B21\u91CD\u542F\u4F1A\u53D8\uFF09"),
+        (0, import_react2.createElement)("div", { style: styles.muted }, "\u4EFB\u4F55\u7F51\u7EDC\u626B\u7801\u5373\u7528\uFF08URL \u6BCF\u6B21\u91CD\u542F\u81EA\u52A8\u6362\u65B0\uFF09"),
+        (0, import_react2.createElement)("div", { style: styles.warn, marginTop: 4 }, "\u{1F511} \u94FE\u63A5\u5DF2\u6CC4\u9732\uFF1F\u91CD\u542F dsh web\u2014\u2014URL \u7ACB\u5373\u6362\u65B0\uFF0C\u65E7\u94FE\u63A5\u4F5C\u5E9F\uFF0C\u65E0\u5B89\u5168\u98CE\u9669 | URL leaked? Restart dsh web \u2014 the URL rotates and the old one dies"),
         (0, import_react2.createElement)("button", { style: styles.btn, onClick: stopTunnel }, "\u5173\u95ED\u516C\u7F51 | Stop")
       ) : (0, import_react2.createElement)(
         "div",
@@ -1445,7 +1473,16 @@ function PocketSettingsTab({ rpcCall }) {
           "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")
+        ) : tunnelPhase === "error" ? (0, import_react2.createElement)(
+          "div",
+          { style: { marginTop: 8, fontSize: 12, color: "var(--dsw-alias-state-error-primary,#dc2626)" } },
+          `\u274C \u5F00\u542F\u5931\u8D25\uFF1A${tunnelStateDetail || "\u672A\u77E5\u9519\u8BEF | failed"}\uFF08\u53EF\u91CD\u8BD5\uFF1B\u82E5\u662F\u4EE3\u7406/VPN \u95EE\u9898\u89C1 README \u6392\u969C\uFF09`
+        ) : (0, import_react2.createElement)(
+          "div",
+          null,
+          (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 | the QR/URL is the key \u2014 never share it"),
+          (0, import_react2.createElement)("div", { style: styles.muted, marginTop: 4 }, "\u4E0D\u614E\u6CC4\u9732\u4E86\uFF1F\u91CD\u542F dsh web\uFF0CURL \u81EA\u52A8\u6362\u65B0\u3001\u65E7\u94FE\u63A5\u7ACB\u5373\u5931\u6548 | Leaked it? Restart dsh web \u2014 the URL rotates and the old one dies instantly")
+        )
       )
     ),
     error ? (0, import_react2.createElement)("div", { style: { color: "var(--dsw-alias-state-error-primary,#dc2626)", fontSize: 12, marginTop: 8 } }, `\u274C ${error}`) : null,

package/client/index.jsx

@@ -45,7 +45,11 @@ function PocketSettingsTab({ rpcCall }) {
       const s = await call(POCKET_ENDPOINTS.status, {});
       setStatus(s);
       setTunnelState(s.tunnelState ?? null);
-      if (s.restartNotice) setRestartNotice(true);
+      if (s.restartNotice) {
+        // 新进程确认起来了：显示一次「已重启」，并清掉旧的更新横幅（单状态，不并存）
+        setRestartNotice(true);
+        setUpdateInfo(null);
+      }
     } catch { /* 忽略瞬时失败 */ }
   };
 
@@ -80,11 +84,16 @@ function PocketSettingsTab({ rpcCall }) {
   const restartPocket = async () => {
     setUpdateInfo((u) => ({ ...u, restarting: true }));
     try {
-      await call(POCKET_ENDPOINTS.restart, {});
+      // 宿主 500ms 后自杀，RPC 响应可能来不及送达 → 3 秒超时兜底，别让按钮永远卡「重启中…」
+      await Promise.race([
+        call(POCKET_ENDPOINTS.restart, {}),
+        new Promise((_, rej) => setTimeout(() => rej(new Error('restart requested (no reply within 3s)')), 3000)),
+      ]);
+      setUpdateInfo((u) => ({ ...u, restarting: true, result: 'ok' }));
     } catch (err) {
-      // 宿主 500ms 后自杀，RPC 响应可能来不及送达——网络断连视为「已请求重启」
+      // 网络断连/超时同样视为「已请求重启」——旧进程即将退出，等新进程起来后刷新即可
       const msg = String(err?.message ?? '');
-      if (/connection|socket|fetch|network|abort|cancelled|ECONN|disconnect|closed/i.test(msg)) {
+      if (/connection|socket|fetch|network|abort|cancelled|ECONN|disconnect|closed|timeout/i.test(msg)) {
         setUpdateInfo((u) => ({ ...u, restarting: true, result: 'ok' }));
         return;
       }
@@ -92,12 +101,18 @@ function PocketSettingsTab({ rpcCall }) {
     }
   };
 
-  // 一键更新：调宿主 dsh plugin update
+  // 一键更新：调宿主 dsh plugin update（成功后宿主自动重启生效，用户只点一次）
   const runUpdate = async () => {
     setUpdateInfo((u) => ({ ...u, updating: true, result: null }));
     try {
       const r = await call(POCKET_ENDPOINTS.update, {});
-      setUpdateInfo((u) => ({ ...u, updating: false, result: r.ok ? 'ok' : 'fail', output: r.output ?? r.error }));
+      setUpdateInfo((u) => ({
+        ...u,
+        updating: false,
+        result: r.ok ? 'ok' : 'fail',
+        autoRestart: r.autoRestart === true,
+        output: r.output ?? r.error,
+      }));
     } catch (err) {
       setUpdateInfo((u) => ({ ...u, updating: false, result: 'fail', output: err.message }));
     }
@@ -143,22 +158,28 @@ 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 :3080 | xargs kill -9'),
+      h('div', { style: styles.muted, marginTop: 4, wordBreak: 'break-all' }, `进程在后台运行（不挂终端）。如需停止：lsof -ti :${status?.dshPort ?? 3080} | xargs kill -9`),
     ) : null,
 
-    // 更新提示——左侧黄色色条（提示有新版本）
+    // 更新提示——左侧黄色色条（提示有新版本）；单状态：有更新/更新中/已更新自动重启，不并存
     updateInfo ? h('div', { style: { ...styles.block, borderLeft: '4px solid var(--dsw-alias-state-warn-primary,#b45309)', borderRadius: 8, background: 'var(--dsw-alias-bg-layer-2,#f3f4f6)', padding: '10px 12px' } },
       h('div', { style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 8 } },
         h('div', { style: { fontWeight: 600, fontSize: 13 } },
           updateInfo.updated
             ? `✅ 已更新 v${updateInfo.current}，重启生效 | Updated — restart to apply`
-            : `📦 新版本 v${updateInfo.latest} | Update available`),
+            : updateInfo.result === 'ok'
+              ? (updateInfo.autoRestart ? `✅ 已更新 v${updateInfo.latest}，正在自动重启… | updated — restarting…` : `✅ 已更新 v${updateInfo.latest} | Updated`)
+              : `📦 新版本 v${updateInfo.latest} | Update available`),
         updateInfo.result !== 'ok'
           ? h('button', { style: styles.primary, onClick: runUpdate, disabled: updateInfo.updating }, updateInfo.updating ? '更新中…' : `更新到 v${updateInfo.latest} | Update`)
-          : h('button', { style: styles.primary, onClick: restartPocket, disabled: updateInfo.restarting }, updateInfo.restarting ? '重启中…' : '🔄 重启 dsh web 生效 | Restart now'),
+          : updateInfo.autoRestart
+            ? h('button', { style: styles.btn, disabled: true }, '正在重启生效… | restarting…')
+            : h('button', { style: styles.primary, onClick: restartPocket, disabled: updateInfo.restarting }, updateInfo.restarting ? '重启中…' : '🔄 重启 dsh web 生效 | Restart now'),
       ),
       h('div', { style: styles.muted, marginTop: 4 },
-        updateInfo.result === 'ok' ? '✅ 已更新，重启 dsh web 生效 | updated — restart dsh web'
+        updateInfo.result === 'ok'
+          ? (updateInfo.autoRestart ? '✅ 已更新，正在自动重启生效，请稍候刷新 | updated — restarting automatically, refresh shortly'
+            : '✅ 已更新，重启 dsh web 生效 | updated — restart dsh web')
         : updateInfo.result === 'fail' ? `❌ 失败：${updateInfo.output || '未知'}（手动更新：dsh plugin --profile web update dsh-pocket --latest -w）`
         : `当前 v${updateInfo.current} → 最新 v${updateInfo.latest}`),
     ) : null,
@@ -182,7 +203,8 @@ function PocketSettingsTab({ rpcCall }) {
         ? h('div', null,
           h('img', { src: status.tunnelQr, alt: 'Tunnel QR', style: styles.qr }),
           h('div', { style: styles.code }, tunnelUrl),
-          h('div', { style: styles.muted }, '任何网络扫码即用（URL 每次重启会变）'),
+          h('div', { style: styles.muted }, '任何网络扫码即用（URL 每次重启自动换新）'),
+          h('div', { style: styles.warn, marginTop: 4 }, '🔑 链接已泄露？重启 dsh web——URL 立即换新，旧链接作废，无安全风险 | URL leaked? Restart dsh web — the URL rotates and the old one dies'),
           h('button', { style: styles.btn, onClick: stopTunnel }, '关闭公网 | Stop'),
         )
         : h('div', null,
@@ -190,7 +212,13 @@ function PocketSettingsTab({ rpcCall }) {
           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 就是钥匙，请勿发给别人'),
+            : tunnelPhase === 'error'
+              ? h('div', { style: { marginTop: 8, fontSize: 12, color: 'var(--dsw-alias-state-error-primary,#dc2626)' } },
+                `❌ 开启失败：${tunnelStateDetail || '未知错误 | failed'}（可重试；若是代理/VPN 问题见 README 排障）`)
+              : h('div', null,
+                h('div', { style: styles.warn, marginTop: 8 }, '⚠️ DSH 能执行电脑代码：二维码/URL 就是钥匙，请勿发给别人 | the QR/URL is the key — never share it'),
+                h('div', { style: styles.muted, marginTop: 4 }, '不慎泄露了？重启 dsh web，URL 自动换新、旧链接立即失效 | Leaked it? Restart dsh web — the URL rotates and the old one dies instantly'),
+              ),
         ),
     ),
 

package/lib/index.js

@@ -11,7 +11,6 @@
 
 import { fileURLToPath } from 'node:url';
 import { spawn } from 'node:child_process';
-import { createRequire } from 'node:module';
 import { readFileSync } from 'node:fs';
 import { writeFile, readFile, mkdir, rm } from 'node:fs/promises';
 import { join, dirname } from 'node:path';
@@ -23,7 +22,6 @@ import { restartHost } from './restart.js';
 
 const name = 'dsh-pocket';
 const inject = ['connection', 'webServer'];
-const require = createRequire(import.meta.url);
 
 const pkgPath = fileURLToPath(new URL('../package.json', import.meta.url));
 
@@ -69,10 +67,18 @@ async function consumeRestartNotice() {
   }
   return notice;
 }
-/** 自重启（先落 notice，让重启后的页面提示停止方法）。 */
-function pocketRestart() {
+/**
+ * 自重启。
+ * 顺序很重要：先拉起 helper（失败就如实返回，不写标记、不停隧道）→ 停公网隧道
+ * （否则孤儿 cloudflared 让旧公网 URL 永活，与「重启即换 URL 作废」的宣传矛盾）→
+ * 写重启标记（新进程据此显示一次「已重启」横幅）。
+ */
+function pocketRestart(service) {
+  const result = restartHost();
+  if (!result || result.helperPid == null) return result; // helper 都没 spawn 出来 → 失败
+  try { service?.stopTunnel(); } catch { /* 忽略 */ }
   writeRestartNotice().catch(() => {});
-  return restartHost(); // 不传 internals：模块级函数里没有该变量（曾导致 ReferenceError）
+  return result;
 }
 
 /** 执行更新：dsh plugin --profile <p> update dsh-pocket --latest -w（超时保护）。 */
@@ -116,7 +122,7 @@ export function apply(ctx, config = {}, internals = {}) {
   const disposeRpc = installPocketRpc(ctx, {
     service,
     runUpdate: internals.runUpdate ?? { currentVersion, perform: performUpdate, loadedVersion: () => loadedVersion },
-    restart: internals.restart ?? pocketRestart,
+    restart: internals.restart ?? (() => pocketRestart(service)),
     restartNotice: internals.restartNotice ?? consumeRestartNotice,
     log: logger,
   });

package/lib/service.mjs

@@ -59,13 +59,18 @@ export function createPocketService({
   async function qrCached(text) {
     if (!text) return null;
     if (!qrCache.has(text)) {
-      if (qrCache.size > 8) qrCache.clear(); // 隧道 URL 每次重启换新，防止无限增长
+      if (qrCache.size >= 8) {
+        // 只淘汰最旧一条（隧道 URL 每次重启换新），别殃及稳定的 LAN 二维码
+        const oldest = qrCache.keys().next().value;
+        qrCache.delete(oldest);
+      }
       qrCache.set(text, encodeQr(text).catch(() => null));
     }
     return qrCache.get(text);
   }
 
   return {
+    dshPort,
     /** 启动局域网代理（幂等）。 */
     async startProxy() {
       if (proxy) return proxy;
@@ -98,6 +103,12 @@ export function createPocketService({
           // 归一化：startTunnel 契约返回 {url, kill}（字符串也兼容）
           tunnel = typeof result === 'string' ? { url: result, kill: () => {} } : result;
           tunnelState.phase = 'ready';
+          // M1：隧道进程运行中死亡（崩溃/被杀）→ 状态打回，别让 UI 永远显示"可用"
+          tunnel.onExit?.((code) => {
+            if (controller.signal.aborted) return; // 主动停止（stopTunnel）不算故障
+            tunnelState.phase = 'error';
+            tunnelState.detail = `隧道进程退出（code=${code}）| tunnel process exited`;
+          });
           return tunnel.url;
         } catch (err) {
           // stopTunnel 触发的 abort 不算错误：保持 idle，别把状态刷成 error
@@ -108,9 +119,12 @@ export function createPocketService({
           tunnelState.startedAt = null; // 失败后清掉计时，避免 UI 误显"启动中"
           throw err;
         } finally {
-          tunnelPromise = null;
+          // 只清自己的引用：stopTunnel 后立即 startTunnel 可能已建了新的 in-flight
+          // （tunnelPromise=B），A 的 finally 不能把 B 清掉，否则第三次调用会并发 spawn
+          if (tunnelPromise === p) tunnelPromise = null;
         }
       })();
+      const p = tunnelPromise;
       return tunnelPromise;
     },
 

package/lib/tunnel.mjs

@@ -20,12 +20,16 @@ function platformBinary() {
   return { os, a, ext: os === 'windows' ? '.exe' : '' };
 }
 
-async function downloadCloudflared(binPath) {
+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（首次运行，之后跳过）…`);
-  const res = await fetch(url, { signal: AbortSignal.timeout(180_000) });
+  // 同时响应外部 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`);
@@ -61,7 +65,7 @@ let downloading = null;
  * 优先：PATH 已有 → 直接用；否则用持久缓存（$DSH_HOME/dsh-pocket/cloudflared），
  * 只有缓存缺失才下载——避免每次开启公网都重新下 20MB。
  */
-export async function resolveCloudflared({ home, onPhase = () => {} } = {}) {
+export async function resolveCloudflared({ home, onPhase = () => {}, signal } = {}) {
   if (cloudflaredOnPath()) return 'cloudflared';
   const dshHome = home ?? process.env.DSH_HOME ?? join(homedir(), '.dsh');
   const cacheDir = join(dshHome, 'dsh-pocket', 'bin');
@@ -73,7 +77,7 @@ export async function resolveCloudflared({ home, onPhase = () => {} } = {}) {
   onPhase('downloading');
   await mkdir(cacheDir, { recursive: true });
   if (!downloading) {
-    downloading = downloadCloudflared(bin).finally(() => { downloading = null; });
+    downloading = downloadCloudflared(bin, signal).finally(() => { downloading = null; });
   }
   return downloading;
 }
@@ -88,7 +92,7 @@ export async function resolveCloudflared({ home, onPhase = () => {} } = {}) {
  * @returns {Promise<{url:string, kill:()=>void}>}
  */
 export async function startQuickTunnel({ port, home, signal, onPhase = () => {} }) {
-  const bin = await resolveCloudflared({ home, onPhase });
+  const bin = await resolveCloudflared({ home, onPhase, signal });
   onPhase('starting');
   // 强制 HTTP/2（TCP 443）而不是默认的 QUIC（UDP 7844）：
   // 国内网络/部分企业网常屏蔽 UDP 7844，导致 tunnel 报 error 1033（Tunnel error）；
@@ -96,8 +100,16 @@ export async function startQuickTunnel({ port, home, signal, onPhase = () => {}
   const child = spawn(bin, ['tunnel', '--url', `http://127.0.0.1:${port}`, '--protocol', 'http2', '--no-autoupdate'], {
     stdio: ['ignore', 'pipe', 'pipe'],
   });
+  // H1：spawn 失败（缓存二进制损坏等）必须接住，否则 uncaughtException 崩宿主
+  child.on('error', (err) => {
+    cleanup?.();
+    onPhase?.('error');
+    rejectErr?.(new Error(`cloudflared 启动失败：${err?.message ?? err}（可删除 $DSH_HOME/dsh-pocket/bin 缓存后重试）`));
+  });
   onPhase('registering');
 
+  let cleanup = null;
+  let rejectErr = null;
   const url = await new Promise((resolve, reject) => {
     let buf = '';
     const onData = (chunk) => {
@@ -113,12 +125,15 @@ export async function startQuickTunnel({ port, home, signal, onPhase = () => {}
       cleanup();
       reject(new Error(`cloudflared 退出（code=${code}）`));
     };
-    const cleanup = () => {
+    cleanup = () => {
       child.stdout.off('data', onData);
       child.stderr.off('data', onData);
       child.off('exit', onExit);
       clearTimeout(timer);
       signal?.removeEventListener('abort', onAbort);
+      // M4：摘掉监听后管道不再消费 → 64KB 缓冲填满会阻塞 cloudflared → 继续吞掉输出
+      child.stdout.resume();
+      child.stderr.resume();
     };
     const onAbort = () => {
       cleanup();
@@ -138,6 +153,13 @@ export async function startQuickTunnel({ port, home, signal, onPhase = () => {}
     child.stderr.on('data', onData);
     child.once('exit', onExit);
     signal?.addEventListener('abort', onAbort, { once: true });
+    rejectErr = reject;
+  });
+
+  // M1：隧道进程运行中死亡（崩溃/被杀）→ 通知监听方（service 据此把状态从 ready 打回）
+  const exitListeners = new Set();
+  child.on('exit', (code) => {
+    for (const cb of exitListeners) cb(code);
   });
 
   return {
@@ -145,5 +167,10 @@ export async function startQuickTunnel({ port, home, signal, onPhase = () => {}
     kill: () => {
       try { child.kill(); } catch { /* 忽略 */ }
     },
+    /** 注册「进程已退出」回调，返回取消函数。 */
+    onExit: (cb) => {
+      exitListeners.add(cb);
+      return () => exitListeners.delete(cb);
+    },
   };
 }

package/lib/web-rpc.js

@@ -50,12 +50,22 @@ export function installPocketRpc(ctx, { service, log = console, runUpdate = null
       if (endpoint === POCKET_ENDPOINTS.update) {
         if (!runUpdate) return fail('bad-request', '更新不可用 | update unavailable');
         const result = await runUpdate.perform(payload?.profile ?? 'web');
+        // 更新成功 → 自动重启生效（用户只点一次；helper 拉起失败则保持现状，可手动重启）
+        if (result?.ok && restart) {
+          const rr = restart();
+          result.autoRestart = rr?.helperPid != null;
+        }
         return ok(result);
       }
       if (endpoint === POCKET_ENDPOINTS.restart) {
         if (!restart) return fail('bad-request', '重启不可用 | restart unavailable');
         const result = restart();
-        return ok({ ...result, hint: '重启后进程在后台运行；如需停止：lsof -ti :3080 | xargs kill -9' });
+        // 重启拉起失败（helper 都没 spawn 出来）→ 如实报错，别让 UI 误报成功
+        if (!result || result.helperPid == 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 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.23"
+  "version": "1.0.25"
 }