dsh-remote-plugin 0.6.2 → 0.6.4

package/gateway.cjs

@@ -1653,10 +1653,20 @@ function proxyApi(req, res, url) {
 }
 
 // ---------- 其它 ----------
-function serveHealth(res) {
+async function serveHealth(res) {
+  let upstreamOk = false
+  try {
+    const ctrl = new AbortController()
+    const timer = setTimeout(() => ctrl.abort(), 2000)
+    const probe = await fetch(UPSTREAM.origin + '/healthz', { signal: ctrl.signal, cache: 'no-store' })
+    clearTimeout(timer)
+    upstreamOk = probe.ok
+  } catch {
+    upstreamOk = false
+  }
   cors(res)
   res.writeHead(200, { 'content-type': 'application/json; charset=utf-8' })
-  res.end(JSON.stringify({ ok: true, service: 'dsh-remote', version: VERSION, upstream: UPSTREAM.origin }))
+  res.end(JSON.stringify({ ok: true, service: 'dsh-remote', version: VERSION, pid: process.pid, upstream: UPSTREAM.origin, upstreamOk }))
 }
 
 function lanAddresses() {

package/index.mjs

@@ -5,9 +5,10 @@
  *                         网关不可用时回退到插件模式主机状态
  * 浏览器侧入口由 client half 注册在 DSH 原生侧边栏(见 client.js)。
  */
-import { spawn } from 'node:child_process'
-import { createReadStream, existsSync, mkdirSync, openSync, readFileSync, writeFileSync } from 'node:fs'
+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,11 +143,78 @@ 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(800) })
-    return res.ok
+    const res = await fetch(`${gatewayBase()}/health`, { signal: AbortSignal.timeout(3000) })
+    if (!res.ok) return { running: false }
+    const data = await res.json().catch(() => ({}))
+    return {
+      running: true,
+      pid: Number(data.pid) || 0,
+      upstream: typeof data.upstream === 'string' ? data.upstream : '',
+      upstreamOk: data.upstreamOk === true,
+    }
+  } catch {
+    return { running: false }
+  }
+}
+
+function gatewayPidFile() { return `${homedir()}/.dsh-remote/plugin-gateway.pid` }
+
+function readGatewayPid() {
+  try {
+    const pid = Number(readFileSync(gatewayPidFile(), 'utf8').trim())
+    return Number.isFinite(pid) && pid > 0 ? pid : 0
   } catch {
+    return 0
+  }
+}
+
+function writeGatewayPid(pid) {
+  try {
+    mkdirSync(`${homedir()}/.dsh-remote`, { recursive: true })
+    writeFileSync(gatewayPidFile(), String(pid) + '\n')
+  } catch {}
+}
+
+function logGateway(msg) {
+  try {
+    mkdirSync(`${homedir()}/.dsh-remote`, { recursive: true })
+    appendFileSync(`${homedir()}/.dsh-remote/plugin-gateway.log`, `[${new Date().toISOString()}] ${msg}\n`)
+  } catch {}
+}
+
+async function killGateway(health) {
+  const pid = (health && Number(health.pid)) || readGatewayPid()
+  if (!pid) return false
+  try {
+    if (process.platform === 'win32') {
+      await runExit('taskkill', ['/F', '/PID', String(pid)])
+    } else {
+      process.kill(pid)
+    }
+    logGateway('已停止旧网关 PID=' + pid)
+    await sleep(300)
+    return true
+  } catch (e) {
+    logGateway('停止旧网关失败 PID=' + pid + ' ' + (e?.message || String(e)))
     return false
   }
 }
@@ -157,7 +241,9 @@ function setGatewayEnabled(on) {
 
 /** 启动随插件分发的 gateway.cjs; 已运行则直接返回。 */
 async function startGateway() {
-  if (await gatewayRunning()) {
+  const upstream = `http://${dshListen.host}:${dshListen.port}`
+  const health = await gatewayRunning()
+  if (health.running) {
     setGatewayEnabled(true)
     return { ok: true, running: true, started: false }
   }
@@ -165,7 +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'
+  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
@@ -173,10 +264,16 @@ async function startGateway() {
     await runExit('systemctl', ['--user', 'reset-failed', 'dsh-remote-gateway'])
     sysd = (await runExit('systemd-run', [
       '--user', '--unit=dsh-remote-gateway', '--service-type=exec',
-      '--setenv=PORT=' + port, '--setenv=HOST=0.0.0.0',
+      '--setenv=PORT=' + port, '--setenv=HOST=0.0.0.0', '--setenv=DSH_UPSTREAM=' + upstream,
       '--', process.execPath, script,
     ])) === 0
   } catch {}
+  if (sysd) {
+    try {
+      const pid = Number(execFileSync('systemctl', ['--user', 'show', '-p', 'MainPID', '--value', 'dsh-remote-gateway'], { encoding: 'utf8' }).trim())
+      if (Number.isFinite(pid) && pid > 1) writeGatewayPid(pid)
+    } catch {}
+  }
 
   // 无 systemd 的机器回退: detached 子进程
   if (!sysd) {
@@ -188,14 +285,17 @@ async function startGateway() {
       cwd: dirname(script),
       detached: true,
       stdio: ['ignore', logFd ?? 'ignore', logFd ?? 'ignore'],
-      env: { ...process.env, PORT: port },
+      env: { ...process.env, PORT: port, DSH_UPSTREAM: upstream },
     })
     child.unref()
+    writeGatewayPid(child.pid)
   }
   // 最多等 4 秒; 超过可能是端口冲突或首次初始化, 前端稍后刷新即可
   for (let i = 0; i < 16; i++) {
     await sleep(250)
-    if (await gatewayRunning()) {
+    const h = await gatewayRunning()
+    if (h.running) {
+      if (h.pid) writeGatewayPid(h.pid)
       setGatewayEnabled(true)
       return { ok: true, running: true, started: true }
     }
@@ -210,9 +310,24 @@ function ensureGateway() {
   if (ensurePromise) return ensurePromise
   ensurePromise = (async () => {
     try {
-      if (await gatewayRunning()) return true
-      const out = await startGateway()
-      return !!out.running
+      const health = await gatewayRunning()
+      if (!health.running) {
+        const out = await startGateway()
+        return !!out.running
+      }
+      const upstream = `http://${dshListen.host}:${dshListen.port}`
+      const oldUpstream = health.upstream || ''
+      if (health.upstreamOk === false || (oldUpstream && oldUpstream !== upstream) || (!oldUpstream && upstream)) {
+        logGateway(`网关上游需刷新: 旧=${oldUpstream || '?'} 新=${upstream}`)
+        await killGateway(health)
+        for (let i = 0; i < 10; i++) {
+          if (!(await gatewayRunning()).running) break
+          await sleep(200)
+        }
+        const out = await startGateway()
+        return !!out.running
+      }
+      return true
     } finally {
       setTimeout(() => { ensurePromise = null }, 4000)
     }
@@ -225,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),
@@ -271,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),
@@ -357,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
   }
@@ -409,15 +524,70 @@ 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') {
-      sendJson(res, 200, { ok: true, running: await gatewayRunning() })
+      const h = await gatewayRunning()
+      sendJson(res, 200, { ok: true, running: h.running, upstream: h.upstream || '', upstreamOk: h.upstreamOk === true })
       return
     }
     if (req.method === 'POST') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-plugin",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "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)

package/public/app.js

@@ -275,7 +275,7 @@ async function rpc(method, payload = {}) {
     body: JSON.stringify({ type: 'client-request', rpcId: uuid(), method, payload })
   }
   if (typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function') {
-    opts.signal = AbortSignal.timeout(20000)
+    opts.signal = AbortSignal.timeout(45000)
   }
   const res = await fetch(apiUrl('/api/' + method), opts)
   if (res.status === 401) throw new Error('AUTH')
@@ -1180,8 +1180,19 @@ async function loadHistory(reset) {
   } catch (e) {
     state.history.loading = false
     if (e.message === 'AUTH') { authFailure(); return }
-    if (restoreCachedHistory()) toast(t('history.cacheFallback'), 'ok')
-    else toast(t('history.loadFailed', { msg: e.message }), 'err')
+    if (restoreCachedHistory()) {
+      toast(t('history.cacheFallback'), 'ok')
+      return
+    }
+    const msg = e.message || t('err.dshError')
+    const box = $('history')
+    if (box && (reset || !state.history.visible.length)) {
+      box.innerHTML = `<div class="empty"><div>${esc(t('history.loadFailed', { msg }))}</div><button type="button" class="mini-btn" id="btn-history-retry" style="margin-top:10px">${esc(t('history.retry'))}</button></div>`
+      const retry = $('btn-history-retry')
+      if (retry) retry.addEventListener('click', () => loadHistory(true))
+    } else {
+      toast(t('history.loadFailed', { msg }), 'err')
+    }
     return
   }
 
@@ -1404,7 +1415,7 @@ function blockHtml(b) {
   if (!b || typeof b !== 'object') return `<p>${esc(String(b))}</p>`
   if ((b.type === 'tool-call' || b.type === 'tool-result') && LS.get('showTools', '1') === '0') return ''
   switch (b.type) {
-    case 'text': return `<div>${renderMarkdown(b.text ?? '')}</div>`
+    case 'text': return `<div class="md">${window.mdToHtml ? window.mdToHtml(b.text ?? '') : esc(b.text ?? '')}</div>`
     case 'image': return `<img alt="${t('block.image')}" src="data:${esc(b.mediaType || 'image/png')};base64,${esc(b.data || '')}">`
     case 'thinking':
     case 'reasoning':
@@ -1418,20 +1429,6 @@ function blockHtml(b) {
   }
 }
 
-function renderMarkdown(text) {
-  const parts = String(text ?? '').split(/```/)
-  let out = ''
-  for (let i = 0; i < parts.length; i++) {
-    if (i % 2 === 1) out += `<pre>${esc(parts[i])}</pre>`
-    else out += esc(parts[i])
-      .replace(/`([^`]+)`/g, '<code>$1</code>')
-      .replace(/\*\*([^*]+)\*\*/g, '<b>$1</b>')
-      .replace(/(?:^|\n)(#{1,4})\s+([^\n]+)/g, (m, h, t) => `\n<b>${t}</b>`)
-      .replace(/\n/g, '<br>')
-  }
-  return out
-}
-
 function safeJson(v) {
   try { return typeof v === 'string' ? v : JSON.stringify(v, null, 2) }
   catch { return String(v) }
@@ -2544,6 +2541,33 @@ function notify(title, body) {
   } catch {}
 }
 
+async function sendTestNotification() {
+  if (!CAP?.isNativePlatform?.()) {
+    toast(t('settings.testNotifyUnavailable'), 'err')
+    return
+  }
+  const L = CAP.Plugins?.LocalNotifications
+  if (!L?.schedule) {
+    toast(t('settings.testNotifyUnavailable'), 'err')
+    return
+  }
+  const ok = await ensureNotify()
+  if (!ok) { toast(t('settings.notifyDenied'), 'err'); return }
+  try {
+    await L.schedule({
+      notifications: [{
+        id: 8899,
+        title: 'DSH Remote',
+        body: '测试通知 · Test',
+        schedule: { at: new Date(Date.now() + 3000) }
+      }]
+    })
+    toast(t('settings.testNotifySent'), 'ok')
+  } catch (e) {
+    toast(t('settings.testNotifyFailed', { msg: e?.message || '' }), 'err')
+  }
+}
+
 /* ---------------- 后台轮询（Android 前台服务） ---------------- */
 function bgBridge() { return window.NativeBackground }
 function bgBase() { return (state.server || location.origin || '').replace(/\/+$/, '') }
@@ -2646,38 +2670,25 @@ function deletePreset(id) {
   toast(t('presets.deleted'), 'ok')
 }
 
-/* ---------------- 峰谷计费提醒(每天 9/12/14/18 点本地通知) ---------------- */
-const PEAK_REMIND_NOTIFS = [
-  { id: 8801, hour: 9, periodKey: 'peak0912', enterKey: 'enterPeak' },
-  { id: 8802, hour: 12, periodKey: 'off1214', enterKey: 'enterOff' },
-  { id: 8803, hour: 14, periodKey: 'peak1418', enterKey: 'enterPeak' },
-  { id: 8804, hour: 18, periodKey: 'off1809', enterKey: 'enterOff' },
-]
+/* ---------------- 峰谷计费提醒(前台服务进程内定时, 绕开 MIUI 后台限制) ---------------- */
 function peakRemindOn() { return LS.get('peakRemind', '0') === '1' }
 
 async function schedulePeakReminders() {
   if (!CAP?.isNativePlatform?.()) return false
-  const L = CAP.Plugins?.LocalNotifications
-  if (!L?.schedule) return false
+  const b = bgBridge()
+  if (!b?.startPeakReminder) return false
   try {
-    await L.schedule({
-      notifications: PEAK_REMIND_NOTIFS.map(n => ({
-        id: n.id,
-        title: 'DSH Remote',
-        body: `${t('peakRemind.' + n.enterKey)} · ${t('peakRemind.' + n.periodKey)}`,
-        schedule: { every: 'day', on: { hour: n.hour, minute: 0 } },
-      }))
-    })
+    b.startPeakReminder()
     return true
   } catch { return false }
 }
 
 async function cancelPeakReminders() {
   if (!CAP?.isNativePlatform?.()) return false
-  const L = CAP.Plugins?.LocalNotifications
-  if (!L?.cancel) return false
+  const b = bgBridge()
+  if (!b?.stopPeakReminder) return false
   try {
-    await L.cancel({ notifications: PEAK_REMIND_NOTIFS.map(n => ({ id: n.id })) })
+    b.stopPeakReminder()
     return true
   } catch { return false }
 }
@@ -2784,7 +2795,7 @@ async function decodeQrDataUrl(dataUrl) {
 /** App 内扫码: 官方 Camera 拍照/相册 + jsQR 本地解码(无 Google ML Kit/GMS 依赖, 国内可用)。
  *  冗余路径 1: 系统相机扫 dshremote:// 二维码直接唤起 App(见 bindNativeLinks);
  *  冗余路径 2: 设置页手动粘贴令牌。 */
-async function scanPair() {
+async function scanPair(source) {
   if (!CAP?.isNativePlatform?.()) {
     toast(t('scan.browserHint'), 'err')
     return
@@ -2792,17 +2803,17 @@ async function scanPair() {
   const camera = CAP.Plugins?.Camera
   if (!camera?.getPhoto) { toast(t('scan.unsupported'), 'err'); return }
   try {
-    const perm = await camera.requestPermissions?.({ permissions: ['camera'] })
-    if (perm && perm.camera !== 'granted') { toast(t('scan.permissionDenied'), 'err'); return }
+    // 显式指定来源绕过 PROMPT: 小米/HyperOS 的 PROMPT 选择器会错乱(选拍照开相册/选相册开相机)
+    if (source === 'CAMERA') {
+      const perm = await camera.requestPermissions?.({ permissions: ['camera'] })
+      if (perm && perm.camera !== 'granted') { toast(t('scan.permissionDenied'), 'err'); return }
+    }
     const photo = await camera.getPhoto({
       resultType: 'dataUrl',
-      source: 'PROMPT', // 拍照 / 从相册选择都行, 相册可扫截图
+      source: source === 'PHOTOS' ? 'PHOTOS' : 'CAMERA',
       quality: 85,
       correctOrientation: true,
       saveToGallery: false,
-      promptLabelHeader: t('scan.promptHeader'),
-      promptLabelPhoto: t('scan.promptPhoto'),
-      promptLabelPicture: t('scan.promptGallery'),
     })
     if (!photo?.dataUrl) { toast(t('scan.noPhoto'), 'err'); return }
     const raw = await decodeQrDataUrl(photo.dataUrl)
@@ -3020,7 +3031,8 @@ function bindUi() {
     if (group) { showSettingsPage(group.dataset.settingsGroup); return }
     if (e.target.closest('[data-settings-back]')) { showSettingsHome(); return }
   })
-  $('btn-scan-pair').addEventListener('click', scanPair)
+  $('btn-scan-camera').addEventListener('click', () => scanPair('CAMERA'))
+  $('btn-scan-gallery').addEventListener('click', () => scanPair('PHOTOS'))
   $('btn-change-token').addEventListener('click', () => {
     const input = prompt(t('token.prompt'), state.token)
     if (input && input.trim()) { state.token = input.trim(); LS.set('token', input.trim()); $('token-desc').textContent = t('token.saved'); toast(t('token.savedReconnect'), 'ok'); openStreams(); refreshAll(); syncBgConfig() }
@@ -3076,6 +3088,7 @@ function bindUi() {
     }
     LS.set('peakRemind', e.target.checked ? '1' : '0')
   })
+  $('btn-test-notify').addEventListener('click', sendTestNotification)
   // 已开启则启动时重新调度, 防止系统清理后丢失
   if (peakRemindOn() && CAP?.isNativePlatform?.()) schedulePeakReminders()
   applyBgConfigFromNative()

package/public/desktop/desktop.css

@@ -103,6 +103,16 @@ a.ds-btn { text-decoration: none; }
 .ds-msg.user { align-self: flex-end; background: var(--dsr-accent-soft); border: 1px solid var(--dsr-accent-line); color: var(--dsr-accent-strong); }
 .ds-msg.assistant { align-self: flex-start; background: var(--dsr-panel); border: 1px solid var(--dsr-line); color: var(--dsr-text); }
 .ds-msg .role { font-size: 10px; color: var(--dsr-muted); margin-bottom: 3px; }
+.ds-msg p { margin: 4px 0; }
+.ds-msg p:first-child { margin-top: 0; } .ds-msg p:last-child { margin-bottom: 0; }
+.ds-msg ul, .ds-msg ol { margin: 4px 0; padding-left: 20px; }
+.ds-msg li { margin: 2px 0; }
+.ds-msg h1, .ds-msg h2, .ds-msg h3 { margin: 8px 0 4px; line-height: 1.3; font-weight: 700; }
+.ds-msg h1 { font-size: 1.3em; } .ds-msg h2 { font-size: 1.18em; } .ds-msg h3 { font-size: 1.05em; }
+.ds-msg blockquote { margin: 6px 0; padding: 2px 10px; border-left: 3px solid var(--dsr-accent-2); color: var(--dsr-muted); }
+.ds-msg a { color: inherit; text-decoration: underline; word-break: break-all; }
+.ds-msg code { font-family: ui-monospace, monospace; font-size: .9em; background: var(--dsr-accent-soft); padding: 0 4px; border-radius: 4px; }
+.ds-msg pre { margin: 6px 0; background: var(--dsr-code-bg); border-radius: 8px; padding: 8px 10px; overflow-x: auto; font-size: 12px; max-height: 220px; overflow-y: auto; }
 .ds-tool { align-self: flex-start; max-width: min(78%, 680px); width: fit-content; box-sizing: border-box; background: var(--dsr-bg-2); border: 1px solid var(--dsr-line); border-radius: 10px; padding: 8px 11px; font-size: 12px; }
 .ds-tool summary { cursor: pointer; color: var(--dsr-muted); }
 .ds-tool pre { margin: 6px 0 0; white-space: pre-wrap; word-break: break-all; font-size: 11px; color: var(--dsr-text); }

package/public/desktop/desktop.html

@@ -511,6 +511,7 @@
     }
   </script>
   <script src="i18n.js"></script>
+  <script src="../md.js"></script>
   <script src="desktop.js"></script>
 </body>
 </html>

package/public/desktop/desktop.js

@@ -1060,7 +1060,7 @@ function shouldShowEvent(type) { return INTERESTING_EVENTS.has(type) }
 function safeJson(v) { try { return JSON.stringify(v, null, 2) } catch { return String(v) } }
 function blockHtml(b) {
   if (!b) return ''
-  if (b.type === 'text') return `<span>${esc(b.text ?? '')}</span>`
+  if (b.type === 'text') return `<div class="md">${window.mdToHtml ? window.mdToHtml(b.text ?? '') : esc(b.text ?? '')}</div>`
   if (b.type === 'reasoning') return `<span style="opacity:.75">${esc(b.text ?? '')}</span>`
   if (b.type === 'tool-call') return `<div>🔧 ${esc(b.name || '')}</div>`
   if (b.type === 'tool-result') return `<div>📦</div>`

package/public/index.html

@@ -250,7 +250,10 @@
           </div>
           <div class="setting-row">
             <div><div class="setting-name" data-i18n="settings.scanTitle">扫码连接</div><div class="setting-desc" data-i18n="settings.scanDesc">拍照/相册本地解码（无谷歌服务依赖）；也可系统相机扫码或手动粘贴</div></div>
-            <button id="btn-scan-pair" class="mini-btn" data-i18n="settings.scan">扫码</button>
+            <div class="setting-actions">
+              <button id="btn-scan-camera" class="mini-btn" data-i18n="scan.promptPhoto">拍照扫描</button>
+              <button id="btn-scan-gallery" class="mini-btn" data-i18n="scan.promptGallery">从相册选择</button>
+            </div>
           </div>
         </div>
       </div>
@@ -271,6 +274,10 @@
             <div><div class="setting-name" data-i18n="settings.peakRemindTitle">峰谷计费提醒</div><div class="setting-desc" data-i18n="settings.peakRemindDesc">每天 9:00 / 12:00 / 14:00 / 18:00 推送峰谷切换（App 内有效）</div></div>
             <label class="switch"><input type="checkbox" id="opt-peak-remind"><span class="slider"></span></label>
           </div>
+          <div class="setting-row">
+            <div><div class="setting-name" data-i18n="settings.testNotifyTitle">测试通知</div><div class="setting-desc" data-i18n="settings.testNotifyDesc">立即排一条 3 秒后的本地通知，用于排查系统通知限制</div></div>
+            <button id="btn-test-notify" class="mini-btn" data-i18n="settings.testNotify">发送测试通知</button>
+          </div>
           <div class="setting-row">
             <div><div class="setting-name" data-i18n="settings.bgTitle">后台轮询</div><div class="setting-desc" data-i18n="settings.bgDesc">退后台后由前台服务定时拉取事件，待办审批/提问不遗漏</div><div id="bg-auth-status" class="setting-desc hidden" data-i18n="settings.bgAuthFailed">登录失效：连续 3 次 401，后台轮询已停止</div></div>
             <label class="switch"><input type="checkbox" id="opt-bg-poll"><span class="slider"></span></label>
@@ -530,7 +537,7 @@
         'session.confirmStop': '停止当前会话正在运行的任务？', 'session.stopFailed': '停止失败', 'session.stopRequested': '已请求停止',
         'notify.approvalTitle': '工具审批', 'notify.approvalBody': '{tool} 需要批准', 'notify.questionTitle': 'DSH 提问', 'notify.questionBody': '需要你回答',
         'notify.permissionFailed': '通知权限申请失败：{msg}',
-        'history.loading': '加载历史…', 'history.cacheFallback': '网络不可用：显示本地缓存的历史', 'history.loadFailed': '加载历史失败：{msg}',
+        'history.loading': '加载历史…', 'history.cacheFallback': '网络不可用：显示本地缓存的历史', 'history.loadFailed': '加载历史失败：{msg}', 'history.retry': '重试',
         'history.offlineCache': '离线缓存 {n} 条', 'history.count': '{n} 条', 'history.empty': '还没有消息',
         'history.queueAndCount': '队列 {q} · 历史 {n}', 'history.countOnly': '历史 {n}',
         'role.me': '我', 'role.dsh': 'DSH',
@@ -610,6 +617,8 @@
         'settings.servers': '服务器地址（可多个）', 'settings.speedTest': '测速', 'settings.add': '添加',
         'settings.scanTitle': '扫码连接', 'settings.scanDesc': '拍照/相册本地解码（无谷歌服务依赖）；也可系统相机扫码或手动粘贴', 'settings.scan': '扫码',
         'settings.notifyTitle': '通知', 'settings.notifyDesc': '收到审批/提问时推送',
+        'settings.testNotifyTitle': '测试通知', 'settings.testNotifyDesc': '立即排一条 3 秒后的本地通知，用于排查系统通知限制', 'settings.testNotify': '发送测试通知',
+        'settings.testNotifySent': '测试通知已排定，3 秒后到达', 'settings.testNotifyFailed': '发送测试通知失败：{msg}', 'settings.testNotifyUnavailable': '测试通知仅在 App 内可用',
         'settings.peakRemindTitle': '峰谷计费提醒', 'settings.peakRemindDesc': '每天 9:00 / 12:00 / 14:00 / 18:00 推送峰谷切换（App 内有效）',
         'peakRemind.enterPeak': '已进入高峰计费时段', 'peakRemind.enterOff': '已进入空闲计费时段',
         'peakRemind.peak0912': '高峰 9:00-12:00', 'peakRemind.off1214': '空闲 12:00-14:00',
@@ -709,7 +718,7 @@
         'session.confirmStop': 'Stop the currently running task in this session?', 'session.stopFailed': 'Stop failed', 'session.stopRequested': 'Stop requested',
         'notify.approvalTitle': 'Tool approval', 'notify.approvalBody': '{tool} needs approval', 'notify.questionTitle': 'DSH question', 'notify.questionBody': 'Needs your answer',
         'notify.permissionFailed': 'Notification permission failed: {msg}',
-        'history.loading': 'Loading history…', 'history.cacheFallback': 'Network unavailable: showing cached history', 'history.loadFailed': 'Failed to load history: {msg}',
+        'history.loading': 'Loading history…', 'history.cacheFallback': 'Network unavailable: showing cached history', 'history.loadFailed': 'Failed to load history: {msg}', 'history.retry': 'Retry',
         'history.offlineCache': 'Offline cache {n} items', 'history.count': '{n} items', 'history.empty': 'No messages yet',
         'history.queueAndCount': 'Queue {q} · History {n}', 'history.countOnly': 'History {n}',
         'role.me': 'Me', 'role.dsh': 'DSH',
@@ -789,6 +798,8 @@
         'settings.servers': 'Servers (one or more)', 'settings.speedTest': 'Test', 'settings.add': 'Add',
         'settings.scanTitle': 'Scan to pair', 'settings.scanDesc': 'Photo/gallery QR decoding on device (no Google services); system camera or manual paste also work', 'settings.scan': 'Scan',
         'settings.notifyTitle': 'Notifications', 'settings.notifyDesc': 'Push on approvals / questions',
+        'settings.testNotifyTitle': 'Test notification', 'settings.testNotifyDesc': 'Schedule a local notification in 3 seconds to verify the notification pipeline', 'settings.testNotify': 'Send test notification',
+        'settings.testNotifySent': 'Test notification scheduled, arriving in 3s', 'settings.testNotifyFailed': 'Failed to send test notification: {msg}', 'settings.testNotifyUnavailable': 'Test notification is only available in the app',
         'settings.peakRemindTitle': 'Peak/off-peak reminders', 'settings.peakRemindDesc': 'Push at 9:00 / 12:00 / 14:00 / 18:00 daily (in-app only)',
         'peakRemind.enterPeak': 'Peak pricing period started', 'peakRemind.enterOff': 'Off-peak pricing period started',
         'peakRemind.peak0912': 'Peak 9:00-12:00', 'peakRemind.off1214': 'Off-peak 12:00-14:00',
@@ -845,6 +856,7 @@
   <script src="jsqr.min.js"></script>
   <script src="i18n.js"></script>
   <script src="theme.js"></script>
+  <script src="md.js"></script>
   <script src="app.js"></script>
 </body>
 </html>

package/public/md.js

@@ -0,0 +1,115 @@
+/* DSH Remote 轻量 Markdown 渲染器 · 零依赖
+ * 用法: mdToHtml(text) -> HTML 字符串
+ * 安全: 先 HTML 转义再转标记; 链接仅允许 http/https, 其余保留为纯文本。
+ * 支持: 代码块 / 行内代码 / #~### 标题 / **粗体** / *斜体* / - 无序列表 /
+ *       1. 有序列表 / > 引用 / [text](url) 链接 / 换行。
+ * 同时支持浏览器全局 window.mdToHtml 与 Node CommonJS module.exports。
+ */
+(function (root, factory) {
+  if (typeof module === 'object' && module.exports) module.exports = factory()
+  else root.mdToHtml = factory()
+})(typeof self !== 'undefined' ? self : this, function () {
+  'use strict'
+
+  function escapeHtml(s) {
+    return String(s).replace(/[&<>"']/g, function (c) {
+      return {
+        '&': '&amp;',
+        '<': '&lt;',
+        '>': '&gt;',
+        '"': '&quot;',
+        "'": '&#39;'
+      }[c]
+    })
+  }
+
+  function inline(s) {
+    s = s.replace(/`([^`]+)`/g, '<code>$1</code>')
+    s = s.replace(/\*\*([^*]+)\*\*/g, '<strong>$1</strong>')
+    s = s.replace(/(^|[^*])\*([^*\n]+)\*/g, '$1<em>$2</em>')
+    s = s.replace(/\[([^\]]+)\]\(([^)\s]+)\)/g, function (m, text, url) {
+      url = url.trim()
+      if (!/^https?:\/\//i.test(url)) return m
+      return '<a href="' + url + '" target="_blank" rel="noopener noreferrer">' + text + '</a>'
+    })
+    return s
+  }
+
+  function renderLines(lines) {
+    var html = ''
+    var i = 0
+    while (i < lines.length) {
+      var line = lines[i]
+      var t = line.trim()
+      if (!t) { i++; continue }
+      var h = line.match(/^(#{1,3})\s+(.*)$/)
+      if (h) {
+        var level = h[1].length
+        html += '<h' + level + '>' + inline(h[2]) + '</h' + level + '>'
+        i++
+        continue
+      }
+      var q = line.match(/^&gt;\s?(.*)$/)
+      if (q) {
+        html += '<blockquote>' + inline(q[1]) + '</blockquote>'
+        i++
+        continue
+      }
+      var ul = line.match(/^[-*]\s+(.*)$/)
+      if (ul) {
+        var items = []
+        while (i < lines.length) {
+          var um = lines[i].match(/^[-*]\s+(.*)$/)
+          if (!um) break
+          items.push(inline(um[1]))
+          i++
+        }
+        html += '<ul>' + items.map(function (x) { return '<li>' + x + '</li>' }).join('') + '</ul>'
+        continue
+      }
+      var ol = line.match(/^\d+[.)]\s+(.*)$/)
+      if (ol) {
+        var oitems = []
+        while (i < lines.length) {
+          var om = lines[i].match(/^\d+[.)]\s+(.*)$/)
+          if (!om) break
+          oitems.push(inline(om[1]))
+          i++
+        }
+        html += '<ol>' + oitems.map(function (x) { return '<li>' + x + '</li>' }).join('') + '</ol>'
+        continue
+      }
+      var para = []
+      while (i < lines.length) {
+        var cur = lines[i]
+        var ct = cur.trim()
+        if (!ct) break
+        if (/^(#{1,3})\s+/.test(cur) || /^&gt;\s?/.test(cur) || /^[-*]\s+/.test(cur) || /^\d+[.)]\s+/.test(cur)) break
+        para.push(inline(cur))
+        i++
+      }
+      if (para.length) html += '<p>' + para.join('<br>') + '</p>'
+    }
+    return html
+  }
+
+  function mdToHtml(text) {
+    var raw = String(text == null ? '' : text)
+    var parts = raw.split(/```/)
+    var out = ''
+    for (var i = 0; i < parts.length; i++) {
+      if (i % 2 === 1) {
+        var code = parts[i]
+        code = code.replace(/^\n/, '')
+        if (code.slice(-1) === '\n') code = code.slice(0, -1)
+        out += '<pre><code>' + escapeHtml(code) + '</code></pre>'
+      } else {
+        var escaped = escapeHtml(parts[i])
+        out += renderLines(escaped.split('\n'))
+      }
+    }
+    return out
+  }
+
+  return mdToHtml
+})

package/public/styles.css

@@ -298,6 +298,12 @@ body.in-session .view {
 .msg p:first-child { margin-top: 0; } .msg p:last-child { margin-bottom: 0; }
 .msg ul, .msg ol { margin: 4px 0; padding-left: 20px; }
 .msg code { font-family: ui-monospace, monospace; font-size: .9em; background: var(--dsr-accent-soft); padding: 0 4px; border-radius: 4px; }
+.msg h1, .msg h2, .msg h3 { margin: 8px 0 4px; line-height: 1.3; font-weight: 700; }
+.msg h1 { font-size: 1.3em; } .msg h2 { font-size: 1.18em; } .msg h3 { font-size: 1.05em; }
+.msg blockquote { margin: 6px 0; padding: 2px 10px; border-left: 3px solid var(--dsr-accent-2); color: var(--dsr-muted); }
+.msg a { color: var(--dsr-accent-strong); text-decoration: underline; word-break: break-all; }
+.msg.user a { color: var(--dsr-on-accent); }
+.msg li { margin: 2px 0; }
 
 .event {
   align-self: center; font-size: 11px; color: var(--dsr-muted);
@@ -454,6 +460,7 @@ body.in-session .main { padding-bottom: 84px; }
 .setting-name { font-size: 14.5px; font-weight: 600; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
 .setting-desc { font-size: 12px; color: var(--dsr-muted); margin-top: 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
 .setting-desc.expanded { white-space: normal; overflow: visible; text-overflow: clip; word-break: break-word; }
+.setting-actions { display: flex; gap: 6px; flex-wrap: wrap; justify-content: flex-end; }
 .about { text-align: center; color: var(--dsr-muted); font-size: 12px; margin-top: 16px; line-height: 1.8; }
 
 /* 多服务器列表(分组) */

package/public/update.json

@@ -1,10 +1,18 @@
 {
-  "version": "0.6.2",
+  "version": "0.6.4",
   "apkUrl": "dsh-remote.apk",
-  "sha256": "cfd99b7f3e38a55f956e9ca7867da0e0c841629b00675fcbfad1dfb9bc74c183",
-  "releasedAt": "2026-08-18T18:55:03.782Z",
-  "notes": "桌面端 WebUI：设置页清理与输入区饱满化；新增会话功能（goal/todo/subagent/模型切换/思考深度）；预设提示词管理与空状态引导；更新弹窗改为按正式版逐版展示历史（App/桌面端）；移除通知分组；聊天宽度约 680px、输入框按钮对齐。",
+  "sha256": "7e9a67c36a77e13556034758b5e9b4d950b3e183d9a9bbfa0219f077a5c06ab2",
+  "releasedAt": "2026-08-19T11:39:19.543Z",
+  "notes": "扫码配对改为显式双按钮（拍照/相册），修复小米等 ROM 选择器错乱；会话历史加载超时放宽至 45 秒，失败可重试；网关端口自定义（插件管理页可改，环境变量仍优先）+ 启动前端口占用检测；峰谷计费提醒改前台服务驱动，后台按时必达；消息 Markdown 渲染（标题/代码块/列表/链接）；修复 DSH 重启后网关上游端口不刷新（Issue #1）；新增测试通知按钮。",
   "history": [
+    {
+      "version": "0.6.4",
+      "notes": "扫码配对改为显式双按钮（拍照/相册），修复小米等 ROM 选择器错乱；会话历史加载超时放宽至 45 秒，失败可重试；网关端口自定义（插件管理页可改，环境变量仍优先）+ 启动前端口占用检测；峰谷计费提醒改前台服务驱动，后台按时必达；消息 Markdown 渲染（标题/代码块/列表/链接）；修复 DSH 重启后网关上游端口不刷新（Issue #1）；新增测试通知按钮。"
+    },
+    {
+      "version": "0.6.3",
+      "notes": "修复 DSH 重启后网关 upstream 端口不刷新（Issue #1）：/health 增加 upstream/upstreamOk/pid 探测；插件 ensureGateway 检测上游变化或不可达时自动杀旧网关并按新 DSH_UPSTREAM 重启；启动/刷新写插件日志与 PID 文件。"
+    },
     {
       "version": "0.6.2",
       "notes": "桌面端 WebUI：设置页清理与输入区饱满化；新增会话功能（goal/todo/subagent/模型切换/思考深度）；预设提示词管理与空状态引导；更新弹窗改为按正式版逐版展示历史（App/桌面端）；移除通知分组；聊天宽度约 680px、输入框按钮对齐。"

package/public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.6.2"
+  "version": "0.6.4"
 }