systeminformation 5.31.14 → 5.31.16

package/lib/cpu.js

@@ -1430,7 +1430,7 @@ function cpuTemperature(callback) {
                     else if (s.startsWith('coretemp') || s.startsWith('core')) section = 'core';
                     else if (s.startsWith('k10temp')) section = 'coreAMD';
                     else if (s.startsWith('cpu_thermal') || s.startsWith('cpu-thermal') || s.startsWith('soc_thermal') || s.startsWith('cpu')) section = 'cpuThermal';
-                    else section = 'other'; 
+                    else section = 'other';
                     newSectionStarts = false;
                   }
 
@@ -2016,6 +2016,9 @@ function getLoad() {
         const cpus = os.cpus().map((cpu) => {
           cpu.times.steal = 0;
           cpu.times.guest = 0;
+          if (_windows) {
+            cpu.times.sys = Math.max(0, cpu.times.sys - cpu.times.irq);
+          }
           return cpu;
         });
         let totalUser = 0;
@@ -2230,7 +2233,7 @@ function getFullLoad() {
         for (let i = 0, len = cpus.length; i < len; i++) {
           const cpu = cpus[i].times;
           totalUser += cpu.user;
-          totalSystem += cpu.sys;
+          totalSystem += _windows ? Math.max(0, cpu.sys - cpu.irq) : cpu.sys;
           totalNice += cpu.nice;
           totalIrq += cpu.irq;
           totalIdle += cpu.idle;

package/lib/filesystem.js

@@ -214,7 +214,7 @@ function fsSize(drive, callback) {
       }
       if (_windows) {
         try {
-          const driveSanitized = drive ? util.sanitizeShellString(drive, true) : '';
+          const driveSanitized = drive ? util.sanitizeString(drive, true) : '';
           const cmd = `Get-WmiObject Win32_logicaldisk | select Access,Caption,FileSystem,FreeSpace,Size ${driveSanitized ? '| where -property Caption -eq ' + driveSanitized : ''} | fl`;
           util.powerShell(cmd).then((stdout, error) => {
             if (!error) {
@@ -484,7 +484,7 @@ function raidMatchLinux(data) {
   try {
     data.forEach((element) => {
       if (element.type.startsWith('raid')) {
-        const lines = execSync(`mdadm --export --detail /dev/${element.name}`, util.execOptsLinux).toString().split('\n');
+        const lines = execSync(`mdadm --export --detail /dev/${util.sanitizeString(element.name, true)}`, util.execOptsLinux).toString().split('\n');
         const mdData = decodeMdabmData(lines);
 
         element.label = mdData.label; // <- assign label info

package/lib/network.js

@@ -1337,7 +1337,7 @@ function networkStatsSingle(iface) {
 
   return new Promise((resolve) => {
     process.nextTick(() => {
-      const ifaceSanitized = util.sanitizeString(iface);
+      const ifaceSanitized = util.sanitizeString(iface, true);
 
       let result = {
         iface: ifaceSanitized,

package/lib/wifi.js

@@ -229,7 +229,7 @@ function wpaConnectionLinux(iface) {
   if (!iface) {
     return {};
   }
-  const cmd = `wpa_cli -i ${iface} status 2>&1`;
+  const cmd = `wpa_cli -i ${util.sanitizeString(iface, true)} status 2>&1`;
   try {
     const lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
     const freq = util.toInt(util.getValue(lines, 'freq', '='));
@@ -284,7 +284,7 @@ function getWifiNetworkListNmi() {
 function getWifiNetworkListIw(iface) {
   const result = [];
   try {
-    let iwlistParts = execSync(`export LC_ALL=C; iwlist ${iface} scan 2>&1; unset LC_ALL`, util.execOptsLinux).toString().split('        Cell ');
+    let iwlistParts = execSync(`export LC_ALL=C; iwlist ${util.sanitizeString(iface, true)} scan 2>&1; unset LC_ALL`, util.execOptsLinux).toString().split('        Cell ');
     if (iwlistParts[0].indexOf('resource busy') >= 0) {
       return -1;
     }

package/package.json

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