@linxin666/dsh-remote-web-ui 0.3.13 → 0.3.15

package/lib/types/routes.js

@@ -67,6 +67,87 @@ export function isTrustedApiRequest(request, trustedHosts) {
         return false;
     }
 }
+/**
+ * Test whether a hostname represents a private local-area network (RFC 1918 / ULA / mDNS / loopback).
+ * Supports pairing in container-bridged (Docker) or NAT-proxied topologies where the host
+ * machine's LAN IP or proxy domain differs from the container's internal sampled network interface.
+ */
+export function isPrivateOrLocalHostname(hostname) {
+    const normalized = hostname.toLowerCase().trim();
+    if (normalized === 'localhost' ||
+        normalized.endsWith('.local') ||
+        normalized.endsWith('.lan') ||
+        normalized.endsWith('.internal') ||
+        normalized.endsWith('.home.arpa')) {
+        return true;
+    }
+    let ip = normalized;
+    if (ip.startsWith('[') && ip.endsWith(']'))
+        ip = ip.slice(1, -1);
+    if (ip === '::1' || ip === '127.0.0.1')
+        return true;
+    if (ip.startsWith('fc') || ip.startsWith('fd') || ip.startsWith('fe80'))
+        return true;
+    const parts = ip.split('.').map(Number);
+    if (parts.length === 4 && parts.every(n => Number.isInteger(n) && n >= 0 && n <= 255)) {
+        const [a, b] = parts;
+        if (a === 10)
+            return true;
+        if (a === 127)
+            return true;
+        if (a === 169 && b === 254)
+            return true;
+        if (a === 172 && b >= 16 && b <= 31)
+            return true;
+        if (a === 192 && b === 168)
+            return true;
+    }
+    return false;
+}
+/**
+ * Validates that an incoming request is non-cross-site (rejects cross-site fetch metadata
+ * and ensures Origin matches Host when present).
+ */
+export function isNonCrossSite(request) {
+    if (request.headers['sec-fetch-site'] === 'cross-site')
+        return false;
+    const host = request.headers.host;
+    if (typeof host !== 'string')
+        return false;
+    const origin = request.headers.origin;
+    if (origin === undefined)
+        return true;
+    try {
+        const originUrl = new URL(origin);
+        const hostUrl = new URL(`http://${host}`);
+        return originUrl.host === hostUrl.host;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * The private-LAN fallback authority of a request: its Host header when the
+ * hostname is private/local (RFC 1918 / ULA / mDNS / loopback) and the
+ * browser markers are non-cross-site, else undefined. The accept paths and
+ * the lanFence fallback use this to serve container-bridged and reverse-proxy
+ * topologies whose Host is not among the advertised or configured authorities.
+ */
+function privateLanHostOf(request) {
+    const host = request.headers.host;
+    if (typeof host !== 'string')
+        return undefined;
+    let hostName = '';
+    try {
+        hostName = new URL(`http://${host}`).hostname;
+    }
+    catch {
+        return undefined;
+    }
+    if (hostName === '' || !isPrivateOrLocalHostname(hostName) || !isNonCrossSite(request))
+        return undefined;
+    return host;
+}
 /** Cap on pairing request bodies (tokens and workspace ids are tiny). */
 const MAX_BODY_BYTES = 4096;
 /**
@@ -84,6 +165,28 @@ export function acceptLimitKey(socketIp, forwarded, bucket) {
     }
     return `${bucket}|${socketIp}`;
 }
+/**
+ * Cap on the dynamically trusted hosts (see {@link addBounded}): room for
+ * every legitimate router/proxy aliasing shape, small enough that a flood of
+ * distinct private Host headers cannot grow the table unboundedly.
+ */
+export const MAX_DYNAMIC_TRUSTED_HOSTS = 64;
+/**
+ * FIFO-bounded Set insert: past `max` entries the oldest one is evicted
+ * (a Set iterates in insertion order). The dynamic trusted-host table is fed
+ * by caller-controlled Host headers, so it must stay bounded; an evicted
+ * legitimate host re-adds itself on that device's next gated request.
+ */
+export function addBounded(set, value, max) {
+    if (set.has(value))
+        return;
+    if (set.size >= max) {
+        const oldest = set.values().next().value;
+        if (oldest !== undefined)
+            set.delete(oldest);
+    }
+    set.add(value);
+}
 /**
  * The host authority of a configured public base URL, e.g. `foo.trycloudflare.com`
  * from `https://foo.trycloudflare.com`. Undefined when the URL does not parse —
@@ -324,20 +427,45 @@ export class PairingEventsStream {
  * @returns the exact routes to register on webServer.
  */
 export function makeRoutes(deps) {
-    const { service, lanAddresses, requirePairingForLan = true } = deps;
+    const { service, requirePairingForLan = true } = deps;
     const pairingRequired = () => typeof requirePairingForLan === 'function'
         ? requirePairingForLan()
         : requirePairingForLan;
     const events = new PairingEventsStream(service);
+    const dynamicTrustedHosts = new Set();
     /** Loopback-only fence: the desktop panel's control endpoints. */
     const loopbackFence = (req) => isTrustedApiRequest(req, []);
-    /** Phone-facing fence: loopback, the service's live LAN literals, or the configured public host. */
+    /** Phone-facing fence: loopback, the service's live LAN literals, configured public host, extra trusted hosts, or dynamically paired hosts. */
     const lanFence = (req) => {
         const publicHost = publicHostOf(service.publicBaseUrl);
         // The service's LAN bases re-read per request: a hot rebind (the lan-bind
         // toggle) updates them mid-process, and the fence must follow.
         const bases = service.lanAddresses;
-        return isTrustedApiRequest(req, publicHost === undefined ? bases : [...bases, publicHost]);
+        const extraHosts = typeof deps.trustedHosts === 'function' ? deps.trustedHosts() : (deps.trustedHosts ?? []);
+        const combined = [
+            ...bases,
+            ...(publicHost !== undefined ? [publicHost] : []),
+            ...extraHosts,
+            ...dynamicTrustedHosts,
+        ];
+        if (isTrustedApiRequest(req, combined))
+            return true;
+        // If request carries a valid paired device cookie from a private LAN host (e.g. after service restart), trust and remember it
+        const privateLanHost = privateLanHostOf(req);
+        if (privateLanHost !== undefined) {
+            const cookieDeviceId = readCookie(req.headers.cookie, service.config.cookieName);
+            let queryDeviceId = null;
+            try {
+                queryDeviceId = new URL(req.url ?? '/', 'http://pair.invalid').searchParams.get('device');
+            }
+            catch { }
+            const deviceId = cookieDeviceId ?? queryDeviceId ?? undefined;
+            if (deviceId !== undefined && service.hasDevice(deviceId)) {
+                addBounded(dynamicTrustedHosts, privateLanHost, MAX_DYNAMIC_TRUSTED_HOSTS);
+                return true;
+            }
+        }
+        return false;
     };
     const requireMethod = (req, res, method) => {
         if (req.method === method)
@@ -434,7 +562,8 @@ export function makeRoutes(deps) {
     const handleAccept = async (req, res) => {
         if (!requireMethod(req, res, 'POST'))
             return;
-        if (!lanFence(req)) {
+        const privateLanHost = privateLanHostOf(req);
+        if (!lanFence(req) && privateLanHost === undefined) {
             writeJson(res, 403, { ok: false, code: 'forbidden' });
             return;
         }
@@ -451,9 +580,16 @@ export function makeRoutes(deps) {
         const ua = req.headers['user-agent'];
         const result = service.accept(payload.token, typeof ua === 'string' ? ua : undefined);
         if (!result.ok) {
+            if (!lanFence(req)) {
+                writeJson(res, 403, { ok: false, code: 'forbidden' });
+                return;
+            }
             writeJson(res, result.code === 'used' ? 409 : 404, { ok: false, code: result.code });
             return;
         }
+        if (privateLanHost !== undefined) {
+            addBounded(dynamicTrustedHosts, privateLanHost, MAX_DYNAMIC_TRUSTED_HOSTS);
+        }
         // No Secure attribute: LAN pairing runs over plain HTTP (the cookie must
         // work there), and the same cookie rides HTTPS on the tunnel. Lax keeps
         // top-level navigations working while blocking cross-site subrequests.
@@ -570,7 +706,8 @@ export function makeRoutes(deps) {
     const handleAcceptPage = async (req, res) => {
         if (!requireMethod(req, res, 'GET'))
             return;
-        if (!lanFence(req)) {
+        const privateLanHost = privateLanHostOf(req);
+        if (!lanFence(req) && privateLanHost === undefined) {
             res.writeHead(403, { 'content-type': 'text/plain; charset=utf-8' });
             res.end('forbidden');
             return;
@@ -585,6 +722,11 @@ export function makeRoutes(deps) {
         const ua = req.headers['user-agent'];
         const result = token === '' ? { ok: false, code: 'invalid' } : service.accept(token, typeof ua === 'string' ? ua : undefined);
         if (!result.ok) {
+            if (!lanFence(req)) {
+                res.writeHead(403, { 'content-type': 'text/plain; charset=utf-8' });
+                res.end('forbidden');
+                return;
+            }
             // accept() now refuses only expired/unknown/stopped tokens: a consumed
             // token stays re-usable until its expiry or replacement, so a mobile
             // flow that split across cookie contexts (camera preview, in-app
@@ -604,6 +746,9 @@ export function makeRoutes(deps) {
             res.end(pairingFailurePage());
             return;
         }
+        if (privateLanHost !== undefined) {
+            addBounded(dynamicTrustedHosts, privateLanHost, MAX_DYNAMIC_TRUSTED_HOSTS);
+        }
         // Land the paired device on the cookieless app page: the official shell
         // served by this plugin, with the device id in the URL. No harness index
         // gate, no browser-auth cookie hop - the channel gate accepts the device

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-remote-web-ui",
   "description": "Scan-to-pair remote access for the dsh web GUI that shares one official interface: a QR beside the settings button pairs phones and PCs into the same Web GUI (a portrait-touch adaptation layer for phones, full desktop on PCs) through one-time tokens and revocable device sessions, with a LAN bind toggle, optional Cloudflare tunnel, and one-click family self-update",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -36,7 +36,7 @@
   "license": "Apache-2.0",
   "dsh": {
     "engines": {
-      "dsh": ">=0.1.2-alpha.4"
+      "dsh": ">=0.1.2-rc.1"
     },
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -63,22 +63,22 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-agent": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-api-session-controller": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-api-workspace-controller": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-client-connection": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-client-locale": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-client-store": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-commands": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-invariants": "^0.1.2-alpha.4",
-    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.4",
+    "@deepseek-ai/dsh-agent": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-api-remotes": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-api-session-controller": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-api-workspace-controller": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-connection": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-locale": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-store": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-commands": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-invariants": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.1.2-rc.1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^22.20.0",

package/src/client/RemoteEntry.tsx

@@ -62,6 +62,7 @@ export function RemoteEntry({ wide, t }: RemoteEntryProps) {
   const stateRef = useRef(state)
   useEffect(() => { stateRef.current = state }, [state])
   const [copied, setCopied] = useState<boolean>(false)
+  const [copiedToken, setCopiedToken] = useState<boolean>(false)
   const eventSource = useRef<EventSource | undefined>(undefined)
   // Generation counter for the open flow: closing (or re-opening) the panel
   // bumps it, so an in-flight issue() that resolves after a close does not
@@ -94,6 +95,7 @@ export function RemoteEntry({ wide, t }: RemoteEntryProps) {
     return {
       kind: 'ready',
       url: result.url,
+      token: result.token,
       expiresAt: result.expiresAt,
       expired: Date.now() > result.expiresAt,
       phase: 'waiting',
@@ -215,6 +217,14 @@ export function RemoteEntry({ wide, t }: RemoteEntryProps) {
     })
   }, [])
 
+  const handleCopyToken = useCallback((token: string) => {
+    void copyText(token).then((ok) => {
+      if (!ok) return
+      setCopiedToken(true)
+      window.setTimeout(() => { setCopiedToken(false) }, 1500)
+    })
+  }, [])
+
   return (
     <>
       <div className={css.entryRow} data-rail={wide ? undefined : 'rail'}>
@@ -228,10 +238,12 @@ export function RemoteEntry({ wide, t }: RemoteEntryProps) {
             t={t}
             state={state}
             copied={copied}
+            copiedToken={copiedToken}
             onClose={closePanel}
             onStop={handleStop}
             onRefresh={handleRefresh}
             onCopy={handleCopy}
+            onCopyToken={handleCopyToken}
             onPickAddress={handlePickAddress}
             onPickPublic={handlePickPublic}
             onRevoke={handleRevoke}

package/src/client/RemotePanel.tsx

@@ -41,6 +41,8 @@ export type PanelState =
       address: string
       /** Every constructible LAN literal (interface order). */
       lanAddresses: string[]
+      /** The active pairing token itself (useful in Docker/reverse proxy topologies). */
+      token?: string
       /** Whether this QR is built on the configured public (tunneled) base. */
       public: boolean
       /** The configured public (tunneled) base URL, when present. */
@@ -58,10 +60,12 @@ export interface RemotePanelProps {
   t: TranslateNS<'remote'>
   state: PanelState
   copied: boolean
+  copiedToken?: boolean
   onClose(): void
   onStop(): void
   onRefresh(): void
   onCopy(url: string): void
+  onCopyToken?(token: string): void
   /** Re-mint the QR against a different LAN address. */
   onPickAddress(address: string): void
   /** Re-mint the QR against the configured public (tunneled) base. */
@@ -89,7 +93,20 @@ function statusOf(
  * @param props - copy, state, and actions.
  * @returns the panel element tree.
  */
-export function RemotePanel({ t, state, copied, onClose, onStop, onRefresh, onCopy, onPickAddress, onPickPublic, onRevoke }: RemotePanelProps) {
+export function RemotePanel({
+  t,
+  state,
+  copied,
+  copiedToken,
+  onClose,
+  onStop,
+  onRefresh,
+  onCopy,
+  onCopyToken,
+  onPickAddress,
+  onPickPublic,
+  onRevoke,
+}: RemotePanelProps) {
   return (
     <div className={css.panel} role="dialog" aria-modal="true" aria-label={t('title')}>
       <div className={css.header}>
@@ -157,8 +174,26 @@ export function RemotePanel({ t, state, copied, onClose, onStop, onRefresh, onCo
                 {copied ? t('action.copied') : t('action.copyLink')}
               </button>
             </div>
+            {state.token !== undefined && state.token !== '' && (
+              <div className={css.pairLinkRow}>
+                <div className={css.pairLinkText}>
+                  <span className={css.pairLinkLabel}>{t('pair.tokenLabel')}</span>
+                  <code className={css.link} title={state.token}>{state.token}</code>
+                </div>
+                <button
+                  type="button"
+                  className={css.copyLink}
+                  onClick={() => onCopyToken ? onCopyToken(state.token!) : onCopy(state.token!)}
+                >
+                  <IconCopyOutline16 size={14} />
+                  {copiedToken ? t('action.copiedToken') : t('action.copyToken')}
+                </button>
+              </div>
+            )}
           </div>
-          <p className={css.oneTimeHint}>{t('pair.oneTimeHint')}</p>
+          <p className={css.oneTimeHint}>
+            {t('pair.oneTimeHint')} {t('pair.dockerHint')}
+          </p>
           {state.phase === 'stopped' && <p className={css.stoppedHint}>{t('stopped.hint')}</p>}
           {state.tunnel !== undefined && state.tunnel.state !== 'running' && (
             <p className={state.tunnel.state === 'failed' ? css.tunnelFailed : css.tunnelNote} role="status">

package/src/client/locales.ts

@@ -29,6 +29,8 @@ export const zh = {
   'pair.expires': '二维码有效至 {time}',
   'pair.expired': '二维码已过期，请刷新',
   'pair.linkLabel': '配对链接',
+  'pair.tokenLabel': '配对令牌',
+  'pair.dockerHint': 'Docker 或反向代理环境下，可直接复制此令牌并在目标设备配对页面输入。',
   'pair.oneTimeHint': '链接含一次性令牌；任一设备配对成功后立即失效，配对下一台设备请刷新二维码。',
   'pair.failed.title': '配对失败',
   'pair.failed.detail': '链接无效或已使用，请回到电脑端刷新二维码后重新扫码。',
@@ -52,7 +54,9 @@ export const zh = {
   'action.refresh': '刷新二维码',
   'action.copy': '复制链接',
   'action.copyLink': '复制链接',
+  'action.copyToken': '复制令牌',
   'action.copied': '已复制',
+  'action.copiedToken': '已复制令牌',
   'devices.title': '已授权设备',
   'devices.empty': '还没有已配对的设备。扫码或打开链接后会出现在这里。',
   'devices.unknown': '未知设备',
@@ -199,6 +203,8 @@ export const en = {
   'pair.expires': 'QR code valid until {time}',
   'pair.expired': 'QR code expired — refresh it',
   'pair.linkLabel': 'Pairing link',
+  'pair.tokenLabel': 'Pairing token',
+  'pair.dockerHint': 'In Docker or reverse proxy environments, copy this token to pair directly on the target device.',
   'pair.oneTimeHint': 'The link carries one single-use token; it dies as soon as any device pairs. Refresh the QR to pair the next device.',
   'pair.failed.title': 'Pairing failed',
   'pair.failed.detail': 'The link is invalid or was already used. Refresh the QR code on your computer and scan again.',
@@ -222,7 +228,9 @@ export const en = {
   'action.refresh': 'Refresh QR',
   'action.copy': 'Copy link',
   'action.copyLink': 'Copy link',
+  'action.copyToken': 'Copy token',
   'action.copied': 'Copied',
+  'action.copiedToken': 'Token copied',
   'devices.title': 'Authorized devices',
   'devices.empty': 'No paired devices yet. Scan the QR or open the link to add one.',
   'devices.unknown': 'Unknown device',

package/src/client/mobile-adapt.ts

@@ -236,7 +236,6 @@ const ADAPT_CSS: readonly string[] = [
   `body.${ACTIVE_CLASS} [data-dsh-plugin=\"task-board\"],`,
   `body.${ACTIVE_CLASS} [data-dsh-plugin=\"git-graph\"],`,
   `body.${ACTIVE_CLASS} [data-dsh-plugin=\"pet\"],`,
-  `body.${ACTIVE_CLASS} [data-dsh-plugin=\"perf\"],`,
   `body.${ACTIVE_CLASS} [data-dsh-plugin=\"usage\"]{display:none !important}`,
   // The official workbench (Files / source control) mounts into a
   // full-viewport portal layer with no data-dsh-plugin root, so the plugin
@@ -921,15 +920,11 @@ export function startMobileAdapt(): void {
     }
     lanOrigFocus.call(this, options)
   }
-  let lastComposerTapRegistered = false
-  if (!lastComposerTapRegistered) {
-    lastComposerTapRegistered = true
-    document.addEventListener('pointerdown', (e) => {
-      if (!active) return
-      const t = e.target
-      if (t instanceof Element && (t.tagName === 'TEXTAREA' || t.tagName === 'INPUT') && t.closest('[class$="_composerSeat"]') !== null) lastComposerTap = Date.now()
-    }, true)
-  }
+  document.addEventListener('pointerdown', (e) => {
+    if (!active) return
+    const t = e.target
+    if (t instanceof Element && (t.tagName === 'TEXTAREA' || t.tagName === 'INPUT') && t.closest('[class$="_composerSeat"]') !== null) lastComposerTap = Date.now()
+  }, true)
 
   // The plugin apply() wires toggleSidebar/closeDetails to ctx.layout once
   // it is live, and flips the master switch when the settings snapshot

package/src/client/remote-channel.ts

@@ -11,8 +11,6 @@
  * - the pairing routes (`/api/pair/*`) stay where they are — accept must
  *   work BEFORE a device is paired;
  * - the update endpoints (`/api/update/*`) stay loopback-only;
- * - desktop-launcher create/shutdown (`/api/dsh-desktop-launcher/*`) stay
- *   loopback-only (host-local files and process exit);
  * - the family settings bridge (`/api/dsh-web-ui-settings/*`) stays
  *   loopback-only (same plane as SDK settings.*);
  * - `/api/*` (SDK methods and `/api/<plugin>/...` plugin namespaces),
@@ -77,7 +75,6 @@ export function isLoopbackHostname(hostname: string): boolean {
 export function shouldRewriteFetchPath(pathname: string): boolean {
   if (pathname.startsWith(RULES.pairPrefix)) return false
   if (pathname.startsWith(RULES.updatePrefix)) return false
-  if (pathname === RULES.desktopLauncherPrefix || pathname.startsWith(`${RULES.desktopLauncherPrefix}/`)) return false
   if (pathname === RULES.settingsBridgePrefix || pathname.startsWith(`${RULES.settingsBridgePrefix}/`)) return false
   if (pathname.startsWith(RULES.apiPrefix)) return true
   if (pathname.startsWith(RULES.sidebarPrefix) || pathname === '/sidebar') return true

package/src/index.ts

@@ -126,6 +126,13 @@ export interface Config {
    * warning (LAN-only behavior preserved). Ignored while `autoTunnel` is on.
    */
   publicBaseUrl?: string
+  /**
+   * Extra trusted host authorities (exact host:port or port-less host) allowed
+   * to access pairing endpoints and remote web services. Useful in Docker, reverse proxy,
+   * or NAT environments where incoming request Host headers differ from the container's
+   * internal network addresses. Can also be set via the DSH_REMOTE_TRUSTED_HOSTS env var.
+   */
+  trustedHosts?: string[]
   /**
    * Absolute path to a JSON file where paired device sessions are persisted.
    * Defaults to `$DSH_HOME/remote-web-ui-devices.json` so a paired device
@@ -199,6 +206,7 @@ export const Config: z<Config> = z.object({
   cookieName: z.string().min(1).default('dsh_pair'),
   requirePairingForLan: z.boolean().default(true),
   publicBaseUrl: z.string(),
+  trustedHosts: z.array(z.string()),
   devicesFile: z.string(),
   autoTunnel: z.boolean().default(false),
   tunnelToken: z.string().role('secret'),
@@ -216,8 +224,9 @@ const SWEEP_INTERVAL_MS = 10_000
  * which legitimately resolves to `undefined` when unset (the schema keeps it
  * optional, so `Required` alone would over-narrow it to `string`).
  */
-type ResolvedConfig = Required<Omit<Config, 'publicBaseUrl' | 'devicesFile' | 'lanBind' | 'profile' | 'tunnelToken'>> & {
+type ResolvedConfig = Required<Omit<Config, 'publicBaseUrl' | 'trustedHosts' | 'devicesFile' | 'lanBind' | 'profile' | 'tunnelToken'>> & {
   publicBaseUrl: string | undefined
+  trustedHosts: string[] | undefined
   devicesFile: string
   /** undefined until the user flips the toggle once; undefined never writes the patch. */
   lanBind: boolean | undefined
@@ -259,6 +268,7 @@ const DEFAULTS: ResolvedConfig = {
   cookieName: 'dsh_pair',
   requirePairingForLan: true,
   publicBaseUrl: undefined,
+  trustedHosts: undefined,
   devicesFile: defaultDevicesFile(),
   autoTunnel: false,
   tunnelToken: undefined,
@@ -276,6 +286,7 @@ const DEFAULTS: ResolvedConfig = {
 export const apply = mountOnce('@linxin666/dsh-remote-web-ui', applyImpl)
 
 function applyImpl(ctx: Context, config?: Config): void {
+  const envPublicBase = process.env.DSH_REMOTE_PUBLIC_BASE_URL?.trim() || undefined
   const resolved: ResolvedConfig = {
     tokenTtlMs: config?.tokenTtlMs ?? DEFAULTS.tokenTtlMs,
     offlineAfterMs: config?.offlineAfterMs ?? DEFAULTS.offlineAfterMs,
@@ -283,7 +294,8 @@ function applyImpl(ctx: Context, config?: Config): void {
     idleExpireMs: config?.idleExpireMs ?? DEFAULTS.idleExpireMs,
     cookieName: config?.cookieName ?? DEFAULTS.cookieName,
     requirePairingForLan: config?.requirePairingForLan ?? DEFAULTS.requirePairingForLan,
-    publicBaseUrl: config?.publicBaseUrl,
+    publicBaseUrl: config?.publicBaseUrl ?? envPublicBase,
+    trustedHosts: config?.trustedHosts,
     devicesFile: config?.devicesFile ?? DEFAULTS.devicesFile,
     autoTunnel: config?.autoTunnel ?? DEFAULTS.autoTunnel,
     tunnelToken: config?.tunnelToken,
@@ -305,7 +317,8 @@ function applyImpl(ctx: Context, config?: Config): void {
       idleExpireMs: value.idleExpireMs ?? DEFAULTS.idleExpireMs,
       cookieName: value.cookieName ?? DEFAULTS.cookieName,
       requirePairingForLan: value.requirePairingForLan ?? DEFAULTS.requirePairingForLan,
-      publicBaseUrl: value.publicBaseUrl,
+      publicBaseUrl: value.publicBaseUrl ?? envPublicBase,
+      trustedHosts: value.trustedHosts,
       devicesFile: value.devicesFile ?? DEFAULTS.devicesFile,
       autoTunnel: value.autoTunnel ?? DEFAULTS.autoTunnel,
       tunnelToken: value.tunnelToken,
@@ -445,13 +458,15 @@ function applyImpl(ctx: Context, config?: Config): void {
   // directory on update, so a boot-time captured path would fail to read
   // after a successful update; versions are re-read from disk per check.
   const requireFromHost = createRequire(import.meta.url)
-  const resolveAnchorPath = (): string | undefined => resolveAnchorManifest(specifier => {
+  /** Host-process resolve that degrades to "not installed" (undefined) instead of throwing. */
+  const hostResolve = (specifier: string): string | undefined => {
     try {
       return requireFromHost.resolve(specifier)
     } catch {
       return undefined
     }
-  })
+  }
+  const resolveAnchorPath = (): string | undefined => resolveAnchorManifest(hostResolve)
 
   const releaseNotesCache = new Map<string, { at: number; notes?: UpdateReleaseNotes }>()
   const fetchReleaseNotesCached = async (version: string): Promise<UpdateReleaseNotes | undefined> => {
@@ -467,13 +482,7 @@ function applyImpl(ctx: Context, config?: Config): void {
     fence: request => isTrustedApiRequest(request, []),
     check: () => checkUpdates({
       anchorManifestPath: resolveAnchorPath(),
-      resolve: specifier => {
-        try {
-          return requireFromHost.resolve(specifier)
-        } catch {
-          return undefined
-        }
-      },
+      resolve: hostResolve,
       fetchLatest: name => fetchLatestVersion(name, fetch),
       fetchReleaseNotes: fetchReleaseNotesCached,
     }),
@@ -497,13 +506,7 @@ function applyImpl(ctx: Context, config?: Config): void {
         run: { profileDir: target.profileDir, packages: target.packages },
         check: {
           anchorManifestPath: resolveAnchorPath(),
-          resolve: specifier => {
-            try {
-              return requireFromHost.resolve(specifier)
-            } catch {
-              return undefined
-            }
-          },
+          resolve: hostResolve,
           fetchLatest: name => fetchLatestVersion(name, fetch),
           fetchReleaseNotes: fetchReleaseNotesCached,
         },
@@ -589,10 +592,29 @@ function applyImpl(ctx: Context, config?: Config): void {
   const routes = [
     ...makeRoutes({
       service,
-      lanAddresses: service.lanAddresses,
       requirePairingForLan: () => resolve().requirePairingForLan,
       lanBindStatus,
       indexDocument: fetchAppShell,
+      trustedHosts: () => {
+        const list: string[] = []
+        const envHosts = process.env.DSH_REMOTE_TRUSTED_HOSTS
+        if (typeof envHosts === 'string' && envHosts.trim() !== '') {
+          for (const item of envHosts.split(',')) {
+            const trimmed = item.trim()
+            if (trimmed !== '') list.push(trimmed)
+          }
+        }
+        const cfgHosts = resolve().trustedHosts
+        if (Array.isArray(cfgHosts)) {
+          for (const item of cfgHosts) {
+            if (typeof item === 'string') {
+              const trimmed = item.trim()
+              if (trimmed !== '') list.push(trimmed)
+            }
+          }
+        }
+        return list
+      },
     }),
     // The remote desktop channel: policy-gated `/remote` prefix that
     // re-issues fenced paths to loopback (see remote-api.ts). The live
@@ -852,13 +874,24 @@ function applyImpl(ctx: Context, config?: Config): void {
   }), 'remote-web-ui: remote channel boot patch')
 
   ctx.inject(['settings'], (settingsCtx) => {
-    settingsCtx.settings.installSection(ctx, REMOTE_WEB_UI_SETTINGS_NAMESPACE, Config, config ?? {}, {
-      setSource: (source) => {
-        current = source
+    try {
+      if (typeof settingsCtx.settings?.installSection === 'function') {
+        settingsCtx.settings.installSection(ctx, REMOTE_WEB_UI_SETTINGS_NAMESPACE, Config, config ?? {}, {
+          setSource: (source) => {
+            current = source
+            sync()
+          },
+          onChange: sync,
+        })
+      } else if (typeof settingsCtx.settings?.register === 'function') {
+        const scope = settingsCtx.settings.register(REMOTE_WEB_UI_SETTINGS_NAMESPACE, Config, { base: config ?? {} })
+        current = () => scope?.get?.() ?? (config ?? {})
+        scope?.watch?.(() => { sync() })
         sync()
-      },
-      onChange: sync,
-    })
+      }
+    } catch {
+      // Defensive fallback against settings registration differences
+    }
   })
   sync()
 }