systeminformation 5.9.7 → 5.9.8

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 parseBluetoothTyoe(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 = parseBluetoothTyoe(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 = parseBluetoothTyoe(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 = parseBluetoothTyoe(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.wmic('path Win32_PNPEntity 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'), '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 - 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;

package/lib/cpu.js

@@ -751,8 +751,8 @@ function getCpu() {
         if (_windows) {
           try {
             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-WmiObject Win32_processor | fl *'));
+            workload.push(util.powerShell('Get-WmiObject Win32_CacheMemory | select CacheType,InstalledSize,Purpose | fl *'));
             // workload.push(util.powerShell('Get-ComputerInfo -property "HyperV*"'));
             workload.push(util.powerShell('(Get-CimInstance Win32_ComputerSystem).HypervisorPresent'));
 
@@ -760,7 +760,7 @@ function getCpu() {
               workload
             ).then(data => {
               let lines = data[0].split('\r\n');
-              let name = util.getValue(lines, 'name', '=') || '';
+              let name = util.getValue(lines, 'name', ':') || '';
               if (name.indexOf('@') >= 0) {
                 result.brand = name.split('@')[0].trim();
                 result.speed = name.split('@')[1] ? parseFloat(name.split('@')[1].trim()) : 0;
@@ -770,15 +770,15 @@ function getCpu() {
                 result.speed = 0;
               }
               result = cpuBrandManufacturer(result);
-              result.revision = util.getValue(lines, 'revision', '=');
+              result.revision = util.getValue(lines, 'revision', ':');
               result.cache.l1d = 0;
               result.cache.l1i = 0;
-              result.cache.l2 = util.getValue(lines, 'l2cachesize', '=');
-              result.cache.l3 = util.getValue(lines, 'l3cachesize', '=');
+              result.cache.l2 = util.getValue(lines, 'l2cachesize', ':');
+              result.cache.l3 = util.getValue(lines, 'l3cachesize', ':');
               if (result.cache.l2) { result.cache.l2 = parseInt(result.cache.l2, 10) * 1024; }
               if (result.cache.l3) { result.cache.l3 = parseInt(result.cache.l3, 10) * 1024; }
-              result.vendor = util.getValue(lines, 'manufacturer', '=');
-              result.speedMax = Math.round(parseFloat(util.getValue(lines, 'maxclockspeed', '=').replace(/,/g, '.')) / 10.0) / 100;
+              result.vendor = util.getValue(lines, 'manufacturer', ':');
+              result.speedMax = Math.round(parseFloat(util.getValue(lines, 'maxclockspeed', ':').replace(/,/g, '.')) / 10.0) / 100;
               if (result.speed === 0 && (result.brand.indexOf('AMD') > -1 || result.brand.toLowerCase().indexOf('ryzen') > -1)) {
                 result.speed = getAMDSpeed(result.brand);
               }
@@ -787,7 +787,7 @@ function getCpu() {
               }
               result.speedMin = result.speed;
 
-              let description = util.getValue(lines, 'description', '=').split(' ');
+              let description = util.getValue(lines, 'description', ':').split(' ');
               for (let i = 0; i < description.length; i++) {
                 if (description[i].toLowerCase().startsWith('family') && (i + 1) < description.length && description[i + 1]) {
                   result.family = description[i + 1];
@@ -800,14 +800,14 @@ function getCpu() {
                 }
               }
               // socket type
-              const socketId = util.getValue(lines, 'UpgradeMethod', '=');
+              const socketId = util.getValue(lines, 'UpgradeMethod', ':');
               if (socketTypes[socketId]) {
                 result.socket = socketTypes[socketId];
               }
               // # threads / # cores
               const countProcessors = util.countLines(lines, 'Caption');
-              const countThreads = util.getValue(lines, 'NumberOfLogicalProcessors', '=');
-              const countCores = util.getValue(lines, 'NumberOfCores', '=');
+              const countThreads = util.getValue(lines, 'NumberOfLogicalProcessors', ':');
+              const countCores = util.getValue(lines, 'NumberOfCores', ':');
               if (countProcessors) {
                 result.processors = parseInt(countProcessors) || 1;
               }
@@ -819,18 +819,19 @@ function getCpu() {
                 result.cores = result.cores * countProcessors;
                 result.physicalCores = result.physicalCores * countProcessors;
               }
-              lines = data[1].split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0);
-              lines.forEach(function (line) {
-                if (line !== '') {
-                  line = line.trim().split(/\s\s+/);
-                  // L1 Instructions
-                  if (line[2] === 'L1 Cache' && line[0] === '3') {
-                    result.cache.l1i = parseInt(line[1], 10);
-                  }
-                  // L1 Data
-                  if (line[2] === 'L1 Cache' && line[0] === '4') {
-                    result.cache.l1d = parseInt(line[1], 10);
-                  }
+              const parts = data[1].split(/\n\s*\n/);
+              parts.forEach(function (part) {
+                lines = part.split('\r\n');
+                const cacheType = util.getValue(lines, 'CacheType');
+                const purpose = util.getValue(lines, 'Purpose');
+                const installedSize = util.getValue(lines, 'InstalledSize');
+                // L1 Instructions
+                if (purpose === 'L1 Cache' && cacheType === '3') {
+                  result.cache.l1i = parseInt(installedSize, 10);
+                }
+                // L1 Data
+                if (purpose === 'L1 Cache' && cacheType === '4') {
+                  result.cache.l1d = parseInt(installedSize, 10);
                 }
               });
               // lines = data[2].split('\r\n');
@@ -1134,7 +1135,7 @@ function cpuTemperature(callback) {
       }
       if (_windows) {
         try {
-          util.wmic('/namespace:\\\\root\\wmi PATH MSAcpi_ThermalZoneTemperature get CurrentTemperature').then((stdout, error) => {
+          util.powerShell('Get-WmiObject MSAcpi_ThermalZoneTemperature -Namespace "root/wmi" | Select CurrentTemperature').then((stdout, error) => {
             if (!error) {
               let sum = 0;
               let lines = stdout.split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0);
@@ -1373,30 +1374,31 @@ function cpuCache(callback) {
       }
       if (_windows) {
         try {
-          util.wmic('cpu get l2cachesize, l3cachesize /value').then((stdout, error) => {
+          util.powerShell('Get-WmiObject Win32_processor | fl *').then((stdout, error) => {
             if (!error) {
               let lines = stdout.split('\r\n');
               result.l1d = 0;
               result.l1i = 0;
-              result.l2 = util.getValue(lines, 'l2cachesize', '=');
-              result.l3 = util.getValue(lines, 'l3cachesize', '=');
+              result.l2 = util.getValue(lines, 'l2cachesize', ':');
+              result.l3 = util.getValue(lines, 'l3cachesize', ':');
               if (result.l2) { result.l2 = parseInt(result.l2, 10) * 1024; }
               if (result.l3) { result.l3 = parseInt(result.l3, 10) * 1024; }
             }
-            util.wmic('path Win32_CacheMemory get CacheType,InstalledSize,Purpose').then((stdout, error) => {
+            util.powerShell('Get-WmiObject Win32_CacheMemory | select CacheType,InstalledSize,Purpose | fl ').then((stdout, error) => {
               if (!error) {
-                let lines = stdout.split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0);
-                lines.forEach(function (line) {
-                  if (line !== '') {
-                    line = line.trim().split(/\s\s+/);
-                    // L1 Instructions
-                    if (line[2] === 'L1 Cache' && line[0] === '3') {
-                      result.l1i = parseInt(line[1], 10);
-                    }
-                    // L1 Data
-                    if (line[2] === 'L1 Cache' && line[0] === '4') {
-                      result.l1d = parseInt(line[1], 10);
-                    }
+                const parts = stdout.split(/\n\s*\n/);
+                parts.forEach(function (part) {
+                  const lines = part.split('\r\n');
+                  const cacheType = util.getValue(lines, 'CacheType');
+                  const purpose = util.getValue(lines, 'Purpose');
+                  const installedSize = util.getValue(lines, 'InstalledSize');
+                  // L1 Instructions
+                  if (purpose === 'L1 Cache' && cacheType === '3') {
+                    result.l1i = parseInt(installedSize, 10);
+                  }
+                  // L1 Data
+                  if (purpose === 'L1 Cache' && cacheType === '4') {
+                    result.l1d = parseInt(installedSize, 10);
                   }
                 });
               }

package/lib/dockerSocket.js

@@ -321,7 +321,7 @@ class DockerSocket {
     } catch (err) {
       callback({});
     }
-  }  
+  }
 }
 
 module.exports = DockerSocket;