dsh-pocket 2.10.4 → 2.10.6

package/client/client.js

@@ -1796,6 +1796,35 @@ function mobileApply(ctx) {
     );
     return startFileGuard(readFile);
   }, "dsh-mobile-nav: file open guard + copy button + hide add-workspace (issue #17)");
+  ctx.effect(() => {
+    if (!narrow.matches) return () => {
+    };
+    const PHRASES = ["加载提供方目录失败", "Settings are unavailable in this browser"];
+    const NOTICE = "手机上不支持模型设置，请去电脑端修改设置";
+    const findDeepest = (el) => {
+      let deepest = el;
+      for (const child of el.querySelectorAll("*")) {
+        if (PHRASES.some((p) => (child.textContent ?? "").includes(p))) deepest = child;
+      }
+      return deepest;
+    };
+    const patch = () => {
+      for (const el of document.querySelectorAll("body *")) {
+        const t = el.textContent ?? "";
+        if (!PHRASES.some((p) => t.includes(p))) continue;
+        if (el.dataset?.dshpModelNotice === "1") continue;
+        const target = findDeepest(el);
+        target.textContent = NOTICE;
+        target.dataset.dshpModelNotice = "1";
+      }
+    };
+    const observer = new MutationObserver(patch);
+    observer.observe(document.body, { childList: true, subtree: true, characterData: true });
+    patch();
+    return () => {
+      observer.disconnect();
+    };
+  }, "dsh-mobile-nav: replace model-settings load error with mobile hint");
   ctx.slots.inject("conversation.session.header.actions", () => ctx.slots.register({
     name: "conversation.session.header.actions",
     id: "mobile-nav-toggle",

package/client/mobile/mobile-apply.tsx

@@ -299,6 +299,38 @@ export function mobileApply(ctx): void {
     return startFileGuard(readFile)
   }, 'dsh-mobile-nav: file open guard + copy button + hide add-workspace (issue #17)')
 
+  // 手机上模型 / 提供方设置加载失败：上游 dsh-web 会渲染「加载提供方目录失败 /
+  // Settings are unavailable in this browser」。这条文案不是 dsh-pocket 的，但手机侧
+  // 本就不支持改模型设置，原报错只会吓到用户。窄屏下用 MutationObserver 就地把该报错
+  // 文本替换成「去电脑端修改」的引导提示（仅手机，桌面端不受影响）。
+  ctx.effect(() => {
+    if (!narrow.matches) return () => {}
+    const PHRASES = ['加载提供方目录失败', 'Settings are unavailable in this browser']
+    const NOTICE = '手机上不支持模型设置，请去电脑端修改设置'
+    // 取包含报错文案的最深节点，避免把外层大容器整块清掉。
+    const findDeepest = (el: Element): Element => {
+      let deepest = el
+      for (const child of el.querySelectorAll('*')) {
+        if (PHRASES.some((p) => (child.textContent ?? '').includes(p))) deepest = child
+      }
+      return deepest
+    }
+    const patch = (): void => {
+      for (const el of document.querySelectorAll('body *')) {
+        const t = el.textContent ?? ''
+        if (!PHRASES.some((p) => t.includes(p))) continue
+        if ((el as HTMLElement).dataset?.dshpModelNotice === '1') continue
+        const target = findDeepest(el)
+        target.textContent = NOTICE
+        ;(target as HTMLElement).dataset.dshpModelNotice = '1'
+      }
+    }
+    const observer = new MutationObserver(patch)
+    observer.observe(document.body, { childList: true, subtree: true, characterData: true })
+    patch()
+    return () => observer.disconnect()
+  }, 'dsh-mobile-nav: replace model-settings load error with mobile hint')
+
 
   ctx.slots.inject('conversation.session.header.actions', () => ctx.slots.register({
     name: 'conversation.session.header.actions',

package/lib/web-rpc.js

@@ -201,15 +201,24 @@ async function pocketHttpBridge(req, res, fetchHandler, maxBodyBytes) {
 function mountPocketWebRoute(ctx, { channel, handler, log }) {
   const webServer = ctx?.webServer;
   if (!webServer || typeof webServer.register !== 'function') return null;
-  const requestRejection = ctx?.connection?.requestRejection;
+  // 必须持有 connection 本体并以**方法形式**调用 requestRejection（issue #117）：
+  // dsh 的 HostConnectionService.requestRejection 是类方法，内部读 this.trustedHosts /
+  // this.browserAuth。先把方法抽成裸函数（`const fn = ctx.connection.requestRejection`）
+  // 再调用会丢失 this → TypeError → 被下面的 catch 兜底成 403，于是**任何**请求
+  // （本机、带会话 cookie 的浏览器、移动端）都被判 forbidden，设置页 status RPC 全挂
+  // （用户可见症状：局域网区块一直显示「代理未就绪…」，公网隧道开启报 403）。
+  // dsh 自己的 /api 路由也是以方法形式调用的（见 client-connection 的 register()）；
+  // 本仓库 lib/index.js 处理 authenticatedUrl 时同样用 fn.call(ctx.connection, ...) 绑定。
+  // 等价写法：requestRejection.call(ctx.connection, req)（issue #117 报告者的建议）。
+  const connection = ctx?.connection;
   const fetchHandler = pocketFetchHandler(channel, handler, log);
   const route = {
     kind: 'prefix',
     path: channel,
     handler: async (req, res) => {
       let rejection;
-      if (typeof requestRejection === 'function') {
-        try { rejection = requestRejection(req); } catch { rejection = 403; }
+      if (typeof connection?.requestRejection === 'function') {
+        try { rejection = connection.requestRejection(req); } catch { rejection = 403; }
       } else if (!isTrustedLoopbackRequest(req)) {
         rejection = 403;
       }

package/package.json

@@ -24,7 +24,8 @@
   "scripts": {
     "build:client": "node client/build.mjs",
     "release": "semantic-release",
-    "test": "node --test --test-timeout=30000 \"test/*.test.js\""
+    "test": "node --test --test-timeout=30000 \"test/*.test.js\"",
+    "test:local": "node --test --test-timeout=300000 \"test/local/*.test.js\""
   },
   "dependencies": {
     "qrcode": "^1.5.4",
@@ -80,5 +81,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "2.10.4"
+  "version": "2.10.6"
 }