systeminformation 5.31.10 → 5.31.12

package/lib/cpu.js

@@ -1332,6 +1332,7 @@ function cpuTemperature(callback) {
       };
       if (_linux) {
         // CPU Chipset, Socket
+        let cpuThermal = null;
         try {
           const cmd = 'cat /sys/class/thermal/thermal_zone*/type  2>/dev/null; echo "-----"; cat /sys/class/thermal/thermal_zone*/temp 2>/dev/null;';
           const parts = execSync(cmd, util.execOptsLinux).toString().split('-----\n');
@@ -1346,6 +1347,10 @@ function cpuTemperature(callback) {
               if (line.startsWith('pch') && lines2[i]) {
                 result.chipset = Math.round(parseInt(lines2[i], 10) / 100) / 10;
               }
+              // CPU thermal zone (e.g. cpu-thermal on Raspberry Pi)
+              if (cpuThermal === null && line.indexOf('cpu') !== -1 && lines2[i]) {
+                cpuThermal = Math.round(parseInt(lines2[i], 10) / 100) / 10;
+              }
             }
           }
         } catch (e) {
@@ -1397,34 +1402,42 @@ function cpuTemperature(callback) {
               resolve(result);
               return;
             }
+            if (cpuThermal !== null) {
+              result.main = cpuThermal;
+              result.max = cpuThermal;
+              if (callback) {
+                callback(result);
+              }
+              resolve(result);
+              return;
+            }
             exec('sensors', (error, stdout) => {
               if (!error) {
                 const lines = stdout.toString().split('\n');
                 let tdieTemp = null;
+                let cpuThermalTemp = null;
                 let newSectionStarts = true;
                 let section = '';
+
                 lines.forEach((line) => {
-                  // determine section
+                  // Section bestimmen
                   if (line.trim() === '') {
                     newSectionStarts = true;
                   } else if (newSectionStarts) {
-                    if (line.trim().toLowerCase().startsWith('acpi')) {
-                      section = 'acpi';
-                    }
-                    if (line.trim().toLowerCase().startsWith('pch')) {
-                      section = 'pch';
-                    }
-                    if (line.trim().toLowerCase().startsWith('core')) {
-                      section = 'core';
-                    }
-                    if (line.trim().toLowerCase().startsWith('k10temp')) {
-                      section = 'coreAMD';
-                    }
+                    const s = line.trim().toLowerCase();
+                    if (s.startsWith('acpi')) section = 'acpi';
+                    else if (s.startsWith('pch')) section = 'pch';
+                    else if (s.startsWith('coretemp') || s.startsWith('core')) section = 'core';
+                    else if (s.startsWith('k10temp')) section = 'coreAMD';
+                    else if (s.startsWith('cpu_thermal') || s.startsWith('cpu-thermal') || s.startsWith('soc_thermal') || s.startsWith('cpu')) section = 'cpuThermal';
+                    else section = 'other'; // WICHTIG: unbekannte Blöcke NICHT als CPU behandeln
                     newSectionStarts = false;
                   }
+
                   const regex = /[+-]([^°]*)/g;
                   const temps = line.match(regex);
                   const firstPart = line.split(':')[0].toUpperCase();
+
                   if (section === 'acpi') {
                     // socket temp
                     if (firstPart.indexOf('TEMP') !== -1) {
@@ -1437,7 +1450,7 @@ function cpuTemperature(callback) {
                     }
                   }
                   // cpu temp
-                  if (firstPart.indexOf('PHYSICAL') !== -1 || firstPart.indexOf('PACKAGE') !== -1 || (section === 'coreAMD' && firstPart.indexOf('TDIE') !== -1) || firstPart.indexOf('TEMP') !== -1) {
+                  if (firstPart.indexOf('PHYSICAL') !== -1 || firstPart.indexOf('PACKAGE') !== -1 || (section === 'coreAMD' && firstPart.indexOf('TDIE') !== -1)) {
                     result.main = parseFloat(temps);
                   }
                   if (firstPart.indexOf('CORE ') !== -1) {
@@ -1446,13 +1459,22 @@ function cpuTemperature(callback) {
                   if (firstPart.indexOf('TDIE') !== -1 && tdieTemp === null) {
                     tdieTemp = parseFloat(temps);
                   }
+
+                  // generic temp value from cpuThermal
+                  if (section === 'cpuThermal' && firstPart.indexOf('TEMP') !== -1 && cpuThermalTemp === null) {
+                    cpuThermalTemp = parseFloat(temps);
+                  }
                 });
                 if (result.cores.length > 0) {
                   result.main = Math.round(result.cores.reduce((a, b) => a + b, 0) / result.cores.length);
                   const maxtmp = Math.max.apply(Math, result.cores);
                   result.max = maxtmp > result.main ? maxtmp : result.main;
                 } else {
-                  if (result.main === null && tdieTemp !== null) {
+                  // fallback order: cpu_thermal before tdie
+                  if (result.main === null && cpuThermalTemp !== null) {
+                    result.main = cpuThermalTemp;
+                    result.max = cpuThermalTemp;
+                  } else if (result.main === null && tdieTemp !== null) {
                     result.main = tdieTemp;
                     result.max = tdieTemp;
                   }

package/lib/graphics.js

@@ -337,9 +337,17 @@ function graphics(callback) {
             currentController.bus = 'Onboard';
           }
           if (parts.length > 1 && parts[0].replace(/ +/g, '').toLowerCase().indexOf('region') !== -1 && parts[1].toLowerCase().indexOf('memory') !== -1) {
-            let memparts = parts[1].split('=');
-            if (memparts.length > 1) {
-              currentController.vram = parseInt(memparts[1]);
+            const sizeMatch = parts[1].match(/size=(\d+)([KMG])?/i);
+            if (sizeMatch) {
+              let vram = parseInt(sizeMatch[1], 10);
+              const unit = (sizeMatch[2] || '').toUpperCase();
+              if (unit === 'G') { vram *= 1024; }
+              else if (unit === 'K') { vram = Math.round(vram / 1024); }
+              else if (unit === '') { vram = Math.round(vram / 1024 / 1024); } // bytes
+              // keep the largest memory region (the actual framebuffer aperture)
+              if (currentController.vram === null || vram > currentController.vram) {
+                currentController.vram = vram;
+              }
             }
           }
         }

package/package.json

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