dsh-mesh-ui 0.0.4 → 0.0.6

package/lib/client.js

@@ -1254,22 +1254,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 +1312,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)]
           ]
         }
       }))

package/lib/collect.js

@@ -14,7 +14,7 @@
 // 归宿：reusable（dsh-mesh/plugin/dsh-mesh-ui/lib/collect.js）
 
 import { execFile } from 'node:child_process'
-import { existsSync, readdirSync, readFileSync, statfsSync } from 'node:fs'
+import { existsSync, readdirSync, readFileSync, statfsSync, writeFileSync } from 'node:fs'
 import { lookup as dnsLookup } from 'node:dns/promises'
 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'
@@ -439,12 +439,17 @@ export async function collect(repo) {
     list.push({ id: inst.id, port: 3080 + idx, up: Boolean(inst.up) })
   }
 
-  // 远端节点：host_self 并发（单调用超时 6s）
+  // 远端节点：host_self 并发（超时放宽到 12s —— 跨公网节点 6s 偶尔不够，会导致硬件字段丢失）
   const meshPeers = mesh.peers || []
   const peerSelfs = await Promise.all(meshPeers.map(async (peer) => {
     if (!peer.up) return null
-    return await cliJson(repo, ['peer', 'call', 'host_self', '--to', peer.name, '--args', '{}'], { timeout: 6000 })
+    return await cliJson(repo, ['peer', 'call', 'host_self', '--to', peer.name, '--args', '{}'], { timeout: 12000 })
   }))
+  // 硬件缓存：跨公网 host_self 偶发超时时，用上次成功结果兜底，避免面板时有时无
+  const HW_CACHE_FILE = join(meshHome(), 'peer-hardware.json')
+  let hwCache = {}
+  try { hwCache = JSON.parse(readFileSync(HW_CACHE_FILE, 'utf8')) || {} } catch { hwCache = {} }
+  const devKeyOf = (name) => String(name || '').toLowerCase().replace(/-(lan|wan|exec|exe|import|local|ctl)$/i, '')
   const peers = meshPeers.map((peer, index) => {
     const self = unwrapPeerCall(peerSelfs[index])
     const stats = agentStats(self?.agents)
@@ -460,7 +465,7 @@ export async function collect(repo) {
       sessions: stats.sessions,
       running: stats.running,
       hostname: self?.node?.hostname || '',
-      hardware: self?.hardware || null,
+      hardware: self?.hardware || hwCache[devKeyOf(peer.name)] || null,
       release: self?.node?.release || '',
       os: osLabel(self?.node?.platform, self?.node?.release),
       uptimeSec: overviewByNode[peer.name]?.uptimeSec ?? null,
@@ -473,6 +478,16 @@ export async function collect(repo) {
       error: peer.error?.code || null
     }
   })
+  // 同一设备可能有多个入口（company / company-exec / -lan / -wan）：硬件信息互通，
+  // 避免 UI 去重时选中了恰好没有 hardware 的那条记录。
+  const hwByDev = {}
+  for (const p of peers) { const k = devKeyOf(p.name); if (p.hardware) hwByDev[k] = p.hardware }
+  for (const p of peers) {
+    const k = devKeyOf(p.name)
+    if (!p.hardware && hwByDev[k]) p.hardware = hwByDev[k]
+    if (p.hardware) hwCache[k] = p.hardware
+  }
+  try { writeFileSync(HW_CACHE_FILE, JSON.stringify(hwCache, null, 1)) } catch { /* 缓存写失败不影响主流程 */ }
 
   // 2026-11-10：LAN 链路要显示 IP（不是主机名）→ 对域名型 tunnel.host 做一次 DNS 解析（800ms 超时，失败则回落主机名）
   function isIpLiteral(host) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mesh-ui",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "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",