systeminformation 5.23.14 → 5.23.15

package/README.md

@@ -51,7 +51,7 @@
 
 I wish you all a Merry Christmas and a peaceful New Year 2025.
 
-This is amazing. Started as a small project just for myself, it now has > 15,000
+This is amazing. Started as a small project just for myself, it now has > 17,000
 lines of code, > 650 versions published, up to 8 mio downloads per month, > 330
 mio downloads overall. #1 NPM ranking for backend packages. Thank you to all who
 contributed to this project!

package/lib/users.js

@@ -120,7 +120,7 @@ function parseUsersDarwin(lines) {
         result_w.command = l.slice(5, 1000).join(' ');
         // find corresponding 'who' line
         who_line = result_who.filter(function (obj) {
-          return (obj.user === result_w.user && (obj.tty.substring(3, 1000) === result_w.tty || obj.tty === result_w.tty));
+          return (obj.user.substring(0, 10) === result_w.user.substring(0, 10) && (obj.tty.substring(3, 1000) === result_w.tty || obj.tty === result_w.tty));
         });
         if (who_line.length === 1) {
           result.push({

package/lib/wifi.js

@@ -396,6 +396,47 @@ function parseWifiDarwin(wifiObj) {
   }
   return result;
 }
+
+function parseWifi2Darwin(wifiStr) {
+  const result = [];
+  try {
+    let wifiObj = JSON.parse(wifiStr);
+    wifiObj = wifiObj.SPAirPortDataType[0].spairport_airport_interfaces[0].spairport_airport_other_local_wireless_networks;
+    wifiObj.forEach(function (wifiItem) {
+
+      let security = [];
+      const sm = wifiItem.spairport_security_mode;
+      if (sm === 'spairport_security_mode_wep') {
+        security.push('WEP');
+      } else if (sm === 'spairport_security_mode_wpa2_personal') {
+        security.push('WPA2');
+      } else if (sm.startsWith('spairport_security_mode_wpa2_enterprise')) {
+        security.push('WPA2 EAP');
+      } else if (sm.startsWith('pairport_security_mode_wpa3_transition')) {
+        security.push('WPA2/WPA3');
+      } else if (sm.startsWith('pairport_security_mode_wpa3')) {
+        security.push('WPA3');
+      }
+      const channelInfo = new RegExp(/(\d+) \((\d)GHz, (\d+)MHz\)/g).exec(wifiItem.spairport_network_channel);
+
+      result.push({
+        ssid: wifiItem._name || '',
+        bssid: '',
+        mode: wifiItem.spairport_network_phymode,
+        channel: parseInt(channelInfo[0].split(' ')[0]),
+        frequency: wifiFrequencyFromChannel(channelInfo[1]),
+        signalLevel: null,
+        quality: null,
+        security,
+        wpaFlags: [],
+        rsnFlags: []
+      });
+    });
+    return result;
+  } catch (e) {
+    return result;
+  }
+};
 function wifiNetworks(callback) {
   return new Promise((resolve) => {
     process.nextTick(() => {
@@ -459,10 +500,15 @@ function wifiNetworks(callback) {
           resolve(result);
         }
       } else if (_darwin) {
-        let cmd = '/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -s -x';
+        let cmd = '/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -s -x  >2 /dev/bull; echo "######"; system_profiler -json SPAirPortDataType';
         exec(cmd, { maxBuffer: 1024 * 40000 }, function (error, stdout) {
           const output = stdout.toString();
-          result = parseWifiDarwin(util.plistParser(output));
+          const parts = output.split('######');
+          if (parts[0]) {
+            result = parseWifiDarwin(util.plistParser(parts[0]));
+          } else {
+            result = parseWifi2Darwin(parts[1]);
+          }
           if (callback) {
             callback(result);
           }

package/package.json

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