systeminformation 5.23.3 → 5.23.5

package/lib/processes.js

@@ -1005,7 +1005,7 @@ function processLoad(proc, callback) {
       let processes = processesString.split('|');
       let result = [];
 
-      const procSanitized = util.isPrototypePolluted() ? '' : util.sanitizeShellString(proc);
+      const procSanitized = util.isPrototypePolluted() ? '' : (util.sanitizeShellString(proc) || '*');
 
       // from here new
       // let result = {
@@ -1149,12 +1149,14 @@ function processLoad(proc, callback) {
                 });
                 return found;
               });
-
+              lines.shift();
               lines.forEach(function (line) {
                 let data = line.trim().replace(/ +/g, ' ').split(' ');
                 if (data.length > 4) {
+                  const linuxName = data[4].indexOf('/') >= 0 ? data[4].substring(0, data[4].indexOf('/')) : data[4];
+                  const name = _linux ? (linuxName) : data[4].substring(data[4].lastIndexOf('/') + 1);
                   procStats.push({
-                    name: data[4].substring(data[4].lastIndexOf('/') + 1),
+                    name,
                     pid: parseInt(data[0]) || 0,
                     ppid: parseInt(data[1]) || 0,
                     cpu: parseFloat(data[2].replace(',', '.')),
@@ -1166,7 +1168,7 @@ function processLoad(proc, callback) {
               procStats.forEach(function (item) {
                 let listPos = -1;
                 let inList = false;
-                let name = '';
+                let name = item.name;
                 for (let j = 0; j < result.length; j++) {
                   if (item.name.toLowerCase().indexOf(result[j].proc.toLowerCase()) >= 0) {
                     listPos = j;
@@ -1181,13 +1183,15 @@ function processLoad(proc, callback) {
                 });
                 if ((processesString === '*') || inList) {
                   if (listPos < 0) {
-                    result.push({
-                      proc: name,
-                      pid: item.pid,
-                      pids: [item.pid],
-                      cpu: item.cpu,
-                      mem: item.mem
-                    });
+                    if (name) {
+                      result.push({
+                        proc: name,
+                        pid: item.pid,
+                        pids: [item.pid],
+                        cpu: item.cpu,
+                        mem: item.mem
+                      });
+                    }
                   } else {
                     if (item.ppid < 10) {
                       result[listPos].pid = item.pid;

package/lib/system.js

@@ -473,11 +473,11 @@ function baseboard(callback) {
           workload
         ).then((data) => {
           let lines = data.results[0] ? data.results[0].toString().split('\n') : [''];
-          result.manufacturer = util.getValue(lines, 'Manufacturer');
-          result.model = util.getValue(lines, 'Product Name');
-          result.version = util.getValue(lines, 'Version');
-          result.serial = util.getValue(lines, 'Serial Number');
-          result.assetTag = util.getValue(lines, 'Asset Tag');
+          result.manufacturer = cleanDefaults(util.getValue(lines, 'Manufacturer'));
+          result.model = cleanDefaults(util.getValue(lines, 'Product Name'));
+          result.version = cleanDefaults(util.getValue(lines, 'Version'));
+          result.serial = cleanDefaults(util.getValue(lines, 'Serial Number'));
+          result.assetTag = cleanDefaults(util.getValue(lines, 'Asset Tag'));
           // Non-Root values
           const cmd = `echo -n "board_asset_tag: "; cat /sys/devices/virtual/dmi/id/board_asset_tag 2>/dev/null; echo;
             echo -n "board_name: "; cat /sys/devices/virtual/dmi/id/board_name 2>/dev/null; echo;
@@ -486,16 +486,14 @@ function baseboard(callback) {
             echo -n "board_version: "; cat /sys/devices/virtual/dmi/id/board_version 2>/dev/null; echo;`;
           try {
             lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
-            result.manufacturer = !result.manufacturer ? util.getValue(lines, 'board_vendor') : result.manufacturer;
-            result.model = !result.model ? util.getValue(lines, 'board_name') : result.model;
-            result.version = !result.version ? util.getValue(lines, 'board_version') : result.version;
-            result.serial = !result.serial ? util.getValue(lines, 'board_serial') : result.serial;
-            result.assetTag = !result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag;
+            result.manufacturer = cleanDefaults(!result.manufacturer ? util.getValue(lines, 'board_vendor') : result.manufacturer);
+            result.model = cleanDefaults(!result.model ? util.getValue(lines, 'board_name') : result.model);
+            result.version = cleanDefaults(!result.version ? util.getValue(lines, 'board_version') : result.version);
+            result.serial = cleanDefaults(!result.serial ? util.getValue(lines, 'board_serial') : result.serial);
+            result.assetTag = cleanDefaults(!result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag);
           } catch (e) {
             util.noop();
           }
-          if (result.serial.toLowerCase().indexOf('o.e.m.') !== -1) { result.serial = '-'; }
-          if (result.assetTag.toLowerCase().indexOf('o.e.m.') !== -1) { result.assetTag = '-'; }
 
           // mem
           lines = data.results[1] ? data.results[1].toString().split('\n') : [''];
@@ -675,16 +673,12 @@ function chassis(callback) {
             echo -n "chassis_version: "; cat /sys/devices/virtual/dmi/id/chassis_version 2>/dev/null; echo;`;
         exec(cmd, function (error, stdout) {
           let lines = stdout.toString().split('\n');
-          result.manufacturer = util.getValue(lines, 'chassis_vendor');
+          result.manufacturer = cleanDefaults(util.getValue(lines, 'chassis_vendor'));
           const ctype = parseInt(util.getValue(lines, 'chassis_type').replace(/\D/g, ''));
-          result.type = (ctype && !isNaN(ctype) && ctype < chassisTypes.length) ? chassisTypes[ctype - 1] : '';
-          result.version = util.getValue(lines, 'chassis_version');
-          result.serial = util.getValue(lines, 'chassis_serial');
-          result.assetTag = util.getValue(lines, 'chassis_asset_tag');
-          if (result.manufacturer.toLowerCase().indexOf('o.e.m.') !== -1) { result.manufacturer = '-'; }
-          if (result.version.toLowerCase().indexOf('o.e.m.') !== -1) { result.version = '-'; }
-          if (result.serial.toLowerCase().indexOf('o.e.m.') !== -1) { result.serial = '-'; }
-          if (result.assetTag.toLowerCase().indexOf('o.e.m.') !== -1) { result.assetTag = '-'; }
+          result.type = cleanDefaults((ctype && !isNaN(ctype) && ctype < chassisTypes.length) ? chassisTypes[ctype - 1] : '');
+          result.version = cleanDefaults(util.getValue(lines, 'chassis_version'));
+          result.serial = cleanDefaults(util.getValue(lines, 'chassis_serial'));
+          result.assetTag = cleanDefaults(util.getValue(lines, 'chassis_asset_tag'));
 
           if (callback) { callback(result); }
           resolve(result);

package/package.json

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