@feiyang666/dsh-mobile-remote 1.9.1 → 2.0.0

package/lib/lanproxy.js

@@ -59,6 +59,12 @@ export function createLanProxy(options = {}) {
   let listenPort = 0
   /** 转发目标端口（宿主端口；监听建立前就已确定，避免启动窗口内 503）。 */
   let targetPort = 0
+  /**
+   * 转发目标地址。宿主可能只绑定了某块局域网网卡（例如官方桌面端用
+   * `--host 192.168.x.x` 启动），此时 127.0.0.1 上没有任何监听，转发必须打到
+   * 宿主真实绑定的那块网卡，否则旁挂听众自己也会 502。
+   */
+  let upstreamHost = '127.0.0.1'
   /** 当前对外提供的局域网地址列表。 */
   let hosts = []
   /** 每次 start/stop 递增，用于丢弃过期的启动结果。 */
@@ -68,6 +74,7 @@ export function createLanProxy(options = {}) {
     running: listeners.length > 0,
     hosts: hosts.slice(),
     port: listenPort,
+    upstream: `${upstreamHost}:${listenPort || targetPort || 0}`,
   })
 
   function targetPortOf() {
@@ -92,7 +99,7 @@ export function createLanProxy(options = {}) {
     headers['x-forwarded-proto'] = 'http'
     if (realHost) headers['x-forwarded-host'] = realHost
     const upstream = http.request({
-      host: '127.0.0.1',
+      host: upstreamHost,
       port,
       method: req.method,
       path: req.url,
@@ -125,7 +132,7 @@ export function createLanProxy(options = {}) {
     headers['x-forwarded-proto'] = 'http'
     if (realHost) headers['x-forwarded-host'] = realHost
 
-    const upstream = net.connect(port, '127.0.0.1', () => {
+    const upstream = net.connect(port, upstreamHost, () => {
       const lines = [`${req.method || 'GET'} ${req.url || '/'} HTTP/1.1`]
       for (const [key, value] of Object.entries(headers)) {
         if (value === undefined) continue
@@ -172,21 +179,37 @@ export function createLanProxy(options = {}) {
    * 在给定局域网地址上开启监听。
    * @param {string[]} lanHosts - 局域网 IPv4 列表（按优先级排序）
    * @param {number} port - 宿主当前监听端口
-   * @returns {Promise<{running: boolean, hosts: string[], port: number, failures: Array<{host: string, error: string}>}>}
+   * @param {{upstreamHost?: string, skipHosts?: string[]}} [startOptions]
+   *   upstreamHost：转发目标（宿主真实监听的地址，未绑回环时是网卡 IP）；
+   *   skipHosts：宿主已经自己占用的地址（旁挂听众不能再绑，否则 EADDRINUSE）。
+   * @returns {Promise<{running: boolean, hosts: string[], port: number, upstream: string, failures: Array<{host: string, error: string}>}>}
    */
-  async function start(lanHosts, port) {
-    const wanted = [...new Set((lanHosts || []).filter(Boolean))]
+  async function start(lanHosts, port, startOptions = {}) {
+    const skip = new Set((startOptions.skipHosts || []).filter(Boolean))
+    const wanted = [...new Set((lanHosts || []).filter((h) => h && !skip.has(h)))]
+    const nextUpstream = String(startOptions.upstreamHost || '127.0.0.1')
     if (!wanted.length) {
-      return { running: false, hosts: [], port: 0, failures: [{ host: '', error: '没有可用的局域网 IPv4 地址' }] }
+      return {
+        running: false,
+        hosts: [],
+        port: 0,
+        upstream: `${nextUpstream}:${port || 0}`,
+        failures: [],
+        skipped: [...skip],
+      }
     }
-    if (listeners.length > 0 && listenPort === port && hosts.join(',') === wanted.join(',')) {
-      return { running: true, hosts: hosts.slice(), port: listenPort, failures: [] }
+    if (
+      listeners.length > 0 && listenPort === port && upstreamHost === nextUpstream
+      && hosts.join(',') === wanted.join(',')
+    ) {
+      return { running: true, hosts: hosts.slice(), port: listenPort, upstream: state().upstream, failures: [] }
     }
     await stop()
     // stop() 已推进代次；此刻记录本轮的代次，后续任何 stop() 都会让它过期
     const mark = generation
     // 先确定转发目标：监听建立期间到达的请求也能正确转发
     targetPort = port
+    upstreamHost = nextUpstream
     const opened = []
     const failures = []
     for (const host of wanted) {
@@ -201,13 +224,19 @@ export function createLanProxy(options = {}) {
       for (const item of opened) { try { item.server.close() } catch { /* ignore */ } }
       return state().running
         ? { ...state(), failures }
-        : { running: false, hosts: [], port: 0, failures }
+        : { running: false, hosts: [], port: 0, upstream: `${nextUpstream}:${port || 0}`, failures }
     }
     listeners = opened
     listenPort = opened.length > 0 ? port : 0
     hosts = opened.map((item) => item.host)
     if (!opened.length) log('lan proxy: no listener could bind', failures)
-    return { running: opened.length > 0, hosts: hosts.slice(), port: listenPort, failures }
+    return {
+      running: opened.length > 0,
+      hosts: hosts.slice(),
+      port: listenPort,
+      upstream: `${nextUpstream}:${listenPort || port || 0}`,
+      failures,
+    }
   }
 
   /** 关闭全部监听。 */
@@ -217,6 +246,7 @@ export function createLanProxy(options = {}) {
     listeners = []
     listenPort = 0
     targetPort = 0
+    upstreamHost = '127.0.0.1'
     hosts = []
     await Promise.all(closing.map(({ server }) => new Promise((resolve) => {
       try { server.close(() => resolve()) } catch { resolve() }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feiyang666/dsh-mobile-remote",
-  "version": "1.9.1",
-  "description": "DeepSeek Harness mobile remote-control plugin: LAN access through a side-car listener (dsh 0.2.1+ rejects wildcard binds, so the host listener is never touched: no restart, no port drift, local window keeps working), external tunnel with real status detection, QR / on-off toggle / remote-access password gate, rich telemetry and mobile-first UI polish.",
+  "version": "2.0.0",
+  "description": "DeepSeek Harness remote-access plugin: LAN access that adapts to how dsh binds (loopback side-car listener, or directly reusing the `--host <nic>` listener that dsh already owns), external tunnel through a relay server with real reachability probing (502 detection), QR code / on-off toggle / remote-access password gate and device telemetry. No mobile UI patches: dsh 0.2.2+ ships its own responsive/mobile layout.",
   "keywords": [
     "deepseek",
     "harness",