dsh-pocket 1.0.10 → 1.0.11

package/client/api.js

@@ -12,6 +12,7 @@ export const POCKET_ENDPOINTS = Object.freeze({
   pushSetEnabled: 'push.setEnabled',
   version: 'pocket.version',
   update: 'pocket.update',
+  restart: 'pocket.restart',
 });
 
 /** 语义化版本比较：a > b 返回正数，相等 0，a < b 负数（仅数字段；带预发布后缀的更旧）。 */

package/client/client.js

@@ -44,7 +44,8 @@ var POCKET_ENDPOINTS = Object.freeze({
   pushStatus: "push.status",
   pushSetEnabled: "push.setEnabled",
   version: "pocket.version",
-  update: "pocket.update"
+  update: "pocket.update",
+  restart: "pocket.restart"
 });
 function compareVersions(a, b) {
   const pa = String(a).replace(/^v/, "").split(".");
@@ -1346,6 +1347,14 @@ function PocketSettingsTab({ rpcCall }) {
       alive = false;
     };
   }, []);
+  const restartPocket = async () => {
+    setUpdateInfo((u) => ({ ...u, restarting: true }));
+    try {
+      await call(POCKET_ENDPOINTS.restart, {});
+    } catch (err) {
+      setUpdateInfo((u) => ({ ...u, restarting: false, result: "fail", output: err.message }));
+    }
+  };
   const runUpdate = async () => {
     setUpdateInfo((u) => ({ ...u, updating: true, result: null }));
     try {
@@ -1414,9 +1423,9 @@ function PocketSettingsTab({ rpcCall }) {
         (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")
       ),
       (0, import_react2.createElement)(
-        "a",
-        { href: "https://github.com/shaobeichen/dsh-pocket/issues", target: "_blank", rel: "noreferrer", style: { fontSize: 12, color: "var(--dsw-alias-label-tertiary,#8b93a1)", textDecoration: "none", whiteSpace: "nowrap" } },
-        "\u5F00\u53D1\u8005\uFF1A\u7A0B\u5E8F\u5458\u5C11\u5317\u6668 | by \u5C11\u5317\u6668"
+        "div",
+        { style: { fontSize: 12, color: "var(--dsw-alias-label-tertiary,#8b93a1)", whiteSpace: "nowrap" } },
+        "\u5F00\u53D1\u8005\uFF1A\u7A0B\u5E8F\u5458\u5C11\u5317\u6668"
       )
     ),
     // 更新提示
@@ -1427,7 +1436,7 @@ function PocketSettingsTab({ rpcCall }) {
         "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`) : (0, import_react2.createElement)("button", { style: styles.btn, onClick: () => window.location.reload() }, "\u{1F504} \u5237\u65B0\u9875\u9762 | Refresh")
+        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")
       ),
       (0, import_react2.createElement)(
         "div",
@@ -1487,7 +1496,17 @@ function PocketSettingsTab({ rpcCall }) {
         !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
+    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)(
+      "div",
+      { style: { ...styles.block, textAlign: "center" } },
+      (0, import_react2.createElement)(
+        "a",
+        { href: "https://github.com/shaobeichen/dsh-pocket/issues", target: "_blank", rel: "noreferrer", style: { fontSize: 12, color: "var(--dsw-alias-label-secondary,#6b7280)", textDecoration: "none" } },
+        "\u6709\u95EE\u9898\uFF1F\u6B22\u8FCE\u5230 GitHub Issues \u53CD\u9988 \u{1F64F} | Questions? Open an issue on GitHub"
+      )
+    )
   );
 }
 function apply(ctx) {

package/client/index.jsx

@@ -105,6 +105,17 @@ function PocketSettingsTab({ rpcCall }) {
     return () => { alive = false; };
   }, []);
 
+  // 重启宿主（更新生效必需：刷新页面不会重载服务端代码）
+  const restartPocket = async () => {
+    setUpdateInfo((u) => ({ ...u, restarting: true }));
+    try {
+      await call(POCKET_ENDPOINTS.restart, {});
+      // 宿主即将退出重启，无需更多处理
+    } catch (err) {
+      setUpdateInfo((u) => ({ ...u, restarting: false, result: 'fail', output: err.message }));
+    }
+  };
+
   // 一键更新：调宿主 dsh plugin update
   const runUpdate = async () => {
     setUpdateInfo((u) => ({ ...u, updating: true, result: null }));
@@ -171,8 +182,8 @@ function PocketSettingsTab({ rpcCall }) {
         h('strong', null, '📱 手机访问 | Phone access'),
         h('div', { style: styles.muted }, '手机扫码打开的就是电脑上的这个界面，实时同步 | the phone shows this exact screen, live'),
       ),
-      h('a', { href: 'https://github.com/shaobeichen/dsh-pocket/issues', target: '_blank', rel: 'noreferrer', style: { fontSize: 12, color: 'var(--dsw-alias-label-tertiary,#8b93a1)', textDecoration: 'none', whiteSpace: 'nowrap' } },
-        '开发者：程序员少北晨 | by 少北晨'),
+      h('div', { style: { fontSize: 12, color: 'var(--dsw-alias-label-tertiary,#8b93a1)', whiteSpace: 'nowrap' } },
+        '开发者：程序员少北晨'),
     ),
 
     // 更新提示
@@ -181,7 +192,7 @@ function PocketSettingsTab({ rpcCall }) {
         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`)
-          : h('button', { style: styles.btn, onClick: () => window.location.reload() }, '🔄 刷新页面 | Refresh'),
+          : 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'
@@ -238,6 +249,12 @@ function PocketSettingsTab({ rpcCall }) {
     ),
 
     error ? h('div', { style: { color: 'var(--dsw-alias-state-error-primary,#dc2626)', fontSize: 12, marginTop: 8 } }, `❌ ${error}`) : null,
+
+    // 页面最底部：反馈入口
+    h('div', { style: { ...styles.block, textAlign: 'center' } },
+      h('a', { href: 'https://github.com/shaobeichen/dsh-pocket/issues', target: '_blank', rel: 'noreferrer', style: { fontSize: 12, color: 'var(--dsw-alias-label-secondary,#6b7280)', textDecoration: 'none' } },
+        '有问题？欢迎到 GitHub Issues 反馈 🙏 | Questions? Open an issue on GitHub'),
+    ),
   );
 }
 

package/lib/index.js

@@ -15,6 +15,7 @@ import { createRequire } from 'node:module';
 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';
 const inject = ['connection', 'webServer'];
@@ -83,6 +84,7 @@ export function apply(ctx, config = {}, internals = {}) {
     service,
     push: internals.push ?? { vapidPublicKey: () => '', count: () => 0, subscribe: async () => false, unsubscribe: async () => false, isEnabled: () => true, setEnabled: async () => true },
     runUpdate: internals.runUpdate ?? { currentVersion, perform: performUpdate },
+    restart: internals.restart ?? (() => restartHost({ internals })),
     log: logger,
   });
   disposers.push(disposeRpc);

package/lib/restart.js

@@ -0,0 +1,45 @@
+// dsh-pocket 自重启：重新拉起启动本宿主的确切 dsh 调用（脱离父进程），
+// 让更新后的插件代码生效——用户无需离开界面手动重启（借鉴 dshmarket 的
+// self-restart 方案，见 https://github.com/dsh-market/dsh-market lib/restart.js）。
+//
+// 原理：本插件运行在 dsh web 进程内，process.argv 即 dsh CLI 的启动参数
+// （如 node <bin.js> web [flags]）。用相同参数 detached 拉起新进程，
+// 短暂等待后旧进程退出，新进程接管端口。
+
+import { spawn } from 'node:child_process';
+
+/**
+ * 重建启动调用（与当前宿主相同的命令）。
+ * @returns {{file:string, args:string[]}}
+ */
+export function restartLaunch() {
+  return {
+    file: process.argv[0], // node
+    args: [process.argv[1], ...process.argv.slice(2)], // <bin.js> + web [flags]
+  };
+}
+
+/**
+ * 拉起替代宿主（detached），随后退出当前进程。
+ * @param {object} opts
+ * @param {number} [opts.exitDelayMs] 等待新进程接管后再退出（默认 800ms）
+ * @param {object} [opts.internals] 测试注入：spawnFn / exitFn
+ * @returns {{spawned:boolean, file:string}}
+ */
+export function restartHost({ exitDelayMs = 800, internals = {} } = {}) {
+  const spawnFn = internals.spawn ?? spawn;
+  const exitFn = internals.exit ?? ((code) => process.exit(code));
+  const { file, args } = restartLaunch();
+  try {
+    const child = spawnFn(file, args, {
+      detached: true,
+      stdio: 'ignore',
+      env: process.env,
+    });
+    child.unref?.();
+    setTimeout(() => exitFn(0), exitDelayMs);
+    return { spawned: true, file };
+  } catch (err) {
+    return { spawned: false, error: err?.message ?? String(err) };
+  }
+}

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 }) {
+export function installPocketRpc(ctx, { service, push, log = console, runUpdate = null, restart = null }) {
   if (!ctx?.connection?.rpc?.handle) {
     log.warn?.('dsh-pocket: DSH Host Connection RPC unavailable — settings tab disabled | 无 Connection RPC，设置页不可用');
     return () => {};
@@ -63,6 +63,11 @@ export function installPocketRpc(ctx, { service, push, log = console, runUpdate
         const result = await runUpdate.perform(payload?.profile ?? 'web');
         return ok(result);
       }
+      if (endpoint === POCKET_ENDPOINTS.restart) {
+        if (!restart) return fail('bad-request', '重启不可用 | restart unavailable');
+        const result = restart();
+        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.10"
+  "version": "1.0.11"
 }