systeminformation 5.31.13 → 5.31.15

package/lib/cpu.js

@@ -1430,7 +1430,7 @@ function cpuTemperature(callback) {
                     else if (s.startsWith('coretemp') || s.startsWith('core')) section = 'core';
                     else if (s.startsWith('k10temp')) section = 'coreAMD';
                     else if (s.startsWith('cpu_thermal') || s.startsWith('cpu-thermal') || s.startsWith('soc_thermal') || s.startsWith('cpu')) section = 'cpuThermal';
-                    else section = 'other'; // WICHTIG: unbekannte Blöcke NICHT als CPU behandeln
+                    else section = 'other'; 
                     newSectionStarts = false;
                   }
 

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;
@@ -215,7 +214,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) {
@@ -485,7 +484,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
@@ -1194,7 +1193,7 @@ function diskLayout(callback) {
               let devices = [];
               try {
                 const outJSON = JSON.parse(out);
-                if (outJSON && {}.hasOwnProperty.call(outJSON, 'blockdevices')) {
+                if (outJSON && Object.hasOwn(outJSON, 'blockdevices')) {
                   devices = outJSON.blockdevices.filter((item) => {
                     return (
                       item.type === 'disk' &&
@@ -1351,17 +1350,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 +1372,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);
               }
@@ -1485,7 +1489,7 @@ 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:');
               devices.shift();
@@ -1538,6 +1542,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) => {

package/lib/network.js

@@ -1337,7 +1337,7 @@ function networkStatsSingle(iface) {
 
   return new Promise((resolve) => {
     process.nextTick(() => {
-      const ifaceSanitized = util.sanitizeString(iface);
+      const ifaceSanitized = util.sanitizeString(iface, true);
 
       let result = {
         iface: ifaceSanitized,

package/lib/wifi.js

@@ -204,7 +204,11 @@ function nmiDeviceLinux(iface) {
 }
 
 function nmiConnectionLinux(ssid) {
-  const cmd = `nmcli -t --show-secrets connection show ${ssid} 2>/dev/null`;
+  const ssidSanitized = sanitizeShellString(ssid, true);
+  if (!ssidSanitized) {
+    return {};
+  }
+  const cmd = `nmcli -t connection show ${ssidSanitized} 2>/dev/null`;
   try {
     const lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
     const bssid = util.getValue(lines, '802-11-wireless.seen-bssids').toLowerCase();
@@ -225,7 +229,7 @@ function wpaConnectionLinux(iface) {
   if (!iface) {
     return {};
   }
-  const cmd = `wpa_cli -i ${iface} status 2>&1`;
+  const cmd = `wpa_cli -i ${util.sanitizeString(iface, true)} status 2>&1`;
   try {
     const lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
     const freq = util.toInt(util.getValue(lines, 'freq', '='));
@@ -280,7 +284,7 @@ function getWifiNetworkListNmi() {
 function getWifiNetworkListIw(iface) {
   const result = [];
   try {
-    let iwlistParts = execSync(`export LC_ALL=C; iwlist ${iface} scan 2>&1; unset LC_ALL`, util.execOptsLinux).toString().split('        Cell ');
+    let iwlistParts = execSync(`export LC_ALL=C; iwlist ${util.sanitizeString(iface, true)} scan 2>&1; unset LC_ALL`, util.execOptsLinux).toString().split('        Cell ');
     if (iwlistParts[0].indexOf('resource busy') >= 0) {
       return -1;
     }

package/package.json

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