Bugfix CPU utilization

Author: luca-vogels

README.md

@@ -30,7 +30,7 @@ import osUtils from 'lup-system';
 
 Output:
 ```
-CPU Utilization: 45.3
+CPU Utilization: 0.2313135420902806
 Drives: [
     {
         filesystem: 'C:',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lup-system",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "NodeJS library to retrieve system information and utilization.",
   "files": [
     "lib/**/*"

src/__tests__/CPU.test.ts

@@ -6,8 +6,8 @@ test('getCpuTemperature', async () => {
 });
 
 test('getCpuUtilization', async () => {
-  const utilization = await getCpuUtilization();
-  console.log('CPU utilization:', utilization); // TODO REMOVE
+    const utilization = await getCpuUtilization();
+    console.log('CPU utilization:', utilization); // TODO REMOVE
 });
 
 afterAll(() => {

src/cpu.ts

@@ -5,7 +5,9 @@ import { execCommand, sleep } from './utils';
 /** Intervall in milliseconds at which CPU utilization is computed. */
 export let CPU_COMPUTE_UTILIZATION_INTERVAL = 1000;
 
-const PREV_CPU_CORES: os.CpuInfo[] = [];
+const CPU_COMPUTE_UTILIZATION_INITIAL_DELAY = 50;
+
+let PREV_CPU_CORES: os.CpuInfo[] = [];
 let CPU_CORE_UTILIZATIONS: number[] = [];
 let CPU_UTILIZATION: number = 0;
 let CPU_COMPUTE_RUNNING = false;
@@ -24,7 +26,7 @@ async function computeCpuUtilization() {
     const prev = PREV_CPU_CORES[i] as os.CpuInfo;
     const next = cpuCores[i] as os.CpuInfo;
 
-    const nextUsage = next.times.user + next.times.nice + next.times.sys + next.times.irq;
+    const nextUsage = (next.times.user + next.times.nice + next.times.sys + next.times.irq) * 1.0;
     const prevUsage = prev.times.user + prev.times.nice + prev.times.sys + prev.times.irq;
     const usage = nextUsage - prevUsage;
 
@@ -37,12 +39,14 @@ async function computeCpuUtilization() {
     totalTotal += total;
   }
   CPU_UTILIZATION = totalTotal !== 0 ? totalUsage / totalTotal : 0;
+  PREV_CPU_CORES = cpuCores;
 }
 
 async function runCpuComputeInterval() {
   CPU_COMPUTE_RUNNING = true;
   await computeCpuUtilization();
-  CPU_COMPUTE_TIMEOUT = setTimeout(runCpuComputeInterval, Math.max(CPU_COMPUTE_UTILIZATION_INTERVAL, 1));
+  if (CPU_COMPUTE_RUNNING)
+    CPU_COMPUTE_TIMEOUT = setTimeout(runCpuComputeInterval, Math.max(CPU_COMPUTE_UTILIZATION_INTERVAL, 1));
 }
 
 /**
@@ -72,7 +76,7 @@ export function getCpuCoreCount(): number {
 export async function getCpuCoreUtilization(): Promise<number[]> {
   if (!CPU_COMPUTE_RUNNING) {
     await runCpuComputeInterval(); // runs the first computation immediately
-    await sleep(50); // wait a bit to get initial values
+    await sleep(CPU_COMPUTE_UTILIZATION_INITIAL_DELAY); // wait a bit to get initial values
     await computeCpuUtilization(); // run second computation immediately to get initial values
   }
   return CPU_CORE_UTILIZATIONS;
@@ -86,7 +90,7 @@ export async function getCpuCoreUtilization(): Promise<number[]> {
 export async function getCpuUtilization(): Promise<number> {
   if (!CPU_COMPUTE_RUNNING) {
     await runCpuComputeInterval(); // runs the first computation immediately
-    await sleep(50); // wait a bit to get initial values
+    await sleep(CPU_COMPUTE_UTILIZATION_INITIAL_DELAY); // wait a bit to get initial values
     await computeCpuUtilization(); // run second computation immediately to get initial values
   }
   return CPU_UTILIZATION;

src/drive.ts

@@ -25,7 +25,7 @@ export type DriveInfo = {
   /** The total size of the drive in bytes. */
   total: number;
 
-    /** The current drive utilization as a percentage (0-1). */
+  /** The current drive utilization as a percentage (0-1). */
   utilization: number;
 };
 
@@ -53,13 +53,13 @@ export async function getDrives(includeVirtual: boolean = false): Promise<DriveI
         const used = parseInt(parts[3], 10) || 0;
         const total = parseInt(parts[2], 10) || 0;
         drives.push({
-            filesystem: parts[0] as string,
-            type,
-            total,
-            used,
-            free: parseInt(parts[4], 10) || 0,
-            utilization: total !== 0 ? used / total : 0,
-            mount: (parts[6] || parts[0]) as string,
+          filesystem: parts[0] as string,
+          type,
+          total,
+          used,
+          free: parseInt(parts[4], 10) || 0,
+          utilization: total !== 0 ? used / total : 0,
+          mount: (parts[6] || parts[0]) as string,
         });
       }
       break;
@@ -74,13 +74,13 @@ export async function getDrives(includeVirtual: boolean = false): Promise<DriveI
         const total = parseInt(drive.Size, 10) || 0;
         const free = parseInt(drive.FreeSpace, 10) || 0;
         drives.push({
-            filesystem: drive.Caption,
-            mount: drive.VolumeName || drive.Caption,
-            type: (drive.FileSystem || 'unknown').toLowerCase(),
-            total,
-            free,
-            used: total - free,
-            utilization: total !== 0 ? (total - free) / total : 0,
+          filesystem: drive.Caption,
+          mount: drive.VolumeName || drive.Caption,
+          type: (drive.FileSystem || 'unknown').toLowerCase(),
+          total,
+          free,
+          used: total - free,
+          utilization: total !== 0 ? (total - free) / total : 0,
         });
       }
       break;

src/net.ts

@@ -151,7 +151,8 @@ async function computeNetworkUtilization() {
 async function runNetComputeInterval() {
   NET_COMPUTE_RUNNING = true;
   await computeNetworkUtilization();
-  NET_COMPUTE_TIMEOUT = setTimeout(runNetComputeInterval, Math.max(NET_COMPUTE_UTILIZATION_INTERVAL, 1));
+  if (NET_COMPUTE_RUNNING)
+    NET_COMPUTE_TIMEOUT = setTimeout(runNetComputeInterval, Math.max(NET_COMPUTE_UTILIZATION_INTERVAL, 1));
 }
 
 /**