systeminformation 5.23.15 → 5.23.16

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

@@ -345,7 +345,7 @@ function getWifiNetworkListIw(iface) {
   }
 }
 
-function parseWifiDarwin(wifiObj) {
+function parseWifiDarwinXX(wifiObj) {
   const result = [];
   if (wifiObj) {
     wifiObj.forEach(function (wifiItem) {
@@ -397,7 +397,7 @@ function parseWifiDarwin(wifiObj) {
   return result;
 }
 
-function parseWifi2Darwin(wifiStr) {
+function parseWifiDarwin(wifiStr) {
   const result = [];
   try {
     let wifiObj = JSON.parse(wifiStr);
@@ -417,16 +417,17 @@ function parseWifi2Darwin(wifiStr) {
       } 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);
+      const channel = parseInt(('' + wifiItem.spairport_network_channel).split(' ')[0]) || 0;
+      const signalLevel = wifiItem.spairport_signal_noise || null;
 
       result.push({
         ssid: wifiItem._name || '',
-        bssid: '',
+        bssid: wifiItem.spairport_network_bssid || null,
         mode: wifiItem.spairport_network_phymode,
-        channel: parseInt(channelInfo[0].split(' ')[0]),
-        frequency: wifiFrequencyFromChannel(channelInfo[1]),
-        signalLevel: null,
-        quality: null,
+        channel,
+        frequency: wifiFrequencyFromChannel(channel),
+        signalLevel: signalLevel ? parseInt(signalLevel, 10) : null,
+        quality: wifiQualityFromDB(signalLevel),
         security,
         wpaFlags: [],
         rsnFlags: []
@@ -500,15 +501,9 @@ function wifiNetworks(callback) {
           resolve(result);
         }
       } else if (_darwin) {
-        let cmd = '/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -s -x  >2 /dev/bull; echo "######"; system_profiler -json SPAirPortDataType';
+        let cmd = 'system_profiler SPAirPortDataType -json 2>/dev/null';
         exec(cmd, { maxBuffer: 1024 * 40000 }, function (error, stdout) {
-          const output = stdout.toString();
-          const parts = output.split('######');
-          if (parts[0]) {
-            result = parseWifiDarwin(util.plistParser(parts[0]));
-          } else {
-            result = parseWifi2Darwin(parts[1]);
-          }
+          result = parseWifiDarwin(stdout.toString());
           if (callback) {
             callback(result);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.23.15",
+  "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)",