systeminformation 5.9.3 → 5.9.7

package/CHANGELOG.md

@@ -76,10 +76,14 @@ If you want to see all function results on your machine, please head over to (Te
 
 For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
-## Version history
+## Version History
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 5.9.7          | 2021-10-09     | `battery()` fixed typo seperator (windows) |
+| 5.9.6          | 2021-10-08     | `system()` fixed virtual on WSL2 |
+| 5.9.5          | 2021-10-08     | `battery()` fixed isCharging (windows) |
+| 5.9.4          | 2021-09-23     | `processes()` fixed memVsz, Memrss (macOS M1) |
 | 5.9.3          | 2021-09-17     | `cpuTemperature()` improved tdie detection (linus) |
 | 5.9.2          | 2021-09-16     | `graohics()` (macOS),  `memLayout()` (win) improvements |
 | 5.9.1          | 2021-09-15     | `diskLayout()` fix size (macOS) |

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 > 10,000 lines of code, > 400 versions published, up to 3 mio downloads per month, > 45 mio downloads overall. Thank you to all who contributed to this project!
+This is amazing. Started as a small project just for myself, it now has > 10,000 lines of code, > 450 versions published, up to 4 mio downloads per month, > 50 mio downloads overall. #1 NPM ranking for backend packages. Thank you to all who contributed to this project!
 
 ## New Version 5.0
 

package/lib/battery.js

@@ -52,7 +52,7 @@ function parseWinBatteryPart(lines, designedCapacity, fullChargeCapacity) {
     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.acConnected = result.isCharging || statusValue === 2;
     result.model = util.getValue(lines, 'DeviceID', '=');
   } else {
     result.status = -1;
@@ -120,7 +120,7 @@ module.exports = function (callback) {
               result.currentCapacity = Math.round(parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CHARGE_NOW', '='), 10) / 1000.0 * (result.voltage || 1));
               if (!result.maxCapacity) {
                 result.maxCapacity = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_FULL', '=', true, true), 10) / 1000.0;
-                result.designedCapacity = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_FULL_DESIGN', true, true, '='), 10) / 1000.0 | result.maxCapacity;
+                result.designedCapacity = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_FULL_DESIGN', '=', true, true), 10) / 1000.0 | result.maxCapacity;
                 result.currentCapacity = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_NOW', '='), 10) / 1000.0;
               }
               const percent = util.getValue(lines, 'POWER_SUPPLY_CAPACITY', '=');

package/lib/processes.js

@@ -686,7 +686,7 @@ function processes(callback) {
         if (_linux || _freebsd || _openbsd || _netbsd || _darwin || _sunos) {
           if (_linux) { cmd = 'export LC_ALL=C; ps -axo pid:11,ppid:11,pcpu:6,pmem:6,pri:5,vsz:11,rss:11,ni:5,lstart:30,state:5,tty:15,user:20,command; unset LC_ALL'; }
           if (_freebsd || _openbsd || _netbsd) { cmd = 'export LC_ALL=C; ps -axo pid,ppid,pcpu,pmem,pri,vsz,rss,ni,lstart,state,tty,user,command; unset LC_ALL'; }
-          if (_darwin) { cmd = 'export LC_ALL=C; ps -axo pid,ppid,pcpu,pmem,pri,vsz,rss,nice,lstart,state,tty,user,command -r; unset LC_ALL'; }
+          if (_darwin) { cmd = 'ps -axo pid,ppid,pcpu,pmem,pri,vsz=xxx_fake_title,rss=fake_title2,nice,lstart,state,tty,user,command -r'; }
           if (_sunos) { cmd = 'ps -Ao pid,ppid,pcpu,pmem,pri,vsz,rss,nice,stime,s,tty,user,comm'; }
           exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
             if (!error && stdout.toString().trim()) {

package/lib/system.js

@@ -122,10 +122,10 @@ function system(callback) {
               util.noop();
             }
           }
-          if (!result.virtual && util.linuxVersion().toLowerCase().indexOf('microsoft') >= 0) {
+          if (!result.virtual && (util.linuxVersion().toLowerCase().indexOf('microsoft') >= 0 || os.release().toLowerCase().indexOf('microsoft') >= 0 || os.release().toLowerCase().endsWith('wsl2'))) {
             let versionStr = util.linuxVersion().toLowerCase();
             versionStr = versionStr.split('-')[0].replace('#', '');
-            const version = parseInt(versionStr, 10) || null;
+            const version = os.release().toLowerCase().endsWith('wsl2') ? 'WSL2' : parseInt(versionStr, 10) || null;
             result.virtual = true;
             result.manufacturer = 'Microsoft';
             result.model = 'WSL';

package/lib/users.js

@@ -283,7 +283,7 @@ function users(callback) {
       }
       if (_windows) {
         try {
-          exec('query user', util.execOptsWin, function (error, stdout) {
+          util.execWin('query user', util.execOptsWin, function (error, stdout) {
             if (stdout) {
               // lines / split
               let lines = stdout.toString().split('\r\n');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "systeminformation",
-  "version": "5.9.3",
-  "description": "Simple system and OS information library",
+  "version": "5.9.7",
+  "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",
   "homepage": "https://systeminformation.io",
@@ -70,7 +70,10 @@
     "virtual box",
     "virtualbox",
     "vm",
-    "backend"
+    "backend",
+    "hardware",
+    "BIOS",
+    "chassis"
   ],
   "repository": {
     "type": "git",