systeminformation 5.31.16 → 5.32.0

package/lib/osinfo.js

@@ -190,7 +190,7 @@ function getWindowsRelease(build) {
 // FQDN
 
 function getFQDN() {
-  let fqdn = os.hostname;
+  let fqdn = os.hostname();
   if (_linux || _darwin) {
     try {
       const stdout = execSync('hostname -f 2>/dev/null', util.execOptsLinux);
@@ -292,7 +292,7 @@ function osInfo(callback) {
           const distro = util.getValue(lines, 'kern.ostype');
           const logofile = getLogoFile(distro);
           const release = util.getValue(lines, 'kern.osrelease').split('-')[0];
-          const serial = util.getValue(lines, 'kern.uuid');
+          const serial = util.getValue(lines, 'kern.hostuuid');
           const bootmethod = util.getValue(lines, 'machdep.bootmethod');
           const uefiConf = stdout.toString().indexOf('<type>efi</type>') >= 0;
           const uefi = bootmethod ? bootmethod.toLowerCase().indexOf('uefi') >= 0 : uefiConf ? uefiConf : null;
@@ -547,6 +547,13 @@ function versions(apps, callback) {
       const appsObj = checkVersionParam(apps);
       let totalFunctions = appsObj.counter;
 
+      if (totalFunctions <= 0) {
+        if (callback) {
+          callback(appsObj.versions);
+        }
+        return resolve(appsObj.versions);
+      }
+
       let functionProcessed = (() => {
         return () => {
           if (--totalFunctions === 0) {
@@ -824,6 +831,7 @@ function versions(apps, callback) {
                   if (appsObj.versions.postgresql.includes('(') && postgresql.length >= 2 && !postgresql[postgresql.length - 2].includes('(')) {
                     appsObj.versions.postgresql = postgresql[postgresql.length - 2];
                   }
+                  functionProcessed();
                 } else {
                   exec('pg_config --version', (error, stdout) => {
                     if (!error) {
@@ -833,9 +841,9 @@ function versions(apps, callback) {
                         appsObj.versions.postgresql = postgresql[postgresql.length - 2];
                       }
                     }
+                    functionProcessed();
                   });
                 }
-                functionProcessed();
               });
             }
           }
@@ -1151,7 +1159,6 @@ function shell(callback) {
     process.nextTick(() => {
       if (_windows) {
         try {
-          const result = 'CMD';
           util.powerShell(`Get-CimInstance -className win32_process | where-object {$_.ProcessId -eq ${process.ppid} } | select Name`).then((stdout) => {
             let result = 'CMD';
             if (stdout) {
@@ -1166,9 +1173,9 @@ function shell(callback) {
           });
         } catch {
           if (callback) {
-            callback(result);
+            callback('CMD');
           }
-          resolve(result);
+          resolve('CMD');
         }
       } else {
         let result = '';
@@ -1258,9 +1265,13 @@ echo -n "hardware: "; cat /sys/class/dmi/id/product_uuid 2> /dev/null; echo;`;
           result.os = util.getValue(lines, 'os').toLowerCase();
           result.hardware = util.getValue(lines, 'hardware').toLowerCase();
           if (!result.hardware) {
-            const lines = fs.readFileSync('/proc/cpuinfo', { encoding: 'utf8' }).toString().split('\n');
-            const serial = util.getValue(lines, 'serial');
-            result.hardware = serial || '';
+            try {
+              const lines = fs.readFileSync('/proc/cpuinfo', { encoding: 'utf8' }).toString().split('\n');
+              const serial = util.getValue(lines, 'serial');
+              result.hardware = serial || '';
+            } catch {
+              result.hardware = '';
+            }
           }
           if (callback) {
             callback(result);

package/lib/printer.js

@@ -121,7 +121,7 @@ function printer(callback) {
           // printers.conf
           if (!error) {
             const parts = stdout.toString().split('<Printer ');
-            const printerHeader = parseLinuxCupsHeader(parts[0]);
+            const printerHeader = parseLinuxCupsHeader(parts[0].split('\n'));
             for (let i = 1; i < parts.length; i++) {
               const printers = parseLinuxCupsPrinter(parts[i].split('\n'));
               if (printers.name) {
@@ -141,11 +141,11 @@ function printer(callback) {
                   const printers = parseLinuxLpstatPrinter(parts[i].split('\n'), i);
                   result.push(printers);
                 }
+                if (callback) {
+                  callback(result);
+                }
+                resolve(result);
               });
-              if (callback) {
-                callback(result);
-              }
-              resolve(result);
             } else {
               if (callback) {
                 callback(result);

package/lib/processes.js

@@ -207,7 +207,7 @@ function services(srv, callback) {
             if (callback) {
               callback(result);
             }
-            resolve(result);
+            return resolve(result);
           }
           let args = _darwin ? ['-caxo', 'pcpu,pmem,pid,command'] : ['-axo', 'pcpu,pmem,pid,command'];
           if (srvString !== '' && srvs.length > 0) {
@@ -307,7 +307,7 @@ function services(srv, callback) {
                     // store old values
                     _services_cpu.all = all;
                     _services_cpu.list = Object.assign({}, list_new);
-                    _services_cpu.ms = Date.now() - _services_cpu.ms;
+                    _services_cpu.ms = Date.now();
                     _services_cpu.result = Object.assign({}, result);
                     if (callback) {
                       callback(result);
@@ -365,8 +365,7 @@ function services(srv, callback) {
             }
             resolve(result);
           }
-        }
-        if (_windows) {
+        } else if (_windows) {
           try {
             let wincommand = 'Get-CimInstance Win32_Service';
             if (srvs[0] !== '*') {
@@ -442,6 +441,11 @@ function services(srv, callback) {
             }
             resolve(result);
           }
+        } else {
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
         }
       } else {
         if (callback) {
@@ -568,6 +572,9 @@ function processes(callback) {
   }
 
   function parseLine(line) {
+    if (parsedhead.length < 13) {
+      return null;
+    }
     let offset = 0;
     let offset2 = 0;
 
@@ -709,7 +716,10 @@ function processes(callback) {
       lines.shift();
       lines.forEach((line) => {
         if (line.trim() !== '') {
-          result.push(parseLine(line));
+          const parsed = parseLine(line);
+          if (parsed) {
+            result.push(parsed);
+          }
         }
       });
     }
@@ -737,7 +747,15 @@ function processes(callback) {
         started = formatDateTime(new Date(Date.now() - (elapsed_parts[0] * 60 + elapsed_parts[1] * 1) * 60 * 1000));
       } else if (etime.indexOf(':') >= 0) {
         const elapsed_parts = etime.split(':');
-        started = formatDateTime(new Date(Date.now() - (elapsed_parts.length > 1 ? (elapsed_parts[0] * 60 + elapsed_parts[1]) * 1000 : elapsed_parts[0] * 1000)));
+        let seconds = 0;
+        if (elapsed_parts.length === 3) {
+          seconds = elapsed_parts[0] * 3600 + elapsed_parts[1] * 60 + elapsed_parts[2] * 1;
+        } else if (elapsed_parts.length === 2) {
+          seconds = elapsed_parts[0] * 60 + elapsed_parts[1] * 1;
+        } else {
+          seconds = elapsed_parts[0] * 1;
+        }
+        started = formatDateTime(new Date(Date.now() - seconds * 1000));
       }
       return started;
     }
@@ -877,7 +895,7 @@ function processes(callback) {
                     // store old values
                     _processes_cpu.all = all;
                     _processes_cpu.list = Object.assign({}, list_new);
-                    _processes_cpu.ms = Date.now() - _processes_cpu.ms;
+                    _processes_cpu.ms = Date.now();
                     _processes_cpu.result = Object.assign({}, result);
                     if (callback) {
                       callback(result);
@@ -948,6 +966,9 @@ function processes(callback) {
                   try {
                     stdout = stdout.trim().replace(/^\uFEFF/, '');
                     processArray = JSON.parse(stdout);
+                    if (!Array.isArray(processArray)) {
+                      processArray = [processArray];
+                    }
                   } catch {}
                   processArray.forEach((element) => {
                     const pid = element.ProcessId;
@@ -989,7 +1010,7 @@ function processes(callback) {
                       cpuu: 0,
                       cpus: 0,
                       mem: (memw / os.totalmem()) * 100,
-                      priority: element.Priority | null,
+                      priority: element.Priority || null,
                       memVsz: element.PageFileUsage || null,
                       memRss: Math.floor((element.WorkingSetSize || 0) / 1024),
                       nice: 0,
@@ -1030,7 +1051,7 @@ function processes(callback) {
                   _processes_cpu.all_utime = allcpuu;
                   _processes_cpu.all_stime = allcpus;
                   _processes_cpu.list = Object.assign({}, list_new);
-                  _processes_cpu.ms = Date.now() - _processes_cpu.ms;
+                  _processes_cpu.ms = Date.now();
                   _processes_cpu.result = Object.assign({}, result);
                 }
                 if (callback) {
@@ -1139,6 +1160,9 @@ function processLoad(proc, callback) {
                 try {
                   stdout = stdout.trim().replace(/^\uFEFF/, '');
                   processArray = JSON.parse(stdout);
+                  if (!Array.isArray(processArray)) {
+                    processArray = [processArray];
+                  }
                 } catch {}
 
                 // go through all processes
@@ -1233,7 +1257,7 @@ function processLoad(proc, callback) {
                 _process_cpu.all_utime = allcpuu;
                 _process_cpu.all_stime = allcpus;
                 _process_cpu.list = Object.assign({}, list_new);
-                _process_cpu.ms = Date.now() - _process_cpu.ms;
+                _process_cpu.ms = Date.now();
                 _process_cpu.result = JSON.parse(JSON.stringify(result));
                 if (callback) {
                   callback(result);
@@ -1247,9 +1271,7 @@ function processLoad(proc, callback) {
             }
             resolve(result);
           }
-        }
-
-        if (_darwin || _linux || _freebsd || _openbsd || _netbsd) {
+        } else if (_darwin || _linux || _freebsd || _openbsd || _netbsd) {
           const params = ['-axo', 'pid,ppid,pcpu,pmem,comm'];
           util.execSafe('ps', params).then((stdout) => {
             if (stdout) {
@@ -1270,7 +1292,9 @@ function processLoad(proc, callback) {
                   });
                   return found;
                 });
-              lines.shift();
+              if (processesString === '*') {
+                lines.shift();
+              }
               lines.forEach((line) => {
                 const data = line.trim().replace(/ +/g, ' ').split(' ');
                 if (data.length > 4) {
@@ -1396,7 +1420,7 @@ function processLoad(proc, callback) {
 
                   _process_cpu.all = all;
                   _process_cpu.list = Object.assign({}, list_new);
-                  _process_cpu.ms = Date.now() - _process_cpu.ms;
+                  _process_cpu.ms = Date.now();
                   _process_cpu.result = Object.assign({}, result);
                   if (callback) {
                     callback(result);
@@ -1416,7 +1440,17 @@ function processLoad(proc, callback) {
               resolve(result);
             }
           });
+        } else {
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        }
+      } else {
+        if (callback) {
+          callback(result);
         }
+        resolve(result);
       }
     });
   });

package/lib/system.js

@@ -16,7 +16,6 @@
 const fs = require('fs');
 const os = require('os');
 const util = require('./util');
-const { uuid } = require('./osinfo');
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
 const execPromise = util.promisify(require('child_process').exec);
@@ -123,7 +122,7 @@ function system(callback) {
           }
           if (!result.virtual) {
             try {
-              const disksById = execSync('ls -1 /dev/disk/by-id/ 2>/dev/null; pciconf -lv  2>/dev/null', util.execOptsLinux).toString();
+              const disksById = execSync('ls -1 /dev/disk/by-id/ 2>/dev/null; pciconf -lv 2>/dev/null || true', util.execOptsLinux).toString();
               if (disksById.indexOf('_QEMU_') >= 0 || disksById.indexOf('QEMU ') >= 0) {
                 result.virtual = true;
                 result.virtualHost = 'QEMU';
@@ -781,7 +780,7 @@ function chassis(callback) {
           let lines = stdout.toString().split('\n');
           result.manufacturer = cleanDefaults(util.getValue(lines, 'chassis_vendor'));
           const ctype = parseInt(util.getValue(lines, 'chassis_type').replace(/\D/g, ''));
-          result.type = cleanDefaults(ctype && !isNaN(ctype) && ctype < chassisTypes.length ? chassisTypes[ctype - 1] : '');
+          result.type = cleanDefaults(ctype && !isNaN(ctype) && ctype <= chassisTypes.length ? chassisTypes[ctype - 1] : '');
           result.version = cleanDefaults(util.getValue(lines, 'chassis_version'));
           result.serial = cleanDefaults(util.getValue(lines, 'chassis_serial'));
           result.assetTag = cleanDefaults(util.getValue(lines, 'chassis_asset_tag'));
@@ -827,7 +826,7 @@ function chassis(callback) {
               result.manufacturer = cleanDefaults(util.getValue(lines, 'manufacturer', ':'));
               result.model = cleanDefaults(util.getValue(lines, 'model', ':'));
               const ctype = parseInt(util.getValue(lines, 'ChassisTypes', ':').replace(/\D/g, ''));
-              result.type = ctype && !isNaN(ctype) && ctype < chassisTypes.length ? chassisTypes[ctype - 1] : '';
+              result.type = ctype && !isNaN(ctype) && ctype <= chassisTypes.length ? chassisTypes[ctype - 1] : '';
               result.version = cleanDefaults(util.getValue(lines, 'version', ':'));
               result.serial = cleanDefaults(util.getValue(lines, 'serialnumber', ':'));
               result.assetTag = cleanDefaults(util.getValue(lines, 'partnumber', ':'));

package/lib/usb.js

@@ -275,10 +275,6 @@ function usb(callback) {
                 result.push(usb);
               }
             }
-            if (callback) {
-              callback(result);
-            }
-            resolve(result);
           }
           if (callback) {
             callback(result);

package/lib/util.js

@@ -201,14 +201,8 @@ function parseTime(t, pmDesignator) {
     if (parts[2]) {
       parts[1] += parts[2];
     }
-    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);
+    const p1 = (parts[1] || '').toLowerCase();
+    let isPM = 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 +358,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) {
@@ -621,7 +616,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 +729,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 +755,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;
@@ -1285,7 +1297,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--;
@@ -1315,7 +1327,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;
               }
             }
@@ -1389,8 +1401,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]) {
@@ -2745,6 +2757,10 @@ function grep(str, pattern) {
 
 function noop() {}
 
+function isProtoKey(key) {
+  return key === '__proto__' || key === 'constructor' || key === 'prototype';
+}
+
 exports.toInt = toInt;
 exports.splitByNumber = splitByNumber;
 exports.execOptsWin = execOptsWin;
@@ -2773,6 +2789,8 @@ 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;

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,30 +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 ssidSanitized = sanitizeShellString(ssid, true);
-  if (!ssidSanitized) {
+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 ${ssidSanitized} 2>/dev/null`;
+  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',
@@ -284,7 +294,9 @@ function getWifiNetworkListNmi() {
 function getWifiNetworkListIw(iface) {
   const result = [];
   try {
-    let iwlistParts = execSync(`export LC_ALL=C; iwlist ${util.sanitizeString(iface, true)} 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;
     }
@@ -328,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';
               }
             }
@@ -340,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';
               }
             }
@@ -491,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,11 +600,9 @@ function wifiConnections(callback) {
 
           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);
-          const ssidSanitized = util.sanitizeString(ssid, true);
-
-          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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.31.16",
+  "version": "5.32.0",
   "description": "Advanced, lightweight system and OS information library",
   "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/"
@@ -96,6 +97,6 @@
     "android"
   ],
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=10.0.0"
   }
 }