@axium/sysadmin 0.1.1 → 0.1.3

package/dist/client/info.js

@@ -1,3 +1,4 @@
+import { execFileSync } from 'node:child_process';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 /** Read a sysfs/procfs file, returning the trimmed contents or undefined if unreadable. */
@@ -140,15 +141,26 @@ function networkInterfaces() {
             continue;
         const operstate = read(`/sys/class/net/${name}/operstate`);
         const connected = operstate === 'up' || read(`/sys/class/net/${name}/carrier`) === '1';
-        // `speed` is in Mbit/s; only valid for connected links and may be -1/unreadable.
-        const raw = read(`/sys/class/net/${name}/speed`);
-        const speed = connected && raw && Number(raw) > 0 ? BigInt(raw) : undefined;
-        // Wi-Fi devices expose a `wireless`/`phy80211` subdirectory.
+        const raw = Number(read(`/sys/class/net/${name}/speed`));
+        let speed = connected && Number.isSafeInteger(raw) && raw > 0 ? raw : undefined;
         const wireless = fs.existsSync(`/sys/class/net/${name}/wireless`) || fs.existsSync(`/sys/class/net/${name}/phy80211`);
+        // Wi-Fi doesn't expose sysfs `speed`; the SSID and link bitrate come from `iw` instead.
+        let connection;
+        if (wireless && connected)
+            try {
+                const link = execFileSync('iw', ['dev', name, 'link'], { encoding: 'utf8' });
+                connection = /^\s*SSID:\s*(.+)$/m.exec(link)?.[1].trim() || undefined;
+                const bitrate = /^\s*tx bitrate:\s*([\d.]+)\s*MBit\/s/m.exec(link)?.[1];
+                if (bitrate)
+                    speed = Math.round(Number(bitrate));
+            }
+            catch {
+                // that's okay
+            }
         const uevent = read(`/sys/class/net/${name}/device/uevent`);
         const id = uevent && /^PCI_ID=(.+)$/m.exec(uevent)?.[1];
         const model = id ? pciName(id) : name;
-        result.push({ name, model, connected, wireless, speed });
+        result.push({ name, model, connected, wireless, connection, speed });
     }
     return result;
 }

package/dist/common.d.ts

@@ -297,7 +297,7 @@ declare const SysadminClientToServer: {
             connected: z.ZodBoolean;
             wireless: z.ZodBoolean;
             connection: z.ZodOptional<z.ZodString>;
-            speed: z.ZodOptional<z.ZodCoercedBigInt<unknown>>;
+            speed: z.ZodOptional<z.ZodNumber>;
         }, z.core.$strip>>;
         arch: z.ZodString;
         machine: z.ZodString;
@@ -346,7 +346,7 @@ declare const SysadminServerToClient: {
             connected: z.ZodBoolean;
             wireless: z.ZodBoolean;
             connection: z.ZodOptional<z.ZodString>;
-            speed: z.ZodOptional<z.ZodCoercedBigInt<unknown>>;
+            speed: z.ZodOptional<z.ZodNumber>;
         }, z.core.$strip>>;
         arch: z.ZodString;
         machine: z.ZodString;

package/dist/info.d.ts

@@ -44,7 +44,7 @@ export declare const NetworkInterface: z.ZodObject<{
     connected: z.ZodBoolean;
     wireless: z.ZodBoolean;
     connection: z.ZodOptional<z.ZodString>;
-    speed: z.ZodOptional<z.ZodCoercedBigInt<unknown>>;
+    speed: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
 export interface NetworkInterface extends z.infer<typeof NetworkInterface> {
 }
@@ -80,7 +80,7 @@ export declare const SystemInfo: z.ZodObject<{
         connected: z.ZodBoolean;
         wireless: z.ZodBoolean;
         connection: z.ZodOptional<z.ZodString>;
-        speed: z.ZodOptional<z.ZodCoercedBigInt<unknown>>;
+        speed: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>;
     arch: z.ZodString;
     machine: z.ZodString;

package/dist/info.js

@@ -30,7 +30,7 @@ export const NetworkInterface = z.object({
     connected: z.boolean(),
     wireless: z.boolean(),
     connection: z.string().optional(),
-    speed: z.coerce.bigint().optional(),
+    speed: z.number().nonnegative().optional(),
 });
 export const SystemInfo = z.object({
     cpus: CPU.array(),

package/locales/en.json

@@ -67,6 +67,7 @@
 			"wired": "Wired",
 			"connected": "Connected",
 			"disconnected": "Disconnected",
+			"connected_to": "to {connection}",
 			"os": "Operating System",
 			"platform": "Platform",
 			"release": "Release",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/sysadmin",
-	"version": "0.1.1",
+	"version": "0.1.3",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "System administration for Axium",
 	"funding": {

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

@@ -23,6 +23,12 @@
 		return text('sysadmin.system.usage', { used: formatBytes(used), total: formatBytes(total) });
 	}
 
+	function speedText(speed: number): string {
+		if (speed < 1000) return `${speed} MBit/s`;
+		const gb = speed / 1000;
+		return `${gb % 1 === 0 ? gb : gb.toFixed(1)} GBit/s`;
+	}
+
 	const socket = await connect();
 
 	async function loadInfo() {
@@ -139,18 +145,23 @@
 				<div class="component">
 					<h3><Icon i="network-wired" /> {text('sysadmin.system.network')}</h3>
 					{#each info.networkInterfaces as iface}
-						<div class="line">
-							<span class="icon-text">
+						<div class="net-line">
+							<span class="icon-text net-name">
 								<Icon i={iface.wireless ? 'wifi' : 'ethernet'} />
 								{iface.name}
 							</span>
-							<span class="subtle">{iface.model}</span>
-							<span class={['net-status', iface.connected ? 'online' : 'offline']}>
-								{iface.connected ? text('sysadmin.system.connected') : text('sysadmin.system.disconnected')}
+							<span class="subtle net-model">{iface.model}</span>
+							<span class="net-state">
+								<span class={['net-status', iface.connected ? 'online' : 'offline']}>
+									{iface.connected ? text('sysadmin.system.connected') : text('sysadmin.system.disconnected')}
+									{#if iface.connection}
+										<span class="subtle">{text('sysadmin.system.connected_to', { connection: iface.connection })}</span>
+									{/if}
+								</span>
+								{#if iface.speed}
+									<span class="subtle">{speedText(iface.speed)}</span>
+								{/if}
 							</span>
-							{#if iface.speed}
-								<span>{iface.speed} Mbit/s</span>
-							{/if}
 						</div>
 					{/each}
 				</div>
@@ -266,6 +277,29 @@
 		}
 	}
 
+	.net-line {
+		display: flex;
+		align-items: center;
+		gap: 0.5em 1em;
+		flex-wrap: wrap;
+	}
+
+	.net-name {
+		font-weight: bold;
+	}
+
+	/* Push the status/speed cluster to the trailing edge; let the model take the slack. */
+	.net-model {
+		margin-right: auto;
+	}
+
+	.net-state {
+		display: inline-flex;
+		align-items: center;
+		gap: 0.35em 0.75em;
+		flex-wrap: wrap;
+	}
+
 	dl {
 		display: grid;
 		grid-template-columns: max-content 1fr;
@@ -286,5 +320,9 @@
 			padding: 1em;
 			padding-bottom: 5em;
 		}
+
+		.net-model {
+			flex-basis: 100%;
+		}
 	}
 </style>