From 1808fbb453a560952387e3add763b64eed1a03ab Mon Sep 17 00:00:00 2001
From: Leah Cloudburst <us@conep.one>
Date: Wed, 25 May 2022 12:40:00 +0100
Subject: a

---
 index.ts | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/index.ts b/index.ts
index 4424083..00d399b 100644
--- a/index.ts
+++ b/index.ts
@@ -24,26 +24,24 @@ app.get("/json", async (req, res) => {
             cores: cpu.cores,
             speed: cpuSpeed.avg,
             temperature: temp.main,
-            processes: {
-                total: processes.all,
-                running: processes.running,
-                sleeping: processes.sleeping,
-                blocked: processes.blocked,
-                unknown: processes.unknown
-            },
             load: load.currentLoadSystem
         },
-        memory: {
-            swap: {
-                used: memory.swapused,
-                free: memory.swapfree,
-                total: memory.swaptotal
-            },
-            physical: {
-                used: memory.used,
-                free: memory.free,
-                total: memory.total
-            }
+        processes: {
+            total: processes.all,
+            running: processes.running,
+            sleeping: processes.sleeping,
+            blocked: processes.blocked,
+            unknown: processes.unknown
+        },
+        swapmemory: {
+            used: memory.swapused,
+            free: memory.swapfree,
+            total: memory.swaptotal
+        },
+        physicalmemory: {
+            used: memory.used,
+            free: memory.free,
+            total: memory.total
         },
         os: {
             name: os.distro,
-- 
cgit