dsh-remote-plugin 0.6.9 → 0.6.10

package/gateway.cjs

@@ -797,53 +797,70 @@ function startEventCollector(kind) {
   }
   const connect = () => {
     if (stopped) return
+    let current
     try {
-      ws = new WebSocket(url)
+      current = new WebSocket(url)
+      ws = current
     } catch (err) {
       state.lastError = String(err?.message || err)
+      state.connected = false
+      state.reconnects++
       schedule()
       return
     }
-    const current = ws
+    let finished = false
+    const clearConnectTimer = () => {
+      if (connectTimer) clearTimeout(connectTimer)
+      connectTimer = null
+    }
+    // Node WebSocket 在 CONNECTING 阶段失败时可能只触发 error，
+    // 调用 close() 后不保证再触发 close。每次尝试因此必须有一个
+    // 幂等的收口，任何 error/close/timeout 都只安排一次重连。
+    const finishAndRetry = (closeCode = 0, closeReason = '') => {
+      if (finished) return
+      finished = true
+      clearConnectTimer()
+      state.connected = false
+      state.lastCloseCode = Number(closeCode) || 0
+      state.lastCloseReason = String(closeReason || '')
+      if (ws === current) ws = null
+      if (stopped) return
+      state.reconnects++
+      schedule()
+    }
     connectTimer = setTimeout(() => {
-      if (ws === current && current.readyState === 0) {
+      if (!finished && ws === current && current.readyState === 0) {
         state.lastError = 'websocket connect timeout'
+        finishAndRetry()
         try { current.close() } catch {}
       }
     }, WS_UPGRADE_TIMEOUT_MS)
     connectTimer.unref?.()
-    ws.onopen = () => {
-      if (connectTimer) clearTimeout(connectTimer)
-      connectTimer = null
-      if (state) {
-        state.connected = true
-        state.lastConnectAt = Date.now()
-        state.lastError = ''
-        state.attempt = 0
+    current.onopen = () => {
+      if (finished || ws !== current || stopped) {
+        try { current.close() } catch {}
+        return
       }
-      if (stopped) { try { ws.close() } catch {} }
+      clearConnectTimer()
+      state.connected = true
+      state.lastConnectAt = Date.now()
+      state.lastError = ''
+      state.attempt = 0
     }
-    ws.onmessage = (ev) => {
+    current.onmessage = (ev) => {
       if (stopped) return
       try {
         const data = typeof ev.data === 'string' ? ev.data : Buffer.isBuffer(ev.data) ? ev.data.toString() : String(ev.data)
         pushEvent(kind, JSON.parse(data), data)
       } catch {}
     }
-    ws.onclose = () => {
-      if (connectTimer) clearTimeout(connectTimer)
-      connectTimer = null
-      if (state) {
-        state.connected = false
-        state.reconnects++
-        state.lastCloseCode = Number(current?.closeCode) || 0
-        state.lastCloseReason = String(current?.closeReason || '')
-      }
-      ws = null
-      schedule()
+    current.onclose = (ev) => {
+      finishAndRetry(ev?.code, ev?.reason)
     }
-    ws.onerror = (err) => {
-      if (state) state.lastError = String(err?.message || 'websocket error')
+    current.onerror = (err) => {
+      if (finished) return
+      state.lastError = String(err?.error?.message || err?.message || 'websocket error')
+      finishAndRetry()
       try { current.close() } catch {}
     }
   }
@@ -958,8 +975,9 @@ function serveStats(req, res, url) {
 // ---------- 反馈提交 ----------
 const feedbackThrottle = new Map()   // ip -> 上次受理时间戳
 const FEEDBACK_WINDOW_MS = 60 * 1000
-// 反馈收集器: 环境变量可覆盖, 默认 Tailscale 内网地址
-const FEEDBACK_URL = process.env.DSH_REMOTE_FEEDBACK_URL || 'http://100.84.128.29/submit'
+// 反馈收集器: 环境变量可覆盖, 默认使用 Tailscale Funnel 提供的公网 HTTPS
+// 入口。这里是公开的 ts.net 域名，不要求提交反馈的用户加入 tailnet。
+const FEEDBACK_URL = process.env.DSH_REMOTE_FEEDBACK_URL || 'https://vm-0-2-ubuntu.tail1f6fc4.ts.net/submit'
 
 function maskIp(ip) {
   if (!ip) return 'unknown'
@@ -2193,7 +2211,9 @@ async function serveHealth(res) {
 
 function lanAddresses() {
   const out = []
-  for (const infos of Object.values(os.networkInterfaces())) {
+  let groups
+  try { groups = Object.values(os.networkInterfaces()) } catch { return out }
+  for (const infos of groups) {
     for (const info of infos || []) {
       if (info.family === 'IPv4' && !info.internal) out.push(info.address)
     }

package/index.mjs

@@ -71,7 +71,9 @@ let dshListen = { host: '127.0.0.1', port: 3080 }
 
 function lanIPs() {
   const out = []
-  for (const list of Object.values(networkInterfaces())) {
+  let groups
+  try { groups = Object.values(networkInterfaces()) } catch { return out }
+  for (const list of groups) {
     for (const it of list ?? []) {
       if (it.family === 'IPv4' && !it.internal) out.push(it.address)
     }

package/package.json

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

package/public/announcements.json

@@ -7,6 +7,14 @@
       "minVersion": "0.6.7",
       "maxVersion": "",
       "publishedAt": "2026-08-21T15:00:00+08:00"
+    },
+    {
+      "id": "2026-08-22-0.6.9-progress",
+      "title": "dsh-Remote 0.6.9 更新公告",
+      "content": "各位开发者们下午好呀！在昨天的开发中，我对dsh-Remote的UI和网关部分进行了整体重构，目前的UI相比以往会更加简洁一些，同时网络连接稳定性也得到了增强，同时也吸取了PR中的部分功能，不知道大家使用后感觉体验如何呢？\n\n现在deepseek出了官方多模态模型，dsh的新版本也可以识别图片啦，所以我为app添加了插入图片附件的功能，以便更好地适配新版本。\n\n如果关于插件开发有更多的想法与建议，亦或是遇到了一些bug都可以通过各种渠道进行反馈，不过如果是在github上的话，由于目前版本更新较为频繁，更推荐各位开发者们提交issues进行反馈，提交PR可能由于版本不是最新还需要手动移植。感谢大家的支持与反馈！\n\n（设置中已新增往期公告功能，各位开发者可以查阅往期公告啦！）",
+      "minVersion": "0.6.9",
+      "maxVersion": "",
+      "publishedAt": "2026-08-22T12:00:00+08:00"
     }
   ]
 }

package/public/app.js

@@ -1641,7 +1641,10 @@ function insertLiveEvent(event) {
     h.renderStart = Math.max(0, h.renderEnd - 200)
     renderHistory(false, 'bottom')
   } else {
-    renderHistory(false, 'keep')
+    // 图片异步撑高历史区后，用户可能瞬间不再满足 nearBottom。新回复仍须
+    // 扩展可见窗口，但保持当前阅读位置，不能等到重新进入会话才出现。
+    h.renderEnd = h.visible.length
+    renderHistory(false, 'fixed')
   }
   scheduleHistoryCacheSave()
 }
@@ -1684,6 +1687,7 @@ function renderHistory(reset, mode = 'bottom') {
   box.innerHTML = filtered.slice(start, end).map(e => eventHtml(e, { toolNames })).join('')
   if (reset || mode === 'bottom') box.scrollTop = box.scrollHeight
   else if (mode === 'keep') box.scrollTop = Math.max(0, oldTop + (box.scrollHeight - oldH))
+  else if (mode === 'fixed') box.scrollTop = oldTop
   updateRail()
 }
 
@@ -1856,8 +1860,11 @@ function statsHtml(s) {
   return html || '<div class="empty">' + t('stats.empty') + '</div>'
 }
 
+let sessionCardsRenderGeneration = 0
 async function renderSessionCards() {
-  const s = state.byId.get(state.current)
+  const renderGeneration = ++sessionCardsRenderGeneration
+  const sessionId = state.current
+  const s = state.byId.get(sessionId)
   const box = $('session-cards')
   const statsBox = $('stats-body')
   if (!s) { box.innerHTML = ''; if (statsBox) statsBox.innerHTML = ''; return }
@@ -1888,7 +1895,8 @@ async function renderSessionCards() {
     btn.addEventListener('click', () => goalAction(btn.dataset.goal)))
 
   // 子代理
-  const sub = await safeRpc('subagent.list', { parentSessionId: state.current })
+  const sub = await safeRpc('subagent.list', { parentSessionId: sessionId })
+  if (renderGeneration !== sessionCardsRenderGeneration || state.current !== sessionId) return
   if (sub?.entries?.length) {
     const rows = sub.entries.map(e => {
       if (e.kind === 'diagnostic') return `<div class="card-row"><span class="k">${t('subagent.diagnostic')}</span><span class="v">${esc(e.reason)}</span></div>`
@@ -2326,7 +2334,9 @@ function renderOverview() {
   const ring = $('overview-pulse-ring')
   if (!ring) return
   const checks = {
-    gateway: !!state.token && !!state.server,
+    // 独立网关页面默认走同源，此时 state.server 合法地为空；不能因此把
+    // 已连接网关误报为离线。Capacitor 等非 HTTP 页面仍要求显式服务器。
+    gateway: !!state.token && (!!state.server || /^https?:$/.test(location.protocol)),
     dsh: !!state.hostInfo,
     mux: !!state.streamsOk?.mux,
     host: !!state.streamsOk?.host
@@ -3633,6 +3643,9 @@ function showSettingsPage(name) {
 
 function updateConn() {
   const el = $('conn-badge')
+  // mux/host 的打开顺序不稳定；连接状态改变时同步重绘总览，避免后打开的
+  // 通道只更新顶栏、总览却永久停留在 3/4。
+  renderOverview()
   const cur = state.servers.find(s => s.url === state.server)
   const ms = state.serverLatency[state.server]
   const curGroup = cur ? cur.group : state.activeGroup

package/public/desktop/desktop.js

@@ -1378,9 +1378,12 @@ function renderHistory() {
 }
 
 /* ---------------- 会话信息卡（goal / todo / 子代理） ---------------- */
+let sessionCardsRenderGeneration = 0
 async function renderSessionCards() {
+  const renderGeneration = ++sessionCardsRenderGeneration
+  const sessionId = state.current
   const box = $('session-cards')
-  const s = state.byId.get(state.current)
+  const s = state.byId.get(sessionId)
   if (!box) return
   if (!s) { box.innerHTML = ''; return }
   const goal = goalOf(s)
@@ -1406,7 +1409,8 @@ async function renderSessionCards() {
   box.querySelectorAll('[data-goal]').forEach(btn =>
     btn.addEventListener('click', () => goalAction(btn.dataset.goal)))
 
-  const sub = await safeRpc('subagent.list', { parentSessionId: state.current }, '')
+  const sub = await safeRpc('subagent.list', { parentSessionId: sessionId }, '')
+  if (renderGeneration !== sessionCardsRenderGeneration || state.current !== sessionId) return
   if (sub?.entries?.length) {
     const rows = sub.entries.map(e => {
       if (e.kind === 'diagnostic') return `<div class="ds-card-row"><span class="ds-card-k">${t('subagent.diagnostic')}</span><span class="ds-card-v">${esc(e.reason)}</span></div>`
@@ -2011,7 +2015,8 @@ function renderOverviewDesktop() {
   const ring = $('ds-overview-pulse-ring')
   if (!ring) return
   const checks = {
-    gateway: !!state.token && !!state.server,
+    // 桌面独立页面默认使用当前 origin，state.server 为空不代表网关离线。
+    gateway: !!state.token && (!!state.server || /^https?:$/.test(location.protocol)),
     dsh: !!state.hostInfo,
     mux: !!state.streamsOk?.mux,
     host: !!state.streamsOk?.host
@@ -2119,6 +2124,8 @@ function showSettingsPage(name) {
 }
 function updateConn() {
   const el = $('conn-badge')
+  // 双实时通道可能按任意顺序打开，连接刷新必须同时刷新系统总览。
+  renderOverviewDesktop()
   const cur = state.servers.find(s => s.url === state.server)
   const group = cur ? cur.group : state.activeGroup
   const label = cur ? (cur.note || cur.url) : (state.server || t('ds.origin'))

package/public/update.json

@@ -1,10 +1,14 @@
 {
-  "version": "0.6.9",
+  "version": "0.6.10",
   "apkUrl": "dsh-remote.apk",
-  "sha256": "b8d869a6a6840261bc511005e4c86e3a2853df15f29ee33406e5c9e1f21f5796",
-  "releasedAt": "2026-08-21T19:36:51.824Z",
-  "notes": "0.6.9 正式版：全面优化网络连接稳定性，重构网关实时链路与连接管理；修复 downlink-only 心跳断联、网关重启风暴和 WebSocket 状态竞态；新增 VPN 友好 Ping/Pong、集中 mux/host collector、短时 WebSocket ticket、CORS 收紧与统计旁路优化。",
+  "sha256": "1aa45a7edcadbbfc5285d30308e6abf2fac7c7eaaf4ad6cf831df1a06a4f48b9",
+  "releasedAt": "2026-08-23T08:13:20.716Z",
+  "notes": "0.6.10 正式版：修复 DSH/网关重启后事件通道不自动恢复、启动阶段网卡读取异常、同源状态误报、双通道总览卡在 3/4、图片后实时回复不可见及子代理重复；新增完整用户链路与重启生命周期测试；公网反馈切换到安全的 HTTPS 临时入口并加强来源 IP 防伪造、节流与隐私保护。",
   "history": [
+    {
+      "version": "0.6.10",
+      "notes": "0.6.10 正式版：修复 DSH/网关重启后事件通道不自动恢复、启动阶段网卡读取异常、同源状态误报、双通道总览卡在 3/4、图片后实时回复不可见及子代理重复；新增完整用户链路与重启生命周期测试；公网反馈切换到安全的 HTTPS 临时入口并加强来源 IP 防伪造、节流与隐私保护。"
+    },
     {
       "version": "0.6.9",
       "notes": "0.6.9 正式版：全面优化网络连接稳定性，重构网关实时链路与连接管理；修复 downlink-only 心跳断联、网关重启风暴和 WebSocket 状态竞态；新增 VPN 友好 Ping/Pong、集中 mux/host collector、短时 WebSocket ticket、CORS 收紧与统计旁路优化。"

package/public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.6.9"
+  "version": "0.6.10"
 }