dsh-remote-hub 0.3.4 → 0.4.1

package/README.md

@@ -19,9 +19,9 @@ Kotlin/Compose 直连 DSH 自带的 HTTP API + WebSocket 网关。
 
 ## 下载手机端 App
 
-**DSH Remote v4.21.0** · Android 8.0 (API 26) 及以上 · 2.8 MB
+**DSH Remote v4.21.2** · Android 8.0 (API 26) 及以上 · 2.8 MB
 
-[⬇️ 下载 APK](https://github.com/liaoguogang-hub/dsh-remote-public/releases/download/v4.21.0/DSH-Remote-v4.21.0.apk) ·
+[⬇️ 下载 APK](https://github.com/liaoguogang-hub/dsh-remote-public/releases/download/v4.21.2/DSH-Remote-v4.21.2.apk) ·
 [全部版本](https://github.com/liaoguogang-hub/dsh-remote-public/releases)
 
 安装后应用名「DSH Remote」，包名 `com.dsh.remote.ngrok`（可与作者的 `DSH` 自用版共存）。

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] [--public-url=URL]  run the supervisor; --open 打印地址并打开配对页
+ *   dsh-remote start [--open] [--restart] [--public-url=URL]  --restart 会先停掉配置不同的旧桥接
  *   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
@@ -260,9 +260,26 @@ async function main() {
       break
     case 'start': {
       const wantOpen = process.argv.includes('--open')
+      const wantRestart = process.argv.includes('--restart')
       // --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 || ''
+      // A launcher that carries its own transport config must not silently adopt a bridge started
+      // with different config (that is how a public launcher ended up advertising a self-use relay).
+      if (wantRestart) {
+        const live = await bridgeHealthy(Number(process.env.DSH_REMOTE_PORT || 6300))
+        const mismatch = live && (live.relay || null) !== (publicUrl || null)
+        if (mismatch && live.pid) {
+          console.log(`已有桥接配置不同（relay=${live.relay ?? '无'}），先停止它（PID ${live.pid}）再按当前配置启动`)
+          try {
+            process.kill(Number(live.pid))
+          } catch (err) {
+            console.log(`停止失败：${err.message}`)
+          }
+          await new Promise((r) => setTimeout(r, 1200))
+        }
+      }
+
       let handle
       try {
         handle = await start({ publicUrl, log: (m) => console.log(m) })

package/lib/bridge.js

@@ -68,7 +68,7 @@ function trimSessionList(body) {
  * @param {(msg: string) => void} [options.log]
  * @returns {Promise<{close: () => Promise<void>, port: number}>}
  */
-export function startBridge({ listenPort, authority, upstream, pairing = null, log = () => {} }) {
+export function startBridge({ listenPort, authority, upstream, pairing = null, relayUrl = null, log = () => {} }) {
   const forward = (req, res, attempt = 0) =>
     new Promise((resolve) => {
       upstream.resolve(attempt > 0).then((port) => {
@@ -155,6 +155,10 @@ export function startBridge({ listenPort, authority, upstream, pairing = null, l
       const body = JSON.stringify({
         ok: true,
         service: 'dsh-remote-bridge',
+        pid: process.pid,
+        // Whether this bridge advertises a self-hosted relay; a launcher that expects none must not
+        // adopt a bridge that has one, or the public app would show the self-use relay.
+        relay: relayUrl || null,
         // A bridge built before pairing existed has no such route; callers use this flag to decide
         // whether an already-listening port can be adopted or must be bypassed.
         pairing: pairing != null,

package/lib/index.js

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

package/lib/pairing-routes.js

@@ -22,11 +22,13 @@ export const PAIR_PREFIX = '/_dsh-remote/pair'
  * 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 }) {
-  // `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.
+export function buildPairPayload({ lan, relay, tunnel, code, expiresAt }) {
+  // v3 ships all three transports so one scan can fill every tab:
+  //   l = LAN addresses (list; only one adapter may be reachable from the phone)
+  //   r = self-hosted relay (Aliyun/Caddy + reverse SSH)
+  //   u = auto tunnel (ngrok / cloudflared)
   const lanList = Array.isArray(lan) ? lan.filter(Boolean) : lan ? [lan] : []
-  return JSON.stringify({ v: 2, l: lanList, u: publicUrl ?? null, c: code, e: expiresAt })
+  return JSON.stringify({ v: 3, l: lanList, r: relay ?? null, u: tunnel ?? null, c: code, e: expiresAt })
 }
 
 /**
@@ -76,10 +78,12 @@ export async function handlePairing({ req, res, current, store }) {
     res.end(
       JSON.stringify({
         ok: true,
-        // `url` keeps the old single-address shape working; new clients read lan/public.
-        url: snapshot.public ?? (Array.isArray(snapshot.lan) ? snapshot.lan[0] : snapshot.lan) ?? null,
+        // `url`/`public` keep the old single-address shape working; new clients read the three.
+        url: snapshot.relay ?? snapshot.tunnel ?? null,
         lan: Array.isArray(snapshot.lan) ? snapshot.lan : snapshot.lan ? [snapshot.lan] : [],
-        public: snapshot.public ?? null,
+        relay: snapshot.relay ?? null,
+        tunnel: snapshot.tunnel ?? null,
+        public: snapshot.relay ?? snapshot.tunnel ?? null,
         cookie: result.cookie,
         issuedAt: result.issuedAt,
       }),
@@ -89,7 +93,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({ lan: snapshot.lan, publicUrl: snapshot.public, code, expiresAt })
+  const payload = buildPairPayload({ lan: snapshot.lan, relay: snapshot.relay, tunnel: snapshot.tunnel, code, expiresAt })
 
   if (url === PAIR_PREFIX + '/svg') {
     const svg = await QRCode.toString(payload, { type: 'svg', margin: 1, width: 320, errorCorrectionLevel: 'M' })
@@ -122,7 +126,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">${(Array.isArray(snapshot.lan) ? snapshot.lan : snapshot.lan ? [snapshot.lan] : []).map((u) => `局域网：${u}`).join('<br>')}${snapshot.public ? `<br>公网：${snapshot.public}` : ''}</p>
+  <p class="addr">${(Array.isArray(snapshot.lan) ? snapshot.lan : snapshot.lan ? [snapshot.lan] : []).map((u) => `局域网：${u}`).join('<br>')}${snapshot.relay ? `<br>中转：${snapshot.relay}` : ''}${snapshot.tunnel ? `<br>隧道：${snapshot.tunnel}` : ''}</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

@@ -274,6 +274,10 @@ export async function start(config = {}) {
   const lanUrlsFor = (bridgePort) =>
     lanAddresses().map((address) => `http://${address}:${bridgePort}`)
 
+  // The self-hosted relay (if configured) and the auto tunnel are reported SEPARATELY: a self-use
+  // setup wants both (relay for 4G, ngrok as a second path), and the phone decides which to use.
+  const relayUrl = String(publicUrl || '').trim().replace(/\/+$/, '') || null
+
   let bridgeInstance = null
   const actualBridgePort = () => (bridgeInstance ? bridgeInstance.port : Number(port) || 6300)
 
@@ -284,7 +288,8 @@ export async function start(config = {}) {
     // Read at redeem time so a tunnel URL that appears later is still handed to the phone.
     current: () => ({
       lan: lanUrlsFor(actualBridgePort()),
-      public: lastPublicUrl ?? null,
+      relay: relayUrl,
+      tunnel: tunnelRef?.publicUrl ?? null,
       cookie,
     }),
   }
@@ -311,6 +316,7 @@ export async function start(config = {}) {
       authority,
       upstream: discovery,
       pairing,
+      relayUrl,
       log,
     })
   } catch (err) {
@@ -336,7 +342,13 @@ export async function start(config = {}) {
         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' },
+        // Never inherit the previous run's public address: it may describe a different transport
+        // (e.g. a self-use relay) than the launcher that is running now.
+        public: existing.relay
+          ? { url: existing.relay, kind: 'relay' }
+          : { url: null, kind: 'none', note: 'served by an existing bridge' },
+        relay: existing.relay ? { url: existing.relay } : null,
+        tunnel: null,
         cookie: prev.cookie ?? null,
         cookieExpiresAt: prev.cookieExpiresAt ?? null,
         pairing: { url: prev.public?.url ?? (ip ? `http://${ip}:${livePort}` : null), page: '/_dsh-remote/pair' },
@@ -385,7 +397,6 @@ export async function start(config = {}) {
 
   const tunnel = await startTunnel({
     kind: tunnelKind,
-    publicUrl,
     bridgePort: bridge.port,
     authority,
     domain,
@@ -405,14 +416,12 @@ 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?`)
+  lastPublicUrl = relayUrl ?? tunnel.publicUrl
+  let relayReachable = null
+  if (relayUrl) {
+    relayReachable = await probeHealthUrl(`${relayUrl}/_dsh-remote/health`)
+    if (relayReachable === false) {
+      log(`dsh-remote: WARNING ${relayUrl} does not answer — is the relay's SSH tunnel up?`)
     }
   }
   const ip = ipForPairing
@@ -423,12 +432,11 @@ 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,
-      ...(publicReachable === null ? {} : { reachable: publicReachable }),
-      ...(tunnel.note ? { note: tunnel.note } : {}),
-    },
+    public: relayUrl
+      ? { url: relayUrl, kind: 'relay', ...(relayReachable === null ? {} : { reachable: relayReachable }) }
+      : { url: tunnel.publicUrl, kind: tunnel.kind, ...(tunnel.note ? { note: tunnel.note } : {}) },
+    relay: relayUrl ? { url: relayUrl, ...(relayReachable === null ? {} : { reachable: relayReachable }) } : null,
+    tunnel: tunnel.publicUrl ? { url: tunnel.publicUrl, kind: tunnel.kind, ...(tunnel.note ? { note: tunnel.note } : {}) } : null,
     cookie,
     cookieExpiresAt: expiresAt ?? cookieExpiry(cookie),
     pairing: {

package/lib/tunnel.js

@@ -148,16 +148,7 @@ 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 = '', 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' }
+export async function startTunnel({ kind = 'auto', bridgePort, authority, domain = '', publicUrl = '', log = () => {} }) {  if (kind === 'off') return { publicUrl: null, kind: 'none', close: () => {}, note: 'tunnel disabled by config' }
 
   const wantNgrok = kind === 'auto' || kind === 'ngrok'
   const wantCloudflared = kind === 'auto' || kind === 'cloudflared'

package/package.json

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