systeminformation 5.12.0 → 5.12.3

package/README.md

@@ -904,7 +904,7 @@ To be able to measure temperature on macOS I created a little additional package
 in NPM with `optionalDependencies` I unfortunately was getting unexpected warnings on other platforms.
 So I decided to drop this optional dependency for macOS - so by default, you will not get correct values.
 
-This additional package will unfortunately NOT work on Apple Silicon M1 machines.
+This additional package is now also supporting Apple Silicon M1 machines.
 
 But if you need to detect macOS temperature just run the following additional
 installation command:
@@ -1009,7 +1009,7 @@ OSX Temperature: credits here are going to:
 Linux is a registered trademark of Linus Torvalds. Apple, macOS, OS X are registered trademarks of Apple Inc.,
 Windows is a registered trademark of Microsoft Corporation. Node.js is a trademark of Joyent Inc.,
 Intel is a trademark of Intel Corporation, AMD is a trademark of Advanced Micro Devices Inc.,
-Raspberry Pi is a trademark of the Raspberry Pi Foundation, Debian is a trademark of the Debian Project,
+Raspberry Pi is a trademark of the Raspberry Pi Foundation, Debian is a trademark owned by Software in the Public Interest, Inc.,
 Ubuntu is a trademark of Canonical Ltd., FreeBSD is a registered trademark of The FreeBSD Foundation,
 NetBSD is a registered trademark of The NetBSD Foundation, Docker is a trademark of Docker, Inc., Sun,
 Solaris, OpenSolaris and registered trademarks of Sun Microsystems, VMware is a trademark of VMware Inc,

package/lib/cpu.js

@@ -714,10 +714,10 @@ function getCpu() {
             const threadsPerCore = util.getValue(lines, 'thread(s) per core') || '1';
             // const coresPerSocketInt = parseInt(util.getValue(lines, 'cores(s) per socket') || '1', 10);
             const processors = util.getValue(lines, 'socket(s)') || '1';
-            let threadsPerCoreInt = parseInt(threadsPerCore, 10);
-            let processorsInt = parseInt(processors, 10) || 1;
-            const cpus = (parseInt(util.getValue(lines, 'cpu(s)'), 10) || 1);
-            const coresPerSocket = parseInt(util.getValue(lines, 'core(s) per socket'), 10);
+            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 cpus = (parseInt(util.getValue(lines, 'cpu(s)'), 10) || 1); // overall number of cores (e.g. 24 on i12900)
+            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;
             result.efficiencyCores = threadsPerCoreInt > 1 ? result.cores - (threadsPerCoreInt * result.performanceCores) : 0;
@@ -1204,6 +1204,18 @@ function cpuTemperature(callback) {
         }
         if (osxTemp) {
           result = osxTemp.cpuTemperature();
+          // round to 2 digits
+          if (result.main) {
+            result.main = Math.round(result.main * 100) / 100;
+          }
+          if (result.max) {
+            result.max = Math.round(result.max * 100) / 100;
+          }
+          if (result.cores && result.cores.length) {
+            for (let i = 0; i < result.cores.length; i++) {
+              result.cores[i] = Math.round(result.cores[i] * 100) / 100;
+            }
+          }
         }
 
         if (callback) { callback(result); }

package/lib/network.js

@@ -494,7 +494,9 @@ function parseLinesDarwinNics(sections) {
       }
     }
     nic.type = util.getValue(section, 'type').toLowerCase().indexOf('wi-fi') > -1 ? 'wireless' : 'wired';
-    nic.operstate = util.getValue(section, 'status').toLowerCase().indexOf('active') > -1 ? 'up' : 'down';
+    const operstate = util.getValue(section, 'status').toLowerCase();
+    nic.operstate = (operstate === 'active' ? 'up' : (operstate === 'inactive' ? 'down' : 'unknown'));
+    // nic.operstate = util.getValue(section, 'status').toLowerCase().indexOf('active') > -1 ? 'up' : 'down';
     nic.duplex = util.getValue(section, 'media').toLowerCase().indexOf('half-duplex') > -1 ? 'half' : 'full';
     if (nic.ip6 || nic.ip4 || nic.mac) {
       nics.push(nic);

package/lib/processes.js

@@ -160,7 +160,7 @@ function services(srv, callback) {
               for (const s of tmpsrv) {
                 const name = s.split('.service')[0];
                 if (name) {
-                  srvs.push(name);
+                  srvs.push(name.trim());
                 }
               }
               srvString = srvs.join('|');

package/package.json

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