dsh-pocket 1.0.19 → 1.0.20

package/README.en.md

@@ -42,7 +42,6 @@ What it looks like — the phone shows the exact same UI as your computer, live:
 | 📱 Mobile-adaptive layout | Narrow screens get a drawer layout automatically (ported from dsh-web-mobile, MIT): sidebar drawer, full-width conversation, safe-area insets, touch optimizations |
 | 🧩 Zero-dependency install | One npm package, one settings tab — no core/adapter split, no account, no server |
 | 🔒 URL is the key | No public URL exposure in LAN mode; public URL rotates on every restart |
-| 🔔 Web Push | Phone notifications when a task finishes or fails (even with the page closed); requires the HTTPS public tunnel or localhost |
 
 ## 🚀 Usage
 
@@ -93,7 +92,6 @@ On the same page click "**Enable anywhere**" → wait for the tunnel (first run
 | 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 |
 | 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`) |
-| No push on iOS Safari | Safari Web Push requires **"Add to Home Screen"** first, then open from the home-screen icon (Chrome/Android don't need this) |
 | 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`) |
 

package/README.md

@@ -42,7 +42,6 @@ DSH Pocket 就是干这个的：**装上它，手机扫个码，就能实时看
 | 📱 移动端适配 | 窄屏自动变抽屉布局（移植 dsh-web-mobile，MIT）：侧栏抽屉、会话全宽、状态栏安全区、触控优化 |
 | 🧩 零依赖安装 | 一个 npm 包、一个设置页，没有核心/适配器要分开装；无需账号、无需服务器 |
 | 🔒 URL 即钥匙 | 无公网 URL 暴露给第三方（局域网模式）；公网 URL 每次重启自动换新 |
-| 🔔 Web Push 通知 | agent 跑完/出错 → 手机推送通知（即使没开页面）；需 HTTPS 公网路径或 localhost |
 
 ## 🚀 怎么用
 
@@ -93,7 +92,6 @@ npx @deepseek-ai/dsh web
 | 装完/更新了但界面没变化 | **必须重启 `dsh web`** 才生效；运行中的进程仍加载旧代码 |
 | `listen EADDRINUSE ... :3081` | 旧 dsh-pocket 进程还占着端口：`lsof -ti :3081 \| xargs kill -9` 后重试 |
 | 版本停在 0.x 升不上去 | `^0.x` 范围不允许升到 1.x：更新用 `--latest`（`dsh plugin --profile web update dsh-pocket --latest -w`） |
-| 手机 iOS 收不到推送 | Safari 的 Web Push 要求**先把网页「添加到主屏幕」**，从主屏幕图标打开后才生效（Chrome/Android 无此要求） |
 | 公网 `error 1033` | 见下方「公网隧道常见问题」——多半是本机代理/VPN（Clash 等 TUN 模式）掐断了隧道 |
 | 点「重启 dsh web」后页面提示进程在后台运行 | 自重启的新进程是 detached 后台进程（不挂终端），是页内更新的标准做法；停止它：`lsof -ti :3080 \| xargs kill -9`（日志在 `$DSH_HOME` 下 `dsh-pocket-restart-*.log`） |
 

package/client/api.js

@@ -5,11 +5,6 @@ export const POCKET_ENDPOINTS = Object.freeze({
   status: 'pocket.status',
   tunnelStart: 'tunnel.start',
   tunnelStop: 'tunnel.stop',
-  pushVapidKey: 'push.vapidKey',
-  pushSubscribe: 'push.subscribe',
-  pushUnsubscribe: 'push.unsubscribe',
-  pushStatus: 'push.status',
-  pushSetEnabled: 'push.setEnabled',
   version: 'pocket.version',
   update: 'pocket.update',
   restart: 'pocket.restart',

package/client/client.js

@@ -38,11 +38,6 @@ var POCKET_ENDPOINTS = Object.freeze({
   status: "pocket.status",
   tunnelStart: "tunnel.start",
   tunnelStop: "tunnel.stop",
-  pushVapidKey: "push.vapidKey",
-  pushSubscribe: "push.subscribe",
-  pushUnsubscribe: "push.unsubscribe",
-  pushStatus: "push.status",
-  pushSetEnabled: "push.setEnabled",
   version: "pocket.version",
   update: "pocket.update",
   restart: "pocket.restart"
@@ -1265,32 +1260,6 @@ function mobileApply(ctx) {
 // client/index.jsx
 var name = "dsh-pocket";
 var inject = ["slots", "connection", "layout", "locale", "sessionLogDownload"];
-async function setupPush(rpcCall) {
-  try {
-    if (!("serviceWorker" in navigator) || !("PushManager" in window)) return "unsupported";
-    if (!window.isSecureContext) return "insecure";
-    const reg = await navigator.serviceWorker.register("/pocket-sw.js");
-    const vapid = await rpcCall(POCKET_ENDPOINTS.pushVapidKey, {});
-    if (!vapid?.ok) return "host-error";
-    let sub = await reg.pushManager.getSubscription();
-    if (!sub) {
-      sub = await reg.pushManager.subscribe({
-        userVisibleOnly: true,
-        applicationServerKey: urlBase64ToUint8Array(vapid.value.publicKey)
-      });
-    }
-    const res = await rpcCall(POCKET_ENDPOINTS.pushSubscribe, { subscription: sub.toJSON() });
-    return res?.ok ? "on" : "host-error";
-  } catch {
-    return "error";
-  }
-}
-function urlBase64ToUint8Array(base64url) {
-  const pad = "=".repeat((4 - base64url.length % 4) % 4);
-  const b64 = (base64url + pad).replace(/-/g, "+").replace(/_/g, "/");
-  const raw = atob(b64);
-  return Uint8Array.from(raw, (c) => c.charCodeAt(0));
-}
 var styles = {
   card: { background: "var(--dsw-alias-bg-layer-1,#fff)", border: "1px solid var(--dsw-alias-border-l2,#e5e7eb)", borderRadius: 12, padding: "14px 16px", maxWidth: 480 },
   block: { borderTop: "1px solid var(--dsw-alias-border-l2,#e5e7eb)", marginTop: 12, paddingTop: 12 },
@@ -1305,8 +1274,6 @@ function PocketSettingsTab({ rpcCall }) {
   const [status, setStatus] = (0, import_react2.useState)(null);
   const [busy, setBusy] = (0, import_react2.useState)(false);
   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 [restartNotice, setRestartNotice] = (0, import_react2.useState)(false);
   const [updateInfo, setUpdateInfo] = (0, import_react2.useState)(null);
@@ -1329,16 +1296,6 @@ function PocketSettingsTab({ rpcCall }) {
     const t = setInterval(load, 3e3);
     return () => clearInterval(t);
   }, []);
-  (0, import_react2.useEffect)(() => {
-    (async () => {
-      try {
-        const s = await call(POCKET_ENDPOINTS.pushStatus, {});
-        setPushEnabled(s.enabled);
-        if (s.enabled) setPushState(await setupPush(rpcCall));
-      } catch {
-      }
-    })();
-  }, []);
   (0, import_react2.useEffect)(() => {
     let alive = true;
     (async () => {
@@ -1381,36 +1338,6 @@ function PocketSettingsTab({ rpcCall }) {
       setUpdateInfo((u) => ({ ...u, updating: false, result: "fail", output: err.message }));
     }
   };
-  const enablePush = async () => {
-    try {
-      await call(POCKET_ENDPOINTS.pushSetEnabled, { enabled: true });
-      setPushEnabled(true);
-      setPushState(await setupPush(rpcCall));
-    } catch (err) {
-      setError(err?.message ?? "\u63A8\u9001\u5F00\u542F\u5931\u8D25 | failed to enable push");
-    }
-  };
-  const disablePush = async () => {
-    try {
-      try {
-        if ("serviceWorker" in navigator) {
-          const reg = await navigator.serviceWorker.getRegistration("/pocket-sw.js");
-          const sub = await reg?.pushManager?.getSubscription();
-          if (sub) {
-            const endpoint = sub.endpoint;
-            await sub.unsubscribe();
-            await call(POCKET_ENDPOINTS.pushUnsubscribe, { endpoint });
-          }
-        }
-      } catch {
-      }
-      await call(POCKET_ENDPOINTS.pushSetEnabled, { enabled: false });
-      setPushEnabled(false);
-      setPushState("off");
-    } catch (err) {
-      setError(err?.message ?? "\u63A8\u9001\u5173\u95ED\u5931\u8D25 | failed to disable push");
-    }
-  };
   const startTunnel = async () => {
     setBusy(true);
     setError(null);
@@ -1521,22 +1448,6 @@ function PocketSettingsTab({ rpcCall }) {
         ) : (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 状态 + 开关
-    (0, import_react2.createElement)(
-      "div",
-      { style: styles.block },
-      (0, import_react2.createElement)(
-        "div",
-        { style: { display: "flex", alignItems: "center", justifyContent: "space-between" } },
-        (0, import_react2.createElement)("div", { style: { fontWeight: 600, fontSize: 13 } }, "\u{1F514} \u63A8\u9001\u901A\u77E5 | Push notifications"),
-        pushEnabled ? (0, import_react2.createElement)("button", { style: styles.btn, onClick: disablePush }, "\u5173\u95ED | Off") : (0, import_react2.createElement)("button", { style: styles.primary, onClick: enablePush }, "\u5F00\u542F | On")
-      ),
-      (0, import_react2.createElement)(
-        "div",
-        { style: styles.muted },
-        !pushEnabled ? "\u5DF2\u5173\u95ED\uFF1Aagent \u8DD1\u5B8C\u4E0D\u4F1A\u63A8\u9001 | off: no notifications" : pushState === "on" ? "\u5DF2\u5F00\u542F\uFF1Aagent \u8DD1\u5B8C/\u51FA\u9519\u65F6\u624B\u673A\u6536\u5230\u901A\u77E5 | on: notified when tasks finish or fail" : pushState === "unsupported" ? "\u5DF2\u5F00\u542F\uFF08\u4F46\u5F53\u524D\u6D4F\u89C8\u5668\u4E0D\u652F\u6301\u63A8\u9001\uFF09| on, but this browser does not support push" : pushState === "insecure" ? "\u5DF2\u5F00\u542F\uFF0C\u4F46\u5F53\u524D\u8DEF\u5F84\u4E0D\u662F HTTPS\u2014\u2014\u63A8\u9001\u9700\u8981\u516C\u7F51\u96A7\u9053\u6216 localhost | on, but push needs HTTPS (public tunnel) or localhost" : pushState === "checking" ? "\u68C0\u67E5\u4E2D\u2026 | checking\u2026" : "\u63A8\u9001\u672A\u751F\u6548 | push not active"
-      )
-    ),
     error ? (0, import_react2.createElement)("div", { style: { color: "var(--dsw-alias-state-error-primary,#dc2626)", fontSize: 12, marginTop: 8 } }, `\u274C ${error}`) : null,
     // 页面最底部：反馈入口
     (0, import_react2.createElement)(

package/client/index.jsx

@@ -1,9 +1,11 @@
 // dsh-pocket 网页客户端：
-//   1. 设置页签「手机访问」（局域网/公网二维码 + Web Push 状态）
+//   1. 设置页签「手机访问」（局域网/公网二维码 + 更新/重启提示）
 //   2. 移动端适配（移植自 MIT 项目 dsh-web-mobile，见 client/mobile/LICENSE.dsh-web-mobile）
-//   3. Web Push：注册 Service Worker + 订阅推送（agent 跑完/出错 → 手机通知）
 //
 // 手机扫码打开的就是电脑上的 dsh web，实时同步；窄屏自动变成抽屉布局。
+//
+// 注：Web Push 已移除——浏览器推送依赖 Google FCM（Chrome）等境外服务，
+// 国内直连被墙，普通用户用不了。专注扫码同屏这一件事。
 
 import { createElement as h, useEffect, useState } from 'react';
 
@@ -13,36 +15,6 @@ import { mobileApply } from './mobile/mobile-apply.tsx';
 const name = 'dsh-pocket';
 const inject = ['slots', 'connection', 'layout', 'locale', 'sessionLogDownload'];
 
-/** Web Push：注册 SW + 订阅（仅安全上下文可用：HTTPS 公网 / localhost）。 */
-async function setupPush(rpcCall) {
-  try {
-    if (!('serviceWorker' in navigator) || !('PushManager' in window)) return 'unsupported';
-    if (!window.isSecureContext) return 'insecure'; // http://LAN-IP 无 Push API
-    const reg = await navigator.serviceWorker.register('/pocket-sw.js');
-    const vapid = await rpcCall(POCKET_ENDPOINTS.pushVapidKey, {});
-    if (!vapid?.ok) return 'host-error';
-    let sub = await reg.pushManager.getSubscription();
-    if (!sub) {
-      sub = await reg.pushManager.subscribe({
-        userVisibleOnly: true,
-        applicationServerKey: urlBase64ToUint8Array(vapid.value.publicKey),
-      });
-    }
-    const res = await rpcCall(POCKET_ENDPOINTS.pushSubscribe, { subscription: sub.toJSON() });
-    return res?.ok ? 'on' : 'host-error';
-  } catch {
-    return 'error';
-  }
-}
-
-/** VAPID 公钥（base64url）→ Uint8Array（pushManager.subscribe 需要）。 */
-function urlBase64ToUint8Array(base64url) {
-  const pad = '='.repeat((4 - (base64url.length % 4)) % 4);
-  const b64 = (base64url + pad).replace(/-/g, '+').replace(/_/g, '/');
-  const raw = atob(b64);
-  return Uint8Array.from(raw, (c) => c.charCodeAt(0));
-}
-
 const styles = {
   card: { background: 'var(--dsw-alias-bg-layer-1,#fff)', border: '1px solid var(--dsw-alias-border-l2,#e5e7eb)', borderRadius: 12, padding: '14px 16px', maxWidth: 480 },
   block: { borderTop: '1px solid var(--dsw-alias-border-l2,#e5e7eb)', marginTop: 12, paddingTop: 12 },
@@ -58,8 +30,6 @@ function PocketSettingsTab({ rpcCall }) {
   const [status, setStatus] = useState(null);
   const [busy, setBusy] = useState(false);
   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 [restartNotice, setRestartNotice] = useState(false); // 重启后提示
   const [updateInfo, setUpdateInfo] = useState(null); // { current, latest, updating, result } | null
@@ -85,17 +55,6 @@ function PocketSettingsTab({ rpcCall }) {
     return () => clearInterval(t);
   }, []);
 
-  // 读取宿主开关状态；已开启时同步检查浏览器订阅状态（否则刷新后一直显示"检查中…"）
-  useEffect(() => {
-    (async () => {
-      try {
-        const s = await call(POCKET_ENDPOINTS.pushStatus, {});
-        setPushEnabled(s.enabled);
-        if (s.enabled) setPushState(await setupPush(rpcCall));
-      } catch { /* 忽略瞬时失败 */ }
-    })();
-  }, []);
-
   // 版本检测：host 当前版本 vs npm registry latest（registry 带 CORS *）
   // 两种情况显示横幅：① 有新版可更新；② 磁盘已更新但进程还是旧代码（重启生效）
   useEffect(() => {
@@ -144,39 +103,6 @@ function PocketSettingsTab({ rpcCall }) {
     }
   };
 
-  // 开启推送：宿主开关开 + 浏览器订阅（安全上下文才有效）
-  const enablePush = async () => {
-    try {
-      await call(POCKET_ENDPOINTS.pushSetEnabled, { enabled: true });
-      setPushEnabled(true);
-      setPushState(await setupPush(rpcCall));
-    } catch (err) {
-      setError(err?.message ?? '推送开启失败 | failed to enable push');
-    }
-  };
-
-  // 关闭推送：取消浏览器订阅 + 宿主开关关
-  const disablePush = async () => {
-    try {
-      try {
-        if ('serviceWorker' in navigator) {
-          const reg = await navigator.serviceWorker.getRegistration('/pocket-sw.js');
-          const sub = await reg?.pushManager?.getSubscription();
-          if (sub) {
-            const endpoint = sub.endpoint;
-            await sub.unsubscribe();
-            await call(POCKET_ENDPOINTS.pushUnsubscribe, { endpoint });
-          }
-        }
-      } catch { /* 浏览器侧失败不影响宿主开关 */ }
-      await call(POCKET_ENDPOINTS.pushSetEnabled, { enabled: false });
-      setPushEnabled(false);
-      setPushState('off');
-    } catch (err) {
-      setError(err?.message ?? '推送关闭失败 | failed to disable push');
-    }
-  };
-
   const startTunnel = async () => {
     setBusy(true);
     setError(null);
@@ -268,23 +194,6 @@ function PocketSettingsTab({ rpcCall }) {
         ),
     ),
 
-    // Web Push 状态 + 开关
-    h('div', { style: styles.block },
-      h('div', { style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between' } },
-        h('div', { style: { fontWeight: 600, fontSize: 13 } }, '🔔 推送通知 | Push notifications'),
-        pushEnabled
-          ? h('button', { style: styles.btn, onClick: disablePush }, '关闭 | Off')
-          : h('button', { style: styles.primary, onClick: enablePush }, '开启 | On'),
-      ),
-      h('div', { style: styles.muted },
-        !pushEnabled ? '已关闭：agent 跑完不会推送 | off: no notifications'
-        : pushState === 'on' ? '已开启：agent 跑完/出错时手机收到通知 | on: notified when tasks finish or fail'
-        : pushState === 'unsupported' ? '已开启（但当前浏览器不支持推送）| on, but this browser does not support push'
-        : pushState === 'insecure' ? '已开启，但当前路径不是 HTTPS——推送需要公网隧道或 localhost | on, but push needs HTTPS (public tunnel) or localhost'
-        : pushState === 'checking' ? '检查中… | checking…'
-        : '推送未生效 | push not active'),
-    ),
-
     error ? h('div', { style: { color: 'var(--dsw-alias-state-error-primary,#dc2626)', fontSize: 12, marginTop: 8 } }, `❌ ${error}`) : null,
 
     // 页面最底部：反馈入口

package/lib/index.js

@@ -3,9 +3,11 @@
 // 设置一级入口「手机访问」：
 //   - 局域网二维码：自动显示（代理随插件启动）
 //   - 公网二维码：点「开启公网」→ cloudflared 隧道 → 扫码即用，人在外面也能访问
-//   - Web Push：agent 跑完/出错 → 手机推送通知（需 HTTPS 公网路径或 localhost）
 //   - 更新提示：有新版本时显示一键更新按钮（dsh plugin update --latest）
 // 手机看到的界面 = 电脑上的 dsh web，实时同步（WebSocket 透传）。
+//
+// 注：Web Push 已移除——浏览器推送依赖 Google FCM（Chrome）等境外服务，
+// 国内直连被墙，普通用户用不了，且排障成本高。专注扫码同屏这一件事。
 
 import { fileURLToPath } from 'node:url';
 import { spawn } from 'node:child_process';
@@ -17,7 +19,6 @@ import { homedir } from 'node:os';
 
 import { createPocketService } from './service.mjs';
 import { installPocketRpc } from './web-rpc.js';
-import { createPushService } from './push.mjs';
 import { restartHost } from './restart.js';
 
 const name = 'dsh-pocket';
@@ -85,14 +86,6 @@ function performUpdate(profile, { timeoutMs = 180_000 } = {}) {
   });
 }
 
-// 服务 worker 源码（同源提供：/pocket-sw.js）
-const SW_SOURCE = new URL('./pocket-sw.js', import.meta.url);
-let swCache = null;
-async function swScript() {
-  if (!swCache) swCache = await readFile(fileURLToPath(SW_SOURCE), 'utf8');
-  return swCache;
-}
-
 export function apply(ctx, config = {}, internals = {}) {
   const logger = ctx.logger?.(name) ?? console;
   const dshPort = internals.dshPort ?? ctx.webServer?.port;
@@ -108,16 +101,9 @@ export function apply(ctx, config = {}, internals = {}) {
     internals,
   });
 
-  // Web Push 服务（web-push 库；测试可注入 stub）
-  const pushPromise = internals.pushPromise ?? createPushService({ internals });
-  pushPromise.catch((err) => logger.error('dsh-pocket: push service init failed | 推送服务初始化失败: %s', err?.message ?? err));
-
   const disposers = [];
   const disposeRpc = installPocketRpc(ctx, {
     service,
-    // push 传 promise：插件启动早期 createPushService 可能还没 resolve，
-    // RPC 侧每次调用前动态 await（不能传空 fallback——会拿到空的 VAPID key）
-    push: internals.push ?? pushPromise,
     runUpdate: internals.runUpdate ?? { currentVersion, perform: performUpdate, loadedVersion: () => loadedVersion },
     restart: internals.restart ?? pocketRestart,
     restartNotice: internals.restartNotice ?? readRestartNotice,
@@ -125,41 +111,6 @@ export function apply(ctx, config = {}, internals = {}) {
   });
   disposers.push(disposeRpc);
 
-  // 同源提供 Service Worker（Web Push 必需）
-  try {
-    const removeSw = ctx.webServer.register({
-      kind: 'exact',
-      path: '/pocket-sw.js',
-      handler: async (req, res) => {
-        res.writeHead(200, { 'content-type': 'application/javascript', 'cache-control': 'no-cache' });
-        res.end(await swScript());
-      },
-    });
-    disposers.push(removeSw);
-  } catch (err) {
-    logger.error('dsh-pocket: sw route register failed | SW 路由注册失败: %s', err?.message ?? err);
-  }
-
-  // Agent 回合结束/出错 → 推送通知（有订阅才发）
-  const onSessionEvent = (session, event) => {
-    if (event?.type !== 'turn/end') return;
-    const reason = event?.data?.reason ?? event?.reason;
-    if (!reason) return;
-    void pushPromise.then(async (push) => {
-      try {
-        if (reason.kind === 'error') {
-          await push.notify({ title: '❌ 任务失败 | Task failed', body: String(reason.error?.message ?? '').slice(0, 120) || 'Agent 执行出错', url: '/' });
-        } else if (reason.kind === 'completed') {
-          await push.notify({ title: '✅ 任务完成 | Task done', body: 'Agent 已完成任务，点开查看结果', url: '/' });
-        }
-      } catch (err) {
-        logger.error('dsh-pocket: push send failed | 推送发送失败: %s', err?.message ?? err);
-      }
-    });
-  };
-  const offSession = ctx.on('session/event', onSessionEvent);
-  disposers.push(offSession);
-
   // 代理随插件自动启动（局域网二维码开箱即用，零配置）
   void service.startProxy().then((proxy) => {
     logger.info('dsh-pocket: proxy ready on :%d | 局域网代理已就绪', proxy.port);
@@ -170,7 +121,7 @@ export function apply(ctx, config = {}, internals = {}) {
   ctx.effect(() => async () => {
     for (const d of disposers.reverse()) { try { d(); } catch { /* 忽略 */ } }
     await service.dispose();
-  }, 'dsh-pocket: stop proxy, tunnel and push');
+  }, 'dsh-pocket: stop proxy and tunnel');
 }
 
 export { name, inject, readRestartNotice };

package/lib/web-rpc.js

@@ -17,7 +17,7 @@ function fail(code, message) {
 }
 
 /** 注册 /dsh-pocket 逻辑通道（仅本机 loopback 可调）。 */
-export function installPocketRpc(ctx, { service, push, log = console, runUpdate = null, restart = null, restartNotice = null }) {
+export function installPocketRpc(ctx, { service, log = console, runUpdate = null, restart = null, restartNotice = null }) {
   if (!ctx?.connection?.rpc?.handle) {
     log.warn?.('dsh-pocket: DSH Host Connection RPC unavailable — settings tab disabled | 无 Connection RPC，设置页不可用');
     return () => {};
@@ -32,9 +32,6 @@ export function installPocketRpc(ctx, { service, push, log = console, runUpdate
       return ok({ ...redactStatus(await service.status()), restartNotice: notice });
     };
 
-    // push 可能是 promise（插件启动早期 createPushService 尚未 resolve）；动态取实例
-    const pushApi = await Promise.resolve(push).catch(() => null);
-
     try {
       if (endpoint === POCKET_ENDPOINTS.status) {
         return await statusPayload();
@@ -47,29 +44,6 @@ export function installPocketRpc(ctx, { service, push, log = console, runUpdate
         service.stopTunnel();
         return await statusPayload();
       }
-      if (endpoint === POCKET_ENDPOINTS.pushVapidKey) {
-        if (!pushApi) return fail('bad-request', '推送服务未就绪 | push service unavailable');
-        return ok({ publicKey: pushApi.vapidPublicKey() });
-      }
-      if (endpoint === POCKET_ENDPOINTS.pushSubscribe) {
-        if (!pushApi) return fail('bad-request', '推送服务未就绪 | push service unavailable');
-        const added = await pushApi.subscribe(payload?.subscription);
-        return ok({ subscribed: added, count: pushApi.count() });
-      }
-      if (endpoint === POCKET_ENDPOINTS.pushUnsubscribe) {
-        if (!pushApi) return fail('bad-request', '推送服务未就绪 | push service unavailable');
-        const removed = await pushApi.unsubscribe(payload?.endpoint);
-        return ok({ removed, count: pushApi.count() });
-      }
-      if (endpoint === POCKET_ENDPOINTS.pushStatus) {
-        if (!pushApi) return fail('bad-request', '推送服务未就绪 | push service unavailable');
-        return ok({ enabled: pushApi.isEnabled(), count: pushApi.count() });
-      }
-      if (endpoint === POCKET_ENDPOINTS.pushSetEnabled) {
-        if (!pushApi) return fail('bad-request', '推送服务未就绪 | push service unavailable');
-        const enabled = await pushApi.setEnabled(payload?.enabled === true);
-        return ok({ enabled, count: pushApi.count() });
-      }
       if (endpoint === POCKET_ENDPOINTS.version) {
         return ok({ current: runUpdate?.currentVersion?.() ?? null, loaded: runUpdate?.loadedVersion?.() ?? null });
       }

package/package.json

@@ -27,8 +27,7 @@
   },
   "dependencies": {
     "qrcode": "^1.5.4",
-    "qrcode-terminal": "^0.12.0",
-    "web-push": "^3.6.7"
+    "qrcode-terminal": "^0.12.0"
   },
   "devDependencies": {
     "esbuild": "^0.25.9",
@@ -77,5 +76,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.0.19"
+  "version": "1.0.20"
 }

package/lib/pocket-sw.js

@@ -1,39 +0,0 @@
-// dsh-pocket Service Worker（经 webServer 同源提供：/pocket-sw.js）
-// 职责：接收推送 → 显示通知；点击通知 → 聚焦/打开 DSH 页面。
-// 图标用内联 data URI（不依赖 dsh 静态资源，避免 404 导致通知无图标）。
-const ICON = 'data:image/svg+xml,' + encodeURIComponent(
-  '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">' +
-  '<rect width="64" height="64" rx="14" fill="#4f6ef7"/>' +
-  '<rect x="16" y="12" width="32" height="40" rx="5" fill="#fff"/>' +
-  '<rect x="22" y="18" width="20" height="26" rx="2" fill="#4f6ef7"/>' +
-  '<circle cx="32" cy="49" r="2.2" fill="#fff"/>' +
-  '</svg>');
-
-self.addEventListener('push', (event) => {
-  let data = {};
-  try {
-    data = event.data ? event.data.json() : {};
-  } catch { /* 非 JSON 载荷忽略 */ }
-  event.waitUntil(
-    self.registration.showNotification(data.title || 'DSH Pocket', {
-      body: data.body || '',
-      icon: ICON,
-      badge: ICON,
-      tag: data.tag || 'dsh-pocket',
-      data: { url: data.url || '/' },
-    }),
-  );
-});
-
-self.addEventListener('notificationclick', (event) => {
-  event.notification.close();
-  const url = event.notification.data?.url || '/';
-  event.waitUntil(
-    self.clients.matchAll({ type: 'window', includeUncontrolled: true }).then((windowClients) => {
-      for (const client of windowClients) {
-        if ('focus' in client) return client.focus();
-      }
-      return self.clients.openWindow(url);
-    }),
-  );
-});

package/lib/push.mjs

@@ -1,154 +0,0 @@
-// dsh-pocket Web Push 服务（Agent 跑完/出错 → 手机推送通知，即使没开页面）
-//
-// 原理：浏览器 Push API（Service Worker + pushManager.subscribe）把订阅
-// 交给我们，我们在 dsh web 进程内用 web-push（VAPID 认证 + RFC 8030 协议）
-// 直接推送到浏览器厂商的推送服务（Chrome→FCM / Firefox→Mozilla / Safari→APNs）。
-// 免费、无需第三方账号；VAPID 密钥与订阅存本机。
-//
-// ⚠️ 硬性前提：Web Push 只在**安全上下文**可用（HTTPS 或 localhost）。
-//    - 公网隧道 https://xxx.trycloudflare.com ✅（人在外面的主场景）
-//    - 桌面 localhost:3080 ✅
-//    - 局域网 http://192.168.x.x ❌（明文 HTTP 没有 Push API）
-
-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';
-const SUBS_FILE = 'subscriptions.json';
-const SETTINGS_FILE = 'settings.json';
-
-function defaultWebPush() {
-  // web-push 是 CJS，ESM 里必须经 createRequire 加载
-  return require('web-push');
-}
-
-/**
- * 创建推送服务。
- * @param {object} opts
- * @param {string} [opts.home]      $DSH_HOME（默认 ~/.dsh）
- * @param {object} [opts.webpush]   web-push 库（测试注入 stub）
- * @param {string} [opts.subject]   VAPID subject（mailto:）
- * @param {object} [opts.log]       日志（默认 console）
- * @param {object} [opts.internals] 测试注入：mkdir/write/read
- * @returns {Promise<PushService>}
- */
-export async function createPushService({
-  home,
-  webpush = defaultWebPush(),
-  subject = 'mailto:shaobeichen@outlook.com',
-  log = console,
-  internals = {},
-} = {}) {
-  const dshHome = home ?? process.env.DSH_HOME ?? join(homedir(), '.dsh');
-  const dir = join(dshHome, DATA_REL);
-  const vapidPath = join(dir, VAPID_FILE);
-  const subsPath = join(dir, SUBS_FILE);
-  const settingsPath = join(dir, SETTINGS_FILE);
-  const mkdirFn = internals.mkdir ?? mkdir;
-  const read = internals.read ?? readFile;
-  const write = internals.write ?? writeFile;
-
-  await mkdirFn(dir, { recursive: true });
-
-  // 开关状态：默认开，持久化到 settings.json
-  let enabled = true;
-  try {
-    const s = JSON.parse(await read(settingsPath, 'utf8'));
-    if (typeof s.enabled === 'boolean') enabled = s.enabled;
-  } catch { /* 默认开 */ }
-  if (internals.enabled !== undefined) enabled = internals.enabled === true;
-
-  // VAPID 密钥：生成一次，持久化
-  let vapid;
-  try {
-    vapid = JSON.parse(await read(vapidPath, 'utf8'));
-  } catch {
-    vapid = webpush.generateVAPIDKeys();
-    await write(vapidPath, JSON.stringify(vapid, null, 2) + '\n', { mode: 0o600 });
-  }
-  webpush.setVapidDetails(subject, vapid.publicKey, vapid.privateKey);
-
-  // 订阅集合：endpoint → subscription
-  let subs = new Map();
-  try {
-    for (const s of JSON.parse(await read(subsPath, 'utf8')) ?? []) {
-      if (s?.endpoint) subs.set(s.endpoint, s);
-    }
-  } catch { /* 空开始 */ }
-
-  const persist = async () => {
-    await write(subsPath, JSON.stringify([...subs.values()], null, 2) + '\n', { mode: 0o600 });
-  };
-
-  return {
-    vapidPublicKey: () => vapid.publicKey,
-    count: () => subs.size,
-    isEnabled: () => enabled,
-
-    /** 设置推送总开关（持久化）。 */
-    async setEnabled(value) {
-      enabled = value === true;
-      await write(settingsPath, JSON.stringify({ enabled }, null, 2) + '\n', { mode: 0o600 });
-      return enabled;
-    },
-
-    /** 记录浏览器订阅。 */
-    async subscribe(subscription) {
-      if (!subscription?.endpoint || !subscription?.keys) return false;
-      subs.set(subscription.endpoint, subscription);
-      await persist();
-      return true;
-    },
-
-    /** 按 endpoint 取消订阅。 */
-    async unsubscribe(endpoint) {
-      const removed = subs.delete(endpoint);
-      if (removed) await persist();
-      return removed;
-    },
-
-    /**
-     * 推送通知到所有订阅；失效订阅自动清理。
-     * @param {object} opts
-     * @param {string} opts.title
-     * @param {string} [opts.body]
-     * @param {string} [opts.url]     点击通知打开的地址（默认 /）
-     * @param {object} [opts.data]     额外载荷
-     */
-    async notify({ title, body = '', url = '/', data = {} }) {
-      if (!enabled || subs.size === 0) return 0;
-      const payload = JSON.stringify({ title, body, url, ...data });
-      let sent = 0;
-      for (const [endpoint, sub] of [...subs.entries()]) {
-        try {
-          await webpush.sendNotification(sub, payload, { TTL: 600 });
-          sent += 1;
-        } catch (err) {
-          // 410 Gone / 404 = 订阅失效，清理
-          const code = err?.statusCode;
-          if (code === 410 || code === 404) {
-            subs.delete(endpoint);
-            await persist();
-          } else {
-            // 完整记录状态码与响应体，方便判断是 FCM 拒绝（401/403）还是网络/代理问题
-            log.warn?.(
-              'dsh-pocket: push send failed | 推送失败: %s (status=%s, body=%s, endpoint=%s…)',
-              err?.message ?? String(err),
-              code ?? '?',
-              String(err?.body ?? '').slice(0, 200),
-              String(endpoint).slice(0, 48),
-            );
-          }
-        }
-      }
-      return sent;
-    },
-
-    async dispose() { /* 无长连接需要清理 */ },
-  };
-}