systeminformation 5.21.23 → 5.21.25

package/lib/cpu.js

@@ -766,8 +766,8 @@ function getCpu() {
 
             const threadsPerCore = util.getValue(lines, 'thread(s) per core') || '1';
             const processors = util.getValue(lines, 'socket(s)') || '1';
-            let threadsPerCoreInt = parseInt(threadsPerCore, 10); // threads per code (normally only for performance cores)
-            let processorsInt = parseInt(processors, 10) || 1;  // number of sockets /  processor units in machine (normally 1)
+            const threadsPerCoreInt = parseInt(threadsPerCore, 10); // threads per code (normally only for performance cores)
+            const processorsInt = parseInt(processors, 10) || 1;  // number of sockets /  processor units in machine (normally 1)
             const coresPerSocket = parseInt(util.getValue(lines, 'core(s) per socket'), 10); // number of cores (e.g. 16 on i12900)
             result.physicalCores = coresPerSocket ? coresPerSocket * processorsInt : result.cores / threadsPerCoreInt;
             result.performanceCores = threadsPerCoreInt > 1 ? result.cores - result.physicalCores : result.cores;

package/lib/osinfo.js

@@ -243,14 +243,18 @@ function osInfo(callback) {
               release[line.split('=')[0].trim().toUpperCase()] = line.split('=')[1].trim();
             }
           });
+          result.distro = (release.DISTRIB_ID || release.NAME || 'unknown').replace(/"/g, '');
+          result.logofile = getLogoFile(result.distro);
           let releaseVersion = (release.VERSION || '').replace(/"/g, '');
           let codename = (release.DISTRIB_CODENAME || release.VERSION_CODENAME || '').replace(/"/g, '');
+          const prettyName = (release.PRETTY_NAME || '').replace(/"/g, '');
+          if (prettyName.indexOf(result.distro + ' ') === 0) {
+            releaseVersion = prettyName.replace(result.distro + ' ', '').trim();
+          }
           if (releaseVersion.indexOf('(') >= 0) {
             codename = releaseVersion.split('(')[1].replace(/[()]/g, '').trim();
             releaseVersion = releaseVersion.split('(')[0].trim();
           }
-          result.distro = (release.DISTRIB_ID || release.NAME || 'unknown').replace(/"/g, '');
-          result.logofile = getLogoFile(result.distro);
           result.release = (releaseVersion || release.DISTRIB_RELEASE || release.VERSION_ID || 'unknown').replace(/"/g, '');
           result.codename = codename;
           result.codepage = util.getCodepage();

package/lib/wifi.js

@@ -25,7 +25,10 @@ const _darwin = (_platform === 'darwin');
 const _windows = (_platform === 'win32');
 
 function wifiDBFromQuality(quality) {
-  return (parseFloat(quality) / 2 - 100);
+  const qual = parseFloat(quality);
+  if (qual < 0) { return 0; }
+  if (qual >= 100) { return -50; }
+  return (qual / 2 - 100);
 }
 
 function wifiQualityFromDB(db) {
@@ -658,7 +661,7 @@ function wifiConnections(callback) {
               const id = lines[2].indexOf(':') >= 0 ? lines[2].split(':')[1].trim() : '';
               const ssid = util.getValue(lines, 'SSID', ':', true);
               const bssid = util.getValue(lines, 'BSSID', ':', true);
-              const signalLevel = util.getValue(lines, 'Signal', ':', true);
+              const signalLevel = wifiDBFromQuality(util.getValue(lines, 'Signal', ':', true));
               const type = util.getValue(lines, 'Radio type', ':', true) || util.getValue(lines, 'Type de radio', ':', true) || util.getValue(lines, 'Funktyp', ':', true) || null;
               const security = util.getValue(lines, 'authentication', ':', true) || util.getValue(lines, 'Authentification', ':', true) || util.getValue(lines, 'Authentifizierung', ':', true) || null;
               const channel = util.getValue(lines, 'Channel', ':', true) || util.getValue(lines, 'Canal', ':', true) || util.getValue(lines, 'Kanal', ':', true) || null;

package/package.json

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