querysub 0.651.0 → 0.652.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.651.0",
+  "version": "0.652.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/deployManager/machineApplyMainCode.ts

@@ -31,7 +31,7 @@ import { ProcessRecord, syncProcessRecords, listProcessRecords } from "./process
 
 
 
-const getMemoryInfo = measureWrap(async function getMemoryInfo(): Promise<{ value: number; max: number } | undefined> {
+const getMemoryInfo = measureWrap(async function getMemoryInfo(): Promise<{ memory?: { value: number; max: number }; swap?: { value: number; max: number } } | undefined> {
     if (os.platform() === "win32") {
         throw new Error("Windows is not supported for machine resource monitoring");
     }
@@ -40,17 +40,24 @@ const getMemoryInfo = measureWrap(async function getMemoryInfo(): Promise<{ valu
         // Linux: Use free command
         let result = await runPromise("free -b", { quiet: true });
         let lines = result.split("\n");
-        let memLine = lines.find(line => line.startsWith("Mem:"));
-        if (memLine) {
-            let parts = memLine.split(/\s+/);
+        let parseLine = (prefix: string): { value: number; max: number } | undefined => {
+            let line = lines.find(line => line.startsWith(prefix));
+            if (!line) return undefined;
+            let parts = line.split(/\s+/);
             let total = parseInt(parts[1]);
             let used = parseInt(parts[2]);
-            if (total && used >= 0) {
+            if (total >= 0 && used >= 0) {
                 return { value: used, max: total };
             }
+            return undefined;
+        };
+        let memory = parseLine("Mem:");
+        let swap = parseLine("Swap:");
+        if (memory || swap) {
+            return { memory, swap };
         }
     } catch (e: any) {
-        console.warn(`Error getting memory info: ${e.message}`);
+        console.warn(`Error getting memory info: ${e.stack}`);
     }
     return undefined;
 });
@@ -98,11 +105,19 @@ const getLiveMachineInfo = measureWrap(async function getLiveMachineInfo() {
         getDiskInfo()
     ]);
 
-    if (memoryInfo) {
+    if (memoryInfo?.memory) {
         machineInfo.info.ram = {
             type: "MEMORY",
-            value: memoryInfo.value,
-            max: memoryInfo.max,
+            value: memoryInfo.memory.value,
+            max: memoryInfo.memory.max,
+        };
+    }
+
+    if (memoryInfo?.swap) {
+        machineInfo.info.swap = {
+            type: "SWAP",
+            value: memoryInfo.swap.value,
+            max: memoryInfo.swap.max,
         };
     }
 

package/src/library-components/UsageBar.tsx

@@ -8,8 +8,11 @@ export const MEMORY_WARNING_THRESHOLD = 0.7;
 export const MEMORY_ERROR_THRESHOLD = 0.85;
 export const DISK_WARNING_THRESHOLD = 0.8;
 export const DISK_ERROR_THRESHOLD = 0.92;
+// Swap in use at all means memory pressure already happened, so warn much earlier than RAM.
+export const SWAP_WARNING_THRESHOLD = 0.25;
+export const SWAP_ERROR_THRESHOLD = 0.7;
 
-/** The standard thresholds for the machine resource bar types ("MEMORY" / "DISK"), so every page showing these bars warns identically. */
+/** The standard thresholds for the machine resource bar types ("MEMORY" / "DISK" / "SWAP"), so every page showing these bars warns identically. */
 export function getUsageThresholds(type: string): { warningThreshold?: number; errorThreshold?: number } {
     if (type === "MEMORY") {
         return { warningThreshold: MEMORY_WARNING_THRESHOLD, errorThreshold: MEMORY_ERROR_THRESHOLD };
@@ -17,6 +20,9 @@ export function getUsageThresholds(type: string): { warningThreshold?: number; e
     if (type === "DISK") {
         return { warningThreshold: DISK_WARNING_THRESHOLD, errorThreshold: DISK_ERROR_THRESHOLD };
     }
+    if (type === "SWAP") {
+        return { warningThreshold: SWAP_WARNING_THRESHOLD, errorThreshold: SWAP_ERROR_THRESHOLD };
+    }
     return {};
 }