dsh-pocket 1.0.14 → 1.0.16

package/README.en.md

@@ -8,10 +8,10 @@
 
 <p align="center">
   <a href="https://www.npmjs.com/package/dsh-pocket"><img alt="npm" src="https://img.shields.io/npm/v/dsh-pocket?color=4d6bfe&label=npm"></a>
-  <a href="https://www.npmjs.com/package/dsh-pocket"><img alt="downloads" src="https://img.shields.io/npm/dm/dsh-pocket?color=4d6bfe"></a>
   <a href="https://github.com/shaobeichen/dsh-pocket/actions"><img alt="CI" src="https://github.com/shaobeichen/dsh-pocket/actions/workflows/npm-publish.yml/badge.svg"></a>
   <a href="LICENSE"><img alt="License: MIT" src="https://img.shields.io/badge/license-GPL--2.0-red.svg"></a>
   <a href="https://github.com/shaobeichen/dsh-pocket/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/shaobeichen/dsh-pocket"></a>
+  <a href="https://awesome-dsh-plugin.com"><img alt="Awesome DSH Plugin" src="https://awesome-dsh-plugin.com/badge.svg"></a>
 </p>
 
 > Put **DeepSeek Harness in your pocket**: one package, one settings tab — scan a QR code and your phone shows exactly what's on your computer screen, live, from anywhere.

package/README.md

@@ -8,10 +8,10 @@
 
 <p align="center">
   <a href="https://www.npmjs.com/package/dsh-pocket"><img alt="npm" src="https://img.shields.io/npm/v/dsh-pocket?color=4d6bfe&label=npm"></a>
-  <a href="https://www.npmjs.com/package/dsh-pocket"><img alt="downloads" src="https://img.shields.io/npm/dm/dsh-pocket?color=4d6bfe"></a>
   <a href="https://github.com/shaobeichen/dsh-pocket/actions"><img alt="CI" src="https://github.com/shaobeichen/dsh-pocket/actions/workflows/npm-publish.yml/badge.svg"></a>
   <a href="LICENSE"><img alt="License: MIT" src="https://img.shields.io/badge/license-GPL--2.0-red.svg"></a>
   <a href="https://github.com/shaobeichen/dsh-pocket/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/shaobeichen/dsh-pocket"></a>
+  <a href="https://awesome-dsh-plugin.com/zh/"><img alt="Awesome DSH Plugin" src="https://awesome-dsh-plugin.com/badge.svg"></a>
 </p>
 
 > 把 **DeepSeek Harness 装进你的口袋**：一个包、一个设置页，手机扫二维码就实时看到电脑上的同一个界面——人在外面也能用。

package/client/client.js

@@ -1341,6 +1341,8 @@ function PocketSettingsTab({ rpcCall }) {
         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 });
+        } else if (v.current && v.loaded && compareVersions(v.current, v.loaded) > 0) {
+          setUpdateInfo({ current: v.current, latest: v.current, updating: false, result: "ok", updated: true });
         }
       } catch {
       }
@@ -1449,7 +1451,11 @@ function PocketSettingsTab({ rpcCall }) {
       (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`),
+        (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.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)(

package/client/index.jsx

@@ -91,6 +91,7 @@ function PocketSettingsTab({ rpcCall }) {
   }, []);
 
   // 版本检测：host 当前版本 vs npm registry latest（registry 带 CORS *）
+  // 两种情况显示横幅：① 有新版可更新；② 磁盘已更新但进程还是旧代码（重启生效）
   useEffect(() => {
     let alive = true;
     (async () => {
@@ -101,6 +102,9 @@ function PocketSettingsTab({ rpcCall }) {
         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 });
+        } else if (v.current && v.loaded && compareVersions(v.current, v.loaded) > 0) {
+          // 已更新未重启：显示「已更新，重启生效」+ 重启按钮
+          setUpdateInfo({ current: v.current, latest: v.current, updating: false, result: 'ok', updated: true });
         }
       } catch { /* 网络失败静默 */ }
     })();
@@ -200,7 +204,10 @@ function PocketSettingsTab({ rpcCall }) {
     // 更新提示
     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`),
+        h('div', { style: { fontWeight: 600, fontSize: 13 } },
+          updateInfo.updated
+            ? `✅ 已更新 v${updateInfo.current}，重启生效 | Updated — restart to apply`
+            : `📦 新版本 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'),

package/lib/index.js

@@ -10,6 +10,7 @@
 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 } from 'node:fs/promises';
 import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';
@@ -23,15 +24,23 @@ const name = 'dsh-pocket';
 const inject = ['connection', 'webServer'];
 const require = createRequire(import.meta.url);
 
-/** 本插件已安装版本（读取自己的 package.json）。 */
+const pkgPath = fileURLToPath(new URL('../package.json', import.meta.url));
+
+/**
+ * 本插件磁盘上的已安装版本。注意：**不能用 require 缓存**（进程内永远不变），
+ * 必须实时读文件——一键更新会改写 package.json，「已更新未重启」靠它识别。
+ */
 function currentVersion() {
   try {
-    return require('../package.json').version;
+    return JSON.parse(readFileSync(pkgPath, 'utf8')).version;
   } catch {
     return '0.0.0';
   }
 }
 
+/** 进程启动时加载的版本（模块加载瞬间固化；用于识别「磁盘已更新但进程还是旧代码」）。 */
+const loadedVersion = currentVersion();
+
 const restartNoticeRel = join('dsh-pocket', 'restarted.json');
 function restartNoticePath() {
   return join(process.env.DSH_HOME ?? join(homedir(), '.dsh'), restartNoticeRel);
@@ -107,7 +116,7 @@ export function apply(ctx, config = {}, internals = {}) {
   const disposeRpc = installPocketRpc(ctx, {
     service,
     push: internals.push ?? { vapidPublicKey: () => '', count: () => 0, subscribe: async () => false, unsubscribe: async () => false, isEnabled: () => true, setEnabled: async () => true },
-    runUpdate: internals.runUpdate ?? { currentVersion, perform: performUpdate },
+    runUpdate: internals.runUpdate ?? { currentVersion, perform: performUpdate, loadedVersion: () => loadedVersion },
     restart: internals.restart ?? pocketRestart,
     restartNotice: internals.restartNotice ?? readRestartNotice,
     log: logger,

package/lib/web-rpc.js

@@ -63,7 +63,7 @@ export function installPocketRpc(ctx, { service, push, log = console, runUpdate
         return ok({ enabled, count: push.count() });
       }
       if (endpoint === POCKET_ENDPOINTS.version) {
-        return ok({ current: runUpdate?.currentVersion?.() ?? null });
+        return ok({ current: runUpdate?.currentVersion?.() ?? null, loaded: runUpdate?.loadedVersion?.() ?? null });
       }
       if (endpoint === POCKET_ENDPOINTS.update) {
         if (!runUpdate) return fail('bad-request', '更新不可用 | update unavailable');

package/package.json

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