systeminformation 5.23.14 → 5.23.16

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/network.js

@@ -1417,9 +1417,10 @@ function getProcessName(processes, pid) {
     }
   });
   cmd = cmd.split(' -')[0];
-  // return cmd;
-  const cmdParts = cmd.split('/');
-  return cmdParts[cmdParts.length - 1];
+  cmd = cmd.split(' /')[0];
+  return cmd;
+  // const cmdParts = cmd.split('/');
+  // return cmdParts[cmdParts.length - 1];
 }
 
 function networkConnections(callback) {
@@ -1535,18 +1536,24 @@ function networkConnections(callback) {
       }
       if (_darwin) {
         let cmd = 'netstat -natvln | grep "tcp4\\|tcp6\\|udp4\\|udp6"';
-        const states = 'ESTABLISHED|SYN_SENT|SYN_RECV|FIN_WAIT1|FIN_WAIT_1|FIN_WAIT2|FIN_WAIT_2|TIME_WAIT|CLOSE|CLOSE_WAIT|LAST_ACK|LISTEN|CLOSING|UNKNOWN';
+        const states = 'ESTABLISHED|SYN_SENT|SYN_RECV|FIN_WAIT1|FIN_WAIT_1|FIN_WAIT2|FIN_WAIT_2|TIME_WAIT|CLOSE|CLOSE_WAIT|LAST_ACK|LISTEN|CLOSING|UNKNOWN'.split('|');
         exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
           if (!error) {
             exec('ps -axo pid,command', { maxBuffer: 1024 * 20000 }, function (err2, stdout2) {
               let processes = stdout2.toString().split('\n');
               processes = processes.map((line => { return line.trim().replace(/ +/g, ' '); }));
               let lines = stdout.toString().split('\n');
-
-
+              let pidPos = 8;
+              if (lines[0] !== '') {
+                const lineParts = lines[0].replace(/ +/g, ' ').split(' ');
+                for (let i = 0; i < lineParts.length; i++) {
+                  if (states.indexOf(lineParts[i]) >= 0) {
+                    pidPos = i + 3;
+                  }
+                };
+              }
               lines.forEach(function (line) {
                 line = line.replace(/ +/g, ' ').split(' ');
-                const hasTransferred = line.length >= 19;
                 if (line.length >= 8) {
                   let localip = line[3];
                   let localport = '';
@@ -1566,7 +1573,7 @@ function networkConnections(callback) {
                   }
                   const hasState = states.indexOf(line[5]) >= 0;
                   let connstate = hasState ? line[5] : 'UNKNOWN';
-                  let pid = parseInt(line[8 + (hasState ? 0 : -1) + (hasTransferred ? 2 : 0)], 10);
+                  let pid = parseInt(line[pidPos + (hasState ? 0 : -1)], 10);
                   if (connstate) {
                     result.push({
                       protocol: line[0],

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

@@ -345,7 +345,7 @@ function getWifiNetworkListIw(iface) {
   }
 }
 
-function parseWifiDarwin(wifiObj) {
+function parseWifiDarwinXX(wifiObj) {
   const result = [];
   if (wifiObj) {
     wifiObj.forEach(function (wifiItem) {
@@ -396,6 +396,48 @@ function parseWifiDarwin(wifiObj) {
   }
   return result;
 }
+
+function parseWifiDarwin(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 channel = parseInt(('' + wifiItem.spairport_network_channel).split(' ')[0]) || 0;
+      const signalLevel = wifiItem.spairport_signal_noise || null;
+
+      result.push({
+        ssid: wifiItem._name || '',
+        bssid: wifiItem.spairport_network_bssid || null,
+        mode: wifiItem.spairport_network_phymode,
+        channel,
+        frequency: wifiFrequencyFromChannel(channel),
+        signalLevel: signalLevel ? parseInt(signalLevel, 10) : null,
+        quality: wifiQualityFromDB(signalLevel),
+        security,
+        wpaFlags: [],
+        rsnFlags: []
+      });
+    });
+    return result;
+  } catch (e) {
+    return result;
+  }
+};
 function wifiNetworks(callback) {
   return new Promise((resolve) => {
     process.nextTick(() => {
@@ -459,10 +501,9 @@ function wifiNetworks(callback) {
           resolve(result);
         }
       } else if (_darwin) {
-        let cmd = '/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -s -x';
+        let cmd = 'system_profiler SPAirPortDataType -json 2>/dev/null';
         exec(cmd, { maxBuffer: 1024 * 40000 }, function (error, stdout) {
-          const output = stdout.toString();
-          result = parseWifiDarwin(util.plistParser(output));
+          result = parseWifiDarwin(stdout.toString());
           if (callback) {
             callback(result);
           }

package/package.json

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