dsh-remote-plugin 0.6.8 → 0.6.9

package/index.mjs

@@ -151,7 +151,12 @@ function runExit(cmd, args) {
 const GATEWAY_ENV_KEYS = [
   'TOKEN', 'TOKEN_FILE', 'DSH_REMOTE_TOKEN', 'DSH_REMOTE_FS_ROOT', 'DSH_REMOTE_FS_MAX_UPLOAD',
   'DSH_REMOTE_NOTES', 'DSH_REMOTE_WORKBENCH', 'DSH_REMOTE_DSH_SERVICE', 'DSH_REMOTE_FEEDBACK_URL',
-  'UPDATE_CHECK_URL', 'UPDATE_INTERVAL_MS', 'UPDATE_PROXY', 'GATEWAY_WS_IDLE_MS',
+  'UPDATE_CHECK_URL', 'UPDATE_INTERVAL_MS', 'UPDATE_PROXY', 'DSH_HEALTH_PATH',
+  'GATEWAY_WS_IDLE_MS', 'GATEWAY_WS_PING_MS', 'GATEWAY_WS_PONG_TIMEOUT_MS',
+  'GATEWAY_WS_UPGRADE_TIMEOUT_MS', 'GATEWAY_UPSTREAM_TIMEOUT_MS', 'GATEWAY_EVENT_BUFFER_MAX',
+  'GATEWAY_WS_TICKET_TTL_MS',
+  'GATEWAY_HTTP_REQUEST_TIMEOUT_MS', 'GATEWAY_HTTP_HEADERS_TIMEOUT_MS', 'GATEWAY_HTTP_KEEPALIVE_TIMEOUT_MS',
+  'DSH_REMOTE_CORS_ORIGINS',
   'HTTP_PROXY', 'HTTPS_PROXY', 'ALL_PROXY', 'NO_PROXY',
   'http_proxy', 'https_proxy', 'all_proxy', 'no_proxy'
 ]
@@ -194,6 +199,9 @@ async function gatewayRunning() {
       version: typeof data.version === 'string' ? data.version : '',
       upstream: typeof data.upstream === 'string' ? data.upstream : '',
       upstreamOk: data.upstreamOk === true,
+      upstreamReachable: data.upstreamReachable !== false,
+      upstreamStatus: Number(data.upstreamStatus) || 0,
+      upstreamProbe: typeof data.upstreamProbe === 'string' ? data.upstreamProbe : '',
     }
   } catch {
     return { running: false }
@@ -344,7 +352,9 @@ function ensureGateway() {
       const oldUpstream = health.upstream || ''
       const oldVersion = health.version || '?'
       const versionMismatch = oldVersion !== version
-      if (versionMismatch || health.upstreamOk === false || (oldUpstream && oldUpstream !== upstream) || (!oldUpstream && upstream)) {
+      // 上游暂时不可达不应重启网关: VPN/DSH 重启/短暂网络抖动时，
+      // 重启只能制造额外断线，网关应保持运行并通过 /health 暴露 degraded 状态。
+      if (versionMismatch || (oldUpstream && oldUpstream !== upstream) || (!oldUpstream && upstream)) {
         logGateway(`网关需刷新: 版本 ${oldVersion} -> ${version}, 上游 ${oldUpstream || '?'} -> ${upstream}`)
         await killGateway(health)
         for (let i = 0; i < 10; i++) {

package/package.json

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

package/public/app.js

@@ -11,6 +11,16 @@ const LS = {
   set(k, v) { try { localStorage.setItem(k, v) } catch {} },
   del(k) { try { localStorage.removeItem(k) } catch {} }
 }
+const CLIENT_ID = (() => {
+  try {
+    let id = sessionStorage.getItem('dshRemoteClientId')
+    if (!id) {
+      id = (globalThis.crypto?.randomUUID?.() || `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`)
+      sessionStorage.setItem('dshRemoteClientId', id)
+    }
+    return id
+  } catch { return '' }
+})()
 
 /* 离线缓存: 会话列表 + 每会话聊天记录。只在网络失败时兜底展示, 不会替代线上数据。 */
 const CACHE = {
@@ -37,6 +47,7 @@ function writeHistoryCache(cache) {
 
 const state = {
   token: '',
+  wsTicket: { token: '', server: '', value: '', expiresAt: 0 },
   server: '',             // 当前生效的网关地址, 空 = 同源(浏览器模式)
   servers: [],            // 服务器列表: [{id,url,note,group}]
   groups: ['默认'],       // 组名列表(顺序保留)
@@ -59,6 +70,10 @@ const state = {
   jobs: {},                // sessionId -> jobs
   history: emptyHistory(),
   errCount: 0,
+  streamInfo: {
+    mux: { status: 'idle', lastOpenAt: 0, lastCloseAt: 0, lastCloseCode: 0, lastCloseReason: '' },
+    host: { status: 'idle', lastOpenAt: 0, lastCloseAt: 0, lastCloseCode: 0, lastCloseReason: '' },
+  },
   streamMode: 'ws', // 'ws' | 'poll'
   pollSeq: { mux: 0, host: 0 },
   refreshTimer: null,
@@ -191,6 +206,31 @@ function apiUrl(path) {
   return (state.server || '') + path
 }
 
+let wsTicketPromise = null
+async function getWsTicket() {
+  const now = Date.now()
+  if (state.wsTicket.token === state.token && state.wsTicket.server === state.server &&
+      state.wsTicket.value && state.wsTicket.expiresAt > now + 15000) return state.wsTicket.value
+  if (wsTicketPromise) return wsTicketPromise
+  const token = state.token
+  const server = state.server
+  wsTicketPromise = (async () => {
+    const res = await fetch(apiUrl('/api/ws-ticket'), {
+      method: 'POST',
+      headers: {
+        authorization: 'Bearer ' + token,
+        'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web',
+      }
+    })
+    if (!res.ok) throw new Error('ws ticket HTTP ' + res.status)
+    const data = await res.json()
+    if (!data?.ticket || !Number(data.expiresAt)) throw new Error('invalid ws ticket')
+    state.wsTicket = { token, server, value: data.ticket, expiresAt: Number(data.expiresAt) }
+    return data.ticket
+  })()
+  try { return await wsTicketPromise } finally { wsTicketPromise = null }
+}
+
 function updateBase() {
   const configured = String(state.server || '').replace(/\/+$/, '')
   if (configured) return configured
@@ -738,6 +778,10 @@ function deleteGroup(name) {
 /* ---------------- 事件流 (WebSocket + 轮询降级) ---------------- */
 const streams = {}
 state.streamsOk = { mux: false, host: false }
+const streamMeta = {
+  mux: { generation: 0, attempt: 0, failures: 0, retryTimer: null },
+  host: { generation: 0, attempt: 0, failures: 0, retryTimer: null },
+}
 let pollTimer = null
 let wsRetryTimer = null
 let connTickTimer = null
@@ -745,10 +789,40 @@ let reconnectInfo = null
 
 function clearStreamTimers(ws) {
   if (!ws) return
-  clearInterval(ws._hbTimer)
-  clearInterval(ws._staleTimer)
-  ws._hbTimer = null
-  ws._staleTimer = null
+  if (ws._retryTimer) clearTimeout(ws._retryTimer)
+  ws._retryTimer = null
+}
+
+function streamIsCurrent(kind, ws, generation) {
+  return streams[kind] === ws && streamMeta[kind].generation === generation
+}
+
+function aggregateStreamFailures() {
+  state.errCount = Math.max(streamMeta.mux.failures, streamMeta.host.failures)
+}
+
+function markStreamInfo(kind, patch) {
+  state.streamInfo[kind] = { ...state.streamInfo[kind], ...patch }
+}
+
+function allStreamsOpen() {
+  return streams.mux?.readyState === WebSocket.OPEN && streams.host?.readyState === WebSocket.OPEN
+}
+
+function clearStreamRetry(kind) {
+  const meta = streamMeta[kind]
+  if (meta.retryTimer) clearTimeout(meta.retryTimer)
+  meta.retryTimer = null
+}
+
+function closeStream(kind) {
+  const meta = streamMeta[kind]
+  clearStreamRetry(kind)
+  meta.generation++
+  const ws = streams[kind]
+  streams[kind] = null
+  state.streamsOk[kind] = false
+  try { ws?.close() } catch {}
 }
 
 function clearConnTick() {
@@ -780,15 +854,23 @@ function clearReconnect() {
 
 function openStreams() {
   if (!state.token) return
-  if (state.streamMode === 'poll') stopPolling()
-  state.streamMode = 'ws'
-  clearReconnect()
+  if (state.streamMode !== 'poll') state.streamMode = 'ws'
   openStream('mux', onMuxFrame, true)
   openStream('host', onHostFrame, false)
 }
 
-function openStream(kind, handler, refreshOnOpen, isRestore) {
+function openStream(kind, handler, refreshOnOpen, isRestore, ticket = null) {
   if (!state.token) return
+  if (ticket === null) {
+    const token = state.token
+    void getWsTicket().then((value) => {
+      if (state.token === token) openStream(kind, handler, refreshOnOpen, isRestore, value)
+    }).catch(() => {
+      // 兼容旧网关/插件副本: ticket 接口不可用时临时回退旧 token 握手。
+      if (state.token === token) openStream(kind, handler, refreshOnOpen, isRestore, '')
+    })
+    return
+  }
   let base
   if (state.server) {
     base = state.server.replace(/^http/, 'ws')
@@ -797,31 +879,40 @@ function openStream(kind, handler, refreshOnOpen, isRestore) {
     base = `${proto}//${location.host}`
   }
   const clientMark = CAP?.isNativePlatform?.() ? 'app' : 'web'
-  const ws = new WebSocket(`${base}/api/events.${kind}?token=${encodeURIComponent(state.token)}&client=${clientMark}`)
-  try { streams[kind]?.close() } catch {}
+  const auth = ticket ? `ticket=${encodeURIComponent(ticket)}` : `token=${encodeURIComponent(state.token)}`
+  const clientId = CLIENT_ID ? `&clientId=${encodeURIComponent(CLIENT_ID)}` : ''
+  const streamUrl = `${base}/api/events.${kind}?${auth}&client=${clientMark}${clientId}`
+  const current = streams[kind]
+  if (current?._streamUrl === streamUrl &&
+      (current.readyState === WebSocket.OPEN || current.readyState === WebSocket.CONNECTING)) return
+  if (current && current._streamUrl !== streamUrl) {
+    streamMeta[kind].attempt = 0
+    streamMeta[kind].failures = 0
+    aggregateStreamFailures()
+  }
+  closeStream(kind)
+  const meta = streamMeta[kind]
+  const generation = meta.generation
+  const ws = new WebSocket(streamUrl)
   streams[kind] = ws
-  ws._attempt = 0
-  ws._lastMsgAt = 0
+  ws._streamUrl = streamUrl
+  ws._generation = generation
   ws._isRestore = !!isRestore
   ws.onopen = () => {
+    if (!streamIsCurrent(kind, ws, generation)) return
     state.streamsOk[kind] = true
-    state.errCount = 0
-    ws._attempt = 0
-    ws._lastMsgAt = Date.now()
+    markStreamInfo(kind, { status: 'open', lastOpenAt: Date.now(), lastCloseCode: 0, lastCloseReason: '' })
+    meta.attempt = 0
+    meta.failures = 0
+    aggregateStreamFailures()
     clearStreamTimers(ws)
-    // 应用层心跳: 25s 发纯文本 ping, 防 NAT/WiFi 切换后的 WS 半开假活
-    ws._hbTimer = setInterval(() => {
-      try { if (ws.readyState === WebSocket.OPEN) ws.send('ping') } catch {}
-    }, 25000)
-    // 60s 没有任何消息(含 pong/业务帧)就主动断开, 触发指数退避重连
-    ws._staleTimer = setInterval(() => {
-      if (ws.readyState === WebSocket.OPEN && Date.now() - (ws._lastMsgAt || 0) > 60000) {
-        try { ws.close() } catch {}
-      }
-    }, 10000)
-    // 重连成功：切回 WS 并停止轮询
-    if (state.streamMode === 'poll') { stopPolling(); state.streamMode = 'ws' }
-    if (streams.mux?.readyState === WebSocket.OPEN && streams.host?.readyState === WebSocket.OPEN) clearReconnect()
+    // DSH mux/host 是只下行 WebSocket, 浏览器不能发送应用层 ping。
+    // 网关负责 RFC6455 Ping/Pong, 前端只监听业务帧和 close 事件。
+    if (state.streamMode === 'poll' && allStreamsOpen()) {
+      stopPolling()
+      state.streamMode = 'ws'
+    }
+    if (allStreamsOpen()) clearReconnect()
     updateConn()
     // mux 每次(重)连接都会重放“仍待处理”的审批/提问基线:
     // 先清空旧列表, 避免“桌面已自定义回答, 手机漏收 question/resolved”后永久残留。
@@ -833,9 +924,8 @@ function openStream(kind, handler, refreshOnOpen, isRestore) {
     if (refreshOnOpen) refreshAll()
   }
   ws.onmessage = (msg) => {
-    ws._lastMsgAt = Date.now()
+    if (!streamIsCurrent(kind, ws, generation)) return
     state.streamsOk[kind] = true
-    state.errCount = 0
     updateConn()
     try {
       const full = JSON.parse(msg.data)
@@ -844,33 +934,33 @@ function openStream(kind, handler, refreshOnOpen, isRestore) {
   }
   ws.onclose = () => {
     clearStreamTimers(ws)
+    if (!streamIsCurrent(kind, ws, generation)) return
+    streams[kind] = null
     state.streamsOk[kind] = false
-    state.errCount++
+    markStreamInfo(kind, {
+      status: 'closed',
+      lastCloseAt: Date.now(),
+      lastCloseCode: Number(ws.code) || 0,
+      lastCloseReason: String(ws.reason || ''),
+    })
+    meta.failures++
+    aggregateStreamFailures()
     updateConn()
     if (!navigator.onLine) { clearReconnect(); return }
-    if (state.streamMode === 'poll') {
-      // 降级轮询期间: 恢复尝试失败也用退避, 避免 30s 固定间隔内空转
-      if (ws._isRestore && streams[kind] === ws) {
-        const attempt = ws._attempt || 0
-        ws._attempt = attempt + 1
-        const baseDelay = Math.min(1200 * Math.pow(2, attempt), 30000)
-        const delay = Math.round(baseDelay * (0.8 + Math.random() * 0.4))
-        setTimeout(() => openStream(kind, handler, refreshOnOpen, true), delay)
-      }
-      return
-    }
-    // 连续失败 3 次 -> 降级为轮询
-    if (state.errCount >= 3) { enterPollMode(); return }
+    // 任一通道连续失败 3 次就降级轮询；另一个通道不会清零它的失败计数。
+    if (state.streamMode !== 'poll' && meta.failures >= 3) { enterPollMode(); return }
     // 多服务器: 连续掉线若干次就重测速, 自动换到当前可达的最快地址
-    if (state.servers.length && state.errCount % 5 === 0) setTimeout(() => selectFastestServer({ silent: true }), 300)
-    // 指数退避 + 20% 抖动: min(1200 * 2^attempt, 30000)
-    const attempt = ws._attempt || 0
-    ws._attempt = attempt + 1
-    const baseDelay = Math.min(1200 * Math.pow(2, attempt), 30000)
+    if (state.servers.length && meta.failures % 5 === 0) setTimeout(() => selectFastestServer({ silent: true }), 300)
+    // VPN/跨地域链路使用更宽松的指数退避: 1.5s 起步, 最大 60s, 带 20% 抖动。
+    const attempt = meta.attempt++
+    const baseDelay = Math.min(1500 * Math.pow(2, attempt), 60000)
     const delay = Math.round(baseDelay * (0.8 + Math.random() * 0.4))
     setReconnect(delay)
-    // 页面被挂起时定时器暂停, visibilitychange 会再触发一次
-    if (streams[kind] === ws) setTimeout(() => openStream(kind, handler, refreshOnOpen), delay)
+    clearStreamRetry(kind)
+    meta.retryTimer = setTimeout(() => {
+      meta.retryTimer = null
+      if (state.token && navigator.onLine) openStream(kind, handler, refreshOnOpen, state.streamMode === 'poll')
+    }, delay)
   }
   ws.onerror = () => { try { ws.close() } catch {} }
 }
@@ -881,10 +971,8 @@ function enterPollMode() {
   state.streamMode = 'poll'
   state.pollSeq = { mux: 0, host: 0 }
   state.streamsOk = { mux: false, host: false }
-  try { streams.mux?.close() } catch {}
-  try { streams.host?.close() } catch {}
-  streams.mux = null
-  streams.host = null
+  closeStream('mux')
+  closeStream('host')
   refreshAll()
   startPolling()
   updateConn()
@@ -953,8 +1041,8 @@ async function pollKind(kind) {
 function tryRestoreWs() {
   if (state.streamMode !== 'poll' || !state.token) return
   // 轮询继续跑，等 WS 真正 onopen 后再切回，避免重连窗口丢事件
-  openStream('mux', onMuxFrame, true, true)
-  openStream('host', onHostFrame, false, true)
+  if (!streams.mux && !streamMeta.mux.retryTimer) openStream('mux', onMuxFrame, true, true)
+  if (!streams.host && !streamMeta.host.retryTimer) openStream('host', onHostFrame, false, true)
 }
 
 /* 回前台恢复: 强制重排修复 MIUI WebView 后台切回时 sticky 顶栏不绘制的问题 */
@@ -995,8 +1083,8 @@ setInterval(() => {
 /* 网络感知: 离线立刻关 WS + 显示离线, 在线立即重连 */
 window.addEventListener('offline', () => {
   clearReconnect()
-  try { streams.mux?.close() } catch {}
-  try { streams.host?.close() } catch {}
+  closeStream('mux')
+  closeStream('host')
   if (state.streamMode === 'poll') stopPolling()
   updateConn()
 })

package/public/desktop/desktop.js

@@ -11,6 +11,16 @@ const LS = {
   set(k, v) { try { localStorage.setItem(k, v) } catch {} },
   del(k) { try { localStorage.removeItem(k) } catch {} }
 }
+const CLIENT_ID = (() => {
+  try {
+    let id = sessionStorage.getItem('dshRemoteClientId')
+    if (!id) {
+      id = (globalThis.crypto?.randomUUID?.() || `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`)
+      sessionStorage.setItem('dshRemoteClientId', id)
+    }
+    return id
+  } catch { return '' }
+})()
 const CAP = window.Capacitor || null
 
 /* ---------------- 皮肤 ---------------- */
@@ -40,6 +50,7 @@ themeApply()
 /* ---------------- 状态 ---------------- */
 const state = {
   token: LS.get('token', ''),
+  wsTicket: { token: '', server: '', value: '', expiresAt: 0 },
   server: '',
   servers: [],
   groups: ['默认'],
@@ -59,6 +70,10 @@ const state = {
   questionModal: null,
   streamsOk: { mux: false, host: false },
   errCount: 0,
+  streamInfo: {
+    mux: { status: 'idle', lastOpenAt: 0, lastCloseAt: 0, lastCloseCode: 0, lastCloseReason: '' },
+    host: { status: 'idle', lastOpenAt: 0, lastCloseAt: 0, lastCloseCode: 0, lastCloseReason: '' },
+  },
   streamMode: 'ws', // 'ws' | 'poll'
   pollSeq: { mux: 0, host: 0 },
   fs: { path: null, initial: null, loaded: false },
@@ -499,6 +514,27 @@ function hideTip() { const tip = $('ds-tip'); if (tip) tip.classList.add('hidden
 
 /* ---------------- API ---------------- */
 function apiUrl(path) { return (state.server || '') + path }
+let wsTicketPromise = null
+async function getWsTicket() {
+  const now = Date.now()
+  if (state.wsTicket.token === state.token && state.wsTicket.server === state.server &&
+      state.wsTicket.value && state.wsTicket.expiresAt > now + 15000) return state.wsTicket.value
+  if (wsTicketPromise) return wsTicketPromise
+  const token = state.token
+  const server = state.server
+  wsTicketPromise = (async () => {
+    const res = await fetch(apiUrl('/api/ws-ticket'), {
+      method: 'POST',
+      headers: { authorization: 'Bearer ' + token, 'x-dsh-remote-client': 'web' }
+    })
+    if (!res.ok) throw new Error('ws ticket HTTP ' + res.status)
+    const data = await res.json()
+    if (!data?.ticket || !Number(data.expiresAt)) throw new Error('invalid ws ticket')
+    state.wsTicket = { token, server, value: data.ticket, expiresAt: Number(data.expiresAt) }
+    return data.ticket
+  })()
+  try { return await wsTicketPromise } finally { wsTicketPromise = null }
+}
 async function rpc(method, payload = {}, timeoutMs = 45000) {
   const opts = {
     method: 'POST',
@@ -818,12 +854,47 @@ function deleteGroup(name) {
 }
 
 /* ---------------- 事件流 (WebSocket + 轮询降级) ---------------- */
+const streamMeta = {
+  mux: { generation: 0, attempt: 0, failures: 0, retryTimer: null },
+  host: { generation: 0, attempt: 0, failures: 0, retryTimer: null },
+}
+
 function clearStreamTimers(ws) {
   if (!ws) return
-  clearInterval(ws._hbTimer)
-  clearInterval(ws._staleTimer)
-  ws._hbTimer = null
-  ws._staleTimer = null
+  if (ws._retryTimer) clearTimeout(ws._retryTimer)
+  ws._retryTimer = null
+}
+
+function streamIsCurrent(kind, ws, generation) {
+  return streams[kind] === ws && streamMeta[kind].generation === generation
+}
+
+function aggregateStreamFailures() {
+  state.errCount = Math.max(streamMeta.mux.failures, streamMeta.host.failures)
+}
+
+function markStreamInfo(kind, patch) {
+  state.streamInfo[kind] = { ...state.streamInfo[kind], ...patch }
+}
+
+function allStreamsOpen() {
+  return streams.mux?.readyState === WebSocket.OPEN && streams.host?.readyState === WebSocket.OPEN
+}
+
+function clearStreamRetry(kind) {
+  const meta = streamMeta[kind]
+  if (meta.retryTimer) clearTimeout(meta.retryTimer)
+  meta.retryTimer = null
+}
+
+function closeStream(kind) {
+  const meta = streamMeta[kind]
+  clearStreamRetry(kind)
+  meta.generation++
+  const ws = streams[kind]
+  streams[kind] = null
+  state.streamsOk[kind] = false
+  try { ws?.close() } catch {}
 }
 
 function clearConnTick() {
@@ -855,78 +926,97 @@ function clearReconnect() {
 
 function openStreams() {
   if (!state.token) return
-  if (state.streamMode === 'poll') stopPolling()
-  state.streamMode = 'ws'
-  clearReconnect()
+  if (state.streamMode !== 'poll') state.streamMode = 'ws'
   openStream('mux', onMuxFrame, true)
   openStream('host', onHostFrame, false)
 }
-function openStream(kind, handler, refreshOnOpen, isRestore) {
+function openStream(kind, handler, refreshOnOpen, isRestore, ticket = null) {
   if (!state.token) return
+  if (ticket === null) {
+    const token = state.token
+    void getWsTicket().then((value) => {
+      if (state.token === token) openStream(kind, handler, refreshOnOpen, isRestore, value)
+    }).catch(() => {
+      // 兼容旧网关/插件副本: ticket 接口不可用时临时回退旧 token 握手。
+      if (state.token === token) openStream(kind, handler, refreshOnOpen, isRestore, '')
+    })
+    return
+  }
   let base
   if (state.server) base = state.server.replace(/^http/, 'ws')
   else { const proto = location.protocol === 'https:' ? 'wss:' : 'ws:'; base = `${proto}//${location.host}` }
-  const ws = new WebSocket(`${base}/api/events.${kind}?token=${encodeURIComponent(state.token)}&client=web`)
-  try { streams[kind]?.close() } catch {}
+  const auth = ticket ? `ticket=${encodeURIComponent(ticket)}` : `token=${encodeURIComponent(state.token)}`
+  const clientId = CLIENT_ID ? `&clientId=${encodeURIComponent(CLIENT_ID)}` : ''
+  const streamUrl = `${base}/api/events.${kind}?${auth}&client=web${clientId}`
+  const current = streams[kind]
+  if (current?._streamUrl === streamUrl &&
+      (current.readyState === WebSocket.OPEN || current.readyState === WebSocket.CONNECTING)) return
+  if (current && current._streamUrl !== streamUrl) {
+    streamMeta[kind].attempt = 0
+    streamMeta[kind].failures = 0
+    aggregateStreamFailures()
+  }
+  closeStream(kind)
+  const meta = streamMeta[kind]
+  const generation = meta.generation
+  const ws = new WebSocket(streamUrl)
   streams[kind] = ws
-  ws._attempt = 0
-  ws._lastMsgAt = 0
+  ws._streamUrl = streamUrl
+  ws._generation = generation
   ws._isRestore = !!isRestore
   ws.onopen = () => {
+    if (!streamIsCurrent(kind, ws, generation)) return
     state.streamsOk[kind] = true
-    state.errCount = 0
-    ws._attempt = 0
-    ws._lastMsgAt = Date.now()
+    markStreamInfo(kind, { status: 'open', lastOpenAt: Date.now(), lastCloseCode: 0, lastCloseReason: '' })
+    meta.attempt = 0
+    meta.failures = 0
+    aggregateStreamFailures()
     clearStreamTimers(ws)
-    // 应用层心跳: 25s 发纯文本 ping, 防 NAT/WiFi 切换后的 WS 半开假活
-    ws._hbTimer = setInterval(() => {
-      try { if (ws.readyState === WebSocket.OPEN) ws.send('ping') } catch {}
-    }, 25000)
-    // 60s 没有任何消息(含 pong/业务帧)就主动断开, 触发指数退避重连
-    ws._staleTimer = setInterval(() => {
-      if (ws.readyState === WebSocket.OPEN && Date.now() - (ws._lastMsgAt || 0) > 60000) {
-        try { ws.close() } catch {}
-      }
-    }, 10000)
-    if (state.streamMode === 'poll') { stopPolling(); state.streamMode = 'ws' }
-    if (streams.mux?.readyState === WebSocket.OPEN && streams.host?.readyState === WebSocket.OPEN) clearReconnect()
+    // DSH mux/host 是只下行 WebSocket, 浏览器不能发送应用层 ping。
+    // 网关负责 RFC6455 Ping/Pong, 前端只监听业务帧和 close 事件。
+    if (state.streamMode === 'poll' && allStreamsOpen()) {
+      stopPolling()
+      state.streamMode = 'ws'
+    }
+    if (allStreamsOpen()) clearReconnect()
     updateConn()
     if (kind === 'mux') { state.approvals = []; state.questions = []; renderNotifStack() }
     if (refreshOnOpen) refreshSessions()
   }
   ws.onmessage = (msg) => {
-    ws._lastMsgAt = Date.now()
+    if (!streamIsCurrent(kind, ws, generation)) return
     state.streamsOk[kind] = true
-    state.errCount = 0
     updateConn()
     try { handler(JSON.parse(msg.data)) } catch {}
   }
   ws.onclose = () => {
     clearStreamTimers(ws)
+    if (!streamIsCurrent(kind, ws, generation)) return
+    streams[kind] = null
     state.streamsOk[kind] = false
-    state.errCount++
+    markStreamInfo(kind, {
+      status: 'closed',
+      lastCloseAt: Date.now(),
+      lastCloseCode: Number(ws.code) || 0,
+      lastCloseReason: String(ws.reason || ''),
+    })
+    meta.failures++
+    aggregateStreamFailures()
     updateConn()
     if (!navigator.onLine) { clearReconnect(); return }
-    if (state.streamMode === 'poll') {
-      // 降级轮询期间: 恢复尝试失败也用退避, 避免 30s 固定间隔内空转
-      if (ws._isRestore && streams[kind] === ws) {
-        const attempt = ws._attempt || 0
-        ws._attempt = attempt + 1
-        const baseDelay = Math.min(1200 * Math.pow(2, attempt), 30000)
-        const delay = Math.round(baseDelay * (0.8 + Math.random() * 0.4))
-        setTimeout(() => openStream(kind, handler, refreshOnOpen, true), delay)
-      }
-      return
-    }
-    if (state.errCount >= 3) { enterPollMode(); return }
-    if (state.servers.length && state.errCount % 5 === 0) setTimeout(() => selectFastestServer({ silent: true }), 300)
-    // 指数退避 + 20% 抖动: min(1200 * 2^attempt, 30000)
-    const attempt = ws._attempt || 0
-    ws._attempt = attempt + 1
-    const baseDelay = Math.min(1200 * Math.pow(2, attempt), 30000)
+    // 任一通道连续失败 3 次就降级轮询；另一个通道不会清零它的失败计数。
+    if (state.streamMode !== 'poll' && meta.failures >= 3) { enterPollMode(); return }
+    if (state.servers.length && meta.failures % 5 === 0) setTimeout(() => selectFastestServer({ silent: true }), 300)
+    // VPN/跨地域链路使用更宽松的指数退避: 1.5s 起步, 最大 60s, 带 20% 抖动。
+    const attempt = meta.attempt++
+    const baseDelay = Math.min(1500 * Math.pow(2, attempt), 60000)
     const delay = Math.round(baseDelay * (0.8 + Math.random() * 0.4))
     setReconnect(delay)
-    if (streams[kind] === ws) setTimeout(() => openStream(kind, handler, refreshOnOpen), delay)
+    clearStreamRetry(kind)
+    meta.retryTimer = setTimeout(() => {
+      meta.retryTimer = null
+      if (state.token && navigator.onLine) openStream(kind, handler, refreshOnOpen, state.streamMode === 'poll')
+    }, delay)
   }
   ws.onerror = () => { try { ws.close() } catch {} }
 }
@@ -937,10 +1027,8 @@ function enterPollMode() {
   state.streamMode = 'poll'
   state.pollSeq = { mux: 0, host: 0 }
   state.streamsOk = { mux: false, host: false }
-  try { streams.mux?.close() } catch {}
-  try { streams.host?.close() } catch {}
-  streams.mux = null
-  streams.host = null
+  closeStream('mux')
+  closeStream('host')
   refreshSessions()
   startPolling()
   updateConn()
@@ -1003,15 +1091,15 @@ async function pollKind(kind) {
 function tryRestoreWs() {
   if (state.streamMode !== 'poll' || !state.token) return
   // 轮询继续跑，等 WS 真正 onopen 后再切回，避免重连窗口丢事件
-  openStream('mux', onMuxFrame, true, true)
-  openStream('host', onHostFrame, false, true)
+  if (!streams.mux && !streamMeta.mux.retryTimer) openStream('mux', onMuxFrame, true, true)
+  if (!streams.host && !streamMeta.host.retryTimer) openStream('host', onHostFrame, false, true)
 }
 
 /* 网络感知: 离线立刻关 WS + 显示离线, 在线立即重连 */
 window.addEventListener('offline', () => {
   clearReconnect()
-  try { streams.mux?.close() } catch {}
-  try { streams.host?.close() } catch {}
+  closeStream('mux')
+  closeStream('host')
   if (state.streamMode === 'poll') stopPolling()
   updateConn()
 })

package/public/update.json

@@ -1,10 +1,14 @@
 {
-  "version": "0.6.8",
+  "version": "0.6.9",
   "apkUrl": "dsh-remote.apk",
-  "sha256": "e3f1e98bb3a1c2093182bbfa12c72411613a188d1c822b8c452cbbbe011707ef",
-  "releasedAt": "2026-08-21T17:13:45.607Z",
-  "notes": "0.6.8 正式版：重构手机端、桌面端和插件管理界面；新增工作台、图片附件、历史公告和全屏输入；修复会话布局、系统提示裁切、主题图标对比度与全屏输入高度问题。",
+  "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 收紧与统计旁路优化。",
   "history": [
+    {
+      "version": "0.6.9",
+      "notes": "0.6.9 正式版：全面优化网络连接稳定性，重构网关实时链路与连接管理；修复 downlink-only 心跳断联、网关重启风暴和 WebSocket 状态竞态；新增 VPN 友好 Ping/Pong、集中 mux/host collector、短时 WebSocket ticket、CORS 收紧与统计旁路优化。"
+    },
     {
       "version": "0.6.8",
       "notes": "0.6.8 正式版：重构手机端、桌面端和插件管理界面；新增工作台、图片附件、历史公告和全屏输入；修复会话布局、系统提示裁切、主题图标对比度与全屏输入高度问题。"