systeminformation 5.25.1 → 5.25.2

package/README.md

@@ -178,7 +178,7 @@ si.cpu()
 
 (last 7 major and minor version releases)
 
-- Version 5.24.0: `versions()` added homebrew
+- Version 5.25.0: `versions()` added homebrew
 - Version 5.24.0: `versions()` added bun and deno
 - Version 5.23.0: `usb()` added serial number (linux)
 - Version 5.22.0: `wifiConnections()` added signal quality

package/lib/battery.js

@@ -181,7 +181,7 @@ module.exports = function (callback) {
       }
 
       if (_darwin) {
-        exec('ioreg -n AppleSmartBattery -r | egrep "CycleCount|IsCharging|DesignCapacity|MaxCapacity|CurrentCapacity|BatterySerialNumber|TimeRemaining|Voltage"; pmset -g batt | grep %', function (error, stdout) {
+        exec('ioreg -n AppleSmartBattery -r | egrep "CycleCount|IsCharging|DesignCapacity|MaxCapacity|CurrentCapacity|DeviceName|BatterySerialNumber|Serial|TimeRemaining|Voltage"; pmset -g batt | grep %', function (error, stdout) {
           if (stdout) {
             let lines = stdout.toString().replace(/ +/g, '').replace(/"+/g, '').replace(/-/g, '').split('\n');
             result.cycleCount = parseInt('0' + util.getValue(lines, 'cyclecount', '='), 10);
@@ -191,7 +191,8 @@ module.exports = function (callback) {
             result.currentCapacity = Math.round(parseInt('0' + util.getValue(lines, 'applerawcurrentcapacity', '='), 10) * (result.voltage || 1));
             result.designedCapacity = Math.round(parseInt('0' + util.getValue(lines, 'DesignCapacity', '='), 10) * (result.voltage || 1));
             result.manufacturer = 'Apple';
-            result.serial = util.getValue(lines, 'BatterySerialNumber', '=');
+            result.serial = util.getValue(lines, 'BatterySerialNumber', '=') || util.getValue(lines, 'Serial', '=');
+            result.model = util.getValue(lines, 'DeviceName', '=');
             let percent = null;
             const line = util.getValue(lines, 'internal', 'Battery');
             let parts = line.split(';');

package/lib/cpu.js

@@ -1019,7 +1019,7 @@ function getCpuCurrentSpeedSync() {
       if (speeds[i] < minFreq) { minFreq = speeds[i]; }
       cores.push(parseFloat(speeds[i].toFixed(2)));
     }
-    avgFreq = avgFreq / cpus.length;
+    avgFreq = avgFreq / speeds.length;
     return {
       min: parseFloat(minFreq.toFixed(2)),
       max: parseFloat(maxFreq.toFixed(2)),

package/lib/system.js

@@ -48,11 +48,11 @@ function system(callback) {
       if (_linux || _freebsd || _openbsd || _netbsd) {
         exec('export LC_ALL=C; dmidecode -t system 2>/dev/null; unset LC_ALL', function (error, stdout) {
           let lines = stdout.toString().split('\n');
-          result.manufacturer = util.getValue(lines, 'manufacturer');
-          result.model = util.getValue(lines, 'product name');
+          result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer'));
+          result.model = cleanDefaults(util.getValue(lines, 'product name'));
           result.version = cleanDefaults(util.getValue(lines, 'version'));
           result.serial = cleanDefaults(util.getValue(lines, 'serial number'));
-          result.uuid = cleanDefaults((util.getValue(lines, 'uuid').toLowerCase()));
+          result.uuid = cleanDefaults((util.getValue(lines, 'uuid'))).toLowerCase();
           result.sku = cleanDefaults(util.getValue(lines, 'sku number'));
           // Non-Root values
           const cmd = `echo -n "product_name: "; cat /sys/devices/virtual/dmi/id/product_name 2>/dev/null; echo;
@@ -62,8 +62,8 @@ function system(callback) {
             echo -n "sys_vendor: "; cat /sys/devices/virtual/dmi/id/sys_vendor 2>/dev/null; echo;`;
           try {
             lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
-            result.manufacturer = result.manufacturer === '' ? util.getValue(lines, 'sys_vendor') : result.manufacturer;
-            result.model = result.model === '' ? util.getValue(lines, 'product_name') : result.model;
+            result.manufacturer = cleanDefaults(result.manufacturer === '' ? util.getValue(lines, 'sys_vendor') : result.manufacturer);
+            result.model = cleanDefaults(result.model === '' ? util.getValue(lines, 'product_name') : result.model);
             result.version = cleanDefaults(result.version === '' ? util.getValue(lines, 'product_version') : result.version);
             result.serial = cleanDefaults(result.serial === '' ? util.getValue(lines, 'product_serial') : result.serial);
             result.uuid = cleanDefaults(result.uuid === '' ? util.getValue(lines, 'product_uuid').toLowerCase() : result.uuid);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.25.1",
+  "version": "5.25.2",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",