dsh-remote-hub 0.3.1 → 0.3.3

package/README.md

@@ -19,9 +19,9 @@ Kotlin/Compose 直连 DSH 自带的 HTTP API + WebSocket 网关。
 
 ## 下载手机端 App
 
-**DSH Remote v4.20.1** · Android 8.0 (API 26) 及以上 · 2.8 MB
+**DSH Remote v4.21.0** · Android 8.0 (API 26) 及以上 · 2.8 MB
 
-[⬇️ 下载 APK](https://github.com/liaoguogang-hub/dsh-remote-public/releases/download/v4.20.1/DSH-Remote-v4.20.1.apk) ·
+[⬇️ 下载 APK](https://github.com/liaoguogang-hub/dsh-remote-public/releases/download/v4.21.0/DSH-Remote-v4.21.0.apk) ·
 [全部版本](https://github.com/liaoguogang-hub/dsh-remote-public/releases)
 
 安装后应用名「DSH Remote」，包名 `com.dsh.remote.ngrok`（可与作者的 `DSH` 自用版共存）。
@@ -235,6 +235,38 @@ dsh-remote: ready — 手机端扫码：dsh-remote qr（或浏览器打开 http:
 **Cookie 跨重启有效**：桥接始终向 DSH 呈现固定 authority（默认 `127.0.0.1:1815`），
 所以 DSH 换端口、桥接重启都不会让手机上的凭据失效；只有签名密钥变化或 Cookie 到期（30 天）才需要重新扫码。
 
+### 升级插件（重要：必须完全重启 DSH）
+
+```bash
+dsh plugin --profile desktop add dsh-remote-hub     # 或 --profile web
+```
+
+**升级后请完全退出 DSH 再重新打开，不要只靠插件热重载。** 原因是旧版本的桥接监听可能不会被热重载回收，
+它会继续占着端口，而这个"旧桥接"里没有新版本的路由：
+
+| 症状 | 含义 |
+|---|---|
+| 配对页打不开，或打开是**乱码/无关页面** | 端口被**旧版桥接**占着，请求被它转发走了 |
+| `dsh-remote status` 里 `bridgePort` 是 `0`、地址是 `http://x.x.x.x:0` | 旧版本绑不上端口的回退 bug（0.3.0 及更早） |
+
+0.3.1 起这些都能自愈，但仍建议完全重启，理由是会残留**旧代码的监听**：
+
+- 绑不上端口时先探 `/_dsh-remote/health`：
+  - 是支持配对的本插件桥接 → 直接**采纳**，不重复开隧道；
+  - 是旧版桥接（没有配对路由）或别的程序 → 自动**改用临时端口**，并在日志/`status.json` 里写明真实端口；
+- 插件热重载时通过进程内注册表**先关闭上一实例**的监听。
+
+升级后确认当前真实端口：
+
+```bash
+dsh-remote status        # 打印 bridgePort / 局域网 / 公网 / Cookie
+# 或直接看健康检查
+curl http://127.0.0.1:<bridgePort>/_dsh-remote/health
+```
+
+> 提示：`cordis.patch.yml` 里的 `port` 只是**首选**端口。若被占用，实际端口会写在 `~/.dsh/dsh-remote/status.json`，
+> 一切链接与二维码都以那里为准，不必手改配置。
+
 ### 扫码配对（一次性配对码）
 
 不想手抄 Cookie 就用二维码：

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 [--open]  run the supervisor in the foreground; --open 打印地址并打开配对页
+ *   dsh-remote start [--open] [--public-url=URL]  run the supervisor; --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
@@ -14,6 +14,7 @@
  */
 
 import fs from 'node:fs'
+import http from 'node:http'
 import { execFile } from 'node:child_process'
 import os from 'node:os'
 import path from 'node:path'
@@ -69,8 +70,59 @@ function openBrowser(url) {
   })
 }
 
-/** Point the browser at the running bridge's pairing page (port comes from status, not a constant). */
+/** Is a live dsh-remote bridge answering on this port? */
+function bridgeHealthy(port, timeoutMs = 1200) {
+  return new Promise((resolve) => {
+    const req = http.request(
+      { host: '127.0.0.1', port, path: '/_dsh-remote/health', method: 'GET', timeout: timeoutMs },
+      (res) => {
+        const chunks = []
+        res.on('data', (c) => chunks.push(c))
+        res.on('end', () => {
+          try {
+            const doc = JSON.parse(Buffer.concat(chunks).toString('utf8'))
+            resolve(doc?.ok ? doc : null)
+          } catch {
+            resolve(null)
+          }
+        })
+      },
+    )
+    req.on('error', () => resolve(null))
+    req.on('timeout', () => {
+      req.destroy()
+      resolve(null)
+    })
+    req.end()
+  })
+}
+
+/**
+ * Point the browser at the running bridge's pairing page.
+ *
+ * The port is verified against the bridge's own health route first: status.json can be stale after
+ * a crashed run or a test on another port, and opening a dead URL looks like "the QR page is broken".
+ */
+async function resolveLiveBridge(preferred) {
+  const candidates = [preferred, 6300, readStatus()?.bridgePort]
+    .filter((p, i, arr) => Number.isInteger(p) && p > 0 && arr.indexOf(p) === i)
+  for (const port of candidates) {
+    // eslint-disable-next-line no-await-in-loop
+    const live = await bridgeHealthy(port)
+    if (live) return Number(live.bridgePort) || port
+  }
+  return null
+}
+
 async function openPairPage(bridgePort) {
+  const livePort = await resolveLiveBridge(bridgePort)
+  if (!livePort) {
+    console.log('')
+    console.log('  找不到正在运行的桥接：先运行 dsh-remote start，或双击 connect.cmd')
+    console.log('')
+    return
+  }
+  bridgePort = livePort
   const page = `http://127.0.0.1:${bridgePort}/_dsh-remote/pair`
   console.log('')
   console.log('  配对页：', page)
@@ -81,7 +133,13 @@ async function openPairPage(bridgePort) {
 
 async function qrCommand() {
   const status = readStatus()
-  const port = status?.bridgePort ?? Number(process.env.DSH_REMOTE_PORT || 6300)
+  const port = await resolveLiveBridge(status?.bridgePort ?? Number(process.env.DSH_REMOTE_PORT || 6300))
+  if (!port) {
+    console.log('')
+    console.log('  桥接还没运行：先执行 dsh-remote start --open（或双击 connect.cmd）')
+    console.log('')
+    return
+  }
   const page = `http://127.0.0.1:${port}/_dsh-remote/pair`
   console.log('')
   console.log('  配对页：', page)
@@ -164,9 +222,12 @@ async function main() {
       break
     case 'start': {
       const wantOpen = process.argv.includes('--open')
+      // --public-url=https://relay.example  advertises a self-hosted relay in the QR payload.
+      const publicArg = process.argv.find((a) => a.startsWith('--public-url='))
+      const publicUrl = publicArg ? publicArg.slice('--public-url='.length) : process.env.DSH_REMOTE_PUBLIC_URL || ''
       let handle
       try {
-        handle = await start({ log: (m) => console.log(m) })
+        handle = await start({ publicUrl, 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))) {

package/cordis.patch.yml

@@ -9,6 +9,8 @@
 #   port           local bridge port the phone connects to on the LAN
 #   authority      Host header the bridge presents; the signed cookie is bound to it
 #   tunnel         "auto" (ngrok if found, else cloudflared), "off", "ngrok" or "cloudflared"
+#   publicUrl      explicit public address to advertise (a self-hosted relay, e.g. the Aliyun box).
+#                  When set, nothing is launched for the tunnel and this URL goes into the QR code.
 #   upstreamPort   pin the DSH host port; 0 means discover it automatically
 - insert:
     - id: dsh-remote
@@ -18,4 +20,5 @@
         port: 6300
         authority: '127.0.0.1:1815'
         tunnel: 'auto'
+        publicUrl: ''
         upstreamPort: 0

package/lib/index.js

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

package/lib/pairing-routes.js

@@ -23,7 +23,10 @@ export const PAIR_PREFIX = '/_dsh-remote/pair'
  * 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 })
+  // `l` is a LIST of LAN URLs: a machine can have several private adapters and only one of them is
+  // reachable from the phone, so the client probes them in order instead of trusting our pick.
+  const lanList = Array.isArray(lan) ? lan.filter(Boolean) : lan ? [lan] : []
+  return JSON.stringify({ v: 2, l: lanList, u: publicUrl ?? null, c: code, e: expiresAt })
 }
 
 /**
@@ -74,8 +77,8 @@ export async function handlePairing({ req, res, current, store }) {
       JSON.stringify({
         ok: true,
         // `url` keeps the old single-address shape working; new clients read lan/public.
-        url: snapshot.public ?? snapshot.lan ?? null,
-        lan: snapshot.lan ?? null,
+        url: snapshot.public ?? (Array.isArray(snapshot.lan) ? snapshot.lan[0] : snapshot.lan) ?? null,
+        lan: Array.isArray(snapshot.lan) ? snapshot.lan : snapshot.lan ? [snapshot.lan] : [],
         public: snapshot.public ?? null,
         cookie: result.cookie,
         issuedAt: result.issuedAt,
@@ -119,7 +122,7 @@ 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">${snapshot.lan ? `局域网：${snapshot.lan}<br>` : ''}${snapshot.public ? `公网：${snapshot.public}` : ''}</p>
+  <p class="addr">${(Array.isArray(snapshot.lan) ? snapshot.lan : snapshot.lan ? [snapshot.lan] : []).map((u) => `局域网：${u}`).join('<br>')}${snapshot.public ? `<br>公网：${snapshot.public}` : ''}</p>
   <p class="addr">扫一次会同时存下局域网与公网地址，之后自动优先走局域网</p>
 </div></body></html>`
   res.writeHead(200, { 'content-type': 'text/html; charset=utf-8', 'cache-control': 'no-store' })

package/lib/supervisor.js

@@ -10,6 +10,7 @@
  */
 
 import http from 'node:http'
+import https from 'node:https'
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
@@ -36,6 +37,29 @@ function appendLog(line) {
   } catch {}
 }
 
+/** Every private IPv4 address this machine has, best candidate first. */
+export function lanAddresses() {
+  const nets = os.networkInterfaces()
+  const VIRTUAL = /vEthernet|WSL|Docker|Hyper-V|VMware|VirtualBox|Loopback|Tunnel|Tailscale|ZeroTier/i
+  const scored = []
+  for (const [name, addrs] of Object.entries(nets)) {
+    for (const a of addrs || []) {
+      if (a.family !== 'IPv4' || a.internal) continue
+      const isPrivate = /^192\.168\.|^10\.|^172\.(1[6-9]|2\d|3[01])\./.test(a.address)
+      if (!isPrivate) continue
+      let score = 0
+      if (/^192\.168\./.test(a.address)) score += 40
+      else if (/^10\./.test(a.address)) score += 20
+      else score += 5
+      if (/wi-?fi|wlan|WLAN|en0|Ethernet|以太网/i.test(name)) score += 10
+      if (VIRTUAL.test(name)) score -= 60
+      scored.push({ address: a.address, score })
+    }
+  }
+  scored.sort((a, b) => b.score - a.score)
+  return [...new Set(scored.filter((s2) => s2.score > 0).map((s2) => s2.address))]
+}
+
 /**
  * LAN address a phone on the same network can reach.
  *
@@ -102,6 +126,35 @@ function writeStatus(status) {
   fs.writeFileSync(CONNECT_FILE, lines.join(os.EOL), 'utf8')
 }
 
+/** Probe a full URL (used for the configured public relay) and report whether it answers. */
+function probeHealthUrl(url, timeoutMs = 4000) {
+  return new Promise((resolve) => {
+    let parsed
+    try {
+      parsed = new URL(url)
+    } catch {
+      return resolve(false)
+    }
+    // A relay is usually HTTPS, so pick the transport from the scheme instead of hard-coding http.
+    const transport = parsed.protocol === 'https:' ? https : http
+    let req
+    try {
+      req = transport.request(parsed, { method: 'GET', timeout: timeoutMs }, (res) => {
+        res.resume()
+        resolve(res.statusCode >= 200 && res.statusCode < 500)
+      })
+    } catch {
+      return resolve(false)
+    }
+    req.on('error', () => resolve(false))
+    req.on('timeout', () => {
+      req.destroy()
+      resolve(false)
+    })
+    req.end()
+  })
+}
+
 /** Ask whatever listens on `port` whether it is a dsh-remote bridge, and what it supports. */
 function probeHealth(port, timeoutMs = 1200) {
   return new Promise((resolve) => {
@@ -158,6 +211,7 @@ export async function start(config = {}) {
     port = 6300,
     authority = '127.0.0.1:1815',
     tunnel: tunnelKind = 'auto',
+    publicUrl = '',
     upstreamPort = 0,
     domain = '',
     log = appendLog,
@@ -201,6 +255,9 @@ export async function start(config = {}) {
   let lastPublicUrl = null
 
   /** The bridge may have fallen back to an ephemeral port; everything must report the real one. */
+  const lanUrlsFor = (bridgePort) =>
+    lanAddresses().map((address) => `http://${address}:${bridgePort}`)
+
   let bridgeInstance = null
   const actualBridgePort = () => (bridgeInstance ? bridgeInstance.port : Number(port) || 6300)
 
@@ -210,7 +267,7 @@ export async function start(config = {}) {
     store: pairingStore,
     // Read at redeem time so a tunnel URL that appears later is still handed to the phone.
     current: () => ({
-      lan: ipForPairing ? `http://${ipForPairing}:${actualBridgePort()}` : null,
+      lan: lanUrlsFor(actualBridgePort()),
       public: lastPublicUrl ?? null,
       cookie,
     }),
@@ -250,10 +307,26 @@ export async function start(config = {}) {
     const existing = await probeHealth(wanted)
     if (existing?.ok && existing.pairing) {
       log(`dsh-remote: port ${wanted} is already served by a dsh-remote bridge; adopting it`)
-      return {
-        status: readStatus() ?? { updatedAt: Date.now(), phase: 'adopted', bridgePort: wanted, authority },
-        close: async () => {},
+      // Rebuild the status from the LIVE bridge's own health report instead of trusting
+      // status.json: a stale file (from an earlier run on another port) is exactly what made
+      // connect.cmd open a dead URL.
+      const prev = readStatus() ?? {}
+      const livePort = Number(existing.bridgePort) || wanted
+      const ip = lanAddress()
+      const adopted = {
+        updatedAt: Date.now(),
+        phase: 'adopted',
+        bridgePort: livePort,
+        authority: existing.authority ?? authority,
+        upstreamPort: existing.upstreamPort ?? null,
+        lan: { ip, url: ip ? `http://${ip}:${livePort}` : null },
+        public: prev.public ?? { url: null, kind: 'none', note: 'served by an existing bridge' },
+        cookie: prev.cookie ?? null,
+        cookieExpiresAt: prev.cookieExpiresAt ?? null,
+        pairing: { url: prev.public?.url ?? (ip ? `http://${ip}:${livePort}` : null), page: '/_dsh-remote/pair' },
       }
+      writeStatus(adopted)
+      return { status: adopted, close: async () => {} }
     }
     if (existing?.ok) {
       log('dsh-remote: port is held by an old bridge WITHOUT pairing support; using another port')
@@ -292,6 +365,7 @@ export async function start(config = {}) {
 
   const tunnel = await startTunnel({
     kind: tunnelKind,
+    publicUrl,
     bridgePort: bridge.port,
     authority,
     domain,
@@ -312,6 +386,15 @@ export async function start(config = {}) {
   })
 
   lastPublicUrl = tunnel.publicUrl
+  // A configured relay can be "up" while its reverse tunnel is down; probe it so status does not
+  // advertise a URL that cannot answer.
+  let publicReachable = null
+  if (publicUrl && tunnel.publicUrl) {
+    publicReachable = await probeHealthUrl(`${tunnel.publicUrl}/_dsh-remote/health`)
+    if (publicReachable === false) {
+      log(`dsh-remote: WARNING ${tunnel.publicUrl} does not answer — is the relay's SSH tunnel up?`)
+    }
+  }
   const ip = ipForPairing
   const status = {
     updatedAt: Date.now(),
@@ -320,7 +403,12 @@ export async function start(config = {}) {
     authority,
     upstreamPort: discovery.port || null,
     lan: { ip, url: ip ? `http://${ip}:${bridge.port}` : null },
-    public: { url: tunnel.publicUrl, kind: tunnel.kind, ...(tunnel.note ? { note: tunnel.note } : {}) },
+    public: {
+      url: tunnel.publicUrl,
+      kind: tunnel.kind,
+      ...(publicReachable === null ? {} : { reachable: publicReachable }),
+      ...(tunnel.note ? { note: tunnel.note } : {}),
+    },
     cookie,
     cookieExpiresAt: expiresAt ?? cookieExpiry(cookie),
     pairing: {

package/lib/tunnel.js

@@ -148,7 +148,15 @@ export async function ensureCloudflared({ log = () => {} } = {}) {
  * @param {(msg: string) => void} [options.log]
  * @returns {Promise<{publicUrl: string|null, kind: string, close: () => void, note?: string}>}
  */
-export async function startTunnel({ kind = 'auto', bridgePort, authority, domain = '', log = () => {} }) {
+export async function startTunnel({ kind = 'auto', bridgePort, authority, domain = '', publicUrl = '', log = () => {} }) {
+  // An explicitly configured public URL (a self-hosted relay, e.g. the Aliyun box) wins over any
+  // detected tunnel: for that setup there is nothing to launch here, the relay is kept alive by its
+  // own reverse SSH tunnel.
+  if (publicUrl) {
+    const trimmed = String(publicUrl).trim().replace(/\/+$/, '')
+    log(`using the configured public URL: ${trimmed}`)
+    return { publicUrl: trimmed, kind: 'relay', close: () => {} }
+  }
   if (kind === 'off') return { publicUrl: null, kind: 'none', close: () => {}, note: 'tunnel disabled by config' }
 
   const wantNgrok = kind === 'auto' || kind === 'ngrok'

package/package.json

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