systeminformation 5.12.5 → 5.12.7

package/README.md

@@ -30,7 +30,7 @@
   [![Sponsoring][sponsor-badge]][sponsor-url]
   [![MIT license][license-img]][license-url]
 
-This is amazing. Started as a small project just for myself, it now has > 15,000 lines of code, > 500 versions published, > 4 mio downloads per month, > 90 mio downloads overall. #1 NPM ranking for backend packages. Thank you to all who contributed to this project!
+This is amazing. Started as a small project just for myself, it now has > 15,000 lines of code, > 500 versions published, up to 5 mio downloads per month, > 100 mio downloads overall. #1 NPM ranking for backend packages. Thank you to all who contributed to this project!
 
 ## New Version 5.0
 
@@ -208,7 +208,7 @@ Full function reference with examples can be found at [https://systeminformation
 | | governor | X | | | |  | e.g. 'powersave' |
 | | cores | X | X | X | X |  | # cores |
 | | physicalCores | X | X | X | X |  | # physical cores |
-| | efficiencyCores | X |   | X |  |  | # efficiancy cores |
+| | efficiencyCores | X |   | X |  |  | # efficiency cores |
 | | performanceCores | X |   | X |  |  | # performance cores |
 | | processors | X | X | X | X |  | # processors |
 | | socket | X | X |  | X |  | socket type e.g. "LGA1356" |

package/lib/audio.js

@@ -16,7 +16,6 @@
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
 const util = require('./util');
-// const fs = require('fs');
 
 let _platform = process.platform;
 
@@ -79,7 +78,6 @@ function parseLinuxAudioPciMM(lines, audioPCI) {
 
   result.id = slotId;
   result.name = util.getValue(lines, 'SDevice');
-  // result.type = util.getValue(lines, 'Class');
   result.manufacturer = util.getValue(lines, 'SVendor');
   result.revision = util.getValue(lines, 'Rev');
   result.driver = pciMatch && pciMatch.length === 1 && pciMatch[0].driver ? pciMatch[0].driver : '';
@@ -128,7 +126,6 @@ function parseDarwinAudio(audioObject, id) {
 function parseWindowsAudio(lines) {
   const result = {};
   const status = util.getValue(lines, 'StatusInfo', ':');
-  // const description = util.getValue(lines, 'Description', ':');
 
   result.id = util.getValue(lines, 'DeviceID', ':'); // PNPDeviceID??
   result.name = util.getValue(lines, 'name', ':');

package/lib/battery.js

@@ -51,7 +51,7 @@ function parseWinBatteryPart(lines, designedCapacity, fullChargeCapacity) {
     result.capacityUnit = 'mWh';
     result.percent = parseInt(util.getValue(lines, 'EstimatedChargeRemaining', ':') || 0);
     result.currentCapacity = parseInt(result.maxCapacity * result.percent / 100);
-    result.isCharging = (statusValue >= 6 && statusValue <= 9) || statusValue === 11 || (!(statusValue === 3) && !(statusValue === 1) && result.percent < 100);
+    result.isCharging = (statusValue >= 6 && statusValue <= 9) || statusValue === 11 || ((statusValue !== 3) && (statusValue !== 1) && result.percent < 100);
     result.acConnected = result.isCharging || statusValue === 2;
     result.model = util.getValue(lines, 'DeviceID', ':');
   } else {
@@ -232,7 +232,6 @@ module.exports = function (callback) {
             workload
           ).then(data => {
             if (data) {
-              // let parts = data.results[0].split(/\n\s*\n/);
               let parts = data.results[0].split(/\n\s*\n/);
               let batteries = [];
               const hasValue = value => /\S/.test(value);

package/lib/cpu.js

@@ -617,14 +617,6 @@ function getCpu() {
       cpuFlags().then(flags => {
         result.flags = flags;
         result.virtualization = flags.indexOf('vmx') > -1 || flags.indexOf('svm') > -1;
-        // if (_windows) {
-        //   try {
-        //     const systeminfo = execSync('systeminfo', util.execOptsWin).toString();
-        //     result.virtualization = result.virtualization || (systeminfo.indexOf('Virtualization Enabled In Firmware: Yes') !== -1) || (systeminfo.indexOf('Virtualisierung in Firmware aktiviert: Ja') !== -1) || (systeminfo.indexOf('Virtualisation activée dans le microprogramme : Qiu') !== -1);
-        //   } catch (e) {
-        //     util.noop();
-        //   }
-        // }
         if (_darwin) {
           exec('sysctl machdep.cpu hw.cpufrequency_max hw.cpufrequency_min hw.packages hw.physicalcpu_max hw.ncpu hw.tbfrequency hw.cpufamily hw.cpusubfamily', function (error, stdout) {
             let lines = stdout.toString().split('\n');
@@ -695,12 +687,9 @@ function getCpu() {
 
             result = cpuBrandManufacturer(result);
             result.vendor = cpuManufacturer(util.getValue(lines, 'vendor id'));
-            // if (!result.vendor) { result.vendor = util.getValue(lines, 'anbieterkennung'); }
 
             result.family = util.getValue(lines, 'cpu family');
-            // if (!result.family) { result.family = util.getValue(lines, 'prozessorfamilie'); }
             result.model = util.getValue(lines, 'model:');
-            // if (!result.model) { result.model = util.getValue(lines, 'modell:'); }
             result.stepping = util.getValue(lines, 'stepping');
             result.revision = util.getValue(lines, 'cpu revision');
             result.cache.l1d = util.getValue(lines, 'l1d cache');
@@ -713,11 +702,9 @@ function getCpu() {
             if (result.cache.l3) { result.cache.l3 = parseInt(result.cache.l3) * (result.cache.l3.indexOf('M') !== -1 ? 1024 * 1024 : (result.cache.l3.indexOf('K') !== -1 ? 1024 : 1)); }
 
             const threadsPerCore = util.getValue(lines, 'thread(s) per core') || '1';
-            // const coresPerSocketInt = parseInt(util.getValue(lines, 'cores(s) per socket') || '1', 10);
             const processors = util.getValue(lines, 'socket(s)') || '1';
             let threadsPerCoreInt = parseInt(threadsPerCore, 10); // threads per code (normally only for performance cores)
             let processorsInt = parseInt(processors, 10) || 1;  // number of sockets /  processor units in machine (normally 1)
-            // const cpus = (parseInt(util.getValue(lines, 'cpu(s)'), 10) || 1); // overall number of cores (e.g. 24 on i12900)
             const coresPerSocket = parseInt(util.getValue(lines, 'core(s) per socket'), 10); // number of cores (e.g. 16 on i12900)
             result.physicalCores = coresPerSocket ? coresPerSocket * processorsInt : result.cores / threadsPerCoreInt;
             result.performanceCores = threadsPerCoreInt > 1 ? result.cores - result.physicalCores : result.cores;
@@ -779,7 +766,7 @@ function getCpu() {
             result.vendor = cpuManufacturer(util.getValue(lines, 'manufacturer'));
             let sig = util.getValue(lines, 'signature');
             sig = sig.split(',');
-            for (var i = 0; i < sig.length; i++) {
+            for (let i = 0; i < sig.length; i++) {
               sig[i] = sig[i].trim();
             }
             result.family = util.getValue(sig, 'Family', ' ', true);
@@ -825,7 +812,6 @@ function getCpu() {
             const workload = [];
             workload.push(util.powerShell('Get-WmiObject Win32_processor | select Name, Revision, L2CacheSize, L3CacheSize, Manufacturer, MaxClockSpeed, Description, UpgradeMethod, Caption, NumberOfLogicalProcessors, NumberOfCores | fl'));
             workload.push(util.powerShell('Get-WmiObject Win32_CacheMemory | select CacheType,InstalledSize,Level | fl'));
-            // workload.push(util.powerShell('Get-ComputerInfo -property "HyperV*"'));
             workload.push(util.powerShell('(Get-CimInstance Win32_ComputerSystem).HypervisorPresent'));
 
             Promise.all(
@@ -915,9 +901,6 @@ function getCpu() {
                   result.cache.l1d = parseInt(installedSize, 10) / 2;
                 }
               });
-              // lines = data[2].split('\r\n');
-              // result.virtualization = (util.getValue(lines, 'HyperVRequirementVirtualizationFirmwareEnabled').toLowerCase() === 'true');
-              // result.virtualization = (util.getValue(lines, 'HyperVisorPresent').toLowerCase() === 'true');
               const hyperv = data[2] ? data[2].toString().toLowerCase() : '';
               result.virtualization = hyperv.indexOf('true') !== -1;
 
@@ -1067,9 +1050,7 @@ 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);
-              // }
               let maxtmp = Math.max.apply(Math, result.cores);
               result.max = (maxtmp > result.main) ? maxtmp : result.main;
             }
@@ -1123,9 +1104,7 @@ 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);
-                  // }
                   let maxtmp = Math.max.apply(Math, result.cores);
                   result.max = (maxtmp > result.main) ? maxtmp : result.main;
                 } else {
@@ -1702,8 +1681,6 @@ function getFullLoad() {
         let totalTicks = totalIdle + totalIrq + totalNice + totalSystem + totalUser;
         result = (totalTicks - totalIdle) / totalTicks * 100.0;
 
-      } else {
-        result = 0;
       }
       resolve(result);
     });

package/lib/network.js

@@ -108,7 +108,6 @@ function getDefaultNetworkInterface() {
       if (_linux) { cmd = 'ip route 2> /dev/null | grep default | awk \'{print $5}\''; }
       if (_darwin) { cmd = 'route -n get default 2>/dev/null | grep interface: | awk \'{print $2}\''; }
       if (_freebsd || _openbsd || _netbsd || _sunos) { cmd = 'route get 0.0.0.0 | grep interface:'; }
-      // console.log('SYNC - default darwin 3');
       let result = execSync(cmd);
       ifacename = result.toString().split('\n')[0];
       if (ifacename.indexOf(':') > -1) {
@@ -173,7 +172,6 @@ function getMacAddresses() {
   if (_darwin) {
     try {
       const cmd = '/sbin/ifconfig';
-      // console.log('SYNC - macAde darwin 6');
       let res = execSync(cmd);
       const lines = res.toString().split('\n');
       for (let i = 0; i < lines.length; i++) {
@@ -247,8 +245,6 @@ function parseLinesWindowsNics(sections, nconfigsections) {
 }
 
 function getWindowsNics() {
-  // 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 \'#-#-#-#\';';
@@ -394,7 +390,6 @@ function getWindowsIEEE8021x(connectionType, iface, ifaces) {
         i8021x.state = 'Enabled';
       }
     } catch (error) {
-      // console.log('Error getting wired information:', error);
       return i8021x;
     }
   } else if (connectionType == 'wireless') {
@@ -416,7 +411,6 @@ function getWindowsIEEE8021x(connectionType, iface, ifaces) {
         i8021x.protocol = i8021xProtocol.split(':').pop();
       }
     } catch (error) {
-      // console.log('Error getting wireless information:', error);
       if (error.status === 1 && error.stdout.includes('AutoConfig')) {
         i8021x.state = 'Disabled';
         i8021x.protocol = 'Not defined';
@@ -1189,7 +1183,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),
@@ -1340,8 +1334,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;
@@ -1409,7 +1403,6 @@ function networkConnections(callback) {
                   peerip = peeraddress.join(':');
                 }
                 let connstate = line[5];
-                // if (connstate === 'VERBUNDEN') connstate = 'ESTABLISHED';
                 let proc = line[6].split('/');
 
                 if (connstate) {
@@ -1558,6 +1551,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(':');
@@ -1566,6 +1560,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'; }
@@ -1578,7 +1573,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,
@@ -1589,6 +1584,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/lib/osinfo.js

@@ -18,7 +18,6 @@ const fs = require('fs');
 const util = require('./util');
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
-// const execPromise = util.promisify(require('child_process').exec);
 
 let _platform = process.platform;
 
@@ -332,8 +331,6 @@ function osInfo(callback) {
         try {
           const workload = [];
           workload.push(util.powerShell('Get-WmiObject Win32_OperatingSystem | select Caption,SerialNumber,BuildNumber,ServicePackMajorVersion,ServicePackMinorVersion | fl'));
-          // workload.push(execPromise('systeminfo', util.execOptsWin));
-          // workload.push(util.powerShell('Get-ComputerInfo -property "HyperV*"'));
           workload.push(util.powerShell('(Get-CimInstance Win32_ComputerSystem).HypervisorPresent'));
           workload.push(util.powerShell('Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.SystemInformation]::TerminalServerSession'));
           util.promiseAll(
@@ -345,10 +342,6 @@ function osInfo(callback) {
             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);
-            // const hyperv = data.results[1] ? data.results[1].toString().split('\r\n') : [];
-            // result.hypervisor = (util.getValue(hyperv, 'HyperVisorPresent').toLowerCase() === 'true');
             const hyperv = data.results[1] ? data.results[1].toString().toLowerCase() : '';
             result.hypervisor = hyperv.indexOf('true') !== -1;
             const term = data.results[2] ? data.results[2].toString() : '';
@@ -741,7 +734,6 @@ function versions(apps, callback) {
                   }
                   functionProcessed();
                 });
-                functionProcessed();
               }
             });
           } else {
@@ -1004,17 +996,21 @@ function versions(apps, callback) {
           }
         }
         if ({}.hasOwnProperty.call(appsObj.versions, 'dotnet')) {
-          util.powerShell('gci "HKLM:\\SOFTWARE\\Microsoft\\NET Framework Setup\\NDP" -recurse | gp -name Version,Release -EA 0 | where { $_.PSChildName -match "^(?!S)\\p{L}"} | select PSChildName, Version, Release').then(stdout => {
-            const lines = stdout.toString().split('\r\n');
-            let dotnet = '';
-            lines.forEach(line => {
-              line = line.replace(/ +/g, ' ');
-              const parts = line.split(' ');
-              dotnet = dotnet || ((parts[0].toLowerCase().startsWith('client') && parts.length > 2 ? parts[1].trim() : (parts[0].toLowerCase().startsWith('full') && parts.length > 2 ? parts[1].trim() : '')));
+          if (_windows) {
+            util.powerShell('gci "HKLM:\\SOFTWARE\\Microsoft\\NET Framework Setup\\NDP" -recurse | gp -name Version,Release -EA 0 | where { $_.PSChildName -match "^(?!S)\\p{L}"} | select PSChildName, Version, Release').then(stdout => {
+              const lines = stdout.toString().split('\r\n');
+              let dotnet = '';
+              lines.forEach(line => {
+                line = line.replace(/ +/g, ' ');
+                const parts = line.split(' ');
+                dotnet = dotnet || (parts[0].toLowerCase().startsWith('client') && parts.length > 2 ? parts[1].trim() : (parts[0].toLowerCase().startsWith('full') && parts.length > 2 ? parts[1].trim() : ''));
+              });
+              appsObj.versions.dotnet = dotnet.trim();
+              functionProcessed();
             });
-            appsObj.versions.dotnet = dotnet.trim();
+          } else {
             functionProcessed();
-          });
+          }
         }
       } catch (e) {
         if (callback) { callback(appsObj.versions); }
@@ -1090,7 +1086,6 @@ function uuid(callback) {
               const jsonObj = JSON.parse(stdout.toString());
               if (jsonObj.SPHardwareDataType && jsonObj.SPHardwareDataType.length > 0) {
                 const spHardware = jsonObj.SPHardwareDataType[0];
-                // result.os = parts.length > 1 ? parts[1].trim().toLowerCase() : '';
                 result.os = spHardware.platform_UUID.toLowerCase();
                 result.hardware = spHardware.serial_number;
               }
@@ -1142,7 +1137,6 @@ echo -n "hardware: "; cat /sys/class/dmi/id/product_uuid 2> /dev/null; echo;`;
           sysdir = '%windir%\\sysnative\\cmd.exe /c %windir%\\System32';
         }
         util.powerShell('Get-WmiObject Win32_ComputerSystemProduct | select UUID | 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();
           exec(`${sysdir}\\reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid`, util.execOptsWin, function (error, stdout) {

package/lib/printer.js

@@ -14,9 +14,7 @@
 // ----------------------------------------------------------------------------------
 
 const exec = require('child_process').exec;
-// const execSync = require('child_process').execSync;
 const util = require('./util');
-// const fs = require('fs');
 
 let _platform = process.platform;
 

package/lib/processes.js

@@ -150,7 +150,6 @@ function services(srv, callback) {
         let srvs = srvString.split('|');
         let result = [];
         let dataSrv = [];
-        // let allSrv = [];
 
         if (_linux || _freebsd || _openbsd || _netbsd || _darwin) {
           if ((_linux || _freebsd || _openbsd || _netbsd) && srvString === '*') {
@@ -1166,18 +1165,13 @@ function processLoad(proc, callback) {
                     listPos = j;
                   }
                 }
-                // console.log(listPos);
                 processes.forEach(function (proc) {
-                  // console.log(proc)
-                  // console.log(item)
-                  // inList = inList || item.name.toLowerCase() === proc.toLowerCase();
+
                   if (item.name.toLowerCase().indexOf(proc.toLowerCase()) >= 0 && !inList) {
                     inList = true;
                     name = proc;
                   }
                 });
-                // console.log(item);
-                // console.log(listPos);
                 if ((processesString === '*') || inList) {
                   if (listPos < 0) {
                     result.push({
@@ -1265,10 +1259,8 @@ function processLoad(proc, callback) {
                   });
 
                   _process_cpu.all = all;
-                  // _process_cpu.list = list_new;
                   _process_cpu.list = Object.assign({}, list_new);
                   _process_cpu.ms = Date.now() - _process_cpu.ms;
-                  // _process_cpu.result = result;
                   _process_cpu.result = Object.assign({}, result);
                   if (callback) { callback(result); }
                   resolve(result);

package/package.json

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