dsh-mesh-ui 0.0.5 → 0.0.7

package/lib/client.js

@@ -677,7 +677,7 @@ body.light .dm-edge-label { stroke: rgba(255,255,255,.92); }
             h('span', null, '⋯')
           )
         ),
-        h('div', { className: 'dm-hint' }, '拓扑 v17 · 内容 ' + Math.round(layout.W) + '×' + Math.round(layout.H) + 'px · 卡 ' + Math.round(layout.cardW) + '×' + Math.round(layout.cardH) + ' · 缩放 ' + Math.round(view.scale * 100) + '% · 滚轮缩放 / 拖拽平移')
+        h('div', { className: 'dm-hint' }, '拓扑 v19 · 内容 ' + Math.round(layout.W) + '×' + Math.round(layout.H) + 'px · 卡 ' + Math.round(layout.cardW) + '×' + Math.round(layout.cardH) + ' · 缩放 ' + Math.round(view.scale * 100) + '% · 滚轮缩放 / 拖拽平移')
       )
     }
 
@@ -835,9 +835,11 @@ function sakuraTunnelOf(data, devKey) {
 function deviceLinkState(data, peer, lanMap) {
   var dk = peerDeviceKey(peer.name)
   var t = peer.tunnel || {}
-  var publicUp = Boolean(peer.up)
+  // 2026-11-10：蓝线状态以隧道端口 TCP 探测为准（HTTP /health 对高延迟节点会误判断连）
+  var probe = t.probe && typeof t.probe.up === "boolean" ? t.probe : null
+  var publicUp = (probe ? probe.up === true : false) || Boolean(peer.up)
   var lan = lanMap ? lanMap[dk] : (t.kind === 'lan' ? { up: Boolean(peer.up), host: t.host, port: t.port, ip: t.ip || '' } : null)
-  var lanUp = Boolean(lan && lan.up)
+  var lanUp = Boolean(lan && (lan.probe && lan.probe.up === true ? true : lan.up))
   var st = sakuraTunnelOf(data, dk)
   var sakuraUp = st ? st.online === true : null
   var anyUp = publicUp || sakuraUp === true || lanUp
@@ -858,7 +860,7 @@ function deviceLinkState(data, peer, lanMap) {
       var localKey = peerDeviceKey(data.nodeName)
       var devs = [{ devKey: localKey, name: nodeDisplay(data.nodeName) + "（本机）", up: true, port: localPort, host: localHost }].concat(peers.filter(function (p) { return !isLanPeer(p) }).map(function (p) {
         var tu = p.tunnel || {}
-        return { devKey: peerDeviceKey(p.name), name: nodeDisplay(peerDeviceKey(p.name)), up: Boolean(p.up), port: tu.port || null, host: tu.host || 'relay.example.com' }
+        return { devKey: peerDeviceKey(p.name), name: nodeDisplay(peerDeviceKey(p.name)), up: (tu.probe ? Boolean(tu.probe.up) : Boolean(p.up)), port: tu.port || null, host: tu.host || 'relay.example.com' }
       }))
       var aliyunRows = devs.filter(function (d) { return d.port }).map(function (d) {
         return h('div', { key: d.devKey, className: 'dm-device-row' },
@@ -997,7 +999,7 @@ function deviceLinkState(data, peer, lanMap) {
   var lanMap = {}
   filterSelfPeers(data.peers || [], data.nodeName).forEach(function (p) {
     var t = p.tunnel || {}
-    if (isLanPeer(p)) lanMap[peerDeviceKey(p.name)] = { up: Boolean(p.up), host: t.host, port: t.port, ip: t.ip || '' }
+    if (isLanPeer(p)) lanMap[peerDeviceKey(p.name)] = { up: Boolean(p.up), host: t.host, port: t.port, ip: t.ip || '', probe: t.probe || null }
   })
   var nodes = [{
     key: 'local',
@@ -1254,22 +1256,55 @@ function deviceLinkState(data, peer, lanMap) {
         var p = String(d.path || '').replace(/[\\/]+$/, '')
         return (d.freeGB != null ? d.freeGB : '?') + ' / ' + d.totalGB + ' GB' + (p ? ' (' + p + ')' : '')
       }
+      // 设备类型：按平台/CPU 形态泛化推断（不依赖任何个人设备表）
+      function formFactorOf(h) {
+        if (!h) return '—'
+        if (h.platform === 'linux' && String(h.arch || '').indexOf('arm') === 0) return '手机'
+        var cpu = String(h.cpuModel || '')
+        return cpu ? '主机' : '—'
+      }
+      function memTextOf(h) {
+        return h && h.memTotalGB ? ((h.memFreeGB != null ? h.memFreeGB : '?') + ' / ' + h.memTotalGB + ' GB') : '—'
+      }
+      function cpuTextOf(h) {
+        return h && h.cpuModel ? h.cpuModel + ' · ' + (h.cpuCores || '?') + ' 线程' : '—'
+      }
+      function ipKindOf(peer) {
+        var t = peer.tunnel || {}
+        if (t.kind === 'loopback') return '本机回环'
+        if (t.kind === 'lan') return '局域网直连'
+        if (t.kind === 'frp') return '公网穿透（域名）'
+        if (t.kind === 'wan') return relayHosts[String(t.host || '').toLowerCase()] ? '公网（共享中转）' : '公网 IP 直连'
+        return '—'
+      }
+      function relayKindOf(peer) {
+        var t = peer.tunnel || {}
+        if (t.kind === 'loopback') return '无（本机回环）'
+        if (t.kind === 'lan') return '无（局域网直连）'
+        if (t.kind === 'frp') return 'Sakura / 第三方 frp 穿透'
+        if (t.kind === 'wan') return relayHosts[String(t.host || '').toLowerCase()] ? '自建公网中继（frps）' : '公网 IP 直连'
+        return '—'
+      }
+      function dshVerOf(peer) {
+        var v = peer.version ? 'v' + peer.version : '—'
+        if (peer.plugin) v += ' · 插件 ' + peer.plugin
+        return v
+      }
 
       var devices = [{
         key: 'local',
         name: nodeDisplay(data.nodeName) + '（本机）',
         up: Boolean(endpoint.up),
         rows: [
+          ['设备类型', formFactorOf(hw)],
           ['操作系统', hw.os || '—'],
-          ['CPU', cpuText],
-          ['内存', memText],
+          ['内存', memTextOf(hw)],
           ['磁盘', diskText(hw.disk)],
-          ['DSH 实例', localUp + '/' + instances.length + ' 在线'],
-          ['会话 / 运行', sessions + ' / ' + running],
-          ['模型', model],
-          ...localTunnelRows,
-          ['端点', (endpoint.pid != null ? 'pid ' + endpoint.pid : '—') + ' · tools ' + (endpoint.tools != null ? endpoint.tools : '—') + ' · mesh ' + (data.meshVersion || '?')],
-          ['检测时间', clockText(data.at)]
+          ['CPU', cpuTextOf(hw)],
+          ['DSH 版本', data.meshVersion ? 'v' + data.meshVersion : '—'],
+          ['IP 类型', '本机回环'],
+          ['端口号', localTunnel.port != null ? String(localTunnel.port) : '—'],
+          ['公网穿透类型', mainSrc === 'self-hosted' ? '自建 frps 中继（主用）' : (mainSrc === 'sakura' ? 'Sakura 穿透（备用）' : '无（仅局域网）')]
         ]
       }].concat(peers.map(function (peer) {
         var t = peer.tunnel || {}
@@ -1279,18 +1314,15 @@ function deviceLinkState(data, peer, lanMap) {
           name: nodeDisplay(peerDeviceKey(peer.name)),
           up: Boolean(peer.up),
           rows: [
+            ['设备类型', formFactorOf(hwp)],
             ['操作系统', hwp.os || peer.os || '—'],
-            ['CPU', hwp.cpuModel ? hwp.cpuModel + ' · ' + (hwp.cpuCores || '?') + ' 线程' : '—'],
-            ['内存', hwp.memTotalGB ? ((hwp.memFreeGB != null ? hwp.memFreeGB : '?') + ' / ' + hwp.memTotalGB + ' GB') : '—'],
+            ['内存', memTextOf(hwp)],
             ['磁盘', diskText(hwp.disk)],
-            ['运行时长', uptimeText(peer.uptimeSec)],
-            ['DSH 实例', (peer.instancesCount || 0) + ' 个（' + ((peer.instancesList || []).map(function (x) { return x.port + (x.up ? '✓' : '✗') }).join(' ') || '—') + '）'],
-            ['会话 / 运行', (peer.sessions || 0) + ' / ' + (peer.running || 0)],
-            ['任务（进行中）', peer.tasksActive == null ? '—' : String(peer.tasksActive)],
-            ['入口', t.host ? t.host + (t.port ? ':' + t.port : '') : '—'],
-            ['链路', commLabel(peer, relayHosts).text + ' · ' + (peer.up ? (peer.latencyMs == null ? '—' : peer.latencyMs + 'ms') : '离线') + ' · ' + (peer.tls ? 'TLS ✓' : 'TLS ✗') + ' · v' + (peer.version || '?')],
-            ['节点 pid / tools', (peer.nodePid == null ? '—' : peer.nodePid) + ' / ' + (peer.nodeTools == null ? '—' : peer.nodeTools)],
-            ['检测时间', clockText(peer.detectedAt || data.at)]
+            ['CPU', cpuTextOf(hwp)],
+            ['DSH 版本', dshVerOf(peer)],
+            ['IP 类型', ipKindOf(peer)],
+            ['端口号', t.port ? String(t.port) : '—'],
+            ['公网穿透类型', relayKindOf(peer)]
           ]
         }
       }))
@@ -1388,17 +1420,62 @@ function deviceLinkState(data, peer, lanMap) {
       var s2 = useState(''); var error = s2[0]; var setError = s2[1]
       var s3 = useState(0); var tick = s3[0]; var setTick = s3[1]
       var s4 = useState(''); var copied = s4[0]; var setCopied = s4[1]
+      // 2026-11-10：真刷新 —— 点击后等待后台采集完成再渲染；本地冷却 + 忙锁防止连点刷爆请求
+      var s6 = useState(""); var refreshHint = s6[0]; var setRefreshHint = s6[1]
+      var forceRef = useRef({ at: 0, busy: false })
       var s5 = useState('local'); var selectedKey = s5[0]; var setSelectedKey = s5[1]
 
       function load(force) {
+        if (!force) {
+          setLoading(true)
+          fetchStatus(false)
+            .then(function (json) {
+              setData(json)
+              setError(json && json.ok === false && !json.warming ? json.error || "mesh-health error" : "")
+            })
+            .catch(function (err) { setError(String((err && err.message) || err)) })
+            .finally(function () { setLoading(false) })
+          return
+        }
+        var st = forceRef.current
+        var now = Date.now()
+        if (st.busy) return
+        if (now - st.at < 8000) {
+          var waitSec = Math.ceil((8000 - (now - st.at)) / 1000)
+          setRefreshHint("刚采集过，" + waitSec + "s 后可再刷新")
+          setTimeout(function () { setRefreshHint("") }, 2200)
+          return
+        }
+        st.busy = true
+        st.at = now
         setLoading(true)
-        fetchStatus(Boolean(force))
-          .then(function (json) {
-            setData(json)
-            setError(json && json.ok === false && !json.warming ? json.error || 'mesh-health error' : '')
+        setRefreshHint("采集中…")
+        var prevAt = data && data.at
+        var attempts = 0
+        function poll() {
+          attempts++
+          fetchStatus(false).then(function (json) {
+            var fresh = json && json.refreshing === false && json.at && json.at !== prevAt
+            if (fresh || attempts >= 15) {
+              setData(json)
+              setError(json && json.ok === false && !json.warming ? json.error || "mesh-health error" : "")
+              setLoading(false)
+              st.busy = false
+              setRefreshHint(fresh ? "已刷新" : "无新数据（采集超时）")
+              setTimeout(function () { setRefreshHint("") }, 2000)
+              return
+            }
+            setTimeout(poll, 800)
+          }).catch(function () {
+            st.busy = false
+            setLoading(false)
+            setRefreshHint("刷新失败")
+            setTimeout(function () { setRefreshHint("") }, 2500)
           })
-          .catch(function (err) { setError(String((err && err.message) || err)) })
-          .finally(function () { setLoading(false) })
+        }
+        fetchStatus(true)
+          .catch(function () { /* continue polling */ })
+          .then(function () { setTimeout(poll, 500) })
       }
 
       useEffect(function () {
@@ -1407,7 +1484,7 @@ function deviceLinkState(data, peer, lanMap) {
         return function () { clearInterval(timer) }
       }, [])
 
-      useEffect(function () { if (tick > 0) load(false) }, [tick])
+      useEffect(function () { if (tick > 0 && !forceRef.current.busy) load(false) }, [tick])
 
       function copyJson() {
         var text = JSON.stringify(data || {}, null, 2)
@@ -1438,7 +1515,8 @@ function deviceLinkState(data, peer, lanMap) {
           h('span', { style: { flex: 1 } }),
           h('a', { className: 'dm-btn', href: API, target: '_blank', rel: 'noreferrer', style: { textDecoration: 'none' } }, '原始 JSON'),
           h('button', { className: 'dm-btn', onClick: copyJson }, copied || '复制诊断'),
-          h('button', { className: 'dm-btn primary', onClick: function () { load(true) } }, loading ? '刷新中…' : '刷新')
+          h('button', { className: 'dm-btn primary', onClick: function () { load(true) }, title: '立即采集一次并等待新快照（8s 冷却）' }, loading ? '采集中…' : '刷新'),
+          refreshHint ? h('span', { className: 'dm-sub' }, refreshHint) : null
         ),
         error ? h('div', { className: 'dm-err' }, error) : null,
 

package/lib/collect.js

@@ -16,6 +16,7 @@
 import { execFile } from 'node:child_process'
 import { existsSync, readdirSync, readFileSync, statfsSync, writeFileSync } from 'node:fs'
 import { lookup as dnsLookup } from 'node:dns/promises'
+import { connect as netConnect } from 'node:net'
 import { arch as osArch, cpus as osCpus, freemem as osFreemem, homedir, platform as osPlatform, release as osRelease, totalmem as osTotalmem } from 'node:os'
 import { join } from 'node:path'
 
@@ -505,6 +506,36 @@ export async function collect(repo) {
     } catch { /* 解析失败则保持主机名 */ }
   }))
 
+  // 2026-11-10：为每条 peer 隧道做 TCP 端口探测（阿里云 701x / LAN 8124），面板连线状态以此为准，
+  // 而不是用 peer.up（HTTP /health 探测，高延迟节点偶发超时会造成"隧道通却显示断连"的误判）
+  function tcpProbe(host, port, timeoutMs) {
+    return new Promise((resolve) => {
+      const started = Date.now()
+      let done = false
+      const socket = netConnect({ host, port })
+      const finish = (up, error) => {
+        if (done) return
+        done = true
+        try { socket.destroy() } catch { /* ignore */ }
+        resolve({ up, latencyMs: Date.now() - started, error: up ? null : error || "timeout" })
+      }
+      socket.setTimeout(timeoutMs)
+      socket.once("connect", () => finish(true, null))
+      socket.once("timeout", () => finish(false, "timeout"))
+      socket.once("error", (err) => finish(false, err?.code || "error"))
+    })
+  }
+  await Promise.all(peers.map(async (peer) => {
+    const tunnel = peer.tunnel || {}
+    if (!tunnel.host || !tunnel.port) return
+    tunnel.probe = await tcpProbe(tunnel.host, Number(tunnel.port), 3000)
+    if (!tunnel.probe.up) {
+      const retry = await tcpProbe(tunnel.host, Number(tunnel.port), 3000)
+      if (retry.up) tunnel.probe = retry
+    }
+  }))
+
+
   return {
     ok: true,
     generatedAt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mesh-ui",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "DSH settings-page panel for dsh-mesh: AI network topology, peer health, and delegation panel. Read-only; data is collected from the local mesh CLI.",
   "icon": "icon.svg",
   "type": "module",