MCU8MASS-1169 Add timeout for publish

Author: M65649

src/mqtt_client.cpp

@@ -536,10 +536,10 @@ bool MqttClientClass::end(void) {
     delay(10);
     SequansController.clearReceiveBuffer();
 
-    connected_to_broker = false;
-
     internalDisconnectCallback(NULL);
 
+    connected_to_broker = false;
+
     return true;
 }
 
@@ -559,7 +559,8 @@ bool MqttClientClass::isConnected(void) { return connected_to_broker; }
 bool MqttClientClass::publish(const char* topic,
                               const uint8_t* buffer,
                               const uint32_t buffer_size,
-                              const MqttQoS quality_of_service) {
+                              const MqttQoS quality_of_service,
+                              const uint32_t timeout_ms) {
 
     if (!isConnected()) {
         Log.error("Attempted publish without being connected to a broker");
@@ -599,8 +600,12 @@ bool MqttClientClass::publish(const char* topic,
     // termination
     char status_code_buffer[3] = "";
 
-    if (!SequansController.waitForURC(MQTT_ON_PUBLISH_URC, urc, sizeof(urc))) {
-        Log.warn("Timed out waiting for publish confirmation\r\n");
+    if (!SequansController.waitForURC(MQTT_ON_PUBLISH_URC,
+                                      urc,
+                                      sizeof(urc),
+                                      timeout_ms)) {
+        Log.warn("Timed out waiting for publish confirmation. Consider "
+                 "increasing timeout for publishing\r\n");
         return false;
     }
 
@@ -639,11 +644,13 @@ bool MqttClientClass::publish(const char* topic,
 
 bool MqttClientClass::publish(const char* topic,
                               const char* message,
-                              const MqttQoS quality_of_service) {
+                              const MqttQoS quality_of_service,
+                              const uint32_t timeout_ms) {
     return publish(topic,
                    (uint8_t*)message,
                    strlen(message),
-                   quality_of_service);
+                   quality_of_service,
+                   timeout_ms);
 }
 
 bool MqttClientClass::subscribe(const char* topic,

src/mqtt_client.h

@@ -90,26 +90,30 @@ class MqttClientClass {
      * @param buffer Data to publish.
      * @param buffer_size Has to be in range 1-65535.
      * @param quality_of_service MQTT protocol QoS.
+     * @param timeout_ms Timeout waiting for publish confirmation.
      *
      * @return true if publish was successful.
      */
     bool publish(const char* topic,
                  const uint8_t* buffer,
                  const uint32_t buffer_size,
-                 const MqttQoS quality_of_service = AT_LEAST_ONCE);
+                 const MqttQoS quality_of_service = AT_LEAST_ONCE,
+                 const uint32_t timeout_ms        = 30000);
 
     /**
      * @brief Publishes the contents of the message to the given topic.
      *
      * @param topic Topic to publish to.
      * @param message String to publish, has to be null terminated.
      * @param quality_of_service MQTT protocol QoS.
+     * @param timeout_ms Timeout waiting for publish confirmation.
      *
      * @return true if publish was successful.
      */
     bool publish(const char* topic,
                  const char* message,
-                 const MqttQoS quality_of_service = AT_LEAST_ONCE);
+                 const MqttQoS quality_of_service = AT_LEAST_ONCE,
+                 const uint32_t timeout_ms        = 30000);
 
     /**
      * @brief Subscribes to a given topic.