dsh-mesh-ui 0.0.2 → 0.0.4

package/lib/client.js

@@ -1249,6 +1249,11 @@ function deviceLinkState(data, peer, lanMap) {
       var localTunnelAll = tunnelNames
       var memText = hw.memTotalGB ? ((hw.memFreeGB != null ? hw.memFreeGB : '?') + ' / ' + hw.memTotalGB + ' GB') : '—'
       var cpuText = hw.cpuModel ? hw.cpuModel + ' · ' + (hw.cpuCores || '?') + ' 线程' : '—'
+      function diskText(d) {
+        if (!d || d.totalGB == null) return '—'
+        var p = String(d.path || '').replace(/[\\/]+$/, '')
+        return (d.freeGB != null ? d.freeGB : '?') + ' / ' + d.totalGB + ' GB' + (p ? ' (' + p + ')' : '')
+      }
 
       var devices = [{
         key: 'local',
@@ -1258,6 +1263,7 @@ function deviceLinkState(data, peer, lanMap) {
           ['操作系统', hw.os || '—'],
           ['CPU', cpuText],
           ['内存', memText],
+          ['磁盘', diskText(hw.disk)],
           ['DSH 实例', localUp + '/' + instances.length + ' 在线'],
           ['会话 / 运行', sessions + ' / ' + running],
           ['模型', model],
@@ -1267,12 +1273,16 @@ function deviceLinkState(data, peer, lanMap) {
         ]
       }].concat(peers.map(function (peer) {
         var t = peer.tunnel || {}
+        var hwp = peer.hardware || {}
         return {
           key: 'peer:' + peer.name,
           name: nodeDisplay(peerDeviceKey(peer.name)),
           up: Boolean(peer.up),
           rows: [
-            ['操作系统', peer.os || '—'],
+            ['操作系统', hwp.os || peer.os || '—'],
+            ['CPU', hwp.cpuModel ? hwp.cpuModel + ' · ' + (hwp.cpuCores || '?') + ' 线程' : '—'],
+            ['内存', hwp.memTotalGB ? ((hwp.memFreeGB != null ? hwp.memFreeGB : '?') + ' / ' + hwp.memTotalGB + ' GB') : '—'],
+            ['磁盘', 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)],

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 } 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()
   }
 }
 
@@ -447,6 +460,7 @@ export async function collect(repo) {
       sessions: stats.sessions,
       running: stats.running,
       hostname: self?.node?.hostname || '',
+      hardware: self?.hardware || null,
       release: self?.node?.release || '',
       os: osLabel(self?.node?.platform, self?.node?.release),
       uptimeSec: overviewByNode[peer.name]?.uptimeSec ?? null,

package/package.json

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