dsh-remote-plugin 0.6.3 → 0.6.5

package/gateway.cjs

@@ -43,6 +43,7 @@ const ROOT = __dirname
 const PUBLIC_DIR = path.join(ROOT, 'public')
 const PORT = Number(process.env.PORT) || 8787
 const HOST = process.env.HOST || '0.0.0.0'
+const WS_IDLE_MS = Number(process.env.GATEWAY_WS_IDLE_MS) || 60000
 const UPSTREAM = new URL(process.env.DSH_UPSTREAM || 'http://127.0.0.1:3080')
 const TOKEN_FILE = process.env.TOKEN_FILE || path.join(os.homedir(), '.dsh-remote', 'token')
 const NOTES_FILE = process.env.DSH_REMOTE_NOTES || path.join(os.homedir(), '.dsh-remote', 'device-notes.json')
@@ -1778,11 +1779,43 @@ server.on('upgrade', (req, socket, head) => {
     upSocket.setNoDelay(true)
     upSocket.pipe(socket)
     socket.pipe(upSocket)
-    const close = () => { upSocket.destroy(); socket.destroy() }
+    // 双向 idle 检测: 任一侧 60s 无数据即视为死连接, 同时销毁两侧
+    let upIdle = null
+    let clientIdle = null
+    const clearIdle = () => {
+      clearTimeout(upIdle)
+      clearTimeout(clientIdle)
+      upIdle = null
+      clientIdle = null
+    }
+    const destroyBoth = () => {
+      clearIdle()
+      upSocket.destroy()
+      socket.destroy()
+    }
+    const close = () => {
+      clearIdle()
+      upSocket.destroy()
+      socket.destroy()
+    }
+    const touchUp = () => {
+      clearTimeout(upIdle)
+      upIdle = setTimeout(destroyBoth, WS_IDLE_MS)
+      upIdle?.unref?.()
+    }
+    const touchClient = () => {
+      clearTimeout(clientIdle)
+      clientIdle = setTimeout(destroyBoth, WS_IDLE_MS)
+      clientIdle?.unref?.()
+    }
+    upSocket.on('data', touchUp)
+    socket.on('data', touchClient)
+    touchUp()
+    touchClient()
     upSocket.on('error', close)
     socket.on('error', close)
-    upSocket.on('close', () => socket.end())
-    socket.on('close', () => upSocket.end())
+    upSocket.on('close', () => { clearIdle(); if (!socket.destroyed) socket.end() })
+    socket.on('close', () => { clearIdle(); if (!upSocket.destroyed) upSocket.end() })
   })
 
   upstreamReq.on('error', () => {

package/index.mjs

@@ -8,6 +8,7 @@
 import { execFileSync, spawn } from 'node:child_process'
 import { appendFileSync, createReadStream, existsSync, mkdirSync, openSync, readFileSync, writeFileSync } from 'node:fs'
 import { stat } from 'node:fs/promises'
+import net from 'node:net'
 import { homedir, hostname, networkInterfaces } from 'node:os'
 import { dirname, extname, normalize, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
@@ -20,8 +21,24 @@ const PUBLIC_DIR = fileURLToPath(new URL('./public/', import.meta.url))
 const INDEX_FILE = 'index.html'
 const GATEWAY_SCRIPT = fileURLToPath(new URL('./gateway.cjs', import.meta.url))
 const gatewayInstalled = existsSync(GATEWAY_SCRIPT)
-// 本地网关管理 API 代理: 让插件抽屉显示与 8787 网关管理页完全一致的数据。
-const GATEWAY_BASE = (process.env.DSH_REMOTE_GATEWAY || 'http://127.0.0.1:8787').replace(/\/+$/, '')
+// 本地网关管理 API 代理: 让插件抽屉显示与网关管理页完全一致的数据。
+// 端口读取优先级: DSH_REMOTE_GATEWAY_PORT > ~/.dsh-remote/gateway-port > 8787
+function gatewayPortFile() { return `${homedir()}/.dsh-remote/gateway-port` }
+
+function readGatewayPort() {
+  const valid = (v) => /^\d+$/.test(String(v)) && Number(v) >= 1 && Number(v) <= 65535
+  const envPort = process.env.DSH_REMOTE_GATEWAY_PORT
+  if (valid(envPort)) return String(Number(envPort))
+  try {
+    const filePort = readFileSync(gatewayPortFile(), 'utf8').trim()
+    if (valid(filePort)) return String(Number(filePort))
+  } catch {}
+  return '8787'
+}
+
+function gatewayBase() {
+  return (process.env.DSH_REMOTE_GATEWAY || `http://127.0.0.1:${readGatewayPort()}`).replace(/\/+$/, '')
+}
 
 function gatewayToken() {
   if (process.env.DSH_REMOTE_TOKEN) return process.env.DSH_REMOTE_TOKEN
@@ -95,7 +112,7 @@ async function proxyGateway(path, method, body) {
   const token = gatewayToken()
   if (!token) return null
   try {
-    const res = await fetch(`${GATEWAY_BASE}${path}`, {
+    const res = await fetch(`${gatewayBase()}${path}`, {
       method,
       headers: {
         authorization: `Bearer ${token}`,
@@ -126,9 +143,26 @@ function runExit(cmd, args) {
   })
 }
 
+/** 127.0.0.1 端口占用预检: 能连上=被占用, 连接被拒/超时=可用。 */
+function portInUse(port) {
+  return new Promise((resolvePromise) => {
+    const sock = net.connect({ host: '127.0.0.1', port: Number(port) })
+    let done = false
+    const finish = (used) => {
+      if (done) return
+      done = true
+      sock.destroy()
+      resolvePromise(used)
+    }
+    sock.once('connect', () => finish(true))
+    sock.once('error', () => finish(false))
+    sock.setTimeout(800, () => finish(false))
+  })
+}
+
 async function gatewayRunning() {
   try {
-    const res = await fetch(`${GATEWAY_BASE}/health`, { signal: AbortSignal.timeout(3000) })
+    const res = await fetch(`${gatewayBase()}/health`, { signal: AbortSignal.timeout(3000) })
     if (!res.ok) return { running: false }
     const data = await res.json().catch(() => ({}))
     return {
@@ -217,8 +251,12 @@ async function startGateway() {
   if (!existsSync(script)) {
     return { ok: false, running: false, error: '插件包缺少 gateway.cjs, 请升级插件' }
   }
-  const port = process.env.DSH_REMOTE_GATEWAY_PORT || '8787'
-  logGateway('启动网关, 上游: ' + upstream)
+  const port = readGatewayPort()
+  if (await portInUse(port)) {
+    logGateway(`端口 ${port} 已被占用, 拒绝启动`)
+    return { ok: false, running: false, error: `端口 ${port} 已被占用，请在插件页修改网关端口后重试` }
+  }
+  logGateway('启动网关, 端口: ' + port + ', 上游: ' + upstream)
 
   // 首选 systemd-run: 网关成为独立 user 单元, DSH 重启/升级不会连带杀掉它
   let sysd = false
@@ -302,7 +340,7 @@ async function stopGateway() {
   const token = gatewayToken()
   if (!token) return { ok: false, running: false, error: '找不到 ~/.dsh-remote/token, 无法认证网关' }
   try {
-    const res = await fetch(`${GATEWAY_BASE}/admin/api/shutdown`, {
+    const res = await fetch(`${gatewayBase()}/admin/api/shutdown`, {
       method: 'POST',
       headers: { authorization: `Bearer ${token}`, 'x-dsh-remote-client': 'admin' },
       signal: AbortSignal.timeout(2000),
@@ -348,7 +386,7 @@ function statsSend(session, event) {
   const prev = statsQueues.get(session.id) || Promise.resolve()
   const next = prev.then(async () => {
     try {
-      await fetch(`${GATEWAY_BASE}/stats/ingest`, {
+      await fetch(`${gatewayBase()}/stats/ingest`, {
         method: 'POST',
         headers: { authorization: `Bearer ${token}`, 'content-type': 'application/json' },
         body: JSON.stringify(payload),
@@ -434,7 +472,7 @@ async function serveStatic(req, res, ctx) {
     if (proxied !== null) {
       sendJson(res, proxied.status, proxied.json)
     } else {
-      sendJson(res, 502, { ok: false, error: '本地网关不可用, Token 统计需要 8787 网关运行' })
+      sendJson(res, 502, { ok: false, error: '本地网关不可用, Token 统计需要网关运行' })
     }
     return
   }
@@ -486,11 +524,65 @@ async function serveStatic(req, res, ctx) {
     if (proxied !== null) {
       sendJson(res, proxied.status, proxied.json)
     } else {
-      sendJson(res, 502, { ok: false, error: '本地网关不可用, 设备管理需在 8787 网关模式操作' })
+      sendJson(res, 502, { ok: false, error: '本地网关不可用, 设备管理需在网关模式操作' })
     }
     return
   }
 
+  // 网关端口配置(仅插件内嵌页使用): GET 当前生效端口 / PUT 修改端口
+  if (pathname === `${MOUNT}/admin/api/config`) {
+    if (req.method === 'GET') {
+      const h = await gatewayRunning()
+      sendJson(res, 200, {
+        ok: true,
+        port: Number(readGatewayPort()),
+        running: h.running,
+        source: process.env.DSH_REMOTE_GATEWAY_PORT ? 'env' : existsSync(gatewayPortFile()) ? 'file' : 'default',
+      })
+      return
+    }
+    if (req.method === 'PUT') {
+      let body = {}
+      try {
+        body = JSON.parse((await readBody(req, 4096)) || '{}')
+      } catch {}
+      const port = Number(body.port)
+      if (!Number.isInteger(port) || port < 1 || port > 65535) {
+        sendJson(res, 400, { ok: false, error: '端口必须是 1-65535 的整数' })
+        return
+      }
+      const oldPort = Number(readGatewayPort())
+      try {
+        mkdirSync(`${homedir()}/.dsh-remote`, { recursive: true })
+        writeFileSync(gatewayPortFile(), String(port) + '\n')
+      } catch (e) {
+        sendJson(res, 500, { ok: false, error: '写入端口配置失败: ' + (e?.message || String(e)) })
+        return
+      }
+      const effectivePort = Number(readGatewayPort())
+      if (effectivePort !== oldPort) {
+        const h = await gatewayRunning()
+        if (h.running) {
+          await killGateway(h)
+          for (let i = 0; i < 10; i++) {
+            if (!(await gatewayRunning()).running) break
+            await sleep(200)
+          }
+        }
+      }
+      let running = (await gatewayRunning()).running
+      if (gatewayAutostart()) {
+        const startOut = await startGateway()
+        running = !!startOut.running || (await gatewayRunning()).running
+      }
+      sendJson(res, 200, { ok: true, port: Number(port), effectivePort, running })
+      return
+    }
+    res.writeHead(405, { allow: 'GET, PUT' })
+    res.end()
+    return
+  }
+
   // 本地网关开关(仅插件内嵌页使用): GET 状态 / POST {action:'start'|'stop'}
   if (pathname === `${MOUNT}/admin/api/gateway`) {
     if (req.method === 'GET') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-plugin",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "DSH Remote 官方 bundle 插件：DSH 左侧原生边栏入口 + 右侧抽屉内嵌管理控制台；内置网关随 DSH 自动启停(systemd 独立单元)，抽屉直显令牌与设备监控；网关提供 /fs/* 文件传输端点(列表/断点下载/上传)，配合 Android App 远程操控会话/审批/提问/goal 与文件互传(多服务器测速切换、聊天记录离线缓存)。",
   "type": "module",
   "main": "./index.mjs",

package/public/admin.html

@@ -79,6 +79,11 @@
     .token-row code { flex: none; width: 100%; background: var(--dsr-bg); border: 1px solid var(--dsr-line); border-radius: 8px; padding: 8px 10px; font-size: 12px; white-space: nowrap; overflow-x: auto; }
     .token-actions { display: flex; gap: 8px; flex-wrap: wrap; }
     .token-actions .mini-btn { flex: 1 1 auto; text-align: center; padding: 6px 8px; font-size: 12.5px; }
+    .gateway-port-row { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; margin: 0 0 14px; padding: 10px 12px; background: var(--dsr-panel); border: 1px solid var(--dsr-line); border-radius: var(--dsr-radius); }
+    .gateway-port-row label { font-size: 12px; color: var(--dsr-muted); flex: none; }
+    .gateway-port-row input { width: 92px; background: var(--dsr-bg); color: var(--dsr-text); border: 1px solid var(--dsr-line); border-radius: 8px; padding: 6px 8px; font: inherit; font-size: 13px; outline: none; }
+    .gateway-port-row .muted { font-size: 12px; }
+    .gateway-port-row .mini-btn { margin-left: auto; }
     .conn-badge { white-space: nowrap; }
     #btn-close-drawer { white-space: nowrap; }
     @media (max-width: 720px) {
@@ -229,6 +234,13 @@
         </div>
       </div>
 
+      <div id="gateway-port-row" class="gateway-port-row hidden">
+        <label data-i18n="gatewayPort">网关端口</label>
+        <input id="gateway-port-input" type="number" min="1" max="65535" inputmode="numeric" placeholder="8787">
+        <span id="gateway-port-current" class="muted">—</span>
+        <button id="btn-save-port" class="mini-btn" data-i18n="savePort">保存</button>
+      </div>
+
       <div id="pair-box" class="pair-box hidden">
         <div class="pair-title" data-i18n="pairTitle">手机 App 扫码配对</div>
         <div class="pair-qr" id="pair-qr"></div>
@@ -307,6 +319,14 @@
         'stopGateway': '停止网关',
         'starting': '启动中…',
         'stopping': '停止中…',
+        'gatewayPort': '网关端口',
+        'gatewayPort.current': '当前 {port}',
+        'savePort': '保存',
+        'toast.portInvalid': '端口必须是 1-65535 的整数',
+        'toast.portSaved': '端口已更新，网关已切换至 {port}',
+        'toast.portSavedIdle': '端口已保存，网关未运行，下次启动生效',
+        'toast.portEnv': '环境变量优先，当前仍使用 {port}',
+        'toast.portFailedMsg': '端口保存失败：{msg}',
         'qrCode': '二维码',
         'rotateToken': '轮换令牌',
         'copyToken': '复制令牌',
@@ -324,7 +344,7 @@
         'stat.updateAvailable': '{version} 可用', 'stat.currentV': '当前 v{version}',
         'stat.download': '去下载', 'stat.embedded': 'DSH 内嵌 · 免网关',
         'stat.updateCheck': '更新检查: {error}', 'stat.latest': '已是最新(来源检查)', 'stat.notChecked': '未检查更新',
-        'stat.hostIP': '主机 IP · {hostname}', 'stat.ipSep': '、', 'stat.phoneGateway': ' (手机连 8787 网关)', 'stat.phoneThis': ' (手机连这个地址)',
+        'stat.hostIP': '主机 IP · {hostname}', 'stat.ipSep': '、', 'stat.phoneGateway': ' (手机连 {port} 网关)', 'stat.phoneThis': ' (手机连这个地址)',
         'stat.reachable': '可达', 'stat.unreachable': '不可达', 'stat.dshUpstream': 'DSH 上游 {url}',
         'stat.devicesOnline': '设备在线 / 累计', 'stat.totalRequests': '总请求数', 'stat.authFailures': '认证失败',
         'stat.uptime': '运行时长 · {host}:{port}',
@@ -338,7 +358,7 @@
         'stats.output': '输出',
         'stats.peak': '高峰', 'stats.off': '空闲',
         'stats.days': '近 {n} 天',
-        'stats.gatewayDown': '统计需要 8787 网关运行', 'stats.empty': '暂无统计，产生会话后自动聚合',
+        'stats.gatewayDown': '统计需要网关运行', 'stats.empty': '暂无统计，产生会话后自动聚合',
         'stats.note': '注：本数据仅在使用 DeepSeek 官方 API 时估算；基于 token 计算，与官网账单可能有出入，一切以官网为准。统计自 2026-08-17 定价生效日起。',
         'unit.sec': ' 秒', 'unit.min': ' 分钟', 'unit.hour': ' 小时 ', 'unit.minShort': ' 分', 'unit.day': ' 天 ',
         'device.installedNotRunning': '网关已安装 · 当前未运行', 'device.noGatewayBinary': '未检测到网关程序',
@@ -382,6 +402,14 @@
         'stopGateway': 'Stop gateway',
         'starting': 'Starting…',
         'stopping': 'Stopping…',
+        'gatewayPort': 'Gateway port',
+        'gatewayPort.current': 'Current {port}',
+        'savePort': 'Save',
+        'toast.portInvalid': 'Port must be an integer from 1 to 65535',
+        'toast.portSaved': 'Port updated, gateway switched to {port}',
+        'toast.portSavedIdle': 'Port saved; gateway not running, takes effect on next start',
+        'toast.portEnv': 'Environment variable takes priority, current port remains {port}',
+        'toast.portFailedMsg': 'Failed to save port: {msg}',
         'qrCode': 'QR code',
         'rotateToken': 'Rotate token',
         'copyToken': 'Copy token',
@@ -399,7 +427,7 @@
         'stat.updateAvailable': 'v{version} available', 'stat.currentV': 'Current v{version}',
         'stat.download': 'Download', 'stat.embedded': 'Embedded in DSH · no gateway',
         'stat.updateCheck': 'Update check: {error}', 'stat.latest': 'Up to date (source check)', 'stat.notChecked': 'Not checked',
-        'stat.hostIP': 'Host IP · {hostname}', 'stat.ipSep': ', ', 'stat.phoneGateway': ' (phone connects to gateway 8787)', 'stat.phoneThis': ' (phone connects to this address)',
+        'stat.hostIP': 'Host IP · {hostname}', 'stat.ipSep': ', ', 'stat.phoneGateway': ' (phone connects to gateway {port})', 'stat.phoneThis': ' (phone connects to this address)',
         'stat.reachable': 'Reachable', 'stat.unreachable': 'Unreachable', 'stat.dshUpstream': 'DSH upstream {url}',
         'stat.devicesOnline': 'Devices online / total', 'stat.totalRequests': 'Total requests', 'stat.authFailures': 'Auth failures',
         'stat.uptime': 'Uptime · {host}:{port}',
@@ -413,7 +441,7 @@
         'stats.output': 'Output',
         'stats.peak': 'Peak', 'stats.off': 'Off-peak',
         'stats.days': 'Last {n} days',
-        'stats.gatewayDown': 'Stats require the gateway on 8787', 'stats.empty': 'No stats yet — they aggregate as sessions happen',
+        'stats.gatewayDown': 'Stats require the gateway to be running', 'stats.empty': 'No stats yet — they aggregate as sessions happen',
         'stats.note': 'Note: estimates assume the official DeepSeek API. Token-based calculation may differ from the official bill; always defer to deepseek.com. Stats start from the 2026-08-17 pricing date.',
         'unit.sec': 's', 'unit.min': 'min', 'unit.hour': 'h ', 'unit.minShort': 'm', 'unit.day': 'd ',
         'device.installedNotRunning': 'Gateway installed · not running', 'device.noGatewayBinary': 'Gateway binary not found',

package/public/admin.js

@@ -24,6 +24,8 @@ let gatewayBusy = false
 let shownToken = token
 let lastState = null
 let qrShown = false
+let gatewayPort = 8787
+let gatewayPortLoaded = false
 
 const STATS_API = pluginMode ? API + '/stats' : '/stats'
 let statsTimer = null
@@ -64,6 +66,26 @@ async function loadStats() {
   }
 }
 
+async function loadGatewayConfig() {
+  if (!pluginMode) return
+  try {
+    const res = await fetch(`${API}/config`, {
+      headers: { authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'admin' }
+    })
+    const out = await res.json().catch(() => ({}))
+    if (out.ok) {
+      gatewayPort = Number(out.port) || 8787
+      gatewayPortLoaded = true
+      const row = $('gateway-port-row')
+      const input = $('gateway-port-input')
+      if (row) row.classList.toggle('hidden', !pluginMode)
+      if (input && document.activeElement !== input) input.value = gatewayPort
+      const cur = $('gateway-port-current')
+      if (cur) cur.textContent = t('gatewayPort.current', { port: gatewayPort })
+    }
+  } catch {}
+}
+
 function renderStats(days) {
   if (!days.length) {
     $('stats-cards').innerHTML = ''
@@ -191,6 +213,12 @@ function render(st) {
     ? t(gatewayRunning ? 'stopping' : 'starting')
     : t(gatewayRunning ? 'stopGateway' : 'startGateway')
   $('btn-gateway').disabled = gatewayBusy
+  // 网关端口配置: 仅插件内嵌页提供
+  $('gateway-port-row').classList.toggle('hidden', !pluginMode || !gatewayPortLoaded)
+  if (pluginMode) {
+    const cur = $('gateway-port-current')
+    if (cur) cur.textContent = t('gatewayPort.current', { port: gatewayPort })
+  }
   const upOk = st.upstream.reachable
   const hostIPs = (st.lanIPs || []).join(t('stat.ipSep')) || '127.0.0.1'
   const latestHtml = st.latest?.newer
@@ -199,7 +227,7 @@ function render(st) {
   $('stats').innerHTML = `
     <div class="stat-card"><div class="v">v${st.version}</div><div class="k">${t(isPlugin ? 'stat.pluginVersion' : 'stat.gatewayVersion')}</div></div>
     <div class="stat-card ${st.latest?.newer ? 'warn' : 'ok'}">${latestHtml}</div>
-    <div class="stat-card ok"><div class="v" style="font-size:13px">${hostIPs}</div><div class="k">${t('stat.hostIP', { hostname: st.hostname })}${isPlugin ? t('stat.phoneGateway') : t('stat.phoneThis')}</div></div>
+    <div class="stat-card ok"><div class="v" style="font-size:13px">${hostIPs}</div><div class="k">${t('stat.hostIP', { hostname: st.hostname })}${isPlugin ? t('stat.phoneGateway', { port: gatewayPort }) : t('stat.phoneThis')}</div></div>
     <div class="stat-card ${upOk ? 'ok' : 'warn'}"><div class="v">${t(upOk ? 'stat.reachable' : 'stat.unreachable')}</div><div class="k">${t('stat.dshUpstream', { url: st.upstream.url })}</div></div>
     <div class="stat-card"><div class="v">${st.onlineCount}/${st.deviceCount}</div><div class="k">${t('stat.devicesOnline')}</div></div>
     <div class="stat-card"><div class="v">${st.totalRequests}</div><div class="k">${t('stat.totalRequests')}</div></div>
@@ -434,6 +462,45 @@ $('btn-gateway').addEventListener('click', async () => {
   setTimeout(loadState, 700)
 })
 
+$('btn-save-port').addEventListener('click', async () => {
+  const input = $('gateway-port-input')
+  const raw = input.value.trim()
+  const port = Number(raw)
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    toast(t('toast.portInvalid'), 'err')
+    return
+  }
+  const btn = $('btn-save-port')
+  const wasRunning = gatewayRunning
+  btn.disabled = true
+  try {
+    const res = await fetch(`${API}/config`, {
+      method: 'PUT',
+      headers: { 'content-type': 'application/json', authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'admin' },
+      body: JSON.stringify({ port })
+    })
+    const out = await res.json().catch(() => ({}))
+    if (out.ok) {
+      const saved = Number(out.port) || port
+      const effective = Number(out.effectivePort || out.port) || saved
+      if (out.effectivePort && effective !== saved) {
+        toast(t('toast.portEnv', { port: effective }), 'ok')
+      } else if (wasRunning) {
+        toast(t('toast.portSaved', { port: effective }), 'ok')
+      } else {
+        toast(t('toast.portSavedIdle', { port: effective }), 'ok')
+      }
+      loadGatewayConfig()
+      setTimeout(loadState, 800)
+    } else {
+      toast(out.error || t('toast.portFailedMsg', { msg: res.status }), 'err')
+    }
+  } catch (e) {
+    toast(t('toast.portFailedMsg', { msg: e.message || e }), 'err')
+  }
+  btn.disabled = false
+})
+
 function renderLangBtn() {
   const btn = $('btn-lang')
   if (btn) btn.textContent = I18N.lang === 'zh' ? 'EN' : '中文'
@@ -521,6 +588,7 @@ function start(showLogin) {
   }
   showMain()
   loadState()
+  loadGatewayConfig()
   loadStats()
   timer = setInterval(loadState, 5000)
   if (statsTimer) clearInterval(statsTimer)