From c03c3d03fd4a6d7046afade360e4e11be712da4e Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Wed, 22 May 2024 13:42:52 +0200
Subject: [PATCH] decouple mqtt: - register onConnected and onDisconnected
 callbacks - allow optional Scheduler - publishInit is independent on
 Scheduler

---
 gateway/include/huzzah.h | 19 +++++++++++++-----
 gateway/include/mqtt.h   | 43 ++++++++++++++++++----------------------
 gateway/include/wifi.h   |  5 +----
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/gateway/include/huzzah.h b/gateway/include/huzzah.h
index 69c82aa..5f9c3d9 100644
--- a/gateway/include/huzzah.h
+++ b/gateway/include/huzzah.h
@@ -1,13 +1,15 @@
 #include <TaskScheduler.h>
 
+#define MQTT_HOST IPAddress(192, 168, 5, 11)
+#define MQTT_PORT 1883
+
 using namespace std;
 
 Scheduler ts;
 
-void turnLed(uint8_t led, bool on = true) {
-	on ? digitalWrite(led, LOW) : digitalWrite(led, HIGH);
-}
-
+#include "devices.h"
+#include "mqtt.h"
+#include "ota.h"
 #include "wifi.h"
 
 namespace Board {
@@ -19,6 +21,10 @@ namespace Board {
 		}
 	}, &ts);
 
+	void turnLed(uint8_t led, bool on = true) {
+		on ? digitalWrite(led, LOW) : digitalWrite(led, HIGH);
+	}
+
 	void setup() {
 		// Serial.begin(9600, SERIAL_8N1, SERIAL_TX_ONLY);
 
@@ -27,9 +33,12 @@ namespace Board {
 		turnLed(RED_LED, false);
 		turnLed(BLUE_LED);
 
+		Mqtt::setup(&ts,
+			[] {turnLed(BLUE_LED, false);},
+			[] {turnLed(BLUE_LED);}
+		);
 		Wifi::setup();
 		Ota::setup();
-		Mqtt::setup();
 
 		tReadCommand.enable();
 	}
diff --git a/gateway/include/mqtt.h b/gateway/include/mqtt.h
index 840372e..93df1c9 100644
--- a/gateway/include/mqtt.h
+++ b/gateway/include/mqtt.h
@@ -2,27 +2,20 @@
 
 #include <AsyncMqttClient.h>
 #include <ArduinoJson.h>
-#include "devices.h"
 
-
-#define MQTT_HOST IPAddress(192, 168, 5, 11)
-#define MQTT_PORT 1883
+#define MAIN_TOPIC "homeassistant/+/" MAIN_DEVICE_ID "/#"
 
 namespace Mqtt {
 
     AsyncMqttClient client;
 
-    Task tReConnect(5 * TASK_MINUTE, TASK_FOREVER, []{
+    Task tReConnect(TASK_MINUTE, TASK_FOREVER, []{
         Serial.println("Connecting to MQTT...");
         client.connect();
-    }, &ts);
-    void publishInit();
-    Task tPublishInit(TASK_IMMEDIATE, TASK_ONCE, publishInit, &ts);
-
-    const char* mainTopic = "homeassistant/+/rc-gateway/#";
+    });
 
     void disconnect() {
-        client.unsubscribe(mainTopic);
+        client.unsubscribe(MAIN_TOPIC);
         client.disconnect();
     }
 
@@ -31,12 +24,12 @@ namespace Mqtt {
     }
 
     void publishInit() {
-#if MQTT_CLEANUP
-        Ha::publisher = publish;
-        Component::components.forEach([](Component* c) { c->publishConfig(); });
-        AbstractBuilder::deleteAll();
-#endif
-        ts.deleteTask(tPublishInit);
+        static bool firstTime = true;
+        if (firstTime) {
+            Component::components.forEach([](Component* c) { c->publishConfig(); });
+            AbstractBuilder::deleteAll();
+            firstTime = false;
+        }
     }
 
     void publishCleanupConfig() {
@@ -53,18 +46,20 @@ namespace Mqtt {
         if (cmd) cmd->onCommand(msg);
     }
 
-    void setup() {
-        client.onConnect([](bool sessionPresent) {
-            tPublishInit.enable();
-            client.subscribe(mainTopic, 0);
+    void setup(Scheduler* ts = nullptr, void(*onConnected)() = nullptr, void(*onDisconnected)() = nullptr) {
+        if (ts) ts->addTask(tReConnect);
+        Ha::publisher = publish;
+        client.onConnect([onConnected](bool sessionPresent) {
+            publishInit();
+            client.subscribe(MAIN_TOPIC, 0);
             tReConnect.disable();
             Serial.println("Connected to MQTT");
-            turnLed(BLUE_LED, false);
+            if (onConnected) onConnected();
             });
-        client.onDisconnect([](AsyncMqttClientDisconnectReason reason) {
+        client.onDisconnect([onDisconnected](AsyncMqttClientDisconnectReason reason) {
             tReConnect.enableDelayed();
             Serial.println("Disconnected from MQTT");
-            turnLed(BLUE_LED);
+            if (onDisconnected) onDisconnected();
             });
         client.onMessage(onMessage);
         client.setServer(MQTT_HOST, MQTT_PORT);
diff --git a/gateway/include/wifi.h b/gateway/include/wifi.h
index 2f0c877..d09a1cf 100644
--- a/gateway/include/wifi.h
+++ b/gateway/include/wifi.h
@@ -1,8 +1,6 @@
 #include <ESP8266WiFi.h>
 #include <ESP8266WiFiMulti.h>
 #include <ESP8266mDNS.h>
-#include "mqtt.h"
-#include "ota.h"
 #include "credentials.h"
 
 namespace Wifi {
@@ -30,12 +28,11 @@ namespace Wifi {
       printStatus();
       tReconnect.cancel();
       Ota::tLoop.enable();
-      Mqtt::tReConnect.restart();
+      Mqtt::tReConnect.enable();
     });
 
     stationDisconnectedHandler = WiFi.onStationModeDisconnected([](const WiFiEventStationModeDisconnected& e) {
       Serial.println("Disconnected from network.");
-      tReconnect.restartDelayed();
     });