systeminformation 5.23.15 → 5.23.17

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) {
@@ -1534,19 +1535,19 @@ 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';
+        let cmd = 'netstat -natvln | head -n2; 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'.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');
-
-
+              lines.shift();
+              const header = lines.shift().replace(/ Address/g, '_Address').replace(/ +/g, ' ').split(' ');
+              let pidPos = header.indexOf('pid');
               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 +1567,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

@@ -176,7 +176,7 @@ function ifaceListLinux() {
 }
 
 function nmiDeviceLinux(iface) {
-  const cmd = `nmcli -t -f general,wifi-properties,capabilities,ip4,ip6 device show ${iface} 2>/dev/null`;
+  const cmd = `nmcli -t -f general,wifi-properties,capabilities,ip4,ip6 device show ${iface} 2> /dev/null`;
   try {
     const lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
     const ssid = util.getValue(lines, 'GENERAL.CONNECTION');
@@ -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);
           }
@@ -650,85 +645,62 @@ function wifiConnections(callback) {
         }
         resolve(result);
       } else if (_darwin) {
-        let cmd = 'system_profiler SPNetworkDataType';
+        let cmd = 'system_profiler SPNetworkDataType SPAirPortDataType -xml 2>/dev/null; echo "######" ; ioreg -n AppleBCMWLANSkywalkInterface -r 2>/dev/null';
         exec(cmd, function (error, stdout) {
-          const parts1 = stdout.toString().split('\n\n    Wi-Fi:\n\n');
-          if (parts1.length > 1) {
-            const lines = parts1[1].split('\n\n')[0].split('\n');
-            const iface = util.getValue(lines, 'BSD Device Name', ':', true);
-            const model = util.getValue(lines, 'hardware', ':', true);
-            cmd = '/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I 2>/dev/null; echo "######" ; ioreg -n AppleBCMWLANSkywalkInterface -r 2>/dev/null';
-            exec(cmd, function (error, stdout) {
-              const parts = stdout.toString().split('######');
-              const lines2 = parts[0].split('\n');
-              let lines3 = [];
-              if (parts[1].indexOf('  | {') > 0 && parts[1].indexOf('  | }') > parts[1].indexOf('  | {')) {
-                lines3 = parts[1].split('  | {')[1].split('  | }')[0].replace(/ \| /g, '').replace(/"/g, '').split('\n');
-              }
-              if (lines2.length > 10) {
-                const ssid = util.getValue(lines2, 'ssid', ':', true);
-                const bssid = util.getValue(lines2, 'bssid', ':', true) || formatBssid(util.getValue(lines3, 'IO80211BSSID', '=', true));
-                const security = util.getValue(lines2, 'link auth', ':', true);
-                const txRate = util.getValue(lines2, 'lastTxRate', ':', true);
-                const channel = util.getValue(lines2, 'channel', ':', true).split(',')[0];
-                const type = '802.11';
-                const rssi = util.toInt(util.getValue(lines2, 'agrCtlRSSI', ':', true));
-                /// const noise = util.toInt(util.getValue(lines2, 'agrCtlNoise', ':', true));
-                const signalLevel = rssi;
-                if (ssid || bssid) {
-                  result.push({
-                    id: 'Wi-Fi',
-                    iface,
-                    model,
-                    ssid,
-                    bssid,
-                    channel: util.toInt(channel),
-                    frequency: channel ? wifiFrequencyFromChannel(channel) : null,
-                    type,
-                    security,
-                    signalLevel,
-                    quality: wifiQualityFromDB(signalLevel),
-                    txRate
-                  });
-                }
-              }
-              if (lines3.length > 10) {
-                const ssid = util.getValue(lines3, 'IO80211SSID', '=', true);
-                const bssid = formatBssid(util.getValue(lines3, 'IO80211BSSID', '=', true));
-                const security = '';
-                const txRate = -1;
-                const signalLevel = -1;
-                const quality = -1;
-                const channel = util.getValue(lines3, 'IO80211Channel', '=', true);
-                const type = '802.11';
-                if ((ssid || bssid) && !result.length) {
-                  result.push({
-                    id: 'Wi-Fi',
-                    iface,
-                    model,
-                    ssid,
-                    bssid,
-                    channel: util.toInt(channel),
-                    frequency: channel ? wifiFrequencyFromChannel(channel) : null,
-                    type,
-                    security,
-                    signalLevel,
-                    quality,
-                    txRate
-                  });
-                }
-              }
-              if (callback) {
-                callback(result);
-              }
-              resolve(result);
-            });
-          } else {
-            if (callback) {
-              callback(result);
+          try {
+            const parts = stdout.toString().split('######');
+            const profilerObj = util.plistParser(parts[0]);
+            const networkObj = profilerObj[0]._SPCommandLineArguments.indexOf('SPNetworkDataType') >= 0 ? profilerObj[0]._items : profilerObj[1]._items;
+            const airportObj = profilerObj[0]._SPCommandLineArguments.indexOf('SPAirPortDataType') >= 0 ? profilerObj[0]._items[0].spairport_airport_interfaces : profilerObj[1]._items[0].spairport_airport_interfaces;
+
+            // parts[1] : ioreg
+            let lines3 = [];
+            if (parts[1].indexOf('  | {') > 0 && parts[1].indexOf('  | }') > parts[1].indexOf('  | {')) {
+              lines3 = parts[1].split('  | {')[1].split('  | }')[0].replace(/ \| /g, '').replace(/"/g, '').split('\n');
             }
-            resolve(result);
+
+            const networkWifiObj = networkObj.find((item) => { return item._name === 'Wi-Fi'; });
+            const airportWifiObj = airportObj[0].spairport_current_network_information;
+
+            const channel = parseInt(('' + airportWifiObj.spairport_network_channel).split(' ')[0]) || 0;
+            const signalLevel = airportWifiObj.spairport_signal_noise || null;
+
+            let security = [];
+            const sm = airportWifiObj.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');
+            }
+
+            result.push({
+              id: networkWifiObj._name || 'Wi-Fi',
+              iface: networkWifiObj.interface || '',
+              model: networkWifiObj.hardware || '',
+              ssid: airportWifiObj._name || '',
+              bssid: airportWifiObj.spairport_network_bssid || '',
+              channel,
+              frequency: channel ? wifiFrequencyFromChannel(channel) : null,
+              type: airportWifiObj.spairport_network_phymode || '802.11',
+              security,
+              signalLevel: signalLevel ? parseInt(signalLevel, 10) : null,
+              quality: wifiQualityFromDB(signalLevel),
+              txRate: airportWifiObj.spairport_network_rate || null,
+            });
+
+          } catch (e) {
+            util.noop();
           }
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
         });
       } else if (_windows) {
         let cmd = 'netsh wlan show interfaces';

package/package.json

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