1.0.13

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@pushrocks/smartmetrics",
-  "version": "1.0.7",
+  "version": "1.0.13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartmetrics",
-      "version": "1.0.7",
+      "version": "1.0.13",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/smartdelay": "^2.0.13",
@@ -21,7 +21,7 @@
         "@gitzone/tsbundle": "^1.0.78",
         "@gitzone/tstest": "^1.0.44",
         "@pushrocks/tapbundle": "^3.2.9",
-        "@types/node": "^16.6.0",
+        "@types/node": "^16.6.1",
         "tslint": "^6.1.3",
         "tslint-config-prettier": "^1.15.0"
       }
@@ -3041,9 +3041,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "16.6.0",
-      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-16.6.0.tgz",
-      "integrity": "sha512-OyiZPohMMjZEYqcVo/UJ04GyAxXOJEZO/FpzyXxcH4r/ArrVoXHf4MbUrkLp0Tz7/p1mMKpo5zJ6ZHl8XBNthQ==",
+      "version": "16.6.1",
+      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-16.6.1.tgz",
+      "integrity": "sha512-Sr7BhXEAer9xyGuCN3Ek9eg9xPviCF2gfu9kTfuU2HkTVAMYSDeX40fvpmo72n5nansg3nsBjuQBrsS28r+NUw==",
       "dev": true,
       "license": "MIT"
     },
@@ -17071,9 +17071,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.6.0",
-      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-16.6.0.tgz",
-      "integrity": "sha512-OyiZPohMMjZEYqcVo/UJ04GyAxXOJEZO/FpzyXxcH4r/ArrVoXHf4MbUrkLp0Tz7/p1mMKpo5zJ6ZHl8XBNthQ==",
+      "version": "16.6.1",
+      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-16.6.1.tgz",
+      "integrity": "sha512-Sr7BhXEAer9xyGuCN3Ek9eg9xPviCF2gfu9kTfuU2HkTVAMYSDeX40fvpmo72n5nansg3nsBjuQBrsS28r+NUw==",
       "dev": true
     },
     "@types/parcel-bundler": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartmetrics",
-  "version": "1.0.7",
+  "version": "1.0.13",
   "private": false,
   "description": "easy system metrics",
   "main": "dist_ts/index.js",
@@ -16,7 +16,7 @@
     "@gitzone/tsbundle": "^1.0.78",
     "@gitzone/tstest": "^1.0.44",
     "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^16.6.0",
+    "@types/node": "^16.6.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },

ts/smartmetrics.classes.smartmetrics.ts

@@ -58,9 +58,9 @@ export class SmartMetrics {
     let cpuPercentage = 0;
     for (const stat of Object.keys(stats)) {
       if (!stats[stat]) continue;
-      cpuPercentage += stats[stat].cpu / 100;
+      cpuPercentage += stats[stat].cpu;
     }
-    let cpuUsageText = `${cpuPercentage * 100} %`;
+    let cpuUsageText = `${Math.round(cpuPercentage * 100) / 100} %`;
 
     // lets compute memory usage
     let memoryUsageBytes = 0;
@@ -68,8 +68,10 @@ export class SmartMetrics {
       if (!stats[stat]) continue;
       memoryUsageBytes += stats[stat].memory;
     }
-    let memoryUsageText = this.formatBytes(memoryUsageBytes);
-    let memoryPercentage = Math.round((memoryUsageBytes / plugins.os.totalmem()) * 100) / 100;
+    let memoryPercentage = Math.round((memoryUsageBytes / 1000000000) * 100);
+    let memoryUsageText = `${memoryPercentage}% | ${this.formatBytes(memoryUsageBytes)} / ${this.formatBytes(1000000000)}`;
+
+    console.log(`${cpuUsageText} ||| ${memoryUsageText} `);
 
     const returnMetrics: interfaces.IMetricsSnapshot = {
       originalMetrics,