dsh-mobile-access 1.1.3 → 1.1.5

package/README.md

@@ -79,7 +79,7 @@ iPhone 打开「设置 → 无线局域网」，确认和 Mac 连的是同一个
 ### 第 2 步：在 Mac 终端执行一条命令
 
 ```bash
-dsh plugin --profile web add dsh-mobile-access@1.1.3 --registry=https://registry.npmjs.org/
+dsh plugin --profile web add dsh-mobile-access@1.1.5 --registry=https://registry.npmjs.org/
 ```
 
 这条命令做三件事：
@@ -181,13 +181,19 @@ Safari 分享按钮 → 添加到主屏幕
 这是官方会话行的触摸行为：每一行是 `role="treeitem"`、`tabindex="0"` 的可聚焦元素，
 iOS Safari 会把第一次触摸先用去聚焦，第二次才派发 `click`。
 
-从 `1.1.3` 起，插件只在 iPhone / iPad 上、在你触摸会话行的那一刻临时移除该行的
-`tabindex`，400 毫秒后自动恢复；同时给会话行加 `touch-action: manipulation`，
-避免旧式双击缩放延迟。Mac 和键盘操作不受影响。展开侧栏后，点一次会话标题即可切换。
+从 `1.1.4` 起，插件在 iPhone / iPad 上不再依赖“移除 `tabindex` 后等浏览器补发 click”
+这一条不确定路径：第一次触摸结束时就主动触发该会话行的点击，并抑制随后可能重复的
+原生点击，因此一次点击只会切换一次；切换完成后，窄屏左侧栏会自动收起，把空间还给
+对话区。会话行同时加 `touch-action: manipulation`，避免旧式双击缩放延迟。Mac 和
+键盘操作不受影响。
 
 如果左侧栏仍然是窄窄的图标条，第一下是展开侧栏——这是官方布局，不是会话行的问题；
 展开后每个会话只需单击一次。
 
+`1.1.3` 的旧实现只移除 `tabindex`，在部分 iOS Safari 版本上仍可能被第一次触摸吃掉；
+如果更新到 `1.1.4` 后仍是两次，请彻底关闭这个 Safari 标签页再重新打开（不要只刷新），
+以排除旧的 `client.js` 缓存。
+
 ### iPhone 上切换大模型时页面放大、键盘自动弹出怎么办
 
 从 `1.1.2` 起不需要改 DSH，也不需要关掉 Safari 的缩放：
@@ -364,7 +370,7 @@ iPhone 软键盘没有可用的 Shift 键，因此插件在 **iOS / iPadOS** 上
 ### 推荐：npm 官方命令
 
 ```bash
-dsh plugin --profile web add dsh-mobile-access@1.1.3 --registry=https://registry.npmjs.org/
+dsh plugin --profile web add dsh-mobile-access@1.1.5 --registry=https://registry.npmjs.org/
 ```
 
 ### 使用 `@latest`
@@ -494,7 +500,9 @@ dsh plugin --profile web remove dsh-mobile-access
 - `1.1.0` — 回环监听自动局域网网关（macOS / Windows，HTTP + `/api/remote.mux` WebSocket）。
 - `1.1.1` — iPhone / iPad 上模型选择页 16px 缩放守卫。
 - `1.1.2` — 打开模型选择时不自动弹键盘、不整体上移。
-- `1.1.3` — iPhone / iPad 上会话行第一次点击即可切换；当前 npm `latest`。
+- `1.1.5` — Tailscale Serve 经 HTTPS 访问时，允许带 Tailscale 身份头的 `*.ts.net` Host（仅限本机回环转发）；当前 npm `latest`。
+- `1.1.4` — iPhone / iPad 上第一次点击直接切换会话，并在切换后自动收起左侧栏。
+- `1.1.3` — 首次尝试临时移除会话行 `tabindex`。
 
 ## 许可证
 

package/client.js

@@ -184,35 +184,45 @@ function installIOSInputZoomGuard() {
     document.head.appendChild(style);
     return () => style.remove();
 }
-/**
- * The official model menu can move focus into its search field while it opens.
- * On iPhone that opens the software keyboard and shifts the fixed-position menu
- * above the visible viewport. Suppress only programmatic search-box focus until
- * the user deliberately taps that field; blur a focused composer control before
- * any composer menu opens. Native taps still focus normally, and Mac is untouched.
- */
 /**
  * Safari treats a touch on a focusable, non-button row as a focus step: the
  * first tap focuses the row and only the second tap reaches its click handler.
  * Official session rows are `role="treeitem"` divs with `tabIndex={0}`, so
  * switching sessions on iPhone takes two taps. Remove that one attribute for
- * the duration of the tap on iOS only; React restores it on the next render and
- * this hook restores it after a short delay, leaving Mac and keyboard access
- * untouched. `touch-action: manipulation` is also applied in the iOS stylesheet
- * to avoid the legacy double-tap-zoom delay.
+ * the duration of the tap, activate the row on the first tap ourselves, and
+ * collapse the narrow sidebar after the switch. Mac and keyboard users are
+ * untouched; `touch-action: manipulation` in the iOS stylesheet removes the
+ * legacy double-tap-zoom delay.
  */
-function installIOSSidebarTapGuard() {
+function installIOSSidebarTapGuard(layout) {
     if (!isAppleMobile())
         return () => undefined;
     const doc = document;
     const timers = new Set();
+    let pending = null;
+    let syntheticClick = false;
+    let suppressNativeClick = false;
+    const isAction = (target) => target.closest('button, a, input, textarea, select, [role="button"], [role="menuitem"], [role="menuitemradio"], [role="switch"], [data-row-actions]') !== null;
+    const point = (event) => {
+        const touches = event.changedTouches ?? event.touches;
+        const touch = touches?.[0];
+        return touch === undefined ? null : { x: touch.clientX, y: touch.clientY };
+    };
     const onTouchStart = (event) => {
         const target = event.target;
         if (target === null || typeof target.closest !== 'function')
             return;
+        if (isAction(target)) {
+            pending = null;
+            return;
+        }
         const row = target.closest('[data-row-key^="session:"]');
         if (row === null)
             return;
+        const at = point(event);
+        if (at === null)
+            return;
+        pending = { row, x: at.x, y: at.y, startedAt: Date.now() };
         const tabindex = row.getAttribute('tabindex');
         if (tabindex === null)
             return;
@@ -224,14 +234,70 @@ function installIOSSidebarTapGuard() {
         }, 400);
         timers.add(timer);
     };
+    const onClickCapture = (event) => {
+        const target = event.target;
+        if (target === null || typeof target.closest !== 'function' || target.closest('[data-row-key^="session:"]') === null)
+            return;
+        if (syntheticClick) {
+            syntheticClick = false;
+            suppressNativeClick = true;
+            return;
+        }
+        if (!suppressNativeClick)
+            return;
+        suppressNativeClick = false;
+        event.preventDefault();
+        event.stopImmediatePropagation();
+    };
+    const onTouchEnd = (event) => {
+        if (pending === null)
+            return;
+        const { row, x, y, startedAt } = pending;
+        pending = null;
+        if (!row.isConnected)
+            return;
+        const at = point(event);
+        if (at === null)
+            return;
+        if (Math.hypot(at.x - x, at.y - y) > 10 || Date.now() - startedAt > 600)
+            return;
+        syntheticClick = true;
+        row.click();
+        const timer = window.setTimeout(() => {
+            timers.delete(timer);
+            syntheticClick = false;
+            suppressNativeClick = false;
+        }, 500);
+        timers.add(timer);
+        if (window.innerWidth < 1024) {
+            window.setTimeout(() => {
+                try {
+                    layout?.toggleSidebar();
+                }
+                catch {
+                }
+            }, 0);
+        }
+    };
     doc.addEventListener('touchstart', onTouchStart, true);
+    doc.addEventListener('touchend', onTouchEnd, true);
+    doc.addEventListener('click', onClickCapture, true);
     return () => {
         doc.removeEventListener('touchstart', onTouchStart, true);
+        doc.removeEventListener('touchend', onTouchEnd, true);
+        doc.removeEventListener('click', onClickCapture, true);
         for (const timer of timers)
             window.clearTimeout(timer);
         timers.clear();
     };
 }
+/**
+ * The official model menu can move focus into its search field while it opens.
+ * On iPhone that opens the software keyboard and shifts the fixed-position menu
+ * above the visible viewport. Suppress only programmatic search-box focus until
+ * the user deliberately taps that field; blur a focused composer control before
+ * any composer menu opens. Native taps still focus normally, and Mac is untouched.
+ */
 function installIOSModelKeyboardGuard() {
     if (!isAppleMobile())
         return () => undefined;
@@ -505,7 +571,7 @@ const STYLES = ".dsh-ma{height:100%;min-height:100%;overflow:auto;background:var
 function factory(require) {
     React = require('react');
     return {
-        inject: ['slots', 'locale'],
+        inject: ['slots', 'locale', 'layout'],
         apply(ctx) {
             ctx.effect(() => {
                 const cleanups = [];
@@ -566,7 +632,7 @@ function factory(require) {
                     ctx.logger?.warn?.(`[mobile-access] iOS model keyboard guard unavailable: ${String(error)}`);
                 }
                 try {
-                    cleanups.push(installIOSSidebarTapGuard());
+                    cleanups.push(installIOSSidebarTapGuard(ctx.layout));
                 }
                 catch (error) {
                     ctx.logger?.warn?.(`[mobile-access] iOS sidebar tap guard unavailable: ${String(error)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mobile-access",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Independent DSH bundle that pairs iPhones and iPads with the official DeepSeek Harness Web GUI over the local network.",
   "type": "module",
   "license": "MIT",

package/routes.js

@@ -112,7 +112,28 @@ function pairingHostAllowed(ctx, request) {
     catch {
         return false;
     }
-    return isLoopbackHost(bare) || bare === expected;
+    if (isLoopbackHost(bare) || bare === expected)
+        return true;
+    return isTailscaleServeRequest(request, bare);
+}
+/**
+ * Tailscale Serve terminates TLS and forwards to the loopback listener while
+ * preserving the public `*.ts.net` Host. Serve adds identity headers that a
+ * cross-site browser form cannot forge; requiring one plus a loopback peer
+ * keeps DNS-rebinding protection intact for direct loopback requests.
+ */
+function isTailscaleServeRequest(request, hostname) {
+    if (!hostname.endsWith('.ts.net'))
+        return false;
+    const identity = firstHeader(request.headers, 'tailscale-user-login')
+        ?? firstHeader(request.headers, 'tailscale-user-name');
+    if (identity === undefined || identity.length === 0)
+        return false;
+    const remote = request.socket?.remoteAddress;
+    if (remote === undefined)
+        return false;
+    const normalized = remote.startsWith('::ffff:') ? remote.slice(7) : remote;
+    return isLoopbackHost(normalized);
 }
 function pairingNonce() {
     const bytes = new Uint8Array(18);