@depup/systeminformation 5.31.4-depup.0 → 5.33.1-depup.0

package/lib/filesystem.js

@@ -15,7 +15,6 @@
 
 const util = require('./util');
 const fs = require('fs');
-const os = require('os');
 
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
@@ -73,7 +72,7 @@ function fsSize(drive, callback) {
   function filterLines(stdout) {
     const lines = stdout.toString().split('\n');
     lines.shift();
-    if (stdout.toString().toLowerCase().indexOf('filesystem')) {
+    if (stdout.toString().toLowerCase().indexOf('filesystem') >= 0) {
       let removeLines = 0;
       for (let i = 0; i < lines.length; i++) {
         if (lines[i] && lines[i].toLowerCase().startsWith('filesystem')) {
@@ -89,19 +88,23 @@ function fsSize(drive, callback) {
 
   function parseDf(lines) {
     const data = [];
+    // filesystem (first column) and mount point (last column) may contain spaces:
+    // anchor parsing on the numeric columns in between (blocks, used, available, capacity)
+    const dfWithType = /^(.+?)\s+(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(?:\d+%|-)\s+(.+)$/;
+    const dfNoType = /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(?:\d+%|-)\s+(.+)$/;
+    const hasType = _linux || _freebsd || _openbsd || _netbsd;
     lines.forEach((line) => {
       if (line !== '') {
-        line = line.replace(/ +/g, ' ').split(' ');
-        if (line && (line[0].startsWith('/') || (line[6] && line[6] === '/') || line[0].indexOf('/') > 0 || line[0].indexOf(':') === 1 || (!_darwin && !isLinuxTmpFs(line[1])))) {
-          const fs = line[0];
-          const fsType = _linux || _freebsd || _openbsd || _netbsd ? line[1] : getmacOsFsType(line[0]);
-          const size = parseInt(_linux || _freebsd || _openbsd || _netbsd ? line[2] : line[1], 10) * 1024;
-          const used = parseInt(_linux || _freebsd || _openbsd || _netbsd ? line[3] : line[2], 10) * 1024;
-          const available = parseInt(_linux || _freebsd || _openbsd || _netbsd ? line[4] : line[3], 10) * 1024;
+        const parts = line.trim().match(hasType ? dfWithType : dfNoType);
+        if (parts && (parts[1].startsWith('/') || parts[hasType ? 6 : 5] === '/' || parts[1].indexOf('/') > 0 || parts[1].indexOf(':') === 1 || (!_darwin && !isLinuxTmpFs(parts[2])))) {
+          const fs = parts[1];
+          const fsType = hasType ? parts[2] : getmacOsFsType(parts[1]);
+          const size = parseInt(parts[hasType ? 3 : 2], 10) * 1024;
+          const used = parseInt(parts[hasType ? 4 : 3], 10) * 1024;
+          const available = parseInt(parts[hasType ? 5 : 4], 10) * 1024;
           const use = parseFloat((100.0 * (used / (used + available))).toFixed(2));
           const rw = osMounts && Object.keys(osMounts).length > 0 ? osMounts[fs] || false : null;
-          line.splice(0, _linux || _freebsd || _openbsd || _netbsd ? 6 : 5);
-          const mount = line.join(' ');
+          const mount = parts[hasType ? 6 : 5];
           if (!data.find((el) => el.fs === fs && el.type === fsType && el.mount === mount)) {
             data.push({
               fs,
@@ -159,9 +162,11 @@ function fsSize(drive, callback) {
                 return line.startsWith('/');
               })
               .forEach((line) => {
-                osMounts[line.split(' ')[0]] = osMounts[line.split(' ')[0]] || false;
+                // /proc/mounts escapes spaces as \040
+                const fs = line.split(' ')[0].replace(/\\040/g, ' ');
+                osMounts[fs] = osMounts[fs] || false;
                 if (line.toLowerCase().indexOf('/snap/') === -1) {
-                  osMounts[line.split(' ')[0]] = line.toLowerCase().indexOf('rw,') >= 0 || line.toLowerCase().indexOf(' rw ') >= 0;
+                  osMounts[fs] = line.toLowerCase().indexOf('rw,') >= 0 || line.toLowerCase().indexOf(' rw ') >= 0;
                 }
               });
           } catch {
@@ -215,7 +220,7 @@ function fsSize(drive, callback) {
       }
       if (_windows) {
         try {
-          const driveSanitized = drive ? util.sanitizeShellString(drive, true) : '';
+          const driveSanitized = drive ? util.sanitizeString(drive, true) : '';
           const cmd = `Get-WmiObject Win32_logicaldisk | select Access,Caption,FileSystem,FreeSpace,Size ${driveSanitized ? '| where -property Caption -eq ' + driveSanitized : ''} | fl`;
           util.powerShell(cmd).then((stdout, error) => {
             if (!error) {
@@ -342,7 +347,9 @@ exports.fsOpenFiles = fsOpenFiles;
 // disks
 
 function parseBytes(s) {
-  return parseInt(s.substr(s.indexOf(' (') + 2, s.indexOf(' Bytes)') - 10), 10);
+  const start = s.indexOf(' (') + 2;
+  const end = s.indexOf(' Bytes)');
+  return parseInt(s.substr(start, end - start), 10);
 }
 
 function parseDevices(lines) {
@@ -485,7 +492,7 @@ function raidMatchLinux(data) {
   try {
     data.forEach((element) => {
       if (element.type.startsWith('raid')) {
-        const lines = execSync(`mdadm --export --detail /dev/${element.name}`, util.execOptsLinux).toString().split('\n');
+        const lines = execSync(`mdadm --export --detail /dev/${util.sanitizeString(element.name, true)}`, util.execOptsLinux).toString().split('\n');
         const mdData = decodeMdabmData(lines);
 
         element.label = mdData.label; // <- assign label info
@@ -837,8 +844,9 @@ function fsStats(callback) {
               lines.forEach((line) => {
                 if (line !== '') {
                   line = line.trim().split(' ');
-                  if (fs_filter.indexOf(line[0]) === -1) {
-                    fs_filter.push(line[0]);
+                  const dev = util.sanitizeShellString(line[0], true);
+                  if (dev && fs_filter.indexOf(dev) === -1) {
+                    fs_filter.push(dev);
                   }
                 }
               });
@@ -1230,8 +1238,8 @@ function diskLayout(callback) {
               }
               devices.forEach((device) => {
                 let mediumType = '';
-                const BSDName = '/dev/' + device.name;
-                const logical = device.name;
+                const logical = util.sanitizeShellString(device.name, true);
+                const BSDName = '/dev/' + logical;
                 try {
                   mediumType = execSync('cat /sys/block/' + logical + '/queue/rotational 2>/dev/null', util.execOptsLinux)
                     .toString()
@@ -1351,17 +1359,20 @@ function diskLayout(callback) {
       }
       if (_darwin) {
         let cmdFullSmart = '';
-        exec(`system_profiler SPSerialATADataType SPNVMeDataType ${parseInt(os.release(), 10) > 24 ? 'SPUSBHostDataType' : 'SPUSBDataType'} `, { maxBuffer: 1024 * 1024 }, (error, stdout) => {
+        exec(`system_profiler SPSerialATADataType SPNVMeDataType SPUSBDataType SPStorageDataType`, { maxBuffer: 1024 * 1024 }, (error, stdout) => {
           if (!error) {
             // split by type:
             const lines = stdout.toString().split('\n');
             const linesSATA = [];
             const linesNVMe = [];
+            const linesStorage = [];
             const linesUSB = [];
             let dataType = 'SATA';
             lines.forEach((line) => {
               if (line === 'NVMExpress:') {
                 dataType = 'NVMe';
+              } else if (line === 'Storage:') {
+                dataType = 'Storage';
               } else if (line === 'USB:') {
                 dataType = 'USB';
               } else if (line === 'SATA/SATA Express:') {
@@ -1370,6 +1381,8 @@ function diskLayout(callback) {
                 linesSATA.push(line);
               } else if (dataType === 'NVMe') {
                 linesNVMe.push(line);
+              } else if (dataType === 'Storage') {
+                linesStorage.push(line);
               } else if (dataType === 'USB') {
                 linesUSB.push(line);
               }
@@ -1383,7 +1396,7 @@ function diskLayout(callback) {
                 const lines = device.split('\n');
                 const mediumType = util.getValue(lines, 'Medium Type', ':', true).trim();
                 const sizeStr = util.getValue(lines, 'capacity', ':', true).trim();
-                const BSDName = util.getValue(lines, 'BSD Name', ':', true).trim();
+                const BSDName = util.sanitizeShellString(util.getValue(lines, 'BSD Name', ':', true).trim(), true);
                 if (sizeStr) {
                   let sizeValue = 0;
                   if (sizeStr.indexOf('(') >= 0) {
@@ -1439,7 +1452,7 @@ function diskLayout(callback) {
                 const lines = device.split('\n');
                 const linkWidth = util.getValue(lines, 'link width', ':', true).trim();
                 const sizeStr = util.getValue(lines, '!capacity', ':', true).trim();
-                const BSDName = util.getValue(lines, 'BSD Name', ':', true).trim();
+                const BSDName = util.sanitizeShellString(util.getValue(lines, 'BSD Name', ':', true).trim(), true);
                 if (sizeStr) {
                   let sizeValue = 0;
                   if (sizeStr.indexOf('(') >= 0) {
@@ -1485,14 +1498,14 @@ function diskLayout(callback) {
             } catch {
               util.noop();
             }
-            // USB Drives
+            // USB Drives (older macOS report storage devices under SPUSBDataType)
             try {
-              const devices = linesUSB.join('\n').replaceAll('Media:\n ', 'Model:').split('\n\n          Product ID:');
+              const devices = linesUSB.join('\n').replace(/Media:\n /g, 'Model:').split('\n\n          Product ID:');
               devices.shift();
               devices.forEach((device) => {
                 const lines = device.split('\n');
                 const sizeStr = util.getValue(lines, 'Capacity', ':', true).trim();
-                const BSDName = util.getValue(lines, 'BSD Name', ':', true).trim();
+                const BSDName = util.sanitizeShellString(util.getValue(lines, 'BSD Name', ':', true).trim(), true);
                 if (sizeStr) {
                   let sizeValue = 0;
                   if (sizeStr.indexOf('(') >= 0) {
@@ -1513,7 +1526,7 @@ function diskLayout(callback) {
                     result.push({
                       device: BSDName,
                       type: 'USB',
-                      name: util.getValue(lines, 'Model', ':', true).trim().replaceAll(':', ''),
+                      name: util.getValue(lines, 'Model', ':', true).trim().replace(/:/g, ''),
                       vendor: getVendorFromModel(util.getValue(lines, 'Model', ':', true).trim()),
                       size: sizeValue,
                       bytesPerSector: null,
@@ -1538,6 +1551,80 @@ function diskLayout(callback) {
             } catch {
               util.noop();
             }
+            // External drives (USB, Thunderbolt, ...) via SPStorageDataType
+            // only add drives not already reported by the SATA/NVMe/USB data types above
+            try {
+              const seen = {};
+              result.forEach((d) => {
+                const m = (d.BSDName || '').match(/disk\d+/);
+                if (m) {
+                  seen[m[0]] = true;
+                }
+              });
+              const devices = linesStorage.join('\n').split('      Free:');
+              devices.shift();
+              devices.forEach((device) => {
+                const lines = device.split('\n');
+                const internal = util.getValue(lines, 'Internal', ':', true).trim().toLowerCase();
+                if (internal !== 'no') {
+                  return;
+                }
+                const bsdMatch = util
+                  .getValue(lines, 'BSD Name', ':', true)
+                  .trim()
+                  .match(/disk\d+/);
+                const BSDName = bsdMatch ? bsdMatch[0] : '';
+                if (!BSDName || seen[BSDName]) {
+                  return;
+                }
+                const sizeStr = util.getValue(lines, 'Capacity', ':', true).trim();
+                if (sizeStr) {
+                  let sizeValue = 0;
+                  if (sizeStr.indexOf('(') >= 0) {
+                    sizeValue = parseInt(
+                      sizeStr
+                        .match(/\(([^)]+)\)/)[1]
+                        .replace(/\./g, '')
+                        .replace(/,/g, '')
+                        .replace(/\s/g, ''),
+                      10
+                    );
+                  }
+                  if (!sizeValue) {
+                    sizeValue = parseInt(sizeStr, 10);
+                  }
+                  if (sizeValue) {
+                    seen[BSDName] = true;
+                    const protocol = util.getValue(lines, 'Protocol', ':', true).trim();
+                    const model = util.getValue(lines, 'Device Name', ':', true).trim();
+                    result.push({
+                      device: BSDName,
+                      type: protocol && protocol !== 'USB' ? protocol : 'USB',
+                      name: model,
+                      vendor: getVendorFromModel(model),
+                      size: sizeValue,
+                      bytesPerSector: null,
+                      totalCylinders: null,
+                      totalHeads: null,
+                      totalSectors: null,
+                      totalTracks: null,
+                      tracksPerCylinder: null,
+                      sectorsPerTrack: null,
+                      firmwareRevision: '',
+                      serialNum: '',
+                      interfaceType: protocol || 'USB',
+                      smartStatus: 'unknown',
+                      temperature: null,
+                      BSDName: BSDName
+                    });
+                    cmd = cmd + 'printf "\n' + BSDName + '|"; diskutil info /dev/' + BSDName + ' | grep SMART;';
+                    cmdFullSmart += `${cmdFullSmart ? 'printf ",";' : ''}smartctl -a -j ${BSDName};`;
+                  }
+                }
+              });
+            } catch {
+              util.noop();
+            }
             // check S.M.A.R.T. status
             if (cmdFullSmart) {
               exec(cmdFullSmart, { maxBuffer: 1024 * 1024 }, (error, stdout) => {