systeminformation 5.9.5 → 5.9.9

package/CHANGELOG.md

@@ -40,7 +40,7 @@ We had to make **several interface changes** to keep systeminformation as consis
 
 #### Other Improvements and Changes
 
-- `baseboard(): added memMax, memSlots
+- `baseboard()`: added memMax, memSlots
 - `bios()`: added language and features (linux)
 - `cpu()`: extended AMD processor list
 - `cpu()`: extended socket list (win)
@@ -80,9 +80,13 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 5.9.9          | 2021-10-27     | `graphics` fixed screen resolution issue (windows) |
+| 5.9.8          | 2021-10-22     | `wmic` fixed code page issues (windows) |
+| 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.3          | 2021-09-17     | `cpuTemperature()` improved tdie detection (linux) |
 | 5.9.2          | 2021-09-16     | `graohics()` (macOS),  `memLayout()` (win) improvements |
 | 5.9.1          | 2021-09-15     | `diskLayout()` fix size (macOS) |
 | 5.9.0          | 2021-09-15     | `graphics()` new XML parser, added properties (macOS) |
@@ -238,9 +242,9 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 | 4.24.1         | 2020-05-03     | `processes()` fix parsing command and params |
 | 4.24.0         | 2020-05-01     | `networkInterfaces()` added subnet mask ip4 and ip6 |
 | 4.23.10        | 2020-05-01     | `cpuTemperature()` optimized parsing linux |
-| 4.23.9         | 2020-04-29     | `currentLoad()` workarround for no os.cpus info |
+| 4.23.9         | 2020-04-29     | `currentLoad()` workaround for no os.cpus info |
 | 4.23.8         | 2020-04-26     | `getMacAddresses()` fix added try catch |
-| 4.23.7         | 2020-04-26     | `getCpuCurrentSpeedSync()` workarround fix |
+| 4.23.7         | 2020-04-26     | `getCpuCurrentSpeedSync()` workaround fix |
 | 4.23.6         | 2020-04-25     | `networkGatewayDefault()` bug fix no interfaces |
 | 4.23.5         | 2020-04-20     | updated docs |
 | 4.23.4         | 2020-04-20     | `users()` optimized parseDateTime function |

package/README.md

@@ -888,6 +888,8 @@ To be able to measure temperature on macOS I created a little additional package
 in NPM with `optionalDependencies` I unfortunately was getting unexpected warnings on other platforms.
 So I decided to drop this optional dependency for macOS - so by default, you will not get correct values.
 
+This additional package will unfortunately NOT work on Apple Silicon M1 machines.
+
 But if you need to detect macOS temperature just run the following additional
 installation command:
 
@@ -976,6 +978,8 @@ Written by Sebastian Hildebrandt [sebhildebrandt](https://github.com/sebhildebra
 - Miłosz Dźwigała [mily20001](https://github.com/mily20001)
 - cconley717 [cconley717](https://github.com/cconley717)
 - Maria Camila Cubides [MariaCamilaCubides](https://github.com/MariaCamilaCubides)
+- Aleksander Krasnicki [plakak](https://github.com/plakak)
+- Alexis Tyler [OmgImAlexis](https://github.com/OmgImAlexis)
 
 OSX Temperature: credits here are going to:
 

package/lib/audio.js

@@ -1,219 +1,219 @@
-'use strict';
-// @ts-check
-// ==================================================================================
-// audio.js
-// ----------------------------------------------------------------------------------
-// Description:   System Information - library
-//                for Node.js
-// Copyright:     (c) 2014 - 2021
-// Author:        Sebastian Hildebrandt
-// ----------------------------------------------------------------------------------
-// License:       MIT
-// ==================================================================================
-// 16. audio
-// ----------------------------------------------------------------------------------
-
-const exec = require('child_process').exec;
-const execSync = require('child_process').execSync;
-const util = require('./util');
-// const fs = require('fs');
-
-let _platform = process.platform;
-
-const _linux = (_platform === 'linux');
-const _darwin = (_platform === 'darwin');
-const _windows = (_platform === 'win32');
-const _freebsd = (_platform === 'freebsd');
-const _openbsd = (_platform === 'openbsd');
-const _netbsd = (_platform === 'netbsd');
-const _sunos = (_platform === 'sunos');
-
-function parseAudioType(str, input, output) {
-  let result = '';
-
-  if (str.indexOf('speak') >= 0) { result = 'Speaker'; }
-  if (str.indexOf('laut') >= 0) { result = 'Speaker'; }
-  if (str.indexOf('loud') >= 0) { result = 'Speaker'; }
-  if (str.indexOf('head') >= 0) { result = 'Headset'; }
-  if (str.indexOf('mic') >= 0) { result = 'Microphone'; }
-  if (str.indexOf('mikr') >= 0) { result = 'Microphone'; }
-  if (str.indexOf('phone') >= 0) { result = 'Phone'; }
-  if (str.indexOf('controll') >= 0) { result = 'Controller'; }
-  if (str.indexOf('line o') >= 0) { result = 'Line Out'; }
-  if (str.indexOf('digital o') >= 0) { result = 'Digital Out'; }
-
-  if (!result && output) {
-    result = 'Speaker';
-  } else if (!result && input) {
-    result = 'Microphone';
-  }
-  return result;
-}
-
-
-function getLinuxAudioPci() {
-  let cmd = 'lspci -v 2>/dev/null';
-  let result = [];
-  try {
-    const parts = execSync(cmd).toString().split('\n\n');
-    for (let i = 0; i < parts.length; i++) {
-      const lines = parts[i].split('\n');
-      if (lines && lines.length && lines[0].toLowerCase().indexOf('audio') >= 0) {
-        const audio = {};
-        audio.slotId = lines[0].split(' ')[0];
-        audio.driver = util.getValue(lines, 'Kernel driver in use', ':', true) || util.getValue(lines, 'Kernel modules', ':', true);
-        result.push(audio);
-      }
-    }
-    return result;
-  } catch (e) {
-    return result;
-  }
-}
-
-function parseLinuxAudioPciMM(lines, audioPCI) {
-  const result = {};
-  const slotId = util.getValue(lines, 'Slot');
-
-  const pciMatch = audioPCI.filter(function (item) { return item.slotId === slotId; });
-
-  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 : '';
-  result.default = null;
-  result.channel = 'PCIe';
-  result.type = parseAudioType(result.name, null, null);
-  result.in = null;
-  result.out = null;
-  result.status = 'online';
-
-  return result;
-}
-
-function parseDarwinChannel(str) {
-  let result = '';
-
-  if (str.indexOf('builtin') >= 0) { result = 'Built-In'; }
-  if (str.indexOf('extern') >= 0) { result = 'Audio-Jack'; }
-  if (str.indexOf('hdmi') >= 0) { result = 'HDMI'; }
-  if (str.indexOf('displayport') >= 0) { result = 'Display-Port'; }
-  if (str.indexOf('usb') >= 0) { result = 'USB'; }
-  if (str.indexOf('pci') >= 0) { result = 'PCIe'; }
-
-  return result;
-}
-
-function parseDarwinAudio(audioObject, id) {
-  const result = {};
-  const channelStr = ((audioObject.coreaudio_device_transport || '') + ' ' + (audioObject._name || '')).toLowerCase();
-
-  result.id = id;
-  result.name = audioObject._name;
-  result.manufacturer = audioObject.coreaudio_device_manufacturer;
-  result.revision = null;
-  result.driver = null;
-  result.default = !!(audioObject.coreaudio_default_audio_input_device || '') || !!(audioObject.coreaudio_default_audio_output_device || '');
-  result.channel = parseDarwinChannel(channelStr);
-  result.type = parseAudioType(result.name, !!(audioObject.coreaudio_device_input || ''), !!(audioObject.coreaudio_device_output || ''));
-  result.in = !!(audioObject.coreaudio_device_input || '');
-  result.out = !!(audioObject.coreaudio_device_output || '');
-  result.status = 'online';
-
-  return result;
-}
-
-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', '=');
-  result.manufacturer = util.getValue(lines, 'manufacturer', '=');
-  result.revision = null;
-  result.driver = null;
-  result.default = null;
-  result.channel = null;
-  result.type = parseAudioType(result.name, null, null);
-  result.in = null;
-  result.out = null;
-  result.status = status;
-
-  return result;
-}
-
-function audio(callback) {
-
-  return new Promise((resolve) => {
-    process.nextTick(() => {
-      let result = [];
-      if (_linux || _freebsd || _openbsd || _netbsd) {
-        let cmd = 'lspci -vmm 2>/dev/null';
-        exec(cmd, function (error, stdout) {
-          // PCI
-          if (!error) {
-            const audioPCI = getLinuxAudioPci();
-            const parts = stdout.toString().split('\n\n');
-            for (let i = 0; i < parts.length; i++) {
-              const lines = parts[i].split('\n');
-              if (util.getValue(lines, 'class', ':', true).toLowerCase().indexOf('audio') >= 0) {
-                const audio = parseLinuxAudioPciMM(lines, audioPCI);
-                result.push(audio);
-              }
-            }
-          }
-          if (callback) {
-            callback(result);
-          }
-          resolve(result);
-        });
-      }
-      if (_darwin) {
-        let cmd = 'system_profiler SPAudioDataType -json';
-        exec(cmd, function (error, stdout) {
-          if (!error) {
-            try {
-              const outObj = JSON.parse(stdout.toString());
-              if (outObj.SPAudioDataType && outObj.SPAudioDataType.length && outObj.SPAudioDataType[0] && outObj.SPAudioDataType[0]['_items'] && outObj.SPAudioDataType[0]['_items'].length) {
-                for (let i = 0; i < outObj.SPAudioDataType[0]['_items'].length; i++) {
-                  const audio = parseDarwinAudio(outObj.SPAudioDataType[0]['_items'][i], i);
-                  result.push(audio);
-                }
-              }
-            } catch (e) {
-              util.noop();
-            }
-          }
-          if (callback) {
-            callback(result);
-          }
-          resolve(result);
-        });
-      }
-      if (_windows) {
-        util.wmic('path Win32_SoundDevice get /value', function (error, stdout) {
-          if (!error) {
-            const parts = stdout.toString().split(/\n\s*\n/);
-            for (let i = 0; i < parts.length; i++) {
-              if (util.getValue(parts[i].split('\n'), 'name', '=')) {
-                result.push(parseWindowsAudio(parts[i].split('\n')));
-              }
-            }
-          }
-          if (callback) {
-            callback(result);
-          }
-          resolve(result);
-        });
-      }
-      if (_sunos) {
-        resolve(null);
-      }
-    });
-  });
-}
-
-exports.audio = audio;
+'use strict';
+// @ts-check
+// ==================================================================================
+// audio.js
+// ----------------------------------------------------------------------------------
+// Description:   System Information - library
+//                for Node.js
+// Copyright:     (c) 2014 - 2021
+// Author:        Sebastian Hildebrandt
+// ----------------------------------------------------------------------------------
+// License:       MIT
+// ==================================================================================
+// 16. audio
+// ----------------------------------------------------------------------------------
+
+const exec = require('child_process').exec;
+const execSync = require('child_process').execSync;
+const util = require('./util');
+// const fs = require('fs');
+
+let _platform = process.platform;
+
+const _linux = (_platform === 'linux');
+const _darwin = (_platform === 'darwin');
+const _windows = (_platform === 'win32');
+const _freebsd = (_platform === 'freebsd');
+const _openbsd = (_platform === 'openbsd');
+const _netbsd = (_platform === 'netbsd');
+const _sunos = (_platform === 'sunos');
+
+function parseAudioType(str, input, output) {
+  let result = '';
+
+  if (str.indexOf('speak') >= 0) { result = 'Speaker'; }
+  if (str.indexOf('laut') >= 0) { result = 'Speaker'; }
+  if (str.indexOf('loud') >= 0) { result = 'Speaker'; }
+  if (str.indexOf('head') >= 0) { result = 'Headset'; }
+  if (str.indexOf('mic') >= 0) { result = 'Microphone'; }
+  if (str.indexOf('mikr') >= 0) { result = 'Microphone'; }
+  if (str.indexOf('phone') >= 0) { result = 'Phone'; }
+  if (str.indexOf('controll') >= 0) { result = 'Controller'; }
+  if (str.indexOf('line o') >= 0) { result = 'Line Out'; }
+  if (str.indexOf('digital o') >= 0) { result = 'Digital Out'; }
+
+  if (!result && output) {
+    result = 'Speaker';
+  } else if (!result && input) {
+    result = 'Microphone';
+  }
+  return result;
+}
+
+
+function getLinuxAudioPci() {
+  let cmd = 'lspci -v 2>/dev/null';
+  let result = [];
+  try {
+    const parts = execSync(cmd).toString().split('\n\n');
+    for (let i = 0; i < parts.length; i++) {
+      const lines = parts[i].split('\n');
+      if (lines && lines.length && lines[0].toLowerCase().indexOf('audio') >= 0) {
+        const audio = {};
+        audio.slotId = lines[0].split(' ')[0];
+        audio.driver = util.getValue(lines, 'Kernel driver in use', ':', true) || util.getValue(lines, 'Kernel modules', ':', true);
+        result.push(audio);
+      }
+    }
+    return result;
+  } catch (e) {
+    return result;
+  }
+}
+
+function parseLinuxAudioPciMM(lines, audioPCI) {
+  const result = {};
+  const slotId = util.getValue(lines, 'Slot');
+
+  const pciMatch = audioPCI.filter(function (item) { return item.slotId === slotId; });
+
+  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 : '';
+  result.default = null;
+  result.channel = 'PCIe';
+  result.type = parseAudioType(result.name, null, null);
+  result.in = null;
+  result.out = null;
+  result.status = 'online';
+
+  return result;
+}
+
+function parseDarwinChannel(str) {
+  let result = '';
+
+  if (str.indexOf('builtin') >= 0) { result = 'Built-In'; }
+  if (str.indexOf('extern') >= 0) { result = 'Audio-Jack'; }
+  if (str.indexOf('hdmi') >= 0) { result = 'HDMI'; }
+  if (str.indexOf('displayport') >= 0) { result = 'Display-Port'; }
+  if (str.indexOf('usb') >= 0) { result = 'USB'; }
+  if (str.indexOf('pci') >= 0) { result = 'PCIe'; }
+
+  return result;
+}
+
+function parseDarwinAudio(audioObject, id) {
+  const result = {};
+  const channelStr = ((audioObject.coreaudio_device_transport || '') + ' ' + (audioObject._name || '')).toLowerCase();
+
+  result.id = id;
+  result.name = audioObject._name;
+  result.manufacturer = audioObject.coreaudio_device_manufacturer;
+  result.revision = null;
+  result.driver = null;
+  result.default = !!(audioObject.coreaudio_default_audio_input_device || '') || !!(audioObject.coreaudio_default_audio_output_device || '');
+  result.channel = parseDarwinChannel(channelStr);
+  result.type = parseAudioType(result.name, !!(audioObject.coreaudio_device_input || ''), !!(audioObject.coreaudio_device_output || ''));
+  result.in = !!(audioObject.coreaudio_device_input || '');
+  result.out = !!(audioObject.coreaudio_device_output || '');
+  result.status = 'online';
+
+  return result;
+}
+
+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', ':');
+  result.manufacturer = util.getValue(lines, 'manufacturer', ':');
+  result.revision = null;
+  result.driver = null;
+  result.default = null;
+  result.channel = null;
+  result.type = parseAudioType(result.name, null, null);
+  result.in = null;
+  result.out = null;
+  result.status = status;
+
+  return result;
+}
+
+function audio(callback) {
+
+  return new Promise((resolve) => {
+    process.nextTick(() => {
+      let result = [];
+      if (_linux || _freebsd || _openbsd || _netbsd) {
+        let cmd = 'lspci -vmm 2>/dev/null';
+        exec(cmd, function (error, stdout) {
+          // PCI
+          if (!error) {
+            const audioPCI = getLinuxAudioPci();
+            const parts = stdout.toString().split('\n\n');
+            for (let i = 0; i < parts.length; i++) {
+              const lines = parts[i].split('\n');
+              if (util.getValue(lines, 'class', ':', true).toLowerCase().indexOf('audio') >= 0) {
+                const audio = parseLinuxAudioPciMM(lines, audioPCI);
+                result.push(audio);
+              }
+            }
+          }
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        });
+      }
+      if (_darwin) {
+        let cmd = 'system_profiler SPAudioDataType -json';
+        exec(cmd, function (error, stdout) {
+          if (!error) {
+            try {
+              const outObj = JSON.parse(stdout.toString());
+              if (outObj.SPAudioDataType && outObj.SPAudioDataType.length && outObj.SPAudioDataType[0] && outObj.SPAudioDataType[0]['_items'] && outObj.SPAudioDataType[0]['_items'].length) {
+                for (let i = 0; i < outObj.SPAudioDataType[0]['_items'].length; i++) {
+                  const audio = parseDarwinAudio(outObj.SPAudioDataType[0]['_items'][i], i);
+                  result.push(audio);
+                }
+              }
+            } catch (e) {
+              util.noop();
+            }
+          }
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        });
+      }
+      if (_windows) {
+        util.powerShell('Get-WmiObject Win32_SoundDevice | fl *').then((stdout, error) => {
+          if (!error) {
+            const parts = stdout.toString().split(/\n\s*\n/);
+            for (let i = 0; i < parts.length; i++) {
+              if (util.getValue(parts[i].split('\n'), 'name', ':')) {
+                result.push(parseWindowsAudio(parts[i].split('\n')));
+              }
+            }
+          }
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        });
+      }
+      if (_sunos) {
+        resolve(null);
+      }
+    });
+  });
+}
+
+exports.audio = audio;