systeminformation 5.10.0 → 5.10.4

package/README.md

@@ -982,6 +982,7 @@ Written by Sebastian Hildebrandt [sebhildebrandt](https://github.com/sebhildebra
 - Maria Camila Cubides [MariaCamilaCubides](https://github.com/MariaCamilaCubides)
 - Aleksander Krasnicki [plakak](https://github.com/plakak)
 - Alexis Tyler [OmgImAlexis](https://github.com/OmgImAlexis)
+- Simon Smith [si458](https://github.com/si458)
 
 OSX Temperature: credits here are going to:
 

package/lib/battery.js

@@ -244,13 +244,13 @@ module.exports = function (callback) {
                   batteries[batteries.length - 1].push(parts[i]);
                 }
               }
-              let designCapacities = data.results[1].split('\r\n');
-              let fullChargeCapacities = data.results[2].split('\r\n');
+              let designCapacities = data.results[1].split('\r\n').filter(e => e);
+              let fullChargeCapacities = data.results[2].split('\r\n').filter(e => e);
               if (batteries.length) {
                 let first = false;
                 let additionalBatteries = [];
                 for (let i = 0; i < batteries.length; i++) {
-                  let lines = batteries[i];
+                  let lines = batteries[i][0].split('\r\n');
                   const designedCapacity = designCapacities && designCapacities.length >= (i + 1) && designCapacities[i] ? util.toInt(designCapacities[i]) : 0;
                   const fullChargeCapacity = fullChargeCapacities && fullChargeCapacities.length >= (i + 1) && fullChargeCapacities[i] ? util.toInt(fullChargeCapacities[i]) : 0;
                   const parsed = parseWinBatteryPart(lines, designedCapacity, fullChargeCapacity);

package/lib/cpu.js

@@ -515,12 +515,29 @@ const socketTypes = {
   63: 'LGA4677',
 };
 
+function cpuManufacturer(str) {
+  let result = str;
+  str = str.toLowerCase();
+
+  if (str.indexOf('intel') >= 0) { result = 'Intel'; }
+  if (str.indexOf('amd') >= 0) { result = 'AMD'; }
+  if (str.indexOf('qemu') >= 0) { result = 'QEMU'; }
+  if (str.indexOf('hygon') >= 0) { result = 'Hygon'; }
+  if (str.indexOf('centaur') >= 0) { result = 'WinChip/Via'; }
+  if (str.indexOf('vmware') >= 0) { result = 'VMware'; }
+  if (str.indexOf('Xen') >= 0) { result = 'Xen Hypervisor'; }
+  if (str.indexOf('tcg') >= 0) { result = 'QEMU'; }
+  if (str.indexOf('apple') >= 0) { result = 'Apple'; }
+
+  return result;
+}
+
 function cpuBrandManufacturer(res) {
   res.brand = res.brand.replace(/\(R\)+/g, '®').replace(/\s+/g, ' ').trim();
   res.brand = res.brand.replace(/\(TM\)+/g, '™').replace(/\s+/g, ' ').trim();
   res.brand = res.brand.replace(/\(C\)+/g, '©').replace(/\s+/g, ' ').trim();
   res.brand = res.brand.replace(/CPU+/g, '').replace(/\s+/g, ' ').trim();
-  res.manufacturer = res.brand.split(' ')[0];
+  res.manufacturer = cpuManufacturer(res.brand);
 
   let parts = res.brand.split(' ');
   parts.shift();
@@ -655,7 +672,7 @@ function getCpu() {
             result.speedMax = Math.round(parseFloat(util.getValue(lines, 'cpu max mhz').replace(/,/g, '.')) / 10.0) / 100;
 
             result = cpuBrandManufacturer(result);
-            result.vendor = util.getValue(lines, 'vendor id');
+            result.vendor = cpuManufacturer(util.getValue(lines, 'vendor id'));
             // if (!result.vendor) { result.vendor = util.getValue(lines, 'anbieterkennung'); }
 
             result.family = util.getValue(lines, 'cpu family');
@@ -733,7 +750,7 @@ function getCpu() {
             result.speedMax = Math.round(parseFloat(util.getValue(lines, 'max speed').replace(/Mhz/g, '')) / 10.0) / 100;
 
             result = cpuBrandManufacturer(result);
-            result.vendor = util.getValue(lines, 'manufacturer');
+            result.vendor = cpuManufacturer(util.getValue(lines, 'manufacturer'));
             let sig = util.getValue(lines, 'signature');
             sig = sig.split(',');
             for (var i = 0; i < sig.length; i++) {

package/lib/osinfo.js

@@ -1132,13 +1132,13 @@ echo -n "hardware: "; cat /sys/class/dmi/id/product_uuid 2> /dev/null; echo;`;
         if (process.arch === 'ia32' && Object.prototype.hasOwnProperty.call(process.env, 'PROCESSOR_ARCHITEW6432')) {
           sysdir = '%windir%\\sysnative\\cmd.exe /c %windir%\\System32';
         }
-        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.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();
+        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();
+          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() : '';
             if (callback) {
               callback(result);
             }

package/lib/processes.js

@@ -324,7 +324,16 @@ function services(srv, callback) {
         }
         if (_windows) {
           try {
-            util.powerShell('Get-WmiObject Win32_Service | fl *').then((stdout, error) => {
+            let wincommand = "Get-WmiObject Win32_Service";
+            if (srvs[0] !== '*') {
+              wincommand += ' -Filter "';
+              for (let i = 0; i < srvs.length; i++) {
+                wincommand += `Name='${srvs[i]}' or `;
+              }
+              wincommand = `${wincommand.slice(0,-4)}"`;
+            }
+            wincommand += ' | fl *';
+            util.powerShell(wincommand).then((stdout, error) => {
               if (!error) {
                 let serviceSections = stdout.split(/\n\s*\n/);
                 for (let i = 0; i < serviceSections.length; i++) {
@@ -338,7 +347,7 @@ function services(srv, callback) {
                     if (srvString === '*' || srvs.indexOf(srvName) >= 0 || srvs.indexOf(srvCaption) >= 0) {
                       result.push({
                         name: srvName,
-                        running: (started === 'TRUE'),
+                        running: (started.toLowerCase() === 'true'),
                         startmode: startMode,
                         pids: [pid],
                         cpu: 0,

package/lib/system.js

@@ -353,33 +353,21 @@ function system(callback) {
               result.serial = util.getValue(lines, 'identifyingnumber', ':');
               result.uuid = util.getValue(lines, 'uuid', ':').toLowerCase();
               // detect virtual (1)
-              if (result.model.toLowerCase() === 'virtualbox' || result.model.toLowerCase() === 'kvm' || result.model.toLowerCase() === 'virtual machine' || result.model.toLowerCase() === 'bochs' || result.model.toLowerCase().startsWith('vmware')) {
+              const model = result.model.toLowerCase();
+              if (model === 'virtualbox' || model === 'kvm' || model === 'virtual machine' || model === 'bochs' || model.startsWith('vmware') || model.startsWith('qemu')) {
                 result.virtual = true;
-                switch (result.model.toLowerCase()) {
-                  case 'virtualbox':
-                    result.virtualHost = 'VirtualBox';
-                    break;
-                  case 'vmware':
-                    result.virtualHost = 'VMware';
-                    break;
-                  case 'kvm':
-                    result.virtualHost = 'KVM';
-                    break;
-                  case 'bochs':
-                    result.virtualHost = 'bochs';
-                    break;
-                }
+                if (model.startsWith('virtualbox')) { result.virtualHost = 'VirtualBox'; }
+                if (model.startsWith('vmware')) { result.virtualHost = 'VMware'; }
+                if (model.startsWith('kvm')) { result.virtualHost = 'KVM'; }
+                if (model.startsWith('bochs')) { result.virtualHost = 'bochs'; }
+                if (model.startsWith('qemu')) { result.virtualHost = 'KVM'; }
               }
-              if (result.manufacturer.toLowerCase().startsWith('vmware') || result.manufacturer.toLowerCase() === 'xen') {
+              const manufacturer = result.manufacturer.toLowerCase();
+              if (manufacturer.startsWith('vmware') || manufacturer.startsWith('qemu') || manufacturer === 'xen') {
                 result.virtual = true;
-                switch (result.manufacturer.toLowerCase()) {
-                  case 'vmware':
-                    result.virtualHost = 'VMware';
-                    break;
-                  case 'xen':
-                    result.virtualHost = 'Xen';
-                    break;
-                }
+                if (manufacturer.startsWith('vmware')) { result.virtualHost = 'VMware'; }
+                if (manufacturer.startsWith('xen')) { result.virtualHost = 'Xen'; }
+                if (manufacturer.startsWith('qemu')) { result.virtualHost = 'KVM'; }
               }
               util.powerShell('Get-WmiObject MS_Systeminformation -Namespace "root/wmi" | fl *').then((stdout, error) => {
                 if (!error) {

package/package.json

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