From 20c8083a2ae86d7436b43c930a5ff8067f788430 Mon Sep 17 00:00:00 2001
From: Boernsman <you@example.com>
Date: Sun, 23 May 2021 15:43:42 +0200
Subject: [PATCH] finished nymealight network discovery

---
 ws2812fx/integrationpluginws2812fx.cpp | 53 ++++++++++++++++++++------
 ws2812fx/integrationpluginws2812fx.h   |  2 +
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/ws2812fx/integrationpluginws2812fx.cpp b/ws2812fx/integrationpluginws2812fx.cpp
index 5fb6415a..5451e035 100644
--- a/ws2812fx/integrationpluginws2812fx.cpp
+++ b/ws2812fx/integrationpluginws2812fx.cpp
@@ -38,7 +38,6 @@
 #include "network/zeroconf/zeroconfservicebrowser.h"
 
 #include "nymealightserialinterface.h"
-#include "nymealighttcpinterface.h"
 
 IntegrationPluginWs2812fx ::IntegrationPluginWs2812fx ()
 {
@@ -48,12 +47,30 @@ void IntegrationPluginWs2812fx::init()
 {
     m_serviceBrowser = hardwareManager()->zeroConfController()->createServiceBrowser();
     connect(m_serviceBrowser, &ZeroConfServiceBrowser::serviceEntryAdded, this, [=] (const ZeroConfServiceEntry &entry){
-        qCDebug(dcWs2812fx()) << "mDNS service added" << entry;
-        foreach (Thing *thing, myThings().filterByThingClassId(nymeaLightThingClassId)) {
-            Q_UNUSED(thing) //TODO auto address update
-            if (entry.txt().contains("nymea-light")) {
-            }
+        if (!entry.serviceType().contains("nymealight")) {
+            return;
         }
+        if (entry.txt("mac").isEmpty()) {
+            return;
+        }
+
+        ParamList parameters;
+        parameters.append(Param(nymeaLightThingConnectionTypeParamTypeId, "Network"));
+        parameters.append(Param(nymeaLightThingSerialnumberParamTypeId, entry.txt("mac")));
+
+        Thing *thing = myThings().findByParams(parameters);
+        if (!thing) {
+            return;
+        }
+        qCDebug(dcWs2812fx()) << "Updating IP address" << thing << "to" << entry.hostAddress();
+        thing->setParamValue(nymeaLightThingAddressParamTypeId, entry.hostAddress().toString());
+
+        if (!m_lights.contains(thing)) {
+            qCWarning(dcWs2812fx()) << "No nyema light connection found for" << thing;
+            return;
+        }
+        NymeaLightTcpInterface *lightInterface = qobject_cast<NymeaLightTcpInterface *>(m_lights.value(thing)->parent());
+        lightInterface->setAddress(entry.hostAddress());
     });
 }
 
@@ -121,7 +138,6 @@ void IntegrationPluginWs2812fx::setupThing(ThingSetupInfo *info)
 void IntegrationPluginWs2812fx::discoverThings(ThingDiscoveryInfo *info)
 {
     // Create the list of available serial interfaces
-
     Q_FOREACH(QSerialPortInfo port, QSerialPortInfo::availablePorts()) {
         qCDebug(dcWs2812fx()) << "Found serial port:" << port.portName();
         QString description = port.systemLocation() + " " + port.manufacturer() + " " + port.description();
@@ -137,18 +153,31 @@ void IntegrationPluginWs2812fx::discoverThings(ThingDiscoveryInfo *info)
         info->addThingDescriptor(descriptor);
     }
 
+    if (!hardwareManager()->zeroConfController()->available()) {
+        qCWarning(dcWs2812fx()) << "ZeroConfController not available";
+    }
+
     Q_FOREACH (const ZeroConfServiceEntry &service, m_serviceBrowser->serviceEntries()) {
-        qCDebug(dcWs2812fx()) << "mDNS service entry:" << service;
-        if (service.txt().contains("nymea-light")) {
-            ThingDescriptor descriptor(info->thingClassId(), service.name(), service.hostAddress().toString());
+
+        if (service.serviceType().contains("nymealight")) {
+            if (service.txt("mac").isEmpty()) {
+                qCDebug(dcWs2812fx()) << "Found nymea light but mac txt record is missing, ignoring.";
+                continue;
+            }
+            QString name;
+            if (!service.txt("name").isEmpty()) {
+                name = service.txt("name");
+            } else {
+                name = service.name();
+            }
+            ThingDescriptor descriptor(info->thingClassId(), name, service.hostAddress().toString());
 
             ParamList parameters;
             parameters.append(Param(nymeaLightThingConnectionTypeParamTypeId, "Network"));
-            parameters.append(Param(nymeaLightThingSerialnumberParamTypeId, "")); //TODO fixme
+            parameters.append(Param(nymeaLightThingSerialnumberParamTypeId, service.txt("mac")));
             parameters.append(Param(nymeaLightThingAddressParamTypeId, service.hostAddress().toString()));
             descriptor.setParams(parameters);
             info->addThingDescriptor(descriptor);
-            info->addThingDescriptor(descriptor);
         }
     }
     info->finish(Thing::ThingErrorNoError);
diff --git a/ws2812fx/integrationpluginws2812fx.h b/ws2812fx/integrationpluginws2812fx.h
index 60c69ac4..6553b458 100644
--- a/ws2812fx/integrationpluginws2812fx.h
+++ b/ws2812fx/integrationpluginws2812fx.h
@@ -97,6 +97,7 @@
 #include "nymealight.h"
 #include "network/zeroconf/zeroconfservicebrowser.h"
 #include "network/zeroconf/zeroconfserviceentry.h"
+#include "nymealighttcpinterface.h"
 
 #include <QTimer>
 #include <QSerialPort>
@@ -120,6 +121,7 @@ public:
 
 private:
     QHash<Thing *, NymeaLight *> m_lights;
+    QHash<Thing *, NymeaLightTcpInterface *> m_lightTcpInterface;
     QList<QString> m_usedInterfaces;
 
     ZeroConfServiceBrowser *m_serviceBrowser = nullptr;