dsh-remote-hub 0.4.0 → 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.4.0'
+export const version = '0.4.1'
 
 /** No host services are required: the plugin only needs Node builtins. */
 export const inject = []

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)
 
@@ -312,6 +316,7 @@ export async function start(config = {}) {
       authority,
       upstream: discovery,
       pairing,
+      relayUrl,
       log,
     })
   } catch (err) {
@@ -337,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' },
@@ -405,9 +416,6 @@ export async function start(config = {}) {
     },
   })
 
-  // 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
   lastPublicUrl = relayUrl ?? tunnel.publicUrl
   let relayReachable = null
   if (relayUrl) {

package/package.json

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