From 867e55b9e74776b6bcd2675ef7d433c50c8602da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Thu, 12 Jan 2023 16:09:03 +0100
Subject: [PATCH 1/2] sync mqtt with develop

---
 src/mqtt/MQTT.cpp | 30 +++++++++++++++++++++++-------
 src/mqtt/MQTT.h   |  3 ++-
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index 3a5d3b364..cc091bcff 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -21,6 +21,10 @@ String statusTopic = "msh/2/stat/";
 String cryptTopic = "msh/2/c/";   // msh/2/c/CHANNELID/NODEID
 String jsonTopic = "msh/2/json/"; // msh/2/json/CHANNELID/NODEID
 
+static MemoryDynamic<ServiceEnvelope> staticMqttPool;
+
+Allocator<ServiceEnvelope> &mqttPool = staticMqttPool;
+
 void MQTT::mqttCallback(char *topic, byte *payload, unsigned int length)
 {
     mqtt->onPublish(topic, payload, length);
@@ -142,7 +146,7 @@ void mqttInit()
     new MQTT();
 }
 
-MQTT::MQTT() : concurrency::OSThread("mqtt"), pubSub(mqttClient)
+MQTT::MQTT() : concurrency::OSThread("mqtt"), pubSub(mqttClient), mqttQueue(MAX_MQTT_QUEUE)
 {
     if(moduleConfig.mqtt.enabled) {
 
@@ -297,7 +301,7 @@ int32_t MQTT::runOnce()
                     }
                     mqttPool.release(env);
                 }
-                return 20;
+                return 200;
             } else {
                 return 30000;
             }
@@ -322,17 +326,17 @@ void MQTT::onSend(const MeshPacket &mp, ChannelIndex chIndex)
     if (ch.settings.uplink_enabled) {
         const char *channelId = channels.getGlobalId(chIndex); // FIXME, for now we just use the human name for the channel
 
-        ServiceEnvelope env = ServiceEnvelope_init_default;
-        env.channel_id = (char *)channelId;
-        env.gateway_id = owner.id;
-        env.packet = (MeshPacket *)&mp;
+        ServiceEnvelope *env = mqttPool.allocZeroed();
+        env->channel_id = (char *)channelId;
+        env->gateway_id = owner.id;
+        env->packet = (MeshPacket *)&mp;
 
         // don't bother sending if not connected...
         if (pubSub.connected()) {
 
             // FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
             static uint8_t bytes[MeshPacket_size + 64];
-            size_t numBytes = pb_encode_to_bytes(bytes, sizeof(bytes), &ServiceEnvelope_msg, &env);
+            size_t numBytes = pb_encode_to_bytes(bytes, sizeof(bytes), &ServiceEnvelope_msg, env);
 
             String topic = cryptTopic + channelId + "/" + owner.id;
             LOG_DEBUG("publish %s, %u bytes\n", topic.c_str(), numBytes);
@@ -348,7 +352,19 @@ void MQTT::onSend(const MeshPacket &mp, ChannelIndex chIndex)
                     pubSub.publish(topicJson.c_str(), jsonString.c_str(), false);
                 }
             }
+        } else {
+            LOG_INFO("MQTT not connected, queueing packet\n");
+            if (mqttQueue.numFree() == 0) {
+                LOG_WARN("NOTE: MQTT queue is full, discarding oldest\n");
+                ServiceEnvelope *d = mqttQueue.dequeuePtr(0);
+                if (d)
+                    mqttPool.release(d);
+            }
+            // make a copy of serviceEnvelope and queue it
+            ServiceEnvelope *copied = mqttPool.allocCopy(*env);
+            assert(mqttQueue.enqueue(copied, 0));
         }
+        mqttPool.release(env);
     }
 }
 
diff --git a/src/mqtt/MQTT.h b/src/mqtt/MQTT.h
index e3fb2b626..16ce4c37a 100644
--- a/src/mqtt/MQTT.h
+++ b/src/mqtt/MQTT.h
@@ -55,9 +55,10 @@ class MQTT : private concurrency::OSThread
     bool connected();
     
   protected:
+    PointerQueue<ServiceEnvelope> mqttQueue;
 
     int reconnectCount = 0;
-    
+
     virtual int32_t runOnce() override;
 
   private:

From 7936c7c8ae97fef6de0435006a701d798598c249 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Thu, 12 Jan 2023 10:07:17 -0600
Subject: [PATCH 2/2] Remove the D!

---
 arch/esp32/esp32.ini   | 2 +-
 arch/esp32/esp32s2.ini | 2 +-
 arch/esp32/esp32s3.ini | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
index a84288d05..0011cc39f 100644
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -26,7 +26,7 @@ build_flags =
   -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
   -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
   -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
-  -DDDEBUG_HEAP
+  -DDEBUG_HEAP
 
 lib_deps =
   ${arduino_base.lib_deps}
diff --git a/arch/esp32/esp32s2.ini b/arch/esp32/esp32s2.ini
index f1f2ceea5..beba16f3e 100644
--- a/arch/esp32/esp32s2.ini
+++ b/arch/esp32/esp32s2.ini
@@ -27,7 +27,7 @@ build_flags =
   -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
   -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
   -DHAS_BLUETOOTH=0
-  -DDDEBUG_HEAP
+  -DDEBUG_HEAP
   
 lib_deps =
   ${arduino_base.lib_deps}
diff --git a/arch/esp32/esp32s3.ini b/arch/esp32/esp32s3.ini
index fac12b4c1..023d1ca84 100644
--- a/arch/esp32/esp32s3.ini
+++ b/arch/esp32/esp32s3.ini
@@ -26,7 +26,7 @@ build_flags =
   -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
   -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
   -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
-  -DDDEBUG_HEAP
+  -DDEBUG_HEAP
   
 lib_deps =
   ${arduino_base.lib_deps}