systeminformation 4.34.5 → 4.34.9

package/CHANGELOG.md

@@ -30,6 +30,10 @@ For major (breaking) changes - version 3 and 2 see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 4.34.9         | 2020-01-25     | `graphics()` virtual controller vram value fix (win) |
+| 4.34.8         | 2020-01-25     | `graphics()` controller subDeviceId fix (win) |
+| 4.34.7         | 2020-01-13     | `services()` improved service discovery (linux) |
+| 4.34.6         | 2020-01-12     | `networkInterfaces()` catch errors |
 | 4.34.5         | 2020-01-07     | `networkInterfaceDefault()` fixed CMD popup (windows) |
 | 4.34.4         | 2020-01-06     | `system()` fixed vitrual catch error |
 | 4.34.3         | 2020-01-06     | `graphics()` fixed non nvidia-smi controllers (win) |

package/lib/graphics.js

@@ -720,8 +720,8 @@ function graphics(callback) {
               result.controllers = parseLinesLinuxControllers(lines);
               const nvidiaData = nvidiaDevices();
               // needs to be rewritten ... using no spread operators
-              result.controllers = result.controllers.map(( controller ) => { // match by busAddress
-                return mergeControllerNvidia(controller, nvidiaData.find(({ pciBus }) => pciBus.endsWith(controller.busAddress)) || {} );
+              result.controllers = result.controllers.map((controller) => { // match by busAddress
+                return mergeControllerNvidia(controller, nvidiaData.find(({ pciBus }) => pciBus.endsWith(controller.busAddress)) || {});
               })
             }
             let cmd = "clinfo --raw";
@@ -887,15 +887,19 @@ function graphics(callback) {
         if (sections[i].trim() !== '') {
 
           let lines = sections[i].trim().split('\r\n');
-          let subDeviceId = util.getValue(lines, 'PNPDeviceID', '=').match(/SUBSYS_[a-fA-F\d]{8}/)[0];
-          if (subDeviceId) {
-            subDeviceId = subDeviceId.split('_')[1];
+          let pnpDeviceId = util.getValue(lines, 'PNPDeviceID', '=').match(/SUBSYS_[a-fA-F\d]{8}/);
+          let subDeviceId = null;
+          if (pnpDeviceId) {
+            subDeviceId = pnpDeviceId[0];
+            if (subDeviceId) {
+              subDeviceId = subDeviceId.split('_')[1];
+            }
           }
           controllers.push({
             vendor: util.getValue(lines, 'AdapterCompatibility', '='),
             model: util.getValue(lines, 'name', '='),
             bus: util.getValue(lines, 'PNPDeviceID', '=').startsWith('PCI') ? 'PCI' : '',
-            vram: parseInt(util.getValue(lines, 'AdapterRAM', '='), 10) / 1024 / 1024,
+            vram: util.toInt(util.getValue(lines, 'AdapterRAM', '=')) / 1024 / 1024,
             vramDynamic: (util.getValue(lines, 'VideoMemoryType', '=') === '2'),
             subDeviceId
           });

package/lib/network.js

@@ -685,132 +685,133 @@ function networkInterfaces(callback, rescan = true) {
   }
   return new Promise((resolve) => {
     process.nextTick(() => {
-      let ifaces = os.networkInterfaces();
-
       let result = [];
       let nics = [];
       let dnsSuffixes = [];
       let nics8021xInfo = [];
-      // seperate handling in OSX
-      if (_darwin || _freebsd || _openbsd || _netbsd) {
-        nics = getDarwinNics();
+      try {
+        let ifaces = os.networkInterfaces();
 
+        // seperate handling in OSX
+        if (_darwin || _freebsd || _openbsd || _netbsd) {
+          nics = getDarwinNics();
 
-        nics.forEach(nic => {
 
-          if ({}.hasOwnProperty.call(ifaces, nic.iface)) {
-            ifaces[nic.iface].forEach(function (details) {
-              if (details.family === 'IPv4') {
-                nic.ip4subnet = details.netmask;
-              }
-              if (details.family === 'IPv6') {
-                nic.ip6subnet = details.netmask;
-              }
-            });
-          }
+          nics.forEach(nic => {
 
-          result.push({
-            iface: nic.iface,
-            ifaceName: nic.iface,
-            ip4: nic.ip4,
-            ip4subnet: nic.ip4subnet || '',
-            ip6: nic.ip6,
-            ip6subnet: nic.ip6subnet || '',
-            mac: nic.mac,
-            internal: nic.internal,
-            virtual: nic.internal ? false : testVirtualNic(nic.iface, nic.iface, nic.mac),
-            operstate: nic.operstate,
-            type: nic.type,
-            duplex: nic.duplex,
-            mtu: nic.mtu,
-            speed: nic.speed,
-            dhcp: getDarwinIfaceDHCPstatus(nic.iface),
-            dnsSuffix: '',
-            ieee8021xAuth: '',
-            ieee8021xState: '',
-            carrierChanges: 0
-          });
-        });
-        _networkInterfaces = result;
-        if (callback) { callback(result); }
-        resolve(result);
-      } else {
-        if ((JSON.stringify(ifaces) === JSON.stringify(_ifaces)) && !rescan) {
-          // no changes - just return object
-          result = _networkInterfaces;
+            if ({}.hasOwnProperty.call(ifaces, nic.iface)) {
+              ifaces[nic.iface].forEach(function (details) {
+                if (details.family === 'IPv4') {
+                  nic.ip4subnet = details.netmask;
+                }
+                if (details.family === 'IPv6') {
+                  nic.ip6subnet = details.netmask;
+                }
+              });
+            }
 
+            result.push({
+              iface: nic.iface,
+              ifaceName: nic.iface,
+              ip4: nic.ip4,
+              ip4subnet: nic.ip4subnet || '',
+              ip6: nic.ip6,
+              ip6subnet: nic.ip6subnet || '',
+              mac: nic.mac,
+              internal: nic.internal,
+              virtual: nic.internal ? false : testVirtualNic(nic.iface, nic.iface, nic.mac),
+              operstate: nic.operstate,
+              type: nic.type,
+              duplex: nic.duplex,
+              mtu: nic.mtu,
+              speed: nic.speed,
+              dhcp: getDarwinIfaceDHCPstatus(nic.iface),
+              dnsSuffix: '',
+              ieee8021xAuth: '',
+              ieee8021xState: '',
+              carrierChanges: 0
+            });
+          });
+          _networkInterfaces = result;
           if (callback) { callback(result); }
           resolve(result);
         } else {
-          _ifaces = Object.assign({}, ifaces);
+          if ((JSON.stringify(ifaces) === JSON.stringify(_ifaces)) && !rescan) {
+            // no changes - just return object
+            result = _networkInterfaces;
+
+            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 (_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;
-                    }
-                  });
+                  ifaces[nic.name] = [{ mac: nic.mac }];
                 }
               });
 
-              if (!found) {
-                ifaces[nic.name] = [{ mac: nic.mac }];
-              }
-            });
-
-            nics8021xInfo = getWindowsWiredProfilesInformation();
-            dnsSuffixes = getWindowsDNSsuffixes();
-          }
-          if (_linux) {
-            _dhcpNics = getLinuxDHCPNics();
-          }
-          for (let dev in ifaces) {
-            let ip4 = '';
-            let ip4subnet = '';
-            let ip6 = '';
-            let ip6subnet = '';
-            let mac = '';
-            let duplex = '';
-            let mtu = '';
-            let speed = -1;
-            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;
+              nics8021xInfo = getWindowsWiredProfilesInformation();
+              dnsSuffixes = getWindowsDNSsuffixes();
+            }
+            if (_linux) {
+              _dhcpNics = getLinuxDHCPNics();
+            }
+            for (let dev in ifaces) {
+              let ip4 = '';
+              let ip4subnet = '';
+              let ip6 = '';
+              let ip6subnet = '';
+              let mac = '';
+              let duplex = '';
+              let mtu = '';
+              let speed = -1;
+              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;
                   }
-                }
-                mac = details.mac;
-                // fallback due to https://github.com/nodejs/node/issues/13581 (node 8.1 - node 8.2)
-                if (mac.indexOf('00:00:0') > -1 && (_linux || _darwin) && parseInt(process.versions.node.split('.'), 10) === 8) {
-                  if (Object.keys(_mac).length === 0) {
-                    _mac = getMacAddresses();
+                  if (details.family === 'IPv6') {
+                    if (!ip6 || ip6.match(/^fe80::/i)) {
+                      ip6 = details.address;
+                      ip6subnet = details.netmask;
+                    }
                   }
-                  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;
+                  mac = details.mac;
+                  // fallback due to https://github.com/nodejs/node/issues/13581 (node 8.1 - node 8.2)
+                  if (mac.indexOf('00:00:0') > -1 && (_linux || _darwin) && parseInt(process.versions.node.split('.'), 10) === 8) {
+                    if (Object.keys(_mac).length === 0) {
+                      _mac = getMacAddresses();
+                    }
+                    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;
             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;
@@ -836,86 +837,90 @@ function networkInterfaces(callback, rescan = true) {
             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);
-                speed = isNaN(myspeed) ? -1 : myspeed;
-                let wirelessspeed = util.getValue(lines, 'wirelessspeed').split('tx bitrate: ');
-                if (speed === -1 && wirelessspeed.length === 2) {
-                  myspeed = parseFloat(wirelessspeed[1]);
+                  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) ? -1 : myspeed;
+                  let wirelessspeed = util.getValue(lines, 'wirelessspeed').split('tx bitrate: ');
+                  if (speed === -1 && wirelessspeed.length === 2) {
+                    myspeed = parseFloat(wirelessspeed[1]);
+                    speed = isNaN(myspeed) ? -1 : 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'; }
                 }
-                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) {
+                if (_windows) {
 
 
-                dnsSuffix = getWindowsIfaceDNSsuffix(dnsSuffixes.ifaces, dev);
-                nics.forEach(detail => {
-                  if (detail.mac === mac) {
-                    ifaceName = detail.name;
-                    dhcp = detail.dhcp;
-                    operstate = detail.operstate;
-                    speed = detail.speed;
-                    type = detail.type;
+                  dnsSuffix = getWindowsIfaceDNSsuffix(dnsSuffixes.ifaces, dev);
+                  nics.forEach(detail => {
+                    if (detail.mac === mac) {
+                      ifaceName = detail.name;
+                      dhcp = detail.dhcp;
+                      operstate = detail.operstate;
+                      speed = detail.speed;
+                      type = detail.type;
+                    }
+                  });
+
+                  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';
                   }
-                });
 
-                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;
                 }
-
-                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;
+                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: dev,
+                  ifaceName,
+                  ip4,
+                  ip4subnet,
+                  ip6,
+                  ip6subnet,
+                  mac,
+                  internal,
+                  virtual,
+                  operstate,
+                  type,
+                  duplex,
+                  mtu,
+                  speed,
+                  dhcp,
+                  dnsSuffix,
+                  ieee8021xAuth,
+                  ieee8021xState,
+                  carrierChanges,
+                });
               }
-              const virtual = internal ? false : testVirtualNic(dev, ifaceName, mac);
-              result.push({
-                iface: dev,
-                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);
           }
-          _networkInterfaces = result;
-          if (callback) { callback(result); }
-          resolve(result);
         }
+      } catch (e) {
+        if (callback) { callback(result); }
+        resolve(result);
       }
     });
   });

package/lib/processes.js

@@ -120,20 +120,42 @@ function services(srv, callback) {
         let srvs = srvString.split('|');
         let result = [];
         let dataSrv = [];
-        let allSrv = [];
+        // let allSrv = [];
 
         if (_linux || _freebsd || _openbsd || _netbsd || _darwin) {
           if ((_linux || _freebsd || _openbsd || _netbsd) && srvString === '*') {
-            srvString = '';
-            let tmpsrv = execSync('service --status-all 2> /dev/null').toString().split('\n');
-            for (const s of tmpsrv) {
-              const parts = s.split(']');
-              if (parts.length === 2) {
-                srvString += (srvString !== '' ? '|' : '') + parts[1].trim();
-                allSrv.push({ name: parts[1].trim(), running: parts[0].indexOf('+') > 0 });
+            try {
+              srvString = '';
+              const tmpsrv = execSync('service --status-all 2> /dev/null').toString().split('\n');
+              for (const s of tmpsrv) {
+                const parts = s.split(']');
+                if (parts.length === 2) {
+                  srvString += (srvString !== '' ? '|' : '') + parts[1].trim();
+                  // allSrv.push({ name: parts[1].trim(), running: parts[0].indexOf('+') > 0 });
+                }
+              }
+              srvs = srvString.split('|');
+            } catch (e) {
+              try {
+                const srvStr = execSync('ls /etc/init.d/ -m 2> /dev/null').toString().split('\n').join('');
+                srvString = '';
+                if (srvStr) {
+                  const tmpsrv = srvStr.split(',');
+                  for (const s of tmpsrv) {
+                    const name = s.trim();
+                    if (name) {
+                      srvString += (srvString !== '' ? '|' : '') + name;
+                      // allSrv.push({ name: name, running: null });
+                    }
+                  }
+                  srvs = srvString.split('|');
+                }
+              } catch (f) {
+                // allSrv = [];
+                srvString = '';
+                srvs = [];
               }
             }
-            srvs = srvString.split('|');
           }
           let comm = (_darwin) ? 'ps -caxo pcpu,pmem,pid,command' : 'ps -axo pcpu,pmem,pid,command';
           if (srvString !== '' && srvs.length > 0) {
@@ -152,7 +174,7 @@ function services(srv, callback) {
                       return (e.toLowerCase().indexOf(' ' + srv + ':') !== -1) || (e.toLowerCase().indexOf('/' + srv) !== -1);
                     });
                   }
-                  let singleSrv = allSrv.filter(item => { return item.name === srv; });
+                  // let singleSrv = allSrv.filter(item => { return item.name === srv; });
                   const pids = [];
                   for (const p of ps) {
                     const pid = p.trim().split(' ')[2];
@@ -162,7 +184,8 @@ function services(srv, callback) {
                   }
                   result.push({
                     name: srv,
-                    running: (allSrv.length && singleSrv.length ? singleSrv[0].running : ps.length > 0),
+//                    running: (allSrv.length && singleSrv.length && singleSrv[0].running !== null ? singleSrv[0].running : ps.length > 0),
+                    running: ps.length > 0,
                     startmode: '',
                     pids: pids,
                     pcpu: parseFloat((ps.reduce(function (pv, cv) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "4.34.5",
+  "version": "4.34.9",
   "description": "Simple system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",