Skip to content

Export qualityFromDB in src/network-utils.js #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 10, 2019
Merged

Export qualityFromDB in src/network-utils.js #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e96d92b
Export `qualityFromDB` in `src/network-utils.js`
Kirbo Mar 4, 2019
c9d70e8
Fixed BSSID/MAC starting with `00` on macOS
Kirbo Apr 13, 2019
80256f5
Fixing BSSID on Mac
Apr 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 48 additions & 47 deletions src/mac-current-connections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,62 +3,63 @@ var macProvider = '/System/Library/PrivateFrameworks/Apple80211.framework/Versio
var env = require('./env');
var networkUtils = require('./network-utils.js');

function parseAirport (stdout) {
var lines = stdout.split('\n');
function parseAirport(stdout) {
var lines = stdout.split('\n');

var connections = [];
var connection = {};
lines.forEach(function (line) {
if (line.match(/[ ]*agrCtlRSSI: (.*)/)) {
connection.signal_level = parseInt(line.match(/[ ]*agrCtlRSSI: (.*)/)[1]);
connection.quality = networkUtils.qualityFromDB(parseInt(line.match(/[ ]*agrCtlRSSI: (.*)/)[1]));
} else if (line.match(/[ ]*BSSID: ([a-zA-Z0-1:]*)/)) {
var bssid = line.match(/[ ]*BSSID: ([0-9A-Fa-f:]*)/)[1];
connection.mac = bssid;
connection.bssid = bssid;
} else if (line.match(/[ ]*SSID: (.*)/)) {
connection.ssid = line.match(/[ ]*SSID: (.*)/)[1];
} else if (line.match(/[ ]*link auth: (.*)/)) {
connection.security = line.match(/[ ]*link auth: (.*)/)[1];
connection.security_flags = [];
} else if (line.match(/[ ]*channel: (.*)/)) {
connection.channel = parseInt(line.match(/[ ]*channel: (.*)/)[1].split(',')[0]);
connection.frequency = parseInt(networkUtils.frequencyFromChannel(parseInt(line.match(/[ ]*channel: (.*)/)[1].split(',')[0])));
connections.push(connection);
connection = {};
}
});
var connections = [];
var connection = {};
lines.forEach(function (line) {
if (line.match(/[ ]*agrCtlRSSI: (.*)/)) {
connection.signal_level = parseInt(line.match(/[ ]*agrCtlRSSI: (.*)/)[1]);
connection.quality = networkUtils.qualityFromDB(parseInt(line.match(/[ ]*agrCtlRSSI: (.*)/)[1]));
} else if (line.match(/[ ]*BSSID: ([a-zA-Z0-1:]*)/)) {
var bssid = line.match(/[ ]*BSSID: ([0-9A-Fa-f:]*)/)[1];
bssid = bssid.split(':').map(part => part.length === 1 ? `0${part}` : part).join(':');
connection.mac = bssid;
connection.bssid = bssid;
} else if (line.match(/[ ]*SSID: (.*)/)) {
connection.ssid = line.match(/[ ]*SSID: (.*)/)[1];
} else if (line.match(/[ ]*link auth: (.*)/)) {
connection.security = line.match(/[ ]*link auth: (.*)/)[1];
connection.security_flags = [];
} else if (line.match(/[ ]*channel: (.*)/)) {
connection.channel = parseInt(line.match(/[ ]*channel: (.*)/)[1].split(',')[0]);
connection.frequency = parseInt(networkUtils.frequencyFromChannel(parseInt(line.match(/[ ]*channel: (.*)/)[1].split(',')[0])));
connections.push(connection);
connection = {};
}
});

return connections;
return connections;
}

function getCurrentConnections(config, callback) {
var commandStr = macProvider+" --getinfo" ;
var commandStr = macProvider + " --getinfo";

exec(commandStr, env, function(err, stdout) {
if (err) {
callback && callback(err);
} else {
callback && callback(null, parseAirport(stdout));
}
exec(commandStr, env, function (err, stdout) {
if (err) {
callback && callback(err);
} else {
callback && callback(null, parseAirport(stdout));
}
});
}

module.exports = function (config) {
return function(callback) {
if (callback) {
getCurrentConnections(config, callback);
} else {
return new Promise(function (resolve, reject) {
getCurrentConnections(config, function (err, currentConnections) {
if (err) {
reject(err);
} else {
resolve(currentConnections);
}
})
});
}

return function (callback) {
if (callback) {
getCurrentConnections(config, callback);
} else {
return new Promise(function (resolve, reject) {
getCurrentConnections(config, function (err, currentConnections) {
if (err) {
reject(err);
} else {
resolve(currentConnections);
}
})
});
}

}
}
1 change: 1 addition & 0 deletions src/network-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ function qualityFromDB(db) {

exports.frequencyFromChannel = frequencyFromChannel;
exports.dBFromQuality = dBFromQuality;
exports.qualityFromDB = qualityFromDB;