dsh-remote-plugin 0.6.15 → 0.6.16

package/gateway.cjs

@@ -83,6 +83,7 @@ const WORKBENCH_FILE = process.env.DSH_REMOTE_WORKBENCH || path.join(os.homedir(
 const STARTED_AT = Date.now()
 const DSH_SERVICE = String(process.env.DSH_REMOTE_DSH_SERVICE || 'dsh-web').trim()
 const SYSTEMCTL = String(process.env.DSH_REMOTE_SYSTEMCTL || 'systemctl').trim() || 'systemctl'
+const WINDOWS_SC = String(process.env.DSH_REMOTE_WINDOWS_SC || 'sc.exe').trim() || 'sc.exe'
 const DSH_CONTROL_TIMEOUT_MS = durationEnv('DSH_REMOTE_DSH_CONTROL_TIMEOUT_MS', 45000, 2000, 5 * 60 * 1000)
 const DSH_CONTROL_POLL_MS = durationEnv('DSH_REMOTE_DSH_CONTROL_POLL_MS', 500, 50, 5000)
 const HTTP_REQUEST_TIMEOUT_MS = durationEnv('GATEWAY_HTTP_REQUEST_TIMEOUT_MS', 15 * 60 * 1000, 0, 24 * 60 * 60 * 1000)
@@ -840,13 +841,91 @@ function classifySystemctlFailure(result) {
   return { code: 'COMMAND_FAILED', message: 'systemctl 未能接受 DSH 控制命令', detail }
 }
 
-async function dshServiceStatus() {
-  if (process.platform === 'win32') {
-    return { ok: true, supported: false, running: false, service: DSH_SERVICE, code: 'PLATFORM_UNSUPPORTED', message: 'Windows 暂不支持通过 systemd 远程控制 DSH' }
+const WINDOWS_SERVICE_STATE_NAMES = Object.freeze({
+  1: 'STOPPED',
+  2: 'START_PENDING',
+  3: 'STOP_PENDING',
+  4: 'RUNNING',
+  5: 'CONTINUE_PENDING',
+  6: 'PAUSE_PENDING',
+  7: 'PAUSED',
+})
+
+function parseWindowsServiceQuery(output) {
+  const text = String(output || '')
+  const state = /\bSTATE\s*:\s*(\d+)(?:\s+([^\r\n(]+))?/i.exec(text)
+  if (!state) return null
+  const stateCode = Number(state[1])
+  const stateName = WINDOWS_SERVICE_STATE_NAMES[stateCode] || String(state[2] || 'UNKNOWN').trim().split(/\s+/)[0].toUpperCase()
+  const pid = /\bPID\s*:\s*(\d+)/i.exec(text)
+  const pending = [2, 3, 5, 6].includes(stateCode)
+  return {
+    stateCode,
+    stateName,
+    pending,
+    running: stateCode === 4,
+    mainPid: Number(pid?.[1]) || 0,
+  }
+}
+
+function classifyWindowsServiceFailure(result) {
+  const detail = [result?.stderr, result?.stdout, result?.error].filter(Boolean).join(' · ').slice(0, 1000)
+  const code = String(result?.code ?? '')
+  if (result?.timedOut) return { code: 'COMMAND_TIMEOUT', message: 'Windows 服务控制命令超时', detail }
+  if (code === 'ENOENT') return { code: 'SERVICE_CONTROL_NOT_FOUND', message: '系统中找不到 sc.exe', detail }
+  if (code === '1060' || /1060|does not exist|cannot find the file specified|找不到指定的服务/i.test(detail)) {
+    return { code: 'SERVICE_NOT_FOUND', message: `未找到 Windows 服务 ${DSH_SERVICE}`, detail }
+  }
+  if (code === '1058' || /1058|disabled|禁用/i.test(detail)) return { code: 'SERVICE_DISABLED', message: `Windows 服务 ${DSH_SERVICE} 已被禁用`, detail }
+  if (/access is denied|permission denied|not authorized|需要提升|拒绝访问/i.test(detail)) return { code: 'PERMISSION_DENIED', message: '当前用户无权控制 Windows DSH 服务', detail }
+  if (code === 'SERVICE_STOP_TIMEOUT') return { code, message: `Windows 服务 ${DSH_SERVICE} 停止超时`, detail }
+  return { code: 'COMMAND_FAILED', message: 'Windows 服务控制命令失败', detail }
+}
+
+function classifyDshServiceFailure(result) {
+  return process.platform === 'win32' ? classifyWindowsServiceFailure(result) : classifySystemctlFailure(result)
+}
+
+async function windowsServiceStatus() {
+  const r = await execFileResult(WINDOWS_SC, ['queryex', DSH_SERVICE], 5000)
+  if (!r.ok) {
+    const failure = classifyWindowsServiceFailure(r)
+    if (failure.code === 'SERVICE_NOT_FOUND') {
+      return { ok: true, supported: false, running: false, service: DSH_SERVICE, ...failure }
+    }
+    return { ok: false, supported: false, running: false, service: DSH_SERVICE, ...failure }
+  }
+  const parsed = parseWindowsServiceQuery([r.stdout, r.stderr].filter(Boolean).join('\n'))
+  if (!parsed) {
+    return {
+      ok: false, supported: false, running: false, service: DSH_SERVICE,
+      code: 'STATUS_PARSE_FAILED', message: '无法解析 Windows DSH 服务状态', detail: r.stdout || r.stderr || 'sc.exe 没有返回 STATE',
+    }
   }
+  const activeState = parsed.running ? 'active' : parsed.stateCode === 7 ? 'paused' : parsed.pending ? 'activating' : 'inactive'
+  return {
+    ok: true,
+    supported: true,
+    running: parsed.running,
+    service: DSH_SERVICE,
+    state: activeState,
+    loadState: 'loaded',
+    activeState,
+    subState: parsed.stateName.toLowerCase(),
+    unitFileState: 'windows-service',
+    mainPid: parsed.mainPid,
+    result: '',
+    execMainStatus: 0,
+    serviceStateCode: parsed.stateCode,
+    serviceState: parsed.stateName,
+  }
+}
+
+async function dshServiceStatus() {
   if (!/^[A-Za-z0-9_.@-]+$/.test(DSH_SERVICE)) {
     return { ok: false, supported: false, running: false, service: DSH_SERVICE, code: 'INVALID_SERVICE', message: 'DSH_REMOTE_DSH_SERVICE 服务名配置不合法' }
   }
+  if (process.platform === 'win32') return windowsServiceStatus()
   const r = await execFileResult(SYSTEMCTL, [
     '--user', 'show', DSH_SERVICE,
     '--property=Id,LoadState,ActiveState,SubState,UnitFileState,MainPID,Result,ExecMainStatus',
@@ -884,6 +963,31 @@ async function dshServiceStatus() {
   }
 }
 
+async function executeDshServiceAction(action, initial) {
+  if (process.platform !== 'win32') {
+    return execFileResult(SYSTEMCTL, ['--user', '--no-block', action, DSH_SERVICE], 5000)
+  }
+  if (action === 'restart' && initial?.running) {
+    const stop = await execFileResult(WINDOWS_SC, ['stop', DSH_SERVICE], 5000)
+    if (!stop.ok) {
+      const current = await windowsServiceStatus()
+      if (!current.supported || current.running || current.serviceStateCode !== 1) return stop
+    }
+    let stopped = false
+    const checks = Math.max(1, Math.ceil(DSH_CONTROL_TIMEOUT_MS / Math.max(50, DSH_CONTROL_POLL_MS)))
+    for (let i = 0; i < checks; i++) {
+      const current = await windowsServiceStatus()
+      if (!current.supported) {
+        return { ok: false, code: current.code || 'SERVICE_STATUS_FAILED', error: current.message, stderr: current.detail }
+      }
+      if (current.serviceStateCode === 1) { stopped = true; break }
+      await delay(DSH_CONTROL_POLL_MS)
+    }
+    if (!stopped) return { ok: false, code: 'SERVICE_STOP_TIMEOUT', error: `Windows 服务 ${DSH_SERVICE} 停止超时` }
+  }
+  return execFileResult(WINDOWS_SC, ['start', DSH_SERVICE], 5000)
+}
+
 function delay(ms) {
   return new Promise(resolvePromise => setTimeout(resolvePromise, ms))
 }
@@ -949,7 +1053,8 @@ function reconnectDshEventCollectors() {
 
 async function runDshControlOperation(operation) {
   try {
-    dshOperationStep(operation, 'checking', `正在检查 systemd 用户服务 ${DSH_SERVICE}`)
+    const manager = process.platform === 'win32' ? 'Windows 服务' : 'systemd 用户服务'
+    dshOperationStep(operation, 'checking', `正在检查 ${manager} ${DSH_SERVICE}`)
     const initial = await dshServiceStatus()
     operation.initialStatus = initial
     operation.observed = initial
@@ -964,11 +1069,11 @@ async function runDshControlOperation(operation) {
       return
     }
 
-    dshOperationStep(operation, 'command', `正在向 systemd 提交 DSH ${operation.action === 'start' ? '启动' : '重启'}命令`)
-    const command = await execFileResult(SYSTEMCTL, ['--user', '--no-block', operation.action, DSH_SERVICE], 5000)
+    dshOperationStep(operation, 'command', `正在向 ${manager} 提交 DSH ${operation.action === 'start' ? '启动' : '重启'}命令`)
+    const command = await executeDshServiceAction(operation.action, initial)
     operation.command = { ok: command.ok, code: command.code, signal: command.signal }
     if (!command.ok) {
-      const failure = classifySystemctlFailure(command)
+      const failure = classifyDshServiceFailure(command)
       failDshOperation(operation, failure.code, failure.message, failure.detail, await dshServiceStatus())
       return
     }

package/package.json

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

package/public/admin.html

@@ -108,6 +108,28 @@
     .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; }
+    .host-ip-card { margin: 0 0 14px; padding: 18px; background: var(--dsr-panel); border: 1px solid var(--dsr-line); border-radius: var(--dsr-radius); }
+    .host-ip-head { display: flex; align-items: flex-start; justify-content: space-between; gap: 12px; }
+    .host-ip-title { font-size: 16px; font-weight: 750; }
+    .host-ip-head .muted { margin-top: 4px; font-size: 12px; }
+    .host-ip-badge { flex: none; padding: 5px 9px; border: 1px solid var(--dsr-accent-line); border-radius: 999px; color: var(--dsr-accent-strong); background: var(--dsr-accent-soft); font-size: 11px; font-weight: 700; }
+    .host-ip-desc { margin: 12px 0; color: var(--dsr-muted); font-size: 12px; line-height: 1.55; }
+    .host-ip-table-wrap { overflow: hidden; border: 1px solid var(--dsr-line); border-radius: 13px; }
+    .host-ip-table { width: 100%; border-collapse: collapse; }
+    .host-ip-table th, .host-ip-table td { padding: 10px 12px; border-bottom: 1px solid var(--dsr-divider); text-align: left; font-size: 12px; }
+    .host-ip-table th { color: var(--dsr-muted); background: var(--dsr-bg-2); font-size: 11px; font-weight: 750; }
+    .host-ip-table tr:last-child td { border-bottom: none; }
+    .host-ip-toggle { width: 74px; }
+    .host-ip-value { font-size: 13px !important; }
+    .host-ip-use { color: var(--dsr-muted); }
+    .host-ip-switch { position: relative; display: inline-block; width: 38px; height: 22px; vertical-align: middle; }
+    .host-ip-switch input { position: absolute; width: 1px; height: 1px; opacity: 0; }
+    .host-ip-switch span { position: absolute; inset: 0; border: 1px solid var(--dsr-line); border-radius: 999px; background: var(--dsr-bg-2); cursor: pointer; transition: .18s ease; }
+    .host-ip-switch span::after { content: ''; position: absolute; width: 16px; height: 16px; left: 2px; top: 2px; border-radius: 50%; background: var(--dsr-muted); transition: .18s ease; }
+    .host-ip-switch input:checked + span { border-color: var(--dsr-accent-line); background: var(--dsr-accent-soft); }
+    .host-ip-switch input:checked + span::after { transform: translateX(16px); background: var(--dsr-accent-strong); }
+    .host-ip-switch input:focus-visible + span { outline: 2px solid var(--dsr-accent-strong); outline-offset: 2px; }
+    .host-ip-empty { padding: 18px; color: var(--dsr-muted); text-align: center; font-size: 12px; }
     .conn-badge { white-space: nowrap; }
     #btn-close-drawer { white-space: nowrap; }
     @media (max-width: 720px) {
@@ -220,7 +242,7 @@
     .tb-btn { border-radius: 11px; background: linear-gradient(135deg, var(--dsr-panel-2), var(--dsr-bg-2)); border-color: var(--dsr-line); transition: transform .18s ease, border-color .18s ease, background .18s ease; }
     .tb-btn:hover { transform: translateY(-1px); border-color: var(--dsr-accent-line); background: var(--dsr-accent-soft); }
     .tb-btn svg { width: 17px; height: 17px; }
-    .login-card, .stat-card, .stats-chart, .table-wrap, .gateway-port-row, .pair-box { background: linear-gradient(145deg, var(--dsr-panel), var(--dsr-bg-2)); border-color: var(--dsr-line); border-radius: 18px; box-shadow: 0 12px 30px var(--dsr-shadow); }
+    .login-card, .stat-card, .stats-chart, .table-wrap, .gateway-port-row, .host-ip-card, .pair-box { background: linear-gradient(145deg, var(--dsr-panel), var(--dsr-bg-2)); border-color: var(--dsr-line); border-radius: 18px; box-shadow: 0 12px 30px var(--dsr-shadow); }
     .login-card { padding: 18px; }
     .stat-grid { gap: 12px; }
     .stat-card { padding: 15px 16px; box-shadow: inset 0 1px var(--dsr-divider), 0 10px 26px var(--dsr-shadow); }
@@ -293,6 +315,9 @@
       .token-row { display: flex; flex-direction: column; align-items: stretch; }
       .token-actions { justify-content: stretch; }
       .token-actions .mini-btn { flex: 1 1 auto; }
+      .host-ip-card { padding: 15px; }
+      .host-ip-table-wrap { overflow-x: auto; }
+      .host-ip-table { min-width: 360px; }
       .device-key-toggle { align-items:flex-start; }
       .device-key-toggle-actions { align-items:flex-end; flex-direction:column-reverse; }
       .device-key-grid.head { display:none; }
@@ -434,6 +459,24 @@
         <button id="btn-save-port" class="mini-btn" data-i18n="savePort">保存</button>
       </div>
 
+      <section id="host-ip-card" class="host-ip-card" aria-live="polite">
+        <div class="host-ip-head">
+          <div>
+            <div class="host-ip-title" data-i18n="hostIPs.title">主机 IP 地址</div>
+            <div id="host-ip-summary" class="muted" data-i18n="hostIPs.loading">正在读取主机地址…</div>
+          </div>
+          <div class="host-ip-badge" data-i18n="hostIPs.badge">手机连接候选</div>
+        </div>
+        <div class="host-ip-desc" data-i18n="hostIPs.desc">关闭虚拟机、容器或其他无效地址后，它们不会再写入配对二维码，也不会作为诊断和防火墙建议地址。</div>
+        <div class="host-ip-table-wrap">
+          <table class="host-ip-table">
+            <thead><tr><th data-i18n="hostIPs.enabledColumn">启用</th><th data-i18n="hostIPs.addressColumn">主机 IP</th><th data-i18n="hostIPs.statusColumn">状态</th></tr></thead>
+            <tbody id="host-ip-rows"></tbody>
+          </table>
+          <div id="host-ip-empty" class="host-ip-empty hidden" data-i18n="hostIPs.empty">暂无可用的非回环 IPv4 地址</div>
+        </div>
+      </section>
+
       <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>
@@ -564,6 +607,7 @@
         'stat.download': '去下载', 'stat.embedded': 'DSH 内嵌 · 免网关',
         'stat.updateCheck': '更新检查: {error}', 'stat.latest': '已是最新(来源检查)', 'stat.notChecked': '未检查更新',
         'stat.hostIP': '主机 IP · {hostname}', 'stat.ipSep': '、', 'stat.phoneGateway': ' (手机连 {port} 网关)', 'stat.phoneThis': ' (手机连这个地址)',
+        'hostIPs.title': '主机 IP 地址', 'hostIPs.badge': '手机连接候选', 'hostIPs.loading': '正在读取主机地址…', 'hostIPs.summary': '已启用 {enabled}/{total} 个地址', 'hostIPs.desc': '关闭虚拟机、容器或其他无效地址后，它们不会再写入配对二维码，也不会作为诊断和防火墙建议地址。', 'hostIPs.enabledColumn': '启用', 'hostIPs.addressColumn': '主机 IP', 'hostIPs.statusColumn': '状态', 'hostIPs.enabled': '已启用 · 会用于配对', 'hostIPs.disabled': '已关闭 · 不用于配对', 'hostIPs.enable': '切换此地址', 'hostIPs.empty': '暂无可用的非回环 IPv4 地址', 'hostIPs.keepOne': '至少保留一个可用地址',
         'stat.reachable': '可达', 'stat.unreachable': '不可达', 'stat.dshUpstream': 'DSH 上游 {url}',
         'stat.devicesOnline': '设备在线 / 累计', 'stat.totalRequests': '总请求数', 'stat.authFailures': '认证失败',
         'stat.uptime': '运行时长 · {host}:{port}',
@@ -673,6 +717,7 @@
         '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 {port})', 'stat.phoneThis': ' (phone connects to this address)',
+        'hostIPs.title': 'Host IP addresses', 'hostIPs.badge': 'Phone connection candidates', 'hostIPs.loading': 'Reading host addresses…', 'hostIPs.summary': '{enabled}/{total} addresses enabled', 'hostIPs.desc': 'Disabled virtual-machine, container, or other invalid addresses are excluded from pairing QR codes, diagnostics, and firewall suggestions.', 'hostIPs.enabledColumn': 'Enabled', 'hostIPs.addressColumn': 'Host IP', 'hostIPs.statusColumn': 'Status', 'hostIPs.enabled': 'Enabled · used for pairing', 'hostIPs.disabled': 'Disabled · excluded from pairing', 'hostIPs.enable': 'Toggle this address', 'hostIPs.empty': 'No usable non-loopback IPv4 address', 'hostIPs.keepOne': 'Keep at least one usable address enabled',
         '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}',

package/public/admin.js

@@ -31,6 +31,71 @@ let gatewayPort = 8787
 let gatewayPortLoaded = false
 let doctorExpanded = store.get('dshAdminDoctorCollapsed') !== '1'
 let doctorChecks = []
+const HOST_IP_SELECTION_KEY = 'dshAdminEnabledHostIPsV1'
+
+function normalizedHostIPs(st) {
+  return Array.isArray(st?.lanIPs)
+    ? [...new Set(st.lanIPs.map(value => String(value || '').trim()).filter(value => value && value !== '127.0.0.1' && value !== '0.0.0.0'))]
+    : []
+}
+
+function hostIPScope(st) {
+  return [st?.hostname || location.hostname || 'host', st?.host || ''].join('|')
+}
+
+function hostIPPreferences() {
+  try {
+    const value = JSON.parse(store.get(HOST_IP_SELECTION_KEY) || '{}')
+    return value && typeof value === 'object' && !Array.isArray(value) ? value : {}
+  } catch {
+    return {}
+  }
+}
+
+function enabledHostIPs(st) {
+  const all = normalizedHostIPs(st)
+  if (!all.length) return []
+  const saved = hostIPPreferences()[hostIPScope(st)]
+  if (!Array.isArray(saved)) return all
+  const selected = all.filter(ip => saved.includes(ip))
+  return selected.length ? selected : all
+}
+
+function saveEnabledHostIPs(st, selected) {
+  const prefs = hostIPPreferences()
+  prefs[hostIPScope(st)] = normalizedHostIPs(st).filter(ip => selected.includes(ip))
+  store.set(HOST_IP_SELECTION_KEY, JSON.stringify(prefs))
+}
+
+function renderHostIPs(st) {
+  const all = normalizedHostIPs(st)
+  const selected = enabledHostIPs(st)
+  const rows = $('host-ip-rows')
+  const empty = $('host-ip-empty')
+  const summary = $('host-ip-summary')
+  if (!rows || !empty || !summary) return
+  summary.textContent = all.length
+    ? t('hostIPs.summary', { enabled: selected.length, total: all.length })
+    : t('hostIPs.empty')
+  rows.innerHTML = all.map(ip => `<tr>
+    <td class="host-ip-toggle"><label class="host-ip-switch" title="${esc(t('hostIPs.enable'))}"><input type="checkbox" data-host-ip-toggle="${esc(ip)}" ${selected.includes(ip) ? 'checked' : ''}><span aria-hidden="true"></span></label></td>
+    <td class="mono host-ip-value">${esc(ip)}</td>
+    <td class="host-ip-use">${esc(t(selected.includes(ip) ? 'hostIPs.enabled' : 'hostIPs.disabled'))}</td>
+  </tr>`).join('')
+  empty.classList.toggle('hidden', all.length > 0)
+  rows.querySelectorAll('[data-host-ip-toggle]').forEach(input => input.addEventListener('change', () => {
+    const ip = input.dataset.hostIpToggle
+    const next = enabledHostIPs(st).filter(value => value !== ip)
+    if (input.checked) next.push(ip)
+    if (!next.length) {
+      input.checked = true
+      toast(t('hostIPs.keepOne'), 'err')
+      return
+    }
+    saveEnabledHostIPs(st, next)
+    render(st)
+  }))
+}
 
 function onlineClientDevices(st) {
   return (st.devices || []).filter(device => device.online && (device.kind === 'app' || device.kind === 'web'))
@@ -38,7 +103,7 @@ function onlineClientDevices(st) {
 
 function firewallCommand(st) {
   const port = Number(st.port || gatewayPort) || 8787
-  const ip = (st.lanIPs || []).find(value => /^10\.|^192\.168\.|^172\.(1[6-9]|2\d|3[01])\.|^100\.(6[4-9]|[7-9]\d|1[01]\d|12[0-7])\./.test(value || ''))
+  const ip = enabledHostIPs(st).find(value => /^10\.|^192\.168\.|^172\.(1[6-9]|2\d|3[01])\.|^100\.(6[4-9]|[7-9]\d|1[01]\d|12[0-7])\./.test(value || ''))
   let cidr = 'LocalSubnet'
   if (/^10\./.test(ip || '')) cidr = '10.0.0.0/8'
   else if (/^192\.168\./.test(ip || '')) cidr = '192.168.0.0/16'
@@ -52,7 +117,7 @@ function firewallCommand(st) {
 function buildDoctorChecks(st) {
   const isGateway = st.mode === 'gateway'
   const port = Number(st.port || gatewayPort) || 8787
-  const ip = (st.lanIPs || []).find(value => value && value !== '127.0.0.1' && value !== '0.0.0.0')
+  const ip = enabledHostIPs(st).find(value => value && value !== '127.0.0.1' && value !== '0.0.0.0')
   const base = ip ? `http://${ip}:${port}` : ''
   const clients = onlineClientDevices(st)
   const events = st.events || {}
@@ -322,6 +387,7 @@ function render(st) {
   $('btn-qr').classList.toggle('hidden', isGateway !== true || !shownToken)
   $('btn-rotate').classList.toggle('hidden', isGateway !== true || !shownToken || !!st.tokenFromEnv)
   renderDeviceKeys(st, isGateway)
+  renderHostIPs(st)
   renderQr(st)
   renderDoctor(st)
   // 网关开关: 仅插件内嵌页提供, 网关运行/停止两种状态
@@ -356,14 +422,12 @@ function render(st) {
       action.dataset.heroAction = heroState === 'plugin' ? 'start' : heroState === 'offline' ? 'copy' : 'devices'
     }
   }
-  const hostIPs = (st.lanIPs || []).join(t('stat.ipSep')) || '127.0.0.1'
   const latestHtml = st.latest?.newer
     ? `<div class="v">${t('stat.updateAvailable', { version: st.latest.version })}</div><div class="k">${t('stat.currentV', { version: st.version })} · <a href="${st.latest.url || '#'}" target="_blank" rel="noopener" style="color:var(--dsr-accent-strong)">${t('stat.download')}</a></div>`
     : `<div class="v">v${st.version}</div><div class="k">${isPlugin ? t('stat.embedded') : st.latest?.error ? t('stat.updateCheck', { error: st.latest.error }) : st.latest?.version ? t('stat.latest') : t('stat.notChecked')}</div>`
   $('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', { 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>
@@ -424,13 +488,19 @@ function render(st) {
 }
 
 function pairTarget(st, accessToken) {
-  const ip = (st.lanIPs || []).find(x => x && x !== '127.0.0.1' && x !== '0.0.0.0') || (st.lanIPs || [])[0]
-  const host = ip || (st.host && st.host !== '0.0.0.0' ? st.host : location.hostname)
   const port = st.port || 8787
-  const base = `http://${host}:${port}`
+  const hosts = enabledHostIPs(st).slice()
+  if (!hosts.length) {
+    const fallback = st.host && st.host !== '0.0.0.0' ? String(st.host).trim() : location.hostname
+    if (fallback) hosts.push(fallback)
+  }
+  const bases = hosts.map(host => `http://${host}:${port}`)
+  const query = new URLSearchParams({ token: String(accessToken || '') })
+  for (const base of bases) query.append('server', base)
   return {
-    url: `dshremote://pair?token=${encodeURIComponent(accessToken)}&server=${encodeURIComponent(base)}`,
-    base
+    url: `dshremote://pair?${query.toString()}`,
+    base: bases[0] || '',
+    bases
   }
 }
 

package/public/announcements.json

@@ -75,6 +75,39 @@
       "minVersion": "",
       "maxVersion": "",
       "publishedAt": "2026-08-25T00:24:27+08:00"
+    },
+    {
+      "id": "2026-08-26-dsh-local-android-rc1",
+      "title": "dsh-local-android v0.1.0-rc.1 发布公告",
+      "content": "大家好，dsh-local-android 现已发布 v0.1.0-rc.1 测试版本。\n\ndsh-local-android 是 DSH 的 Android 本地发行版，应用名称为 DSH for Android。它将 DSH 运行时、Local Gateway 和交互界面整合到 Android 设备本地运行，适合希望直接在手机或 Android 环境中使用 DSH 的用户。\n\n当前版本支持：\n\n- 在 Android 设备本地运行 DSH；\n- 使用本地 Gateway 和 WebView 界面进行交互；\n- 通过系统文件选择器访问本地文件；\n- 在“设置 → 模型”中配置模型提供方、API 地址、API 密钥和模型目录；\n- 分层显示安装、Engine、Gateway 和界面启动状态，便于排查问题。\n\n本次发布同时提供 arm64-v8a 和 x86_64 架构版本，请根据设备或模拟器的 CPU 架构选择对应 APK。\n\n目前版本仍处于 RC 测试阶段，不同设备、Android 版本和运行环境下可能存在兼容性或稳定性差异。默认运行时采用 minimal profile，部分扩展能力暂未包含。\n\n如果你有在 Android 环境中本地运行 DSH 的需求，欢迎下载尝试，并反馈实际使用体验、设备兼容性和遇到的问题。\n\n提交日志或截图时，请注意隐藏 API 密钥、Token 及其他敏感信息。感谢大家的支持与反馈。",
+      "minVersion": "",
+      "maxVersion": "",
+      "publishedAt": "2026-08-26T18:28:26+08:00",
+      "actionUrl": "https://github.com/Blank-not-black/dsh-local-android/releases",
+      "actionText": "下载 DSH for Android"
+    },
+    {
+      "id": "2026-08-27-meeting-asr-brand-poll",
+      "title": "投票：你的手机品牌是什么？（会议转写调研）",
+      "content": "大家好，我们正在研究为 dsh-Remote 增加会议模式：使用手机录音，调用语音识别生成完整文字，再由 DSH 整理会议纪要、待办事项或指定文件。\n\n第一阶段准备优先验证手机厂商提供的云端语音识别能力，因此先统计大家正在使用的手机品牌。本次投票只用于了解设备分布和安排后续适配顺序，不代表某个品牌已经确认支持，也不会立即改变现有功能。\n\n后续如果需要进一步确认识别能力，我们会在 App 内提供自愿参与的诊断测试，只记录识别服务是否可用、是否返回 partial results、连续识别时长和错误类型，不收集录音、识别文字或 API 密钥。",
+      "minVersion": "0.6.11",
+      "maxVersion": "",
+      "publishedAt": "2026-08-27T12:00:00+08:00",
+      "poll": {
+        "id": "meeting-asr-brand-2026-08",
+        "question": "你的手机品牌是什么？",
+        "options": [
+          { "id": "xiaomi-redmi", "label": "小米 / Redmi" },
+          { "id": "huawei", "label": "华为" },
+          { "id": "honor", "label": "荣耀" },
+          { "id": "oppo-oneplus", "label": "OPPO / 一加" },
+          { "id": "vivo-iqoo", "label": "vivo / iQOO" },
+          { "id": "samsung", "label": "三星" },
+          { "id": "meizu", "label": "魅族" },
+          { "id": "google-pixel", "label": "Google Pixel" },
+          { "id": "other", "label": "其他品牌" }
+        ]
+      }
     }
   ]
 }