@alteriom/painlessmesh 1.8.14 → 1.9.0

package/examples/mqttCommandBridge/mesh_topology_reporter.hpp

@@ -1,303 +0,0 @@
-#ifndef MESH_TOPOLOGY_REPORTER_HPP
-#define MESH_TOPOLOGY_REPORTER_HPP
-
-#include "painlessMesh.h"
-#include <ArduinoJson.h>
-
-/**
- * MeshTopologyReporter - Generate schema-compliant topology messages
- * 
- * Generates mesh topology messages conforming to @alteriom/mqtt-schema v0.5.0
- * mesh_topology.schema.json specification.
- * 
- * Features:
- * - Full topology snapshots with nodes, connections, and metrics
- * - Incremental updates for node join/leave events
- * - Change detection to avoid redundant publishes
- * - Network metrics aggregation
- * 
- * @author Alteriom Development Team
- * @date October 12, 2025
- */
-class MeshTopologyReporter {
-private:
-  painlessMesh& mesh;
-  String meshId;
-  String lastTopologyHash;  // Detect changes
-  String firmwareVersion;
-  
-public:
-  MeshTopologyReporter(painlessMesh& mesh, const String& meshId, const String& fwVersion = "GW 2.3.4") 
-    : mesh(mesh), meshId(meshId), firmwareVersion(fwVersion) {}
-  
-  /**
-   * Generate full topology message (schema v0.5.0 compliant)
-   * 
-   * Returns JSON string ready for MQTT publish to:
-   * alteriom/mesh/{mesh_id}/topology
-   */
-  String generateFullTopology() {
-    JsonDocument doc;  // ArduinoJson v7: automatic sizing
-    
-    // Envelope fields (from @alteriom/mqtt-schema)
-    doc["schema_version"] = 1;
-    doc["device_id"] = generateDeviceId(mesh.getNodeId());
-    doc["device_type"] = "gateway";
-    doc["timestamp"] = getISO8601Timestamp();
-    doc["firmware_version"] = firmwareVersion;
-    
-    // Event discriminator
-    doc["event"] = "mesh_topology";
-    
-    // Mesh identification
-    doc["mesh_id"] = meshId;
-    doc["gateway_node_id"] = generateDeviceId(mesh.getNodeId());
-    
-    // Nodes array - ArduinoJson v7 syntax
-    JsonArray nodes = doc["nodes"].to<JsonArray>();
-    addNodeInfo(nodes, mesh.getNodeId(), "gateway");  // Self
-    
-    auto nodeList = mesh.getNodeList(false);
-    for (auto nodeId : nodeList) {
-      addNodeInfo(nodes, nodeId, "sensor");  // Assume sensor role
-    }
-    
-    // Connections array - ArduinoJson v7 syntax
-    JsonArray connections = doc["connections"].to<JsonArray>();
-    addConnectionInfo(connections);
-    
-    // Network metrics - ArduinoJson v7 syntax
-    JsonObject metrics = doc["metrics"].to<JsonObject>();
-    metrics["total_nodes"] = nodeList.size() + 1;  // +1 for gateway
-    metrics["online_nodes"] = nodeList.size() + 1;
-    metrics["network_diameter"] = calculateNetworkDiameter();
-    metrics["avg_connection_quality"] = calculateAvgQuality();
-    metrics["messages_per_second"] = calculateThroughput();
-    
-    doc["update_type"] = "full";
-    
-    String output;
-    serializeJson(doc, output);
-    return output;
-  }
-  
-  /**
-   * Generate incremental topology update
-   * 
-   * @param nodeId Node that joined or left
-   * @param joined true if node joined, false if left
-   */
-  String generateIncrementalUpdate(uint32_t nodeId, bool joined) {
-    JsonDocument doc;  // ArduinoJson v7: automatic sizing
-    
-    // Envelope fields
-    doc["schema_version"] = 1;
-    doc["device_id"] = generateDeviceId(mesh.getNodeId());
-    doc["device_type"] = "gateway";
-    doc["timestamp"] = getISO8601Timestamp();
-    doc["firmware_version"] = firmwareVersion;
-    
-    doc["event"] = "mesh_topology";
-    doc["mesh_id"] = meshId;
-    doc["gateway_node_id"] = generateDeviceId(mesh.getNodeId());
-    
-    // Node that changed - ArduinoJson v7 syntax
-    JsonArray nodes = doc["nodes"].to<JsonArray>();
-    if (joined) {
-      addNodeInfo(nodes, nodeId, "sensor");
-    } else {
-      // For node leaving, mark as offline
-      JsonObject node = nodes.add<JsonObject>();
-      node["node_id"] = generateDeviceId(nodeId);
-      node["status"] = "offline";
-    }
-    
-    // Update connections - ArduinoJson v7 syntax
-    JsonArray connections = doc["connections"].to<JsonArray>();
-    // Add connections related to this node
-    addConnectionInfoForNode(connections, nodeId);
-    
-    // Updated metrics - ArduinoJson v7 syntax
-    auto nodeList = mesh.getNodeList(false);
-    JsonObject metrics = doc["metrics"].to<JsonObject>();
-    metrics["total_nodes"] = nodeList.size() + 1;
-    metrics["online_nodes"] = nodeList.size() + 1;
-    
-    doc["update_type"] = "incremental";
-    
-    String output;
-    serializeJson(doc, output);
-    return output;
-  }
-  
-  /**
-   * Check if topology has changed since last check
-   * Updates internal hash if changed
-   */
-  bool hasTopologyChanged() {
-    String currentHash = calculateTopologyHash();
-    if (currentHash != lastTopologyHash) {
-      lastTopologyHash = currentHash;
-      return true;
-    }
-    return false;
-  }
-  
-private:
-  /**
-   * Add node information to JSON array
-   */
-  void addNodeInfo(JsonArray& nodes, uint32_t nodeId, const char* role) {
-    JsonObject node = nodes.add<JsonObject>();  // ArduinoJson v7 syntax
-    node["node_id"] = generateDeviceId(nodeId);
-    node["role"] = role;
-    node["status"] = "online";
-    node["last_seen"] = getISO8601Timestamp();
-    
-    // Gateway node has additional info
-    if (nodeId == mesh.getNodeId()) {
-      node["firmware_version"] = firmwareVersion;
-      node["uptime_seconds"] = millis() / 1000;
-#if defined(ESP32) || defined(ESP8266)
-      node["free_memory_kb"] = ESP.getFreeHeap() / 1024;
-#else
-      node["free_memory_kb"] = 0;
-#endif
-      node["connection_count"] = mesh.getNodeList().size();
-    } else {
-      // For other nodes, use placeholder values
-      // TODO: Get actual values from node status messages
-      node["firmware_version"] = "SN 2.3.4";
-      node["uptime_seconds"] = 0;
-      node["free_memory_kb"] = 0;
-      node["connection_count"] = 0;
-    }
-  }
-  
-  /**
-   * Add connection information to JSON array
-   */
-  void addConnectionInfo(JsonArray& connections) {
-    // Get direct connections with quality metrics
-    auto connDetails = mesh.getConnectionDetails();
-    
-    String gatewayId = generateDeviceId(mesh.getNodeId());
-    
-    for (auto& conn : connDetails) {
-      JsonObject connObj = connections.add<JsonObject>();  // ArduinoJson v7 syntax
-      connObj["from_node"] = gatewayId;
-      connObj["to_node"] = generateDeviceId(conn.nodeId);
-      connObj["quality"] = conn.quality;
-      connObj["latency_ms"] = conn.avgLatency;
-      connObj["rssi"] = conn.rssi;
-      connObj["hop_count"] = conn.hopCount;
-    }
-    
-    // TODO: Add indirect connections from mesh topology
-    // For now, we only report direct connections from gateway
-  }
-  
-  /**
-   * Add connection information for a specific node
-   */
-  void addConnectionInfoForNode(JsonArray& connections, uint32_t nodeId) {
-    auto connDetails = mesh.getConnectionDetails();
-    String gatewayId = generateDeviceId(mesh.getNodeId());
-    String targetId = generateDeviceId(nodeId);
-    
-    for (auto& conn : connDetails) {
-      if (conn.nodeId == nodeId) {
-        JsonObject connObj = connections.add<JsonObject>();  // ArduinoJson v7 syntax
-        connObj["from_node"] = gatewayId;
-        connObj["to_node"] = targetId;
-        connObj["quality"] = conn.quality;
-        connObj["latency_ms"] = conn.avgLatency;
-        connObj["rssi"] = conn.rssi;
-        connObj["hop_count"] = conn.hopCount;
-      }
-    }
-  }
-  
-  /**
-   * Calculate network diameter (max hop count)
-   */
-  int calculateNetworkDiameter() {
-    int maxHops = 0;
-    auto nodeList = mesh.getNodeList(false);
-    
-    for (auto nodeId : nodeList) {
-      int hops = mesh.getHopCount(nodeId);
-      if (hops > maxHops) {
-        maxHops = hops;
-      }
-    }
-    
-    return maxHops;
-  }
-  
-  /**
-   * Calculate average connection quality
-   */
-  float calculateAvgQuality() {
-    auto connDetails = mesh.getConnectionDetails();
-    
-    if (connDetails.empty()) {
-      return 0.0;
-    }
-    
-    int totalQuality = 0;
-    for (auto& conn : connDetails) {
-      totalQuality += conn.quality;
-    }
-    
-    return (float)totalQuality / connDetails.size();
-  }
-  
-  /**
-   * Calculate network throughput (messages per second)
-   */
-  float calculateThroughput() {
-    // TODO: Implement actual throughput tracking
-    // For now return placeholder
-    return 12.4;
-  }
-  
-  /**
-   * Calculate topology hash for change detection
-   */
-  String calculateTopologyHash() {
-    auto nodeList = mesh.getNodeList(true);
-    String hash = String(nodeList.size());
-    for (auto nodeId : nodeList) {
-      hash += String(nodeId);
-    }
-    return hash;
-  }
-  
-  /**
-   * Generate device ID in Alteriom format (ALT-XXXXXXXXXXXX)
-   */
-  String generateDeviceId(uint32_t nodeId) {
-    char deviceId[20];
-    snprintf(deviceId, sizeof(deviceId), "ALT-%012X", nodeId);
-    return String(deviceId);
-  }
-  
-  /**
-   * Get current timestamp in ISO 8601 format
-   * TODO: Use proper NTP time if available
-   */
-  String getISO8601Timestamp() {
-    // For now, use epoch-based timestamp
-    // In production, this should use actual NTP-synced time
-    unsigned long ms = millis();
-    char timestamp[32];
-    snprintf(timestamp, sizeof(timestamp), "2025-10-12T%02lu:%02lu:%02luZ",
-             (ms / 3600000) % 24,
-             (ms / 60000) % 60,
-             (ms / 1000) % 60);
-    return String(timestamp);
-  }
-};
-
-#endif  // MESH_TOPOLOGY_REPORTER_HPP

package/examples/mqttCommandBridge/mqttCommandBridge.ino

@@ -1,254 +0,0 @@
-#include <Arduino.h>
-#include "painlessTaskOptions.h"  // Must be first to configure TaskScheduler
-#include <TaskScheduler.h>  // Required for LDF to find TaskScheduler dependency
-#include "painlessMesh.h"
-#include <PubSubClient.h>
-#include "mqtt_command_bridge.hpp"
-#include "mesh_topology_reporter.hpp"
-#include "mesh_event_publisher.hpp"
-
-// Mesh configuration
-#define MESH_PREFIX     "AlteriomMesh"
-#define MESH_PASSWORD   "somethingSneaky"
-#define MESH_PORT       5555
-
-// WiFi configuration
-#define STATION_SSID     "YourWiFi"
-#define STATION_PASSWORD "YourPassword"
-
-// MQTT configuration
-#define MQTT_BROKER_IP   "192.168.1.100"
-#define MQTT_BROKER_PORT 1883
-#define MQTT_CLIENT_ID   "painlessMesh-commandBridge"
-
-Scheduler userScheduler;
-painlessMesh mesh;
-WiFiClient wifiClient;
-PubSubClient mqttClient(wifiClient);
-MqttCommandBridge* commandBridge;
-MeshTopologyReporter* topologyReporter;
-MeshEventPublisher* eventPublisher;
-
-// Task for MQTT reconnection
-Task taskMqttReconnect(TASK_SECOND * 5, TASK_FOREVER, []() {
-  if (!mqttClient.connected()) {
-    Serial.println("MQTT disconnected, reconnecting...");
-    if (mqttClient.connect(MQTT_CLIENT_ID)) {
-      Serial.println("MQTT reconnected!");
-      commandBridge->begin(); // Re-subscribe to topics
-    } else {
-      Serial.printf("MQTT reconnect failed, rc=%d\n", mqttClient.state());
-    }
-  }
-});
-
-// Task for periodic gateway status
-Task taskGatewayStatus(TASK_MINUTE, TASK_FOREVER, []() {
-  if (mqttClient.connected()) {
-    JsonDocument status;  // ArduinoJson v7: automatic sizing
-    status["gateway_id"] = mesh.getNodeId();
-    status["status"] = "online";
-    status["uptime"] = millis() / 1000;
-    status["free_memory"] = ESP.getFreeHeap();
-    status["connected_nodes"] = mesh.getNodeList().size();
-    status["wifi_rssi"] = WiFi.RSSI();
-    
-    String payload;
-    serializeJson(status, payload);
-    
-    mqttClient.publish("mesh/gateway/status", payload.c_str());
-  }
-});
-
-// Task for topology updates (full topology every 60 seconds)
-Task taskTopology(TASK_SECOND * 60, TASK_FOREVER, []() {
-  if (mqttClient.connected() && topologyReporter != nullptr) {
-    Serial.println("[Topology] Publishing full mesh topology...");
-    
-    String topology = topologyReporter->generateFullTopology();
-    bool success = mqttClient.publish("alteriom/mesh/MESH-001/topology", topology.c_str());
-    
-    if (success) {
-      Serial.printf("[Topology] ✅ Published (%d bytes)\n", topology.length());
-    } else {
-      Serial.println("[Topology] ❌ Failed to publish (message too large or MQTT error)");
-    }
-  }
-});
-
-// Task for incremental topology updates (check every 5 seconds)
-Task taskTopologyIncremental(TASK_SECOND * 5, TASK_FOREVER, []() {
-  if (mqttClient.connected() && topologyReporter != nullptr) {
-    if (topologyReporter->hasTopologyChanged()) {
-      Serial.println("[Topology] Topology changed, publishing incremental update...");
-      
-      String topology = topologyReporter->generateFullTopology();
-      bool success = mqttClient.publish("alteriom/mesh/MESH-001/topology", topology.c_str());
-      
-      if (success) {
-        Serial.printf("[Topology] ✅ Published incremental update (%d bytes)\n", topology.length());
-      } else {
-        Serial.println("[Topology] ❌ Failed to publish incremental update");
-      }
-    }
-  }
-});
-
-void setup() {
-  Serial.begin(115200);
-  
-  Serial.println("\n\n=================================");
-  Serial.println("MQTT Command Bridge for painlessMesh");
-  Serial.println("=================================\n");
-  
-  // Initialize mesh as bridge (root node)
-  mesh.setDebugMsgTypes(ERROR | STARTUP | CONNECTION);
-  mesh.init(MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT, WIFI_AP_STA);
-  mesh.setRoot(true);
-  mesh.setContainsRoot(true);
-  
-  // Connect to WiFi station
-  Serial.printf("Connecting to WiFi: %s\n", STATION_SSID);
-  mesh.stationManual(STATION_SSID, STATION_PASSWORD);
-  
-  // Wait for WiFi connection
-  int attempts = 0;
-  while (WiFi.status() != WL_CONNECTED && attempts < 20) {
-    delay(500);
-    Serial.print(".");
-    attempts++;
-  }
-  
-  if (WiFi.status() == WL_CONNECTED) {
-    Serial.printf("\nWiFi connected!\n");
-    Serial.printf("IP Address: %s\n", WiFi.localIP().toString().c_str());
-    Serial.printf("RSSI: %d dBm\n", WiFi.RSSI());
-  } else {
-    Serial.println("\nWiFi connection failed!");
-    Serial.println("Bridge will continue with mesh-only mode");
-  }
-  
-  // Configure MQTT
-  mqttClient.setServer(MQTT_BROKER_IP, MQTT_BROKER_PORT);
-  mqttClient.setBufferSize(2048); // Increase buffer for larger messages
-  
-  // Connect to MQTT broker
-  Serial.printf("\nConnecting to MQTT broker: %s:%d\n", MQTT_BROKER_IP, MQTT_BROKER_PORT);
-  
-  int mqttAttempts = 0;
-  while (!mqttClient.connected() && mqttAttempts < 10) {
-    Serial.print("Attempting MQTT connection...");
-    
-    if (mqttClient.connect(MQTT_CLIENT_ID)) {
-      Serial.println("connected!");
-    } else {
-      Serial.printf("failed, rc=%d\n", mqttClient.state());
-      Serial.println("Error codes: -4=timeout, -3=conn lost, -2=conn failed, -1=disconnected");
-      delay(2000);
-      mqttAttempts++;
-    }
-  }
-  
-  if (!mqttClient.connected()) {
-    Serial.println("WARNING: MQTT connection failed, bridge will retry");
-  }
-  
-  // Initialize topology reporter and event publisher first
-  topologyReporter = new MeshTopologyReporter(mesh, "MESH-001", "GW 2.3.4");
-  eventPublisher = new MeshEventPublisher(mesh, mqttClient, "MESH-001", "alteriom/mesh/MESH-001/events", "GW 2.3.4");
-  
-  Serial.println("\n✅ Topology Reporter initialized");
-  Serial.println("✅ Event Publisher initialized");
-  
-  // Initialize bidirectional MQTT-mesh bridge with topology reporter
-  commandBridge = new MqttCommandBridge(mesh, mqttClient, topologyReporter);
-  commandBridge->setMqttCallback();
-  commandBridge->setMeshCallback();
-  commandBridge->begin();
-  
-  // Add background tasks
-  userScheduler.addTask(taskMqttReconnect);
-  userScheduler.addTask(taskGatewayStatus);
-  userScheduler.addTask(taskTopology);
-  userScheduler.addTask(taskTopologyIncremental);
-  
-  taskMqttReconnect.enable();
-  taskGatewayStatus.enable();
-  taskTopology.enable();
-  taskTopologyIncremental.enable();
-  
-  // Mesh callbacks with schema-compliant event publishing
-  mesh.onNewConnection([](uint32_t nodeId) {
-    Serial.printf("[Mesh] 🔗 New node connected: %u\n", nodeId);
-    
-    // Publish schema-compliant node join event
-    if (eventPublisher != nullptr) {
-      eventPublisher->publishNodeJoin(nodeId);
-    }
-    
-    // Publish incremental topology update
-    if (mqttClient.connected() && topologyReporter != nullptr) {
-      String topology = topologyReporter->generateIncrementalUpdate(nodeId, true);
-      mqttClient.publish("alteriom/mesh/MESH-001/topology", topology.c_str());
-      Serial.println("[Topology] Published incremental update (node join)");
-    }
-  });
-  
-  mesh.onDroppedConnection([](uint32_t nodeId) {
-    Serial.printf("[Mesh] ⚠️ Node disconnected: %u\n", nodeId);
-    
-    // Publish schema-compliant node leave event
-    if (eventPublisher != nullptr) {
-      eventPublisher->publishNodeLeave(nodeId);
-    }
-    
-    // Publish incremental topology update
-    if (mqttClient.connected() && topologyReporter != nullptr) {
-      String topology = topologyReporter->generateIncrementalUpdate(nodeId, false);
-      mqttClient.publish("alteriom/mesh/MESH-001/topology", topology.c_str());
-      Serial.println("[Topology] Published incremental update (node leave)");
-    }
-  });
-  
-  Serial.println("\n=== MQTT Command Bridge Ready ===");
-  Serial.printf("Gateway ID: %u\n", mesh.getNodeId());
-  Serial.printf("Connected Nodes: %d\n", mesh.getNodeList().size());
-  Serial.println("\nMQTT Topics:");
-  Serial.println("  Commands IN:");
-  Serial.println("    - mesh/command/{nodeId}");
-  Serial.println("    - mesh/command/broadcast");
-  Serial.println("    - mesh/config/{nodeId}/get");
-  Serial.println("    - mesh/config/{nodeId}/set");
-  Serial.println("  Messages OUT:");
-  Serial.println("    - mesh/response/{nodeId}");
-  Serial.println("    - mesh/status/{nodeId}");
-  Serial.println("    - mesh/sensor/{nodeId}");
-  Serial.println("    - mesh/health/{nodeId}");
-  Serial.println("    - mesh/gateway/status");
-  Serial.println("    - alteriom/mesh/MESH-001/topology (schema v0.5.0)");
-  Serial.println("    - alteriom/mesh/MESH-001/events (schema v0.5.0)");
-  Serial.println("\nSchema Compliance:");
-  Serial.println("  ✅ @alteriom/mqtt-schema v0.5.0");
-  Serial.println("  ✅ mesh_topology.schema.json");
-  Serial.println("  ✅ mesh_event.schema.json");
-  Serial.println("\nBridge is now listening for commands...\n");
-}
-
-void loop() {
-  mesh.update();
-  
-  // Process MQTT messages
-  if (mqttClient.connected()) {
-    mqttClient.loop();
-  }
-  
-  // Handle WiFi reconnection
-  if (WiFi.status() != WL_CONNECTED) {
-    static unsigned long lastReconnectAttempt = 0;
-    if (millis() - lastReconnectAttempt > 30000) {
-      Serial.println("WiFi disconnected, attempting reconnect...");
-      WiFi.reconnect();
-      lastReconnectAttempt = millis();
-    }
-  }
-}