@alteriom/painlessmesh 1.8.13 → 1.8.15

package/examples/bridge/bridge.ino

@@ -47,9 +47,22 @@ void setup() {
   // 3. Set this node as root
   // 4. Maintain router connection
   // 5. Start broadcasting bridge status (Type 610) every 30 seconds
-  mesh.initAsBridge(MESH_PREFIX, MESH_PASSWORD,
-                    ROUTER_SSID, ROUTER_PASSWORD,
-                    &userScheduler, MESH_PORT);
+  bool bridgeSuccess = mesh.initAsBridge(MESH_PREFIX, MESH_PASSWORD,
+                                         ROUTER_SSID, ROUTER_PASSWORD,
+                                         &userScheduler, MESH_PORT);
+
+  if (!bridgeSuccess) {
+    Serial.println("✗ Failed to initialize as bridge!");
+    Serial.println("Router unreachable - falling back to regular mesh node");
+    Serial.println("The node will join the mesh without bridge functionality");
+    
+    // Fallback: Initialize as regular mesh node
+    // This allows the device to still participate in the mesh
+    mesh.init(MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT);
+    
+    Serial.println("✓ Initialized as regular mesh node");
+    Serial.println("Note: To function as a bridge, fix router connectivity and restart");
+  }
 
   // Optional: Configure bridge status broadcasting
   // mesh.setBridgeStatusInterval(60000);  // Change to 60 seconds
@@ -61,7 +74,7 @@ void setup() {
   // Set up message callback
   mesh.onReceive(&receivedCallback);
   
-  Serial.println("Bridge node initialized and ready!");
+  Serial.println("✓ Bridge node initialized and ready!");
   Serial.println("Broadcasting bridge status to mesh every 30 seconds");
 }
 

package/examples/bridge_failover/bridge_failover.ino

@@ -122,9 +122,23 @@ void setup() {
     Serial.println("This node will start as the primary bridge\n");
     
     // Initialize as bridge with automatic channel detection
-    mesh.initAsBridge(MESH_PREFIX, MESH_PASSWORD,
-                     ROUTER_SSID, ROUTER_PASSWORD,
-                     &userScheduler, MESH_PORT);
+    bool bridgeSuccess = mesh.initAsBridge(MESH_PREFIX, MESH_PASSWORD,
+                                           ROUTER_SSID, ROUTER_PASSWORD,
+                                           &userScheduler, MESH_PORT);
+    
+    if (!bridgeSuccess) {
+      Serial.println("✗ Failed to initialize as bridge!");
+      Serial.println("Router unreachable - falling back to regular node with failover");
+      
+      // Fallback: Initialize as regular node with bridge failover enabled
+      // This allows automatic promotion to bridge when router becomes available
+      mesh.init(MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT);
+      mesh.setRouterCredentials(ROUTER_SSID, ROUTER_PASSWORD);
+      mesh.enableBridgeFailover(true);
+      mesh.setElectionTimeout(5000);
+      
+      Serial.println("✓ Running as regular node - will auto-promote when router available");
+    }
   } else {
     Serial.println("Mode: REGULAR NODE (Failover Enabled)");
     Serial.println("This node can become bridge via election\n");

package/examples/multi_bridge/primary_bridge.ino

@@ -73,9 +73,21 @@ void setup() {
   mesh.setBridgeSelectionStrategy(painlessMesh::PRIORITY_BASED);
   
   // Initialize as bridge with priority 10 (primary)
-  mesh.initAsBridge(MESH_PREFIX, MESH_PASSWORD,
-                    ROUTER_SSID, ROUTER_PASSWORD,
-                    &userScheduler, MESH_PORT, 10);  // Priority 10 = Primary
+  bool bridgeSuccess = mesh.initAsBridge(MESH_PREFIX, MESH_PASSWORD,
+                                         ROUTER_SSID, ROUTER_PASSWORD,
+                                         &userScheduler, MESH_PORT, 10);  // Priority 10 = Primary
+  
+  if (!bridgeSuccess) {
+    Serial.println("✗ Failed to initialize as primary bridge!");
+    Serial.println("Router unreachable - falling back to regular mesh node");
+    
+    // Fallback: Initialize as regular node
+    // In a multi-bridge setup, secondary bridge should take over
+    mesh.init(MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT);
+    
+    Serial.println("✓ Running as regular node - secondary bridge should provide connectivity");
+    Serial.println("Note: Fix router connectivity and restart to resume primary bridge role");
+  }
   
   mesh.onReceive(&receivedCallback);
   mesh.onNewConnection(&newConnectionCallback);

package/examples/multi_bridge/secondary_bridge.ino

@@ -87,9 +87,21 @@ void setup() {
   mesh.setBridgeSelectionStrategy(painlessMesh::PRIORITY_BASED);
   
   // Initialize as bridge with priority 5 (secondary)
-  mesh.initAsBridge(MESH_PREFIX, MESH_PASSWORD,
-                    ROUTER_SSID, ROUTER_PASSWORD,
-                    &userScheduler, MESH_PORT, 5);  // Priority 5 = Secondary
+  bool bridgeSuccess = mesh.initAsBridge(MESH_PREFIX, MESH_PASSWORD,
+                                         ROUTER_SSID, ROUTER_PASSWORD,
+                                         &userScheduler, MESH_PORT, 5);  // Priority 5 = Secondary
+  
+  if (!bridgeSuccess) {
+    Serial.println("✗ Failed to initialize as secondary bridge!");
+    Serial.println("Router unreachable - falling back to regular mesh node");
+    
+    // Fallback: Initialize as regular node
+    // Device will still participate in mesh, relying on other bridges
+    mesh.init(MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT);
+    
+    Serial.println("✓ Running as regular node - relying on other bridges for connectivity");
+    Serial.println("Note: Fix router connectivity and restart to resume bridge role");
+  }
   
   mesh.onReceive(&receivedCallback);
   mesh.onNewConnection(&newConnectionCallback);

package/library.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/Alteriom/painlessMesh"
   },
-  "version": "1.8.13",
+  "version": "1.8.15",
   "frameworks": [
     "arduino"
   ],

package/library.properties

@@ -1,5 +1,5 @@
 name=Alteriom PainlessMesh
-version=1.8.13
+version=1.8.15
 author=Coopdis,Scotty Franzyshen,Edwin van Leeuwen,Germán Martín,Maximilian Schwarz,Doanh Doanh,Alteriom
 maintainer=Alteriom
 sentence=A painless way to setup a mesh with ESP8266 and ESP32 devices with Alteriom extensions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alteriom/painlessmesh",
-  "version": "1.8.13",
+  "version": "1.8.15",
   "description": "painlessMesh is a user-friendly library for creating mesh networks with ESP8266 and ESP32 devices. This Alteriom fork includes additional packages for sensor data (SensorPackage), device commands (CommandPackage), and status monitoring (StatusPackage). It handles routing and network management automatically, so you can focus on your application. The library uses JSON-based messaging and syncs time across all nodes, making it ideal for coordinated behaviour like synchronized light displays or sensor networks reporting to a central node.",
   "keywords": [
     "arduino",
@@ -85,6 +85,9 @@
     "CHANGELOG.md",
     "RELEASE_GUIDE.md",
     "DOCUMENTATION_INDEX.md",
-    "RELEASE_NOTES_1.8.13.md"
+    "RELEASE_NOTES_1.8.13.md",
+    "RELEASE_NOTES_1.8.15.md",
+    "RELEASE_READINESS_PLAN.md",
+    "TESTING_WITH_SIMULATOR.md"
   ]
 }

package/src/arduino/wifi.hpp

@@ -260,7 +260,7 @@ class Mesh : public painlessmesh::Mesh<Connection> {
    * @param baseScheduler Task scheduler for mesh operations
    * @param port TCP port for mesh communication (default: 5555)
    */
-  void initAsBridge(TSTRING meshSSID, TSTRING meshPassword,
+  bool initAsBridge(TSTRING meshSSID, TSTRING meshPassword,
                     TSTRING routerSSID, TSTRING routerPassword,
                     Scheduler *baseScheduler, uint16_t port = 5555) {
     using namespace logger;
@@ -298,14 +298,17 @@ class Mesh : public painlessmesh::Mesh<Connection> {
       detectedChannel = WiFi.channel();
       // Validate channel is in valid range (1-13 for 2.4GHz)
       if (detectedChannel < 1 || detectedChannel > 13) {
-        Log(ERROR, "\n✗ Invalid channel detected: %d, using default channel 1\n", detectedChannel);
+        Log(ERROR, "\n✗ Invalid channel detected: %d, falling back to channel 1\n", detectedChannel);
         detectedChannel = 1;
       } else {
         Log(STARTUP, "\n✓ Router connected on channel %d\n", detectedChannel);
         Log(STARTUP, "✓ Router IP: %s\n", WiFi.localIP().toString().c_str());
       }
     } else {
-      Log(ERROR, "\n✗ Failed to connect to router, using default channel 1\n");
+      Log(ERROR, "\n✗ Failed to connect to router\n");
+      Log(ERROR, "Cannot become bridge without router connection\n");
+      Log(ERROR, "Bridge initialization aborted - remaining as regular node\n");
+      return false;
     }
     
     Log(STARTUP, "Step 2: Initializing mesh on channel %d...\n", detectedChannel);
@@ -331,6 +334,7 @@ class Mesh : public painlessmesh::Mesh<Connection> {
     Log(STARTUP, "  Mesh Channel: %d (matches router)\n", detectedChannel);
     Log(STARTUP, "  Router: %s\n", routerSSID.c_str());
     Log(STARTUP, "  Port: %d\n", port);
+    return true;
   }
 
   /**
@@ -347,7 +351,7 @@ class Mesh : public painlessmesh::Mesh<Connection> {
    * @param port TCP port for mesh communication (default: 5555)
    * @param priority Bridge priority: 10=highest (primary), 5=medium (secondary), 1=lowest (default: 5)
    */
-  void initAsBridge(TSTRING meshSSID, TSTRING meshPassword,
+  bool initAsBridge(TSTRING meshSSID, TSTRING meshPassword,
                     TSTRING routerSSID, TSTRING routerPassword,
                     Scheduler *baseScheduler, uint16_t port, uint8_t priority) {
     using namespace logger;
@@ -370,12 +374,14 @@ class Mesh : public painlessmesh::Mesh<Connection> {
         priority, bridgeRole.c_str());
     
     // Call the base initAsBridge method
-    initAsBridge(meshSSID, meshPassword, routerSSID, routerPassword, baseScheduler, port);
+    bool success = initAsBridge(meshSSID, meshPassword, routerSSID, routerPassword, baseScheduler, port);
     
-    // Setup multi-bridge coordination if enabled
-    if (multiBridgeEnabled) {
+    // Setup multi-bridge coordination if enabled and bridge init succeeded
+    if (success && multiBridgeEnabled) {
       initBridgeCoordination();
     }
+    
+    return success;
   }
 
   /**
@@ -618,6 +624,28 @@ class Mesh : public painlessmesh::Mesh<Connection> {
     return activeBridges;
   }
 
+  /**
+   * Check if any bridge in the mesh has Internet connectivity
+   * 
+   * Override of base class method to also check if THIS node is a bridge
+   * with Internet connectivity, not just other bridges in the mesh.
+   * 
+   * @return true if at least one bridge (including this node) has Internet
+   */
+  bool hasInternetConnection() {
+    // First check if THIS node is a bridge with Internet
+    if (this->isBridge()) {
+      // Check Internet connectivity: WiFi connected AND valid IP address
+      bool hasInternet = (WiFi.status() == WL_CONNECTED) && (WiFi.localIP() != IPAddress(0, 0, 0, 0));
+      if (hasInternet) {
+        return true;
+      }
+    }
+    
+    // Then check other bridges in the mesh (call parent implementation)
+    return painlessmesh::Mesh<Connection>::hasInternetConnection();
+  }
+
   /**
    * Get recommended bridge for message transmission
    * 
@@ -1248,12 +1276,35 @@ class Mesh : public painlessmesh::Mesh<Connection> {
     delay(1000);
     Log(STARTUP, "✓ Takeover announcement sent on channel %d\n", _meshChannel);
     
+    // Save current mesh configuration to restore if bridge init fails
+    uint8_t savedChannel = _meshChannel;
+    
     // Now reconfigure as bridge (this will switch to router's channel)
     this->stop();
     delay(1000);
     
-    this->initAsBridge(_meshSSID, _meshPassword, routerSSID, routerPassword,
-                       mScheduler, _meshPort);
+    bool bridgeInitSuccess = this->initAsBridge(_meshSSID, _meshPassword, routerSSID, routerPassword,
+                                                 mScheduler, _meshPort);
+    
+    if (!bridgeInitSuccess) {
+      Log(ERROR, "✗ Bridge promotion failed - router unreachable\n");
+      Log(ERROR, "Reverting to regular node on channel %d\n", savedChannel);
+      
+      // Re-initialize as regular node on the original channel
+      this->init(_meshSSID, _meshPassword, mScheduler, _meshPort, WIFI_AP_STA,
+                 savedChannel, _meshHidden, MAX_CONN);
+      
+      // Reset election state and clear candidates (consistent with normal election completion)
+      electionState = ELECTION_IDLE;
+      electionCandidates.clear();
+      
+      // Notify via callback
+      if (bridgeRoleChangedCallback) {
+        bridgeRoleChangedCallback(false, "Bridge promotion failed - router unreachable");
+      }
+      
+      return;
+    }
     
     lastRoleChangeTime = millis();