@alteriom/painlessmesh 1.8.15 → 1.9.0

package/examples/mqttCommandBridge/alteriom_sensor_package.hpp

@@ -1,235 +0,0 @@
-#ifndef ALTERIOM_SENSOR_PACKAGE_HPP
-#define ALTERIOM_SENSOR_PACKAGE_HPP
-
-#include "painlessmesh/plugin.hpp"
-
-namespace alteriom {
-
-/**
- * @brief Sensor data package for broadcasting environmental measurements
- *
- * This package is designed for Alteriom's IoT sensor network requirements,
- * allowing nodes to share environmental data across the mesh.
- */
-class SensorPackage : public painlessmesh::plugin::BroadcastPackage {
- public:
-  double temperature = 0.0;  // Temperature in Celsius
-  double humidity = 0.0;  // Relative humidity percentage
-  double pressure = 0.0;  // Atmospheric pressure in hPa
-  uint32_t sensorId = 0;  // Unique sensor identifier
-  uint32_t timestamp = 0;  // Unix timestamp of measurement
-  uint8_t batteryLevel = 0;  // Battery level percentage
-
-  SensorPackage()
-      : BroadcastPackage(200) {}  // Type ID 200 for Alteriom sensors
-
-  SensorPackage(JsonObject jsonObj) : BroadcastPackage(jsonObj) {
-    temperature = jsonObj["temp"];
-    humidity = jsonObj["hum"];
-    pressure = jsonObj["press"];
-    sensorId = jsonObj["sid"];
-    timestamp = jsonObj["ts"];
-    batteryLevel = jsonObj["bat"];
-  }
-
-  JsonObject addTo(JsonObject&& jsonObj) const {
-    jsonObj = BroadcastPackage::addTo(std::move(jsonObj));
-    jsonObj["temp"] = temperature;
-    jsonObj["hum"] = humidity;
-    jsonObj["press"] = pressure;
-    jsonObj["sid"] = sensorId;
-    jsonObj["ts"] = timestamp;
-    jsonObj["bat"] = batteryLevel;
-    return jsonObj;
-  }
-
-#if ARDUINOJSON_VERSION_MAJOR < 7
-  size_t jsonObjectSize() const { return JSON_OBJECT_SIZE(noJsonFields + 6); }
-#endif
-};
-
-/**
- * @brief Command package for controlling Alteriom devices
- *
- * Single-destination package for sending specific commands to individual nodes.
- */
-class CommandPackage : public painlessmesh::plugin::SinglePackage {
- public:
-  uint8_t command = 0;  // Command type
-  uint32_t targetDevice = 0;  // Target device ID
-  TSTRING parameters = "";  // Command parameters as JSON string
-  uint32_t commandId = 0;  // Unique command identifier for tracking
-
-  CommandPackage() : SinglePackage(400) {}  // Type ID 201 for Alteriom commands
-
-  CommandPackage(JsonObject jsonObj) : SinglePackage(jsonObj) {
-    command = jsonObj["cmd"];
-    targetDevice = jsonObj["target"];
-    parameters = jsonObj["params"].as<TSTRING>();
-    commandId = jsonObj["cid"];
-  }
-
-  JsonObject addTo(JsonObject&& jsonObj) const {
-    jsonObj = SinglePackage::addTo(std::move(jsonObj));
-    jsonObj["cmd"] = command;
-    jsonObj["target"] = targetDevice;
-    jsonObj["params"] = parameters;
-    jsonObj["cid"] = commandId;
-    return jsonObj;
-  }
-
-#if ARDUINOJSON_VERSION_MAJOR < 7
-  size_t jsonObjectSize() const {
-    return JSON_OBJECT_SIZE(noJsonFields + 4) + parameters.length();
-  }
-#endif
-};
-
-/**
- * @brief Status report package for device health monitoring
- */
-class StatusPackage : public painlessmesh::plugin::BroadcastPackage {
- public:
-  uint8_t deviceStatus = 0;  // Device status flags
-  uint32_t uptime = 0;  // Device uptime in seconds
-  uint16_t freeMemory = 0;  // Free memory in KB
-  uint8_t wifiStrength = 0;  // WiFi signal strength
-  TSTRING firmwareVersion = "";  // Current firmware version
-
-  // Command response fields (for MQTT bridge)
-  uint32_t responseToCommand = 0;  // CommandId this is responding to
-  TSTRING responseMessage = "";  // Success/error message
-
-  StatusPackage() : BroadcastPackage(202) {}  // Type ID 202 for Alteriom status
-
-  StatusPackage(JsonObject jsonObj) : BroadcastPackage(jsonObj) {
-    deviceStatus = jsonObj["status"];
-    uptime = jsonObj["uptime"];
-    freeMemory = jsonObj["mem"];
-    wifiStrength = jsonObj["wifi"];
-    firmwareVersion = jsonObj["fw"].as<TSTRING>();
-    responseToCommand = jsonObj["respTo"] | 0;
-    responseMessage = jsonObj["respMsg"].as<TSTRING>();
-  }
-
-  JsonObject addTo(JsonObject&& jsonObj) const {
-    jsonObj = BroadcastPackage::addTo(std::move(jsonObj));
-    jsonObj["status"] = deviceStatus;
-    jsonObj["uptime"] = uptime;
-    jsonObj["mem"] = freeMemory;
-    jsonObj["wifi"] = wifiStrength;
-    jsonObj["fw"] = firmwareVersion;
-    if (responseToCommand > 0) {
-      jsonObj["respTo"] = responseToCommand;
-      jsonObj["respMsg"] = responseMessage;
-    }
-    return jsonObj;
-  }
-
-#if ARDUINOJSON_VERSION_MAJOR < 7
-  size_t jsonObjectSize() const {
-    return JSON_OBJECT_SIZE(noJsonFields + 7) + firmwareVersion.length() +
-           responseMessage.length();
-  }
-#endif
-};
-
-/**
- * @brief Enhanced status package with comprehensive health metrics (Phase 1)
- *
- * This is an extended version of StatusPackage that includes additional
- * mesh statistics, performance metrics, and alerting capabilities.
- * Type ID 203 is used to distinguish from the basic StatusPackage (202).
- */
-class EnhancedStatusPackage : public painlessmesh::plugin::BroadcastPackage {
- public:
-  // Device Health (from original StatusPackage)
-  uint8_t deviceStatus = 0;  // Device status flags
-  uint32_t uptime = 0;  // Device uptime in seconds
-  uint16_t freeMemory = 0;  // Free memory in KB
-  uint8_t wifiStrength = 0;  // WiFi signal strength
-  TSTRING firmwareVersion = "";  // Current firmware version
-  TSTRING firmwareMD5 = "";  // Firmware hash for OTA verification
-
-  // Mesh Statistics
-  uint16_t nodeCount = 0;  // Number of known nodes in mesh
-  uint8_t connectionCount = 0;  // Number of direct connections
-  uint32_t messagesReceived = 0;  // Total messages received
-  uint32_t messagesSent = 0;  // Total messages sent
-  uint32_t messagesDropped = 0;  // Total messages dropped/failed
-
-  // Performance Metrics
-  uint16_t avgLatency = 0;  // Average message latency in ms
-  uint8_t packetLossRate = 0;  // Packet loss rate percentage (0-100)
-  uint16_t throughput = 0;  // Network throughput in bytes/sec
-
-  // Warnings/Alerts
-  uint8_t alertFlags = 0;  // Bit flags for various alert conditions
-  TSTRING lastError = "";  // Last error message for diagnostics
-
-  EnhancedStatusPackage()
-      : BroadcastPackage(203) {}  // Type ID 203 for enhanced status
-
-  EnhancedStatusPackage(JsonObject jsonObj) : BroadcastPackage(jsonObj) {
-    deviceStatus = jsonObj["status"];
-    uptime = jsonObj["uptime"];
-    freeMemory = jsonObj["mem"];
-    wifiStrength = jsonObj["wifi"];
-    firmwareVersion = jsonObj["fw"].as<TSTRING>();
-    firmwareMD5 = jsonObj["fwMD5"].as<TSTRING>();
-
-    nodeCount = jsonObj["nodes"];
-    connectionCount = jsonObj["conns"];
-    messagesReceived = jsonObj["msgRx"];
-    messagesSent = jsonObj["msgTx"];
-    messagesDropped = jsonObj["msgDrop"];
-
-    avgLatency = jsonObj["latency"];
-    packetLossRate = jsonObj["loss"];
-    throughput = jsonObj["throughput"];
-
-    alertFlags = jsonObj["alerts"];
-    lastError = jsonObj["lastErr"].as<TSTRING>();
-  }
-
-  JsonObject addTo(JsonObject&& jsonObj) const {
-    jsonObj = BroadcastPackage::addTo(std::move(jsonObj));
-
-    // Device Health
-    jsonObj["status"] = deviceStatus;
-    jsonObj["uptime"] = uptime;
-    jsonObj["mem"] = freeMemory;
-    jsonObj["wifi"] = wifiStrength;
-    jsonObj["fw"] = firmwareVersion;
-    jsonObj["fwMD5"] = firmwareMD5;
-
-    // Mesh Statistics
-    jsonObj["nodes"] = nodeCount;
-    jsonObj["conns"] = connectionCount;
-    jsonObj["msgRx"] = messagesReceived;
-    jsonObj["msgTx"] = messagesSent;
-    jsonObj["msgDrop"] = messagesDropped;
-
-    // Performance Metrics
-    jsonObj["latency"] = avgLatency;
-    jsonObj["loss"] = packetLossRate;
-    jsonObj["throughput"] = throughput;
-
-    // Alerts
-    jsonObj["alerts"] = alertFlags;
-    jsonObj["lastErr"] = lastError;
-
-    return jsonObj;
-  }
-
-#if ARDUINOJSON_VERSION_MAJOR < 7
-  size_t jsonObjectSize() const {
-    return JSON_OBJECT_SIZE(noJsonFields + 18) + firmwareVersion.length() +
-           firmwareMD5.length() + lastError.length();
-  }
-#endif
-};
-
-}  // namespace alteriom
-
-#endif  // ALTERIOM_SENSOR_PACKAGE_HPP

package/examples/mqttCommandBridge/mesh_event_publisher.hpp

@@ -1,253 +0,0 @@
-#ifndef MESH_EVENT_PUBLISHER_HPP
-#define MESH_EVENT_PUBLISHER_HPP
-
-#include "painlessMesh.h"
-#include <PubSubClient.h>
-#include <ArduinoJson.h>
-
-/**
- * MeshEventPublisher - Publish real-time mesh events
- * 
- * Publishes mesh state change events conforming to @alteriom/mqtt-schema v0.5.0
- * mesh_event.schema.json specification.
- * 
- * Event Types:
- * - node_join: New node entered mesh
- * - node_leave: Node left mesh (clean disconnect)
- * - connection_lost: Direct connection failed
- * - connection_restored: Connection recovered
- * 
- * @author Alteriom Development Team
- * @date October 12, 2025
- */
-class MeshEventPublisher {
-private:
-  painlessMesh& mesh;
-  PubSubClient& mqttClient;
-  String meshId;
-  String eventTopic;
-  String firmwareVersion;
-  
-public:
-  MeshEventPublisher(painlessMesh& mesh, PubSubClient& mqttClient, 
-                     const String& meshId, const String& topic = "alteriom/mesh/events",
-                     const String& fwVersion = "GW 2.3.4")
-    : mesh(mesh), mqttClient(mqttClient), meshId(meshId), 
-      eventTopic(topic), firmwareVersion(fwVersion) {}
-  
-  /**
-   * Publish node join event
-   * Called when a new node connects to the mesh
-   */
-  void publishNodeJoin(uint32_t nodeId) {
-    JsonDocument doc;  // ArduinoJson v7: automatic sizing
-    
-    // Envelope
-    doc["schema_version"] = 1;
-    doc["device_id"] = generateDeviceId(mesh.getNodeId());
-    doc["device_type"] = "gateway";
-    doc["timestamp"] = getISO8601Timestamp();
-    doc["firmware_version"] = firmwareVersion;
-    
-    // Event
-    doc["event"] = "mesh_event";
-    doc["event_type"] = "node_join";
-    doc["mesh_id"] = meshId;
-    
-    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
-    affected.add(generateDeviceId(nodeId));
-    
-    JsonObject details = doc["details"].to<JsonObject>();
-    details["total_nodes"] = mesh.getNodeList().size() + 1;
-    details["timestamp"] = getISO8601Timestamp();
-    
-    publishEvent(doc, "Node Join");
-  }
-  
-  /**
-   * Publish node leave event
-   * Called when a node disconnects from the mesh
-   */
-  void publishNodeLeave(uint32_t nodeId) {
-    JsonDocument doc;  // ArduinoJson v7: automatic sizing
-    
-    // Envelope
-    doc["schema_version"] = 1;
-    doc["device_id"] = generateDeviceId(mesh.getNodeId());
-    doc["device_type"] = "gateway";
-    doc["timestamp"] = getISO8601Timestamp();
-    doc["firmware_version"] = firmwareVersion;
-    
-    // Event
-    doc["event"] = "mesh_event";
-    doc["event_type"] = "node_leave";
-    doc["mesh_id"] = meshId;
-    
-    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
-    affected.add(generateDeviceId(nodeId));
-    
-    JsonObject details = doc["details"].to<JsonObject>();
-    details["reason"] = "connection_lost";
-    details["last_seen"] = getISO8601Timestamp();
-    details["total_nodes"] = mesh.getNodeList().size() + 1;
-    
-    publishEvent(doc, "Node Leave");
-  }
-  
-  /**
-   * Publish connection lost event
-   * Called when a direct connection fails
-   */
-  void publishConnectionLost(uint32_t nodeId) {
-    JsonDocument doc;  // ArduinoJson v7: automatic sizing
-    
-    doc["schema_version"] = 1;
-    doc["device_id"] = generateDeviceId(mesh.getNodeId());
-    doc["device_type"] = "gateway";
-    doc["timestamp"] = getISO8601Timestamp();
-    doc["firmware_version"] = firmwareVersion;
-    
-    doc["event"] = "mesh_event";
-    doc["event_type"] = "connection_lost";
-    doc["mesh_id"] = meshId;
-    
-    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
-    affected.add(generateDeviceId(nodeId));
-    
-    JsonObject details = doc["details"].to<JsonObject>();
-    details["reason"] = "timeout";
-    details["timestamp"] = getISO8601Timestamp();
-    
-    publishEvent(doc, "Connection Lost");
-  }
-  
-  /**
-   * Publish connection restored event
-   * Called when a connection is re-established
-   */
-  void publishConnectionRestored(uint32_t nodeId) {
-    JsonDocument doc;  // ArduinoJson v7: automatic sizing
-    
-    doc["schema_version"] = 1;
-    doc["device_id"] = generateDeviceId(mesh.getNodeId());
-    doc["device_type"] = "gateway";
-    doc["timestamp"] = getISO8601Timestamp();
-    doc["firmware_version"] = firmwareVersion;
-    
-    doc["event"] = "mesh_event";
-    doc["event_type"] = "connection_restored";
-    doc["mesh_id"] = meshId;
-    
-    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
-    affected.add(generateDeviceId(nodeId));
-    
-    JsonObject details = doc["details"].to<JsonObject>();
-    details["timestamp"] = getISO8601Timestamp();
-    
-    publishEvent(doc, "Connection Restored");
-  }
-  
-  /**
-   * Publish network split event
-   * Called when mesh partitions into separate segments
-   */
-  void publishNetworkSplit() {
-    JsonDocument doc;  // ArduinoJson v7: automatic sizing
-    
-    doc["schema_version"] = 1;
-    doc["device_id"] = generateDeviceId(mesh.getNodeId());
-    doc["device_type"] = "gateway";
-    doc["timestamp"] = getISO8601Timestamp();
-    doc["firmware_version"] = firmwareVersion;
-    
-    doc["event"] = "mesh_event";
-    doc["event_type"] = "network_split";
-    doc["mesh_id"] = meshId;
-    
-    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
-    // TODO: Detect which nodes are in different partitions
-    
-    JsonObject details = doc["details"].to<JsonObject>();
-    details["timestamp"] = getISO8601Timestamp();
-    details["partition_count"] = 2;  // TODO: Calculate actual partitions
-    
-    publishEvent(doc, "Network Split");
-  }
-  
-  /**
-   * Publish network merged event
-   * Called when mesh partitions rejoin
-   */
-  void publishNetworkMerged() {
-    JsonDocument doc;  // ArduinoJson v7: automatic sizing
-    
-    doc["schema_version"] = 1;
-    doc["device_id"] = generateDeviceId(mesh.getNodeId());
-    doc["device_type"] = "gateway";
-    doc["timestamp"] = getISO8601Timestamp();
-    doc["firmware_version"] = firmwareVersion;
-    
-    doc["event"] = "mesh_event";
-    doc["event_type"] = "network_merged";
-    doc["mesh_id"] = meshId;
-    
-    JsonArray affected = doc["affected_nodes"].to<JsonArray>();
-    // TODO: List nodes that rejoined
-    
-    JsonObject details = doc["details"].to<JsonObject>();
-    details["timestamp"] = getISO8601Timestamp();
-    
-    publishEvent(doc, "Network Merged");
-  }
-  
-private:
-  /**
-   * Internal method to publish event to MQTT
-   */
-  void publishEvent(const JsonDocument& doc, const char* eventName) {
-    if (!mqttClient.connected()) {
-      Serial.printf("[Event] ⚠️ MQTT not connected, cannot publish %s\n", eventName);
-      return;
-    }
-    
-    String payload;
-    serializeJson(doc, payload);
-    
-    bool success = mqttClient.publish(eventTopic.c_str(), payload.c_str());
-    
-    if (success) {
-      Serial.printf("[Event] ✅ Published: %s (node: %s)\n", 
-                    eventName,
-                    doc["affected_nodes"][0].as<const char*>());
-    } else {
-      Serial.printf("[Event] ❌ Failed to publish: %s\n", eventName);
-    }
-  }
-  
-  /**
-   * 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_EVENT_PUBLISHER_HPP