feat: update @ratiosolver/coco to version 0.0.85; enhance MQTT configuration with maximum buffered messages and improve item handling in ItemsTable

Author: riccardodebenedictis

CMakeLists.txt

@@ -36,6 +36,7 @@ endif()
 if(BUILD_MQTT)
     option(MQTT_SECURE "Build MQTT secure connection" OFF)
     option(MQTT_AUTH "Build MQTT authentication" OFF)
+    set(MQTT_MAX_BUFFERED_MSGS 100 CACHE STRING "Maximum buffered messages when offline")
 endif()
 
 if(BUILD_LLM)
@@ -71,7 +72,9 @@ message(STATUS "Build CoCo server: ${BUILD_COCO_SERVER}")
 message(STATUS "Build Firebase Cloud Messaging: ${BUILD_FCM}")
 message(STATUS "Build MQTT middleware: ${BUILD_MQTT}")
 if(BUILD_MQTT)
+    message(STATUS "Build MQTT secure connection: ${MQTT_SECURE}")
     message(STATUS "Build MQTT authentication: ${MQTT_AUTH}")
+    message(STATUS "MQTT maximum buffered messages when offline: ${MQTT_MAX_BUFFERED_MSGS}")
 endif()
 message(STATUS "Build CoCo LLM: ${BUILD_LLM}")
 if(BUILD_COCO_SERVER)
@@ -149,7 +152,7 @@ if(BUILD_MQTT)
     target_include_directories(CoCo PUBLIC ${PAHO_MQTT_CPP_INCLUDE_DIR} $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/mqtt>)
     target_sources(CoCo PRIVATE src/mqtt/coco_mqtt.cpp)
     target_link_libraries(CoCo PUBLIC PahoMqttCpp::paho-mqttpp3)
-    target_compile_definitions(CoCo PUBLIC BUILD_LISTENERS BUILD_MQTT)
+    target_compile_definitions(CoCo PUBLIC BUILD_LISTENERS BUILD_MQTT MQTT_MAX_BUFFERED_MSGS=${MQTT_MAX_BUFFERED_MSGS})
 
     if(MQTT_AUTH)
         target_compile_definitions(CoCo PUBLIC MQTT_AUTH)

gui/app/package-lock.json

@@ -14,7 +14,7 @@
     "vite": "^6.2.0"
   },
   "dependencies": {
-    "@ratiosolver/coco": "^0.0.84",
+    "@ratiosolver/coco": "^0.0.85",
     "@ratiosolver/flick": "^0.1.12",
     "@ratiosolver/solver": "^0.0.42",
     "bootstrap": "^5.3.6"

gui/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ratiosolver/coco",
-  "version": "0.0.84",
+  "version": "0.0.85",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

gui/coco/package-lock.json

@@ -193,7 +193,7 @@ export namespace coco {
       if (itm.types)
         for (const tn of itm.types)
           types.add(this.get_type(tn)!);
-      return new taxonomy.Item(id, types, itm.properties, value, (itm as any).slots);
+      return new taxonomy.Item(id, types, itm.properties, value);
     }
 
     get_type(name: string): taxonomy.Type { return this.types.get(name)!; }
@@ -565,27 +565,24 @@ export namespace coco {
       private readonly types: Set<Type> = new Set();
       private properties?: Record<string, unknown>;
       private datum?: Datum;
-      private slots?: Record<string, unknown>;
       private data: Datum[] = [];
       private readonly listeners = new Set<ItemListener>();
 
-      constructor(id: string, types: Set<Type>, properties?: Record<string, unknown>, value?: Datum, slots?: Record<string, unknown>) {
+      constructor(id: string, types: Set<Type>, properties?: Record<string, unknown>, value?: Datum) {
         this.id = id;
         for (const tp of types) {
           this.types.add(tp);
           tp._instances.add(this);
         }
         this.properties = properties;
         this.datum = value;
-        this.slots = slots;
       }
 
       get_id(): string { return this.id; }
       get_types(): Set<Type> { return this.types; }
       get_properties(): Record<string, unknown> | undefined { return this.properties; }
       get_datum(): Datum | undefined { return this.datum; }
       get_data(): Datum[] { return this.data; }
-      get_slots(): Record<string, unknown> | undefined { return this.slots; }
 
       _set_types(types: Set<Type>): void {
         for (const tp of this.types)
@@ -610,10 +607,6 @@ export namespace coco {
         this.data.push(datum);
         for (const l of this.listeners) l.new_value(this, datum);
       }
-      _set_slots(slots?: Record<string, unknown>): void {
-        this.slots = slots;
-        for (const l of this.listeners) l.slots_updated(this);
-      }
 
       add_item_listener(l: ItemListener): void { this.listeners.add(l); }
       remove_item_listener(l: ItemListener): void { this.listeners.delete(l); }
@@ -627,7 +620,6 @@ export namespace coco {
       properties_updated(item: Item): void;
       values_updated(item: Item): void;
       new_value(item: Item, v: Datum): void;
-      slots_updated(item: Item): void;
     }
 
     export function get_static_properties(item: Item): Map<string, Property<unknown>> {
@@ -707,26 +699,6 @@ export namespace coco {
       get_type(): EntityType { return this.type; }
       get_description(): string { return this.description; }
     }
-
-    export class Slot {
-
-      private readonly name: string;
-      private readonly type: EntityType;
-      private readonly description: string;
-      private readonly influence_context: boolean;
-
-      constructor(name: string, type: EntityType, description: string, influence_context: boolean) {
-        this.name = name;
-        this.type = type;
-        this.description = description;
-        this.influence_context = influence_context;
-      }
-
-      get_name(): string { return this.name; }
-      get_type(): EntityType { return this.type; }
-      get_description(): string { return this.description; }
-      is_influencing_context(): boolean { return this.influence_context; }
-    }
   }
 }
 

gui/coco/package.json

@@ -1,15 +1,18 @@
-import { App, PayloadComponent } from "@ratiosolver/flick";
+import { App, blink, PayloadComponent } from "@ratiosolver/flick";
 import { coco } from "../coco";
 import { Item } from "./item";
 
-export class ItemsTable extends PayloadComponent<HTMLDivElement, coco.taxonomy.Item[]> implements coco.CoCoListener {
+export class ItemsTable extends PayloadComponent<HTMLDivElement, coco.taxonomy.Item[]> implements coco.CoCoListener, coco.taxonomy.ItemListener {
 
   private readonly type: coco.taxonomy.Type;
   private readonly tbody: HTMLTableSectionElement;
+  private readonly items: Map<string, HTMLTableRowElement> = new Map();
+  private readonly static_props: Map<string, coco.taxonomy.Property<unknown>> | undefined
 
   constructor(type: coco.taxonomy.Type, items: coco.taxonomy.Item[] = Array.from(type.get_instances())) {
     super(document.createElement("div"), items);
     this.type = type;
+    this.static_props = type.get_static_properties();
 
     const table = document.createElement("table");
     table.classList.add("table", "table-hover", 'caption-top');
@@ -41,19 +44,52 @@ export class ItemsTable extends PayloadComponent<HTMLDivElement, coco.taxonomy.I
 
   new_type(_: coco.taxonomy.Type): void { }
   new_item(item: coco.taxonomy.Item): void {
-    if (item.get_types().has(this.type))
+    if (item.get_types().has(this.type)) {
       this.add_item(item);
+      item.add_item_listener(this);
+    }
   }
 
+  types_updated(item: coco.taxonomy.Item): void {
+    if (item.get_types().has(this.type)) {
+      if (!this.items.has(item.get_id()))
+        this.new_item(item);
+    } else {
+      const row = this.items.get(item.get_id());
+      if (row) {
+        this.tbody.removeChild(row);
+        this.items.delete(item.get_id());
+        item.remove_item_listener(this);
+      }
+    }
+  }
+  properties_updated(item: coco.taxonomy.Item): void {
+    const row = this.items.get(item.get_id());
+    if (row && this.static_props) {
+      const item_props = item.get_properties();
+      let col_idx = 1;
+      for (const [prop_name, prop] of this.static_props) {
+        const td = row.children.item(col_idx) as HTMLTableCellElement;
+        if (item_props && item_props[prop_name] !== undefined)
+          td.textContent = prop.get_type().to_string(item_props[prop_name]);
+        else
+          td.textContent = "";
+        col_idx += 1;
+      }
+      blink(row);
+    }
+  }
+  values_updated(_item: coco.taxonomy.Item): void { }
+  new_value(_item: coco.taxonomy.Item, _v: coco.taxonomy.Datum): void { }
+
   private add_item(item: coco.taxonomy.Item) {
-    const static_props = this.type.get_static_properties();
     const row = document.createElement("tr");
     row.style.cursor = "pointer";
     const id_td = document.createElement("td");
     id_td.textContent = item.get_id();
     row.appendChild(id_td);
-    if (static_props)
-      for (const [prop_name, prop] of static_props) {
+    if (this.static_props)
+      for (const [prop_name, prop] of this.static_props) {
         const td = document.createElement("td");
         const item_props = item.get_properties();
         if (item_props && item_props[prop_name] !== undefined)
@@ -63,6 +99,7 @@ export class ItemsTable extends PayloadComponent<HTMLDivElement, coco.taxonomy.I
         row.appendChild(td);
       }
     row.addEventListener("click", () => App.get_instance().selected_component(new Item(item)));
+    this.items.set(item.get_id(), row);
     this.tbody.appendChild(row);
   }
 

gui/coco/src/coco/coco.ts

@@ -12,7 +12,7 @@
 
 namespace coco
 {
-  constexpr const int QOS = 1; // Quality of Service level for MQTT messages
+  constexpr const int QOS = 1;                    // Quality of Service level for MQTT messages
 
   [[nodiscard]] inline std::string default_mqtt_uri() noexcept
   {

gui/coco/src/coco/components/items_table.ts

@@ -5,10 +5,11 @@
 
 namespace coco
 {
-    coco_mqtt::coco_mqtt(coco &cc, std::string_view mqtt_uri, std::string_view client_id) noexcept : coco_module(cc), listener(cc), client(mqtt_uri.data(), client_id.data())
+    coco_mqtt::coco_mqtt(coco &cc, std::string_view mqtt_uri, std::string_view client_id) noexcept : coco_module(cc), listener(cc), client(mqtt_uri.data(), client_id.data(), MQTT_MAX_BUFFERED_MSGS)
     {
         conn_opts.set_keep_alive_interval(20);
         conn_opts.set_clean_session(true);
+        conn_opts.set_automatic_reconnect(true);
         conn_opts.set_mqtt_version(MQTTVERSION_5);
 #ifdef MQTT_AUTH
         LOG_DEBUG("Setting MQTT authentication");
@@ -55,26 +56,17 @@ namespace coco
 
         mqtt::subscribe_options opts;
         opts.set_no_local(true); // Prevent receiving messages from self
+        [[maybe_unused]] size_t item_count = 0;
         for (auto &itm : get_coco().get_items())
         {
+            LOG_TRACE("Subscribing/publishing item " << ++item_count << "/" << get_coco().get_items().size());
             client.publish(COCO_NAME "/items/" + itm.get().get_id(), itm.get().to_json().dump(), QOS, true); // Publish each item
             client.subscribe(COCO_NAME "/data/" + itm.get().get_id(), QOS, opts);                            // Subscribe to data updates for each item
         }
     }
     void coco_mqtt::on_connection_lost(const std::string &cause)
     {
         LOG_ERR("Connection lost: " << cause);
-        std::this_thread::sleep_for(std::chrono::milliseconds(2500));
-        LOG_DEBUG("Reconnecting to MQTT broker...");
-        try
-        {
-            client.connect(conn_opts);
-            LOG_DEBUG("Reconnected to MQTT broker");
-        }
-        catch (const mqtt::exception &e)
-        {
-            LOG_ERR("Failed to reconnect: " << e.what());
-        }
     }
 
     void coco_mqtt::created_type(const type &tp)