TobiasH/node-wifi-scanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

node 4 compliant again

Browse Source
This commit is contained in:
Christian Kuster 2016-12-09 17:53:43 +01:00
parent 8a8005e2ef
commit cfacdd6438
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
index.js
View File

@ -21,17 +21,30 @@ function initTools(callback) {
// the error into the result and check it later on. // the error into the result and check it later on.
async.parallel([ async.parallel([
function (cb) { function (cb) {
exec(airport.detector, err => cb(null, {err: err, scanner: airport})); exec(airport.detector, function (err) {
cb(null, {err: err, scanner: airport}
)
}
);
}, },
function (cb) { function (cb) {
exec(iwlist.detector, err => cb(null, {err: err, scanner: iwlist})); exec(iwlist.detector, function (err) {
cb(null, {err: err, scanner: iwlist}
)
}
);
}, },
function (cb) { function (cb) {
exec(netsh.detector, err => cb(null, {err: err, scanner: netsh})); exec(netsh.detector, function (err) {
cb(null, {err: err, scanner: netsh}
)
}
);
} }
], ],
function (err, results) { function (err, results) {
let res = _.find(results, f => { var res = _.find(results,
function (f) {
return !f.err return !f.err
}); });
@ -39,7 +52,8 @@ function initTools(callback) {
return callback(null, res.scanner); return callback(null, res.scanner);
} }
callback(new Error('No scanner found')); callback(new Error('No scanner found'));
}); }
);
} }
/** /**
@ -63,7 +77,7 @@ module.exports = {
*/ */
scan: function (callback) { scan: function (callback) {
if (!scanner) { if (!scanner) {
initTools((err, s) => { initTools(function (err, s) {
if (err) { if (err) {
return callback(err); return callback(err);
} }