dsh-pocket 1.0.4 → 1.0.5

package/client/api.js

@@ -10,8 +10,26 @@ export const POCKET_ENDPOINTS = Object.freeze({
   pushUnsubscribe: 'push.unsubscribe',
   pushStatus: 'push.status',
   pushSetEnabled: 'push.setEnabled',
+  version: 'pocket.version',
+  update: 'pocket.update',
 });
 
+/** 语义化版本比较：a > b 返回正数，相等 0，a < b 负数（仅数字段；带预发布后缀的更旧）。 */
+export function compareVersions(a, b) {
+  const pa = String(a).replace(/^v/, '').split('.');
+  const pb = String(b).replace(/^v/, '').split('.');
+  for (let i = 0; i < 3; i++) {
+    const x = parseInt(pa[i], 10) || 0;
+    const y = parseInt(pb[i], 10) || 0;
+    if (x !== y) return x - y;
+  }
+  // 数字段相等：带预发布（-）的更旧
+  const aPre = /-/.test(pa[2] ?? '');
+  const bPre = /-/.test(pb[2] ?? '');
+  if (aPre !== bPre) return aPre ? -1 : 1;
+  return 0;
+}
+
 /** 浏览器可见的状态字段（无敏感信息；含二维码 data URL）。 */
 export function redactStatus(s) {
   return {

package/client/client.js

@@ -42,8 +42,23 @@ var POCKET_ENDPOINTS = Object.freeze({
   pushSubscribe: "push.subscribe",
   pushUnsubscribe: "push.unsubscribe",
   pushStatus: "push.status",
-  pushSetEnabled: "push.setEnabled"
+  pushSetEnabled: "push.setEnabled",
+  version: "pocket.version",
+  update: "pocket.update"
 });
+function compareVersions(a, b) {
+  const pa = String(a).replace(/^v/, "").split(".");
+  const pb = String(b).replace(/^v/, "").split(".");
+  for (let i = 0; i < 3; i++) {
+    const x = parseInt(pa[i], 10) || 0;
+    const y = parseInt(pb[i], 10) || 0;
+    if (x !== y) return x - y;
+  }
+  const aPre = /-/.test(pa[2] ?? "");
+  const bPre = /-/.test(pb[2] ?? "");
+  if (aPre !== bPre) return aPre ? -1 : 1;
+  return 0;
+}
 function redactStatus(s) {
   return {
     proxyRunning: s?.proxyRunning === true,
@@ -1288,6 +1303,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 [updateInfo, setUpdateInfo] = (0, import_react2.useState)(null);
   const call = async (endpoint, payload) => {
     const res = await rpcCall(endpoint, payload);
     if (!res?.ok) throw new Error(res?.error?.message ?? "RPC failed");
@@ -1308,6 +1324,33 @@ function PocketSettingsTab({ rpcCall }) {
     call(POCKET_ENDPOINTS.pushStatus, {}).then((s) => setPushEnabled(s.enabled)).catch(() => {
     });
   }, []);
+  (0, import_react2.useEffect)(() => {
+    let alive = true;
+    (async () => {
+      try {
+        const v = await call(POCKET_ENDPOINTS.version, {});
+        const meta = await (await fetch("https://registry.npmjs.org/dsh-pocket/latest")).json();
+        if (!alive) return;
+        const latest = typeof meta?.version === "string" ? meta.version : null;
+        if (latest && v.current && compareVersions(latest, v.current) > 0) {
+          setUpdateInfo({ current: v.current, latest, updating: false, result: null });
+        }
+      } catch {
+      }
+    })();
+    return () => {
+      alive = false;
+    };
+  }, []);
+  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 }));
+    } catch (err) {
+      setUpdateInfo((u) => ({ ...u, updating: false, result: "fail", output: err.message }));
+    }
+  };
   const enablePush = async () => {
     await call(POCKET_ENDPOINTS.pushSetEnabled, { enabled: true });
     setPushEnabled(true);
@@ -1358,6 +1401,22 @@ function PocketSettingsTab({ rpcCall }) {
       (0, import_react2.createElement)("strong", null, "\u{1F4F1} \u624B\u673A\u8BBF\u95EE | Phone access"),
       (0, import_react2.createElement)("div", { style: styles.muted }, "\u624B\u673A\u626B\u7801\u6253\u5F00\u7684\u5C31\u662F\u7535\u8111\u4E0A\u7684\u8FD9\u4E2A\u754C\u9762\uFF0C\u5B9E\u65F6\u540C\u6B65 | the phone shows this exact screen, live")
     ),
+    // 更新提示
+    updateInfo ? (0, import_react2.createElement)(
+      "div",
+      { style: { ...styles.block, border: "1px solid var(--dsw-alias-state-warn-primary,#b45309)", borderRadius: 8, background: "var(--dsw-alias-bg-layer-2,#f3f4f6)", padding: "10px 12px" } },
+      (0, import_react2.createElement)(
+        "div",
+        { style: { display: "flex", alignItems: "center", justifyContent: "space-between", gap: 8 } },
+        (0, import_react2.createElement)("div", { style: { fontWeight: 600, fontSize: 13 } }, `\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`) : null
+      ),
+      (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 \u66F4\u65B0\u5931\u8D25\uFF1A${updateInfo.output || "\u672A\u77E5"}\uFF08\u4E5F\u53EF\u624B\u52A8\u6267\u884C dsh plugin --profile web update dsh-pocket --latest -w\uFF09` : `\u5F53\u524D v${updateInfo.current} \u2192 \u6700\u65B0 v${updateInfo.latest}`
+      )
+    ) : null,
     // 局域网
     (0, import_react2.createElement)(
       "div",

package/client/index.jsx

@@ -7,7 +7,7 @@
 
 import { createElement as h, useEffect, useState } from 'react';
 
-import { POCKET_RPC_CHANNEL, POCKET_ENDPOINTS, redactStatus } from './api.js';
+import { POCKET_RPC_CHANNEL, POCKET_ENDPOINTS, redactStatus, compareVersions } from './api.js';
 import { mobileApply } from './mobile/mobile-apply.tsx';
 
 const name = 'dsh-pocket';
@@ -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 [updateInfo, setUpdateInfo] = useState(null); // { current, latest, updating, result } | null
 
   const call = async (endpoint, payload) => {
     const res = await rpcCall(endpoint, payload);
@@ -82,6 +83,34 @@ function PocketSettingsTab({ rpcCall }) {
     call(POCKET_ENDPOINTS.pushStatus, {}).then((s) => setPushEnabled(s.enabled)).catch(() => {});
   }, []);
 
+  // 版本检测：host 当前版本 vs npm registry latest（registry 带 CORS *）
+  useEffect(() => {
+    let alive = true;
+    (async () => {
+      try {
+        const v = await call(POCKET_ENDPOINTS.version, {});
+        const meta = await (await fetch('https://registry.npmjs.org/dsh-pocket/latest')).json();
+        if (!alive) return;
+        const latest = typeof meta?.version === 'string' ? meta.version : null;
+        if (latest && v.current && compareVersions(latest, v.current) > 0) {
+          setUpdateInfo({ current: v.current, latest, updating: false, result: null });
+        }
+      } catch { /* 网络失败静默 */ }
+    })();
+    return () => { alive = false; };
+  }, []);
+
+  // 一键更新：调宿主 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 }));
+    } catch (err) {
+      setUpdateInfo((u) => ({ ...u, updating: false, result: 'fail', output: err.message }));
+    }
+  };
+
   // 开启推送：宿主开关开 + 浏览器订阅（安全上下文才有效）
   const enablePush = async () => {
     await call(POCKET_ENDPOINTS.pushSetEnabled, { enabled: true });
@@ -132,6 +161,20 @@ function PocketSettingsTab({ rpcCall }) {
       h('div', { style: styles.muted }, '手机扫码打开的就是电脑上的这个界面，实时同步 | the phone shows this exact screen, live'),
     ),
 
+    // 更新提示
+    updateInfo ? h('div', { style: { ...styles.block, border: '1px 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 } }, `📦 新版本 v${updateInfo.latest} | Update available`),
+        updateInfo.result !== 'ok'
+          ? h('button', { style: styles.primary, onClick: runUpdate, disabled: updateInfo.updating }, updateInfo.updating ? '更新中…' : `更新到 v${updateInfo.latest} | Update`)
+          : null,
+      ),
+      h('div', { style: styles.muted, marginTop: 4 },
+        updateInfo.result === 'ok' ? '✅ 已更新，重启 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,
+
     // 局域网
     h('div', { style: styles.block },
       h('div', { style: { fontWeight: 600, fontSize: 13 } }, '📶 局域网（同一 WiFi）| LAN'),

package/lib/index.js

@@ -1,13 +1,16 @@
 // dsh-pocket 插件入口（单包单插件：手机扫码访问 DSH，全在这一个包里）
 //
-// 设置页「设置 → 插件 → 手机访问」：
+// 设置一级入口「手机访问」：
 //   - 局域网二维码：自动显示（代理随插件启动）
 //   - 公网二维码：点「开启公网」→ cloudflared 隧道 → 扫码即用，人在外面也能访问
 //   - Web Push：agent 跑完/出错 → 手机推送通知（需 HTTPS 公网路径或 localhost）
+//   - 更新提示：有新版本时显示一键更新按钮（dsh plugin update --latest）
 // 手机看到的界面 = 电脑上的 dsh web，实时同步（WebSocket 透传）。
 
 import { readFile } from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
+import { spawn } from 'node:child_process';
+import { createRequire } from 'node:module';
 
 import { createPocketService } from './service.mjs';
 import { installPocketRpc } from './web-rpc.js';
@@ -15,6 +18,38 @@ import { createPushService } from './push.mjs';
 
 const name = 'dsh-pocket';
 const inject = ['connection', 'webServer'];
+const require = createRequire(import.meta.url);
+
+/** 本插件已安装版本（读取自己的 package.json）。 */
+function currentVersion() {
+  try {
+    return require('../package.json').version;
+  } catch {
+    return '0.0.0';
+  }
+}
+
+/** 执行更新：dsh plugin --profile <p> update dsh-pocket --latest -w（超时保护）。 */
+function performUpdate(profile, { timeoutMs = 180_000 } = {}) {
+  return new Promise((resolve) => {
+    const child = spawn('dsh', ['plugin', '--profile', profile, 'update', 'dsh-pocket', '--latest', '-w'], {
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    let out = '';
+    const onData = (c) => { out += String(c); if (out.length > 4000) out = out.slice(-4000); };
+    child.stdout.on('data', onData);
+    child.stderr.on('data', onData);
+    const timer = setTimeout(() => child.kill(), timeoutMs);
+    child.once('exit', (code) => {
+      clearTimeout(timer);
+      resolve({ ok: code === 0, code, output: out.slice(-800) });
+    });
+    child.once('error', (err) => {
+      clearTimeout(timer);
+      resolve({ ok: false, error: err.message });
+    });
+  });
+}
 
 // 服务 worker 源码（同源提供：/pocket-sw.js）
 const SW_SOURCE = new URL('./pocket-sw.js', import.meta.url);
@@ -45,7 +80,8 @@ export function apply(ctx, config = {}, internals = {}) {
   const disposers = [];
   const disposeRpc = installPocketRpc(ctx, {
     service,
-    push: internals.push ?? { vapidPublicKey: () => '', count: () => 0, subscribe: async () => false, unsubscribe: async () => false },
+    push: internals.push ?? { vapidPublicKey: () => '', count: () => 0, subscribe: async () => false, unsubscribe: async () => false, isEnabled: () => true, setEnabled: async () => true },
+    runUpdate: internals.runUpdate ?? { currentVersion, perform: performUpdate },
     log: logger,
   });
   disposers.push(disposeRpc);

package/lib/web-rpc.js

@@ -17,7 +17,7 @@ function fail(code, message) {
 }
 
 /** 注册 /dsh-pocket 逻辑通道（仅本机 loopback 可调）。 */
-export function installPocketRpc(ctx, { service, push, log = console }) {
+export function installPocketRpc(ctx, { service, push, log = console, runUpdate = null }) {
   if (!ctx?.connection?.rpc?.handle) {
     log.warn?.('dsh-pocket: DSH Host Connection RPC unavailable — settings tab disabled | 无 Connection RPC，设置页不可用');
     return () => {};
@@ -55,6 +55,14 @@ export function installPocketRpc(ctx, { service, push, log = console }) {
         const enabled = await push.setEnabled(payload?.enabled === true);
         return ok({ enabled, count: push.count() });
       }
+      if (endpoint === POCKET_ENDPOINTS.version) {
+        return ok({ current: runUpdate?.currentVersion?.() ?? null });
+      }
+      if (endpoint === POCKET_ENDPOINTS.update) {
+        if (!runUpdate) return fail('bad-request', '更新不可用 | update unavailable');
+        const result = await runUpdate.perform(payload?.profile ?? 'web');
+        return ok(result);
+      }
       return fail('bad-request', `Unknown endpoint: ${endpoint}`);
     } catch (err) {
       log.error?.('dsh-pocket: rpc %s failed | RPC 失败: %s', endpoint, err?.message ?? err);

package/package.json

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