Merge branch 'master' of https://github.com/HASwitchPlate/openHASP

Author: fvanroie

src/hasp/hasp_attribute.cpp

@@ -197,17 +197,26 @@ static bool my_line_set_points(lv_obj_t* obj, const char* payload)
 {
     my_line_clear_points(obj); // delete pointmap
 
-    // Create new points
-    // Reserve memory for JsonDocument
-    // StaticJsonDocument<1024> doc;
-    size_t maxsize = (128u * ((strlen(payload) / 128) + 1)) + 256;
+    // count LEFT SQUARE BRACKET => nb points +1
+    uint16_t count = 0;
+    for (const char* p = payload; *p; p++) 
+        if (*p == '[') count++;
+    count--;
+    
+    // Reserve memory for JsonDocument rounded to upper 128 bytes
+    uint16_t maxsize = 128u * (3*JSON_ARRAY_SIZE(1)*count / 128+1) ;
+    
+    LOG_VERBOSE(TAG_ATTR,"payload: %s",payload);
+    LOG_TRACE(TAG_ATTR,"count: %u maxsize: %u taille brut %u",count,maxsize,(uint32_t)(3*JSON_ARRAY_SIZE(1)*count));
+
     DynamicJsonDocument doc(maxsize);
     DeserializationError jsonError = deserializeJson(doc, payload);
 
     if(jsonError) { // Couldn't parse incoming JSON payload
         dispatch_json_error(TAG_ATTR, jsonError);
         return false;
     }
+     LOG_VERBOSE(TAG_ATTR,"Memory usage: %u",(uint32_t)doc.memoryUsage());
 
     JsonArray arr  = doc.as<JsonArray>(); // Parse payload
     size_t tot_len = sizeof(lv_point_t*) * (arr.size());

src/hasp/hasp_dispatch.cpp

@@ -20,7 +20,17 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
+#include <queue>
+#include <mutex>
+#include <string>
 #include "../mqtt/hasp_mqtt.h"
+
+/* Deferred command queue: MQTT callback runs on Paho thread; jsonl/json handlers call LVGL
+ * (hasp_new_object) which is not thread-safe. Queue jsonl/json for processing on main thread.
+ * 64 is enough for burst layout + state; PC has plenty of memory. */
+#define DISPATCH_DEFERRED_QUEUE_MAX 64
+static std::queue<std::pair<std::string, std::string>> deferred_queue;
+static std::mutex deferred_mutex;
 #else
 #include "StringStream.h"
 #include "StreamUtils.h" // for exec ReadBufferingStream
@@ -463,6 +473,33 @@ void dispatch_topic_payload(const char* topic, const char* payload, bool update,
     dispatch_command(topic, (char*)payload, update, source); // dispatch as is
 }
 
+#if HASP_TARGET_PC
+void dispatch_defer_command(const char* topic, const char* payload)
+{
+    std::lock_guard<std::mutex> lock(deferred_mutex);
+    if(deferred_queue.size() >= DISPATCH_DEFERRED_QUEUE_MAX) {
+        (void)deferred_queue.front();
+        deferred_queue.pop(); // drop oldest
+    }
+    deferred_queue.push({std::string(topic), std::string(payload)});
+}
+
+void dispatch_process_deferred(void)
+{
+    std::pair<std::string, std::string> item;
+    for(;;) {
+        {
+            std::lock_guard<std::mutex> lock(deferred_mutex);
+            if(deferred_queue.empty()) break;
+            item = deferred_queue.front();
+            deferred_queue.pop();
+        }
+        bool update = item.second.size() > 0;
+        dispatch_topic_payload(item.first.c_str(), item.second.c_str(), update, TAG_MQTT);
+    }
+}
+#endif
+
 // void dispatch_output_group_state(uint8_t groupid, uint16_t state)
 // {
 //     char payload[64];

src/hasp/hasp_dispatch.h

@@ -93,6 +93,12 @@ void dispatch_config(const char* topic, const char* payload, uint8_t source);
 
 void dispatch_normalized_group_values(hasp_update_value_t& value);
 
+#if HASP_TARGET_PC
+/* Defer json/jsonl from MQTT thread to main (LVGL) thread to avoid segfault (PC/SDL2 only). */
+void dispatch_defer_command(const char* topic, const char* payload);
+void dispatch_process_deferred(void);
+#endif
+
 void dispatch_state_subtopic(const char* subtopic, const char* payload);
 void dispatch_state_eventid(const char* topic, hasp_event_t eventid);
 void dispatch_state_brightness(const char* topic, hasp_event_t eventid, int32_t val);

src/main.cpp

@@ -172,6 +172,11 @@ IRAM_ATTR void loop()
     }
 #endif
 
+#if HASP_TARGET_PC
+    /* Process jsonl/json commands deferred from MQTT thread (LVGL not thread-safe on PC). */
+    dispatch_process_deferred();
+#endif
+
 #if HASP_USE_LVGL_TASK == 0
     guiLoop();
 #endif

src/mqtt/hasp_mqtt_paho_async.cpp

@@ -44,7 +44,7 @@ const char FP_CONFIG_GROUP[] PROGMEM = "group";
 
 #include "hasp_mqtt.h" // functions to implement here
 
-#include "hasp/hasp_dispatch.h" // for dispatch_topic_payload
+#include "hasp/hasp_dispatch.h" // for dispatch_topic_payload, dispatch_defer_command
 #include "hasp_debug.h"         // for logging
 
 #if !defined(_WIN32)
@@ -83,6 +83,7 @@ uint16_t mqttPort         = MQTT_PORT;
 
 MQTTAsync mqtt_client;
 
+static bool mqttClientCreated = false;
 static bool mqttConnecting = false;
 static bool mqttConnected  = false;
 
@@ -206,6 +207,11 @@ static void mqtt_message_cb(char* topic, char* payload, size_t length)
             // LOG_TRACE(TAG_MQTT, F("ignoring LWT = online"));
         }
     } else {
+        // On PC, jsonl/json handlers call LVGL from MQTT thread -> segfault. Defer to main thread.
+        if(!strcmp(topic, "command/jsonl") || !strcmp(topic, "command/json")) {
+            dispatch_defer_command(topic, payload);
+            return;
+        }
         dispatch_mtx.lock();
         dispatch_topic_payload(topic, (const char*)payload, length > 0, TAG_MQTT);
         dispatch_mtx.unlock();
@@ -361,18 +367,21 @@ void mqttStart()
     int rc;
     int ch;
 
-    if((rc = MQTTAsync_create(&mqtt_client, mqttServer.c_str(), haspDevice.get_hostname(), MQTTCLIENT_PERSISTENCE_NONE,
-                              NULL)) != MQTTASYNC_SUCCESS) {
-        LOG_ERROR(TAG_MQTT, "Failed to create client, return code %d", rc);
-        rc = EXIT_FAILURE;
-        return;
-    }
+    if(!mqttClientCreated) {
+        if((rc = MQTTAsync_create(&mqtt_client, mqttServer.c_str(), haspDevice.get_hostname(), MQTTCLIENT_PERSISTENCE_NONE,
+                                  NULL)) != MQTTASYNC_SUCCESS) {
+            LOG_ERROR(TAG_MQTT, "Failed to create client, return code %d", rc);
+            rc = EXIT_FAILURE;
+            return;
+        }
 
-    if((rc = MQTTAsync_setCallbacks(mqtt_client, mqtt_client, connlost, mqtt_message_arrived, NULL)) !=
-       MQTTASYNC_SUCCESS) {
-        LOG_ERROR(TAG_MQTT, "Failed to set callbacks, return code %d", rc);
-        rc = EXIT_FAILURE;
-        return;
+        if((rc = MQTTAsync_setCallbacks(mqtt_client, mqtt_client, connlost, mqtt_message_arrived, NULL)) !=
+           MQTTASYNC_SUCCESS) {
+            LOG_ERROR(TAG_MQTT, "Failed to set callbacks, return code %d", rc);
+            rc = EXIT_FAILURE;
+            return;
+        }
+        mqttClientCreated = true;
     }
 
     mqttEnabled = mqttServer.length() > 0 && mqttPort > 0;
@@ -410,6 +419,8 @@ void mqttStart()
 
 void mqttStop()
 {
+    if(!mqttClientCreated) return;
+
     int rc;
     MQTTAsync_disconnectOptions disc_opts = MQTTAsync_disconnectOptions_initializer;
     disc_opts.onSuccess                   = onDisconnect;
@@ -418,6 +429,8 @@ void mqttStop()
         LOG_ERROR(TAG_MQTT, "Failed to disconnect, return code %d", rc);
         rc = EXIT_FAILURE;
     }
+    MQTTAsync_destroy(&mqtt_client);
+    mqttClientCreated = false;
 }
 
 void mqttSetup()

src/mqtt/hasp_mqtt_paho_single.cpp

@@ -80,6 +80,7 @@ uint16_t mqttPort         = MQTT_PORT;
 
 MQTTClient mqtt_client;
 
+static bool mqttClientCreated = false;
 int disc_finished = 0;
 int subscribed    = 0;
 int connected     = 0;
@@ -300,18 +301,21 @@ void mqttStart()
     int ch;
 
     LOG_DEBUG(TAG_MQTT, "%s %d", __FILE__, __LINE__);
-    if((rc = MQTTClient_create(&mqtt_client, mqttServer.c_str(), haspDevice.get_hostname(), MQTTCLIENT_PERSISTENCE_NONE,
-                               NULL)) != MQTTCLIENT_SUCCESS) {
-        LOG_ERROR(TAG_MQTT, "Failed to create client, return code %d", rc);
-        rc = EXIT_FAILURE;
-        return;
-    }
+    if(!mqttClientCreated) {
+        if((rc = MQTTClient_create(&mqtt_client, mqttServer.c_str(), haspDevice.get_hostname(), MQTTCLIENT_PERSISTENCE_NONE,
+                                   NULL)) != MQTTCLIENT_SUCCESS) {
+            LOG_ERROR(TAG_MQTT, "Failed to create client, return code %d", rc);
+            rc = EXIT_FAILURE;
+            return;
+        }
 
-    if((rc = MQTTClient_setCallbacks(mqtt_client, mqtt_client, connlost, mqtt_message_arrived, NULL)) !=
-       MQTTCLIENT_SUCCESS) {
-        LOG_ERROR(TAG_MQTT, "Failed to set callbacks, return code %d", rc);
-        rc = EXIT_FAILURE;
-        return;
+        if((rc = MQTTClient_setCallbacks(mqtt_client, mqtt_client, connlost, mqtt_message_arrived, NULL)) !=
+           MQTTCLIENT_SUCCESS) {
+            LOG_ERROR(TAG_MQTT, "Failed to set callbacks, return code %d", rc);
+            rc = EXIT_FAILURE;
+            return;
+        }
+        mqttClientCreated = true;
     }
 
     LOG_DEBUG(TAG_MQTT, "%s %d", __FILE__, __LINE__);
@@ -350,6 +354,8 @@ void mqttStart()
 
 void mqttStop()
 {
+    if(!mqttClientCreated) return;
+
     int rc;
     // MQTTClient_disconnectOptions disc_opts = MQTTClient_disconnectOptions_initializer;
     // disc_opts.onSuccess                    = onDisconnect;
@@ -358,6 +364,8 @@ void mqttStop()
         LOG_ERROR(TAG_MQTT, "Failed to disconnect, return code %d", rc);
         rc = EXIT_FAILURE;
     }
+    MQTTClient_destroy(&mqtt_client);
+    mqttClientCreated = false;
 }
 
 void mqttSetup()

user_setups/darwin/darwin_headless.ini

@@ -6,6 +6,7 @@ extra_scripts =
   tools/linux_build_extra.py
 build_flags =
   ${env.build_flags}
+  -std=c++14
   -D HASP_MODEL="MacOS Headless"
   -D HASP_TARGET_PC=1
 

user_setups/linux/linux_fbdev.ini

@@ -4,6 +4,7 @@ extra_scripts =
   tools/linux_build_extra.py
 build_flags =
   ${env.build_flags}
+  -std=c++14
   -D HASP_MODEL="Linux App"
   -D HASP_TARGET_PC=1
 

user_setups/linux/linux_headless.ini

@@ -4,6 +4,7 @@ extra_scripts =
   tools/linux_build_extra.py
 build_flags =
   ${env.build_flags}
+  -std=c++14
   -D HASP_MODEL="Linux Headless"
   -D HASP_TARGET_PC=1