systeminformation 5.7.3 → 5.7.7

package/CHANGELOG.md

@@ -53,8 +53,8 @@ We had to make **several interface changes** to keep systeminformation as consis
 - `getData()`: support for passing parameters and filters (see section General / getData)
 - `graphics()`: extended nvidia-smi parsing
 - `networkInterfaces()`: type detection improved (win - wireless)
-- `memoryLayout()`: extended manufacturer list (decoding)
-- `memoryLayout()`: added ECC flag
+- `memLayout()`: extended manufacturer list (decoding)
+- `memLayout()`: added ECC flag
 - `osInfo()`: better fqdn (win)
 - `osinfo()`: added hypervizor if hyper-v is enabled (win only)
 - `osInfo()`: added remoteSession (win only)
@@ -77,6 +77,10 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 5.7.7          | 2021-06-15     | `graphics()` improved detection screen resolution (macOS) |
+| 5.7.6          | 2021-06-09     | `battery()` improved detection (additional batteries windows) |
+| 5.7.5          | 2021-06-08     | `memLayout()` improved clock speed detection (windows) |
+| 5.7.4          | 2021-05-27     | `osInfo()`, `cpu()` improved hypervisor, virtualization detection (windows) |
 | 5.7.3          | 2021-05-26     | `osInfo()` improved UEFI detection (windows) |
 | 5.7.2          | 2021-05-24     | `system()` virtual detection improvement |
 | 5.7.1          | 2021-05-20     | `graphics()` Check for qwMemorySize on Windows |

package/lib/battery.js

@@ -27,6 +27,40 @@ const _openbsd = (_platform === 'openbsd');
 const _netbsd = (_platform === 'netbsd');
 const _sunos = (_platform === 'sunos');
 
+function parseWinBatteryPart(lines, designCapacity, fullChargeCapacity) {
+  const result = {};
+  let status = util.getValue(lines, 'BatteryStatus', '=').trim();
+  // 1 = "Discharging"
+  // 2 = "On A/C"
+  // 3 = "Fully Charged"
+  // 4 = "Low"
+  // 5 = "Critical"
+  // 6 = "Charging"
+  // 7 = "Charging High"
+  // 8 = "Charging Low"
+  // 9 = "Charging Critical"
+  // 10 = "Undefined"
+  // 11 = "Partially Charged"
+  if (status >= 0) {
+    const statusValue = status ? parseInt(status) : 0;
+    result.status = statusValue;
+    result.hasBattery = true;
+    result.maxCapacity = fullChargeCapacity || parseInt(util.getValue(lines, 'DesignCapacity', '=') || 0);
+    result.designCapacity = parseInt(util.getValue(lines, 'DesignCapacity', '=') || designCapacity);
+    result.voltage = parseInt(util.getValue(lines, 'DesignVoltage', '=') || 0) / 1000.0;
+    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.acConnected = result.ischarging || statusValue === 2;
+    result.model = util.getValue(lines, 'DeviceID', '=');
+  } else {
+    result.status = -1;
+  }
+
+  return result;
+}
+
 module.exports = function (callback) {
 
   return new Promise((resolve) => {
@@ -175,32 +209,76 @@ module.exports = function (callback) {
       }
       if (_windows) {
         try {
-          util.wmic('Path Win32_Battery Get BatteryStatus, DesignCapacity, EstimatedChargeRemaining, DesignVoltage, FullChargeCapacity /value').then((stdout) => {
-            if (stdout) {
-              let lines = stdout.split('\r\n');
-              let status = util.getValue(lines, 'BatteryStatus', '=').trim();
-              // 1 = "Discharging"
-              // 2 = "On A/C"
-              // 3 = "Fully Charged"
-              // 4 = "Low"
-              // 5 = "Critical"
-              // 6 = "Charging"
-              // 7 = "Charging High"
-              // 8 = "Charging Low"
-              // 9 = "Charging Critical"
-              // 10 = "Undefined"
-              // 11 = "Partially Charged"
-              if (status && status != '10') {
-                const statusValue = parseInt(status);
-                result.hasBattery = true;
-                result.maxCapacity = parseInt(util.getValue(lines, 'DesignCapacity', '=') || 0);
-                result.designCapacity = parseInt(util.getValue(lines, 'DesignCapacity', '=') || 0);
-                result.voltage = parseInt(util.getValue(lines, 'DesignVoltage', '=') || 0) / 1000.0;
-                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.acConnected = result.ischarging || statusValue === 2;
+          const workload = [];
+          workload.push(util.wmic('Path Win32_Battery Get /value'));
+          workload.push(util.powerShell('(Get-WmiObject -Class BatteryStaticData -Namespace ROOT/WMI).DesignedCapacity'));
+          workload.push(util.powerShell('(Get-WmiObject -Class BatteryFullChargedCapacity -Namespace ROOT/WMI).FullChargedCapacity'));
+          util.promiseAll(
+            workload
+          ).then(data => {
+            if (data) {
+              // let parts = data.results[0].split(/\n\s*\n/);
+              let parts = data.results[0].split('\r\n');
+              let batteries = [];
+              for (let i = 0; i < parts.length; i++) {
+                const hasValue = value => /\S/.test(value);
+                if (hasValue(parts[i]) && (!batteries.length || !hasValue(parts[i - 1]))) {
+                  batteries.push([]);
+                }
+                if (hasValue(parts[i])) {
+                  batteries[batteries.length - 1].push(parts[i]);
+                }
+              }
+              let designCapacities = data.results[1].split('\r\n');
+              let fullChargeCapacities = data.results[2].split('\r\n');
+              if (batteries.length) {
+                let first = false;
+                let additionalBatteries = [];
+                for (let i = 0; i < batteries.length; i++) {
+                  let lines = batteries[i];
+                  const designCapacity = 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, designCapacity, fullChargeCapacity);
+                  if (!first && parsed.status > 0 && parsed.status !== 10) {
+                    result.hasBattery = parsed.hasBattery;
+                    result.maxCapacity = parsed.maxCapacity;
+                    result.designCapacity = parsed.designCapacity;
+                    result.voltage = parsed.voltage;
+                    result.capacityUnit = parsed.capacityUnit;
+                    result.percent = parsed.percent;
+                    result.currentCapacity = parsed.currentCapacity;
+                    result.isCharging = parsed.isCharging;
+                    result.acConnected = parsed.acConnected;
+                    result.model = parsed.model;
+                    first = true;
+                  } else if (parsed.status !== -1) {
+                    additionalBatteries.push(
+                      {
+                        hasBattery: parsed.hasBattery,
+                        maxCapacity: parsed.maxCapacity,
+                        designCapacity: parsed.designCapacity,
+                        voltage: parsed.voltage,
+                        capacityUnit: parsed.capacityUnit,
+                        percent: parsed.percent,
+                        currentCapacity: parsed.currentCapacity,
+                        isCharging: parsed.isCharging,
+                        timeRemaining: null,
+                        acConnected: parsed.acConnected,
+                        model: parsed.model,
+                        type: '',
+                        manufacturer: '',
+                        serial: ''
+                      }
+                    );
+                  }
+                }
+                if (!first && additionalBatteries.length) {
+                  result = additionalBatteries[0];
+                  additionalBatteries.shift();
+                }
+                if (additionalBatteries.length) {
+                  result.additionalBatteries = additionalBatteries;
+                }
               }
             }
             if (callback) { callback(result); }

package/lib/cpu.js

@@ -550,14 +550,14 @@ 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 (_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');
@@ -753,6 +753,7 @@ function getCpu() {
             const workload = [];
             workload.push(util.wmic('cpu get /value'));
             workload.push(util.wmic('path Win32_CacheMemory get CacheType,InstalledSize,Purpose'));
+            workload.push(util.powerShell('Get-ComputerInfo -property "HyperV*"'));
 
             Promise.all(
               workload
@@ -831,6 +832,10 @@ function getCpu() {
                   }
                 }
               });
+              lines = data[2].split('\r\n');
+              result.virtualization = (util.getValue(lines, 'HyperVRequirementVirtualizationFirmwareEnabled').toLowerCase() === 'true');
+              result.virtualization = (util.getValue(lines, 'HyperVisorPresent').toLowerCase() === 'true');
+
               resolve(result);
             });
           } catch (e) {
@@ -1608,5 +1613,3 @@ function fullLoad(callback) {
 }
 
 exports.fullLoad = fullLoad;
-
-

package/lib/graphics.js

@@ -172,10 +172,20 @@ function graphics(callback) {
         if (4 === level) {       // display controller details level
           if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('resolution') !== -1) {
             let resolution = parts[1].split('x');
-            currentDisplay.resolutionX = (resolution.length > 1 ? parseInt(resolution[0]) : 0);
-            currentDisplay.resolutionY = (resolution.length > 1 ? parseInt(resolution[1]) : 0);
-            currentDisplay.currentResX = currentDisplay.resolutionX;
-            currentDisplay.currentResY = currentDisplay.resolutionY;
+            if (resolution.length > 1) {
+              let xpart = resolution[0];
+              if (xpart.indexOf('(') !== -1) {
+                xpart = xpart.split('(').slice(-1)[0];
+              }
+              let ypart = resolution[1];
+              if (ypart.indexOf(')') !== -1) {
+                ypart = ypart.split(')')[0];
+              }
+              currentDisplay.resolutionX = parseInt(xpart) || 0;
+              currentDisplay.resolutionY = parseInt(ypart) || 0;
+              currentDisplay.currentResX = currentDisplay.resolutionX;
+              currentDisplay.currentResY = currentDisplay.resolutionY;
+            }
           }
           if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('pixeldepth') !== -1) { currentDisplay.pixelDepth = parseInt(parts[1]); } // in BIT
           if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('framebufferdepth') !== -1) { currentDisplay.pixelDepth = parseInt(parts[1]); } // in BIT

package/lib/index.d.ts

@@ -284,6 +284,7 @@ export namespace Systeminformation {
     model: string;
     manufacturer: string;
     serial: string;
+    additionalBatteries?: BatteryData[];
   }
 
   interface GraphicsData {

package/lib/memory.js

@@ -510,7 +510,7 @@ function memLayout(callback) {
                   bank: util.getValue(lines, 'abel', '='), // BankLabel
                   type: memoryTypes[parseInt(util.getValue(lines, 'MemoryType', '='), 10)],
                   ecc: dataWidth && totalWidth ? totalWidth > dataWidth : false,
-                  clockSpeed: parseInt(util.getValue(lines, 'ConfiguredClockSpeed', '='), 10) || 0,
+                  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', '='),

package/lib/osinfo.js

@@ -18,7 +18,7 @@ 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);
+// const execPromise = util.promisify(require('child_process').exec);
 
 let _platform = process.platform;
 
@@ -323,7 +323,8 @@ function osInfo(callback) {
         try {
           const workload = [];
           workload.push(util.wmic('os get /value'));
-          workload.push(execPromise('systeminfo', util.execOptsWin));
+          // workload.push(execPromise('systeminfo', util.execOptsWin));
+          workload.push(util.powerShell('Get-ComputerInfo -property "HyperV*"'));
           workload.push(util.powerShell('Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.SystemInformation]::TerminalServerSession'));
           util.promiseAll(
             workload
@@ -334,8 +335,10 @@ 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('Es wurde ein Hypervisor erkannt') !== -1) || (systeminfo.indexOf('Un hyperviseur a ') !== -1);
+            // const systeminfo = data.results[1] ? data.results[1].toString() : '';
+            // result.hypervisor = (systeminfo.indexOf('hypervisor has been detected') !== -1) || (systeminfo.indexOf('Es wurde 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 term = data.results[2] ? data.results[2].toString() : '';
             result.remoteSession = (term.toString().toLowerCase().indexOf('true') >= 0);
             isUefiWindows().then(uefi => {
@@ -384,7 +387,7 @@ function isUefiWindows() {
         exec('findstr /C:"Detected boot environment" "%windir%\\Panther\\setupact.log"', util.execOptsWin, function (error, stdout) {
           if (!error) {
             const line = stdout.toString().split('\n\r')[0];
-            resolve(line.toLowerCase().indexOf('uefi') >= 0 || line.toLowerCase().indexOf(' efi') >= 0);
+            resolve(line.toLowerCase().indexOf('efi') >= 0);
             return;
           } else {
             exec('echo %firmware_type%', util.execOptsWin, function (error, stdout) {

package/package.json

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