dsh-remote-hub 0.2.0 → 0.2.2

package/README.md

@@ -19,9 +19,9 @@ Kotlin/Compose 直连 DSH 自带的 HTTP API + WebSocket 网关。
 
 ## 下载手机端 App
 
-**DSH Remote v4.17.1** · Android 8.0 (API 26) 及以上 · 2.6 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.17.1/DSH-Remote-v4.17.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` 自用版共存）。
@@ -32,6 +32,14 @@ Kotlin/Compose 直连 DSH 自带的 HTTP API + WebSocket 网关。
 手机：装上面这个 APK → 填电脑给出的地址与 Cookie → 连接
 ```
 
+## 扫码配对（手机端）
+
+电脑上 `dsh-remote qr` 打开配对页 → 手机 App「设置 → 扫码配对」扫一下就自动填好地址与凭据，
+不用手抄 Cookie。
+
+二维码里**不含 Cookie**：只含一个 **10 分钟有效、用一次就作废**的配对码。
+相机不可用时可以点「手动输入」，填地址 + 配对码同样能连上。
+
 ## 功能
 
 | 能力 | 状态 |
@@ -194,6 +202,7 @@ dsh plugin --profile web add github:liaoguogang-hub/dsh-remote-public
 
 ```bash
 dsh-remote qr         # 打开配对页（二维码），手机扫一下就自动填好
+dsh-remote start --open   # 起桥接并打印地址/Cookie，同时打开二维码页（connect.cmd 用的就是它）
 dsh-remote status     # 局域网地址、公网地址、Cookie、上游端口
 dsh-remote connect    # 直接打印要抄进手机的两行
 dsh-remote doctor     # 逐项自检：凭据、ngrok、cloudflared、宿主端口
@@ -224,6 +233,8 @@ dsh-remote qr
 浏览器会打开 `http://127.0.0.1:6300/_dsh-remote/pair`，显示一个二维码。手机 DSH Remote 里点
 「扫码配对」，扫完自动填入地址并换取登录凭据，直接连上。
 
+扫码一次会同时写入「局域网」和「ngrok」两档地址；连接时优先局域网（同 WiFi 最快），局域网不通才走 ngrok。扫码后即保存，之后不用再扫。
+
 安全设计：
 - 二维码里**不含 Cookie**，只含一个 **10 分钟有效的一次性配对码**（`{"v":1,"u":"<地址>","c":"<配对码>","e":<过期时间>}`）；
 - 兑换成功即作废，截图/偷拍泄漏的是一个立刻失效的码，而不是 30 天访问权；

package/bin/dsh-remote.mjs

@@ -5,7 +5,7 @@
  *   dsh-remote status      show LAN URL, public URL, cookie and upstream port
  *   dsh-remote connect     print the two lines to paste into the phone
  *   dsh-remote cookie      print only the cookie
- *   dsh-remote start       run the supervisor in the foreground (Ctrl+C stops it)
+ *   dsh-remote start [--open]  run the supervisor in the foreground; --open 打印地址并打开配对页
  *   dsh-remote stop        ask a foreground `start` to stop (best effort, via status file)
  *   dsh-remote doctor      check every prerequisite in one pass
  *   dsh-remote qr          open the pairing page (QR) in the default browser
@@ -69,6 +69,16 @@ function openBrowser(url) {
   })
 }
 
+/** Point the browser at the running bridge's pairing page (port comes from status, not a constant). */
+async function openPairPage(bridgePort) {
+  const page = `http://127.0.0.1:${bridgePort}/_dsh-remote/pair`
+  console.log('')
+  console.log('  配对页：', page)
+  console.log('  手机点右上角扫码按钮，扫这个二维码即可（10 分钟内有效，用一次作废）')
+  console.log('')
+  await openBrowser(page)
+}
+
 async function qrCommand() {
   const status = readStatus()
   const port = status?.bridgePort ?? Number(process.env.DSH_REMOTE_PORT || 6300)
@@ -148,7 +158,31 @@ async function main() {
       await qrCommand()
       break
     case 'start': {
-      const handle = await start({ log: (m) => console.log(m) })
+      const wantOpen = process.argv.includes('--open')
+      let handle
+      try {
+        handle = await start({ log: (m) => console.log(m) })
+      } catch (err) {
+        // Port already taken: another bridge is serving; just show its pairing page.
+        if (/EADDRINUSE/.test(String(err?.message ?? err))) {
+          const running = readStatus()
+          const port = running?.bridgePort
+          if (port) {
+            console.log(`已有桥接在 127.0.0.1:${port} 运行，直接复用它`)
+            if (wantOpen) await openPairPage(port)
+            return
+          }
+        }
+        throw err
+      }
+      const status = handle.status
+      if (status?.cookie) {
+        console.log('')
+        console.log('  DSH 地址（局域网）：', status.lan?.url ?? '(未检测到局域网 IP)')
+        console.log('  DSH 地址（公网）  ：', status.public?.url ?? `无（${status.public?.note ?? '未开启'}）`)
+        console.log('  Cookie            ：', status.cookie)
+      }
+      if (wantOpen) await openPairPage(status?.bridgePort ?? Number(process.env.DSH_REMOTE_PORT || 6300))
       process.on('SIGINT', async () => {
         await handle.close()
         process.exit(0)

package/lib/index.js

@@ -16,7 +16,7 @@ import { start } from './supervisor.js'
 
 export const name = 'dsh-remote-hub'
 
-export const version = '0.2.0'
+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/lib/tunnel.js

@@ -56,10 +56,14 @@ function which(cmd) {
 
 /** Locate an installed tunel binary, or null. */
 export function findNgrok() {
+  const exe = process.platform === 'win32' ? 'ngrok.exe' : 'ngrok'
   const candidates = [
-    process.platform === 'win32' ? path.join(process.env.LOCALAPPDATA || '', 'ngrok', 'ngrok.exe') : null,
-    path.join(DATA_DIR, process.platform === 'win32' ? 'ngrok.exe' : 'ngrok'),
-    process.platform === 'win32' ? 'ngrok.exe' : 'ngrok',
+    process.platform === 'win32' ? path.join(process.env.LOCALAPPDATA || '', 'ngrok', exe) : null,
+    path.join(DATA_DIR, exe),
+    path.join(process.cwd(), 'tools', exe),
+    path.join(os.homedir(), 'Documents', 'DSH', 'DshRemote', 'tools', exe),
+    path.join(os.homedir(), 'Documents', 'DSH', '.dsh-apk-research', 'tools', exe),
+    exe,
   ].filter(Boolean)
   for (const c of candidates) {
     if (exists(c)) return c
@@ -69,7 +73,14 @@ export function findNgrok() {
 }
 
 export function findCloudflared() {
-  const candidates = [CLOUDFLARED_EXE, path.join(DATA_DIR, 'cloudflared.exe')]
+  const exe = process.platform === 'win32' ? 'cloudflared.exe' : 'cloudflared'
+  const candidates = [
+    CLOUDFLARED_EXE,
+    path.join(DATA_DIR, exe),
+    path.join(process.cwd(), 'tools', exe),
+    path.join(os.homedir(), 'Documents', 'DSH', 'DshRemote', 'tools', exe),
+    path.join(os.homedir(), 'Documents', 'DSH', '.dsh-apk-research', 'tools', exe),
+  ]
   for (const c of candidates) {
     if (exists(c)) return c
   }
@@ -144,6 +155,13 @@ export async function startTunnel({ kind = 'auto', bridgePort, authority, domain
   const wantCloudflared = kind === 'auto' || kind === 'cloudflared'
 
   if (wantNgrok) {
+    // A tunnel that is already pointing at this bridge (the usual case for a long-running setup
+    // with a static ngrok domain) is reused instead of spawning a second agent.
+    const reused = await existingNgrokUrl(bridgePort)
+    if (reused) {
+      log(`reusing the running ngrok tunnel: ${reused}`)
+      return { publicUrl: reused, kind: 'ngrok', close: () => {} }
+    }
     const ngrok = findNgrok()
     if (ngrok) {
       const args = ['http', String(bridgePort), '--host-header', authority, '--log', 'stdout', '--log-format', 'json']
@@ -178,6 +196,24 @@ export async function startTunnel({ kind = 'auto', bridgePort, authority, domain
   return { publicUrl: null, kind: 'none', close: () => {} }
 }
 
+/** Ask a running ngrok agent what it already exposes for `bridgePort`. */
+async function existingNgrokUrl(bridgePort) {
+  try {
+    const res = await fetch('http://127.0.0.1:4040/api/tunnels', { signal: AbortSignal.timeout(2000) })
+    if (!res.ok) return null
+    const doc = await res.json()
+    const tunnels = Array.isArray(doc?.tunnels) ? doc.tunnels : []
+    for (const t of tunnels) {
+      const addr = String(t?.config?.addr ?? '')
+      // ngrok reports the upstream as `http://localhost:6300` / `http://127.0.0.1:6300`.
+      if (new RegExp(`:${bridgePort}(/|$)`).test(addr)) return t.public_url || null
+    }
+    return null
+  } catch {
+    return null
+  }
+}
+
 function waitForUrl(child, timeoutMs) {
   return new Promise((resolve) => {
     let done = false

package/package.json

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