dsh-remote-hub 0.3.0 → 0.3.1

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.1'
 
 /** 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,25 @@ 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`)
+      return {
+        status: readStatus() ?? { updatedAt: Date.now(), phase: 'adopted', bridgePort: wanted, authority },
+        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 +267,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 +290,6 @@ export async function start(config = {}) {
   }
   const upstreamReady = waitForHost()
 
-  bridgeInstance = bridge
   const tunnel = await startTunnel({
     kind: tunnelKind,
     bridgePort: bridge.port,
@@ -229,6 +298,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.1",
   "description": "DSH 插件：把电脑上的 DeepSeek Harness 变成手机可访问的服务——起桥接、自动开隧道（ngrok / cloudflared）、签发 30 天 Cookie，并输出地址与凭据，配合 DSH Remote Android App 使用。",
   "type": "module",
   "main": "lib/index.js",