systeminformation 5.17.13 → 5.17.15

package/lib/osinfo.js

@@ -289,7 +289,7 @@ function osInfo(callback) {
           let lines = stdout.toString().split('\n');
           result.serial = util.getValue(lines, 'kern.uuid');
           result.distro = util.getValue(lines, 'ProductName');
-          result.release = util.getValue(lines, 'ProductVersion');
+          result.release = (util.getValue(lines, 'ProductVersion', ':', true, true) + ' ' + util.getValue(lines, 'ProductVersionExtra', ':', true, true)).trim();
           result.build = util.getValue(lines, 'BuildVersion');
           result.logofile = getLogoFile(result.distro);
           result.codename = 'macOS';
@@ -1053,7 +1053,7 @@ function getUniqueMacAdresses() {
     for (let dev in ifaces) {
       if ({}.hasOwnProperty.call(ifaces, dev)) {
         ifaces[dev].forEach(function (details) {
-          if (details && details.mac && details.mac !== '00:00:00:00:00:00') {
+          if (details?.mac && details.mac !== '00:00:00:00:00:00') {
             const mac = details.mac.toLowerCase();
             if (macs.indexOf(mac) === -1) {
               macs.push(mac);

package/lib/util.js

@@ -119,7 +119,7 @@ function getValue(lines, property, separator, trimmed, lineMatch) {
   trimmed = trimmed || false;
   lineMatch = lineMatch || false;
   let result = '';
-  lines.forEach((line) => {
+  lines.some((line) => {
     let lineLower = line.toLowerCase().replace(/\t/g, '');
     if (trimmed) {
       lineLower = lineLower.trim();
@@ -129,6 +129,7 @@ function getValue(lines, property, separator, trimmed, lineMatch) {
       if (parts.length >= 2) {
         parts.shift();
         result = parts.join(separator).trim();
+        return true;
       }
     }
   });
@@ -314,7 +315,7 @@ function getWmic() {
     if (!fs.existsSync(wmicPath)) {
       try {
         const wmicPathArray = execSync('WHERE WMIC', execOptsWin).toString().split('\r\n');
-        if (wmicPathArray && wmicPathArray.length) {
+        if (wmicPathArray?.length) {
           wmicPath = wmicPathArray[0];
         } else {
           wmicPath = 'wmic';
@@ -377,14 +378,14 @@ function powerShellProceedResults(data) {
 
 function powerShellStart() {
   if (!_psChild) {
-    _psChild = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-Command', '-'], {
+    _psChild = spawn('powershell.exe', ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-NoExit', '-Command', '-'], {
       stdio: 'pipe',
       windowsHide: true,
       maxBuffer: 1024 * 20000,
       encoding: 'UTF-8',
       env: util._extend({}, process.env, { LANG: 'en_US.UTF-8' })
     });
-    if (_psChild && _psChild.pid) {
+    if (_psChild?.pid) {
       _psPersistent = true;
       _psChild.stdout.on('data', function (data) {
         _psResult = _psResult + data.toString('utf8');
@@ -435,7 +436,7 @@ function powerShell(cmd) {
           start: new Date()
         });
         try {
-          if (_psChild && _psChild.pid) {
+          if (_psChild?.pid) {
             _psChild.stdin.write(_psToUTF8 + 'echo ' + _psCmdStart + id + _psIdSeperator + '; ' + os.EOL + cmd + os.EOL + 'echo ' + _psCmdSeperator + os.EOL);
           }
         } catch (e) {
@@ -450,7 +451,7 @@ function powerShell(cmd) {
     return new Promise((resolve) => {
       process.nextTick(() => {
         try {
-          const child = spawn('powershell.exe', ['-NoLogo', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], {
+          const child = spawn('powershell.exe', ['-NoProfile', '-NoLogo', '-InputFormat', 'Text', '-NoExit', '-ExecutionPolicy', 'Unrestricted', '-Command', '-'], {
             stdio: 'pipe',
             windowsHide: true,
             maxBuffer: 1024 * 20000,
@@ -463,7 +464,7 @@ function powerShell(cmd) {
               resolve(result);
             });
           }
-          if (child && child.pid) {
+          if (child?.pid) {
             child.stdout.on('data', function (data) {
               result = result + data.toString('utf8');
             });
@@ -513,7 +514,7 @@ function execSafe(cmd, args, options) {
             resolve(result);
           });
         }
-        if (child && child.pid) {
+        if (child?.pid) {
           child.stdout.on('data', function (data) {
             result += data.toString();
           });
@@ -575,7 +576,7 @@ function smartMonToolsInstalled() {
   if (_windows) {
     try {
       const pathArray = execSync('WHERE smartctl 2>nul', execOptsWin).toString().split('\r\n');
-      if (pathArray && pathArray.length) {
+      if (pathArray?.length) {
         _smartMonToolsInstalled = pathArray[0].indexOf(':\\') >= 0;
       } else {
         _smartMonToolsInstalled = false;

package/package.json

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