Merge pull request #209 from andrewiggins/sysinfo-upgrade

Upgrade systeminformation for legacy JSON output
google · Feb 16, 2021 · f791c31 · f791c31
2 parents 4b9768a + 4e6ee7f
commit f791c31
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 33 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "semver": "^7.1.1",
     "source-map-support": "^0.5.16",
     "strip-ansi": "^6.0.0",
-    "systeminformation": "^4.32.0",
+    "systeminformation": "^5.3.3",
     "table": "^6.0.7",
     "ua-parser-js": "^0.7.19"
   },
@@ -86,7 +86,6 @@
     "@types/progress": "^2.0.3",
     "@types/rimraf": "^3.0.0",
     "@types/semver": "^7.3.1",
-    "@types/systeminformation": "^3.54.1",
     "@types/ua-parser-js": "^0.7.32",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",

diff --git a/src/json-output.ts b/src/json-output.ts
@@ -135,16 +135,16 @@ export async function legacyJsonOutput(results: BenchmarkResult[]):
         manufacturer: cpu.manufacturer,
         model: cpu.model,
         family: cpu.family,
-        speed: cpu.speed,
+        speed: cpu.speed.toFixed(2),
         cores: cpu.cores,
       },
       load: {
-        average: currentLoad.avgload,
-        current: currentLoad.currentload,
+        average: currentLoad.avgLoad,
+        current: currentLoad.currentLoad,
       },
       battery: {
-        hasBattery: battery.hasbattery,
-        connected: battery.acconnected,
+        hasBattery: battery.hasBattery,
+        connected: battery.acConnected,
       },
       memory: {
         total: memory.total,