From a54361c57158ed9b74cb908a73763f9932bea24b Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Mon, 12 May 2025 01:38:36 +0200 Subject: [PATCH 1/2] Add basic cpu info to processInfo global --- server.js | 6 ++++++ server/ready.js | 2 ++ util/updateCpuPercentage.js | 10 ++++++++++ 3 files changed, 18 insertions(+) create mode 100644 util/updateCpuPercentage.js diff --git a/server.js b/server.js index b38abe4..1f7aefe 100644 --- a/server.js +++ b/server.js @@ -49,6 +49,12 @@ client.whitelist = { user: new Collection() } +client.processInfo = { + cpuPercentage: 0, + ramUsage: 0, + previousCpuUsage: process.cpuUsage() +} + createAndLoadWhitelistTable(client.whitelist); client.settings.set("presenceType", presenceType); diff --git a/server/ready.js b/server/ready.js index 20324b7..2a862bb 100644 --- a/server/ready.js +++ b/server/ready.js @@ -1,6 +1,7 @@ const loadServerPrefixes = require('../util/loadServerPrefixes'); const checkTimer = require('../util/timer/checkTimer'); const updatePresence = require('../util/updatePresence'); +const updateCpuPercentage = require('../util/updateCpuPercentage') module.exports = function(client, enableLoginMessage, loginChannel, loginMessage) { updatePresence(client) @@ -13,4 +14,5 @@ module.exports = function(client, enableLoginMessage, loginChannel, loginMessage } loadServerPrefixes(client) checkTimer(client); + updateCpuPercentage(client.processInfo); } diff --git a/util/updateCpuPercentage.js b/util/updateCpuPercentage.js new file mode 100644 index 0000000..2c0135a --- /dev/null +++ b/util/updateCpuPercentage.js @@ -0,0 +1,10 @@ +const os = require('os'); +const updateCpuPercentage = require('./updateCpuPercentage'); +module.exports = async function (processInfo) { + const newCpuUsage = process.cpuUsage(processInfo.cpuPercentage); + processInfo.previousCpuUsage = process.cpuUsage(); + processInfo.cpuPercentage = (newCpuUsage.system + newCpuUsage.user) / 60_000_000 / os.cpus().length; + + setTimeout(updateCpuPercentage, 60000, processInfo); +} + From c100528c2a921db719d4a9ceb5b3819c48495273 Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Wed, 25 Jun 2025 05:08:43 +0200 Subject: [PATCH 2/2] Use setInterval --- server/ready.js | 4 +++- util/updateCpuPercentage.js | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/ready.js b/server/ready.js index 2a862bb..2848099 100644 --- a/server/ready.js +++ b/server/ready.js @@ -14,5 +14,7 @@ module.exports = function(client, enableLoginMessage, loginChannel, loginMessage } loadServerPrefixes(client) checkTimer(client); - updateCpuPercentage(client.processInfo); + setInterval(() => { + updateCpuPercentage(client) + }, 60 * 1000); } diff --git a/util/updateCpuPercentage.js b/util/updateCpuPercentage.js index 2c0135a..a00da82 100644 --- a/util/updateCpuPercentage.js +++ b/util/updateCpuPercentage.js @@ -1,10 +1,8 @@ const os = require('os'); -const updateCpuPercentage = require('./updateCpuPercentage'); module.exports = async function (processInfo) { const newCpuUsage = process.cpuUsage(processInfo.cpuPercentage); processInfo.previousCpuUsage = process.cpuUsage(); processInfo.cpuPercentage = (newCpuUsage.system + newCpuUsage.user) / 60_000_000 / os.cpus().length; - setTimeout(updateCpuPercentage, 60000, processInfo); }