systeminformation 5.24.2 → 5.24.4

package/lib/docker.js

@@ -453,9 +453,17 @@ function dockerContainerStats(containerIDs, callback) {
           return resolve([]);
         }
         let containerIDsSanitized = '';
-        containerIDsSanitized.__proto__.toLowerCase = util.stringToLower;
-        containerIDsSanitized.__proto__.replace = util.stringReplace;
-        containerIDsSanitized.__proto__.trim = util.stringTrim;
+        try {
+          containerIDsSanitized.__proto__.toLowerCase = util.stringToLower;
+          containerIDsSanitized.__proto__.replace = util.stringReplace;
+          containerIDsSanitized.__proto__.toString = util.stringToString;
+          containerIDsSanitized.__proto__.substr = util.stringSubstr;
+          containerIDsSanitized.__proto__.substring = util.stringSubstring;
+          containerIDsSanitized.__proto__.trim = util.stringTrim;
+          containerIDsSanitized.__proto__.startsWith = util.stringStartWith;
+        } catch (e) {
+          Object.setPrototypeOf(containerIDsSanitized, util.stringObj);
+        }
 
         containerIDsSanitized = containerIDs;
         containerIDsSanitized = containerIDsSanitized.trim();

package/lib/internet.js

@@ -47,7 +47,12 @@ function inetChecksite(url, callback) {
       const l = util.mathMin(s.length, 2000);
       for (let i = 0; i <= l; i++) {
         if (s[i] !== undefined) {
-          s[i].__proto__.toLowerCase = util.stringToLower;
+          try {
+            s[i].__proto__.toLowerCase = util.stringToLower;
+          } catch (e) {
+            Object.setPrototypeOf(s[i], util.stringObj);
+          }
+
           const sl = s[i].toLowerCase();
           if (sl && sl[0] && !sl[1] && sl[0].length === 1) {
             urlSanitized = urlSanitized + sl[0];
@@ -57,7 +62,12 @@ function inetChecksite(url, callback) {
       result.url = urlSanitized;
       try {
         if (urlSanitized && !util.isPrototypePolluted()) {
-          urlSanitized.__proto__.startsWith = util.stringStartWith;
+          try {
+            urlSanitized.__proto__.startsWith = util.stringStartWith;
+          } catch (e) {
+            Object.setPrototypeOf(urlSanitized, util.stringObj);
+          }
+
           if (urlSanitized.startsWith('file:') || urlSanitized.startsWith('gopher:') || urlSanitized.startsWith('telnet:') || urlSanitized.startsWith('mailto:') || urlSanitized.startsWith('news:') || urlSanitized.startsWith('nntp:')) {
             if (callback) { callback(result); }
             return resolve(result);
@@ -108,14 +118,24 @@ function inetLatency(host, callback) {
       const l = util.mathMin(s.length, 2000);
       for (let i = 0; i <= l; i++) {
         if (!(s[i] === undefined)) {
-          s[i].__proto__.toLowerCase = util.stringToLower;
+          try {
+            s[i].__proto__.toLowerCase = util.stringToLower;
+          } catch (e) {
+            Object.setPrototypeOf(s[i], util.stringObj);
+          }
+
           const sl = s[i].toLowerCase();
           if (sl && sl[0] && !sl[1]) {
             hostSanitized = hostSanitized + sl[0];
           }
         }
       }
-      hostSanitized.__proto__.startsWith = util.stringStartWith;
+      try {
+        hostSanitized.__proto__.startsWith = util.stringStartWith;
+      } catch (e) {
+        Object.setPrototypeOf(hostSanitized, util.stringObj);
+      }
+
       if (hostSanitized.startsWith('file:') || hostSanitized.startsWith('gopher:') || hostSanitized.startsWith('telnet:') || hostSanitized.startsWith('mailto:') || hostSanitized.startsWith('news:') || hostSanitized.startsWith('nntp:')) {
         if (callback) { callback(null); }
         return resolve(null);

package/lib/network.js

@@ -1174,9 +1174,17 @@ function networkStats(ifaces, callback) {
         }
         ifaces = ifaces || getDefaultNetworkInterface();
 
-        ifaces.__proto__.toLowerCase = util.stringToLower;
-        ifaces.__proto__.replace = util.stringReplace;
-        ifaces.__proto__.trim = util.stringTrim;
+        try {
+          ifaces.__proto__.toLowerCase = util.stringToLower;
+          ifaces.__proto__.replace = util.stringReplace;
+          ifaces.__proto__.toString = util.stringToString;
+          ifaces.__proto__.substr = util.stringSubstr;
+          ifaces.__proto__.substring = util.stringSubstring;
+          ifaces.__proto__.trim = util.stringTrim;
+          ifaces.__proto__.startsWith = util.stringStartWith;
+        } catch (e) {
+          Object.setPrototypeOf(ifaces, util.stringObj);
+        }
 
         ifaces = ifaces.trim().toLowerCase().replace(/,+/g, '|');
         ifacesArray = ifaces.split('|');

package/lib/processes.js

@@ -126,9 +126,17 @@ function services(srv, callback) {
 
       if (srv) {
         let srvString = '';
-        srvString.__proto__.toLowerCase = util.stringToLower;
-        srvString.__proto__.replace = util.stringReplace;
-        srvString.__proto__.trim = util.stringTrim;
+        try {
+          srvString.__proto__.toLowerCase = util.stringToLower;
+          srvString.__proto__.replace = util.stringReplace;
+          srvString.__proto__.toString = util.stringToString;
+          srvString.__proto__.substr = util.stringSubstr;
+          srvString.__proto__.substring = util.stringSubstring;
+          srvString.__proto__.trim = util.stringTrim;
+          srvString.__proto__.startsWith = util.stringStartWith;
+        } catch (e) {
+          Object.setPrototypeOf(srvString, util.stringObj);
+        }
 
         const s = util.sanitizeShellString(srv);
         const l = util.mathMin(s.length, 2000);
@@ -982,9 +990,18 @@ function processLoad(proc, callback) {
       }
 
       let processesString = '';
-      processesString.__proto__.toLowerCase = util.stringToLower;
-      processesString.__proto__.replace = util.stringReplace;
-      processesString.__proto__.trim = util.stringTrim;
+      try {
+        processesString.__proto__.toLowerCase = util.stringToLower;
+        processesString.__proto__.replace = util.stringReplace;
+        processesString.__proto__.toString = util.stringToString;
+        processesString.__proto__.substr = util.stringSubstr;
+        processesString.__proto__.substring = util.stringSubstring;
+        processesString.__proto__.trim = util.stringTrim;
+        processesString.__proto__.startsWith = util.stringStartWith;
+
+      } catch (e) {
+        Object.setPrototypeOf(processesString, util.stringObj);
+      }
 
       const s = util.sanitizeShellString(proc);
       const l = util.mathMin(s.length, 2000);

package/lib/util.js

@@ -84,10 +84,12 @@ function splitByNumber(str) {
   return [cpart, num];
 }
 
+const stringObj = new String();
 const stringReplace = new String().replace;
 const stringToLower = new String().toLowerCase;
 const stringToString = new String().toString;
 const stringSubstr = new String().substr;
+const stringSubstring = new String().substring;
 const stringTrim = new String().trim;
 const stringStartWith = new String().startsWith;
 const mathMin = Math.min;
@@ -758,11 +760,17 @@ function isPrototypePolluted() {
   let notPolluted = true;
   let st = '';
 
-  st.__proto__.replace = stringReplace;
-  st.__proto__.toLowerCase = stringToLower;
-  st.__proto__.toString = stringToString;
-  st.__proto__.substr = stringSubstr;
-
+  try {
+    st.__proto__.replace = stringReplace;
+    st.__proto__.toLowerCase = stringToLower;
+    st.__proto__.toString = stringToString;
+    st.__proto__.substr = stringSubstr;
+    st.__proto__.substring = stringSubstring;
+    st.__proto__.trim = stringTrim;
+    st.__proto__.startsWith = stringStartWith;
+  } catch (e) {
+    Object.setPrototypeOf(st, stringObj);
+  }
   notPolluted = notPolluted || (s.length !== 62);
   const ms = Date.now();
   if (typeof ms === 'number' && ms > 1600000000000) {
@@ -782,7 +790,11 @@ function isPrototypePolluted() {
     // string manipulation
     let p = Math.random() * l * 0.9999999999;
     let stm = st.substr(0, p) + ' ' + st.substr(p, 2000);
-    stm.__proto__.replace = stringReplace;
+    try {
+      stm.__proto__.replace = stringReplace;
+    } catch (e) {
+      Object.setPrototypeOf(stm, stringObj);
+    }
     let sto = stm.replace(/ /g, '');
     notPolluted = notPolluted && st === sto;
     p = Math.random() * l * 0.9999999999;
@@ -803,7 +815,11 @@ function isPrototypePolluted() {
     notPolluted = notPolluted && (stl.length === l) && stl[l - 1] && !(stl[l]);
     for (let i = 0; i < l; i++) {
       const s1 = st[i];
-      s1.__proto__.toLowerCase = stringToLower;
+      try {
+        s1.__proto__.toLowerCase = stringToLower;
+      } catch (e) {
+        Object.setPrototypeOf(st, stringObj);
+      }
       const s2 = stl ? stl[i] : '';
       const s1l = s1.toLowerCase();
       notPolluted = notPolluted && s1l[0] === s2 && s1l[0] && !(s1l[1]);
@@ -2561,10 +2577,12 @@ exports.smartMonToolsInstalled = smartMonToolsInstalled;
 exports.linuxVersion = linuxVersion;
 exports.plistParser = plistParser;
 exports.plistReader = plistReader;
+exports.stringObj = stringObj;
 exports.stringReplace = stringReplace;
 exports.stringToLower = stringToLower;
 exports.stringToString = stringToString;
 exports.stringSubstr = stringSubstr;
+exports.stringSubstring = stringSubstring;
 exports.stringTrim = stringTrim;
 exports.stringStartWith = stringStartWith;
 exports.mathMin = mathMin;

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "systeminformation",
-  "version": "5.24.2",
+  "version": "5.24.4",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",
   "homepage": "https://systeminformation.io",
   "main": "./lib/index.js",
+  "type": "commonjs",
   "bin": {
     "systeminformation": "lib/cli.js"
   },
   "types": "./lib/index.d.ts",
   "scripts": {
-    "test": "node ./test/test.js"
+    "test": "node ./test/test.js",
+    "testDeno": "deno run -A ./test/test.js"
   },
   "files": [
     "lib/"