systeminformation 5.9.16 → 5.10.1

package/lib/bluetooth.js

@@ -1,183 +1,183 @@
-'use strict';
-// @ts-check
-// ==================================================================================
-// audio.js
-// ----------------------------------------------------------------------------------
-// Description:   System Information - library
-//                for Node.js
-// Copyright:     (c) 2014 - 2021
-// Author:        Sebastian Hildebrandt
-// ----------------------------------------------------------------------------------
-// License:       MIT
-// ==================================================================================
-// 17. bluetooth
-// ----------------------------------------------------------------------------------
-
-const exec = require('child_process').exec;
-const execSync = require('child_process').execSync;
-const path = require('path');
-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 parseBluetoothType(str) {
-  let result = '';
-
-  if (str.indexOf('keyboard') >= 0) { result = 'Keyboard'; }
-  if (str.indexOf('mouse') >= 0) { result = 'Mouse'; }
-  if (str.indexOf('speaker') >= 0) { result = 'Speaker'; }
-  if (str.indexOf('headset') >= 0) { result = 'Headset'; }
-  if (str.indexOf('phone') >= 0) { result = 'Phone'; }
-  // to be continued ...
-
-  return result;
-}
-
-function parseLinuxBluetoothInfo(lines, macAddr1, macAddr2) {
-  const result = {};
-
-  result.device = null;
-  result.name = util.getValue(lines, 'name', '=');
-  result.manufacturer = null;
-  result.macDevice = macAddr1;
-  result.macHost = macAddr2;
-  result.batteryPercent = null;
-  result.type = parseBluetoothType(result.name.toLowerCase());
-  result.connected = false;
-
-  return result;
-}
-
-function parseDarwinBluetoothDevices(bluetoothObject, macAddr2) {
-  const result = {};
-  const typeStr = ((bluetoothObject.device_minorClassOfDevice_string || bluetoothObject.device_majorClassOfDevice_string || '') + (bluetoothObject.device_name || '')).toLowerCase();
-
-  result.device = bluetoothObject.device_services || '';
-  result.name = bluetoothObject.device_name || '';
-  result.manufacturer = bluetoothObject.device_manufacturer || '';
-  result.macDevice = (bluetoothObject.device_addr || '').toLowerCase().replace(/-/g, ':');
-  result.macHost = macAddr2;
-  result.batteryPercent = bluetoothObject.device_batteryPercent || null;
-  result.type = parseBluetoothType(typeStr);
-  result.connected = bluetoothObject.device_isconnected === 'attrib_Yes' || false;
-
-  return result;
-}
-
-function parseWindowsBluetooth(lines) {
-  const result = {};
-
-  result.device = null;
-  result.name = util.getValue(lines, 'name', ':');
-  result.manufacturer = util.getValue(lines, 'manufacturer', ':');
-  result.macDevice = null;
-  result.macHost = null;
-  result.batteryPercent = null;
-  result.type = parseBluetoothType(result.name.toLowerCase());
-  result.connected = null;
-
-  return result;
-}
-
-function bluetoothDevices(callback) {
-
-  return new Promise((resolve) => {
-    process.nextTick(() => {
-      let result = [];
-      if (_linux) {
-        // get files in /var/lib/bluetooth/ recursive
-        const btFiles = util.getFilesInPath('/var/lib/bluetooth/');
-        for (let i = 0; i < btFiles.length; i++) {
-          const filename = path.basename(btFiles[i]);
-          const pathParts = btFiles[i].split('/');
-          const macAddr1 = pathParts.length >= 6 ? pathParts[pathParts.length - 2] : null;
-          const macAddr2 = pathParts.length >= 7 ? pathParts[pathParts.length - 3] : null;
-          if (filename === 'info') {
-            const infoFile = fs.readFileSync(btFiles[i], { encoding: 'utf8' }).split('\n');
-            result.push(parseLinuxBluetoothInfo(infoFile, macAddr1, macAddr2));
-          }
-        }
-        // determine "connected" with hcitool con
-        try {
-          const hdicon = execSync('hcitool con').toString().toLowerCase();
-          for (let i = 0; i < result.length; i++) {
-            if (result[i].macDevice && result[i].macDevice.length > 10 && hdicon.indexOf(result[i].macDevice.toLowerCase()) >= 0) {
-              result[i].connected = true;
-            }
-          }
-        } catch (e) {
-          util.noop();
-        }
-
-        if (callback) {
-          callback(result);
-        }
-        resolve(result);
-      }
-      if (_darwin) {
-        let cmd = 'system_profiler SPBluetoothDataType -json';
-        exec(cmd, function (error, stdout) {
-          if (!error) {
-            try {
-              const outObj = JSON.parse(stdout.toString());
-              if (outObj.SPBluetoothDataType && outObj.SPBluetoothDataType.length && outObj.SPBluetoothDataType[0] && outObj.SPBluetoothDataType[0]['device_title'] && outObj.SPBluetoothDataType[0]['device_title'].length) {
-                // missing: host BT Adapter macAddr ()
-                let macAddr2 = null;
-                if (outObj.SPBluetoothDataType[0]['local_device_title'] && outObj.SPBluetoothDataType[0].local_device_title.general_address) {
-                  macAddr2 = outObj.SPBluetoothDataType[0].local_device_title.general_address.toLowerCase().replace(/-/g, ':');
-                }
-
-                for (let i = 0; i < outObj.SPBluetoothDataType[0]['device_title'].length; i++) {
-                  const obj = outObj.SPBluetoothDataType[0]['device_title'][i];
-                  const objKey = Object.keys(obj);
-                  if (objKey && objKey.length === 1) {
-                    const innerObject = obj[objKey[0]];
-                    innerObject.device_name = objKey[0];
-                    const bluetoothDevice = parseDarwinBluetoothDevices(innerObject, macAddr2);
-                    result.push(bluetoothDevice);
-                  }
-                }
-              }
-            } catch (e) {
-              util.noop();
-            }
-          }
-          if (callback) {
-            callback(result);
-          }
-          resolve(result);
-        });
-      }
-      if (_windows) {
-        util.powerShell('Get-WmiObject Win32_PNPEntity | 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'), 'PNPClass', ':') === 'Bluetooth') {
-                result.push(parseWindowsBluetooth(parts[i].split('\n')));
-              }
-            }
-          }
-          if (callback) {
-            callback(result);
-          }
-          resolve(result);
-        });
-      }
-      if (_freebsd || _netbsd || _openbsd || _sunos) {
-        resolve(null);
-      }
-    });
-  });
-}
-
-exports.bluetoothDevices = bluetoothDevices;
+'use strict';
+// @ts-check
+// ==================================================================================
+// audio.js
+// ----------------------------------------------------------------------------------
+// Description:   System Information - library
+//                for Node.js
+// Copyright:     (c) 2014 - 2022
+// Author:        Sebastian Hildebrandt
+// ----------------------------------------------------------------------------------
+// License:       MIT
+// ==================================================================================
+// 17. bluetooth
+// ----------------------------------------------------------------------------------
+
+const exec = require('child_process').exec;
+const execSync = require('child_process').execSync;
+const path = require('path');
+const util = require('./util');
+const fs = require('fs');
+
+let _platform = process.platform;
+
+const _linux = (_platform === 'linux' || _platform === 'android');
+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 parseBluetoothType(str) {
+  let result = '';
+
+  if (str.indexOf('keyboard') >= 0) { result = 'Keyboard'; }
+  if (str.indexOf('mouse') >= 0) { result = 'Mouse'; }
+  if (str.indexOf('speaker') >= 0) { result = 'Speaker'; }
+  if (str.indexOf('headset') >= 0) { result = 'Headset'; }
+  if (str.indexOf('phone') >= 0) { result = 'Phone'; }
+  // to be continued ...
+
+  return result;
+}
+
+function parseLinuxBluetoothInfo(lines, macAddr1, macAddr2) {
+  const result = {};
+
+  result.device = null;
+  result.name = util.getValue(lines, 'name', '=');
+  result.manufacturer = null;
+  result.macDevice = macAddr1;
+  result.macHost = macAddr2;
+  result.batteryPercent = null;
+  result.type = parseBluetoothType(result.name.toLowerCase());
+  result.connected = false;
+
+  return result;
+}
+
+function parseDarwinBluetoothDevices(bluetoothObject, macAddr2) {
+  const result = {};
+  const typeStr = ((bluetoothObject.device_minorClassOfDevice_string || bluetoothObject.device_majorClassOfDevice_string || '') + (bluetoothObject.device_name || '')).toLowerCase();
+
+  result.device = bluetoothObject.device_services || '';
+  result.name = bluetoothObject.device_name || '';
+  result.manufacturer = bluetoothObject.device_manufacturer || '';
+  result.macDevice = (bluetoothObject.device_addr || '').toLowerCase().replace(/-/g, ':');
+  result.macHost = macAddr2;
+  result.batteryPercent = bluetoothObject.device_batteryPercent || null;
+  result.type = parseBluetoothType(typeStr);
+  result.connected = bluetoothObject.device_isconnected === 'attrib_Yes' || false;
+
+  return result;
+}
+
+function parseWindowsBluetooth(lines) {
+  const result = {};
+
+  result.device = null;
+  result.name = util.getValue(lines, 'name', ':');
+  result.manufacturer = util.getValue(lines, 'manufacturer', ':');
+  result.macDevice = null;
+  result.macHost = null;
+  result.batteryPercent = null;
+  result.type = parseBluetoothType(result.name.toLowerCase());
+  result.connected = null;
+
+  return result;
+}
+
+function bluetoothDevices(callback) {
+
+  return new Promise((resolve) => {
+    process.nextTick(() => {
+      let result = [];
+      if (_linux) {
+        // get files in /var/lib/bluetooth/ recursive
+        const btFiles = util.getFilesInPath('/var/lib/bluetooth/');
+        for (let i = 0; i < btFiles.length; i++) {
+          const filename = path.basename(btFiles[i]);
+          const pathParts = btFiles[i].split('/');
+          const macAddr1 = pathParts.length >= 6 ? pathParts[pathParts.length - 2] : null;
+          const macAddr2 = pathParts.length >= 7 ? pathParts[pathParts.length - 3] : null;
+          if (filename === 'info') {
+            const infoFile = fs.readFileSync(btFiles[i], { encoding: 'utf8' }).split('\n');
+            result.push(parseLinuxBluetoothInfo(infoFile, macAddr1, macAddr2));
+          }
+        }
+        // determine "connected" with hcitool con
+        try {
+          const hdicon = execSync('hcitool con').toString().toLowerCase();
+          for (let i = 0; i < result.length; i++) {
+            if (result[i].macDevice && result[i].macDevice.length > 10 && hdicon.indexOf(result[i].macDevice.toLowerCase()) >= 0) {
+              result[i].connected = true;
+            }
+          }
+        } catch (e) {
+          util.noop();
+        }
+
+        if (callback) {
+          callback(result);
+        }
+        resolve(result);
+      }
+      if (_darwin) {
+        let cmd = 'system_profiler SPBluetoothDataType -json';
+        exec(cmd, function (error, stdout) {
+          if (!error) {
+            try {
+              const outObj = JSON.parse(stdout.toString());
+              if (outObj.SPBluetoothDataType && outObj.SPBluetoothDataType.length && outObj.SPBluetoothDataType[0] && outObj.SPBluetoothDataType[0]['device_title'] && outObj.SPBluetoothDataType[0]['device_title'].length) {
+                // missing: host BT Adapter macAddr ()
+                let macAddr2 = null;
+                if (outObj.SPBluetoothDataType[0]['local_device_title'] && outObj.SPBluetoothDataType[0].local_device_title.general_address) {
+                  macAddr2 = outObj.SPBluetoothDataType[0].local_device_title.general_address.toLowerCase().replace(/-/g, ':');
+                }
+
+                for (let i = 0; i < outObj.SPBluetoothDataType[0]['device_title'].length; i++) {
+                  const obj = outObj.SPBluetoothDataType[0]['device_title'][i];
+                  const objKey = Object.keys(obj);
+                  if (objKey && objKey.length === 1) {
+                    const innerObject = obj[objKey[0]];
+                    innerObject.device_name = objKey[0];
+                    const bluetoothDevice = parseDarwinBluetoothDevices(innerObject, macAddr2);
+                    result.push(bluetoothDevice);
+                  }
+                }
+              }
+            } catch (e) {
+              util.noop();
+            }
+          }
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        });
+      }
+      if (_windows) {
+        util.powerShell('Get-WmiObject Win32_PNPEntity | 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'), 'PNPClass', ':') === 'Bluetooth') {
+                result.push(parseWindowsBluetooth(parts[i].split('\n')));
+              }
+            }
+          }
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        });
+      }
+      if (_freebsd || _netbsd || _openbsd || _sunos) {
+        resolve(null);
+      }
+    });
+  });
+}
+
+exports.bluetoothDevices = bluetoothDevices;

package/lib/cli.js

@@ -7,7 +7,7 @@
 // ----------------------------------------------------------------------------------
 // Description:   System Information - library
 //                for Node.js
-// Copyright:     (c) 2014 - 2021
+// Copyright:     (c) 2014 - 2022
 // Author:        Sebastian Hildebrandt
 // ----------------------------------------------------------------------------------
 // License:       MIT
@@ -21,7 +21,7 @@ const si = require('./index');
 // ----------------------------------------------------------------------------------
 // Main
 // ----------------------------------------------------------------------------------
-(function() {
+(function () {
   si.getStaticData().then(
     (data => {
       data.time = si.time();

package/lib/cpu.js

@@ -5,7 +5,7 @@
 // ----------------------------------------------------------------------------------
 // Description:   System Information - library
 //                for Node.js
-// Copyright:     (c) 2014 - 2021
+// Copyright:     (c) 2014 - 2022
 // Author:        Sebastian Hildebrandt
 // ----------------------------------------------------------------------------------
 // License:       MIT
@@ -21,7 +21,7 @@ const util = require('./util');
 
 let _platform = process.platform;
 
-const _linux = (_platform === 'linux');
+const _linux = (_platform === 'linux' || _platform === 'android');
 const _darwin = (_platform === 'darwin');
 const _windows = (_platform === 'win32');
 const _freebsd = (_platform === 'freebsd');
@@ -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/docker.js

@@ -5,7 +5,7 @@
 // ----------------------------------------------------------------------------------
 // Description:   System Information - library
 //                for Node.js
-// Copyright:     (c) 2014 - 2021
+// Copyright:     (c) 2014 - 2022
 // Author:        Sebastian Hildebrandt
 // ----------------------------------------------------------------------------------
 // License:       MIT

package/lib/dockerSocket.js

@@ -5,7 +5,7 @@
 // ----------------------------------------------------------------------------------
 // Description:   System Information - library
 //                for Node.js
-// Copyright:     (c) 2014 - 2021
+// Copyright:     (c) 2014 - 2022
 // Author:        Sebastian Hildebrandt
 // ----------------------------------------------------------------------------------
 // License:       MIT

package/lib/filesystem.js

@@ -5,7 +5,7 @@
 // ----------------------------------------------------------------------------------
 // Description:   System Information - library
 //                for Node.js
-// Copyright:     (c) 2014 - 2021
+// Copyright:     (c) 2014 - 2022
 // Author:        Sebastian Hildebrandt
 // ----------------------------------------------------------------------------------
 // License:       MIT
@@ -22,7 +22,7 @@ const execPromiseSave = util.promisifySave(require('child_process').exec);
 
 let _platform = process.platform;
 
-const _linux = (_platform === 'linux');
+const _linux = (_platform === 'linux' || _platform === 'android');
 const _darwin = (_platform === 'darwin');
 const _windows = (_platform === 'win32');
 const _freebsd = (_platform === 'freebsd');

package/lib/graphics.js

@@ -5,7 +5,7 @@
 // ----------------------------------------------------------------------------------
 // Description:   System Information - library
 //                for Node.js
-// Copyright:     (c) 2014 - 2021
+// Copyright:     (c) 2014 - 2022
 // Author:        Sebastian Hildebrandt
 // ----------------------------------------------------------------------------------
 // License:       MIT
@@ -21,7 +21,7 @@ const util = require('./util');
 let _platform = process.platform;
 let _nvidiaSmiPath = '';
 
-const _linux = (_platform === 'linux');
+const _linux = (_platform === 'linux' || _platform === 'android');
 const _darwin = (_platform === 'darwin');
 const _windows = (_platform === 'win32');
 const _freebsd = (_platform === 'freebsd');