@yourfam/yf-vitals 0.3.0 → 0.3.2

package/README.md

@@ -36,10 +36,10 @@ One live dashboard. Refresh every **1.0s** (or `--interval`, or **2.0s** with `-
 |---|---|
 | **CPU** | Overall utilization 0–100%, plus physical / logical core counts |
 | **RAM** | Percent used, plus used / total (`GiB` / `MiB`) |
-| **USE** | Local hard-disk fill (system volume first). Skips Google Drive, iCloud, network, FAT/USB. Extra local disks as extra lines |
+| **GPU** | Utilization and VRAM when telemetry exists; **the row is omitted** when it does not |
 | **DSK** | Read and write **rates** (KiB/s, MiB/s, GiB/s) |
 | **NET** | Send ↑ and receive ↓ in **kbps / Mbps / Gbps** (decimal bits; 1 Mbps = 1e6 bit/s) |
-| **GPU** | Utilization and VRAM when telemetry exists; **the row is omitted** when it does not |
+| **C: / D: / Data** | Capacity last: one bar per local partition. Skips Google Drive, iCloud, network, FAT/USB |
 
 Header: `yf-vitals` · hostname · OS · `NP/NL` cores · RAM total · tick interval.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yourfam/yf-vitals",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Live terminal dashboard for CPU, RAM, disk, net, and optional GPU",
   "type": "module",
   "bin": {

package/src/args.js

@@ -98,7 +98,7 @@ Usage:
   --version, -V          Package version
 
 q / Q / Ctrl+C quit. GPU row is omitted when the OS has no GPU telemetry.
-USE is local NTFS/APFS/HFS fill (no Google Drive, iCloud, or network shares).
+Each local partition (C:, D:, Data, …) gets its own fill bar. No Google Drive, iCloud, or network shares.
 Disk rates are KiB/s–GiB/s; network rates are kbps/Mbps/Gbps.
 Disk / net sparks are split (R/W, ↑/↓) and scale to the pair max in the last 60 ticks.
 Bar fill turns yellow ≥50% and red ≥80%. Unused spark slots use the lowest tick.

package/src/diskuse.js

@@ -56,8 +56,29 @@ function systemScore(row) {
 }
 
 /**
+ * @param {{ fs?: string, type?: string, mount?: string, size?: number, used?: number, use?: number }} r
+ */
+function toVolume(r) {
+  const total = Number(r.size) || 0;
+  const used = Number(r.used) || 0;
+  const percent =
+    typeof r.use === "number" && Number.isFinite(r.use)
+      ? r.use
+      : total > 0
+        ? (used / total) * 100
+        : 0;
+  return {
+    percent: Math.min(100, Math.max(0, percent)),
+    used,
+    total,
+    mount: shortMount(r.mount || r.fs || ""),
+  };
+}
+
+/**
+ * One first-class volume per local partition. System disk first, then the rest.
  * @param {Array<{ fs?: string, type?: string, mount?: string, size?: number, used?: number, use?: number }>} rows
- * @returns {{ percent: number, used: number, total: number, mount: string, others: { percent: number, used: number, total: number, mount: string }[] } | null}
+ * @returns {{ percent: number, used: number, total: number, mount: string }[] | null}
  */
 export function summarizeLocalDisks(rows) {
   const local = (Array.isArray(rows) ? rows : []).filter(isLocalCapacityVolume);
@@ -73,31 +94,5 @@ export function summarizeLocalDisks(rows) {
     uniq.push(r);
   }
   if (!uniq.length) return null;
-  const primary = uniq[0];
-  const total = Number(primary.size) || 0;
-  const used = Number(primary.used) || 0;
-  const percent =
-    typeof primary.use === "number" && Number.isFinite(primary.use)
-      ? primary.use
-      : total > 0
-        ? (used / total) * 100
-        : 0;
-  return {
-    percent: Math.min(100, Math.max(0, percent)),
-    used,
-    total,
-    mount: shortMount(primary.mount || primary.fs || ""),
-    others: uniq.slice(1).map((r) => {
-      const t = Number(r.size) || 0;
-      const u = Number(r.used) || 0;
-      const p =
-        typeof r.use === "number" && Number.isFinite(r.use) ? r.use : t > 0 ? (u / t) * 100 : 0;
-      return {
-        percent: Math.min(100, Math.max(0, p)),
-        used: u,
-        total: t,
-        mount: shortMount(r.mount || r.fs || ""),
-      };
-    }),
-  };
+  return uniq.slice(0, 6).map(toVolume);
 }

package/src/history.js

@@ -9,11 +9,11 @@ import { HISTORY_SIZE } from "./bar.js";
  * @property {number[]} dskW
  * @property {number[]} netUp
  * @property {number[]} netDn
- * @property {number[]} diskUse
+ * @property {Record<string, number[]>} diskUse
  */
 
 export function createHistory() {
-  return { cpu: [], ram: [], gpu: [], dskR: [], dskW: [], netUp: [], netDn: [], diskUse: [] };
+  return { cpu: [], ram: [], gpu: [], dskR: [], dskW: [], netUp: [], netDn: [], diskUse: {} };
 }
 
 /**
@@ -44,6 +44,19 @@ export function appendHistory(history, snap) {
     dskW: pushSample(history.dskW, snap.disk?.writeBps),
     netUp: pushSample(history.netUp, snap.net?.txBps),
     netDn: pushSample(history.netDn, snap.net?.rxBps),
-    diskUse: pushSample(history.diskUse, snap.diskUse?.percent),
+    diskUse: appendDiskUse(history.diskUse, snap.diskUse),
   };
 }
+
+/**
+ * @param {Record<string, number[]>} prev
+ * @param {{ mount: string, percent: number }[] | null | undefined} vols
+ */
+function appendDiskUse(prev, vols) {
+  /** @type {Record<string, number[]>} */
+  const next = { ...prev };
+  for (const vol of vols || []) {
+    next[vol.mount] = pushSample(next[vol.mount] || [], vol.percent);
+  }
+  return next;
+}

package/src/render.js

@@ -168,19 +168,6 @@ export function renderFrame(snap, history, opts = {}) {
   }
   lines.push("");
 
-  if (snap.diskUse) {
-    lines.push(
-      `${color.green("USE")}  ${paintPercentBar(snap.diskUse.percent, color, "green", ascii)}  ${formatPercent(snap.diskUse.percent)}   ${formatBytePair(snap.diskUse.used, snap.diskUse.total)}  ${snap.diskUse.mount}`,
-    );
-    lines.push(`     ${color.green(sparkline(history.diskUse, sparkW, { ascii, max: 100 }))}`);
-    for (const extra of snap.diskUse.others || []) {
-      lines.push(
-        `     ${extra.mount}  ${formatPercent(extra.percent).trim()}   ${formatBytePair(extra.used, extra.total)}`,
-      );
-    }
-  }
-  if (snap.diskUse) lines.push("");
-
   const gpuLines = buildGpuRow(snap.gpu, {
     history: history.gpu,
     ascii,
@@ -221,6 +208,19 @@ export function renderFrame(snap, history, opts = {}) {
     );
   }
   lines.push("");
+
+  if (Array.isArray(snap.diskUse) && snap.diskUse.length) {
+    for (const vol of snap.diskUse) {
+      const label = vol.mount.length >= 3 ? vol.mount.slice(0, 4) : vol.mount.padEnd(3);
+      const spark = history.diskUse?.[vol.mount] || [];
+      lines.push(
+        `${color.green(label)}  ${paintPercentBar(vol.percent, color, "green", ascii)}  ${formatPercent(vol.percent)}   ${formatBytePair(vol.used, vol.total)}`,
+      );
+      lines.push(`     ${color.green(sparkline(spark, sparkW, { ascii, max: 100 }))}`);
+      lines.push("");
+    }
+  }
+
   lines.push("q quit");
 
   return lines.map((ln) => fitLine(ln, columns)).join("\n");

package/src/sample.js

@@ -37,7 +37,7 @@ import { rateFromCounters } from "./rates.js";
  * @property {DiskSample | null} disk
  * @property {NetSample | null} net
  * @property {GpuSample | null} gpu
- * @property {{ percent: number, used: number, total: number, mount: string, others: { percent: number, used: number, total: number, mount: string }[] } | null} diskUse
+ * @property {{ percent: number, used: number, total: number, mount: string }[] | null} diskUse
  */
 
 /**