@axium/sysadmin 0.2.0 → 0.2.2

package/dist/client/info.js

@@ -129,6 +129,27 @@ function memory() {
         total,
         used: total - available,
     };
+    try {
+        const dmiMemoryInfo = execFileSync('sudo', ['-n', 'dmidecode', '-t', '17'], {
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+        });
+        for (const match of dmiMemoryInfo.matchAll(/^\s*(?:Configured Memory|Configured Clock)?\s*Speed:\s*(\d+)\s*MT\/s/gim)) {
+            memory.speed = Math.max(memory.speed, Number(match[1]));
+        }
+        const populated = (field) => {
+            for (const [, match] of dmiMemoryInfo.matchAll(new RegExp(`^[ \\t]*${field}:[ \\t]*(.+)$`, 'gim'))) {
+                const value = match.trim();
+                if (value && value !== 'Unknown')
+                    return value;
+            }
+        };
+        memory.formFactor = populated('Form Factor');
+        memory.type = populated('Type');
+    }
+    catch {
+        // dmidecode missing, not root, or sudo needs a password
+    }
     const swapTotal = info.SwapTotal ?? 0n;
     if (swapTotal > 0n)
         memory.swap = { total: swapTotal, used: swapTotal - (info.SwapFree ?? 0n) };

package/dist/common.d.ts

@@ -320,6 +320,8 @@ declare const SysadminClientToServer: {
         }, z.core.$strip>>;
         memory: z.ZodObject<{
             speed: z.ZodInt;
+            formFactor: z.ZodOptional<z.ZodString>;
+            type: z.ZodOptional<z.ZodString>;
             swap: z.ZodOptional<z.ZodObject<{
                 total: z.ZodCoercedBigInt<unknown>;
                 used: z.ZodCoercedBigInt<unknown>;
@@ -376,6 +378,8 @@ declare const SysadminServerToClient: {
         }, z.core.$strip>>;
         memory: z.ZodObject<{
             speed: z.ZodInt;
+            formFactor: z.ZodOptional<z.ZodString>;
+            type: z.ZodOptional<z.ZodString>;
             swap: z.ZodOptional<z.ZodObject<{
                 total: z.ZodCoercedBigInt<unknown>;
                 used: z.ZodCoercedBigInt<unknown>;

package/dist/info.d.ts

@@ -23,6 +23,8 @@ export interface GPU extends z.infer<typeof GPU> {
 }
 export declare const Memory: z.ZodObject<{
     speed: z.ZodInt;
+    formFactor: z.ZodOptional<z.ZodString>;
+    type: z.ZodOptional<z.ZodString>;
     swap: z.ZodOptional<z.ZodObject<{
         total: z.ZodCoercedBigInt<unknown>;
         used: z.ZodCoercedBigInt<unknown>;
@@ -72,6 +74,8 @@ export declare const SystemInfo: z.ZodObject<{
     }, z.core.$strip>>;
     memory: z.ZodObject<{
         speed: z.ZodInt;
+        formFactor: z.ZodOptional<z.ZodString>;
+        type: z.ZodOptional<z.ZodString>;
         swap: z.ZodOptional<z.ZodObject<{
             total: z.ZodCoercedBigInt<unknown>;
             used: z.ZodCoercedBigInt<unknown>;

package/dist/info.js

@@ -17,6 +17,10 @@ export const Memory = z.object({
     ...TotalUsed.shape,
     /** Memory speed in MT/s */
     speed: z.int().nonnegative(),
+    /** Form factor, e.g. 'DIMM' or 'SODIMM' */
+    formFactor: z.string().optional(),
+    /** Memory type, e.g. 'DDR4' or 'DDR5' */
+    type: z.string().optional(),
     /** Only available when swap is in use */
     swap: TotalUsed.optional(),
 });

package/locales/en.json

@@ -14,8 +14,6 @@
 		"online": "Online",
 		"offline": "Offline",
 		"back_to_main": "Back to System Administration",
-		"back_to_systems": "Back to Systems",
-		"back_to_users": "Back to System Users",
 		"SystemInitDialog": {
 			"submit": "Add System",
 			"save": "Save",
@@ -62,6 +60,7 @@
 			"cpu_cores": "{count} cores",
 			"gpu": "Graphics",
 			"memory": "Memory",
+			"memory_speed": "{speed} MT/s",
 			"swap": "Swap",
 			"storage": "Storage",
 			"network": "Network",

package/package.json

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

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

@@ -31,22 +31,17 @@
 	}
 
 	function usageText(used: bigint, total: bigint): string {
+		if (used <= 0n) return formatBytes(total);
 		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() {
 		try {
 			const all = await socket.emitWithAck('sysadmin:getSystemInfo');
 			info = all.find(i => i.hostname === system.hostname);
-			if (!info) error = true;
+			error = !info;
 		} catch {
 			error = true;
 		} finally {
@@ -64,9 +59,9 @@
 </svelte:head>
 
 <div class="system-page">
-	<a class="subtle icon-text back" href="/sysadmin/systems">
+	<a class="subtle icon-text back" href="/sysadmin">
 		<Icon i="arrow-left" />
-		<span>{text('sysadmin.back_to_systems')}</span>
+		<span>{text('sysadmin.back_to_main')}</span>
 	</a>
 
 	<div class="system-header">
@@ -124,7 +119,19 @@
 			{/if}
 
 			<div class="component">
-				<h3><Icon i="memory" /> {text('sysadmin.system.memory')}</h3>
+				<h3>
+					<Icon i="memory" />
+					{text('sysadmin.system.memory')}
+					{#if info.memory.type}
+						<span class="subtle">{info.memory.type}</span>
+					{/if}
+					{#if info.memory.formFactor}
+						<span class="subtle">{info.memory.formFactor}</span>
+					{/if}
+					{#if info.memory.speed}
+						<span class="subtle">{text('sysadmin.system.memory_speed', { speed: info.memory.speed })}</span>
+					{/if}
+				</h3>
 				<NumberBar
 					value={fraction(info.memory.used, info.memory.total)}
 					max={1}
@@ -170,7 +177,11 @@
 									{/if}
 								</span>
 								{#if iface.speed}
-									<span class="subtle">{speedText(iface.speed)}</span>
+									<span class="subtle"
+										>{iface.speed < 1000
+											? `${iface.speed} MBit/s`
+											: `${(iface.speed / 1000).toFixed(2).replace(/\.?0+$/, '')} GBit/s`}</span
+									>
 								{/if}
 							</span>
 						</div>

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

@@ -27,9 +27,9 @@
 </svelte:head>
 
 <div class="user-page">
-	<a class="subtle icon-text back" href="/sysadmin/users">
+	<a class="subtle icon-text back" href="/sysadmin">
 		<Icon i="arrow-left" />
-		<span>{text('sysadmin.back_to_users')}</span>
+		<span>{text('sysadmin.back_to_main')}</span>
 	</a>
 
 	<div class="user-header">