systeminformation 5.9.7 → 5.9.11

package/lib/memory.js

@@ -198,7 +198,7 @@ function mem(callback) {
         });
       }
       if (_freebsd || _openbsd || _netbsd) {
-        exec('/sbin/sysctl -a 2>/dev/null | grep -E "hw.realmem|hw.physmem|vm.stats.vm.v_page_count|vm.stats.vm.v_wire_count|vm.stats.vm.v_active_count|vm.stats.vm.v_inactive_count|vm.stats.vm.v_cache_count|vm.stats.vm.v_free_count|vm.stats.vm.v_page_size"', function (error, stdout) {
+        exec('/sbin/sysctl hw.realmem hw.physmem vm.stats.vm.v_page_count vm.stats.vm.v_wire_count vm.stats.vm.v_active_count vm.stats.vm.v_inactive_count vm.stats.vm.v_cache_count vm.stats.vm.v_free_count vm.stats.vm.v_page_size', function (error, stdout) {
           if (!error) {
             let lines = stdout.toString().split('\n');
             const pagesize = parseInt(util.getValue(lines, 'vm.stats.vm.v_page_size'), 10);
@@ -256,14 +256,14 @@ function mem(callback) {
         let swaptotal = 0;
         let swapused = 0;
         try {
-          util.wmic('pagefile get AllocatedBaseSize, CurrentUsage').then((stdout, error) => {
+          util.powerShell('Get-CimInstance Win32_PageFileUsage | Select AllocatedBaseSize, CurrentUsage').then((stdout, error) => {
             if (!error) {
               let lines = stdout.split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0);
               lines.forEach(function (line) {
                 if (line !== '') {
                   line = line.trim().split(/\s\s+/);
-                  swaptotal = swaptotal + parseInt(line[0], 10);
-                  swapused = swapused + parseInt(line[1], 10);
+                  swaptotal = swaptotal + (parseInt(line[0], 10) || 0);
+                  swapused = swapused + (parseInt(line[1], 10) || 0);
                 }
               });
             }
@@ -329,9 +329,9 @@ function memLayout(callback) {
                   manufacturer: getManufacturerLinux(util.getValue(lines, 'Manufacturer:')),
                   partNum: util.getValue(lines, 'Part Number:'),
                   serialNum: util.getValue(lines, 'Serial Number:'),
-                  voltageConfigured: parseFloat(util.getValue(lines, 'Configured Voltage:') || null),
-                  voltageMin: parseFloat(util.getValue(lines, 'Minimum Voltage:') || null),
-                  voltageMax: parseFloat(util.getValue(lines, 'Maximum Voltage:') || null),
+                  voltageConfigured: parseFloat(util.getValue(lines, 'Configured Voltage:')) || null,
+                  voltageMin: parseFloat(util.getValue(lines, 'Minimum Voltage:')) || null,
+                  voltageMax: parseFloat(util.getValue(lines, 'Maximum Voltage:')) || null,
                 });
               } else {
                 result.push({
@@ -384,14 +384,14 @@ function memLayout(callback) {
                 result[0].type = version && version[2] && version[2] === '3' ? 'LPDDR4' : result[0].type;
                 result[0].ecc = false;
                 result[0].clockSpeed = version && version[2] && clockSpeed[version[2]] || 400;
-                result[0].clockSpeed = version && version[4] && version[4] === 'd' ? '500' : result[0].clockSpeed;
+                result[0].clockSpeed = version && version[4] && version[4] === 'd' ? 500 : result[0].clockSpeed;
                 result[0].formFactor = 'SoC';
 
                 stdout = execSync('vcgencmd get_config sdram_freq 2>/dev/null');
                 lines = stdout.toString().split('\n');
                 let freq = parseInt(util.getValue(lines, 'sdram_freq', '=', true), 10) || 0;
                 if (freq) {
-                  result.clockSpeed = freq;
+                  result[0].clockSpeed = freq;
                 }
 
                 stdout = execSync('vcgencmd measure_volts sdram_p 2>/dev/null');
@@ -469,7 +469,7 @@ function memLayout(callback) {
             if (size && type) {
               result.push({
                 size: size * 1024 * 1024 * 1024,
-                bank: 0,
+                bank: '0',
                 type,
                 ecc: false,
                 clockSpeed: 0,
@@ -497,28 +497,31 @@ function memLayout(callback) {
         const FormFactors = 'Unknown|Other|SIP|DIP|ZIP|SOJ|Proprietary|SIMM|DIMM|TSOP|PGA|RIMM|SODIMM|SRIMM|SMD|SSMP|QFP|TQFP|SOIC|LCC|PLCC|BGA|FPBGA|LGA'.split('|');
 
         try {
-          util.wmic('memorychip get /value').then((stdout, error) => {
+          util.powerShell('Get-WmiObject Win32_PhysicalMemory | fl *').then((stdout, error) => {
             if (!error) {
-              let devices = stdout.toString().split('BankL');
+              let devices = stdout.toString().split(/\n\s*\n/);
               devices.shift();
               devices.forEach(function (device) {
                 let lines = device.split('\r\n');
-                const dataWidth = util.toInt(util.getValue(lines, 'DataWidth', '='));
-                const totalWidth = util.toInt(util.getValue(lines, 'TotalWidth', '='));
-                result.push({
-                  size: parseInt(util.getValue(lines, 'Capacity', '='), 10) || 0,
-                  bank: util.getValue(lines, 'abel', '='), // BankLabel
-                  type: memoryTypes[parseInt(util.getValue(lines, 'MemoryType', '='), 10) || parseInt(util.getValue(lines, 'SMBIOSMemoryType', '='), 10)],
-                  ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
-                  clockSpeed: parseInt(util.getValue(lines, 'ConfiguredClockSpeed', '='), 10) || parseInt(util.getValue(lines, 'Speed', '='), 10) || 0,
-                  formFactor: FormFactors[parseInt(util.getValue(lines, 'FormFactor', '='), 10) || 0],
-                  manufacturer: util.getValue(lines, 'Manufacturer', '='),
-                  partNum: util.getValue(lines, 'PartNumber', '='),
-                  serialNum: util.getValue(lines, 'SerialNumber', '='),
-                  voltageConfigured: (parseInt(util.getValue(lines, 'ConfiguredVoltage', '='), 10) || 0) / 1000.0,
-                  voltageMin: (parseInt(util.getValue(lines, 'MinVoltage', '='), 10) || 0) / 1000.0,
-                  voltageMax: (parseInt(util.getValue(lines, 'MaxVoltage', '='), 10) || 0) / 1000.0,
-                });
+                const dataWidth = util.toInt(util.getValue(lines, 'DataWidth', ':'));
+                const totalWidth = util.toInt(util.getValue(lines, 'TotalWidth', ':'));
+                const size = parseInt(util.getValue(lines, 'Capacity', ':'), 10) || 0;
+                if (size) {
+                  result.push({
+                    size,
+                    bank: util.getValue(lines, 'BankLabel', ':'), // BankLabel
+                    type: memoryTypes[parseInt(util.getValue(lines, 'MemoryType', ':'), 10) || parseInt(util.getValue(lines, 'SMBIOSMemoryType', ':'), 10)],
+                    ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
+                    clockSpeed: parseInt(util.getValue(lines, 'ConfiguredClockSpeed', ':'), 10) || parseInt(util.getValue(lines, 'Speed', ':'), 10) || 0,
+                    formFactor: FormFactors[parseInt(util.getValue(lines, 'FormFactor', ':'), 10) || 0],
+                    manufacturer: util.getValue(lines, 'Manufacturer', ':'),
+                    partNum: util.getValue(lines, 'PartNumber', ':'),
+                    serialNum: util.getValue(lines, 'SerialNumber', ':'),
+                    voltageConfigured: (parseInt(util.getValue(lines, 'ConfiguredVoltage', ':'), 10) || 0) / 1000.0,
+                    voltageMin: (parseInt(util.getValue(lines, 'MinVoltage', ':'), 10) || 0) / 1000.0,
+                    voltageMax: (parseInt(util.getValue(lines, 'MaxVoltage', ':'), 10) || 0) / 1000.0,
+                  });
+                }
               });
             }
             if (callback) { callback(result); }

package/lib/network.js

@@ -218,23 +218,23 @@ function parseLinesWindowsNics(sections, nconfigsections) {
 
         let lines = sections[i].trim().split('\r\n');
         let linesNicConfig = nconfigsections[i].trim().split('\r\n');
-        let netEnabled = util.getValue(lines, 'NetEnabled', '=');
-        let adapterType = util.getValue(lines, 'AdapterTypeID', '=') === '9' ? 'wireless' : 'wired';
-        let ifacename = util.getValue(lines, 'Name', '=').replace(/\]/g, ')').replace(/\[/g, '(');
-        let iface = util.getValue(lines, 'NetConnectionID', '=').replace(/\]/g, ')').replace(/\[/g, '(');
+        let netEnabled = util.getValue(lines, 'NetEnabled', ':');
+        let adapterType = util.getValue(lines, 'AdapterTypeID', ':') === '9' ? 'wireless' : 'wired';
+        let ifacename = util.getValue(lines, 'Name', ':').replace(/\]/g, ')').replace(/\[/g, '(');
+        let iface = util.getValue(lines, 'NetConnectionID', ':').replace(/\]/g, ')').replace(/\[/g, '(');
         if (ifacename.toLowerCase().indexOf('wi-fi') >= 0 || ifacename.toLowerCase().indexOf('wireless') >= 0) {
           adapterType = 'wireless';
         }
         if (netEnabled !== '') {
-          const speed = parseInt(util.getValue(lines, 'speed', '=').trim(), 10) / 1000000;
+          const speed = parseInt(util.getValue(lines, 'speed', ':').trim(), 10) / 1000000;
           nics.push({
-            mac: util.getValue(lines, 'MACAddress', '=').toLowerCase(),
-            dhcp: util.getValue(linesNicConfig, 'dhcpEnabled', '=').toLowerCase(),
+            mac: util.getValue(lines, 'MACAddress', ':').toLowerCase(),
+            dhcp: util.getValue(linesNicConfig, 'dhcpEnabled', ':').toLowerCase() === 'true',
             name: ifacename,
             iface,
             netEnabled: netEnabled === 'TRUE',
             speed: isNaN(speed) ? null : speed,
-            operstate: util.getValue(lines, 'NetConnectionStatus', '=') === '2' ? 'up' : 'down',
+            operstate: util.getValue(lines, 'NetConnectionStatus', ':') === '2' ? 'up' : 'down',
             type: adapterType
           });
         }
@@ -245,15 +245,24 @@ function parseLinesWindowsNics(sections, nconfigsections) {
 }
 
 function getWindowsNics() {
-  const cmd = util.getWmic() + ' nic get /value';
-  const cmdnicconfig = util.getWmic() + ' nicconfig get dhcpEnabled /value';
-  try {
-    const nsections = execSync(cmd, util.execOptsWin).split(/\n\s*\n/);
-    const nconfigsections = execSync(cmdnicconfig, util.execOptsWin).split(/\n\s*\n/);
-    return (parseLinesWindowsNics(nsections, nconfigsections));
-  } catch (e) {
-    return [];
-  }
+  // const cmd = util.getWmic() + ' nic get /value';
+  // const cmdnicconfig = util.getWmic() + ' nicconfig get dhcpEnabled /value';
+  return new Promise((resolve) => {
+    process.nextTick(() => {
+      let cmd = 'Get-WmiObject Win32_NetworkAdapter | fl *' + '; echo \'#-#-#-#\';';
+      cmd += 'Get-WmiObject Win32_NetworkAdapterConfiguration | fl DHCPEnabled' + '';
+      try {
+        util.powerShell(cmd).then(data => {
+          data = data.split('#-#-#-#');
+          const nsections = data[0].split(/\n\s*\n/);
+          const nconfigsections = data[1].split(/\n\s*\n/);
+          resolve(parseLinesWindowsNics(nsections, nconfigsections));
+        });
+      } catch (e) {
+        resolve([]);
+      }
+    });
+  });
 }
 
 function getWindowsDNSsuffixes() {
@@ -743,7 +752,8 @@ function networkInterfaces(callback, rescan) {
         _networkInterfaces = result;
         if (callback) { callback(result); }
         resolve(result);
-      } else {
+      }
+      if (_linux) {
         if ((JSON.stringify(ifaces) === JSON.stringify(_ifaces)) && !rescan) {
           // no changes - just return object
           result = _networkInterfaces;
@@ -751,35 +761,9 @@ function networkInterfaces(callback, rescan) {
           if (callback) { callback(result); }
           resolve(result);
         } else {
-          _ifaces = Object.assign({}, ifaces);
-
-          if (_windows) {
-            nics = getWindowsNics();
-            nics.forEach(nic => {
-              let found = false;
-              Object.keys(ifaces).forEach(key => {
-                if (!found) {
-                  ifaces[key].forEach(value => {
-                    if (Object.keys(value).indexOf('mac') >= 0) {
-                      found = value['mac'] === nic.mac;
-                    }
-                  });
-                }
-              });
-
-              if (!found) {
-                ifaces[nic.name] = [{ mac: nic.mac }];
-              }
-            });
-
-            nics8021xInfo = getWindowsWiredProfilesInformation();
-            dnsSuffixes = getWindowsDNSsuffixes();
-          }
-          if (_linux) {
-            _dhcpNics = getLinuxDHCPNics();
-          }
+          _ifaces = JSON.parse(JSON.stringify(ifaces));
+          _dhcpNics = getLinuxDHCPNics();
           for (let dev in ifaces) {
-            let iface = dev;
             let ip4 = '';
             let ip4subnet = '';
             let ip6 = '';
@@ -819,9 +803,8 @@ function networkInterfaces(callback, rescan) {
                   mac = _mac[dev] || '';
                 }
               });
-              if (_linux) {
-                let iface = dev.split(':')[0].trim().toLowerCase();
-                const cmd = `echo -n "addr_assign_type: "; cat /sys/class/net/${iface}/addr_assign_type 2>/dev/null; echo;
+              let iface = dev.split(':')[0].trim().toLowerCase();
+              const cmd = `echo -n "addr_assign_type: "; cat /sys/class/net/${iface}/addr_assign_type 2>/dev/null; echo;
             echo -n "address: "; cat /sys/class/net/${iface}/address 2>/dev/null; echo;
             echo -n "addr_len: "; cat /sys/class/net/${iface}/addr_len 2>/dev/null; echo;
             echo -n "broadcast: "; cat /sys/class/net/${iface}/broadcast 2>/dev/null; echo;
@@ -847,57 +830,32 @@ function networkInterfaces(callback, rescan) {
             echo -n "wireless: "; cat /proc/net/wireless 2>/dev/null | grep ${iface}; echo;
             echo -n "wirelessspeed: "; iw dev ${iface} link 2>&1 | grep bitrate; echo;`;
 
-                let lines = [];
-                try {
-                  lines = execSync(cmd).toString().split('\n');
-                  const connectionName = getLinuxIfaceConnectionName(iface);
-                  dhcp = getLinuxIfaceDHCPstatus(iface, connectionName, _dhcpNics);
-                  dnsSuffix = getLinuxIfaceDNSsuffix(connectionName);
-                  ieee8021xAuth = getLinuxIfaceIEEE8021xAuth(connectionName);
-                  ieee8021xState = getLinuxIfaceIEEE8021xState(ieee8021xAuth);
-                } catch (e) {
-                  util.noop();
-                }
-                duplex = util.getValue(lines, 'duplex');
-                duplex = duplex.startsWith('cat') ? '' : duplex;
-                mtu = parseInt(util.getValue(lines, 'mtu'), 10);
-                let myspeed = parseInt(util.getValue(lines, 'speed'), 10);
+              let lines = [];
+              try {
+                lines = execSync(cmd).toString().split('\n');
+                const connectionName = getLinuxIfaceConnectionName(iface);
+                dhcp = getLinuxIfaceDHCPstatus(iface, connectionName, _dhcpNics);
+                dnsSuffix = getLinuxIfaceDNSsuffix(connectionName);
+                ieee8021xAuth = getLinuxIfaceIEEE8021xAuth(connectionName);
+                ieee8021xState = getLinuxIfaceIEEE8021xState(ieee8021xAuth);
+              } catch (e) {
+                util.noop();
+              }
+              duplex = util.getValue(lines, 'duplex');
+              duplex = duplex.startsWith('cat') ? '' : duplex;
+              mtu = parseInt(util.getValue(lines, 'mtu'), 10);
+              let myspeed = parseInt(util.getValue(lines, 'speed'), 10);
+              speed = isNaN(myspeed) ? null : myspeed;
+              let wirelessspeed = util.getValue(lines, 'wirelessspeed').split('tx bitrate: ');
+              if (speed === null && wirelessspeed.length === 2) {
+                myspeed = parseFloat(wirelessspeed[1]);
                 speed = isNaN(myspeed) ? null : myspeed;
-                let wirelessspeed = util.getValue(lines, 'wirelessspeed').split('tx bitrate: ');
-                if (speed === null && wirelessspeed.length === 2) {
-                  myspeed = parseFloat(wirelessspeed[1]);
-                  speed = isNaN(myspeed) ? null : myspeed;
-                }
-                carrierChanges = parseInt(util.getValue(lines, 'carrier_changes'), 10);
-                operstate = util.getValue(lines, 'operstate');
-                type = operstate === 'up' ? (util.getValue(lines, 'wireless').trim() ? 'wireless' : 'wired') : 'unknown';
-                if (iface === 'lo' || iface.startsWith('bond')) { type = 'virtual'; }
               }
-              if (_windows) {
-
-
-                dnsSuffix = getWindowsIfaceDNSsuffix(dnsSuffixes.ifaces, dev);
-                let foundFirst = false;
-                nics.forEach(detail => {
-                  if (detail.mac === mac && !foundFirst) {
-                    iface = detail.iface || iface;
-                    ifaceName = detail.name;
-                    dhcp = detail.dhcp;
-                    operstate = detail.operstate;
-                    speed = detail.speed;
-                    type = detail.type;
-                    foundFirst = true;
-                  }
-                });
-
-                if (dev.toLowerCase().indexOf('wlan') >= 0 || ifaceName.toLowerCase().indexOf('wlan') >= 0 || ifaceName.toLowerCase().indexOf('802.11n') >= 0 || ifaceName.toLowerCase().indexOf('wireless') >= 0 || ifaceName.toLowerCase().indexOf('wi-fi') >= 0 || ifaceName.toLowerCase().indexOf('wifi') >= 0) {
-                  type = 'wireless';
-                }
+              carrierChanges = parseInt(util.getValue(lines, 'carrier_changes'), 10);
+              operstate = util.getValue(lines, 'operstate');
+              type = operstate === 'up' ? (util.getValue(lines, 'wireless').trim() ? 'wireless' : 'wired') : 'unknown';
+              if (iface === 'lo' || iface.startsWith('bond')) { type = 'virtual'; }
 
-                const IEEE8021x = getWindowsIEEE8021x(type, dev, nics8021xInfo);
-                ieee8021xAuth = IEEE8021x.protocol;
-                ieee8021xState = IEEE8021x.state;
-              }
               let internal = (ifaces[dev] && ifaces[dev][0]) ? ifaces[dev][0].internal : false;
               if (dev.toLowerCase().indexOf('loopback') > -1 || ifaceName.toLowerCase().indexOf('loopback') > -1) {
                 internal = true;
@@ -931,6 +889,134 @@ function networkInterfaces(callback, rescan) {
           resolve(result);
         }
       }
+      if (_windows) {
+        if ((JSON.stringify(ifaces) === JSON.stringify(_ifaces)) && !rescan) {
+          // no changes - just return object
+          result = _networkInterfaces;
+
+          if (callback) { callback(result); }
+          resolve(result);
+        } else {
+          _ifaces = JSON.parse(JSON.stringify(ifaces));
+
+          getWindowsNics().then(function (nics) {
+            nics.forEach(nic => {
+              let found = false;
+              Object.keys(ifaces).forEach(key => {
+                if (!found) {
+                  ifaces[key].forEach(value => {
+                    if (Object.keys(value).indexOf('mac') >= 0) {
+                      found = value['mac'] === nic.mac;
+                    }
+                  });
+                }
+              });
+
+              if (!found) {
+                ifaces[nic.name] = [{ mac: nic.mac }];
+              }
+            });
+            nics8021xInfo = getWindowsWiredProfilesInformation();
+            dnsSuffixes = getWindowsDNSsuffixes();
+            for (let dev in ifaces) {
+              let iface = dev;
+              let ip4 = '';
+              let ip4subnet = '';
+              let ip6 = '';
+              let ip6subnet = '';
+              let mac = '';
+              let duplex = '';
+              let mtu = '';
+              let speed = null;
+              let carrierChanges = 0;
+              let operstate = 'down';
+              let dhcp = false;
+              let dnsSuffix = '';
+              let ieee8021xAuth = '';
+              let ieee8021xState = '';
+              let type = '';
+
+              if ({}.hasOwnProperty.call(ifaces, dev)) {
+                let ifaceName = dev;
+                ifaces[dev].forEach(function (details) {
+                  if (details.family === 'IPv4') {
+                    ip4 = details.address;
+                    ip4subnet = details.netmask;
+                  }
+                  if (details.family === 'IPv6') {
+                    if (!ip6 || ip6.match(/^fe80::/i)) {
+                      ip6 = details.address;
+                      ip6subnet = details.netmask;
+                    }
+                  }
+                  mac = details.mac;
+                  // fallback due to https://github.com/nodejs/node/issues/13581 (node 8.1 - node 8.2)
+                  const nodeMainVersion = parseInt(process.versions.node.split('.'), 10);
+                  if (mac.indexOf('00:00:0') > -1 && (_linux || _darwin) && (!details.internal) && nodeMainVersion >= 8 && nodeMainVersion <= 11) {
+                    if (Object.keys(_mac).length === 0) {
+                      _mac = getMacAddresses();
+                    }
+                    mac = _mac[dev] || '';
+                  }
+                });
+
+
+
+                dnsSuffix = getWindowsIfaceDNSsuffix(dnsSuffixes.ifaces, dev);
+                let foundFirst = false;
+                nics.forEach(detail => {
+                  if (detail.mac === mac && !foundFirst) {
+                    iface = detail.iface || iface;
+                    ifaceName = detail.name;
+                    dhcp = detail.dhcp;
+                    operstate = detail.operstate;
+                    speed = detail.speed;
+                    type = detail.type;
+                    foundFirst = true;
+                  }
+                });
+
+                if (dev.toLowerCase().indexOf('wlan') >= 0 || ifaceName.toLowerCase().indexOf('wlan') >= 0 || ifaceName.toLowerCase().indexOf('802.11n') >= 0 || ifaceName.toLowerCase().indexOf('wireless') >= 0 || ifaceName.toLowerCase().indexOf('wi-fi') >= 0 || ifaceName.toLowerCase().indexOf('wifi') >= 0) {
+                  type = 'wireless';
+                }
+
+                const IEEE8021x = getWindowsIEEE8021x(type, dev, nics8021xInfo);
+                ieee8021xAuth = IEEE8021x.protocol;
+                ieee8021xState = IEEE8021x.state;
+                let internal = (ifaces[dev] && ifaces[dev][0]) ? ifaces[dev][0].internal : false;
+                if (dev.toLowerCase().indexOf('loopback') > -1 || ifaceName.toLowerCase().indexOf('loopback') > -1) {
+                  internal = true;
+                }
+                const virtual = internal ? false : testVirtualNic(dev, ifaceName, mac);
+                result.push({
+                  iface,
+                  ifaceName,
+                  ip4,
+                  ip4subnet,
+                  ip6,
+                  ip6subnet,
+                  mac,
+                  internal,
+                  virtual,
+                  operstate,
+                  type,
+                  duplex,
+                  mtu,
+                  speed,
+                  dhcp,
+                  dnsSuffix,
+                  ieee8021xAuth,
+                  ieee8021xState,
+                  carrierChanges,
+                });
+              }
+            }
+            _networkInterfaces = result;
+            if (callback) { callback(result); }
+            resolve(result);
+          });
+        }
+      }
     });
   });
 }
@@ -1048,13 +1134,13 @@ function networkStatsSingle(iface) {
         if (sections[i].trim() !== '') {
           let lines = sections[i].trim().split('\r\n');
           perfData.push({
-            name: util.getValue(lines, 'Name', '=').replace(/[()[\] ]+/g, '').replace('#', '_').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)
+            name: util.getValue(lines, 'Name', ':').replace(/[()[\] ]+/g, '').replace('#', '_').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)
           });
         }
       }
@@ -1182,7 +1268,7 @@ function networkStatsSingle(iface) {
           let ifaceName = ifaceSanitized;
 
           // Performance Data
-          util.wmic('path Win32_PerfRawData_Tcpip_NetworkInterface Get name,BytesReceivedPersec,BytesSentPersec,BytesTotalPersec,PacketsOutboundDiscarded,PacketsOutboundErrors,PacketsReceivedDiscarded,PacketsReceivedErrors /value').then((stdout, error) => {
+          util.powerShell('Get-WmiObject Win32_PerfRawData_Tcpip_NetworkInterface | fl *').then((stdout, error) => {
             if (!error) {
               const psections = stdout.toString().split(/\n\s*\n/);
               perfData = parseLinesWindowsPerfData(psections);
@@ -1425,7 +1511,7 @@ function networkConnections(callback) {
                     peeraddress.pop();
                     peerip = peeraddress.join(':');
                   }
-                  let pid = line[4];
+                  let pid = util.toInt(line[4]);
                   let connstate = line[3];
                   if (connstate === 'HERGESTELLT') { connstate = 'ESTABLISHED'; }
                   if (connstate.startsWith('ABH')) { connstate = 'LISTEN'; }

package/lib/osinfo.js

@@ -196,7 +196,7 @@ function osInfo(callback) {
     process.nextTick(() => {
       let result = {
 
-        platform: (_platform === 'Windows_NT' ? 'Windows' : _platform),
+        platform: (_platform === 'win32' ? 'Windows' : _platform),
         distro: 'unknown',
         release: 'unknown',
         codename: '',
@@ -299,6 +299,7 @@ function osInfo(callback) {
           result.codename = (result.release.indexOf('10.14') > -1 ? 'macOS Mojave' : result.codename);
           result.codename = (result.release.indexOf('10.15') > -1 ? 'macOS Catalina' : result.codename);
           result.codename = (result.release.startsWith('11.') ? 'macOS Big Sur' : result.codename);
+          result.codename = (result.release.startsWith('12.') ? 'macOS Monterey' : result.codename);
           result.uefi = true;
           result.codepage = util.getCodepage();
           if (callback) {
@@ -322,7 +323,7 @@ function osInfo(callback) {
         result.release = result.kernel;
         try {
           const workload = [];
-          workload.push(util.wmic('os get /value'));
+          workload.push(util.powerShell('Get-WmiObject Win32_OperatingSystem | fl *'));
           // workload.push(execPromise('systeminfo', util.execOptsWin));
           // workload.push(util.powerShell('Get-ComputerInfo -property "HyperV*"'));
           workload.push(util.powerShell('(Get-CimInstance Win32_ComputerSystem).HypervisorPresent'));
@@ -331,10 +332,10 @@ function osInfo(callback) {
             workload
           ).then(data => {
             let lines = data.results[0] ? data.results[0].toString().split('\r\n') : [''];
-            result.distro = util.getValue(lines, 'Caption', '=').trim();
-            result.serial = util.getValue(lines, 'SerialNumber', '=').trim();
-            result.build = util.getValue(lines, 'BuildNumber', '=').trim();
-            result.servicepack = util.getValue(lines, 'ServicePackMajorVersion', '=').trim() + '.' + util.getValue(lines, 'ServicePackMinorVersion', '=').trim();
+            result.distro = util.getValue(lines, 'Caption', ':').trim();
+            result.serial = util.getValue(lines, 'SerialNumber', ':').trim();
+            result.build = util.getValue(lines, 'BuildNumber', ':').trim();
+            result.servicepack = util.getValue(lines, 'ServicePackMajorVersion', ':').trim() + '.' + util.getValue(lines, 'ServicePackMinorVersion', ':').trim();
             result.codepage = util.getCodepage();
             // const systeminfo = data.results[1] ? data.results[1].toString() : '';
             // result.hypervisor = (systeminfo.indexOf('hypervisor has been detected') !== -1) || (systeminfo.indexOf('ein Hypervisor erkannt') !== -1) || (systeminfo.indexOf('Un hyperviseur a ') !== -1);
@@ -737,12 +738,12 @@ function versions(apps, callback) {
             });
           } else {
             if (_windows) {
-              util.wmic('service get /value').then((stdout) => {
+              util.powerShell('Get-WmiObject Win32_Service | fl *').then((stdout) => {
                 let serviceSections = stdout.split(/\n\s*\n/);
                 for (let i = 0; i < serviceSections.length; i++) {
                   if (serviceSections[i].trim() !== '') {
                     let lines = serviceSections[i].trim().split('\r\n');
-                    let srvCaption = util.getValue(lines, 'caption', '=', true).toLowerCase();
+                    let srvCaption = util.getValue(lines, 'caption', ':', true).toLowerCase();
                     if (srvCaption.indexOf('postgresql') > -1) {
                       const parts = srvCaption.split(' server ');
                       if (parts.length > 1) {
@@ -1110,12 +1111,10 @@ echo -n "hardware: "; cat /sys/class/dmi/id/product_uuid 2> /dev/null; echo;`;
         });
       }
       if (_freebsd || _openbsd || _netbsd) {
-        const cmd = `echo -n "os: "; sysctl -n kern.hostid; echo;
-echo -n "hardware: "; sysctl -n kern.hostuuid; echo;`;
-        exec(cmd, function (error, stdout) {
+        exec('sysctl -i kern.hostid kern.hostuuid', function (error, stdout) {
           const lines = stdout.toString().split('\n');
-          result.os = util.getValue(lines, 'os').toLowerCase();
-          result.hardware = util.getValue(lines, 'hardware').toLowerCase();
+          result.os = util.getValue(lines, 'kern.hostid', ':').toLowerCase();
+          result.hardware = util.getValue(lines, 'kern.hostuuid', ':').toLowerCase();
           if (result.os.indexOf('unknown') >= 0) { result.os = ''; }
           if (result.hardware.indexOf('unknown') >= 0) { result.hardware = ''; }
           if (callback) {
@@ -1132,10 +1131,10 @@ echo -n "hardware: "; sysctl -n kern.hostuuid; echo;`;
         exec(`${sysdir}\\reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid`, util.execOptsWin, function (error, stdout) {
           parts = stdout.toString().split('\n\r')[0].split('REG_SZ');
           result.os = parts.length > 1 ? parts[1].replace(/\r+|\n+|\s+/ig, '').toLowerCase() : '';
-          util.wmic('csproduct get /value').then((stdout) => {
+          util.powerShell('Get-WmiObject Win32_ComputerSystemProduct | fl *').then((stdout) => {
             // let lines = stdout.split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0)[0].trim().split(/\s\s+/);
             let lines = stdout.split('\r\n');
-            result.hardware = util.getValue(lines, 'uuid', '=').toLowerCase();
+            result.hardware = util.getValue(lines, 'uuid', ':').toLowerCase();
             if (callback) {
               callback(result);
             }