systeminformation 5.30.7 → 5.31.0

package/README.md

@@ -31,7 +31,7 @@
 ## The Systeminformation Project
 
 This is amazing. Started as a small project just for myself, it now has > 19,000
-lines of code, > 700 versions published, up to 15 mio downloads per month, > 450
+lines of code, > 700 versions published, up to 20 mio downloads per month, > 480
 mio downloads overall. Top 10 NPM ranking for backend packages. Thank you to all
 who contributed to this project!
 
@@ -539,8 +539,8 @@ Full function reference with examples can be found at
 |                      | [0].serialNum         | X     |     | X   | X   |     | serial number                                                            |
 |                      | [0].interfaceType     | X     |     | X   | X   |     | SATA, PCIe, ...                                                          |
 |                      | [0].smartStatus       | X     |     | X   | X   |     | S.M.A.R.T Status (see Known Issues)                                      |
-|                      | [0].temperature       | X     |     |     |     |     | S.M.A.R.T temperature                                                    |
-|                      | [0].smartData         | X     |     |     | X   |     | full S.M.A.R.T data from smartctl<br>requires at least smartmontools 7.0 |
+|                      | [0].temperature       | X     |     | X   | X   |     | S.M.A.R.T temperature                                                    |
+|                      | [0].smartData         | X     |     | X   | X   |     | full S.M.A.R.T data from smartctl<br>requires at least smartmontools 7.0 |
 | si.blockDevices(cb)  | [{...}]               | X     |     | X   | X   |     | returns array of disks, partitions,<br>raids and roms                    |
 |                      | [0].name              | X     |     | X   | X   |     | name                                                                     |
 |                      | [0].type              | X     |     | X   | X   |     | type                                                                     |

package/lib/filesystem.js

@@ -1349,6 +1349,7 @@ function diskLayout(callback) {
         resolve(result);
       }
       if (_darwin) {
+        let cmdFullSmart = '';
         exec('system_profiler SPSerialATADataType SPNVMeDataType SPUSBDataType', { maxBuffer: 1024 * 1024 }, (error, stdout) => {
           if (!error) {
             // split by type:
@@ -1420,6 +1421,7 @@ function diskLayout(callback) {
                       BSDName: BSDName
                     });
                     cmd = cmd + 'printf "\n' + BSDName + '|"; diskutil info /dev/' + BSDName + ' | grep SMART;';
+                    cmdFullSmart += `${cmdFullSmart ? 'printf ",";' : ''}smartctl -a -j ${BSDName};`;
                   }
                 }
               });
@@ -1475,6 +1477,7 @@ function diskLayout(callback) {
                       BSDName: BSDName
                     });
                     cmd = `${cmd}printf "\n${BSDName}|"; diskutil info /dev/${BSDName} | grep SMART;`;
+                    cmdFullSmart += `${cmdFullSmart ? 'printf ",";' : ''}smartctl -a -j ${BSDName};`;
                   }
                 }
               });
@@ -1527,13 +1530,64 @@ function diskLayout(callback) {
                       BSDName: BSDName
                     });
                     cmd = cmd + 'printf "\n' + BSDName + '|"; diskutil info /dev/' + BSDName + ' | grep SMART;';
+                    cmdFullSmart += `${cmdFullSmart ? 'printf ",";' : ''}smartctl -a -j ${BSDName};`;
                   }
                 }
               });
             } catch {
               util.noop();
             }
-            if (cmd) {
+            // check S.M.A.R.T. status
+            if (cmdFullSmart) {
+              exec(cmdFullSmart, { maxBuffer: 1024 * 1024 }, (error, stdout) => {
+                try {
+                  const data = JSON.parse(`[${stdout}]`);
+                  data.forEach((disk) => {
+                    const diskBSDName = disk.smartctl.argv[disk.smartctl.argv.length - 1];
+
+                    for (let i = 0; i < result.length; i++) {
+                      if (result[i].BSDName === diskBSDName) {
+                        result[i].smartStatus = disk.smart_status.passed ? 'Ok' : disk.smart_status.passed === false ? 'Predicted Failure' : 'unknown';
+                        if (disk.temperature && disk.temperature.current) {
+                          result[i].temperature = disk.temperature.current;
+                        }
+                        result[i].smartData = disk;
+                      }
+                    }
+                  });
+                  commitResult(result);
+                } catch (e) {
+                  if (cmd) {
+                    cmd = cmd + 'printf "\n"';
+                    exec(cmd, { maxBuffer: 1024 * 1024 }, (error, stdout) => {
+                      const lines = stdout.toString().split('\n');
+                      lines.forEach((line) => {
+                        if (line) {
+                          const parts = line.split('|');
+                          if (parts.length === 2) {
+                            const BSDName = parts[0];
+                            parts[1] = parts[1].trim();
+                            const parts2 = parts[1].split(':');
+                            if (parts2.length === 2) {
+                              parts2[1] = parts2[1].trim();
+                              const status = parts2[1].toLowerCase();
+                              for (let i = 0; i < result.length; i++) {
+                                if (result[i].BSDName === BSDName) {
+                                  result[i].smartStatus = status === 'passed' ? 'Ok' : status === 'failed!' ? 'Predicted Failure' : 'unknown';
+                                }
+                              }
+                            }
+                          }
+                        }
+                      });
+                      commitResult(result);
+                    });
+                  } else {
+                    commitResult(result);
+                  }
+                }
+              });
+            } else if (cmd) {
               cmd = cmd + 'printf "\n"';
               exec(cmd, { maxBuffer: 1024 * 1024 }, (error, stdout) => {
                 const lines = stdout.toString().split('\n');

package/lib/osinfo.js

@@ -769,9 +769,14 @@ function versions(apps, callback) {
           if (_linux) {
             exec('locate bin/postgres', (error, stdout) => {
               if (!error) {
-                const postgresqlBin = stdout.toString().split('\n').sort();
+                const safePath = /^[a-zA-Z0-9/_.-]+$/;
+                const postgresqlBin = stdout
+                  .toString()
+                  .split('\n')
+                  .filter((p) => safePath.test(p.trim()))
+                  .sort();
                 if (postgresqlBin.length) {
-                  exec(postgresqlBin[postgresqlBin.length - 1] + ' -V', (error, stdout) => {
+                  execFile(postgresqlBin[postgresqlBin.length - 1], ['-V'], (error, stdout) => {
                     if (!error) {
                       const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
                       appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';

package/lib/wifi.js

@@ -437,8 +437,8 @@ function wifiNetworks(callback) {
               const res = getWifiNetworkListIw(ifaceSanitized);
               if (res === -1) {
                 // try again after 4 secs
-                setTimeout((iface) => {
-                  const res = getWifiNetworkListIw(iface);
+                setTimeout(() => {
+                  const res = getWifiNetworkListIw(ifaceSanitized);
                   if (res !== -1) {
                     result = res;
                   }

package/package.json

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