dsh-remote-plugin 0.6.15 → 0.6.17

package/public/admin.js

@@ -18,6 +18,13 @@ const store = {
   del(k) { try { localStorage.removeItem(k) } catch {} }
 }
 let token = store.get('dshAdminToken') || new URLSearchParams(location.search).get('token') || ''
+function adminHeaders(extra = {}, accessToken = token) {
+  const headers = { 'x-dsh-remote-client': 'admin', ...extra }
+  // /remote/* 可能由 Caddy Basic Auth 保护。插件路由自身已在 DSH 登录态内，
+  // 这里不能再写 Authorization: Bearer，否则会覆盖浏览器的 Basic 凭据并形成 401 循环。
+  if (!pluginMode && accessToken) headers.authorization = 'Bearer ' + accessToken
+  return headers
+}
 let timer = null
 let gatewayRunning = false
 let gatewayBusy = false
@@ -31,6 +38,132 @@ let gatewayPort = 8787
 let gatewayPortLoaded = false
 let doctorExpanded = store.get('dshAdminDoctorCollapsed') !== '1'
 let doctorChecks = []
+const HOST_IP_SELECTION_KEY = 'dshAdminEnabledHostIPsV1'
+const MANUAL_HOST_IP_KEY = 'dshAdminManualHostIPsV1'
+
+function normalizedHostIPs(st) {
+  const detected = Array.isArray(st?.lanIPs) ? st.lanIPs : []
+  return [...new Set([...detected, ...manualHostIPs(st)].map(validManualHost).filter(Boolean))]
+}
+
+function validManualHost(value) {
+  const host = String(value || '').trim()
+  if (!host || host.length > 253 || host === '0.0.0.0' || host === '127.0.0.1') return ''
+  if (!/^[A-Za-z0-9.-]+$/.test(host) || host.startsWith('.') || host.endsWith('.') || host.includes('..')) return ''
+  if (/^\d+(?:\.\d+){3}$/.test(host) && host.split('.').some(part => Number(part) > 255)) return ''
+  const labels = host.split('.')
+  if (labels.some(label => !label || label.length > 63 || label.startsWith('-') || label.endsWith('-'))) return ''
+  return host
+}
+
+function hostIPScope(st) {
+  return [st?.hostname || location.hostname || 'host', st?.host || ''].join('|')
+}
+
+function manualHostIPScope(st) {
+  return st?.hostname || location.hostname || 'host'
+}
+
+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 manualHostPreferences() {
+  try {
+    const value = JSON.parse(store.get(MANUAL_HOST_IP_KEY) || '{}')
+    return value && typeof value === 'object' && !Array.isArray(value) ? value : {}
+  } catch {
+    return {}
+  }
+}
+
+function manualHostIPs(st) {
+  const values = manualHostPreferences()[manualHostIPScope(st)]
+  return Array.isArray(values) ? [...new Set(values.map(validManualHost).filter(Boolean))] : []
+}
+
+function saveManualHostIPs(st, values) {
+  const prefs = manualHostPreferences()
+  prefs[manualHostIPScope(st)] = [...new Set(values.map(validManualHost).filter(Boolean))]
+  store.set(MANUAL_HOST_IP_KEY, JSON.stringify(prefs))
+}
+
+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 addManualHostIP() {
+  if (!lastState) return
+  const input = prompt(t('hostIPs.addPrompt'), '')
+  if (input === null) return
+  const host = validManualHost(input)
+  if (!host) {
+    toast(t('hostIPs.invalid'), 'err')
+    return
+  }
+  if (normalizedHostIPs(lastState).includes(host)) {
+    toast(t('hostIPs.exists'), 'err')
+    return
+  }
+  saveManualHostIPs(lastState, [...manualHostIPs(lastState), host])
+  saveEnabledHostIPs(lastState, [...enabledHostIPs(lastState), host])
+  render(lastState)
+}
+
+function removeManualHostIP(st, host) {
+  saveManualHostIPs(st, manualHostIPs(st).filter(value => value !== host))
+  render(st)
+}
+
+function renderHostIPs(st) {
+  const all = normalizedHostIPs(st)
+  const selected = enabledHostIPs(st)
+  const manual = new Set(manualHostIPs(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'))}${manual.has(ip) ? ` <button class="mini-btn host-ip-remove" type="button" data-host-ip-remove="${esc(ip)}">${esc(t('hostIPs.remove'))}</button>` : ''}</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)
+  }))
+  rows.querySelectorAll('[data-host-ip-remove]').forEach(button => button.addEventListener('click', () => {
+    removeManualHostIP(st, button.dataset.hostIpRemove)
+  }))
+}
 
 function onlineClientDevices(st) {
   return (st.devices || []).filter(device => device.online && (device.kind === 'app' || device.kind === 'web'))
@@ -38,7 +171,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 +185,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 || {}
@@ -118,7 +251,7 @@ async function loadStats() {
   if (!token && !pluginMode) return
   try {
     const res = await fetch(`${STATS_API}/summary?days=7`, {
-      headers: { authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'admin' }
+      headers: adminHeaders(), credentials: 'same-origin'
     })
     if (!res.ok) {
       if (res.status === 401) return
@@ -139,7 +272,7 @@ async function loadGatewayConfig() {
   if (!pluginMode) return
   try {
     const res = await fetch(`${API}/config`, {
-      headers: { authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'admin' }
+      headers: adminHeaders(), credentials: 'same-origin'
     })
     const out = await res.json().catch(() => ({}))
     if (out.ok) {
@@ -290,15 +423,19 @@ async function loadState() {
   if (!token && !pluginMode) return
   try {
     const res = await fetch(`${API}/state`, {
-      headers: { authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'admin' }
+      headers: adminHeaders(), credentials: 'same-origin'
     })
-    if (res.status === 401) throw new Error('AUTH')
+    if (res.status === 401) throw new Error(pluginMode ? 'AUTH_LAYER' : 'AUTH')
+    if (pluginMode && !String(res.headers.get('content-type') || '').includes('application/json')) throw new Error('AUTH_LAYER')
     const st = await res.json()
     render(st)
   } catch (e) {
     if (e.message === 'AUTH') {
       toast(t('toast.tokenInvalid'), 'err')
       logout()
+    } else if (e.message === 'AUTH_LAYER') {
+      $('conn-badge').textContent = t('toast.authLayer')
+      $('conn-badge').className = 'conn-badge off'
     } else {
       $('conn-badge').textContent = t('toast.connFailed')
       $('conn-badge').className = 'conn-badge off'
@@ -322,6 +459,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 +494,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 +560,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
   }
 }
 
@@ -460,7 +602,7 @@ async function setNote(ip, current) {
   if (name === null) return
   const res = await fetch(`${API}/note`, {
     method: 'POST',
-    headers: { 'content-type': 'application/json', authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'admin' },
+    headers: adminHeaders({ 'content-type': 'application/json' }), credentials: 'same-origin',
     body: JSON.stringify({ ip, name })
   })
   if (res.ok) {
@@ -475,7 +617,7 @@ async function kick(ip) {
   if (!confirm(t('confirm.kick'))) return
   const res = await fetch(`${API}/kick`, {
     method: 'POST',
-    headers: { 'content-type': 'application/json', authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'admin' },
+    headers: adminHeaders({ 'content-type': 'application/json' }), credentials: 'same-origin',
     body: JSON.stringify({ ip })
   })
   if (res.ok) {
@@ -493,7 +635,7 @@ async function deviceKeyMutation(action, payload = {}) {
   try {
     const res = await fetch(`${API}/device-keys/${action}`, {
       method: 'POST',
-      headers: { 'content-type': 'application/json', authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'admin' },
+      headers: adminHeaders({ 'content-type': 'application/json' }), credentials: 'same-origin',
       body: JSON.stringify(payload),
     })
     const out = await res.json().catch(() => ({}))
@@ -685,6 +827,8 @@ $('btn-qr').addEventListener('click', () => {
   renderQr(lastState || { mode: '', token: shownToken })
 })
 
+$('btn-host-ip-add').addEventListener('click', addManualHostIP)
+
 /* 右上角「网关」徽章: 新标签页打开独立网关管理面板(带 token 免登录) */
 $('conn-badge').addEventListener('click', () => {
   const st = lastState
@@ -704,7 +848,7 @@ $('btn-rotate').addEventListener('click', async () => {
   try {
     const res = await fetch(`${API}/token/rotate`, {
       method: 'POST',
-      headers: { authorization: 'Bearer ' + (token || shownToken), 'x-dsh-remote-client': 'admin' }
+      headers: adminHeaders({}, token || shownToken), credentials: 'same-origin'
     })
     const out = await res.json().catch(() => ({}))
     if (out.ok && out.token) {
@@ -729,7 +873,7 @@ $('btn-gateway').addEventListener('click', async () => {
   try {
     const res = await fetch(`${API}/gateway`, {
       method: 'POST',
-      headers: { 'content-type': 'application/json', authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'admin' },
+      headers: adminHeaders({ 'content-type': 'application/json' }), credentials: 'same-origin',
       body: JSON.stringify({ action: gatewayRunning ? 'stop' : 'start' })
     })
     const out = await res.json().catch(() => ({}))
@@ -759,7 +903,7 @@ $('btn-save-port').addEventListener('click', async () => {
   try {
     const res = await fetch(`${API}/config`, {
       method: 'PUT',
-      headers: { 'content-type': 'application/json', authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'admin' },
+      headers: adminHeaders({ 'content-type': 'application/json' }), credentials: 'same-origin',
       body: JSON.stringify({ port })
     })
     const out = await res.json().catch(() => ({}))

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": "其他品牌" }
+        ]
+      }
     }
   ]
 }