dsh-remote-hub 0.3.0 → 0.3.2

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

@@ -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)

package/lib/bridge.js

@@ -155,6 +155,9 @@ export function startBridge({ listenPort, authority, upstream, pairing = null, l
       const body = JSON.stringify({
         ok: true,
         service: 'dsh-remote-bridge',
+        // 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,
         bridgePort: listenPort,
         authority,
         upstreamPort: upstream.port || null,
@@ -213,9 +216,13 @@ export function startBridge({ listenPort, authority, upstream, pairing = null, l
     server.once('error', reject)
     server.listen(listenPort, '0.0.0.0', () => {
       server.removeListener('error', reject)
-      log(`bridge listening on 0.0.0.0:${listenPort} (Host: ${authority})`)
+      // `listenPort: 0` asks the OS for a free port; the real one must be read back, otherwise the
+      // status file and every printed URL would carry port 0.
+      const addr = server.address()
+      const boundPort = addr && typeof addr === 'object' ? addr.port : listenPort
+      log(`bridge listening on 0.0.0.0:${boundPort} (Host: ${authority})`)
       resolve({
-        port: listenPort,
+        port: boundPort,
         close: () =>
           new Promise((done) => {
             server.close(() => done())

package/lib/index.js

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

package/lib/supervisor.js

@@ -9,6 +9,7 @@
  * @module lib/supervisor
  */
 
+import http from 'node:http'
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
@@ -101,6 +102,32 @@ function writeStatus(status) {
   fs.writeFileSync(CONNECT_FILE, lines.join(os.EOL), 'utf8')
 }
 
+/** 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) => {
+    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 {
+            resolve(JSON.parse(Buffer.concat(chunks).toString('utf8')))
+          } catch {
+            resolve(null)
+          }
+        })
+      },
+    )
+    req.on('error', () => resolve(null))
+    req.on('timeout', () => {
+      req.destroy()
+      resolve(null)
+    })
+    req.end()
+  })
+}
+
 /**
  * Start everything.
  *
@@ -113,6 +140,18 @@ function writeStatus(status) {
  * @param {string} [config.domain='']
  * @param {(msg: string) => void} [config.log]
  */
+/**
+ * Servers started by this plugin, by port.
+ *
+ * Plugin reload (hot module replacement) mounts the new build while the previous instance may still
+ * hold its socket. Keeping the handles on globalThis lets the new instance close its predecessor in
+ * the same process instead of leaving a stale bridge — built from older code — owning the port.
+ */
+function instanceRegistry() {
+  if (!globalThis.__dshRemoteInstances) globalThis.__dshRemoteInstances = new Map()
+  return globalThis.__dshRemoteInstances
+}
+
 export async function start(config = {}) {
   const {
     enabled = true,
@@ -177,6 +216,21 @@ export async function start(config = {}) {
     }),
   }
 
+  /** Assigned once the tunnel exists; the registry disposer may run before/after that. */
+  let tunnelRef = null
+  const registry = instanceRegistry()
+  const wantedPort = Number(port) || 6300
+  const previous = registry.get(wantedPort)
+  if (previous) {
+    log(`dsh-remote: closing the previous bridge on ${wantedPort} (plugin reload)`)
+    try {
+      await previous.close()
+    } catch (err) {
+      log(`dsh-remote: previous bridge close failed: ${err?.message ?? err}`)
+    }
+    registry.delete(wantedPort)
+  }
+
   let bridge
   try {
     bridge = await startBridge({
@@ -187,10 +241,41 @@ export async function start(config = {}) {
       log,
     })
   } catch (err) {
-    // The usual cause is an older bridge (or a watchdog) still holding the port. Falling back to
-    // an ephemeral port keeps the pairing page reachable; the real port is reported everywhere.
     if (!/EADDRINUSE/.test(String(err?.message ?? err))) throw err
-    log(`dsh-remote: port ${port} is busy, falling back to an ephemeral port`)
+    // Port busy. Three cases, in order of preference:
+    //   1. a live bridge of ours that supports pairing -> adopt it (nothing to do);
+    //   2. a live bridge of ours from an older build (no pairing route) -> must bypass it;
+    //   3. some unrelated program -> bypass it.
+    const wanted = Number(port) || 6300
+    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`)
+      // 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')
+    } else {
+      log(`dsh-remote: port ${wanted} is busy (not a dsh-remote bridge); using another port`)
+    }
     bridge = await startBridge({
       listenPort: 0,
       authority,
@@ -198,6 +283,7 @@ export async function start(config = {}) {
       pairing,
       log,
     })
+    log(`dsh-remote: bound to ${bridge.port} instead; use the URLs below, not the old port`)
   }
 
   // Wait for the host's web server in the background: plugin mode runs before DSH binds its port.
@@ -220,7 +306,6 @@ export async function start(config = {}) {
   }
   const upstreamReady = waitForHost()
 
-  bridgeInstance = bridge
   const tunnel = await startTunnel({
     kind: tunnelKind,
     bridgePort: bridge.port,
@@ -229,6 +314,19 @@ export async function start(config = {}) {
     log,
   })
 
+  tunnelRef = tunnel
+  bridgeInstance = bridge
+  registry.set(bridge.port, {
+    close: async () => {
+      try {
+        tunnelRef?.close?.()
+      } catch {}
+      try {
+        await bridge.close()
+      } catch {}
+    },
+  })
+
   lastPublicUrl = tunnel.publicUrl
   const ip = ipForPairing
   const status = {

package/package.json

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