From 912956bf31ebd6bd1025effbc64e6da06e483225 Mon Sep 17 00:00:00 2001 From: Christian Pedersen Date: Sat, 8 Aug 2020 01:14:56 +0200 Subject: [PATCH] Use mac address, not hostname --- index.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/index.js b/index.js index 3157757..bfa218e 100755 --- a/index.js +++ b/index.js @@ -209,9 +209,9 @@ function getClients() { } else { numClients[client.essid] = 1; } - mqttPub([config.name, 'status', 'wifi', client.essid, 'client', client.hostname].join('/'), {val: true, mac: client.mac, ts: (new Date()).getTime()}, {retain: true}); + mqttPub([config.name, 'status', 'wifi', client.essid, 'client', client.mac].join('/'), {val: true, mac: client.mac, ts: (new Date()).getTime(), hostname: client.hostname}, {retain: true}); if (retainedClients[client.essid]) { - const index = retainedClients[client.essid].indexOf(client.hostname); + const index = retainedClients[client.essid].indexOf(client.mac); if (index > -1) { retainedClients[client.essid].splice(index, 1); } @@ -246,8 +246,8 @@ unifi.on('*.disconnected', data => { numClients[data.ssid] = 0; } wifiInfoPub(); - mqttPub([config.name, 'status', 'wifi', data.ssid, 'event', 'disconnected'].join('/'), {val: data.hostname, mac: data.user, ts: data.time}); - mqttPub([config.name, 'status', 'wifi', data.ssid, 'client', data.hostname].join('/'), {val: false, mac: data.user, ts: data.time}, {retain: true}); + mqttPub([config.name, 'status', 'wifi', data.ssid, 'event', 'disconnected'].join('/'), {val: data.user, mac: data.user, ts: data.time}); + mqttPub([config.name, 'status', 'wifi', data.ssid, 'client', data.user].join('/'), {val: false, mac: data.user, ts: data.time}, {retain: true}); }); unifi.on('*.connected', data => { @@ -258,8 +258,8 @@ unifi.on('*.connected', data => { numClients[data.ssid] = 1; } wifiInfoPub(); - mqttPub([config.name, 'status', 'wifi', data.ssid, 'event', 'connected'].join('/'), {val: data.hostname, mac: data.user, ts: data.time}); - mqttPub([config.name, 'status', 'wifi', data.ssid, 'client', data.hostname].join('/'), {val: true, mac: data.user, ts: data.time}, {retain: true}); + mqttPub([config.name, 'status', 'wifi', data.ssid, 'event', 'connected'].join('/'), {val: data.user, mac: data.user, ts: data.time}); + mqttPub([config.name, 'status', 'wifi', data.ssid, 'client', data.user].join('/'), {val: true, mac: data.user, ts: data.time}, {retain: true}); }); unifi.on('*.roam', data => {