systeminformation 5.28.3 → 5.28.5

package/README.md

@@ -99,7 +99,7 @@ changes!):
 - better uuid function to get unique hardware and OS UUIDs
 - better/extended cpu info detection
 - better/extended system info detection
-- Apple Silicon M1/M2/M3 support
+- Apple Silicon M1/M2/M3/M4/M5 support
 - better Raspberry-PI detection
 - systeminformation website updated and extended with full documentation and
   examples [systeminformation.io][systeminformation-url]

package/lib/cpu.js

@@ -1238,7 +1238,7 @@ function getCpuCurrentSpeedSync() {
   const cores = [];
   const speeds = [];
 
-  if (cpus?.length && Object.prototype.hasOwnProperty.call(cpus[0], 'speed')) {
+  if (cpus && cpus.length && Object.prototype.hasOwnProperty.call(cpus[0], 'speed')) {
     for (let i in cpus) {
       speeds.push(cpus[i].speed > 100 ? (cpus[i].speed + 1) / 1000 : cpus[i].speed / 10);
     }
@@ -1256,7 +1256,7 @@ function getCpuCurrentSpeedSync() {
     }
   }
 
-  if (speeds?.length) {
+  if (speeds && speeds.length) {
     try {
       for (const i in speeds) {
         avgFreq = avgFreq + speeds[i];
@@ -1545,7 +1545,7 @@ function cpuTemperature(callback) {
           if (result.max) {
             result.max = Math.round(result.max * 100) / 100;
           }
-          if (result?.cores.length) {
+          if (result && result.cores && result.cores.length) {
             for (let i = 0; i < result.cores.length; i++) {
               result.cores[i] = Math.round(result.cores[i] * 100) / 100;
             }
@@ -1565,7 +1565,7 @@ function cpuTemperature(callback) {
             // round to 2 digits
             result.chipset = Math.round(res.soc * 100) / 100;
           }
-          if (res?.cpuDieTemps.length) {
+          if (res && res.cpuDieTemps.length) {
             for (const temp of res.cpuDieTemps) {
               result.cores.push(Math.round(temp * 100) / 100);
             }
@@ -2204,7 +2204,7 @@ function getFullLoad() {
 
       let result = 0;
 
-      if (cpus?.length) {
+      if (cpus && cpus.length) {
         for (let i = 0, len = cpus.length; i < len; i++) {
           const cpu = cpus[i].times;
           totalUser += cpu.user;

package/lib/filesystem.js

@@ -75,7 +75,7 @@ function fsSize(drive, callback) {
     if (stdout.toString().toLowerCase().indexOf('filesystem')) {
       let removeLines = 0;
       for (let i = 0; i < lines.length; i++) {
-        if (lines[i]?.toLowerCase().startsWith('filesystem')) {
+        if (lines[i] && lines[i].toLowerCase().startsWith('filesystem')) {
           removeLines = i;
         }
       }
@@ -194,11 +194,10 @@ function fsSize(drive, callback) {
             }
             resolve(data);
           } else {
-            exec('df -kPT', { maxBuffer: 1024 * 1024 }, (error, stdout) => {
-              if (!error) {
-                const lines = filterLines(stdout);
-                data = parseDf(lines);
-              }
+            exec('df -kPT 2>/dev/null', { maxBuffer: 1024 * 1024 }, (error, stdout) => {
+              // fixed issue alpine fallback
+              const lines = filterLines(stdout);
+              data = parseDf(lines);
               if (callback) {
                 callback(data);
               }
@@ -491,7 +490,7 @@ function raidMatchLinux(data) {
         element.label = mdData.label; // <- assign label info
         element.uuid = mdData.uuid; // <- assign uuid info
 
-        if (mdData.members?.length && mdData.raid === element.type) {
+        if (mdData && mdData.members && mdData.members.length && mdData.raid === element.type) {
           result = result.map((blockdevice) => {
             if (blockdevice.fsType === 'linux_raid_member' && mdData.members.indexOf(blockdevice.name) >= 0) {
               blockdevice.group = element.name;
@@ -778,7 +777,7 @@ function calcFsSpeed(rx, wx) {
     ms: 0
   };
 
-  if (_fs_speed?.ms) {
+  if (_fs_speed && _fs_speed.ms) {
     result.rx = rx;
     result.wx = wx;
     result.tx = result.rx + result.wx;
@@ -829,7 +828,7 @@ function fsStats(callback) {
 
       let rx = 0;
       let wx = 0;
-      if ((_fs_speed && !_fs_speed.ms) || (_fs_speed?.ms && Date.now() - _fs_speed.ms >= 500)) {
+      if ((_fs_speed && !_fs_speed.ms) || (_fs_speed && _fs_speed.ms && Date.now() - _fs_speed.ms >= 500)) {
         if (_linux) {
           // exec("df -k | grep /dev/", function(error, stdout) {
           const procLsblk = exec('lsblk -r 2>/dev/null | grep /', { maxBuffer: 1024 * 1024 }, (error, stdout) => {
@@ -951,7 +950,7 @@ function calcDiskIO(rIO, wIO, rWaitTime, wWaitTime, tWaitTime) {
     tWaitPercent: null,
     ms: 0
   };
-  if (_disk_io?.ms) {
+  if (_disk_io && _disk_io.ms) {
     result.rIO = rIO;
     result.wIO = wIO;
     result.tIO = rIO + wIO;
@@ -1033,7 +1032,7 @@ function disksIO(callback) {
       let wWaitTime = 0;
       let tWaitTime = 0;
 
-      if ((_disk_io && !_disk_io.ms) || (_disk_io?.ms && Date.now() - _disk_io.ms >= 500)) {
+      if ((_disk_io && !_disk_io.ms) || (_disk_io && _disk_io.ms && Date.now() - _disk_io.ms >= 500)) {
         if (_linux || _freebsd || _openbsd || _netbsd) {
           // prints Block layer statistics for all mounted volumes
           // var cmd = "for mount in `lsblk | grep / | sed -r 's/│ └─//' | cut -d ' ' -f 1`; do cat /sys/block/$mount/stat | sed -r 's/ +/;/g' | sed -r 's/^;//'; done";
@@ -1295,7 +1294,7 @@ function diskLayout(callback) {
                   for (let i = 0; i < result.length; i++) {
                     if (result[i].BSDName === diskBSDName) {
                       result[i].smartStatus = disk.smart_status.passed ? 'Ok' : disk.smart_status.passed === false ? 'Predicted Failure' : 'unknown';
-                      if (disk.temperature?.current) {
+                      if (disk.temperature && disk.temperature.current) {
                         result[i].temperature = disk.temperature.current;
                       }
                       result[i].smartData = disk;
@@ -1581,7 +1580,7 @@ function diskLayout(callback) {
           if (util.smartMonToolsInstalled()) {
             try {
               const smartDev = JSON.parse(execSync('smartctl --scan -j').toString());
-              if (smartDev?.devices && smartDev.devices.length > 0) {
+              if (smartDev && smartDev.devices && smartDev.devices.length > 0) {
                 smartDev.devices.forEach((dev) => {
                   workload.push(execPromiseSave(`smartctl -j -a ${dev.name}`, util.execOptsWin));
                 });
@@ -1661,8 +1660,9 @@ function diskLayout(callback) {
                     const serialNum = smartData.serial_number;
                     const i = util.findObjectByKey(result, 'serialNum', serialNum);
                     if (i !== -1) {
-                      result[i].smartStatus = smartData.smart_status?.passed ? 'Ok' : smartData.smart_status && smartData.smart_status.passed === false ? 'Predicted Failure' : 'unknown';
-                      if (smartData.temperature?.current) {
+                      result[i].smartStatus =
+                        smartData.smart_status && smartData.smart_status.passed ? 'Ok' : smartData.smart_status && smartData.smart_status.passed === false ? 'Predicted Failure' : 'unknown';
+                      if (smartData.temperature && smartData.temperature.current) {
                         result[i].temperature = smartData.temperature.current;
                       }
                       result[i].smartData = smartData;

package/lib/util.js

@@ -375,7 +375,7 @@ function getWmic() {
         } else {
           wmicPath = 'wmic';
         }
-      } catch (e) {
+      } catch {
         wmicPath = 'wmic';
       }
     }
@@ -471,7 +471,7 @@ function powerShellRelease() {
       _psChild.stdin.end();
       _psPersistent = false;
     }
-  } catch (e) {
+  } catch {
     if (_psChild) {
       _psChild.kill();
     }
@@ -480,11 +480,6 @@ function powerShellRelease() {
 }
 
 function powerShell(cmd) {
-  /// const pattern = [
-  ///   '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
-  ///   '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))'
-  /// ].join('|');
-
   if (_psPersistent) {
     const id = Math.random().toString(36).substring(2, 12);
     return new Promise((resolve) => {
@@ -502,7 +497,7 @@ function powerShell(cmd) {
           if (_psChild && _psChild.pid) {
             _psChild.stdin.write(_psToUTF8 + 'echo ' + _psCmdStart + id + _psIdSeperator + '; ' + os.EOL + cmd + os.EOL + 'echo ' + _psCmdSeperator + os.EOL);
           }
-        } catch (e) {
+        } catch {
           resolve('');
         }
       });
@@ -513,7 +508,13 @@ function powerShell(cmd) {
     return new Promise((resolve) => {
       process.nextTick(() => {
         try {
-          const child = spawn(_powerShell, ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-ExecutionPolicy', 'Unrestricted', '-Command', cmd], {
+          const osVersion = os.release().split('.').map(Number);
+          // windows 7 compatibility issue
+          const spanOptions =
+            osVersion[0] < 10
+              ? ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-']
+              : ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-ExecutionPolicy', 'Unrestricted', '-Command', cmd];
+          const child = spawn(_powerShell, spanOptions, {
             stdio: 'pipe',
             windowsHide: true,
             maxBuffer: 1024 * 102400,
@@ -543,18 +544,20 @@ function powerShell(cmd) {
               child.kill();
               resolve(result);
             });
-            // try {
-            //   child.stdin.write(_psToUTF8 + cmd + os.EOL);
-            //   child.stdin.write('exit' + os.EOL);
-            //   child.stdin.end();
-            // } catch (e) {
-            //   child.kill();
-            //   resolve(result);
-            // }
+            if (osVersion[0] < 10) {
+              try {
+                child.stdin.write(_psToUTF8 + cmd + os.EOL);
+                child.stdin.write('exit' + os.EOL);
+                child.stdin.end();
+              } catch {
+                child.kill();
+                resolve(result);
+              }
+            }
           } else {
             resolve(result);
           }
-        } catch (e) {
+        } catch {
           resolve(result);
         }
       });
@@ -1124,7 +1127,7 @@ function getRpiGpu(cpuinfo) {
     try {
       cpuinfo = fs.readFileSync('/proc/cpuinfo', { encoding: 'utf8' }).toString().split('\n');
       _rpi_cpuinfo = cpuinfo;
-    } catch (e) {
+    } catch {
       return false;
     }
   }
@@ -1140,22 +1143,23 @@ function getRpiGpu(cpuinfo) {
 }
 
 function promiseAll(promises) {
-  const resolvingPromises = promises.map(function (promise) {
-    return new Promise(function (resolve) {
-      let payload = new Array(2);
-      promise
-        .then(function (result) {
-          payload[0] = result;
-        })
-        .catch(function (error) {
-          payload[1] = error;
-        })
-        .then(function () {
-          // The wrapped Promise returns an array: 0 = result, 1 = error ... we resolve all
-          resolve(payload);
-        });
-    });
-  });
+  const resolvingPromises = promises.map(
+    (promise) =>
+      new Promise((resolve) => {
+        const payload = new Array(2);
+        promise
+          .then((result) => {
+            payload[0] = result;
+          })
+          .catch((error) => {
+            payload[1] = error;
+          })
+          .then(() => {
+            // The wrapped Promise returns an array: 0 = result, 1 = error ... we resolve all
+            resolve(payload);
+          });
+      })
+  );
   const errors = [];
   const results = [];
 

package/package.json

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