systeminformation 5.21.7 → 5.21.9

package/lib/battery.js

@@ -127,6 +127,7 @@ module.exports = function (callback) {
               const energy = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_NOW', '='), 10);
               const power = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_POWER_NOW', '='), 10);
               const current = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CURRENT_NOW', '='), 10);
+              const charge = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CHARGE_NOW', '='), 10);
 
               result.percent = parseInt('0' + percent, 10);
               if (result.maxCapacity && result.currentCapacity) {
@@ -140,6 +141,8 @@ module.exports = function (callback) {
               }
               if (energy && power) {
                 result.timeRemaining = Math.floor(energy / power * 60);
+              } else if (current && charge) {
+                result.timeRemaining = Math.floor(charge / current * 60);
               } else if (current && result.currentCapacity) {
                 result.timeRemaining = Math.floor(result.currentCapacity / current * 60);
               }

package/lib/docker.js

@@ -462,7 +462,8 @@ function dockerContainerStats(containerIDs, callback) {
         if (containerIDsSanitized !== '*') {
           containerIDsSanitized = '';
           const s = (util.isPrototypePolluted() ? '' : util.sanitizeShellString(containerIDs, true)).trim();
-          for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+          const l = util.mathMin(s.length, 2000);
+          for (let i = 0; i <= l; i++) {
             if (s[i] !== undefined) {
               s[i].__proto__.toLowerCase = util.stringToLower;
               const sl = s[i].toLowerCase();

package/lib/internet.js

@@ -45,7 +45,8 @@ function inetChecksite(url, callback) {
       }
       let urlSanitized = '';
       const s = util.sanitizeShellString(url, true);
-      for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+      const l = util.mathMin(s.length, 2000);
+      for (let i = 0; i <= l; i++) {
         if (s[i] !== undefined) {
           s[i].__proto__.toLowerCase = util.stringToLower;
           const sl = s[i].toLowerCase();
@@ -143,7 +144,8 @@ function inetLatency(host, callback) {
       }
       let hostSanitized = '';
       const s = (util.isPrototypePolluted() ? '8.8.8.8' : util.sanitizeShellString(host, true)).trim();
-      for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+      const l = util.mathMin(s.length, 2000);
+      for (let i = 0; i <= l; i++) {
         if (!(s[i] === undefined)) {
           s[i].__proto__.toLowerCase = util.stringToLower;
           const sl = s[i].toLowerCase();

package/lib/network.js

@@ -745,7 +745,8 @@ function networkInterfaces(callback, rescan, defaultString) {
 
             let ifaceSanitized = '';
             const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(nic.iface);
-            for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+            const l = util.mathMin(s.length, 2000);
+            for (let i = 0; i <= l; i++) {
               if (s[i] !== undefined) {
                 ifaceSanitized = ifaceSanitized + s[i];
               }
@@ -840,7 +841,8 @@ function networkInterfaces(callback, rescan, defaultString) {
               let iface = dev.split(':')[0].trim().toLowerCase();
               let ifaceSanitized = '';
               const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface);
-              for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+              const l = util.mathMin(s.length, 2000);
+              for (let i = 0; i <= l; i++) {
                 if (s[i] !== undefined) {
                   ifaceSanitized = ifaceSanitized + s[i];
                 }
@@ -973,7 +975,8 @@ function networkInterfaces(callback, rescan, defaultString) {
 
               let ifaceSanitized = '';
               const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(dev);
-              for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+              const l = util.mathMin(s.length, 2000);
+              for (let i = 0; i <= l; i++) {
                 if (s[i] !== undefined) {
                   ifaceSanitized = ifaceSanitized + s[i];
                 }
@@ -1221,7 +1224,8 @@ function networkStatsSingle(iface) {
     process.nextTick(() => {
       let ifaceSanitized = '';
       const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface);
-      for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+      const l = util.mathMin(s.length, 2000);
+      for (let i = 0; i <= l; i++) {
         if (s[i] !== undefined) {
           ifaceSanitized = ifaceSanitized + s[i];
         }

package/lib/processes.js

@@ -131,7 +131,8 @@ function services(srv, callback) {
         srvString.__proto__.trim = util.stringTrim;
 
         const s = util.sanitizeShellString(srv);
-        for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+        const l = util.mathMin(s.length, 2000);
+        for (let i = 0; i <= l; i++) {
           if (s[i] !== undefined) {
             srvString = srvString + s[i];
           }
@@ -986,7 +987,9 @@ function processLoad(proc, callback) {
       processesString.__proto__.trim = util.stringTrim;
 
       const s = util.sanitizeShellString(proc);
-      for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+      const l = util.mathMin(s.length, 2000);
+
+      for (let i = 0; i <= l; i++) {
         if (s[i] !== undefined) {
           processesString = processesString + s[i];
         }

package/lib/util.js

@@ -682,7 +682,8 @@ function sanitizeShellString(str, strict) {
   if (typeof strict === 'undefined') { strict = false; }
   const s = str || '';
   let result = '';
-  for (let i = 0; i <= mathMin(s.length, 2000); i++) {
+  const l = mathMin(s.length, 2000);
+  for (let i = 0; i <= l; i++) {
     if (!(s[i] === undefined ||
       s[i] === '>' ||
       s[i] === '<' ||

package/lib/wifi.js

@@ -403,7 +403,9 @@ function wifiNetworks(callback) {
             if (iface) {
               let ifaceSanitized = '';
               const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface, true);
-              for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+              const l = util.mathMin(s.length, 2000);
+
+              for (let i = 0; i <= l; i++) {
                 if (s[i] !== undefined) {
                   ifaceSanitized = ifaceSanitized + s[i];
                 }
@@ -539,7 +541,9 @@ function wifiConnections(callback) {
         ifaces.forEach(ifaceDetail => {
           let ifaceSanitized = '';
           const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ifaceDetail.iface, true);
-          for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+          const ll = util.mathMin(s.length, 2000);
+
+          for (let i = 0; i <= ll; i++) {
             if (s[i] !== undefined) {
               ifaceSanitized = ifaceSanitized + s[i];
             }
@@ -551,7 +555,8 @@ function wifiConnections(callback) {
           const network = networkList.filter(nw => nw.ssid === ssid);
           let ssidSanitized = '';
           const t = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ssid, true);
-          for (let i = 0; i <= util.mathMin(t.length, 2000); i++) {
+          const l = util.mathMin(t.length, 2000);
+          for (let i = 0; i <= l; i++) {
             if (t[i] !== undefined) {
               ssidSanitized = ssidSanitized + t[i];
             }

package/package.json

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