6 Commits

View File

@ -13,7 +13,8 @@
* Created by kc on 04.04.16. - Forked and updated by Tobias Hopp 27.03.2024 * Created by kc on 04.04.16. - Forked and updated by Tobias Hopp 27.03.2024
*/ */
const exec = require('child_process').exec; const {exec, spawn} = require('child_process');
const async = require('async'); const async = require('async');
const _ = require('lodash'); const _ = require('lodash');
// The tools // The tools
@ -71,13 +72,37 @@ function initTools(callback) {
* @param {boolean} useSudo - Use sudo for access? * @param {boolean} useSudo - Use sudo for access?
*/ */
function scanNetworks(callback, useSudo) { function scanNetworks(callback, useSudo) {
exec((useSudo ? "sudo ":"") + scanner.cmdLine, function (err, stdout) { const cmd = scanner.cmdLine.split(" ");
let args = cmd.slice(1);
if(useSudo)
args.unshift(cmd[0]);
const child = spawn(useSudo ? "sudo" : cmd[0], args, { stdio: ['ignore', 'pipe', 'pipe'], detached: true });
child.on("error", (err) => callback(err, null) );
let stdoutData = '';
child.stdout.on('data', (data) => {
stdoutData += data;
});
child.on('close', (code) => {
if (code === 0) {
// Prozess erfolgreich beendet, Ausgabe verarbeiten
scanner.parseOutput(stdoutData, callback);
} else {
// Prozess mit Fehler beendet
callback(new Error(`Exited with code ${code}`), null);
}
});
/*exec((useSudo ? "sudo ":"") + scanner.cmdLine, { shell: true }, function (err, stdout) {
if (err) { if (err) {
callback(err, null); callback(err, null);
return; return;
} }
scanner.parseOutput(stdout, callback); scanner.parseOutput(stdout, callback);
}); });*/
} }
module.exports = { module.exports = {
@ -98,8 +123,10 @@ module.exports = {
scanNetworks((err, result) => { scanNetworks((err, result) => {
if(err) if(err)
return reject(err); return reject(err);
if(!result)
result = [];
resolve(result); resolve(result);
}, useSudo); }, useSudo && scanner == iwlist);
}); });
return; return;
@ -107,8 +134,10 @@ module.exports = {
scanNetworks((err, result) => { scanNetworks((err, result) => {
if(err) if(err)
return reject(err); return reject(err);
if(!result)
result = [];
resolve(result); resolve(result);
}, useSudo); }, useSudo && scanner == iwlist);
} ); } );
} }
}; };