systeminformation 5.7.10 → 5.7.14

package/CHANGELOG.md

@@ -77,6 +77,10 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 5.7.14         | 2021-08-01     | `cpu()` cache calculation fix (linux) |
+| 5.7.13         | 2021-07-28     | `osInfo()` fix uefi detection (win) |
+| 5.7.12         | 2021-07-27     | `osInfo()` fix uefi detection (win) |
+| 5.7.11         | 2021-07-27     | typescript typings fix `bluetoothDevices()` |
 | 5.7.10         | 2021-07-26     | typescript typings fix `processLoad()` |
 | 5.7.9          | 2021-07-25     | `uuid()` better regedit path detection (win) |
 | 5.7.8          | 2021-07-16     | `battery()` fix designedCapacity (win, linux), fix catch error |

package/lib/cpu.js

@@ -636,13 +636,13 @@ function getCpu() {
             result.stepping = util.getValue(lines, 'stepping');
             result.revision = util.getValue(lines, 'cpu revision');
             result.cache.l1d = util.getValue(lines, 'l1d cache');
-            if (result.cache.l1d) { result.cache.l1d = parseInt(result.cache.l1d) * (result.cache.l1d.indexOf('K') !== -1 ? 1024 : 1); }
+            if (result.cache.l1d) { result.cache.l1d = parseInt(result.cache.l1d) * (result.cache.l1d.indexOf('M') !== -1 ? 1024 * 1024 : (result.cache.l1d.indexOf('K') !== -1 ? 1024 : 1)); }
             result.cache.l1i = util.getValue(lines, 'l1i cache');
-            if (result.cache.l1i) { result.cache.l1i = parseInt(result.cache.l1i) * (result.cache.l1i.indexOf('K') !== -1 ? 1024 : 1); }
+            if (result.cache.l1i) { result.cache.l1i = parseInt(result.cache.l1i) * (result.cache.l1i.indexOf('M') !== -1 ? 1024 * 1024 : (result.cache.l1i.indexOf('K') !== -1 ? 1024 : 1)); }
             result.cache.l2 = util.getValue(lines, 'l2 cache');
-            if (result.cache.l2) { result.cache.l2 = parseInt(result.cache.l2) * (result.cache.l2.indexOf('K') !== -1 ? 1024 : 1); }
+            if (result.cache.l2) { result.cache.l2 = parseInt(result.cache.l2) * (result.cache.l2.indexOf('M') !== -1 ? 1024 * 1024 : (result.cache.l2.indexOf('K') !== -1 ? 1024 : 1)); }
             result.cache.l3 = util.getValue(lines, 'l3 cache');
-            if (result.cache.l3) { result.cache.l3 = parseInt(result.cache.l3) * (result.cache.l3.indexOf('K') !== -1 ? 1024 : 1); }
+            if (result.cache.l3) { result.cache.l3 = parseInt(result.cache.l3) * (result.cache.l3.indexOf('M') !== -1 ? 1024 * 1024 : (result.cache.l3.indexOf('K') !== -1 ? 1024 : 1)); }
 
             const threadsPerCore = util.getValue(lines, 'thread(s) per core') || '1';
             // const coresPerSocketInt = parseInt(util.getValue(lines, 'cores(s) per socket') || '1', 10);
@@ -1285,16 +1285,16 @@ function cpuCache(callback) {
               lines.forEach(function (line) {
                 let parts = line.split(':');
                 if (parts[0].toUpperCase().indexOf('L1D CACHE') !== -1) {
-                  result.l1d = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
+                  result.l1d = parseInt(parts[1].trim()) * (parts[1].indexOf('M') !== -1 ? 1024 * 1024 : (parts[1].indexOf('K') !== -1 ? 1024 : 1));
                 }
                 if (parts[0].toUpperCase().indexOf('L1I CACHE') !== -1) {
-                  result.l1i = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
+                  result.l1i = parseInt(parts[1].trim()) * (parts[1].indexOf('M') !== -1 ? 1024 * 1024 : (parts[1].indexOf('K') !== -1 ? 1024 : 1));
                 }
                 if (parts[0].toUpperCase().indexOf('L2 CACHE') !== -1) {
-                  result.l2 = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
+                  result.l2 = parseInt(parts[1].trim()) * (parts[1].indexOf('M') !== -1 ? 1024 * 1024 : (parts[1].indexOf('K') !== -1 ? 1024 : 1));
                 }
                 if (parts[0].toUpperCase().indexOf('L3 CACHE') !== -1) {
-                  result.l3 = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
+                  result.l3 = parseInt(parts[1].trim()) * (parts[1].indexOf('M') !== -1 ? 1024 * 1024 : (parts[1].indexOf('K') !== -1 ? 1024 : 1));
                 }
               });
             }

package/lib/index.d.ts

@@ -938,7 +938,7 @@ export function usb(cb?: (data: Systeminformation.UsbData[]) => any): Promise<Sy
 
 export function audio(cb?: (data: Systeminformation.AudioData[]) => any): Promise<Systeminformation.AudioData[]>;
 
-export function bluetoothDevices(cb?: (data: Systeminformation.BlockDevicesData[]) => any): Promise<Systeminformation.BlockDevicesData[]>;
+export function bluetoothDevices(cb?: (data: Systeminformation.BluetoothDeviceData[]) => any): Promise<Systeminformation.BluetoothDeviceData[]>;
 
 export function getStaticData(cb?: (data: Systeminformation.StaticData) => any): Promise<Systeminformation.StaticData>;
 export function getDynamicData(srv?: string, iface?: string, cb?: (data: any) => any): Promise<any>;

package/lib/osinfo.js

@@ -365,14 +365,14 @@ function isUefiLinux() {
     process.nextTick(() => {
       fs.stat('/sys/firmware/efi', function (err) {
         if (!err) {
-          resolve(true);
+          return resolve(true);
         } else {
           exec('dmesg | grep -E "EFI v"', function (error, stdout) {
             if (!error) {
               const lines = stdout.toString().split('\n');
-              resolve(lines.length > 0);
+              return resolve(lines.length > 0);
             }
-            resolve(false);
+            return resolve(false);
           });
         }
       });
@@ -387,21 +387,20 @@ function isUefiWindows() {
         exec('findstr /C:"Detected boot environment" "%windir%\\Panther\\setupact.log"', util.execOptsWin, function (error, stdout) {
           if (!error) {
             const line = stdout.toString().split('\n\r')[0];
-            resolve(line.toLowerCase().indexOf('efi') >= 0);
-            return;
+            return resolve(line.toLowerCase().indexOf('efi') >= 0);
           } else {
             exec('echo %firmware_type%', util.execOptsWin, function (error, stdout) {
               if (!error) {
                 const line = stdout.toString() || '';
-                resolve(line.toLowerCase().indexOf('efi') >= 0);
+                return resolve(line.toLowerCase().indexOf('efi') >= 0);
+              } else {
+                return resolve(false);
               }
-              resolve(false);
             });
           }
-          resolve(false);
         });
       } catch (e) {
-        resolve(false);
+        return resolve(false);
       }
     });
   });
@@ -1015,18 +1014,18 @@ function shell(callback) {
     process.nextTick(() => {
       if (_windows) {
         resolve('cmd');
+      } else {
+        let result = '';
+        exec('echo $SHELL', function (error, stdout) {
+          if (!error) {
+            result = stdout.toString().split('\n')[0];
+          }
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        });
       }
-
-      let result = '';
-      exec('echo $SHELL', function (error, stdout) {
-        if (!error) {
-          result = stdout.toString().split('\n')[0];
-        }
-        if (callback) {
-          callback(result);
-        }
-        resolve(result);
-      });
     });
   });
 }

package/package.json

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