@depup/systeminformation 5.31.4-depup.0 → 5.33.1-depup.0

package/lib/network.js

@@ -16,6 +16,9 @@
 const os = require('os');
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
+const execFileSync = require('child_process').execFileSync;
+const readFileSync = require('fs').readFileSync;
+
 const fs = require('fs');
 const util = require('./util');
 
@@ -416,15 +419,7 @@ function getWindowsIEEE8021x(connectionType, iface, ifaces) {
     try {
       const SSID = getWindowsWirelessIfaceSSID(iface);
       if (SSID !== 'Unknown') {
-        let ifaceSanitized = '';
-        const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(SSID);
-        const l = util.mathMin(s.length, 32);
-
-        for (let i = 0; i <= l; i++) {
-          if (s[i] !== undefined) {
-            ifaceSanitized = ifaceSanitized + s[i];
-          }
-        }
+        const ifaceSanitized = util.sanitizeString(SSID);
         const profiles = execSync(`netsh wlan show profiles "${ifaceSanitized}"`, util.execOptsWin).split('\r\n');
         i8021xState = (profiles.find((l) => l.indexOf('802.1X') >= 0) || '').trim();
         i8021xProtocol = (profiles.find((l) => l.indexOf('EAP') >= 0) || '').trim();
@@ -536,24 +531,30 @@ function getDarwinNics() {
 }
 
 function getLinuxIfaceConnectionName(interfaceName) {
-  const cmd = `nmcli device status 2>/dev/null | grep ${interfaceName}`;
-
   try {
-    const result = execSync(cmd, util.execOptsLinux).toString();
+    const output = execFileSync('nmcli', ['device', 'status'], { ...util.execOptsLinux, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+    const result = util.grep(output, interfaceName);
+
     const resultFormat = result.replace(/\s+/g, ' ').trim();
     const connectionNameLines = resultFormat.split(' ').slice(3);
     const connectionName = connectionNameLines.join(' ');
-    return connectionName !== '--' ? connectionName : '';
+    const connectionNameSanitized = util.sanitizeString(connectionName, false);
+
+    return connectionNameSanitized !== '--' ? connectionNameSanitized : '';
   } catch {
     return '';
   }
 }
 
-function checkLinuxDCHPInterfaces(file) {
+function checkLinuxDCHPInterfaces(file, depth) {
   let result = [];
+  depth = depth || 0;
+  if (depth > 10) {
+    return result;
+  }
   try {
-    const cmd = `cat ${file} 2> /dev/null | grep 'iface\\|source'`;
-    const lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
+    const content = readFileSync(file, { encoding: 'utf8' });
+    const lines = content.split('\n').filter((l) => /iface|source/.test(l));
 
     lines.forEach((line) => {
       const parts = line.replace(/\s+/g, ' ').trim().split(' ');
@@ -564,7 +565,7 @@ function checkLinuxDCHPInterfaces(file) {
       }
       if (line.toLowerCase().includes('source')) {
         const file = line.split(' ')[1];
-        result = result.concat(checkLinuxDCHPInterfaces(file));
+        result = result.concat(checkLinuxDCHPInterfaces(file, depth + 1));
       }
     });
   } catch {
@@ -617,9 +618,9 @@ function parseLinuxDHCPNics(sections) {
 function getLinuxIfaceDHCPstatus(iface, connectionName, DHCPNics) {
   let result = false;
   if (connectionName) {
-    const cmd = `nmcli connection show "${connectionName}" 2>/dev/null | grep ipv4.method;`;
     try {
-      const lines = execSync(cmd, util.execOptsLinux).toString();
+      const output = execFileSync('nmcli', ['connection', 'show', connectionName], { ...util.execOptsLinux, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+      const lines = util.grep(output, 'ipv4.method');
       const resultFormat = lines.replace(/\s+/g, ' ').trim();
 
       const dhcStatus = resultFormat.split(' ').slice(1).toString();
@@ -643,9 +644,10 @@ function getLinuxIfaceDHCPstatus(iface, connectionName, DHCPNics) {
 
 function getDarwinIfaceDHCPstatus(iface) {
   let result = false;
-  const cmd = `ipconfig getpacket "${iface}" 2>/dev/null | grep lease_time;`;
+
   try {
-    const lines = execSync(cmd).toString().split('\n');
+    const output = execFileSync('ipconfig', ['getpacket', iface], { ...util.execOptsLinux, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+    const lines = util.grep(output, 'lease_time');
     if (lines.length && lines[0].startsWith('lease_time')) {
       result = true;
     }
@@ -657,9 +659,9 @@ function getDarwinIfaceDHCPstatus(iface) {
 
 function getLinuxIfaceDNSsuffix(connectionName) {
   if (connectionName) {
-    const cmd = `nmcli connection show "${connectionName}" 2>/dev/null | grep ipv4.dns-search;`;
     try {
-      const result = execSync(cmd, util.execOptsLinux).toString();
+      const output = execFileSync('nmcli', ['connection', 'show', connectionName], { ...util.execOptsLinux, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+      const result = util.grep(output, 'ipv4.dns-search');
       const resultFormat = result.replace(/\s+/g, ' ').trim();
       const dnsSuffix = resultFormat.split(' ').slice(1).toString();
       return dnsSuffix === '--' ? 'Not defined' : dnsSuffix;
@@ -673,9 +675,9 @@ function getLinuxIfaceDNSsuffix(connectionName) {
 
 function getLinuxIfaceIEEE8021xAuth(connectionName) {
   if (connectionName) {
-    const cmd = `nmcli connection show "${connectionName}" 2>/dev/null | grep 802-1x.eap;`;
     try {
-      const result = execSync(cmd, util.execOptsLinux).toString();
+      const output = execFileSync('nmcli', ['connection', 'show', connectionName], { ...util.execOptsLinux, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+      const result = util.grep(output, '802-1x.eap');
       const resultFormat = result.replace(/\s+/g, ' ').trim();
       const authenticationProtocol = resultFormat.split(' ').slice(1).toString();
 
@@ -825,14 +827,7 @@ function networkInterfaces(callback, rescan, defaultString) {
               nic.ip6subnet = ip6linksubnet;
             }
 
-            let ifaceSanitized = '';
-            const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(nic.iface);
-            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(nic.iface);
 
             result.push({
               iface: nic.iface,
@@ -948,14 +943,7 @@ function networkInterfaces(callback, rescan, defaultString) {
                 ip6subnet = ip6linksubnet;
               }
               const iface = dev.split(':')[0].trim();
-              let ifaceSanitized = '';
-              const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface);
-              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);
               const cmd = `echo -n "addr_assign_type: "; cat /sys/class/net/${ifaceSanitized}/addr_assign_type 2>/dev/null; echo;
             echo -n "address: "; cat /sys/class/net/${ifaceSanitized}/address 2>/dev/null; echo;
             echo -n "addr_len: "; cat /sys/class/net/${ifaceSanitized}/addr_len 2>/dev/null; echo;
@@ -1087,14 +1075,7 @@ function networkInterfaces(callback, rescan, defaultString) {
             nics8021xInfo = getWindowsWiredProfilesInformation();
             dnsSuffixes = getWindowsDNSsuffixes();
             for (let dev in ifaces) {
-              let ifaceSanitized = '';
-              const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(dev);
-              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(dev);
 
               let iface = dev;
               let ip4 = '';
@@ -1340,17 +1321,18 @@ function networkStatsSingle(iface) {
         if (sections[i].trim() !== '') {
           const lines = sections[i].trim().split('\r\n');
           perfData.push({
-            name: util
-              .getValue(lines, 'Name', ':')
+            name: util.getValue(lines, 'Name', ':').toLowerCase(),
+            desc: util
+              .getValue(lines, 'InterfaceDescription', ':')
               .replace(/[()[\] ]+/g, '')
               .replace(/#|\//g, '_')
               .toLowerCase(),
-            rx_bytes: parseInt(util.getValue(lines, 'BytesReceivedPersec', ':'), 10),
-            rx_errors: parseInt(util.getValue(lines, 'PacketsReceivedErrors', ':'), 10),
-            rx_dropped: parseInt(util.getValue(lines, 'PacketsReceivedDiscarded', ':'), 10),
-            tx_bytes: parseInt(util.getValue(lines, 'BytesSentPersec', ':'), 10),
-            tx_errors: parseInt(util.getValue(lines, 'PacketsOutboundErrors', ':'), 10),
-            tx_dropped: parseInt(util.getValue(lines, 'PacketsOutboundDiscarded', ':'), 10)
+            rx_bytes: parseInt(util.getValue(lines, 'ReceivedBytes', ':'), 10),
+            rx_errors: parseInt(util.getValue(lines, 'ReceivedPacketErrors', ':'), 10),
+            rx_dropped: parseInt(util.getValue(lines, 'ReceivedDiscardedPackets', ':'), 10),
+            tx_bytes: parseInt(util.getValue(lines, 'SentBytes', ':'), 10),
+            tx_errors: parseInt(util.getValue(lines, 'OutboundPacketErrors', ':'), 10),
+            tx_dropped: parseInt(util.getValue(lines, 'OutboundDiscardedPackets', ':'), 10)
           });
         }
       }
@@ -1360,14 +1342,7 @@ function networkStatsSingle(iface) {
 
   return new Promise((resolve) => {
     process.nextTick(() => {
-      let ifaceSanitized = '';
-      const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface);
-      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);
 
       let result = {
         iface: ifaceSanitized,
@@ -1456,7 +1431,7 @@ function networkStatsSingle(iface) {
                     rx_errors = rx_errors + parseInt(line[5]);
                   }
                   tx_bytes = tx_bytes + parseInt(line[10]);
-                  if (line[12].trim() !== '-') {
+                  if (line[12] && line[12].trim() !== '-') {
                     tx_dropped = tx_dropped + parseInt(line[12]);
                   }
                   if (line[9].trim() !== '-') {
@@ -1476,7 +1451,7 @@ function networkStatsSingle(iface) {
             result.operstate = (stdout.toString().split(':')[1] || '').trim();
             result.operstate = (result.operstate || '').toLowerCase();
             result.operstate = result.operstate === 'active' ? 'up' : result.operstate === 'inactive' ? 'down' : 'unknown';
-            cmd = 'netstat -bdI ' + ifaceSanitized; // lgtm [js/shell-command-constructed-from-input]
+            cmd = 'netstat -bdnI ' + ifaceSanitized; // lgtm [js/shell-command-constructed-from-input]
             exec(cmd, (error, stdout) => {
               if (!error) {
                 lines = stdout.toString().split('\n');
@@ -1506,7 +1481,7 @@ function networkStatsSingle(iface) {
           // Performance Data
           util
             .powerShell(
-              'Get-CimInstance Win32_PerfRawData_Tcpip_NetworkInterface | select Name,BytesReceivedPersec,PacketsReceivedErrors,PacketsReceivedDiscarded,BytesSentPersec,PacketsOutboundErrors,PacketsOutboundDiscarded | fl'
+              'Get-NetAdapterStatistics | select Name,InterfaceDescription,ReceivedBytes,ReceivedPacketErrors,ReceivedDiscardedPackets,SentBytes,OutboundPacketErrors,OutboundDiscardedPackets | fl'
             )
             .then((stdout, error) => {
               if (!error) {
@@ -1534,10 +1509,11 @@ function networkStatsSingle(iface) {
                             .replace(/[()[\] ]+/g, '')
                             .replace('#', '_')
                             .toLowerCase()) &&
-                      det.ifaceName
-                        .replace(/[()[\] ]+/g, '')
-                        .replace(/#|\//g, '_')
-                        .toLowerCase() === detail.name
+                      (det.iface.toLowerCase() === detail.name ||
+                        det.ifaceName
+                          .replace(/[()[\] ]+/g, '')
+                          .replace(/#|\//g, '_')
+                          .toLowerCase() === detail.desc)
                     ) {
                       ifaceName = det.iface;
                       rx_bytes = detail.rx_bytes;
@@ -1755,10 +1731,10 @@ function networkConnections(callback) {
                   const hasState = states.indexOf(line[5]) >= 0;
                   const connstate = hasState ? line[5] : 'UNKNOWN';
                   let pidField = '';
-                  if (line[line.length - 9].indexOf(':') >= 0) {
+                  if (line[line.length - 9] && line[line.length - 9].indexOf(':') >= 0) {
                     pidField = line[line.length - 9].split(':')[1];
                   } else {
-                    pidField = line[pidPos + (hasState ? 0 : -1)];
+                    pidField = line[pidPos + (hasState ? 0 : -1)] || '';
 
                     if (pidField.indexOf(':') >= 0) {
                       pidField = pidField.split(':')[1];
@@ -1784,6 +1760,11 @@ function networkConnections(callback) {
               }
               resolve(result);
             });
+          } else {
+            if (callback) {
+              callback(result);
+            }
+            resolve(result);
           }
         });
       }
@@ -1874,6 +1855,11 @@ function networkConnections(callback) {
                 callback(result);
               }
               resolve(result);
+            } else {
+              if (callback) {
+                callback(result);
+              }
+              resolve(result);
             }
           });
         } catch {

package/lib/osinfo.js

@@ -18,6 +18,7 @@ const fs = require('fs');
 const util = require('./util');
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
+const execFile = require('child_process').execFile;
 
 const _platform = process.platform;
 
@@ -189,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);
@@ -291,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;
@@ -546,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) {
@@ -820,15 +828,22 @@ function versions(apps, callback) {
                 if (!error) {
                   const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
                   appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';
+                  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) {
                       const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
                       appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';
+                      if (appsObj.versions.postgresql.includes('(') && postgresql.length >= 2 && !postgresql[postgresql.length - 2].includes('(')) {
+                        appsObj.versions.postgresql = postgresql[postgresql.length - 2];
+                      }
                     }
+                    functionProcessed();
                   });
                 }
-                functionProcessed();
               });
             }
           }
@@ -1144,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) {
@@ -1159,9 +1173,9 @@ function shell(callback) {
           });
         } catch {
           if (callback) {
-            callback(result);
+            callback('CMD');
           }
-          resolve(result);
+          resolve('CMD');
         }
       } else {
         let result = '';
@@ -1251,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);