dsh-mesh-ui 0.0.3 → 0.0.5

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 } 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'
@@ -167,7 +167,19 @@ function gb(bytes) {
   return Math.round((Number(bytes || 0) / 1024 / 1024 / 1024) * 10) / 10
 }
 
-/** 本机硬件概况（远端拿不到，需要 host_self 扩展；先只给本机）。 */
+/** 本机系统盘 / 根分区容量（与远端 hardware.disk 结构一致）。 */
+function localDisk() {
+  try {
+    const path = process.platform === 'win32' ? `${process.env.SystemDrive || 'C:'}\\` : '/'
+    const st = statfsSync(path)
+    const blockSize = Number(st.bsize || 4096)
+    return { path, totalGB: gb(Number(st.blocks) * blockSize), freeGB: gb(Number(st.bavail) * blockSize) }
+  } catch {
+    return null
+  }
+}
+
+/** 本机硬件概况（本机直采；远端由 host_self 的 hardware 字段提供）。 */
 function localHardware() {
   const cpuList = osCpus()
   const first = cpuList[0] || {}
@@ -177,7 +189,8 @@ function localHardware() {
     cpuModel: String(first.model || '').replace(/\s+/g, ' ').trim(),
     cpuCores: cpuList.length,
     memTotalGB: gb(osTotalmem()),
-    memFreeGB: gb(osFreemem())
+    memFreeGB: gb(osFreemem()),
+    disk: localDisk()
   }
 }
 
@@ -426,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)
@@ -446,8 +464,8 @@ export async function collect(repo) {
       instancesList: remoteByNode[peer.name] || [],
       sessions: stats.sessions,
       running: stats.running,
-      hostname: self?.node?.hostname || '',
-      hardware: self?.hardware || null,
+      hostname: self?.node?.hostname || '',
+      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,
@@ -460,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.3",
+  "version": "0.0.5",
   "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",