dsh-remote-hub 0.3.3 → 0.3.4

package/README.md

@@ -267,6 +267,27 @@ curl http://127.0.0.1:<bridgePort>/_dsh-remote/health
 > 提示：`cordis.patch.yml` 里的 `port` 只是**首选**端口。若被占用，实际端口会写在 `~/.dsh/dsh-remote/status.json`，
 > 一切链接与二维码都以那里为准，不必手改配置。
 
+### 用自己的服务器做中转（阿里云等自建 relay）
+
+如果你不用 ngrok，而是用一台云服务器（Caddy/nginx 终止 TLS + SSH 反向隧道）把本机暴露出去，
+就让插件把这个地址写进二维码，否则扫码只会得到 ngrok/cloudflared 的地址：
+
+```bash
+# 方式一：临时环境变量
+export DSH_REMOTE_PUBLIC_URL="https://your-relay.example"     # Windows: $env:DSH_REMOTE_PUBLIC_URL="https://..."
+dsh-remote start --open
+
+# 方式二：写进 profile 配置（推荐，长期有效）
+# ~/.dsh/profiles/<name>/cordis.patch.yml 的 dsh-remote 行：
+#   publicUrl: 'https://your-relay.example'
+```
+
+配置后插件不再启动 ngrok/cloudflared，并把该地址作为「公网地址」放进配对载荷；
+启动时会探测 `<publicUrl>/_dsh-remote/health`，结果记在 `status.json` 的 `public.reachable`
+（中转在、但反向隧道断了 → `false` 并打印警告）。
+
+前提：服务器侧确实把请求转发到**桥接监听的端口**（默认 6300）。
+
 ### 扫码配对（一次性配对码）
 
 不想手抄 Cookie 就用二维码：

package/bin/dsh-remote.mjs

@@ -62,6 +62,21 @@ function printStatus() {
   console.log('')
 }
 
+/** Describe the process listening on a port (Windows only, best effort). */
+function describePortOwner(port) {
+  if (process.platform !== 'win32') return Promise.resolve(null)
+  const script =
+    `$c = Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue | Select-Object -First 1;` +
+    'if ($c) { $p = Get-CimInstance Win32_Process -Filter (\"ProcessId=$($c.OwningProcess)\");' +
+    ' "PID $($c.OwningProcess): $($p.CommandLine)" }'
+  return new Promise((resolve) => {
+    execFile('powershell', ['-NoProfile', '-NonInteractive', '-Command', script], { timeout: 8000, windowsHide: true }, (err, stdout) => {
+      const out = String(stdout || '').trim()
+      resolve(err || !out ? null : out.slice(0, 180))
+    })
+  })
+}
+
 function openBrowser(url) {
   const cmd = process.platform === 'win32' ? 'cmd' : process.platform === 'darwin' ? 'open' : 'xdg-open'
   const args = process.platform === 'win32' ? ['/c', 'start', '', url] : [url]
@@ -188,6 +203,29 @@ async function doctor() {
   }
   console.log('  ' + '-'.repeat(52))
   console.log('')
+  // Who owns the bridge port right now, and what public URL is advertised.
+  const bridgePort = Number(process.env.DSH_REMOTE_PORT || 6300)
+  const health = await bridgeHealthy(bridgePort)
+  if (health) {
+    console.log(`  ✔ 桥接端口        ${bridgePort}（本插件，pairing=${health.pairing}）`)
+  } else {
+    console.log(`  · 桥接端口        ${bridgePort} 上没有本插件在跑`)
+    const owner = await describePortOwner(bridgePort)
+    if (owner) console.log(`     被其它进程占用:   ${owner}`)
+  }
+  const st = readStatus()
+  const pub = st?.public
+  if (pub?.url) {
+    const tag = pub.kind === 'relay' ? '自建中转' : pub.kind
+    console.log(`  ▲ 公网地址        ${pub.url}（${tag}${pub.reachable === false ? '，当前不可达' : ''}）`)
+    if (pub.kind !== 'relay' && process.env.DSH_REMOTE_PUBLIC_URL) {
+      console.log('     （已设置 DSH_REMOTE_PUBLIC_URL，但当前桥接未采用：需要重启桥接）')
+    }
+  } else if (process.env.DSH_REMOTE_PUBLIC_URL) {
+    console.log(`  · 公网地址        未生效（要重启桥接才会用 ${process.env.DSH_REMOTE_PUBLIC_URL}）`)
+  } else {
+    console.log('  · 公网地址        未配置（如需自建中转，设置 DSH_REMOTE_PUBLIC_URL）')
+  }
 }
 
 async function main() {

package/lib/index.js

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

package/lib/supervisor.js

@@ -11,6 +11,7 @@
 
 import http from 'node:http'
 import https from 'node:https'
+import { execFile } from 'node:child_process'
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
@@ -126,6 +127,21 @@ function writeStatus(status) {
   fs.writeFileSync(CONNECT_FILE, lines.join(os.EOL), 'utf8')
 }
 
+/** Best-effort description of the process listening on `port` (Windows), for diagnostics. */
+function describePortOwner(port) {
+  if (process.platform !== 'win32') return Promise.resolve(null)
+  const script =
+    `$c = Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue | Select-Object -First 1;` +
+    'if ($c) { $p = Get-CimInstance Win32_Process -Filter (\"ProcessId=$($c.OwningProcess)\");' +
+    ' "PID $($c.OwningProcess): $($p.CommandLine)" }'
+  return new Promise((resolve) => {
+    execFile('powershell', ['-NoProfile', '-NonInteractive', '-Command', script], { timeout: 8000, windowsHide: true }, (err, stdout) => {
+      const out = String(stdout || '').trim()
+      resolve(err || !out ? null : out.slice(0, 200))
+    })
+  })
+}
+
 /** Probe a full URL (used for the configured public relay) and report whether it answers. */
 function probeHealthUrl(url, timeoutMs = 4000) {
   return new Promise((resolve) => {
@@ -332,6 +348,10 @@ export async function start(config = {}) {
       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`)
+      // Say WHO holds it: the usual culprit is a leftover lan-proxy.mjs from an older setup, and
+      // knowing the PID is what lets the user stop it instead of guessing.
+      const owner = await describePortOwner(wanted)
+      if (owner) log(`dsh-remote: port ${wanted} is held by: ${owner}`)
     }
     bridge = await startBridge({
       listenPort: 0,

package/package.json

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