systeminformation 5.18.9 → 5.18.11

package/README.md

@@ -29,7 +29,7 @@
   [![MIT license][license-img]][license-url]
 
 ## The Systeminformation Project
-This is amazing. Started as a small project just for myself, it now has > 15,000 lines of code, > 500 versions published, up to 6 mio downloads per month, > 150 mio downloads overall. #1 NPM ranking for backend packages. Thank you to all who contributed to this project!
+This is amazing. Started as a small project just for myself, it now has > 15,000 lines of code, > 600 versions published, up to 6 mio downloads per month, > 150 mio downloads overall. #1 NPM ranking for backend packages. Thank you to all who contributed to this project!
 
 ## New Version 5.0
 

package/lib/bluetooth.js

@@ -34,6 +34,7 @@ function parseBluetoothType(str) {
 
   if (str.indexOf('keyboard') >= 0) { result = 'Keyboard'; }
   if (str.indexOf('mouse') >= 0) { result = 'Mouse'; }
+  if (str.indexOf('trackpad') >= 0) { result = 'Trackpad'; }
   if (str.indexOf('speaker') >= 0) { result = 'Speaker'; }
   if (str.indexOf('headset') >= 0) { result = 'Headset'; }
   if (str.indexOf('phone') >= 0) { result = 'Phone'; }
@@ -55,6 +56,7 @@ function parseBluetoothManufacturer(str) {
   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('magic track') >= 0) { result = 'Apple'; }
   if (str.indexOf('macbook') >= 0) { result = 'Apple'; }
   // to be continued ...
 

package/lib/cpu.js

@@ -542,6 +542,15 @@ const socketTypes = {
   61: 'LGA4189',
   62: 'LGA1200',
   63: 'LGA4677',
+  64: 'LGA1700',
+  65: 'BGA1744',
+  66: 'BGA1781',
+  67: 'BGA1211',
+  68: 'BGA2422',
+  69: 'LGA1211',
+  70: 'LGA2422',
+  71: 'LGA5773',
+  72: 'BGA5773',
 };
 
 const socketTypesByName = {
@@ -862,12 +871,6 @@ function getCpu() {
               }
               result = cpuBrandManufacturer(result);
               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', ':');
-              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;
               if (result.speed === 0 && (result.brand.indexOf('AMD') > -1 || result.brand.toLowerCase().indexOf('ryzen') > -1)) {
@@ -914,26 +917,7 @@ function getCpu() {
                 result.cores = result.cores * countProcessors;
                 result.physicalCores = result.physicalCores * countProcessors;
               }
-              const parts = data[1].split(/\n\s*\n/);
-              parts.forEach(function (part) {
-                lines = part.split('\r\n');
-                const cacheType = util.getValue(lines, 'CacheType');
-                const level = util.getValue(lines, 'Level');
-                const installedSize = util.getValue(lines, 'InstalledSize');
-                // L1 Instructions
-                if (level === '3' && cacheType === '3') {
-                  result.cache.l1i = parseInt(installedSize, 10);
-                }
-                // L1 Data
-                if (level === '3' && cacheType === '4') {
-                  result.cache.l1d = parseInt(installedSize, 10);
-                }
-                // L1 all
-                if (level === '3' && cacheType === '5' && !result.cache.l1i && !result.cache.l1d) {
-                  result.cache.l1i = parseInt(installedSize, 10) / 2;
-                  result.cache.l1d = parseInt(installedSize, 10) / 2;
-                }
-              });
+              result.cache = parseWinCache(data[0], data[1]);
               const hyperv = data[2] ? data[2].toString().toLowerCase() : '';
               result.virtualization = hyperv.indexOf('true') !== -1;
 
@@ -1483,42 +1467,17 @@ function cpuCache(callback) {
       }
       if (_windows) {
         try {
-          util.powerShell('Get-CimInstance Win32_processor | select L2CacheSize, L3CacheSize | 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', ':');
-              if (result.l2) { result.l2 = parseInt(result.l2, 10) * 1024; }
-              if (result.l3) { result.l3 = parseInt(result.l3, 10) * 1024; }
-            }
-            util.powerShell('Get-CimInstance Win32_CacheMemory | select CacheType,InstalledSize,Level | fl').then((stdout, error) => {
-              if (!error) {
-                const parts = stdout.split(/\n\s*\n/);
-                parts.forEach(function (part) {
-                  const lines = part.split('\r\n');
-                  const cacheType = util.getValue(lines, 'CacheType');
-                  const level = util.getValue(lines, 'Level');
-                  const installedSize = util.getValue(lines, 'InstalledSize');
-                  // L1 Instructions
-                  if (level === '3' && cacheType === '3') {
-                    result.l1i = parseInt(installedSize, 10);
-                  }
-                  // L1 Data
-                  if (level === '3' && cacheType === '4') {
-                    result.l1d = parseInt(installedSize, 10);
-                  }
-                  // L1 all
-                  if (level === '3' && cacheType === '5' && !result.l1i && !result.l1d) {
-                    result.l1i = parseInt(installedSize, 10) / 2;
-                    result.l1d = parseInt(installedSize, 10) / 2;
-                  }
-                });
-              }
-              if (callback) { callback(result); }
-              resolve(result);
-            });
+          const workload = [];
+          workload.push(util.powerShell('Get-CimInstance Win32_processor | select L2CacheSize, L3CacheSize | fl'));
+          workload.push(util.powerShell('Get-CimInstance Win32_CacheMemory | select CacheType,InstalledSize,Level | fl'));
+
+          Promise.all(
+            workload
+          ).then((data) => {
+            result = parseWinCache(data[0], data[1]);
+
+            if (callback) { callback(result); }
+            resolve(result);
           });
         } catch (e) {
           if (callback) { callback(result); }
@@ -1529,6 +1488,61 @@ function cpuCache(callback) {
   });
 }
 
+function parseWinCache(linesProc, linesCache) {
+  let result = {
+    l1d: null,
+    l1i: null,
+    l2: null,
+    l3: null,
+  };
+
+  // Win32_processor
+  let lines = linesProc.split('\r\n');
+  result.l1d = 0;
+  result.l1i = 0;
+  result.l2 = util.getValue(lines, 'l2cachesize', ':');
+  result.l3 = util.getValue(lines, 'l3cachesize', ':');
+  if (result.l2) { result.l2 = parseInt(result.l2, 10) * 1024; } else { result.l2 = 0; }
+  if (result.l3) { result.l3 = parseInt(result.l3, 10) * 1024; } else { result.l3 = 0; }
+
+  // Win32_CacheMemory
+  const parts = linesCache.split(/\n\s*\n/);
+  let l1i = 0;
+  let l1d = 0;
+  let l2 = 0;
+  parts.forEach(function (part) {
+    const lines = part.split('\r\n');
+    const cacheType = util.getValue(lines, 'CacheType');
+    const level = util.getValue(lines, 'Level');
+    const installedSize = util.getValue(lines, 'InstalledSize');
+    // L1 Instructions
+    if (level === '3' && cacheType === '3') {
+      result.l1i = result.l1i + parseInt(installedSize, 10) * 1024;
+    }
+    // L1 Data
+    if (level === '3' && cacheType === '4') {
+      result.l1d = result.l1d + parseInt(installedSize, 10) * 1024;
+    }
+    // L1 all
+    if (level === '3' && cacheType === '5') {
+      l1i = parseInt(installedSize, 10) / 2;
+      l1d = parseInt(installedSize, 10) / 2;
+    }
+    // L2
+    if (level === '4' && cacheType === '5') {
+      l2 = l2 + parseInt(installedSize, 10) * 1024;
+    }
+  });
+  if (!result.l1i && !result.l1d) {
+    result.l1i = l1i;
+    result.l1d = l1d;
+  }
+  if (l2) {
+    result.l2 = l2;
+  }
+  return result;
+}
+
 exports.cpuCache = cpuCache;
 
 // --------------------------

package/lib/osinfo.js

@@ -271,7 +271,7 @@ function osInfo(callback) {
         exec('sysctl kern.ostype kern.osrelease kern.osrevision kern.hostuuid machdep.bootmethod kern.geom.confxml', function (error, stdout) {
           let lines = stdout.toString().split('\n');
           const distro = util.getValue(lines, 'kern.ostype');
-          const logofile = util.getValue(lines, 'kern.ostype');
+          const logofile = util.getLogoFile(distro);
           const release = util.getValue(lines, 'kern.osrelease').split('-')[0];
           const serial = util.getValue(lines, 'kern.uuid');
           const bootmethod = util.getValue(lines, 'machdep.bootmethod');

package/package.json

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