systeminformation 5.12.3 → 5.12.6

package/lib/cpu.js

@@ -645,6 +645,7 @@ function getCpu() {
             result.family = util.getValue(lines, 'machdep.cpu.family') || util.getValue(lines, 'hw.cpufamily');
             result.model = util.getValue(lines, 'machdep.cpu.model');
             result.stepping = util.getValue(lines, 'machdep.cpu.stepping') || util.getValue(lines, 'hw.cpusubfamily');
+            result.virtualization = true;
             const countProcessors = util.getValue(lines, 'hw.packages');
             const countCores = util.getValue(lines, 'hw.physicalcpu_max');
             const countThreads = util.getValue(lines, 'hw.ncpu');
@@ -1066,9 +1067,9 @@ function cpuTemperature(callback) {
             });
 
             if (result.cores.length > 0) {
-              if (result.main === null) {
-                result.main = Math.round(result.cores.reduce((a, b) => a + b, 0) / result.cores.length);
-              }
+              // if (result.main === null) {
+              result.main = Math.round(result.cores.reduce((a, b) => a + b, 0) / result.cores.length);
+              // }
               let maxtmp = Math.max.apply(Math, result.cores);
               result.max = (maxtmp > result.main) ? maxtmp : result.main;
             }
@@ -1122,9 +1123,9 @@ function cpuTemperature(callback) {
                   }
                 });
                 if (result.cores.length > 0) {
-                  if (result.main === null) {
-                    result.main = Math.round(result.cores.reduce((a, b) => a + b, 0) / result.cores.length);
-                  }
+                  // if (result.main === null) {
+                  result.main = Math.round(result.cores.reduce((a, b) => a + b, 0) / result.cores.length);
+                  // }
                   let maxtmp = Math.max.apply(Math, result.cores);
                   result.max = (maxtmp > result.main) ? maxtmp : result.main;
                 } else {

package/lib/network.js

@@ -496,7 +496,6 @@ function parseLinesDarwinNics(sections) {
     nic.type = util.getValue(section, 'type').toLowerCase().indexOf('wi-fi') > -1 ? 'wireless' : 'wired';
     const operstate = util.getValue(section, 'status').toLowerCase();
     nic.operstate = (operstate === 'active' ? 'up' : (operstate === 'inactive' ? 'down' : 'unknown'));
-    // nic.operstate = util.getValue(section, 'status').toLowerCase().indexOf('active') > -1 ? 'up' : 'down';
     nic.duplex = util.getValue(section, 'media').toLowerCase().indexOf('half-duplex') > -1 ? 'half' : 'full';
     if (nic.ip6 || nic.ip4 || nic.mac) {
       nics.push(nic);
@@ -1190,7 +1189,7 @@ 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(),
+            name: util.getValue(lines, 'Name', ':').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),
@@ -1341,8 +1340,8 @@ function networkStatsSingle(iface) {
                     det.mac.toLowerCase() === ifaceSanitized.toLowerCase() ||
                     det.ip4.toLowerCase() === ifaceSanitized.toLowerCase() ||
                     det.ip6.toLowerCase() === ifaceSanitized.toLowerCase() ||
-                    det.ifaceName.replace(/[()[\] ]+/g, '').replace('#', '_').toLowerCase() === ifaceSanitized.replace(/[()[\] ]+/g, '').replace('#', '_').toLowerCase()) &&
-                    (det.ifaceName.replace(/[()[\] ]+/g, '').replace('#', '_').toLowerCase() === detail.name)) {
+                    det.ifaceName.replace(/[()[\] ]+/g, '').replace(/\#|\//g, '_').toLowerCase() === ifaceSanitized.replace(/[()[\] ]+/g, '').replace('#', '_').toLowerCase()) &&
+                    (det.ifaceName.replace(/[()[\] ]+/g, '').replace(/\#|\//g, '_').toLowerCase() === detail.name)) {
                     ifaceName = det.iface;
                     rx_bytes = detail.rx_bytes;
                     rx_dropped = detail.rx_dropped;
@@ -1559,6 +1558,7 @@ function networkConnections(callback) {
                     localaddress.pop();
                     localip = localaddress.join(':');
                   }
+                  localip = localip.replace(/\[/g, '').replace(/\]/g, '');
                   let peerip = line[2];
                   let peerport = '';
                   let peeraddress = line[2].split(':');
@@ -1567,6 +1567,7 @@ function networkConnections(callback) {
                     peeraddress.pop();
                     peerip = peeraddress.join(':');
                   }
+                  peerip = peerip.replace(/\[/g, '').replace(/\]/g, '');
                   let pid = util.toInt(line[4]);
                   let connstate = line[3];
                   if (connstate === 'HERGESTELLT') { connstate = 'ESTABLISHED'; }
@@ -1579,7 +1580,7 @@ function networkConnections(callback) {
                   if (connstate === 'SYN_RECEIVED') { connstate = 'SYN_RECV'; }
                   if (connstate === 'FIN_WAIT_1') { connstate = 'FIN_WAIT1'; }
                   if (connstate === 'FIN_WAIT_2') { connstate = 'FIN_WAIT2'; }
-                  if (connstate) {
+                  if (line[0].toLowerCase() !== 'udp' && connstate) {
                     result.push({
                       protocol: line[0].toLowerCase(),
                       localAddress: localip,
@@ -1590,6 +1591,17 @@ function networkConnections(callback) {
                       pid,
                       process: ''
                     });
+                  } else if (line[0].toLowerCase() === 'udp') {
+                    result.push({
+                      protocol: line[0].toLowerCase(),
+                      localAddress: localip,
+                      localPort: localport,
+                      peerAddress: peerip,
+                      peerPort: peerport,
+                      state: '',
+                      pid: parseInt(line[3], 10),
+                      process: ''
+                    });
                   }
                 }
               });

package/package.json

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