@alteriom/painlessmesh 1.8.10 → 1.8.11

package/src/arduino/wifi.hpp

@@ -806,10 +806,11 @@ class Mesh : public painlessmesh::Mesh<Connection> {
     
     // Also send bridge status when new nodes connect so they can discover the bridge immediately
     // Send directly to the new node to ensure delivery, independent of time sync
-    this->newConnectionCallbacks.push_back([this](uint32_t nodeId) {
-      Log(CONNECTION, "New node %u connected, sending bridge status directly\n", nodeId);
+    // Using changedConnectionCallbacks instead of newConnectionCallbacks ensures routing is ready
+    this->changedConnectionCallbacks.push_back([this](uint32_t nodeId) {
+      Log(CONNECTION, "Node %u connection changed, sending bridge status directly\n", nodeId);
       
-      // Small delay to ensure connection is ready, then send directly to the new node
+      // Small delay to ensure connection is fully stable, then send directly to the new node
       // This avoids issues with time sync blocking broadcast messages
       this->addTask(500, TASK_ONCE, [this, nodeId]() {
         // Create bridge status message
@@ -837,7 +838,7 @@ class Mesh : public painlessmesh::Mesh<Connection> {
         Log(CONNECTION, "Sending bridge status directly to node %u (Internet: %s)\n",
             nodeId, hasInternet ? "YES" : "NO");
         
-        // Send directly to the new node, bypassing broadcast routing
+        // Send directly to the new node using routing table (which is now ready)
         this->sendSingle(nodeId, msg);
       });
     });

package/src/painlessMesh.h

@@ -5,7 +5,7 @@
  * @file painlessMesh.h
  * @brief Main header file for Alteriom painlessMesh library
  * 
- * @version 1.8.10
+ * @version 1.8.11
  * @date 2025-11-18
  * 
  * painlessMesh is a user-friendly library for creating mesh networks with 

package/src/painlessmesh/buffer.hpp

@@ -1,4 +1,4 @@
-#ifndef _PAINLESS_MESH_BUFFER_HPP_
+#ifndef _PAINLESS_MESH_BUFFER_HPP_
 #define _PAINLESS_MESH_BUFFER_HPP_
 
 #include <list>
@@ -37,7 +37,7 @@ class ReceiveBuffer {
     do {
       auto len = strnlen(data_ptr, length);
       do {
-        auto read_len = std::min(len, buf.length);
+        auto read_len = (std::min)(len, buf.length);
         memcpy(buf.buffer, data_ptr, read_len);
         buf.buffer[read_len] = '\0';
         auto newBuffer = T(buf.buffer);
@@ -179,7 +179,7 @@ class SentBuffer {
     else
       // String.toCharArray automatically turns the last character into
       // a \0, we need the extra space to deal with that annoyance
-      return std::min(buffer_length - 1, msg->length() + 1);
+      return (std::min)(buffer_length - 1, msg->length() + 1);
   }
 
   /**

package/src/painlessmesh/mesh.hpp

@@ -1,4 +1,4 @@
-#ifndef _PAINLESS_MESH_MESH_HPP_
+#ifndef _PAINLESS_MESH_MESH_HPP_
 #define _PAINLESS_MESH_MESH_HPP_
 
 #include <vector>
@@ -428,7 +428,7 @@ class Mesh : public ntp::MeshTime, public plugin::PackageHandler<T> {
   /** Set a callback routine for any messages that are addressed to this node.
    *
    * Every time this node receives a message, this callback routine will the
-   * called.  “from” is the id of the original sender of the message, and “msg”
+   * called.  “from” is the id of the original sender of the message, and “msg”
    * is a string that contains the message.  The message can be anything.  A
    * JSON, some other text string, or binary data.
    *
@@ -1861,7 +1861,7 @@ class Mesh : public ntp::MeshTime, public plugin::PackageHandler<T> {
    * // === painlessMesh Diagnostics ===
    * // Mode: Regular Node
    * // Mesh: ProductionMesh (25 nodes)
-   * // Bridge: 123456789 (RSSI: -42 dBm, Internet: ✓)
+   * // Bridge: 123456789 (RSSI: -42 dBm, Internet: ✓)
    * // Queue: 3 messages (2 CRITICAL, 1 NORMAL)
    * // Uptime: 02:15:33
    * // Last Election: 00:45:12 ago (Winner: 123456789)
@@ -1889,7 +1889,7 @@ class Mesh : public ntp::MeshTime, public plugin::PackageHandler<T> {
       if (primaryBridge != nullptr) {
         report += "Bridge: " + TSTRING(std::to_string(primaryBridge->nodeId).c_str());
         report += " (RSSI: " + TSTRING(std::to_string(primaryBridge->routerRSSI).c_str()) + " dBm";
-        report += ", Internet: " + TSTRING(primaryBridge->internetConnected ? "✓" : "✗") + ")\n";
+        report += ", Internet: " + TSTRING(primaryBridge->internetConnected ? "✓" : "✗") + ")\n";
       } else {
         report += "Bridge: None available\n";
       }
@@ -1960,6 +1960,7 @@ class Mesh : public ntp::MeshTime, public plugin::PackageHandler<T> {
     isExternalScheduler = true;
   }
 
+ public:  // Windows MSVC: router functions need access
   void startTimeSync(std::shared_ptr<T> conn) {
     using namespace logger;
     Log(S_TIME, "startTimeSync(): from %u with %u\n", this->nodeId,
@@ -2033,6 +2034,7 @@ class Mesh : public ntp::MeshTime, public plugin::PackageHandler<T> {
         [](const std::shared_ptr<T> &conn) { return !conn->connected(); });
   }
 
+ public:  // Windows MSVC: TCP lambdas need access to droppedConnectionCallbacks
   // Callback functions
   callback::List<uint32_t> newConnectionCallbacks;
   callback::List<uint32_t, bool> droppedConnectionCallbacks;
@@ -2056,6 +2058,8 @@ class Mesh : public ntp::MeshTime, public plugin::PackageHandler<T> {
 
   Scheduler *mScheduler;
 
+ public:  // Windows MSVC: lambdas in friend functions need public access
+
   /**
    * Wrapper function for ESP32 semaphore function
    *

package/src/painlessmesh/message_queue.hpp

@@ -143,8 +143,8 @@ public:
     // Check for state change
     checkStateChange();
     
-    Log(logger::GENERAL, "MessageQueue: Enqueued message #%u (priority=%d, size=%u/%u)\n",
-        msgId, priority, messages.size(), maxQueueSize);
+    Log(logger::GENERAL, "MessageQueue: Enqueued message #%u (priority=%d, size=%zu/%zu)\n",
+        msgId, priority, messages.size(), (size_t)maxQueueSize);
     
     return msgId;
   }
@@ -167,7 +167,7 @@ public:
       updatePriorityStats();
       checkStateChange();
       
-      Log(logger::GENERAL, "MessageQueue: Removed message #%u (size=%u)\n",
+      Log(logger::GENERAL, "MessageQueue: Removed message #%u (size=%zu)\n",
           messageId, messages.size());
       return true;
     }

package/src/painlessmesh/ntp.hpp

@@ -1,4 +1,4 @@
-#ifndef _PAINLESS_MESH_NTP_HPP_
+#ifndef _PAINLESS_MESH_NTP_HPP_
 #define _PAINLESS_MESH_NTP_HPP_
 
 #ifndef TIME_SYNC_INTERVAL
@@ -42,7 +42,7 @@ class MeshTime {
    */
   uint32_t getNodeTime() { return micros() + timeOffset; }
 
- protected:
+ public:  // Windows MSVC: friend functions need access to timeOffset
   uint32_t timeOffset = 0;
 };
 

package/src/painlessmesh/router.hpp

@@ -1,4 +1,4 @@
-#ifndef _PAINLESS_MESH_ROUTER_HPP_
+#ifndef _PAINLESS_MESH_ROUTER_HPP_
 #define _PAINLESS_MESH_ROUTER_HPP_
 
 #include <algorithm>
@@ -235,14 +235,14 @@ void routePackage(layout::Layout<T> layout, std::shared_ptr<T> connection,
   // Base capacity: message length + overhead for JSON structure
   // Each nesting level adds overhead for pointers and metadata
   size_t calculatedCapacity = pkg.length() + 
-                              JSON_OBJECT_SIZE(10) * std::max(nestingDepth, size_t(1)) + 
+                              JSON_OBJECT_SIZE(10) * (std::max)(nestingDepth, size_t(1)) + 
                               512;  // Additional buffer for strings and padding
 #endif
   
   // Cap at 8KB for safety on ESP8266 (which has ~80KB total heap)
   // Messages larger than this should be rejected
   constexpr size_t MAX_MESSAGE_CAPACITY = 8192;
-  size_t capacity = std::min(calculatedCapacity, MAX_MESSAGE_CAPACITY);
+  size_t capacity = (std::min)(calculatedCapacity, MAX_MESSAGE_CAPACITY);
   
   auto variant = std::make_shared<protocol::Variant>(pkg, capacity);
   
@@ -330,7 +330,7 @@ void handleNodeSync(T& mesh, protocol::NodeTree newTree,
         [&mesh, nodeId]() { mesh.changedConnectionCallbacks.execute(nodeId); });
   } else {
     conn->nodeSyncTask.delay();
-    mesh.stability += std::min(1000 - mesh.stability, (size_t)25);
+    mesh.stability += (std::min)(1000 - mesh.stability, (size_t)25);
   }
 }