dsh-remote-hub 0.2.1 → 0.2.2

package/README.md

@@ -19,9 +19,9 @@ Kotlin/Compose 直连 DSH 自带的 HTTP API + WebSocket 网关。
 
 ## 下载手机端 App
 
-**DSH Remote v4.19.1** · Android 8.0 (API 26) 及以上 · 2.8 MB
+**DSH Remote v4.20.0** · Android 8.0 (API 26) 及以上 · 2.8 MB
 
-[⬇️ 下载 APK](https://github.com/liaoguogang-hub/dsh-remote-public/releases/download/v4.19.1/DSH-Remote-v4.19.1.apk) ·
+[⬇️ 下载 APK](https://github.com/liaoguogang-hub/dsh-remote-public/releases/download/v4.20.0/DSH-Remote-v4.20.0.apk) ·
 [全部版本](https://github.com/liaoguogang-hub/dsh-remote-public/releases)
 
 安装后应用名「DSH Remote」，包名 `com.dsh.remote.ngrok`（可与作者的 `DSH` 自用版共存）。
@@ -233,7 +233,7 @@ dsh-remote qr
 浏览器会打开 `http://127.0.0.1:6300/_dsh-remote/pair`，显示一个二维码。手机 DSH Remote 里点
 「扫码配对」，扫完自动填入地址并换取登录凭据，直接连上。
 
-扫码后会自动判断：返回的是私有地址就填进「局域网」，公网地址填进「自定义」。
+扫码一次会同时写入「局域网」和「ngrok」两档地址；连接时优先局域网（同 WiFi 最快），局域网不通才走 ngrok。扫码后即保存，之后不用再扫。
 
 安全设计：
 - 二维码里**不含 Cookie**，只含一个 **10 分钟有效的一次性配对码**（`{"v":1,"u":"<地址>","c":"<配对码>","e":<过期时间>}`）；

package/lib/index.js

@@ -16,7 +16,7 @@ import { start } from './supervisor.js'
 
 export const name = 'dsh-remote-hub'
 
-export const version = '0.2.1'
+export const version = '0.2.2'
 
 /** No host services are required: the plugin only needs Node builtins. */
 export const inject = []

package/lib/pairing-routes.js

@@ -15,9 +15,15 @@ import QRCode from 'qrcode'
 
 export const PAIR_PREFIX = '/_dsh-remote/pair'
 
-/** Build the payload the phone parses. `u` is the URL the phone should talk to. */
-export function buildPairPayload({ url, code, expiresAt }) {
-  return JSON.stringify({ v: 1, u: url, c: code, e: expiresAt })
+/**
+ * Build the payload the phone parses.
+ *
+ * Both addresses are shipped together so one scan can fill both tabs and the phone can pick the
+ * fastest one at connect time: `l` = LAN (private address), `u` = public tunnel. Either may be null
+ * when that transport is unavailable that moment.
+ */
+export function buildPairPayload({ lan, publicUrl, code, expiresAt }) {
+  return JSON.stringify({ v: 1, l: lan ?? null, u: publicUrl ?? null, c: code, e: expiresAt })
 }
 
 /**
@@ -67,7 +73,10 @@ export async function handlePairing({ req, res, current, store }) {
     res.end(
       JSON.stringify({
         ok: true,
-        url: snapshot.url,
+        // `url` keeps the old single-address shape working; new clients read lan/public.
+        url: snapshot.public ?? snapshot.lan ?? null,
+        lan: snapshot.lan ?? null,
+        public: snapshot.public ?? null,
         cookie: result.cookie,
         issuedAt: result.issuedAt,
       }),
@@ -77,7 +86,7 @@ export async function handlePairing({ req, res, current, store }) {
 
   // Any other GET under the prefix hands out a fresh code.
   const { code, expiresAt, ttlMs } = store.issue(snapshot.cookie)
-  const payload = buildPairPayload({ url: snapshot.url, code, expiresAt })
+  const payload = buildPairPayload({ lan: snapshot.lan, publicUrl: snapshot.public, code, expiresAt })
 
   if (url === PAIR_PREFIX + '/svg') {
     const svg = await QRCode.toString(payload, { type: 'svg', margin: 1, width: 320, errorCorrectionLevel: 'M' })
@@ -110,8 +119,8 @@ export async function handlePairing({ req, res, current, store }) {
   <p>配对码 <code>${code}</code> · ${minutes} 分钟内有效，且只能用一次</p>
   <div class="qr">${svg}</div>
   <p class="ok">扫码后自动填入地址并换取登录凭据</p>
-  <p class="addr">本页地址：<br>${snapshot.url}</p>
-  <p class="addr">手输备用：打开 App → 设置 → 扫码配对 → 输入配对码</p>
+  <p class="addr">${snapshot.lan ? `局域网：${snapshot.lan}<br>` : ''}${snapshot.public ? `公网：${snapshot.public}` : ''}</p>
+  <p class="addr">扫一次会同时存下局域网与公网地址，之后自动优先走局域网</p>
 </div></body></html>`
   res.writeHead(200, { 'content-type': 'text/html; charset=utf-8', 'cache-control': 'no-store' })
   res.end(html)

package/lib/supervisor.js

@@ -164,9 +164,12 @@ export async function start(config = {}) {
   const pairingStore = createPairingStore()
   const pairing = {
     store: pairingStore,
-    // `current()` is read at redeem time so a URL that appears later (tunnel is still coming up)
-    // is still handed to the phone.
-    current: () => ({ url: lastPublicUrl ?? (ipForPairing ? `http://${ipForPairing}:${Number(port) || 6300}` : ''), cookie }),
+    // Read at redeem time so a tunnel URL that appears later is still handed to the phone.
+    current: () => ({
+      lan: ipForPairing ? `http://${ipForPairing}:${Number(port) || 6300}` : null,
+      public: lastPublicUrl ?? null,
+      cookie,
+    }),
   }
 
   const ipForPairing = lanAddress()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-hub",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "DSH 插件：把电脑上的 DeepSeek Harness 变成手机可访问的服务——起桥接、自动开隧道（ngrok / cloudflared）、签发 30 天 Cookie，并输出地址与凭据，配合 DSH Remote Android App 使用。",
   "type": "module",
   "main": "lib/index.js",