From 9511f08d2b58d3a0d29bb3cce658545289ea5292 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Wed, 8 Oct 2025 09:43:59 +0200
Subject: [PATCH 01/14] don't create Builders on heap, use temporary objects
 instead

---
 library.json |  2 +-
 src/esp.h    | 18 +++++++++---------
 src/ha.h     | 28 +++-------------------------
 src/mqtt.h   |  1 -
 4 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/library.json b/library.json
index 0a4a586..be1d133 100644
--- a/library.json
+++ b/library.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/platformio/platformio-core/develop/platformio/assets/schema/library.json",
   "name": "ha-mqtt",
-  "version": "1.13.0",
+  "version": "2.0.0",
   "description": "Home Assistant classes for integration with MQTT auto discovery",
   "repository": {
     "type": "git",
diff --git a/src/esp.h b/src/esp.h
index 4753eca..9b78bdb 100644
--- a/src/esp.h
+++ b/src/esp.h
@@ -22,7 +22,7 @@ namespace HaESP {
         ESP.getHeapStats(&hfree, &hmax, &hfrag);
 
         char value[128];
-        snprintf_P(value, sizeof(value),  PSTR("{\"fragmentation\":%d,\"heap\":{\"Heap free\":\"%d B\",\"Heap max free block\":\"%d B\"}}"), hfrag, hfree, hmax);
+        snprintf_P(value, sizeof(value), PSTR("{\"fragmentation\":%d,\"heap\":{\"Heap free\":\"%d B\",\"Heap max free block\":\"%d B\"}}"), hfrag, hfree, hmax);
         GenericSensor::mapSensors["heap_fragmentation"]->updateState(value);
         GenericSensor::mapSensors["heap_free"]->updateState(to_string(hfree).c_str());
         GenericSensor::mapSensors["heap_max_free_block"]->updateState(to_string(hmax).c_str());
@@ -42,19 +42,19 @@ namespace HaESP {
 
     template <class T>
     Builder<T>& heapStats(Builder<T>& builder) {
-        builder.addDiagnostic(Builder<Sensor>::instance(new Sensor{ "Heap fragmentation", "heap_fragmentation" })
+        builder.addDiagnostic(Builder<Sensor>(new Sensor{ "Heap fragmentation", "heap_fragmentation" })
             .withUnitMeasure("%")
             .withPrecision(0)
             .withValueTemplate("{{ value_json.fragmentation }}")
             .withJsonAttributes("{{ value_json.heap | tojson }}")
             .build());
-        builder.addDiagnostic(Builder<Sensor>::instance(new Sensor{ "Heap free", "heap_free" })
+        builder.addDiagnostic(Builder<Sensor>(new Sensor{ "Heap free", "heap_free" })
             .withDeviceClass("data_size")
             .withUnitMeasure("B")
             .withPrecision(0)
             .build()
         );
-        builder.addDiagnostic(Builder<Sensor>::instance(new Sensor{ "Heap max free block", "heap_max_free_block" })
+        builder.addDiagnostic(Builder<Sensor>(new Sensor{ "Heap max free block", "heap_max_free_block" })
             .withDeviceClass("data_size")
             .withUnitMeasure("B")
             .withPrecision(0)
@@ -66,14 +66,14 @@ namespace HaESP {
 
     template <class T>
     Builder<T>& restartInfo(Builder<T>& builder) {
-        builder.addDiagnostic(Builder<Sensor>::instance((new Sensor{ "Restart reason", "restart_reason" })).build());
+        builder.addDiagnostic((new Sensor{ "Restart reason", "restart_reason" }));
         activeSensors.restartInfo = true;
         return builder;
     }
 
     template <class T>
     Builder<T>& wifiInfo(Builder<T>& builder) {
-        builder.addDiagnostic(Builder<Sensor>::instance((
+        builder.addDiagnostic(Builder<Sensor>((
             new Sensor{ "WiFi Signal (RSSI)", "wifi_signal_strength" }))
             .withDeviceClass("signal_strength")
             .withUnitMeasure("dBm")
@@ -85,12 +85,12 @@ namespace HaESP {
     }
 
     Builder<Button>& restartButton() {
-        return Builder<Button>::instance(new Button{"Restart", "restart",
+        return (new Builder<Button>(new Button{"Restart", "restart",
             [](const char* msg) {
                 if (strcmp("PRESS", msg) == 0) tRestart.restartDelayed();
             }
-        })
-        .withIcon("mdi:restart");
+        }))
+        ->withIcon("mdi:restart");
     }
 
     void enableSensors() {
diff --git a/src/ha.h b/src/ha.h
index 465d15c..10eac93 100644
--- a/src/ha.h
+++ b/src/ha.h
@@ -385,38 +385,16 @@ namespace Ha {
         }
     };
 
-    struct AbstractBuilder {
-        inline static List<AbstractBuilder> builders;
-
-        static void deleteAll() {
-            builders.forEach([](AbstractBuilder* builder) { delete builder; });
-            builders.empty();
-        }
-
-    protected:
-        AbstractBuilder() {
-            builders.add(this);
-        }
-    };
-
     template <class T>
-    struct Builder : AbstractBuilder {
+    struct Builder {
         T* cmp;
 
-        Builder(T* cmp) : AbstractBuilder(), cmp(cmp) {}
+        Builder(T* cmp) : cmp(cmp) {}
 
-        Builder(const char* id) : AbstractBuilder() {
+        Builder(const char* id) {
             cmp = new T{ id };
         }
 
-        static Builder& instance(T* c) {
-            return *(new Builder<T>(c));
-        }
-
-        static Builder& instance(const char* id) {
-            return *(new Builder<T>(id));
-        }
-
         T* build() {
             return static_cast<T*>(cmp);
         }
diff --git a/src/mqtt.h b/src/mqtt.h
index c8131d9..d3bddfa 100644
--- a/src/mqtt.h
+++ b/src/mqtt.h
@@ -30,7 +30,6 @@ namespace Mqtt {
         static bool firstTime = true;
         if (firstTime) {
             Component::components.forEach([](Component* c) { c->publishConfig(); });
-            AbstractBuilder::deleteAll();
             HaESP::enableSensors();
             firstTime = false;
         }

From 2b23bbf178d2ddbebbe184dff1671e5341bff981 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Wed, 8 Oct 2025 10:14:59 +0200
Subject: [PATCH 02/14] fix tests

---
 src/ha.h                                |  2 +-
 src/mqtt.h                              |  2 +-
 test/native/ha/test_components/main.cpp | 16 +++++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/ha.h b/src/ha.h
index 10eac93..c8c568a 100644
--- a/src/ha.h
+++ b/src/ha.h
@@ -12,7 +12,7 @@ using namespace std;
 #define BASE_TOPIC      MAIN_DEVICE_ID "/%s"
 
 namespace Ha {
-    uint16(*publisher)(const char*, const char*);
+    uint16_t (*publisher)(const char*, const char*);
     typedef void (*onMessage)(const char*);
 
     struct Config {
diff --git a/src/mqtt.h b/src/mqtt.h
index d3bddfa..9aa6886 100644
--- a/src/mqtt.h
+++ b/src/mqtt.h
@@ -22,7 +22,7 @@ namespace Mqtt {
         client.disconnect();
     }
 
-    uint16 publish(const char* topic, const char* message) {
+    uint16_t publish(const char* topic, const char* message) {
         return client.publish(topic, 0, true, message);
     }
 
diff --git a/test/native/ha/test_components/main.cpp b/test/native/ha/test_components/main.cpp
index 1fe6f05..785a2d7 100644
--- a/test/native/ha/test_components/main.cpp
+++ b/test/native/ha/test_components/main.cpp
@@ -8,7 +8,9 @@
 using namespace Ha;
 
 void setUp(void) {
-    // set stuff up here
+    Ha::publisher = [](const char* topic, const char* message) -> uint16_t {
+        return 0;
+    };
 }
 
 void tearDown(void) {
@@ -38,7 +40,7 @@ void testButton(void) {
     b.buildConfig(doc);
 
     TEST_ASSERT_EQUAL_STRING(MAIN_DEVICE_ID"_id", doc["unique_id"]);
-    TEST_ASSERT_EQUAL_STRING("homeassistant/button/" MAIN_DEVICE_ID "/id/set", doc["command_topic"]);
+    TEST_ASSERT_EQUAL_STRING(MAIN_DEVICE_ID "/id/set", doc["command_topic"]);
     TEST_ASSERT_FALSE(doc["retain"]);
     TEST_ASSERT_EQUAL_STRING("a_name", doc["name"]);
     TEST_ASSERT_EQUAL_STRING(NULL, doc["device_class"]);
@@ -53,14 +55,14 @@ void testSensor(void) {
     s.buildConfig(doc);
 
     TEST_ASSERT_EQUAL_STRING(MAIN_DEVICE_ID"_id", doc["unique_id"]);
-    TEST_ASSERT_EQUAL_STRING("homeassistant/sensor/" MAIN_DEVICE_ID "/id/state", doc["state_topic"]);
+    TEST_ASSERT_EQUAL_STRING(MAIN_DEVICE_ID "/id/state", doc["state_topic"]);
     TEST_ASSERT_EQUAL_STRING("a_name", doc["name"]);
     TEST_ASSERT_EQUAL_STRING(NULL, doc["device_class"]);
     TEST_ASSERT_EQUAL_STRING(NULL, doc["entity_category"]);
     TEST_ASSERT_EQUAL_STRING(NULL, doc["unit_of_measurement"]);
     TEST_ASSERT_EQUAL_STRING(NULL, doc["value_template"]);
     TEST_ASSERT_EQUAL_INT(0, doc["suggested_display_precision"]);
-    TEST_ASSERT_NOT_NULL(Sensor::mapSensors["id"]);
+    TEST_ASSERT_NOT_NULL(GenericSensor::mapSensors["id"]);
 }
 
 void testNumericSensor1(void) {
@@ -90,7 +92,7 @@ void testSwitch(void) {
     s.buildConfig(doc);
     
     TEST_ASSERT_EQUAL_STRING(MAIN_DEVICE_ID"_id", doc["unique_id"]);
-    TEST_ASSERT_EQUAL_STRING("homeassistant/switch/" MAIN_DEVICE_ID "/id/set", doc["command_topic"]);
+    TEST_ASSERT_EQUAL_STRING(MAIN_DEVICE_ID "/id/set", doc["command_topic"]);
     TEST_ASSERT_FALSE(doc["retain"]);
     TEST_ASSERT_EQUAL_STRING("a_name", doc["name"]);
     TEST_ASSERT_EQUAL_STRING(NULL, doc["device_class"]);
@@ -107,7 +109,7 @@ void testSwitchWithState(void) {
     StaticJsonDocument<256> doc;
     s.buildConfig(doc);
     
-    TEST_ASSERT_EQUAL_STRING("homeassistant/switch/" MAIN_DEVICE_ID "/id/state", doc["state_topic"]);
+    TEST_ASSERT_EQUAL_STRING(MAIN_DEVICE_ID "/id/state", doc["state_topic"]);
 }
 
 void testNumber(void) {
@@ -121,7 +123,7 @@ void testNumber(void) {
     TEST_ASSERT_EQUAL_INT16(100, doc["max"]);
     TEST_ASSERT_EQUAL_INT16(1, doc["step"]);
     
-    TEST_ASSERT_EQUAL_STRING("homeassistant/number/" MAIN_DEVICE_ID "/id/set", doc["command_topic"]);
+    TEST_ASSERT_EQUAL_STRING(MAIN_DEVICE_ID "/id/set", doc["command_topic"]);
     TEST_ASSERT_FALSE(doc["retain"]);
     TEST_ASSERT_EQUAL_STRING("a_name", doc["name"]);
     TEST_ASSERT_EQUAL_STRING(NULL, doc["device_class"]);

From 5bf3db20da89767c330472ead706b02531a9f41d Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Wed, 8 Oct 2025 11:03:28 +0200
Subject: [PATCH 03/14] add test for BinarySensor

---
 test/native/ha/test_components/main.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/native/ha/test_components/main.cpp b/test/native/ha/test_components/main.cpp
index 785a2d7..aa2917e 100644
--- a/test/native/ha/test_components/main.cpp
+++ b/test/native/ha/test_components/main.cpp
@@ -193,6 +193,21 @@ void testBatterySensor(void) {
     TEST_ASSERT_EQUAL_INT(2, doc["suggested_display_precision"]);
 }
 
+void testBinarySensor(void) {
+    BinarySensor s("id", "a_name");
+
+    StaticJsonDocument<256> doc;
+    s.buildConfig(doc);
+    
+    TEST_ASSERT_EQUAL_STRING(MAIN_DEVICE_ID"_id", doc["unique_id"]);
+    TEST_ASSERT_EQUAL_STRING(MAIN_DEVICE_ID "/id/state", doc["state_topic"]);
+    TEST_ASSERT_EQUAL_STRING("a_name", doc["name"]);
+    TEST_ASSERT_EQUAL_STRING(NULL, doc["device_class"]);
+    TEST_ASSERT_EQUAL_STRING(NULL, doc["entity_category"]);
+    TEST_ASSERT_EQUAL_STRING(NULL, doc["value_template"]);
+    TEST_ASSERT_NOT_NULL(GenericSensor::mapSensors["id"]);
+}
+
 int main(int argc, char **argv) {
     UNITY_BEGIN();
     RUN_TEST(testDevice);
@@ -208,5 +223,6 @@ int main(int argc, char **argv) {
     RUN_TEST(testSwitch);
     RUN_TEST(testSwitchWithState);
     RUN_TEST(testNumber);
+    RUN_TEST(testBinarySensor);
     return UNITY_END();
 }

From a23bf27c5003b5c5b407727667eea42d3f99ad32 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Tue, 7 Oct 2025 18:58:39 +0200
Subject: [PATCH 04/14] empty list of components, it is not needed after the
 config has been published on MQTT

---
 src/list.h                     | 6 +++++-
 src/mqtt.h                     | 5 ++---
 test/native/test_list/main.cpp | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/list.h b/src/list.h
index e4c000f..bf87503 100644
--- a/src/list.h
+++ b/src/list.h
@@ -13,7 +13,7 @@ struct List {
 
     void add(T* t) {
         Container* c = new Container{t};
-        first == nullptr ? first = c : last->next = c;
+        isEmpty() ? first = c : last->next = c;
         last = c;
     }
 
@@ -33,4 +33,8 @@ struct List {
         first = last = nullptr;
     }
 
+    bool isEmpty() {
+        return first == nullptr;
+    }
+
 };
diff --git a/src/mqtt.h b/src/mqtt.h
index 9aa6886..725f162 100644
--- a/src/mqtt.h
+++ b/src/mqtt.h
@@ -27,11 +27,10 @@ namespace Mqtt {
     }
 
     void publishInit() {
-        static bool firstTime = true;
-        if (firstTime) {
+        if (!Component::components.isEmpty()) {
             Component::components.forEach([](Component* c) { c->publishConfig(); });
+            Component::components.empty();
             HaESP::enableSensors();
-            firstTime = false;
         }
     }
 
diff --git a/test/native/test_list/main.cpp b/test/native/test_list/main.cpp
index d80b4b1..4e4bb15 100644
--- a/test/native/test_list/main.cpp
+++ b/test/native/test_list/main.cpp
@@ -30,6 +30,7 @@ void test_empty(void) {
     list.empty();
     TEST_ASSERT_EQUAL_PTR(nullptr, list.first);
     TEST_ASSERT_EQUAL_PTR(list.first, list.last);
+    TEST_ASSERT_TRUE(list.isEmpty());
 }
 
 int main(int argc, char **argv) {

From 98fbf2a55e6884a69742b4c0ac6b97aeb5e2b9e4 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Wed, 8 Oct 2025 14:32:49 +0200
Subject: [PATCH 05/14] add pre-configured button for updating the heap
 statistics

---
 src/esp.h | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/esp.h b/src/esp.h
index 9b78bdb..a438d5c 100644
--- a/src/esp.h
+++ b/src/esp.h
@@ -47,19 +47,24 @@ namespace HaESP {
             .withPrecision(0)
             .withValueTemplate("{{ value_json.fragmentation }}")
             .withJsonAttributes("{{ value_json.heap | tojson }}")
-            .build());
-        builder.addDiagnostic(Builder<Sensor>(new Sensor{ "Heap free", "heap_free" })
+            .build())
+        .addDiagnostic(Builder<Sensor>(new Sensor{ "Heap free", "heap_free" })
             .withDeviceClass("data_size")
             .withUnitMeasure("B")
             .withPrecision(0)
-            .build()
-        );
-        builder.addDiagnostic(Builder<Sensor>(new Sensor{ "Heap max free block", "heap_max_free_block" })
+            .build())
+        .addDiagnostic(Builder<Sensor>(new Sensor{ "Heap max free block", "heap_max_free_block" })
             .withDeviceClass("data_size")
             .withUnitMeasure("B")
             .withPrecision(0)
-            .build()
-        );
+            .build())
+        .addSecondary(new Button{"Update heap stats", "update_heap_stats",
+            [](const char* msg) {
+                if ((strcmp("PRESS", msg) == 0) && tHeap.isEnabled()) {
+                    tHeap.cancel();
+                    tHeap.restart();
+                }}});
+
         activeSensors.heapStats = true;
         return builder;
     }

From 9093996ec97285c566c88f5d7be2f71f293ba3c4 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Wed, 8 Oct 2025 17:14:06 +0200
Subject: [PATCH 06/14] use standard fixed length types

---
 src/esp.h |  2 +-
 src/ha.h  | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/esp.h b/src/esp.h
index a438d5c..f7cfbce 100644
--- a/src/esp.h
+++ b/src/esp.h
@@ -22,7 +22,7 @@ namespace HaESP {
         ESP.getHeapStats(&hfree, &hmax, &hfrag);
 
         char value[128];
-        snprintf_P(value, sizeof(value), PSTR("{\"fragmentation\":%d,\"heap\":{\"Heap free\":\"%d B\",\"Heap max free block\":\"%d B\"}}"), hfrag, hfree, hmax);
+        snprintf_P(value, sizeof(value), PSTR("{\"fragmentation\":%lu,\"heap\":{\"Heap free\":\"%lu B\",\"Heap max free block\":\"%u B\"}}"), hfrag, hfree, hmax);
         GenericSensor::mapSensors["heap_fragmentation"]->updateState(value);
         GenericSensor::mapSensors["heap_free"]->updateState(to_string(hfree).c_str());
         GenericSensor::mapSensors["heap_max_free_block"]->updateState(to_string(hmax).c_str());
diff --git a/src/ha.h b/src/ha.h
index c8c568a..d559d19 100644
--- a/src/ha.h
+++ b/src/ha.h
@@ -258,14 +258,14 @@ namespace Ha {
     };
 
     struct Number : Component, StatefulCommand {
-        unsigned int min = 1;
-        unsigned int max = 100;
-        unsigned int step = 1;
+        uint16_t min = 1;
+        uint16_t max = 100;
+        uint16_t step = 1;
         const char* unitMeasure = nullptr;
 
         Number(const char* name, const char* id, onMessage f) : Component(id, name, "number"), StatefulCommand(this, f) {}
 
-        void updateState(unsigned int value) {
+        void updateState(uint16_t value) {
             State::updateState(to_string(value).c_str());
         }
 
@@ -280,13 +280,13 @@ namespace Ha {
     };
 
     struct Text : Component, StatefulCommand {
-        unsigned int min = 1;
-        unsigned int max = 100;
+        uint16_t min = 1;
+        uint16_t max = 100;
         const char* pattern = nullptr;
 
         Text(const char* name, const char* id, onMessage f) : Component(id, name, "text"), StatefulCommand(this, f) {}
 
-        void updateState(unsigned int value) {
+        void updateState(uint16_t value) {
             State::updateState(to_string(value).c_str());
         }
 
@@ -315,7 +315,7 @@ namespace Ha {
     };
 
     struct BinarySensor : GenericSensor {
-        unsigned int off_delay_seconds = 0;
+        uint16_t off_delay_seconds = 0;
 
         BinarySensor(const char* id, const char* name = nullptr) : GenericSensor(id, name, "binary_sensor") {}
 
@@ -327,7 +327,7 @@ namespace Ha {
 
     struct Sensor : GenericSensor {
         const char* unitMeasure = nullptr;
-        unsigned int precision = 2;
+        uint16_t precision = 2;
         SensorStateClass sensorStateClass;
 
         Sensor(const char* name, const char* id) : GenericSensor(id, name, "sensor") {}
@@ -419,7 +419,7 @@ namespace Ha {
             return *this;
         }
 
-        Builder& withPrecision(unsigned int value) {
+        Builder& withPrecision(uint16_t value) {
             cmp->precision = value;
             return *this;
         }
@@ -429,22 +429,22 @@ namespace Ha {
             return *this;
         }
 
-        Builder& withMin(unsigned int value) {
+        Builder& withMin(uint16_t value) {
             cmp->min = value;
             return *this;
         }
 
-        Builder& withMax(unsigned int value) {
+        Builder& withMax(uint16_t value) {
             cmp->max = value;
             return *this;
         }
 
-        Builder& withStep(unsigned int value) {
+        Builder& withStep(uint16_t value) {
             cmp->step = value;
             return *this;
         }
 
-        Builder& withOffDelaySeconds(unsigned int value) {
+        Builder& withOffDelaySeconds(uint16_t value) {
             cmp->off_delay_seconds = value;
             return *this;
         }

From 7d8fe51845cb14505e9e774a6dabae1e485ad20f Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Wed, 8 Oct 2025 19:58:25 +0200
Subject: [PATCH 07/14] webserver: separate setup from start

---
 src/webserver.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/webserver.h b/src/webserver.h
index 01c3db7..d16ce68 100644
--- a/src/webserver.h
+++ b/src/webserver.h
@@ -6,9 +6,8 @@
 #include <ESPAsyncWebServer.h>
 #include "ha.h"
 
-AsyncWebServer server(80);
-
 namespace WebServer {
+    AsyncWebServer server(80);
 
     void setup() {
 
@@ -46,7 +45,9 @@ namespace WebServer {
         server.onNotFound([](AsyncWebServerRequest *request) {
             request->send(404, "text/plain", "Not found");
             });
+    }
 
+    void start() {
         server.begin();
     }
 

From adf1629aad0ab196ca1957d5a264cfbb87bf2603 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Thu, 9 Oct 2025 09:12:51 +0200
Subject: [PATCH 08/14] add support for specifying entity_id on HA side,
 instead of being autogenerated based on the name

---
 src/ha.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/ha.h b/src/ha.h
index d559d19..8ebbc6b 100644
--- a/src/ha.h
+++ b/src/ha.h
@@ -75,6 +75,7 @@ namespace Ha {
 
         const char* id = nullptr;
         const char* type = nullptr;
+        const char* entityId = nullptr;
 
         const char* name = nullptr;
         const char* entityCategory = nullptr;
@@ -111,6 +112,7 @@ namespace Ha {
     protected:
         void buildConfig(JsonDocument& jsonDoc) override {
             if (mainDevice) mainDevice->buildConfig(jsonDoc);
+            if (entityId) jsonDoc["object_id"] = entityId;
             if (entityCategory) jsonDoc["entity_category"] = entityCategory;
             if (deviceClass) jsonDoc["device_class"] = deviceClass;
             if (icon) jsonDoc["icon"] = icon;
@@ -404,6 +406,11 @@ namespace Ha {
             return *this;
         }
 
+        Builder& withEntityId(const char* value) {
+            cmp->entityId = value;
+            return *this;
+        }
+
         Builder& withUnitMeasure(const char* value) {
             cmp->unitMeasure = value;
             return *this;

From 962300712fc1d82abde307b3a8c0fb8868668515 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 10 Oct 2025 18:28:27 +0200
Subject: [PATCH 09/14] use configTopic as a temporary object

---
 src/ha.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/ha.h b/src/ha.h
index 8ebbc6b..ad94e11 100644
--- a/src/ha.h
+++ b/src/ha.h
@@ -96,11 +96,15 @@ namespace Ha {
             char message[JSON_SIZE] = {};
             serializeJson(jsonDoc, message);
 
+            auto configTopic = buildConfigTopic();
             publisher(configTopic, message);
+            delete configTopic;
         }
 
         void publishCleanupConfig() {
+            auto configTopic = buildConfigTopic();
             publisher(configTopic, "");
+            delete configTopic;
         }
 
         void toJson(JsonDocument& jsonDoc) {
@@ -119,11 +123,8 @@ namespace Ha {
             jsonDoc["name"] = name;
            
             buildUniqueId(jsonDoc);
-            buildConfigTopic();
         }
     private:
-        char configTopic[TOPIC_SIZE] = {};
-
         void buildUniqueId(JsonDocument& jsonDoc) {
             char uniqueId[50];
             if (multiValueComponent && deviceClass) {
@@ -134,12 +135,14 @@ namespace Ha {
             jsonDoc["unique_id"] = uniqueId;
         }
 
-        void buildConfigTopic() {
+        const char* buildConfigTopic() {
+            char* configTopic = new char[TOPIC_SIZE];
             if (multiValueComponent && deviceClass) {
-                snprintf(configTopic, sizeof(configTopic), CONFIG_TOPIC"_%s""/config", type, deviceClass, id);
+                snprintf(configTopic, TOPIC_SIZE, CONFIG_TOPIC"_%s""/config", type, deviceClass, id);
             } else {
-                snprintf(configTopic, sizeof(configTopic), CONFIG_TOPIC"/config", type, id);
+                snprintf(configTopic, TOPIC_SIZE, CONFIG_TOPIC"/config", type, id);
             }
+            return configTopic;
         }
     };
 

From 149a722fc74c4204b84a8de2ac2f159bd8e3f004 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 10 Oct 2025 23:26:58 +0200
Subject: [PATCH 10/14] use commandTopic as a temporary object

---
 src/ha.h | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/ha.h b/src/ha.h
index ad94e11..4ed1409 100644
--- a/src/ha.h
+++ b/src/ha.h
@@ -152,9 +152,10 @@ namespace Ha {
         inline static unordered_map<string, Command*> mapCommandIds;
 
         Command(Component* cmp, onMessage f) : f(f), cmp(cmp) {
-            snprintf(commandTopic, sizeof(commandTopic),  BASE_TOPIC"/set", cmp->id);
+            auto commandTopic = buildTopic();
             mapCommandTopics.insert({ string(commandTopic), this });
             mapCommandIds.insert({ string(cmp->id), this });
+            delete commandTopic;
         }
 
         virtual void onCommand(const char* msg) {
@@ -166,15 +167,22 @@ namespace Ha {
         }
 
     protected:
-        char commandTopic[TOPIC_SIZE] = {};
         onMessage f;
 
         void buildConfig(JsonDocument& jsonDoc) override {
-            jsonDoc["command_topic"] = (const char*)commandTopic;
+            auto commandTopic = buildTopic();
+            jsonDoc["command_topic"] = commandTopic;
+            delete commandTopic;
             if (retain) jsonDoc["retain"] = true;
         }
     private:
         Component* cmp;
+
+        char* buildTopic() {
+            char* commandTopic = new char[TOPIC_SIZE];
+            snprintf(commandTopic, TOPIC_SIZE,  BASE_TOPIC"/set", cmp->id);
+            return commandTopic;
+        }
     };
 
     struct State : Config {

From 130f4eb6a2ea9ceadbdc988deedd5774e375dac9 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 10 Oct 2025 23:28:01 +0200
Subject: [PATCH 11/14] use a better name for restoreStateFrom...

---
 src/ha.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ha.h b/src/ha.h
index 4ed1409..d89a6be 100644
--- a/src/ha.h
+++ b/src/ha.h
@@ -186,27 +186,27 @@ namespace Ha {
     };
 
     struct State : Config {
-        char stateTopic[TOPIC_SIZE] = {};
+        char topic[TOPIC_SIZE] = {};
         const char* jsonAttributesTemplate = nullptr;
         const char* valueTemplate = nullptr;
 
         State(Component* cmp) : cmp(cmp) {}
 
         void withStateTopic() {
-            snprintf(stateTopic, sizeof(stateTopic),  BASE_TOPIC"/state", cmp->id);
+            snprintf(topic, sizeof(topic),  BASE_TOPIC"/state", cmp->id);
         }
 
         void updateState(const char* message) {
-            if (stateTopic[0]) publisher(stateTopic, message);
+            if (topic[0]) publisher(topic, message);
         }
 
     protected:
         void buildConfig(JsonDocument& jsonDoc) override {
-            if (stateTopic[0]) {
-                jsonDoc["state_topic"] = (const char*)stateTopic;
+            if (topic[0]) {
+                jsonDoc["state_topic"] = (const char*)topic;
                 if (jsonAttributesTemplate) {
                     jsonDoc["json_attributes_template"] = jsonAttributesTemplate;
-                    jsonDoc["json_attributes_topic"] = (const char*)stateTopic;
+                    jsonDoc["json_attributes_topic"] = (const char*)topic;
                 }
                 if (valueTemplate) jsonDoc["value_template"] = valueTemplate;
             }
@@ -220,9 +220,9 @@ namespace Ha {
 
         StatefulCommand(Component* cmp, onMessage f) : Command(cmp, f), State(cmp) {}
 
-        void restoreStateFromCommand() {
+        void restoreStateFromTopic() {
             withStateTopic();
-            mapRestoreStateTopics.insert({stateTopic, this});
+            mapRestoreStateTopics.insert({State::topic, this});
         }
 
     protected:
@@ -519,12 +519,12 @@ namespace Ha {
 
         [[deprecated("Use restoreStateFromCommand() instead")]]
         Builder& restoreFromState() {
-            cmp->restoreStateFromCommand();
+            cmp->restoreStateFromTopic();
             return *this;
         }
 
-        Builder& restoreStateFromCommand() {
-            cmp->restoreStateFromCommand();
+        Builder& restoreStateFromTopic() {
+            cmp->restoreStateFromTopic();
             return *this;
         }
     };

From 12663901ab40a584c71715d847111612b23e1991 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 10 Oct 2025 23:34:42 +0200
Subject: [PATCH 12/14] use precise length for storing state topic

---
 src/ha.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ha.h b/src/ha.h
index d89a6be..4f43010 100644
--- a/src/ha.h
+++ b/src/ha.h
@@ -186,14 +186,17 @@ namespace Ha {
     };
 
     struct State : Config {
-        char topic[TOPIC_SIZE] = {};
+        char* topic;
         const char* jsonAttributesTemplate = nullptr;
         const char* valueTemplate = nullptr;
 
-        State(Component* cmp) : cmp(cmp) {}
+        State(Component* cmp) : cmp(cmp) {
+            auto len = snprintf(nullptr, 0, BASE_TOPIC"/state", cmp->id);
+            topic = new char[len + 1];
+        }
 
         void withStateTopic() {
-            snprintf(topic, sizeof(topic),  BASE_TOPIC"/state", cmp->id);
+            sprintf(topic, BASE_TOPIC"/state", cmp->id);
         }
 
         void updateState(const char* message) {

From fd40969c20de28a8ac733e3a90a24ce154427c7c Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Sat, 11 Oct 2025 14:27:58 +0200
Subject: [PATCH 13/14] use unique_ptr to avoid manual deletion

---
 src/ha.h | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/ha.h b/src/ha.h
index 4f43010..2a3b4e9 100644
--- a/src/ha.h
+++ b/src/ha.h
@@ -97,14 +97,12 @@ namespace Ha {
             serializeJson(jsonDoc, message);
 
             auto configTopic = buildConfigTopic();
-            publisher(configTopic, message);
-            delete configTopic;
+            publisher(configTopic.get(), message);
         }
 
         void publishCleanupConfig() {
             auto configTopic = buildConfigTopic();
-            publisher(configTopic, "");
-            delete configTopic;
+            publisher(configTopic.get(), "");
         }
 
         void toJson(JsonDocument& jsonDoc) {
@@ -135,14 +133,14 @@ namespace Ha {
             jsonDoc["unique_id"] = uniqueId;
         }
 
-        const char* buildConfigTopic() {
-            char* configTopic = new char[TOPIC_SIZE];
+        unique_ptr<char[]> buildConfigTopic() {
+            unique_ptr<char[]> topic(new char[TOPIC_SIZE]);
             if (multiValueComponent && deviceClass) {
-                snprintf(configTopic, TOPIC_SIZE, CONFIG_TOPIC"_%s""/config", type, deviceClass, id);
+                snprintf(topic.get(), TOPIC_SIZE, CONFIG_TOPIC"_%s""/config", type, deviceClass, id);
             } else {
-                snprintf(configTopic, TOPIC_SIZE, CONFIG_TOPIC"/config", type, id);
+                snprintf(topic.get(), TOPIC_SIZE, CONFIG_TOPIC"/config", type, id);
             }
-            return configTopic;
+            return topic;
         }
     };
 
@@ -153,9 +151,8 @@ namespace Ha {
 
         Command(Component* cmp, onMessage f) : f(f), cmp(cmp) {
             auto commandTopic = buildTopic();
-            mapCommandTopics.insert({ string(commandTopic), this });
+            mapCommandTopics.insert({ string(commandTopic.get()), this });
             mapCommandIds.insert({ string(cmp->id), this });
-            delete commandTopic;
         }
 
         virtual void onCommand(const char* msg) {
@@ -171,17 +168,16 @@ namespace Ha {
 
         void buildConfig(JsonDocument& jsonDoc) override {
             auto commandTopic = buildTopic();
-            jsonDoc["command_topic"] = commandTopic;
-            delete commandTopic;
+            jsonDoc["command_topic"] = commandTopic.get();
             if (retain) jsonDoc["retain"] = true;
         }
     private:
         Component* cmp;
 
-        char* buildTopic() {
-            char* commandTopic = new char[TOPIC_SIZE];
-            snprintf(commandTopic, TOPIC_SIZE,  BASE_TOPIC"/set", cmp->id);
-            return commandTopic;
+        unique_ptr<char[]> buildTopic() {
+            unique_ptr<char[]> topic(new char[TOPIC_SIZE]);
+            snprintf(topic.get(), TOPIC_SIZE, BASE_TOPIC "/set", cmp->id);
+            return topic;
         }
     };
 

From d18d7553b9c88d7d7f6198606e3864197bf33a7c Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Sat, 11 Oct 2025 16:13:44 +0200
Subject: [PATCH 14/14] avoid using intermediate buffer to store config to
 publish

---
 src/ha.h                                |  8 ++------
 src/webserver.h                         |  4 ++--
 test/native/ha/test_components/main.cpp | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/ha.h b/src/ha.h
index 2a3b4e9..0bd6609 100644
--- a/src/ha.h
+++ b/src/ha.h
@@ -6,7 +6,7 @@
 
 using namespace std;
 
-#define JSON_SIZE       512
+#define JSON_SIZE       1024
 #define TOPIC_SIZE      255
 #define CONFIG_TOPIC    "homeassistant/%s/" MAIN_DEVICE_ID "/%s"
 #define BASE_TOPIC      MAIN_DEVICE_ID "/%s"
@@ -92,12 +92,8 @@ namespace Ha {
         void publishConfig() {
             StaticJsonDocument<JSON_SIZE> jsonDoc;
             buildConfig(jsonDoc);
-
-            char message[JSON_SIZE] = {};
-            serializeJson(jsonDoc, message);
-
             auto configTopic = buildConfigTopic();
-            publisher(configTopic.get(), message);
+            publisher(configTopic.get(), jsonDoc.as<string>().c_str());
         }
 
         void publishCleanupConfig() {
diff --git a/src/webserver.h b/src/webserver.h
index d16ce68..b9f0c81 100644
--- a/src/webserver.h
+++ b/src/webserver.h
@@ -30,10 +30,10 @@ namespace WebServer {
         server.on("/commands", HTTP_GET, [](AsyncWebServerRequest *request) {
             AsyncResponseStream *response = request->beginResponseStream("application/json");
             
-            DynamicJsonDocument jsonResponse(JSON_SIZE*10);
+            DynamicJsonDocument jsonResponse(5120);
             JsonArray array = jsonResponse.to<JsonArray>();
             for (auto it = Command::mapCommandIds.begin(); it != Command::mapCommandIds.end(); ++it) {
-                StaticJsonDocument<JSON_SIZE/2> jsonDoc;
+                StaticJsonDocument<256> jsonDoc;
                 it->second->toJson(jsonDoc);
                 array.add(jsonDoc);
             }
diff --git a/test/native/ha/test_components/main.cpp b/test/native/ha/test_components/main.cpp
index aa2917e..3cacb02 100644
--- a/test/native/ha/test_components/main.cpp
+++ b/test/native/ha/test_components/main.cpp
@@ -1,5 +1,6 @@
 #include <unity.h>
 #include <unordered_map>
+#include <memory>
 
 #define MAIN_DEVICE_ID "test"
 
@@ -208,6 +209,18 @@ void testBinarySensor(void) {
     TEST_ASSERT_NOT_NULL(GenericSensor::mapSensors["id"]);
 }
 
+void testPublisher(void) {
+    Ha::publisher = [](const char* topic, const char* message) -> uint16_t {
+        TEST_ASSERT_EQUAL_STRING("{\"name\":\"a_name\",\"unique_id\":\"test_id\",\"command_topic\":\"test/id/set\"}", message);
+        return 0;
+    };
+    Switch s("a_name", "id");
+
+    StaticJsonDocument<256> doc;
+    s.buildConfig(doc);
+    s.publishConfig();
+}
+
 int main(int argc, char **argv) {
     UNITY_BEGIN();
     RUN_TEST(testDevice);
@@ -224,5 +237,6 @@ int main(int argc, char **argv) {
     RUN_TEST(testSwitchWithState);
     RUN_TEST(testNumber);
     RUN_TEST(testBinarySensor);
+    RUN_TEST(testPublisher);
     return UNITY_END();
 }