@axium/sysadmin 0.3.0 → 0.3.2

package/dist/client/cli.js

@@ -1,16 +1,16 @@
 import { session } from '@axium/client/cli/config';
 import { fetchAPI } from '@axium/client/requests';
 import { connect } from '@axium/client/socket';
-import { formatBytes, formatDuration } from '@axium/core';
+import * as format from 'utilium/format';
 import { program } from 'commander';
 import * as io from 'ioium/node';
 import { styleText } from 'node:util';
 import './socket.js';
 function usage(info) {
-    return styleText('blueBright', formatBytes(info.used)) + '/' + styleText('blueBright', formatBytes(info.total));
+    return styleText('blueBright', format.bytes(info.used)) + '/' + styleText('blueBright', format.bytes(info.total));
 }
 function drive(device) {
-    return styleText('blueBright', formatBytes(device.size)) + (device.interface ? ' ' + styleText('dim', device.interface) : '');
+    return styleText('blueBright', format.bytes(device.size)) + (device.interface ? ' ' + styleText('dim', device.interface) : '');
 }
 const num = (value) => value === undefined ? styleText('red', '<unknown>') : styleText('blueBright', value.toString());
 const tab = '   ', tab2 = '       ';
@@ -48,7 +48,7 @@ function dumpInfo(system, info) {
         if (iface.connected)
             console.log(tab2, iface.connection ? 'Connected to ' + iface.connection : 'Connected', 'at', num(iface.speed), 'MBit/s');
     }
-    console.log('Uptime:', formatDuration(uptime));
+    console.log('Uptime:', format.duration(uptime));
     for (const [key, value] of Object.entries(rest)) {
         console.log(key + ':', value);
     }

package/dist/client/info.js

@@ -65,7 +65,7 @@ function gpus() {
     }
     return result;
 }
-/** PCIe generations by their per-lane transfer rate in GT/s, as reported by `current_link_speed`. */
+/** PCIe generations by their per-lane transfer rate in GT/s, as reported by `max_link_speed`. */
 const pcieGenerations = {
     '2.5': '1.0',
     '5.0': '2.0',
@@ -79,6 +79,16 @@ const pcieGenerations = {
 function formatLinkRate(mbps) {
     return mbps >= 1000 ? `${(mbps / 1000).toFixed(1).replace(/\.0$/, '')} Gbps` : `${mbps} Mbps`;
 }
+/** A PCIe `*_link_speed` value (`16.0 GT/s PCIe`) in GT/s, or Infinity when it is missing or unparseable. */
+function linkRate(path) {
+    const rate = Number(read(path)?.split(' ')[0]);
+    return rate > 0 ? rate : Infinity;
+}
+/** A PCIe `*_link_width` value in lanes, or Infinity when it is missing or unparseable. */
+function linkWidth(path) {
+    const width = Number(read(path));
+    return width > 0 ? width : Infinity;
+}
 /** The SATA link speed of an `ataN` device directory, e.g. '6.0 Gbps'. */
 function sataSpeed(ata) {
     for (const link of list(ata)) {
@@ -108,13 +118,14 @@ function diskInterface(dev) {
             const speed = sataSpeed(dir);
             return speed ? `SATA ${speed}` : 'SATA';
         }
-        // PCI(e) endpoints expose the negotiated link; `current_link_speed` is like `16.0 GT/s PCIe`.
-        const link = read(`${dir}/current_link_speed`);
-        if (link) {
-            const rate = link.split(' ')[0];
-            const generation = pcieGenerations[Number(rate).toFixed(1)];
-            const width = read(`${dir}/current_link_width`);
-            return `PCIe ${generation ?? `${rate} GT/s`}${width && width !== '0' ? ` x${width}` : ''}`;
+        if (fs.existsSync(`${dir}/max_link_speed`)) {
+            const parent = path.dirname(dir);
+            const rate = Math.min(linkRate(`${dir}/max_link_speed`), linkRate(`${parent}/max_link_speed`));
+            const width = Math.min(linkWidth(`${dir}/max_link_width`), linkWidth(`${parent}/max_link_width`));
+            if (Number.isFinite(rate)) {
+                const generation = pcieGenerations[rate.toFixed(1)];
+                return `PCIe ${generation ?? `${rate} GT/s`}${Number.isFinite(width) ? ` x${width}` : ''}`;
+            }
         }
         // USB devices (as opposed to their interfaces) carry the descriptor fields; `speed` is in Mbit/s.
         if (fs.existsSync(`${dir}/idVendor`)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/sysadmin",
-	"version": "0.3.0",
+	"version": "0.3.2",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "System administration for Axium",
 	"funding": {
@@ -41,7 +41,7 @@
 		"@axium/server": ">=0.47.0",
 		"@sveltejs/kit": "^2.27.3",
 		"kysely": "^0.29.0",
-		"utilium": "^3.0.0"
+		"utilium": "^3.8.0"
 	},
 	"dependencies": {
 		"commander": "^15.0.0",

package/routes/sysadmin/systems/[id]/+page.svelte

@@ -3,7 +3,7 @@
 	import { Icon, NumberBar } from '@axium/client/components';
 	import { connect } from '@axium/client/socket';
 	import { toastStatus } from '@axium/client/toast';
-	import { formatBytes, formatDuration } from '@axium/core';
+	import * as format from 'utilium/format';
 	import { systemTypeIcons, type SystemInfo } from '@axium/sysadmin';
 	import '@axium/sysadmin/common';
 
@@ -36,8 +36,8 @@
 	}
 
 	function usageText(used: bigint, total: bigint): string {
-		if (used <= 0n) return formatBytes(total);
-		return text('sysadmin.system.usage', { used: formatBytes(used), total: formatBytes(total) });
+		if (used <= 0n) return format.bytes(total);
+		return text('sysadmin.system.usage', { used: format.bytes(used), total: format.bytes(total) });
 	}
 
 	const socket = await connect();
@@ -184,7 +184,7 @@
 											{disk.model}
 										</span>
 										<span class="subtle">
-											{formatBytes(disk.size)}
+											{format.bytes(disk.size)}
 											{#if disk.interface}<span class="dot">·</span>{disk.interface}{/if}
 										</span>
 									</div>
@@ -197,7 +197,7 @@
 							<span class="mount">{disk.model}</span>
 							<span class="tags">
 								<span class="subtle">
-									{formatBytes(disk.size)}
+									{format.bytes(disk.size)}
 									{#if disk.interface}<span class="dot">·</span>{disk.interface}{/if}
 								</span>
 								<span class="tag unused">{text('sysadmin.system.storage_unused')}</span>
@@ -248,7 +248,7 @@
 				<dt>{text('sysadmin.system.arch')}</dt>
 				<dd>{info.arch} <span class="subtle">({info.machine})</span></dd>
 				<dt>{text('sysadmin.system.uptime')}</dt>
-				<dd>{formatDuration(info.uptime)}</dd>
+				<dd>{format.duration(info.uptime)}</dd>
 			</dl>
 		</section>
 	{/if}