systeminformation 5.13.0 → 5.13.2

package/lib/audio.js

@@ -28,8 +28,10 @@ const _netbsd = (_platform === 'netbsd');
 const _sunos = (_platform === 'sunos');
 
 function parseAudioType(str, input, output) {
+  str = str.toLowerCase();
   let result = '';
 
+  if (str.indexOf('display audio') >= 0) { result = 'Speaker'; }
   if (str.indexOf('speak') >= 0) { result = 'Speaker'; }
   if (str.indexOf('laut') >= 0) { result = 'Speaker'; }
   if (str.indexOf('loud') >= 0) { result = 'Speaker'; }
@@ -55,15 +57,15 @@ function getLinuxAudioPci() {
   let result = [];
   try {
     const parts = execSync(cmd).toString().split('\n\n');
-    for (let i = 0; i < parts.length; i++) {
-      const lines = parts[i].split('\n');
+    parts.forEach(element => {
+      const lines = element.split('\n');
       if (lines && lines.length && lines[0].toLowerCase().indexOf('audio') >= 0) {
         const audio = {};
         audio.slotId = lines[0].split(' ')[0];
         audio.driver = util.getValue(lines, 'Kernel driver in use', ':', true) || util.getValue(lines, 'Kernel modules', ':', true);
         result.push(audio);
       }
-    }
+    });
     return result;
   } catch (e) {
     return result;
@@ -154,13 +156,13 @@ function audio(callback) {
           if (!error) {
             const audioPCI = getLinuxAudioPci();
             const parts = stdout.toString().split('\n\n');
-            for (let i = 0; i < parts.length; i++) {
-              const lines = parts[i].split('\n');
+            parts.forEach(element => {
+              const lines = element.split('\n');
               if (util.getValue(lines, 'class', ':', true).toLowerCase().indexOf('audio') >= 0) {
                 const audio = parseLinuxAudioPciMM(lines, audioPCI);
                 result.push(audio);
               }
-            }
+            });
           }
           if (callback) {
             callback(result);
@@ -194,11 +196,12 @@ function audio(callback) {
         util.powerShell('Get-CimInstance Win32_SoundDevice | select DeviceID,StatusInfo,Name,Manufacturer | fl').then((stdout, error) => {
           if (!error) {
             const parts = stdout.toString().split(/\n\s*\n/);
-            for (let i = 0; i < parts.length; i++) {
-              if (util.getValue(parts[i].split('\n'), 'name', ':')) {
-                result.push(parseWindowsAudio(parts[i].split('\n')));
+            parts.forEach(element => {
+              const lines = element.split('\n');
+              if (util.getValue(lines, 'name', ':')) {
+                result.push(parseWindowsAudio(lines));
               }
-            }
+            });
           }
           if (callback) {
             callback(result);

package/lib/cpu.js

@@ -1044,13 +1044,15 @@ function cpuTemperature(callback) {
               const value = parts.length > 1 && parts[1] ? parts[1] : '0';
               if (value && (label === undefined || (label && label.toLowerCase().startsWith('core')))) {
                 result.cores.push(Math.round(parseInt(value, 10) / 100) / 10);
-              } else if (value && label && result.main === null) {
+              } else if (value && label && result.main === null && (label.toLowerCase().indexOf('package') >= 0 || label.toLowerCase().startsWith('physical') >= 0)) {
                 result.main = Math.round(parseInt(value, 10) / 100) / 10;
               }
             });
 
             if (result.cores.length > 0) {
-              result.main = Math.round(result.cores.reduce((a, b) => a + b, 0) / result.cores.length);
+              if (result.main === null) {
+                result.main = Math.round(result.cores.reduce((a, b) => a + b, 0) / result.cores.length);
+              }
               let maxtmp = Math.max.apply(Math, result.cores);
               result.max = (maxtmp > result.main) ? maxtmp : result.main;
             }

package/lib/processes.js

@@ -1122,7 +1122,7 @@ function processLoad(proc, callback) {
         }
 
         if (_darwin || _linux || _freebsd || _openbsd || _netbsd) {
-          const params = ['-axo', 'pid,pcpu,pmem,comm'];
+          const params = ['-axo', 'pid,ppid,pcpu,pmem,comm'];
           util.execSafe('ps', params).then((stdout) => {
             if (stdout) {
               let procStats = [];
@@ -1138,12 +1138,13 @@ function processLoad(proc, callback) {
 
               lines.forEach(function (line) {
                 let data = line.trim().replace(/ +/g, ' ').split(' ');
-                if (data.length > 3) {
+                if (data.length > 4) {
                   procStats.push({
-                    name: data[3].substring(data[3].lastIndexOf('/') + 1),
+                    name: data[4].substring(data[4].lastIndexOf('/') + 1),
                     pid: parseInt(data[0]) || 0,
-                    cpu: parseFloat(data[1].replace(',', '.')),
-                    mem: parseFloat(data[2].replace(',', '.'))
+                    ppid: parseInt(data[1]) || 0,
+                    cpu: parseFloat(data[2].replace(',', '.')),
+                    mem: parseFloat(data[3].replace(',', '.'))
                   });
                 }
               });
@@ -1174,6 +1175,9 @@ function processLoad(proc, callback) {
                       mem: item.mem
                     });
                   } else {
+                    if (item.ppid < 10) {
+                      result[listPos].pid = item.pid;
+                    }
                     result[listPos].pids.push(item.pid);
                     result[listPos].cpu += item.cpu;
                     result[listPos].mem += item.mem;

package/package.json

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