Skip to content

Commit 4dc2bbf

Browse files
add cpu ram utilization graph to server.html
1 parent 0279dd4 commit 4dc2bbf

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

server-1.1/main/endusers.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,5 @@
1010
{
1111
"username": "alexo",
1212
"password": "beta9999"
13-
},
14-
{
15-
"username": "dylanc",
16-
"password": "beta9919"
1713
}
1814
]

server-1.1/main/server.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:03e2a8a5075c9751b78756652c11c6b3dfc0aca95b62a550c9ed6ec9f69af534
3-
size 7063
2+
oid sha256:8cba56b48a18c48bf672dd07d50948f9d7653164ad60732724a553cbc311fcb9
3+
size 10792

server-1.1/main/server.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const bcrypt = require('bcrypt');
55
const fs = require('fs');
66
const { exec } = require('child_process');
77
const WebSocket = require('ws');
8+
const os = require('os');
89

910
const app = express();
1011
let port = 3000; // Make port variable to allow changes
@@ -168,6 +169,20 @@ app.post('/unblock-ips', (req, res) => {
168169
res.send('IP addresses unblocked');
169170
});
170171

172+
// Endpoint to get system stats
173+
app.get('/system-stats', (req, res) => {
174+
const cpuUsage = os.loadavg()[0]; // 1-minute load average
175+
const totalMem = os.totalmem();
176+
const freeMem = os.freemem();
177+
const usedMem = totalMem - freeMem;
178+
const usedMemMB = Math.round(usedMem / 1024 / 1024);
179+
180+
res.json({
181+
cpu: Math.round(cpuUsage * 100 / os.cpus().length), // Convert load average to percentage
182+
ram: usedMemMB
183+
});
184+
});
185+
171186
// Function to start the server
172187
const startServer = async () => {
173188
try {

0 commit comments

Comments
 (0)