Skip to content
Open
Changes from 2 commits
Commits
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
24 changes: 16 additions & 8 deletions lib/wifi.js
Original file line number Diff line number Diff line change
Expand Up @@ -466,21 +466,29 @@ function wifiNetworks(callback) {
util.powerShell(cmd).then((stdout) => {
const ssidParts = stdout.toString('utf8').split(os.EOL + os.EOL + 'SSID ');
ssidParts.shift();

ssidParts.forEach(ssidPart => {
const ssidLines = ssidPart.split(os.EOL);
if (ssidLines && ssidLines.length >= 8 && ssidLines[0].indexOf(':') >= 0) {
const bssidsParts = ssidPart.split(' BSSID');
bssidsParts.shift();

bssidsParts.forEach((bssidPart) => {
const bssidLines = bssidPart.split(os.EOL);
const bssidLines = bssidPart.split(os.EOL).map(l => l.trim()).filter(Boolean);

if (!bssidLines[0] || !bssidLines[0].includes(':')) return;

const bssidLine = bssidLines[0].split(':');
bssidLine.shift();
const bssid = bssidLine.join(':').trim().toLowerCase();
const channel = bssidLines[3].split(':').pop().trim();
const quality = bssidLines[1].split(':').pop().trim();


const qualityLine = bssidLines.find(l => /^Signal\s*:/.test(l));
const channelLine = bssidLines.find(l => /^Channel\s*:/.test(l));

const quality = qualityLine ? qualityLine.split(':').pop().trim() : null;
const channel = channelLine ? channelLine.split(':').pop().trim() : null;

const securityLine = ssidLines[2] ? ssidLines[2].split(':').pop().trim() : '';
const authLine = ssidLines[3] ? ssidLines[3].split(':').pop().trim() : '';

result.push({
ssid: ssidLines[0].split(':').pop().trim(),
bssid,
Expand All @@ -489,8 +497,8 @@ function wifiNetworks(callback) {
frequency: wifiFrequencyFromChannel(channel),
signalLevel: wifiDBFromQuality(quality),
quality: quality ? parseInt(quality, 10) : null,
security: [ssidLines[2].split(':').pop().trim()],
wpaFlags: [ssidLines[3].split(':').pop().trim()],
security: securityLine ? [securityLine] : [],
wpaFlags: authLine ? [authLine] : [],
rsnFlags: []
});
});
Expand Down