systeminformation 5.12.8 → 5.12.10

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2021 Sebastian Hildebrandt
+Copyright (c) 2014-2022 Sebastian Hildebrandt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/README.md

@@ -1024,7 +1024,7 @@ All other trademarks are the property of their respective owners.
 
 >The [`MIT`][license-url] License (MIT)
 >
->Copyright © 2014-2021 Sebastian Hildebrandt, [+innovations](http://www.plus-innovations.com).
+>Copyright © 2014-2022 Sebastian Hildebrandt, [+innovations](http://www.plus-innovations.com).
 >
 >Permission is hereby granted, free of charge, to any person obtaining a copy
 >of this software and associated documentation files (the "Software"), to deal

package/lib/battery.js

@@ -230,7 +230,7 @@ module.exports = function (callback) {
           workload.push(util.powerShell('(Get-WmiObject -Class BatteryFullChargedCapacity -Namespace ROOT/WMI).FullChargedCapacity'));
           util.promiseAll(
             workload
-          ).then(data => {
+          ).then((data) => {
             if (data) {
               let parts = data.results[0].split(/\n\s*\n/);
               let batteries = [];

package/lib/bluetooth.js

@@ -37,6 +37,25 @@ function parseBluetoothType(str) {
   if (str.indexOf('speaker') >= 0) { result = 'Speaker'; }
   if (str.indexOf('headset') >= 0) { result = 'Headset'; }
   if (str.indexOf('phone') >= 0) { result = 'Phone'; }
+  if (str.indexOf('macbook') >= 0) { result = 'Computer'; }
+  if (str.indexOf('imac') >= 0) { result = 'Computer'; }
+  if (str.indexOf('ipad') >= 0) { result = 'Tablet'; }
+  if (str.indexOf('watch') >= 0) { result = 'Watch'; }
+  if (str.indexOf('headphone') >= 0) { result = 'Headset'; }
+  // to be continued ...
+
+  return result;
+}
+
+function parseBluetoothManufacturer(str) {
+  let result = str.split(' ')[0];
+  str = str.toLowerCase();
+  if (str.indexOf('apple') >= 0) { result = 'Apple'; }
+  if (str.indexOf('ipad') >= 0) { result = 'Apple'; }
+  if (str.indexOf('imac') >= 0) { result = 'Apple'; }
+  if (str.indexOf('iphone') >= 0) { result = 'Apple'; }
+  if (str.indexOf('magic mouse') >= 0) { result = 'Apple'; }
+  if (str.indexOf('macbook') >= 0) { result = 'Apple'; }
   // to be continued ...
 
   return result;
@@ -59,12 +78,12 @@ function parseLinuxBluetoothInfo(lines, macAddr1, macAddr2) {
 
 function parseDarwinBluetoothDevices(bluetoothObject, macAddr2) {
   const result = {};
-  const typeStr = ((bluetoothObject.device_minorClassOfDevice_string || bluetoothObject.device_majorClassOfDevice_string || '') + (bluetoothObject.device_name || '')).toLowerCase();
+  const typeStr = ((bluetoothObject.device_minorClassOfDevice_string || bluetoothObject.device_majorClassOfDevice_string || bluetoothObject.device_minorType || '') + (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.manufacturer = bluetoothObject.device_manufacturer || parseBluetoothManufacturer(bluetoothObject.device_name || '') || '';
+  result.macDevice = (bluetoothObject.device_addr || bluetoothObject.device_address || '').toLowerCase().replace(/-/g, ':');
   result.macHost = macAddr2;
   result.batteryPercent = bluetoothObject.device_batteryPercent || null;
   result.type = parseBluetoothType(typeStr);
@@ -96,16 +115,16 @@ function bluetoothDevices(callback) {
       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('/');
+        btFiles.forEach((element) => {
+          const filename = path.basename(element);
+          const pathParts = element.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');
+            const infoFile = fs.readFileSync(element, { encoding: 'utf8' }).split('\n');
             result.push(parseLinuxBluetoothInfo(infoFile, macAddr1, macAddr2));
           }
-        }
+        });
         // determine "connected" with hcitool con
         try {
           const hdicon = execSync('hcitool con').toString().toLowerCase();
@@ -135,9 +154,8 @@ function bluetoothDevices(callback) {
                 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];
+                outObj.SPBluetoothDataType[0]['device_title'].forEach((element) => {
+                  const obj = element;
                   const objKey = Object.keys(obj);
                   if (objKey && objKey.length === 1) {
                     const innerObject = obj[objKey[0]];
@@ -145,7 +163,35 @@ function bluetoothDevices(callback) {
                     const bluetoothDevice = parseDarwinBluetoothDevices(innerObject, macAddr2);
                     result.push(bluetoothDevice);
                   }
-                }
+                });
+              }
+              if (outObj.SPBluetoothDataType && outObj.SPBluetoothDataType.length && outObj.SPBluetoothDataType[0] && outObj.SPBluetoothDataType[0]['device_connected'] && outObj.SPBluetoothDataType[0]['device_connected'].length) {
+                const macAddr2 = outObj.SPBluetoothDataType[0].controller_properties && outObj.SPBluetoothDataType[0].controller_properties.controller_address ? outObj.SPBluetoothDataType[0].controller_properties.controller_address.toLowerCase().replace(/-/g, ':') : null;
+                outObj.SPBluetoothDataType[0]['device_connected'].forEach((element) => {
+                  const obj = element;
+                  const objKey = Object.keys(obj);
+                  if (objKey && objKey.length === 1) {
+                    const innerObject = obj[objKey[0]];
+                    innerObject.device_name = objKey[0];
+                    innerObject.device_isconnected = 'attrib_Yes';
+                    const bluetoothDevice = parseDarwinBluetoothDevices(innerObject, macAddr2);
+                    result.push(bluetoothDevice);
+                  }
+                });
+              }
+              if (outObj.SPBluetoothDataType && outObj.SPBluetoothDataType.length && outObj.SPBluetoothDataType[0] && outObj.SPBluetoothDataType[0]['device_not_connected'] && outObj.SPBluetoothDataType[0]['device_not_connected'].length) {
+                const macAddr2 = outObj.SPBluetoothDataType[0].controller_properties && outObj.SPBluetoothDataType[0].controller_properties.controller_address ? outObj.SPBluetoothDataType[0].controller_properties.controller_address.toLowerCase().replace(/-/g, ':') : null;
+                outObj.SPBluetoothDataType[0]['device_not_connected'].forEach((element) => {
+                  const obj = element;
+                  const objKey = Object.keys(obj);
+                  if (objKey && objKey.length === 1) {
+                    const innerObject = obj[objKey[0]];
+                    innerObject.device_name = objKey[0];
+                    innerObject.device_isconnected = 'attrib_No';
+                    const bluetoothDevice = parseDarwinBluetoothDevices(innerObject, macAddr2);
+                    result.push(bluetoothDevice);
+                  }
+                });
               }
             } catch (e) {
               util.noop();
@@ -161,11 +207,11 @@ function bluetoothDevices(callback) {
         util.powerShell('Get-WmiObject Win32_PNPEntity | select PNPClass, Name, Manufacturer | 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')));
+            parts.forEach((part) => {
+              if (util.getValue(part.split('\n'), 'PNPClass', ':') === 'Bluetooth') {
+                result.push(parseWindowsBluetooth(part.split('\n')));
               }
-            }
+            });
           }
           if (callback) {
             callback(result);

package/lib/cli.js

@@ -23,7 +23,7 @@ const si = require('./index');
 // ----------------------------------------------------------------------------------
 (function () {
   si.getStaticData().then(
-    (data => {
+    ((data) => {
       data.time = si.time();
       console.log(JSON.stringify(data, null, 2));
     }

package/lib/cpu.js

@@ -656,7 +656,7 @@ function getCpu() {
               result.cores = parseInt(countThreads) || util.cores();
               result.physicalCores = parseInt(countCores) || util.cores();
             }
-            cpuCache().then(res => {
+            cpuCache().then((res) => {
               result.cache = res;
               resolve(result);
             });
@@ -816,7 +816,7 @@ function getCpu() {
 
             Promise.all(
               workload
-            ).then(data => {
+            ).then((data) => {
               let lines = data[0].split('\r\n');
               let name = util.getValue(lines, 'name', ':') || '';
               if (name.indexOf('@') >= 0) {

package/lib/docker.js

@@ -35,7 +35,7 @@ function dockerInfo(callback) {
       }
       const result = {};
 
-      _docker_socket.getInfo(data => {
+      _docker_socket.getInfo((data) => {
         result.id = data.ID;
         result.containers = data.Containers;
         result.containersRunning = data.ContainersRunning;
@@ -130,7 +130,7 @@ function dockerImages(all, callback) {
             if (workload.length) {
               Promise.all(
                 workload
-              ).then(data => {
+              ).then((data) => {
                 if (callback) { callback(data); }
                 resolve(data);
               });
@@ -255,24 +255,11 @@ function dockerContainers(all, callback) {
                 element.Name = element.Names[0].replace(/^\/|\/$/g, '');
               }
               workload.push(dockerContainerInspect(element.Id.trim(), element));
-              // result.push({
-              //   id: element.Id,
-              //   name: element.Name,
-              //   image: element.Image,
-              //   imageID: element.ImageID,
-              //   command: element.Command,
-              //   created: element.Created,
-              //   state: element.State,
-              //   ports: element.Ports,
-              //   mounts: element.Mounts,
-              //   // hostconfig: element.HostConfig,
-              //   // network: element.NetworkSettings
-              // });
             });
             if (workload.length) {
               Promise.all(
                 workload
-              ).then(data => {
+              ).then((data) => {
                 if (callback) { callback(data); }
                 resolve(data);
               });
@@ -511,7 +498,7 @@ function dockerContainerStats(containerIDs, callback) {
         if (workload.length) {
           Promise.all(
             workload
-          ).then(data => {
+          ).then((data) => {
             if (callback) { callback(data); }
             resolve(data);
           });
@@ -685,7 +672,7 @@ function dockerVolumes(callback) {
       if (!_docker_socket) {
         _docker_socket = new DockerSocket();
       }
-      _docker_socket.listVolumes(data => {
+      _docker_socket.listVolumes((data) => {
         let dockerVolumes = {};
         try {
           dockerVolumes = data;
@@ -726,7 +713,7 @@ function dockerAll(callback) {
         if (result && Object.prototype.toString.call(result) === '[object Array]' && result.length > 0) {
           let l = result.length;
           result.forEach(function (element) {
-            dockerContainerStats(element.id).then(res => {
+            dockerContainerStats(element.id).then((res) => {
               // include stats in array
               element.memUsage = res[0].memUsage;
               element.memLimit = res[0].memLimit;

package/lib/filesystem.js

@@ -53,7 +53,7 @@ function fsSize(callback) {
     const linuxTmpFileSystems = ['rootfs', 'unionfs', 'squashfs', 'cramfs', 'initrd', 'initramfs', 'devtmpfs', 'tmpfs', 'udev', 'devfs', 'specfs', 'type', 'appimaged'];
     let result = false;
     linuxTmpFileSystems.forEach(linuxFs => {
-      if (fs.toLowerCase().indexOf(linuxFs) >= 0) result = true;
+      if (fs.toLowerCase().indexOf(linuxFs) >= 0) { result = true; }
     });
     return result;
   }
@@ -1209,7 +1209,7 @@ function diskLayout(callback) {
           }
           util.promiseAll(
             workload
-          ).then(data => {
+          ).then((data) => {
             let devices = data.results[0].toString().split(/\n\s*\n/);
             devices.forEach(function (device) {
               let lines = device.split('\r\n');

package/lib/graphics.js

@@ -784,7 +784,7 @@ function graphics(callback) {
 
           Promise.all(
             workload
-          ).then(data => {
+          ).then((data) => {
             // controller + vram
             let csections = data[0].replace(/\r/g, '').split(/\n\s*\n/);
             let vsections = data[1].replace(/\r/g, '').split(/\n\s*\n/);

package/lib/index.d.ts

@@ -156,16 +156,16 @@ export namespace Systeminformation {
       type: string;
       protocol: string;
     };
-    model_family?: string,
-    model_name?: string,
-    serial_number?: string,
-    firmware_version?: string,
+    model_family?: string;
+    model_name?: string;
+    serial_number?: string;
+    firmware_version?: string;
     smart_status: {
       passed: boolean;
     };
     trim?: {
       supported: boolean;
-    },
+    };
     ata_smart_attributes?: {
       revision: number;
       table: {
@@ -185,7 +185,10 @@ export namespace Systeminformation {
           event_count: boolean;
           auto_keep: boolean;
         };
-        raw: { value: number; string: string; };
+        raw: {
+          value: number;
+          string: string;
+        };
       }[];
     };
     ata_smart_error_log?: {
@@ -201,12 +204,12 @@ export namespace Systeminformation {
           type: {
             value: number;
             string: string;
-          },
+          };
           status: {
             value: number;
             string: string;
             passed: boolean;
-          },
+          };
           lifetime_hours: number;
         }[];
         count: number;
@@ -215,34 +218,34 @@ export namespace Systeminformation {
       };
     };
     nvme_pci_vendor?: {
-      id: number,
+      id: number;
       subsystem_id: number;
     },
     nvme_smart_health_information_log?: {
-      critical_warning?: number,
-      temperature?: number,
-      available_spare?: number,
-      available_spare_threshold?: number,
-      percentage_used?: number,
-      data_units_read?: number,
-      data_units_written?: number,
-      host_reads?: number,
-      host_writes?: number,
-      controller_busy_time?: number,
-      power_cycles?: number,
-      power_on_hours?: number,
-      unsafe_shutdowns?: number,
-      media_errors?: number,
-      num_err_log_entries?: number,
-      warning_temp_time?: number,
-      critical_comp_time?: number,
+      critical_warning?: number;
+      temperature?: number;
+      available_spare?: number;
+      available_spare_threshold?: number;
+      percentage_used?: number;
+      data_units_read?: number;
+      data_units_written?: number;
+      host_reads?: number;
+      host_writes?: number;
+      controller_busy_time?: number;
+      power_cycles?: number;
+      power_on_hours?: number;
+      unsafe_shutdowns?: number;
+      media_errors?: number;
+      num_err_log_entries?: number;
+      warning_temp_time?: number;
+      critical_comp_time?: number;
       temperature_sensors?: number[];
     },
     user_capacity?: {
-      blocks: number,
+      blocks: number;
       bytes: number;
     },
-    logical_block_size?: number,
+    logical_block_size?: number;
     temperature: {
       current: number;
     };
@@ -283,7 +286,7 @@ export namespace Systeminformation {
     currentCapacity: number;
     capacityUnit: string;
     percent: number;
-    timeRemaining: number,
+    timeRemaining: number;
     acConnected: boolean;
     type: string;
     model: string;
@@ -618,7 +621,7 @@ export namespace Systeminformation {
   interface ProcessesProcessData {
     pid: number;
     parentPid: number;
-    name: string,
+    name: string;
     cpu: number;
     cpuu: number;
     cpus: number;
@@ -627,7 +630,7 @@ export namespace Systeminformation {
     memVsz: number;
     memRss: number;
     nice: number;
-    started: string,
+    started: string;
     state: string;
     tty: string;
     user: string;
@@ -772,7 +775,7 @@ export namespace Systeminformation {
     restartCount: number;
     cpuStats: any;
     precpuStats: any;
-    memoryStats: any,
+    memoryStats: any;
     networks: any;
   }
 

package/lib/index.js

@@ -95,7 +95,7 @@ function getStaticData(callback) {
         network.networkInterfaces(),
         memory.memLayout(),
         filesystem.diskLayout()
-      ]).then(res => {
+      ]).then((res) => {
         data.system = res[0];
         data.bios = res[1];
         data.baseboard = res[2];
@@ -181,95 +181,95 @@ function getDynamicData(srv, iface, callback) {
       data.node = process.versions.node;
       data.v8 = process.versions.v8;
 
-      cpu.cpuCurrentSpeed().then(res => {
+      cpu.cpuCurrentSpeed().then((res) => {
         data.cpuCurrentSpeed = res;
         functionProcessed();
       });
 
-      users.users().then(res => {
+      users.users().then((res) => {
         data.users = res;
         functionProcessed();
       });
 
-      processes.processes().then(res => {
+      processes.processes().then((res) => {
         data.processes = res;
         functionProcessed();
       });
 
-      cpu.currentLoad().then(res => {
+      cpu.currentLoad().then((res) => {
         data.currentLoad = res;
         functionProcessed();
       });
 
       if (!_sunos) {
-        cpu.cpuTemperature().then(res => {
+        cpu.cpuTemperature().then((res) => {
           data.temp = res;
           functionProcessed();
         });
       }
 
       if (!_openbsd && !_freebsd && !_netbsd && !_sunos) {
-        network.networkStats(iface).then(res => {
+        network.networkStats(iface).then((res) => {
           data.networkStats = res;
           functionProcessed();
         });
       }
 
       if (!_sunos) {
-        network.networkConnections().then(res => {
+        network.networkConnections().then((res) => {
           data.networkConnections = res;
           functionProcessed();
         });
       }
 
-      memory.mem().then(res => {
+      memory.mem().then((res) => {
         data.mem = res;
         functionProcessed();
       });
 
       if (!_sunos) {
-        battery().then(res => {
+        battery().then((res) => {
           data.battery = res;
           functionProcessed();
         });
       }
 
       if (!_sunos) {
-        processes.services(srv).then(res => {
+        processes.services(srv).then((res) => {
           data.services = res;
           functionProcessed();
         });
       }
 
       if (!_sunos) {
-        filesystem.fsSize().then(res => {
+        filesystem.fsSize().then((res) => {
           data.fsSize = res;
           functionProcessed();
         });
       }
 
       if (!_windows && !_openbsd && !_freebsd && !_netbsd && !_sunos) {
-        filesystem.fsStats().then(res => {
+        filesystem.fsStats().then((res) => {
           data.fsStats = res;
           functionProcessed();
         });
       }
 
       if (!_windows && !_openbsd && !_freebsd && !_netbsd && !_sunos) {
-        filesystem.disksIO().then(res => {
+        filesystem.disksIO().then((res) => {
           data.disksIO = res;
           functionProcessed();
         });
       }
 
       if (!_openbsd && !_freebsd && !_netbsd && !_sunos) {
-        wifi.wifiNetworks().then(res => {
+        wifi.wifiNetworks().then((res) => {
           data.wifiNetworks = res;
           functionProcessed();
         });
       }
 
-      internet.inetLatency().then(res => {
+      internet.inetLatency().then((res) => {
         data.inetLatency = res;
         functionProcessed();
       });
@@ -301,9 +301,9 @@ function getAllData(srv, iface, callback) {
         iface = '';
       }
 
-      getStaticData().then(res => {
+      getStaticData().then((res) => {
         data = res;
-        getDynamicData(srv, iface).then(res => {
+        getDynamicData(srv, iface).then((res) => {
           for (let key in res) {
             if ({}.hasOwnProperty.call(res, key)) {
               data[key] = res[key];
@@ -333,7 +333,7 @@ function get(valueObject, callback) {
           }
         });
 
-      Promise.all(allPromises).then(data => {
+      Promise.all(allPromises).then((data) => {
         const result = {};
         let i = 0;
         for (let key in valueObject) {
@@ -419,7 +419,7 @@ function observe(valueObject, interval, callback) {
   let _data = null;
 
   const result = setInterval(() => {
-    get(valueObject).then(data => {
+    get(valueObject).then((data) => {
       if (JSON.stringify(_data) !== JSON.stringify(data)) {
         _data = Object.assign({}, data);
         callback(data);

package/lib/network.js

@@ -250,7 +250,7 @@ function getWindowsNics() {
       let cmd = 'Get-WmiObject Win32_NetworkAdapter | fl *' + '; echo \'#-#-#-#\';';
       cmd += 'Get-WmiObject Win32_NetworkAdapterConfiguration | fl DHCPEnabled' + '';
       try {
-        util.powerShell(cmd).then(data => {
+        util.powerShell(cmd).then((data) => {
           data = data.split('#-#-#-#');
           const nsections = (data[0] || '').split(/\n\s*\n/);
           const nconfigsections = (data[1] || '').split(/\n\s*\n/);
@@ -1161,7 +1161,7 @@ function networkStats(ifaces, callback) {
         if (workload.length) {
           Promise.all(
             workload
-          ).then(data => {
+          ).then((data) => {
             if (callback) { callback(data); }
             resolve(data);
           });
@@ -1183,7 +1183,7 @@ function networkStatsSingle(iface) {
         if (sections[i].trim() !== '') {
           let lines = sections[i].trim().split('\r\n');
           perfData.push({
-            name: util.getValue(lines, 'Name', ':').replace(/[()[\] ]+/g, '').replace(/\#|\//g, '_').toLowerCase(),
+            name: util.getValue(lines, 'Name', ':').replace(/[()[\] ]+/g, '').replace(/#|\//g, '_').toLowerCase(),
             rx_bytes: parseInt(util.getValue(lines, 'BytesReceivedPersec', ':'), 10),
             rx_errors: parseInt(util.getValue(lines, 'PacketsReceivedErrors', ':'), 10),
             rx_dropped: parseInt(util.getValue(lines, 'PacketsReceivedDiscarded', ':'), 10),
@@ -1202,7 +1202,7 @@ function networkStatsSingle(iface) {
       let ifaceSanitized = '';
       const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface);
       for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
-        if (!(s[i] === undefined)) {
+        if (s[i] !== undefined) {
           ifaceSanitized = ifaceSanitized + s[i];
         }
       }
@@ -1334,8 +1334,8 @@ function networkStatsSingle(iface) {
                     det.mac.toLowerCase() === ifaceSanitized.toLowerCase() ||
                     det.ip4.toLowerCase() === ifaceSanitized.toLowerCase() ||
                     det.ip6.toLowerCase() === ifaceSanitized.toLowerCase() ||
-                    det.ifaceName.replace(/[()[\] ]+/g, '').replace(/\#|\//g, '_').toLowerCase() === ifaceSanitized.replace(/[()[\] ]+/g, '').replace('#', '_').toLowerCase()) &&
-                    (det.ifaceName.replace(/[()[\] ]+/g, '').replace(/\#|\//g, '_').toLowerCase() === detail.name)) {
+                    det.ifaceName.replace(/[()[\] ]+/g, '').replace(/#|\//g, '_').toLowerCase() === ifaceSanitized.replace(/[()[\] ]+/g, '').replace('#', '_').toLowerCase()) &&
+                    (det.ifaceName.replace(/[()[\] ]+/g, '').replace(/#|\//g, '_').toLowerCase() === detail.name)) {
                     ifaceName = det.iface;
                     rx_bytes = detail.rx_bytes;
                     rx_dropped = detail.rx_dropped;
@@ -1693,7 +1693,7 @@ function networkGatewayDefault(callback) {
             });
             if (!result) {
               util.powerShell('Get-CimInstance -ClassName Win32_IP4RouteTable | Where-Object { $_.Destination -eq \'0.0.0.0\' -and $_.Mask -eq \'0.0.0.0\' }')
-                .then(data => {
+                .then((data) => {
                   let lines = data.toString().split('\r\n');
                   if (lines.length > 1 && !result) {
                     result = util.getValue(lines, 'NextHop');

package/lib/osinfo.js

@@ -250,7 +250,7 @@ function osInfo(callback) {
           result.build = (release.BUILD_ID || '').replace(/"/g, '').trim();
           isUefiLinux().then(uefi => {
             result.uefi = uefi;
-            uuid().then(data => {
+            uuid().then((data) => {
               result.serial = data.os;
               if (callback) {
                 callback(result);
@@ -333,7 +333,7 @@ function osInfo(callback) {
           workload.push(util.powerShell('Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.SystemInformation]::TerminalServerSession'));
           util.promiseAll(
             workload
-          ).then(data => {
+          ).then((data) => {
             let lines = data.results[0] ? data.results[0].toString().split('\r\n') : [''];
             result.distro = util.getValue(lines, 'Caption', ':').trim();
             result.serial = util.getValue(lines, 'SerialNumber', ':').trim();

package/lib/processes.js

@@ -253,8 +253,8 @@ function services(srv, callback) {
                     // process
                     let list_new = {};
                     let resultProcess = {};
-                    for (let i = 0; i < curr_processes.length; i++) {
-                      resultProcess = calcProcStatLinux(curr_processes[i], all, _services_cpu);
+                    curr_processes.forEach((element) => {
+                      resultProcess = calcProcStatLinux(element, all, _services_cpu);
 
                       if (resultProcess.pid) {
                         let listPos = -1;
@@ -279,7 +279,7 @@ function services(srv, callback) {
                           cstime: resultProcess.cstime
                         };
                       }
-                    }
+                    });
 
                     // store old values
                     _services_cpu.all = all;
@@ -338,18 +338,18 @@ function services(srv, callback) {
             let wincommand = 'Get-WmiObject Win32_Service';
             if (srvs[0] !== '*') {
               wincommand += ' -Filter "';
-              for (let i = 0; i < srvs.length; i++) {
-                wincommand += `Name='${srvs[i]}' or `;
-              }
+              srvs.forEach((srv) => {
+                wincommand += `Name='${srv}' or `;
+              });
               wincommand = `${wincommand.slice(0, -4)}"`;
             }
             wincommand += ' | select Name,Caption,Started,StartMode,ProcessId | fl';
             util.powerShell(wincommand).then((stdout, error) => {
               if (!error) {
                 let serviceSections = stdout.split(/\n\s*\n/);
-                for (let i = 0; i < serviceSections.length; i++) {
-                  if (serviceSections[i].trim() !== '') {
-                    let lines = serviceSections[i].trim().split('\r\n');
+                serviceSections.forEach((element) => {
+                  if (element.trim() !== '') {
+                    let lines = element.trim().split('\r\n');
                     let srvName = util.getValue(lines, 'Name', ':', true).toLowerCase();
                     let srvCaption = util.getValue(lines, 'Caption', ':', true).toLowerCase();
                     let started = util.getValue(lines, 'Started', ':', true);
@@ -368,7 +368,9 @@ function services(srv, callback) {
                       dataSrv.push(srvCaption);
                     }
                   }
-                }
+
+                });
+
                 if (srvString !== '*') {
                   let srvsMissing = srvs.filter(function (e) {
                     return dataSrv.indexOf(e) === -1;
@@ -740,9 +742,9 @@ function processes(callback) {
               if (_linux) {
                 // calc process_cpu - ps is not accurate in linux!
                 cmd = 'cat /proc/stat | grep "cpu "';
-                for (let i = 0; i < result.list.length; i++) {
-                  cmd += (';cat /proc/' + result.list[i].pid + '/stat');
-                }
+                result.list.forEach((element) => {
+                  cmd += (';cat /proc/' + element.pid + '/stat');
+                });
                 exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
                   let curr_processes = stdout.toString().split('\n');
 
@@ -752,8 +754,8 @@ function processes(callback) {
                   // process
                   let list_new = {};
                   let resultProcess = {};
-                  for (let i = 0; i < curr_processes.length; i++) {
-                    resultProcess = calcProcStatLinux(curr_processes[i], all, _processes_cpu);
+                  curr_processes.forEach((element) => {
+                    resultProcess = calcProcStatLinux(element, all, _processes_cpu);
 
                     if (resultProcess.pid) {
 
@@ -775,7 +777,7 @@ function processes(callback) {
                         cstime: resultProcess.cstime
                       };
                     }
-                  }
+                  });
 
                   // store old values
                   _processes_cpu.all = all;
@@ -829,9 +831,9 @@ function processes(callback) {
                 let list_new = {};
                 let allcpuu = 0;
                 let allcpus = 0;
-                for (let i = 0; i < processSections.length; i++) {
-                  if (processSections[i].trim() !== '') {
-                    let lines = processSections[i].trim().split('\r\n');
+                processSections.forEach((element) => {
+                  if (element.trim() !== '') {
+                    let lines = element.trim().split('\r\n');
                     let pid = parseInt(util.getValue(lines, 'ProcessId', ':', true), 10);
                     let parentPid = parseInt(util.getValue(lines, 'ParentProcessId', ':', true), 10);
                     let statusValue = util.getValue(lines, 'ExecutionState', ':');
@@ -889,11 +891,12 @@ function processes(callback) {
                       params: ''
                     });
                   }
-                }
+                });
+
                 result.sleeping = result.all - result.running - result.blocked - result.unknown;
                 result.list = procs;
-                for (let i = 0; i < procStats.length; i++) {
-                  let resultProcess = calcProcStatWin(procStats[i], allcpuu + allcpus, _processes_cpu);
+                procStats.forEach((element) => {
+                  let resultProcess = calcProcStatWin(element, allcpuu + allcpus, _processes_cpu);
 
                   // store pcpu in outer array
                   let listPos = result.list.map(function (e) { return e.pid; }).indexOf(resultProcess.pid);
@@ -910,7 +913,8 @@ function processes(callback) {
                     utime: resultProcess.utime,
                     stime: resultProcess.stime
                   };
-                }
+                });
+
                 // store old values
                 _processes_cpu.all = allcpuu + allcpus;
                 _processes_cpu.all_utime = allcpuu;
@@ -972,7 +976,7 @@ function processLoad(proc, callback) {
 
       const s = util.sanitizeShellString(proc);
       for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
-        if (!(s[i] === undefined)) {
+        if (s[i] !== undefined) {
           processesString = processesString + s[i];
         }
       }
@@ -1008,9 +1012,9 @@ function processLoad(proc, callback) {
                 let allcpus = 0;
 
                 // go through all processes
-                for (let i = 0; i < processSections.length; i++) {
-                  if (processSections[i].trim() !== '') {
-                    let lines = processSections[i].trim().split('\r\n');
+                processSections.forEach((element) => {
+                  if (element.trim() !== '') {
+                    let lines = element.trim().split('\r\n');
                     let pid = parseInt(util.getValue(lines, 'ProcessId', ':', true), 10);
                     let name = util.getValue(lines, 'Caption', ':', true);
                     let utime = parseInt(util.getValue(lines, 'UserModeTime', ':', true), 10);
@@ -1058,7 +1062,8 @@ function processLoad(proc, callback) {
                       }
                     }
                   }
-                }
+                });
+
                 // add missing processes
                 if (processesString !== '*') {
                   let processesMissing = processes.filter(function (name) {
@@ -1077,8 +1082,8 @@ function processLoad(proc, callback) {
                 }
 
                 // calculate proc stats for each proc
-                for (let i = 0; i < procStats.length; i++) {
-                  let resultProcess = calcProcStatWin(procStats[i], allcpuu + allcpus, _process_cpu);
+                procStats.forEach((element) => {
+                  let resultProcess = calcProcStatWin(element, allcpuu + allcpus, _process_cpu);
 
                   let listPos = -1;
                   for (let j = 0; j < result.length; j++) {
@@ -1095,7 +1100,8 @@ function processLoad(proc, callback) {
                     utime: resultProcess.utime,
                     stime: resultProcess.stime
                   };
-                }
+                });
+
                 // store old values
                 _process_cpu.all = allcpuu + allcpus;
                 _process_cpu.all_utime = allcpuu;
@@ -1210,9 +1216,8 @@ function processLoad(proc, callback) {
                   // process
                   let list_new = {};
                   let resultProcess = {};
-
-                  for (let i = 0; i < curr_processes.length; i++) {
-                    resultProcess = calcProcStatLinux(curr_processes[i], all, _process_cpu);
+                  curr_processes.forEach((element) => {
+                    resultProcess = calcProcStatLinux(element, all, _process_cpu);
 
                     if (resultProcess.pid) {
 
@@ -1238,7 +1243,7 @@ function processLoad(proc, callback) {
                         cstime: resultProcess.cstime
                       };
                     }
-                  }
+                  });
 
                   result.forEach(function (item) {
                     item.cpu = Math.round(item.cpu * 100) / 100;

package/lib/system.js

@@ -571,7 +571,7 @@ function baseboard(callback) {
         workload.push(execPromise('export LC_ALL=C; dmidecode -t memory 2>/dev/null'));
         util.promiseAll(
           workload
-        ).then(data => {
+        ).then((data) => {
           let lines = data.results[0] ? data.results[0].toString().split('\n') : [''];
           result.manufacturer = util.getValue(lines, 'Manufacturer');
           result.model = util.getValue(lines, 'Product Name');
@@ -630,7 +630,7 @@ function baseboard(callback) {
         workload.push(execPromise('system_profiler SPMemoryDataType'));
         util.promiseAll(
           workload
-        ).then(data => {
+        ).then((data) => {
           let lines = data.results[0] ? data.results[0].toString().replace(/[<>"]/g, '').split('\n') : [''];
           result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
           result.model = util.getValue(lines, 'model', '=', true);
@@ -668,7 +668,7 @@ function baseboard(callback) {
           workload.push(util.powerShell(`Get-WmiObject Win32_physicalmemoryarray | select ${maxCapacityAttribute}, MemoryDevices | fl`));
           util.promiseAll(
             workload
-          ).then(data => {
+          ).then((data) => {
             let lines = data.results[0] ? data.results[0].toString().split('\r\n') : [''];
 
             result.manufacturer = util.getValue(lines, 'manufacturer', ':');

package/lib/usb.js

@@ -14,9 +14,7 @@
 // ----------------------------------------------------------------------------------
 
 const exec = require('child_process').exec;
-// const execSync = require('child_process').execSync;
 const util = require('./util');
-// const fs = require('fs');
 
 let _platform = process.platform;
 
@@ -91,16 +89,6 @@ function parseLinuxUsb(usb) {
   return result;
 }
 
-// bus
-// deviceId
-// id
-// name(product)
-// type(bInterfaceClass)
-// removable / hotplug
-// vendor
-// manufacturer
-// maxpower(linux)
-
 function getDarwinUsbType(name) {
   let result = '';
   if (name.indexOf('camera') >= 0) { result = 'Camera'; }
@@ -164,25 +152,6 @@ function parseDarwinUsb(usb, id) {
   }
 }
 
-// function getWindowsUsbType(service) {
-//   let result = ''
-//   if (service.indexOf('usbhub3') >= 0) { result = 'Hub'; }
-//   else if (service.indexOf('usbstor') >= 0) { result = 'Storage'; }
-//   else if (service.indexOf('hidusb') >= 0) { result = 'Input'; }
-//   else if (service.indexOf('usbccgp') >= 0) { result = 'Controller'; }
-//   else if (service.indexOf('usbxhci') >= 0) { result = 'Controller'; }
-//   else if (service.indexOf('usbehci') >= 0) { result = 'Controller'; }
-//   else if (service.indexOf('kbdhid') >= 0) { result = 'Keyboard'; }
-//   else if (service.indexOf('keyboard') >= 0) { result = 'Keyboard'; }
-//   else if (service.indexOf('pointing') >= 0) { result = 'Mouse'; }
-//   else if (service.indexOf('disk') >= 0) { result = 'Storage'; }
-//   else if (service.indexOf('usbhub') >= 0) { result = 'Hub'; }
-//   else if (service.indexOf('bthusb') >= 0) { result = ''; }
-//   else if (service.indexOf('bth') >= 0) { result = ''; }
-//   else if (service.indexOf('rfcomm') >= 0) { result = ''; }
-//   return result;
-// }
-
 function getWindowsUsbTypeCreation(creationclass, name) {
   let result = '';
   if (name.indexOf('storage') >= 0) { result = 'Storage'; }
@@ -216,7 +185,6 @@ function parseWindowsUsb(lines, id) {
   } else {
     return null;
   }
-
 }
 
 function usb(callback) {
@@ -278,21 +246,6 @@ function usb(callback) {
           }
           resolve(result);
         });
-
-        // util.powerShell("gwmi Win32_USBControllerDevice |\%{[wmi]($_.Dependent)}").then(data => {
-
-        //   const parts = data.toString().split(/\n\s*\n/);
-        //   for (let i = 0; i < parts.length; i++) {
-        //     const usb = parseWindowsUsb(parts[i].split('\n'), i)
-        //     if (usb) {
-        //       result.push(usb)
-        //     }
-        //   }
-        //   if (callback) {
-        //     callback(result);
-        //   }
-        //   resolve(result);
-        // });
       }
       if (_sunos || _freebsd || _openbsd || _netbsd) {
         resolve(null);

package/lib/users.js

@@ -26,44 +26,6 @@ const _openbsd = (_platform === 'openbsd');
 const _netbsd = (_platform === 'netbsd');
 const _sunos = (_platform === 'sunos');
 
-// let _winDateFormat = {
-//   dateFormat: '',
-//   dateSeperator: '',
-//   timeFormat: '',
-//   timeSeperator: '',
-//   amDesignator: '',
-//   pmDesignator: ''
-// };
-
-// --------------------------
-// array of users online = sessions
-
-// function getWinCulture() {
-//   return new Promise((resolve) => {
-//     process.nextTick(() => {
-//       if (!_winDateFormat.dateFormat) {
-//         util.powerShell('(get-culture).DateTimeFormat')
-//           .then(data => {
-//             let lines = data.toString().split('\r\n');
-//             _winDateFormat.dateFormat = util.getValue(lines, 'ShortDatePattern', ':');
-//             _winDateFormat.dateSeperator = util.getValue(lines, 'DateSeparator', ':');
-//             _winDateFormat.timeFormat = util.getValue(lines, 'ShortTimePattern', ':');
-//             _winDateFormat.timeSeperator = util.getValue(lines, 'TimeSeparator', ':');
-//             _winDateFormat.amDesignator = util.getValue(lines, 'AMDesignator', ':');
-//             _winDateFormat.pmDesignator = util.getValue(lines, 'PMDesignator', ':');
-
-//             resolve(_winDateFormat);
-//           })
-//           .catch(() => {
-//             resolve(_winDateFormat);
-//           });
-//       } else {
-//         resolve(_winDateFormat);
-//       }
-//     });
-//   });
-// }
-
 function parseUsersLinux(lines, phase) {
   let result = [];
   let result_who = [];
@@ -245,21 +207,11 @@ function users(callback) {
       }
       if (_windows) {
         try {
-          // const workload = [];
-          // // workload.push(util.powerShell('Get-CimInstance -ClassName Win32_Account | fl *'));
-          // workload.push(util.powerShell('Get-WmiObject Win32_LogonSession | fl *'));
-          // workload.push(util.powerShell('Get-WmiObject Win32_LoggedOnUser | fl *'));
-          // workload.push(util.powerShell('Get-WmiObject Win32_Process -Filter "name=\'explorer.exe\'" | Select @{Name="domain";Expression={$_.GetOwner().Domain}}, @{Name="username";Expression={$_.GetOwner().User}} | fl'));
-          // Promise.all(
-          //   workload
-          // ).then(data => {
           let cmd = 'Get-WmiObject Win32_LogonSession | select LogonId,StartTime | fl' + '; echo \'#-#-#-#\';';
           cmd += 'Get-WmiObject Win32_LoggedOnUser | select antecedent,dependent | fl ' + '; echo \'#-#-#-#\';';
           cmd += 'Get-WmiObject Win32_Process -Filter "name=\'explorer.exe\'" | Select @{Name="sessionid";Expression={$_.SessionId}}, @{Name="domain";Expression={$_.GetOwner().Domain}}, @{Name="username";Expression={$_.GetOwner().User}} | fl' + '; echo \'#-#-#-#\';';
           cmd += 'query user';
-          util.powerShell(cmd).then(data => {
-            // controller + vram
-            // let accounts = parseWinAccounts(data[0].split(/\n\s*\n/));
+          util.powerShell(cmd).then((data) => {
             if (data) {
               data = data.split('#-#-#-#');
               let sessions = parseWinSessions((data[0] || '').split(/\n\s*\n/));

package/package.json

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