@depup/systeminformation 5.31.5-depup.0 → 5.33.6-depup.0

package/lib/util.js

@@ -201,14 +201,15 @@ function parseTime(t, pmDesignator) {
     if (parts[2]) {
       parts[1] += parts[2];
     }
+    const p1 = (parts[1] || '').toLowerCase();
     let isPM =
-      (parts[1] && parts[1].toLowerCase().indexOf('pm') > -1) ||
-      parts[1].toLowerCase().indexOf('p.m.') > -1 ||
-      parts[1].toLowerCase().indexOf('p. m.') > -1 ||
-      parts[1].toLowerCase().indexOf('n') > -1 ||
-      parts[1].toLowerCase().indexOf('ch') > -1 ||
-      parts[1].toLowerCase().indexOf('ös') > -1 ||
-      (pmDesignator && parts[1].toLowerCase().indexOf(pmDesignator) > -1);
+      p1.indexOf('pm') > -1 ||
+      p1.indexOf('p.m.') > -1 ||
+      p1.indexOf('p. m.') > -1 ||
+      p1.indexOf('n') > -1 ||
+      p1.indexOf('ch') > -1 ||
+      p1.indexOf('ös') > -1 ||
+      (pmDesignator && p1.indexOf(pmDesignator) > -1);
     hour = parseInt(parts[0], 10);
     min = parseInt(parts[1], 10);
     hour = isPM && hour < 12 ? hour + 12 : hour;
@@ -364,7 +365,8 @@ function getPowershell() {
 }
 
 function getVboxmanage() {
-  return _windows ? `"${process.env.VBOX_INSTALL_PATH || process.env.VBOX_MSI_INSTALL_PATH}\\VBoxManage.exe"` : 'vboxmanage';
+  const vboxPath = (process.env.VBOX_INSTALL_PATH || process.env.VBOX_MSI_INSTALL_PATH || '').replace(/["%!^&|<>`$;\r\n]/g, '');
+  return _windows ? `"${vboxPath}\\VBoxManage.exe"` : 'vboxmanage';
 }
 
 function powerShellProceedResults(data) {
@@ -410,9 +412,12 @@ function powerShellStart() {
       _psPersistent = true;
       _psChild.stdout.on('data', (data) => {
         _psResult = _psResult + data.toString('utf8');
-        if (data.indexOf(_psCmdSeperator) >= 0) {
-          powerShellProceedResults(_psResult);
-          _psResult = '';
+        let sepIndex = _psResult.indexOf(_psCmdSeperator);
+        while (sepIndex >= 0) {
+          const end = sepIndex + _psCmdSeperator.length;
+          powerShellProceedResults(_psResult.slice(0, end));
+          _psResult = _psResult.slice(end);
+          sepIndex = _psResult.indexOf(_psCmdSeperator);
         }
       });
       _psChild.stderr.on('data', () => {
@@ -621,7 +626,7 @@ function smartMonToolsInstalled() {
       const pathArray = execSync('which smartctl 2>/dev/null', execOptsLinux).toString().split('\r\n');
       _smartMonToolsInstalled = pathArray.length > 0;
     } catch {
-      util.noop();
+      noop();
     }
   }
   return _smartMonToolsInstalled;
@@ -734,6 +739,9 @@ function sanitizeShellString(str, strict) {
         s[i] === '&' ||
         s[i] === ']' ||
         s[i] === '#' ||
+        s[i] === '%' ||
+        s[i] === '!' ||
+        s[i] === '^' ||
         s[i] === '\\' ||
         s[i] === '\t' ||
         s[i] === '\n' ||
@@ -757,6 +765,20 @@ function sanitizeShellString(str, strict) {
   return result;
 }
 
+function sanitizeContainerID(str) {
+  const s = String(str || '')
+    .substring(0, 2000)
+    .replace(/[^a-zA-Z0-9_.,*-]/g, '');
+  return s.indexOf('..') === -1 ? s : '';
+}
+
+function sanitizeImageID(str) {
+  const s = String(str || '')
+    .substring(0, 2000)
+    .replace(/[^a-zA-Z0-9_.,:@/-]/g, '');
+  return s.indexOf('..') === -1 ? s : '';
+}
+
 function isPrototypePolluted() {
   const s = '1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
   let notPolluted = true;
@@ -830,6 +852,22 @@ function isPrototypePolluted() {
   return !notPolluted;
 }
 
+function sanitizeString(str, strict) {
+  if (typeof strict === 'undefined') {
+    strict = false;
+  }
+  let result = '';
+  const s = isPrototypePolluted() ? '---' : sanitizeShellString(str, strict);
+  const l = mathMin(s.length, 2000);
+
+  for (let i = 0; i <= l; i++) {
+    if (s[i] !== undefined) {
+      result = result + s[i];
+    }
+  }
+  return result;
+}
+
 function hex2bin(hex) {
   return ('00000000' + parseInt(hex, 16).toString(2)).substr(-8);
 }
@@ -1149,7 +1187,7 @@ function promiseAll(promises) {
 }
 
 function promisify(nodeStyleFunction) {
-  return () => {
+  return function () {
     const args = Array.prototype.slice.call(arguments);
     return new Promise((resolve, reject) => {
       args.push((err, data) => {
@@ -1165,7 +1203,7 @@ function promisify(nodeStyleFunction) {
 }
 
 function promisifySave(nodeStyleFunction) {
-  return () => {
+  return function () {
     const args = Array.prototype.slice.call(arguments);
     return new Promise((resolve) => {
       args.push((err, data) => {
@@ -1269,7 +1307,7 @@ function plistParser(xmlStr) {
             if (depth > 1 && metaData[depth - 2].tagStart === 'array') {
               metaData[depth - 2].data.push(metaData[depth - 1].data);
             }
-            if (depth > 1 && metaData[depth - 2].tagStart === 'dict') {
+            if (depth > 1 && metaData[depth - 2].tagStart === 'dict' && !isProtoKey(metaData[depth - 1].key)) {
               metaData[depth - 2].data[metaData[depth - 1].key] = metaData[depth - 1].data;
             }
             depth--;
@@ -1299,7 +1337,7 @@ function plistParser(xmlStr) {
               if (depth > 0 && metaData[depth - 1].tagStart === 'array') {
                 metaData[depth - 1].data.push(metaData[depth].data);
               }
-              if (depth > 0 && metaData[depth - 1].tagStart === 'dict') {
+              if (depth > 0 && metaData[depth - 1].tagStart === 'dict' && !isProtoKey(metaData[depth].key)) {
                 metaData[depth - 1].data[metaData[depth].key] = metaData[depth].data;
               }
             }
@@ -1373,8 +1411,8 @@ function plistReader(output) {
 
 function semverCompare(v1, v2) {
   let res = 0;
-  const parts1 = v1.split('.');
-  const parts2 = v2.split('.');
+  const parts1 = v1.split('.').map((p) => parseInt(p, 10) || 0);
+  const parts2 = v2.split('.').map((p) => parseInt(p, 10) || 0);
   if (parts1[0] < parts2[0]) {
     res = 1;
   } else if (parts1[0] > parts2[0]) {
@@ -1399,12 +1437,30 @@ function semverCompare(v1, v2) {
   return res;
 }
 
+// Mac model name and serial number / model identifier
+
 function getAppleModel(key) {
   const appleModelIds = [
     {
-      key: 'Mac17,7',
+      key: 'Mac17,9',
+      name: 'MacBook Pro',
+      size: '14-inch',
+      processor: 'M5 Pro',
+      year: '2026',
+      additional: ''
+    },
+    {
+      key: 'Mac17,8',
       name: 'MacBook Pro',
       size: '16-inch',
+      processor: 'M5 Pro',
+      year: '2026',
+      additional: ''
+    },
+    {
+      key: 'Mac17,7',
+      name: 'MacBook Pro',
+      size: '14-inch',
       processor: 'M5 Max',
       year: '2026',
       additional: ''
@@ -1412,7 +1468,7 @@ function getAppleModel(key) {
     {
       key: 'Mac17,6',
       name: 'MacBook Pro',
-      size: '14-inch',
+      size: '16-inch',
       processor: 'M5 Max',
       year: '2026',
       additional: ''
@@ -2702,8 +2758,21 @@ function checkWebsite(url, timeout = 5000) {
 function cleanString(str) {
   return str.replace(/To Be Filled By O.E.M./g, '');
 }
+
+function grep(str, pattern) {
+  const result = str
+    .split('\n')
+    .filter((line) => line.includes(pattern))
+    .join('\n');
+  return result;
+}
+
 function noop() {}
 
+function isProtoKey(key) {
+  return key === '__proto__' || key === 'constructor' || key === 'prototype';
+}
+
 exports.toInt = toInt;
 exports.splitByNumber = splitByNumber;
 exports.execOptsWin = execOptsWin;
@@ -2732,7 +2801,10 @@ exports.noop = noop;
 exports.isRaspberry = isRaspberry;
 exports.isRaspbian = isRaspbian;
 exports.sanitizeShellString = sanitizeShellString;
+exports.sanitizeContainerID = sanitizeContainerID;
+exports.sanitizeImageID = sanitizeImageID;
 exports.isPrototypePolluted = isPrototypePolluted;
+exports.sanitizeString = sanitizeString;
 exports.decodePiCpuinfo = decodePiCpuinfo;
 exports.getRpiGpu = getRpiGpu;
 exports.promiseAll = promiseAll;
@@ -2757,4 +2829,5 @@ exports.semverCompare = semverCompare;
 exports.getAppleModel = getAppleModel;
 exports.checkWebsite = checkWebsite;
 exports.cleanString = cleanString;
+exports.grep = grep;
 exports.getPowershell = getPowershell;

package/lib/virtualbox.js

@@ -35,8 +35,11 @@ function vboxInfo(callback) {
             try {
               if (running) {
                 const sinceDateObj = new Date(runningSinceString);
-                const offset = sinceDateObj.getTimezoneOffset();
-                runningSince = Math.round((Date.now() - Date.parse(sinceDateObj)) / 1000) + offset * 60;
+                const parsed = Date.parse(sinceDateObj);
+                if (!isNaN(parsed)) {
+                  const offset = sinceDateObj.getTimezoneOffset();
+                  runningSince = Math.round((Date.now() - parsed) / 1000) + offset * 60;
+                }
               }
             } catch {
               util.noop();
@@ -46,8 +49,11 @@ function vboxInfo(callback) {
             try {
               if (!running) {
                 const sinceDateObj = new Date(stoppedSinceString);
-                const offset = sinceDateObj.getTimezoneOffset();
-                stoppedSince = Math.round((Date.now() - Date.parse(sinceDateObj)) / 1000) + offset * 60;
+                const parsed = Date.parse(sinceDateObj);
+                if (!isNaN(parsed)) {
+                  const offset = sinceDateObj.getTimezoneOffset();
+                  stoppedSince = Math.round((Date.now() - parsed) / 1000) + offset * 60;
+                }
               }
             } catch {
               util.noop();

package/lib/wifi.js

@@ -18,7 +18,7 @@ const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
 const util = require('./util');
 
-let _platform = process.platform;
+const _platform = process.platform;
 
 const _linux = _platform === 'linux' || _platform === 'android';
 const _darwin = _platform === 'darwin';
@@ -26,6 +26,9 @@ const _windows = _platform === 'win32';
 
 function wifiDBFromQuality(quality) {
   const qual = parseFloat(quality);
+  if (isNaN(qual)) {
+    return null;
+  }
   if (qual < 0) {
     return 0;
   }
@@ -36,7 +39,11 @@ function wifiDBFromQuality(quality) {
 }
 
 function wifiQualityFromDB(db) {
-  const result = 2 * (parseFloat(db) + 100);
+  const dbValue = parseFloat(db);
+  if (isNaN(dbValue)) {
+    return null;
+  }
+  const result = 2 * (dbValue + 100);
   return result <= 100 ? result : 100;
 }
 
@@ -122,7 +129,7 @@ function wifiFrequencyFromChannel(channel) {
 
 function wifiChannelFromFrequencs(frequency) {
   let channel = 0;
-  for (let key in _wifi_frequencies) {
+  for (const key in _wifi_frequencies) {
     if ({}.hasOwnProperty.call(_wifi_frequencies, key)) {
       if (_wifi_frequencies[key] === frequency) {
         channel = util.toInt(key);
@@ -190,26 +197,33 @@ function nmiDeviceLinux(iface) {
   try {
     const lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
     const ssid = util.getValue(lines, 'GENERAL.CONNECTION');
+    const uuid = util.getValue(lines, 'GENERAL.CON-UUID');
     return {
       iface,
       type: util.getValue(lines, 'GENERAL.TYPE'),
       vendor: util.getValue(lines, 'GENERAL.VENDOR'),
       product: util.getValue(lines, 'GENERAL.PRODUCT'),
       mac: util.getValue(lines, 'GENERAL.HWADDR').toLowerCase(),
-      ssid: ssid !== '--' ? ssid : null
+      ssid: ssid !== '--' ? ssid : null,
+      uuid: uuid !== '--' ? uuid : null
     };
   } catch {
     return {};
   }
 }
 
-function nmiConnectionLinux(ssid) {
-  const cmd = `nmcli -t --show-secrets connection show ${ssid} 2>/dev/null`;
+function nmiConnectionLinux(uuid) {
+  // query by connection UUID instead of SSID: profile names may differ from the SSID
+  if (!uuid || !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(uuid)) {
+    return {};
+  }
+  const cmd = `nmcli -t connection show ${uuid} 2>/dev/null`;
   try {
     const lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
+    const ssid = util.getValue(lines, '802-11-wireless.ssid');
     const bssid = util.getValue(lines, '802-11-wireless.seen-bssids').toLowerCase();
     return {
-      ssid: ssid !== '--' ? ssid : null,
+      ssid: ssid || null,
       uuid: util.getValue(lines, 'connection.uuid'),
       type: util.getValue(lines, 'connection.type'),
       autoconnect: util.getValue(lines, 'connection.autoconnect') === 'yes',
@@ -225,7 +239,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', '='));
@@ -280,7 +294,9 @@ 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 ');
+    const 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;
     }
@@ -324,11 +340,11 @@ function getWifiNetworkListIw(iface) {
           if (l.indexOf('pairwise cipher') >= 0) {
             const parts = l.split(':');
             if (parts.length > 1) {
-              if (parts[1].indexOf('tkip')) {
+              if (parts[1].indexOf('tkip') >= 0) {
                 wpaFlag = wpaFlag ? 'TKIP/' + wpaFlag : 'TKIP';
-              } else if (parts[1].indexOf('ccmp')) {
+              } else if (parts[1].indexOf('ccmp') >= 0) {
                 wpaFlag = wpaFlag ? 'CCMP/' + wpaFlag : 'CCMP';
-              } else if (parts[1].indexOf('proprietary')) {
+              } else if (parts[1].indexOf('proprietary') >= 0) {
                 wpaFlag = wpaFlag ? 'PROP/' + wpaFlag : 'PROP';
               }
             }
@@ -336,9 +352,9 @@ function getWifiNetworkListIw(iface) {
           if (l.indexOf('authentication suites') >= 0) {
             const parts = l.split(':');
             if (parts.length > 1) {
-              if (parts[1].indexOf('802.1x')) {
+              if (parts[1].indexOf('802.1x') >= 0) {
                 wpaFlag = wpaFlag ? '802.1x/' + wpaFlag : '802.1x';
-              } else if (parts[1].indexOf('psk')) {
+              } else if (parts[1].indexOf('psk') >= 0) {
                 wpaFlag = wpaFlag ? 'PSK/' + wpaFlag : 'PSK';
               }
             }
@@ -424,15 +440,7 @@ function wifiNetworks(callback) {
               }
             });
             if (iface) {
-              let ifaceSanitized = '';
-              const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface, true);
-              const l = util.mathMin(s.length, 2000);
-
-              for (let i = 0; i <= l; i++) {
-                if (s[i] !== undefined) {
-                  ifaceSanitized = ifaceSanitized + s[i];
-                }
-              }
+              const ifaceSanitized = util.sanitizeString(iface, true);
 
               const res = getWifiNetworkListIw(ifaceSanitized);
               if (res === -1) {
@@ -495,6 +503,9 @@ function wifiNetworks(callback) {
 
               bssidsParts.forEach((bssidPart) => {
                 const bssidLines = bssidPart.split(os.EOL);
+                if (bssidLines.length < 4) {
+                  return;
+                }
                 const bssidLine = bssidLines[0].split(':');
                 bssidLine.shift();
                 const bssid = bssidLine.join(':').trim().toLowerCase();
@@ -585,30 +596,13 @@ function wifiConnections(callback) {
         const ifaces = ifaceListLinux();
         const networkList = getWifiNetworkListNmi();
         ifaces.forEach((ifaceDetail) => {
-          let ifaceSanitized = '';
-          const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ifaceDetail.iface, true);
-          const ll = util.mathMin(s.length, 2000);
-
-          for (let i = 0; i <= ll; i++) {
-            if (s[i] !== undefined) {
-              ifaceSanitized = ifaceSanitized + s[i];
-            }
-          }
+          const ifaceSanitized = util.sanitizeString(ifaceDetail.iface, true);
 
           const nmiDetails = nmiDeviceLinux(ifaceSanitized);
           const wpaDetails = wpaConnectionLinux(ifaceSanitized);
-          const ssid = nmiDetails.ssid || wpaDetails.ssid;
+          const nmiConnection = nmiConnectionLinux(nmiDetails.uuid);
+          const ssid = nmiConnection.ssid || nmiDetails.ssid || wpaDetails.ssid;
           const network = networkList.filter((nw) => nw.ssid === ssid);
-          let ssidSanitized = '';
-          const t = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ssid, true);
-          const l = util.mathMin(t.length, 32);
-          for (let i = 0; i <= l; i++) {
-            if (t[i] !== undefined) {
-              ssidSanitized = ssidSanitized + t[i];
-            }
-          }
-
-          const nmiConnection = nmiConnectionLinux(ssidSanitized);
           const channel = network && network.length && network[0].channel ? network[0].channel : wpaDetails.channel ? wpaDetails.channel : null;
           const bssid = network && network.length && network[0].bssid ? network[0].bssid : wpaDetails.bssid ? wpaDetails.bssid : null;
           const signalLevel = network && network.length && network[0].signalLevel ? network[0].signalLevel : null;
@@ -760,7 +754,9 @@ function wifiInterfaces(callback) {
       if (_linux) {
         const ifaces = ifaceListLinux();
         ifaces.forEach((ifaceDetail) => {
-          const nmiDetails = nmiDeviceLinux(ifaceDetail.iface);
+          const ifaceSanitized = util.sanitizeString(ifaceDetail.iface, true);
+
+          const nmiDetails = nmiDeviceLinux(ifaceSanitized);
           result.push({
             id: ifaceDetail.id,
             iface: ifaceDetail.iface,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@depup/systeminformation",
-  "version": "5.31.5-depup.0",
+  "version": "5.33.6-depup.0",
   "description": "Advanced, lightweight system and OS information library (with updated dependencies)",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",
@@ -13,7 +13,8 @@
   "types": "./lib/index.d.ts",
   "scripts": {
     "test": "node ./test/test.js",
-    "testDeno": "deno run -A ./test/test.js"
+    "testDeno": "deno run -A ./test/test.js",
+    "testAll": "node ./test/testAll.js"
   },
   "files": [
     "lib/",
@@ -104,14 +105,14 @@
     "android"
   ],
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=10.0.0"
   },
   "depup": {
     "changes": {},
     "depsUpdated": 0,
     "originalPackage": "systeminformation",
-    "originalVersion": "5.31.5",
-    "processedAt": "2026-03-19T08:18:31.754Z",
+    "originalVersion": "5.33.6",
+    "processedAt": "2026-08-30T00:59:35.725Z",
     "smokeTest": "passed"
   }
 }