dsh-pocket 2.1.1 → 2.1.3

package/README.en.md

@@ -191,9 +191,11 @@ Such tools take over all traffic and often cut cloudflared's tunnel-edge connect
 ```sh
 npm install
 node client/build.mjs   # rebuild after editing client/
-npm test                # proxy / auth / compression / tunnel / service / RPC (43 tests)
+npm test                # proxy / auth / compression / tunnel / service / RPC / settings (91 tests)
 ```
 
+**Want to try your changes locally without publishing?** Point the installed plugin at your local checkout with a symlink and restart dsh web. Full steps (including switching back to the npm release) are in [LOCAL-DEV.md](./LOCAL-DEV.md).
+
 ## 🤝 Credits
 
 - Mobile adaptation ported from [mexiaosqwq/dsh-web-mobile](https://github.com/mexiaosqwq/dsh-web-mobile) (MIT)

package/README.md

@@ -192,9 +192,11 @@ npx @deepseek-ai/dsh web
 ```sh
 npm install
 node client/build.mjs   # 改 client/ 后重新打包
-npm test                # 代理 / 认证 / 压缩 / 隧道 / 服务 / RPC（43 测试）
+npm test                # 代理 / 认证 / 压缩 / 隧道 / 服务 / RPC / 设置（91 测试）
 ```
 
+**改完想在本机先试？** 不用发版：把插件换成指向本地仓库的软链，重启 dsh web 就是本地代码。完整步骤（含怎么换回 npm 官方版本）见 [LOCAL-DEV.md](./LOCAL-DEV.md)。
+
 ## 🤝 致谢
 
 - 移动端适配移植自 [mexiaosqwq/dsh-web-mobile](https://github.com/mexiaosqwq/dsh-web-mobile)（MIT）

package/client/client.js

@@ -140,6 +140,41 @@ function MobileNavToggle({ toggleSidebar, t }) {
 // client/mobile/MobileNavOverlay.tsx
 var import_react = require("react");
 var import_dsh_client_ui_primitives2 = require("@deepseek-ai/dsh-client-ui-primitives");
+
+// client/mobile/nav-targets.mjs
+var DRAWER_SELECTOR = '[data-mobile-nav="frame"] > :first-child';
+var TOGGLE_SELECTOR = '[data-mobile-nav="toggle"]';
+var NAV_TARGETS = [
+  "button[data-dsh-taskboard-entry]",
+  "button[data-dsh-ssh-entry]",
+  // 抽屉底部的 "文件" 入口打开的是 dsh-web-ui 的 explorer 面板，它的 z-index
+  // (55) 低于展开的抽屉 (600)，且在抽屉 DOM 之外：抽屉不关就会盖住面板，点
+  // 面板里的行又会被"点抽屉外就关"吃掉。所以按导航处理，一起关掉。
+  '[data-mobile-nav="files"]',
+  '[class*="sessionRow"]',
+  '[class*="newSession"]',
+  '[class*="searchResultWorkspace"]',
+  '[class*="searchResultRow"]'
+].join(", ");
+var NAV_EXCLUDE = '[class*="sessionRow"] button';
+var OVERLAY_SELECTOR = [
+  '[role="menu"]',
+  '[role="listbox"]',
+  '[role="dialog"]',
+  '[role="tooltip"]',
+  "[data-radix-popper-content-wrapper]"
+].join(", ");
+function navTargetFor(target) {
+  if (target == null || typeof target.closest !== "function") return null;
+  if (target.closest(NAV_EXCLUDE) !== null) return null;
+  return target.closest(NAV_TARGETS);
+}
+function isOverlayTap(target) {
+  if (target == null || typeof target.closest !== "function") return false;
+  return target.closest(OVERLAY_SELECTOR) !== null;
+}
+
+// client/mobile/MobileNavOverlay.tsx
 var MOBILE_QUERY = "(max-width: 1023px)";
 function useMobile() {
   const [mobile, setMobile] = (0, import_react.useState)(() => window.matchMedia(MOBILE_QUERY).matches);
@@ -205,25 +240,47 @@ function MobileNavOverlay({ toggleSidebar, t }) {
       if (document.querySelector('[aria-modal="true"]') !== null) return;
       const target = event.target;
       if (target === null) return;
-      const drawer = document.querySelector('[data-mobile-nav="frame"] > :first-child');
+      const drawer = document.querySelector(DRAWER_SELECTOR);
       if (drawer === null || !drawer.contains(target)) return;
-      if (target.closest('[class*="sessionRow"] button') !== null) return;
-      const navigates = target.closest(
-        'button[data-dsh-taskboard-entry], button[data-dsh-ssh-entry], [class*="newSession"], [class*="sessionRow"], [class*="searchResultRow"], [class*="searchResultWorkspace"], [data-mobile-nav="files"]'
-      );
-      if (navigates !== null) toggleSidebar();
+      if (navTargetFor(target) !== null) toggleSidebar();
     };
     document.addEventListener("click", onDrawerClick, true);
     return () => document.removeEventListener("click", onDrawerClick, true);
   }, [mobile, open, toggleSidebar]);
+  (0, import_react.useEffect)(() => {
+    if (!mobile || !open) return;
+    let timer = null;
+    const onDrawerPointerUp = (event) => {
+      if (event.pointerType !== "touch" && event.pointerType !== "pen") return;
+      const target = event.target;
+      if (!(target instanceof Element)) return;
+      const drawer = document.querySelector(DRAWER_SELECTOR);
+      if (drawer === null || !drawer.contains(target)) return;
+      if (navTargetFor(target) === null) return;
+      if (timer !== null) return;
+      timer = window.setTimeout(() => {
+        timer = null;
+        const frame = document.querySelector('[data-mobile-nav="frame"]');
+        if (frame === null || frame.hasAttribute("data-sidebar-collapsed")) return;
+        const row = navTargetFor(target);
+        row?.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true, view: window }));
+      }, 0);
+    };
+    document.addEventListener("pointerup", onDrawerPointerUp, true);
+    return () => {
+      if (timer !== null) window.clearTimeout(timer);
+      document.removeEventListener("pointerup", onDrawerPointerUp, true);
+    };
+  }, [mobile, open]);
   (0, import_react.useEffect)(() => {
     if (!mobile || !open) return;
     const onOutsideClick = (event) => {
       if (document.querySelector('[aria-modal="true"]') !== null) return;
       const target = event.target;
       if (target === null) return;
-      if (target.closest('[data-mobile-nav="toggle"]') !== null) return;
-      const drawer = document.querySelector('[data-mobile-nav="frame"] > :first-child');
+      if (target.closest(TOGGLE_SELECTOR) !== null) return;
+      if (isOverlayTap(target)) return;
+      const drawer = document.querySelector(DRAWER_SELECTOR);
       if (drawer !== null && drawer.contains(target)) return;
       toggleSidebar();
     };

package/client/mobile/MobileNavOverlay.tsx

@@ -2,6 +2,12 @@ import { useEffect, useLayoutEffect, useState } from 'react'
 import type { PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
 import { IconPanelLeftOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
 import { NS } from './locales.ts'
+import {
+  DRAWER_SELECTOR,
+  TOGGLE_SELECTOR,
+  isOverlayTap,
+  navTargetFor,
+} from './nav-targets.mjs'
 
 /** Full props for the shell overlay entry. */
 export interface MobileNavOverlayProps extends PropsRuntime<'shell.overlay'>, PropsLocale<typeof NS> {
@@ -104,7 +110,8 @@ export function MobileNavOverlay({ toggleSidebar, t }: MobileNavOverlayProps) {
   // - Settings / Session log: their dialogs render INSIDE the drawer DOM
   //   (portaled into the sidebar); closing the drawer would slide the dialog
   //   off-screen with it.
-  // - Workspace folder chevrons, the logo: pure UI toggles, not navigation.
+  // - Workspace folder rows (YDXeBa_projectRow), the logo: pure UI toggles,
+  //   not navigation — see NAV_TARGETS in nav-targets.mjs.
   // - Anything while a modal dialog is open: the dialog owns the screen.
   useEffect(() => {
     if (!mobile || !open) return
@@ -112,27 +119,64 @@ export function MobileNavOverlay({ toggleSidebar, t }: MobileNavOverlayProps) {
       if (document.querySelector('[aria-modal="true"]') !== null) return
       const target = event.target as HTMLElement | null
       if (target === null) return
-      const drawer = document.querySelector<HTMLElement>('[data-mobile-nav="frame"] > :first-child')
+      const drawer = document.querySelector<HTMLElement>(DRAWER_SELECTOR)
       if (drawer === null || !drawer.contains(target)) return
       // A session row's own action buttons — the "Session actions" kebab
       // (delete / rename), revealed on hover / long-press — open an edit
       // menu. Tapping one must NOT count as tapping the row, or the drawer
       // would close and take the just-opened menu with it.
-      if (target.closest('[class*="sessionRow"] button') !== null) return
-      // The drawer footer "Files" action opens the dsh-web-ui explorer sheet,
-      // which sits at a LOWER z-index (55) than the open drawer (600) and
-      // outside the drawer DOM — leaving the drawer open would let it cover
-      // the sheet, and tapping a sheet row would be eaten by the tap-outside
-      // close handler. Close the drawer on Files, like navigation.
-      const navigates = target.closest(
-        'button[data-dsh-taskboard-entry], button[data-dsh-ssh-entry], [class*="newSession"], [class*="sessionRow"], [class*="searchResultRow"], [class*="searchResultWorkspace"], [data-mobile-nav="files"]',
-      )
-      if (navigates !== null) toggleSidebar()
+      if (navTargetFor(target) !== null) toggleSidebar()
     }
     document.addEventListener('click', onDrawerClick, true)
     return () => document.removeEventListener('click', onDrawerClick, true)
   }, [mobile, open, toggleSidebar])
 
+  // iOS Safari touch self-heal (issue #72).
+  //
+  // A tap on a drawer row is delivered to the page as touchstart/touchend
+  // plus a browser-synthesized click. On iOS that click is routinely
+  // suppressed: a few px of finger drift is classified as a pan, and any DOM
+  // shift under the finger before dispatch cancels it outright. When it does
+  // not arrive, neither the row's own onClick nor the capture handler above
+  // runs — the row looks completely dead ("抽屉点了没反应").
+  //
+  // So: on touch/pen pointerup inside the drawer that hits a navigation row,
+  // arm a one-macrotask timer. When it fires:
+  // - the drawer is already closed → the real click did arrive and handled
+  //   everything → do nothing (zero interference with the normal path);
+  // - otherwise the click never came → re-dispatch a bubbling click on the
+  //   row ourselves. React's delegated listener runs the row's onClick (the
+  //   session opens / the workspace switches) and the same click bubbles
+  //   through the capture handler above, which closes the drawer.
+  //
+  // Mouse/pen-on-desktop keeps the plain click path: pointerType is 'mouse'.
+  useEffect(() => {
+    if (!mobile || !open) return
+    let timer: number | null = null
+    const onDrawerPointerUp = (event: PointerEvent): void => {
+      if (event.pointerType !== 'touch' && event.pointerType !== 'pen') return
+      const target = event.target
+      if (!(target instanceof Element)) return
+      const drawer = document.querySelector<HTMLElement>(DRAWER_SELECTOR)
+      if (drawer === null || !drawer.contains(target)) return
+      if (navTargetFor(target) === null) return
+      if (timer !== null) return
+      timer = window.setTimeout(() => {
+        timer = null
+        const frame = document.querySelector('[data-mobile-nav="frame"]')
+        // Real click already closed it — nothing to heal.
+        if (frame === null || frame.hasAttribute('data-sidebar-collapsed')) return
+        const row = navTargetFor(target)
+        row?.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true, view: window }))
+      }, 0)
+    }
+    document.addEventListener('pointerup', onDrawerPointerUp, true)
+    return () => {
+      if (timer !== null) window.clearTimeout(timer)
+      document.removeEventListener('pointerup', onDrawerPointerUp, true)
+    }
+  }, [mobile, open])
+
   // Tap-outside closes the drawer (issue #38). The backdrop is now
   // pointer-events: none (pure dimming layer that never steals clicks), so
   // "tap the dimmed area to close" moves here: any click outside the drawer
@@ -146,8 +190,15 @@ export function MobileNavOverlay({ toggleSidebar, t }: MobileNavOverlayProps) {
       if (document.querySelector('[aria-modal="true"]') !== null) return
       const target = event.target as HTMLElement | null
       if (target === null) return
-      if (target.closest('[data-mobile-nav="toggle"]') !== null) return
-      const drawer = document.querySelector<HTMLElement>('[data-mobile-nav="frame"] > :first-child')
+      if (target.closest(TOGGLE_SELECTOR) !== null) return
+      // Portaled overlays (issue #72): the workspace section's "视图选项" /
+      // "添加工作区" and the session row kebab all open menus that live on
+      // document.body — outside the drawer DOM. Without this exemption the
+      // first tap on a menu item is eaten: the drawer slides away, the menu
+      // unmounts with the sidebar, and the item's onClick never runs, so
+      // every workspace control reads as "点了没反应" on a phone.
+      if (isOverlayTap(target)) return
+      const drawer = document.querySelector<HTMLElement>(DRAWER_SELECTOR)
       if (drawer !== null && drawer.contains(target)) return
       toggleSidebar()
     }

package/client/mobile/nav-targets.mjs

@@ -0,0 +1,85 @@
+// 抽屉点击规则的判定常量与纯函数 —— 抽成独立 ESM 模块，好让 node 测试直接
+// 引入（client 侧是 esbuild 打进 bundle 的，测试里没有 DOM 可用）。
+
+/**
+ * 抽屉本体：AppFrame 的第一个网格子元素，即被拉成抽屉的侧边栏列。
+ * @type {string}
+ */
+export const DRAWER_SELECTOR = '[data-mobile-nav="frame"] > :first-child'
+
+/** 抽屉开关（会话头部那颗按钮）——点它不该被"点抽屉外就关"二次触发。 */
+export const TOGGLE_SELECTOR = '[data-mobile-nav="toggle"]'
+
+/**
+ * 命中即视为导航的行：点它们要把屏幕让给刚打开的内容，所以顺带关抽屉。
+ *
+ * 类名现状（2026-08，侧边栏 qDHVXG_* / YDXeBa_* 这一代）：
+ * - `YDXeBa_sessionRow`  会话行 —— 命中 [class*="sessionRow"]
+ * - `YDXeBa_projectRow`  工作区行 —— **故意不收**：实测它是折叠/展开开关
+ *   （aria-expanded 来回翻，会话列表显隐），不是导航。收进来会让每次展开
+ *   工作区都把抽屉关掉（issue #72）。
+ * 旧一代侧边栏的 `_searchResultWorkspace_` / `_searchResultRow_` 保留，兼容
+ * 尚未升级的宿主。
+ *
+ * @type {string}
+ */
+export const NAV_TARGETS = [
+  'button[data-dsh-taskboard-entry]',
+  'button[data-dsh-ssh-entry]',
+  // 抽屉底部的 "文件" 入口打开的是 dsh-web-ui 的 explorer 面板，它的 z-index
+  // (55) 低于展开的抽屉 (600)，且在抽屉 DOM 之外：抽屉不关就会盖住面板，点
+  // 面板里的行又会被"点抽屉外就关"吃掉。所以按导航处理，一起关掉。
+  '[data-mobile-nav="files"]',
+  '[class*="sessionRow"]',
+  '[class*="newSession"]',
+  '[class*="searchResultWorkspace"]',
+  '[class*="searchResultRow"]',
+].join(', ')
+
+/**
+ * 行内操作按钮（会话行的 kebab：重命名 / 删除）——点开的是菜单不是内容，
+ * 不能按导航处理，否则抽屉一关，刚弹出的菜单跟着没了。
+ * @type {string}
+ */
+export const NAV_EXCLUDE = '[class*="sessionRow"] button'
+
+/**
+ * 浮层（portal 到 body 的下拉菜单 / 弹窗）。
+ *
+ * 抽屉里的控件（工作区区块的"视图选项"、"添加工作区"，会话行的 kebab…）
+ * 弹出的菜单在 DOM 上属于 body，不在抽屉里。"点抽屉外就关"因此会把菜单项
+ * 的第一下点击吃掉：抽屉先滑走 → 菜单随侧边栏卸载 → 菜单项的 onClick 永远
+ * 不执行。手机上表现就是工作区相关菜单"点了没反应"（issue #72）。
+ *
+ * 落在浮层内的点击一律豁免，交给浮层自己收尾。
+ *
+ * @type {string}
+ */
+export const OVERLAY_SELECTOR = [
+  '[role="menu"]',
+  '[role="listbox"]',
+  '[role="dialog"]',
+  '[role="tooltip"]',
+  '[data-radix-popper-content-wrapper]',
+].join(', ')
+
+/**
+ * 抽屉内一次点击是否算导航（应关抽屉）。命中 NAV_EXCLUDE 的行内按钮不算。
+ * @param {Element | null | undefined} target - 点击目标。
+ * @returns {Element | null} 命中的导航行，未命中返回 null。
+ */
+export function navTargetFor(target) {
+  if (target == null || typeof target.closest !== 'function') return null
+  if (target.closest(NAV_EXCLUDE) !== null) return null
+  return target.closest(NAV_TARGETS)
+}
+
+/**
+ * 一次点击是否落在浮层内（浮层自己会关闭，不该由抽屉规则接管）。
+ * @param {Element | null | undefined} target - 点击目标。
+ * @returns {boolean}
+ */
+export function isOverlayTap(target) {
+  if (target == null || typeof target.closest !== 'function') return false
+  return target.closest(OVERLAY_SELECTOR) !== null
+}

package/lib/index.js

@@ -20,7 +20,7 @@ import { randomBytes } from 'node:crypto';
 import { createPocketService } from './service.mjs';
 import { installPocketRpc } from './web-rpc.js';
 import { restartHost } from './restart.js';
-import { desktopEnvPatchScript, advancedNoticeScript, DEFAULT_INJECT, classifyHost } from './proxy.mjs';
+import { advancedNoticeScript, DEFAULT_INJECT, classifyHost } from './proxy.mjs';
 import { lanEnabled, setLanEnabled, lanAuthEnabled, setLanAuthEnabled, lanIpOverride, setLanIpOverride, pinCustom, setPinCustom, tunnelMode, setTunnelMode, tunnelToken, setTunnelToken, tunnelHostname, setTunnelHostname, resetSettings } from './settings.mjs';
 
 const name = 'dsh-pocket';
@@ -251,12 +251,18 @@ export function apply(ctx, config = {}, internals = {}) {
     internals,
     getLanIpOverride: () => lanIpOverride(),
     getLanEnabled: () => lanEnabled(),
-    // 桌面端：手机扫码访问的页面缺 dsh-desktop-mode/platform 参数会让 dsh-plugin-desktop
-    // client 崩溃（issue #3/#4）。给代理注入「桌面参数补丁」（history.replaceState 补齐参数，
-    // 无跳转；compatibility 模式不套桌面布局，避免移动端按钮叠加）。保留默认 polyfill。
-    // advanced 模式再加警告覆盖层（issue #19）。
+    // 桌面端**不再**注入 dsh-desktop-* 标记（issue #76）：
+    //   - 旧版 dsh-plugin-desktop 缺 mode/platform 会抛错，当初正是为此加了补丁（issue #3/#4）；
+    //   - 但 2.0.3 起，mode 与 platform **同时缺失**时 parseDesktopClientEnvironment 直接返回
+    //     undefined（视作非桌面外壳，跳过全部桌面逻辑），正是手机页需要的效果；
+    //   - 反之只要 URL 上出现任一 dsh-desktop-* 标记，客户端就会强制校验整组
+    //     （material + semver version + mica），只补两个必然抛 "invalid or missing
+    //     dsh-desktop-material" → 插件树加载失败 → 页面变成「打开恢复模式」；
+    //   - 更糟的是 decideDesktopBrowserAccess 见到 dsh-desktop-* 前缀就把没有渲染器 token 的
+    //     普通浏览器判为 denied（403），刷新后直接打不开。
+    // 结论：手机/浏览器访问一律不带这些标记，advanced 模式另加警告覆盖层（issue #19）。
     injectHtml: isDesktop
-      ? DEFAULT_INJECT + desktopEnvPatchScript(process.platform) + (desktopAdvanced ? advancedNoticeScript() : '')
+      ? DEFAULT_INJECT + (desktopAdvanced ? advancedNoticeScript() : '')
       : undefined,
     // 访问密码（issue #13 + #18 + #24 + #33 + #66）：公网永远要密码（默认每次开启变新，
     // 用户自定义后不再轮换）；局域网按开关（默认开启；关闭后局域网扫码直连）。

package/lib/proxy.mjs

@@ -38,15 +38,23 @@ export const RANDOM_UUID_POLYFILL = `<script data-dsh-pocket-polyfill="1">!funct
 const INJECT_MARK = 'data-dsh-pocket-polyfill="1"';
 
 /**
- * DSH Desktop（桌面版）渲染进程兼容补丁。
+ * DSH Desktop（桌面版）渲染进程兼容补丁（issue #3/#4，已于 issue #76 停用）。
  *
- * 桌面版 profile 里的 dsh-plugin-desktop client 会在页面加载时从 URL query 读
+ * 历史：旧版 dsh-plugin-desktop 的 client 在页面加载时从 URL query 读
  * `dsh-desktop-mode` 与 `dsh-desktop-platform`，缺失即抛
- * "invalid or missing dsh-desktop-mode null" → 页面崩（手机扫码访问桌面版时正是如此，
- * 见 issue #3/#4）。本脚本在页面加载前用 history.replaceState 把这两个参数补上
- * （无跳转、不重载），取最轻的 `compatibility` 模式——不激活桌面布局，避免与
- * 移动端适配叠加。
- * 仅宿主在桌面版（isDesktop）时由 lib/index.js 追加进 injectHtml。
+ * "invalid or missing dsh-desktop-mode null" → 页面崩（手机扫码访问桌面版时正是如此）。
+ * 本脚本用 history.replaceState 补上这两个参数（无跳转、不重载），取最轻的
+ * `compatibility` 模式——不激活桌面布局，避免与移动端适配叠加。
+ *
+ * @deprecated 不要再注入（issue #76，DSH Desktop 2.0.3 起）：
+ *   ① mode 与 platform **同时缺失**时，parseDesktopClientEnvironment 直接返回 undefined
+ *      （视作非桌面外壳，跳过全部桌面逻辑），正是手机/浏览器页面需要的效果；
+ *   ② 只要 URL 上出现任一 dsh-desktop-* 标记，客户端就强制校验整组（material +
+ *      semver version + mica），只补两个必然抛 "invalid or missing
+ *      dsh-desktop-material" → 插件树加载失败 → 页面变成「打开恢复模式」；
+ *   ③ 更糟：decideDesktopBrowserAccess 见到 dsh-desktop-* 前缀就把没有渲染器 token 的
+ *      普通浏览器判为 denied（403），刷新后直接打不开。
+ * lib/index.js 已不再注入本脚本；保留导出仅为兼容旧版本桌面端与既有测试。
  */
 export function desktopEnvPatchScript(platform) {
   const p = ['darwin', 'win32', 'linux'].includes(platform) ? platform : 'linux';

package/package.json

@@ -80,5 +80,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "2.1.1"
+  "version": "2.1.3"
 }