systeminformation 5.27.15 → 5.27.17

package/README.md

@@ -33,22 +33,22 @@
 ### Merry Christmas and Happy new year
 
 ```
-                                                    .''.
-                        .''.      .        *''*    :_\/_:
-                       :_\/_:   _\(/_  .:.*_\/_*   : /\ :
-                   .''.: /\ :   ./)\   ':'* /\ * :  '..'.
-                  :_\/_:'.:::.    ' *''*    * '.\'/.' _\(/_
-                  : /\ : :::::     *_\/_*     -= o =-  /)\
-                   '..'  ':::'     * /\ *     .'/.\'.   '
-                                    *..*         :
-             *
-     *      /.\   *       *           .   *
-  .        /..'\     .     .     * .
-          */'.'\*       . .          .     *   *
-      *   /.''.'\    *     .  .     .   *
-.        */.'.'.\*
-...".""""/'.''.'.\""."."...
-         ^^^[_]^^^*
+                                                          .''.
+                              .''.      .        *''*    :_\/_:
+                             :_\/_:   _\(/_  .:.*_\/_*   : /\ :
+                         .''.: /\ :   ./)\   ':'* /\ * :  '..'.
+                        :_\/_:'.:::.    ' *''*    * '.\'/.' _\(/_
+                        : /\ : :::::     *_\/_*     -= o =-  /)\
+                         '..'  ':::'     * /\ *     .'/.\'.   '
+                                          *..*         :
+                   *
+           *      /.\   *       *           .   *
+        .        /..'\     .     .     * .
+                */'.'\*       . .          .     *   *
+            *   /.''.'\    *     .  .     .   *
+      .        */.'.'.\*
+.........".""""/'.''.'.\""."."........".".".......................
+               ^^^[_]^^^*
 ```
 I wish you all a Merry Christmas and a peaceful New Year 2026.
 

package/lib/cpu.js

@@ -728,8 +728,8 @@ function getCpu() {
         result.flags = flags;
         result.virtualization = flags.indexOf('vmx') > -1 || flags.indexOf('svm') > -1;
         if (_darwin) {
-          exec('sysctl machdep.cpu hw.cpufrequency_max hw.cpufrequency_min hw.packages hw.physicalcpu_max hw.ncpu hw.tbfrequency hw.cpufamily hw.cpusubfamily', function (error, stdout) {
-            let lines = stdout.toString().split('\n');
+          exec('sysctl machdep.cpu hw.cpufrequency_max hw.cpufrequency_min hw.packages hw.physicalcpu_max hw.ncpu hw.tbfrequency hw.cpufamily hw.cpusubfamily', (error, stdout) => {
+            const lines = stdout.toString().split('\n');
             const modelline = util.getValue(lines, 'machdep.cpu.brand_string');
             const modellineParts = modelline.split('@');
             result.brand = modellineParts[0].trim();
@@ -759,12 +759,12 @@ function getCpu() {
                 const performanceCores = clusters.filter((line) => line.indexOf('"P"') >= 0).length;
                 result.efficiencyCores = efficiencyCores;
                 result.performanceCores = performanceCores;
-              } catch (e) {
+              } catch {
                 util.noop();
               }
             }
             if (countProcessors) {
-              result.processors = parseInt(countProcessors) || 1;
+              result.processors = parseInt(countProcessors, 10) || 1;
             }
             if (countCores && countThreads) {
               result.cores = parseInt(countThreads) || util.cores();
@@ -782,7 +782,7 @@ function getCpu() {
           if (os.cpus()[0] && os.cpus()[0].model) {
             modelline = os.cpus()[0].model;
           }
-          exec('export LC_ALL=C; lscpu; echo -n "Governor: "; cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor 2>/dev/null; echo; unset LC_ALL', function (error, stdout) {
+          exec('export LC_ALL=C; lscpu; echo -n "Governor: "; cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor 2>/dev/null; echo; unset LC_ALL', (error, stdout) => {
             if (!error) {
               lines = stdout.toString().split('\n');
             }
@@ -866,7 +866,7 @@ function getCpu() {
 
             // socket type
             let lines2 = [];
-            exec('export LC_ALL=C; dmidecode –t 4 2>/dev/null | grep "Upgrade: Socket"; unset LC_ALL', function (error2, stdout2) {
+            exec('export LC_ALL=C; dmidecode –t 4 2>/dev/null | grep "Upgrade: Socket"; unset LC_ALL', (error2, stdout2) => {
               lines2 = stdout2.toString().split('\n');
               if (lines2 && lines2.length) {
                 result.socket = util.getValue(lines2, 'Upgrade').replace('Socket', '').trim() || result.socket;
@@ -881,7 +881,7 @@ function getCpu() {
           if (os.cpus()[0] && os.cpus()[0].model) {
             modelline = os.cpus()[0].model;
           }
-          exec('export LC_ALL=C; dmidecode -t 4; dmidecode -t 7 unset LC_ALL', function (error, stdout) {
+          exec('export LC_ALL=C; dmidecode -t 4; dmidecode -t 7 unset LC_ALL', (error, stdout) => {
             let cache = [];
             if (!error) {
               const data = stdout.toString().split('# dmidecode');
@@ -1181,13 +1181,13 @@ function cpuTemperature(callback) {
         const cmd =
           'for mon in /sys/class/hwmon/hwmon*; do for label in "$mon"/temp*_label; do if [ -f $label ]; then value=${label%_*}_input; echo $(cat "$label")___$(cat "$value"); fi; done; done;';
         try {
-          exec(cmd, function (error, stdout) {
+          exec(cmd, (error, stdout) => {
             stdout = stdout.toString();
             const tdiePos = stdout.toLowerCase().indexOf('tdie');
             if (tdiePos !== -1) {
               stdout = stdout.substring(tdiePos);
             }
-            let lines = stdout.split('\n');
+            const lines = stdout.split('\n');
             let tctl = 0;
             lines.forEach((line) => {
               const parts = line.split('___');
@@ -1223,13 +1223,13 @@ function cpuTemperature(callback) {
               resolve(result);
               return;
             }
-            exec('sensors', function (error, stdout) {
+            exec('sensors', (error, stdout) => {
               if (!error) {
-                let lines = stdout.toString().split('\n');
+                const lines = stdout.toString().split('\n');
                 let tdieTemp = null;
                 let newSectionStarts = true;
                 let section = '';
-                lines.forEach(function (line) {
+                lines.forEach((line) => {
                   // determine section
                   if (line.trim() === '') {
                     newSectionStarts = true;
@@ -1243,11 +1243,14 @@ function cpuTemperature(callback) {
                     if (line.trim().toLowerCase().startsWith('core')) {
                       section = 'core';
                     }
+                    if (line.trim().toLowerCase().startsWith('k10temp')) {
+                      section = 'coreAMD';
+                    }
                     newSectionStarts = false;
                   }
-                  let regex = /[+-]([^°]*)/g;
-                  let temps = line.match(regex);
-                  let firstPart = line.split(':')[0].toUpperCase();
+                  const regex = /[+-]([^°]*)/g;
+                  const temps = line.match(regex);
+                  const firstPart = line.split(':')[0].toUpperCase();
                   if (section === 'acpi') {
                     // socket temp
                     if (firstPart.indexOf('TEMP') !== -1) {
@@ -1260,7 +1263,7 @@ function cpuTemperature(callback) {
                     }
                   }
                   // cpu temp
-                  if (firstPart.indexOf('PHYSICAL') !== -1 || firstPart.indexOf('PACKAGE') !== -1) {
+                  if (firstPart.indexOf('PHYSICAL') !== -1 || firstPart.indexOf('PACKAGE') !== -1 || (section === 'coreAMD' && firstPart.indexOf('TDIE') !== -1) || firstPart.indexOf('TEMP') !== -1) {
                     result.main = parseFloat(temps);
                   }
                   if (firstPart.indexOf('CORE ') !== -1) {
@@ -1272,7 +1275,7 @@ function cpuTemperature(callback) {
                 });
                 if (result.cores.length > 0) {
                   result.main = Math.round(result.cores.reduce((a, b) => a + b, 0) / result.cores.length);
-                  let maxtmp = Math.max.apply(Math, result.cores);
+                  const maxtmp = Math.max.apply(Math, result.cores);
                   result.max = maxtmp > result.main ? maxtmp : result.main;
                 } else {
                   if (result.main === null && tdieTemp !== null) {
@@ -1280,6 +1283,9 @@ function cpuTemperature(callback) {
                     result.max = tdieTemp;
                   }
                 }
+                if (result.main !== null && result.max === null) {
+                  result.max = result.main;
+                }
                 if (result.main !== null || result.max !== null) {
                   if (callback) {
                     callback(result);
@@ -1288,11 +1294,11 @@ function cpuTemperature(callback) {
                   return;
                 }
               }
-              fs.stat('/sys/class/thermal/thermal_zone0/temp', function (err) {
+              fs.stat('/sys/class/thermal/thermal_zone0/temp', (err) => {
                 if (err === null) {
-                  fs.readFile('/sys/class/thermal/thermal_zone0/temp', function (error, stdout) {
+                  fs.readFile('/sys/class/thermal/thermal_zone0/temp', (error, stdout) => {
                     if (!error) {
-                      let lines = stdout.toString().split('\n');
+                      const lines = stdout.toString().split('\n');
                       if (lines.length > 0) {
                         result.main = parseFloat(lines[0]) / 1000.0;
                         result.max = result.main;
@@ -1304,9 +1310,9 @@ function cpuTemperature(callback) {
                     resolve(result);
                   });
                 } else {
-                  exec('/opt/vc/bin/vcgencmd measure_temp', function (error, stdout) {
+                  exec('/opt/vc/bin/vcgencmd measure_temp', (error, stdout) => {
                     if (!error) {
-                      let lines = stdout.toString().split('\n');
+                      const lines = stdout.toString().split('\n');
                       if (lines.length > 0 && lines[0].indexOf('=')) {
                         result.main = parseFloat(lines[0].split('=')[1]);
                         result.max = result.main;
@@ -1329,11 +1335,11 @@ function cpuTemperature(callback) {
         }
       }
       if (_freebsd || _openbsd || _netbsd) {
-        exec('sysctl dev.cpu | grep temp', function (error, stdout) {
+        exec('sysctl dev.cpu | grep temp', (error, stdout) => {
           if (!error) {
             let lines = stdout.toString().split('\n');
             let sum = 0;
-            lines.forEach(function (line) {
+            lines.forEach((line) => {
               const parts = line.split(':');
               if (parts.length > 1) {
                 const temp = parseFloat(parts[1].replace(',', '.'));
@@ -1355,27 +1361,25 @@ function cpuTemperature(callback) {
         });
       }
       if (_darwin) {
-        let osxTemp = null;
         try {
-          osxTemp = require('osx-temperature-sensor');
-        } catch (er) {
-          osxTemp = null;
-        }
-        if (osxTemp) {
+          const osxTemp = require('osx-temperature-sensor');
           result = osxTemp.cpuTemperature();
-          // round to 2 digits
           if (result.main) {
+            // round to 2 digits
             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) {
+          if (result?.cores.length) {
             for (let i = 0; i < result.cores.length; i++) {
               result.cores[i] = Math.round(result.cores[i] * 100) / 100;
             }
           }
+        } catch {
+          util.noop();
         }
+        // add new macOS temperature library here
 
         if (callback) {
           callback(result);
@@ -1438,7 +1442,7 @@ function cpuFlags(callback) {
       let result = '';
       if (_windows) {
         try {
-          exec('reg query "HKEY_LOCAL_MACHINE\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0" /v FeatureSet', util.execOptsWin, function (error, stdout) {
+          exec('reg query "HKEY_LOCAL_MACHINE\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0" /v FeatureSet', util.execOptsWin, (error, stdout) => {
             if (!error) {
               let flag_hex = stdout.split('0x').pop().trim();
               let flag_bin_unpadded = parseInt(flag_hex, 16).toString(2);
@@ -1492,7 +1496,7 @@ function cpuFlags(callback) {
             }
             resolve(result);
           });
-        } catch (e) {
+        } catch {
           if (callback) {
             callback(result);
           }
@@ -1501,7 +1505,7 @@ function cpuFlags(callback) {
       }
       if (_linux) {
         try {
-          exec('export LC_ALL=C; lscpu; unset LC_ALL', function (error, stdout) {
+          exec('export LC_ALL=C; lscpu; unset LC_ALL', (error, stdout) => {
             if (!error) {
               let lines = stdout.toString().split('\n');
               lines.forEach(function (line) {
@@ -1536,7 +1540,7 @@ function cpuFlags(callback) {
         }
       }
       if (_freebsd || _openbsd || _netbsd) {
-        exec('export LC_ALL=C; dmidecode -t 4 2>/dev/null; unset LC_ALL', function (error, stdout) {
+        exec('export LC_ALL=C; dmidecode -t 4 2>/dev/null; unset LC_ALL', (error, stdout) => {
           let flags = [];
           if (!error) {
             let parts = stdout.toString().split('\tFlags:');
@@ -1556,7 +1560,7 @@ function cpuFlags(callback) {
         });
       }
       if (_darwin) {
-        exec('sysctl machdep.cpu.features', function (error, stdout) {
+        exec('sysctl machdep.cpu.features', (error, stdout) => {
           if (!error) {
             let lines = stdout.toString().split('\n');
             if (lines.length > 0 && lines[0].indexOf('machdep.cpu.features:') !== -1) {
@@ -1595,7 +1599,7 @@ function cpuCache(callback) {
       };
       if (_linux) {
         try {
-          exec('export LC_ALL=C; lscpu; unset LC_ALL', function (error, stdout) {
+          exec('export LC_ALL=C; lscpu; unset LC_ALL', (error, stdout) => {
             if (!error) {
               let lines = stdout.toString().split('\n');
               lines.forEach(function (line) {
@@ -1627,7 +1631,7 @@ function cpuCache(callback) {
         }
       }
       if (_freebsd || _openbsd || _netbsd) {
-        exec('export LC_ALL=C; dmidecode -t 7 2>/dev/null; unset LC_ALL', function (error, stdout) {
+        exec('export LC_ALL=C; dmidecode -t 7 2>/dev/null; unset LC_ALL', (error, stdout) => {
           let cache = [];
           if (!error) {
             const data = stdout.toString();
@@ -1658,7 +1662,7 @@ function cpuCache(callback) {
         });
       }
       if (_darwin) {
-        exec('sysctl hw.l1icachesize hw.l1dcachesize hw.l2cachesize hw.l3cachesize', function (error, stdout) {
+        exec('sysctl hw.l1icachesize hw.l1dcachesize hw.l2cachesize hw.l3cachesize',  (error, stdout) => {
           if (!error) {
             let lines = stdout.toString().split('\n');
             lines.forEach(function (line) {
@@ -1785,7 +1789,7 @@ exports.cpuCache = cpuCache;
 function getLoad() {
   return new Promise((resolve) => {
     process.nextTick(() => {
-      let loads = os.loadavg().map(function (x) {
+      let loads = os.loadavg().map( (x) => {
         return x / util.cores();
       });
       let avgLoad = parseFloat(Math.max.apply(Math, loads).toFixed(2));
@@ -1880,9 +1884,9 @@ function getLoad() {
           cores[i].rawLoadSteal = _cpus[i].loadSteal;
           cores[i].rawLoadGuest = _cpus[i].loadGuest;
         }
-        let totalTick = totalUser + totalSystem + totalNice + totalIrq + totalSteal + totalGuest + totalIdle;
-        let totalLoad = totalUser + totalSystem + totalNice + totalIrq + totalSteal + totalGuest;
-        let currentTick = totalTick - _current_cpu.tick;
+        const totalTick = totalUser + totalSystem + totalNice + totalIrq + totalSteal + totalGuest + totalIdle;
+        const totalLoad = totalUser + totalSystem + totalNice + totalIrq + totalSteal + totalGuest;
+        const currentTick = totalTick - _current_cpu.tick;
         result = {
           avgLoad: avgLoad,
           currentLoad: ((totalLoad - _current_cpu.load) / currentTick) * 100,
@@ -1932,7 +1936,7 @@ function getLoad() {
           rawCurrentLoadGuest: result.rawCurrentLoadGuest
         };
       } else {
-        let cores = [];
+        const cores = [];
         for (let i = 0; i < _corecount; i++) {
           cores[i] = {};
           cores[i].load = (_cpus[i].load / _cpus[i].currentTick) * 100;
@@ -2007,7 +2011,7 @@ function getFullLoad() {
 
       let result = 0;
 
-      if (cpus && cpus.length) {
+      if (cpus?.length) {
         for (let i = 0, len = cpus.length; i < len; i++) {
           const cpu = cpus[i].times;
           totalUser += cpu.user;
@@ -2016,7 +2020,7 @@ function getFullLoad() {
           totalIrq += cpu.irq;
           totalIdle += cpu.idle;
         }
-        let totalTicks = totalIdle + totalIrq + totalNice + totalSystem + totalUser;
+        const totalTicks = totalIdle + totalIrq + totalNice + totalSystem + totalUser;
         result = ((totalTicks - totalIdle) / totalTicks) * 100.0;
       }
       resolve(result);