dsh-pocket 1.0.2 → 1.0.4

package/client/api.js

@@ -9,6 +9,7 @@ export const POCKET_ENDPOINTS = Object.freeze({
   pushSubscribe: 'push.subscribe',
   pushUnsubscribe: 'push.unsubscribe',
   pushStatus: 'push.status',
+  pushSetEnabled: 'push.setEnabled',
 });
 
 /** 浏览器可见的状态字段（无敏感信息；含二维码 data URL）。 */

package/client/client.js

@@ -41,7 +41,8 @@ var POCKET_ENDPOINTS = Object.freeze({
   pushVapidKey: "push.vapidKey",
   pushSubscribe: "push.subscribe",
   pushUnsubscribe: "push.unsubscribe",
-  pushStatus: "push.status"
+  pushStatus: "push.status",
+  pushSetEnabled: "push.setEnabled"
 });
 function redactStatus(s) {
   return {
@@ -1285,6 +1286,7 @@ 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 call = async (endpoint, payload) => {
     const res = await rpcCall(endpoint, payload);
@@ -1303,8 +1305,31 @@ function PocketSettingsTab({ rpcCall }) {
     return () => clearInterval(t);
   }, []);
   (0, import_react2.useEffect)(() => {
-    setupPush(rpcCall).then(setPushState);
+    call(POCKET_ENDPOINTS.pushStatus, {}).then((s) => setPushEnabled(s.enabled)).catch(() => {
+    });
   }, []);
+  const enablePush = async () => {
+    await call(POCKET_ENDPOINTS.pushSetEnabled, { enabled: true });
+    setPushEnabled(true);
+    setPushState(await setupPush(rpcCall));
+  };
+  const disablePush = async () => {
+    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");
+  };
   const startTunnel = async () => {
     setBusy(true);
     setError(null);
@@ -1365,15 +1390,20 @@ 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 状态
+    // Web Push 状态 + 开关
     (0, import_react2.createElement)(
       "div",
       { style: styles.block },
-      (0, import_react2.createElement)("div", { style: { fontWeight: 600, fontSize: 13 } }, "\u{1F514} \u63A8\u9001\u901A\u77E5 | Push notifications"),
+      (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 },
-        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" ? "\u5F53\u524D\u6D4F\u89C8\u5668\u4E0D\u652F\u6301\u63A8\u9001 | this browser does not support push" : pushState === "insecure" ? "\u9700\u8981 HTTPS\uFF08\u516C\u7F51\u96A7\u9053\uFF09\u6216 localhost \u624D\u80FD\u5F00\u542F\u63A8\u9001 | push needs HTTPS (public tunnel) or localhost" : pushState === "checking" ? "\u68C0\u67E5\u4E2D\u2026 | checking\u2026" : "\u63A8\u9001\u672A\u5F00\u542F | push not enabled"
+        !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
@@ -1383,13 +1413,13 @@ function apply(ctx) {
   mobileApply(ctx);
   const rpcCall = (endpoint, payload, signal) => ctx.connection.rpc.call(POCKET_RPC_CHANNEL, endpoint, payload, signal);
   ctx.slots.inject(
-    "settings.plugins.tab",
+    "settings.section",
     () => ctx.slots.register(
       {
-        name: "settings.plugins.tab",
+        name: "settings.section",
         id: "pocket",
-        order: 10,
-        label: "\u624B\u673A\u8BBF\u95EE",
+        order: 1,
+        label: () => "\u624B\u673A\u8BBF\u95EE",
         inject: () => ({ rpcCall })
       },
       PocketSettingsTab

package/client/index.jsx

@@ -58,6 +58,7 @@ 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 call = async (endpoint, payload) => {
@@ -76,11 +77,36 @@ function PocketSettingsTab({ rpcCall }) {
     return () => clearInterval(t);
   }, []);
 
-  // Web Push 订阅（只跑一次）
+  // 读取宿主开关状态
   useEffect(() => {
-    setupPush(rpcCall).then(setPushState);
+    call(POCKET_ENDPOINTS.pushStatus, {}).then((s) => setPushEnabled(s.enabled)).catch(() => {});
   }, []);
 
+  // 开启推送：宿主开关开 + 浏览器订阅（安全上下文才有效）
+  const enablePush = async () => {
+    await call(POCKET_ENDPOINTS.pushSetEnabled, { enabled: true });
+    setPushEnabled(true);
+    setPushState(await setupPush(rpcCall));
+  };
+
+  // 关闭推送：取消浏览器订阅 + 宿主开关关
+  const disablePush = async () => {
+    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');
+  };
+
   const startTunnel = async () => {
     setBusy(true);
     setError(null);
@@ -134,15 +160,21 @@ function PocketSettingsTab({ rpcCall }) {
         ),
     ),
 
-    // Web Push 状态
+    // Web Push 状态 + 开关
     h('div', { style: styles.block },
-      h('div', { style: { fontWeight: 600, fontSize: 13 } }, '🔔 推送通知 | Push notifications'),
+      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 },
-        pushState === 'on' ? '已开启：agent 跑完/出错时手机收到通知 | on: notified when tasks finish or fail'
-        : pushState === 'unsupported' ? '当前浏览器不支持推送 | this browser does not support push'
-        : pushState === 'insecure' ? '需要 HTTPS（公网隧道）或 localhost 才能开启推送 | push needs HTTPS (public tunnel) or localhost'
+        !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 enabled'),
+        : '推送未生效 | push not active'),
     ),
 
     error ? h('div', { style: { color: 'var(--dsw-alias-state-error-primary,#dc2626)', fontSize: 12, marginTop: 8 } }, `❌ ${error}`) : null,
@@ -156,13 +188,14 @@ export function apply(ctx) {
   const rpcCall = (endpoint, payload, signal) =>
     ctx.connection.rpc.call(POCKET_RPC_CHANNEL, endpoint, payload, signal);
 
-  ctx.slots.inject('settings.plugins.tab', () =>
+  // 设置一级入口（与 通用设置/模型/插件 同级，order 1 = 通用之后、最外层）
+  ctx.slots.inject('settings.section', () =>
     ctx.slots.register(
       {
-        name: 'settings.plugins.tab',
+        name: 'settings.section',
         id: 'pocket',
-        order: 10,
-        label: '手机访问',
+        order: 1,
+        label: () => '手机访问',
         inject: () => ({ rpcCall }),
       },
       PocketSettingsTab,

package/lib/push.mjs

@@ -17,6 +17,7 @@ import { join, dirname } from 'node:path';
 const DATA_REL = join('dsh-pocket', 'push');
 const VAPID_FILE = 'vapid.json';
 const SUBS_FILE = 'subscriptions.json';
+const SETTINGS_FILE = 'settings.json';
 
 function defaultWebPush() {
   // 动态 require（web-push 是 CJS）
@@ -42,12 +43,21 @@ export async function createPushService({
   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 {
@@ -73,6 +83,14 @@ export async function createPushService({
   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) {
@@ -98,7 +116,7 @@ export async function createPushService({
      * @param {object} [opts.data]     额外载荷
      */
     async notify({ title, body = '', url = '/', data = {} }) {
-      if (subs.size === 0) return 0;
+      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()]) {

package/lib/web-rpc.js

@@ -49,7 +49,11 @@ export function installPocketRpc(ctx, { service, push, log = console }) {
         return ok({ removed, count: push.count() });
       }
       if (endpoint === POCKET_ENDPOINTS.pushStatus) {
-        return ok({ enabled: push.count() > 0, count: push.count() });
+        return ok({ enabled: push.isEnabled(), count: push.count() });
+      }
+      if (endpoint === POCKET_ENDPOINTS.pushSetEnabled) {
+        const enabled = await push.setEnabled(payload?.enabled === true);
+        return ok({ enabled, count: push.count() });
       }
       return fail('bad-request', `Unknown endpoint: ${endpoint}`);
     } catch (err) {

package/package.json

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