librats 1.0.0 → 1.0.1

package/native-src/src/dht.cpp

@@ -2894,7 +2894,30 @@ bool DhtClient::load_routing_table() {
             LOG_DHT_WARN("Unsupported routing table version: " << version);
             return false;
         }
-        
+
+        // Restore our own node ID so it stays stable across restarts (matches libtorrent's
+        // calculate_node_id). The external address is not known yet at load time, which is
+        // libtorrent's "external_address.is_unspecified()" case -> reuse the saved ID as long
+        // as it is valid (non-zero). If the external IP is later discovered and the restored
+        // ID is no longer valid for it (BEP 42), set_external_ip() regenerates it then.
+        // Restored before bucketing the loaded nodes below, since get_bucket_index() is
+        // computed relative to node_id_.
+        if (routing_data.contains("node_id")) {
+            try {
+                NodeId saved_id = hex_to_node_id(routing_data["node_id"].get<std::string>());
+                bool all_zeros = std::all_of(saved_id.begin(), saved_id.end(),
+                                             [](uint8_t b) { return b == 0; });
+                if (!all_zeros) {
+                    node_id_ = saved_id;
+                    LOG_DHT_INFO("Restored DHT node ID from disk: " << node_id_to_hex(node_id_));
+                } else {
+                    LOG_DHT_WARN("Saved node ID is invalid (zero/malformed), keeping generated one");
+                }
+            } catch (const std::exception& e) {
+                LOG_DHT_WARN("Failed to restore saved node ID, keeping generated one: " << e.what());
+            }
+        }
+
         // Load nodes
         const auto& nodes_array = routing_data["nodes"];
         size_t loaded_count = 0;

package/native-src/src/librats_discovery.cpp

@@ -265,22 +265,19 @@ std::chrono::seconds RatsClient::calculate_discovery_interval() const {
 
 void RatsClient::automatic_discovery_loop() {
     LOG_CLIENT_INFO("Automatic peer discovery loop started");
-    
-    // Initial delay to let DHT bootstrap
-    {
-        std::unique_lock<std::mutex> lock(shutdown_mutex_);
-        if (shutdown_cv_.wait_for(lock, std::chrono::seconds(INITIAL_DISCOVERY_DELAY_SECONDS), [this] { return !auto_discovery_running_.load() || !running_.load(); })) {
-            LOG_CLIENT_INFO("Automatic peer discovery loop stopped during initial delay");
-            return;
-        }
-    }
 
-    // Best-effort: discover our public IP via STUN and derive a BEP 42 node ID from it before
-    // we announce, so we announce under the correct ID. This runs on the discovery thread (not
-    // a standalone one) on purpose: stop_dht_discovery() joins this thread via
-    // stop_automatic_peer_discovery() BEFORE resetting the DHT clients, so set_external_ip()
-    // can never touch a destroyed DhtClient. It complements the in-DHT "ip"-field voting, which
-    // keeps the node ID correct if the address changes or STUN is unavailable.
+    // Best-effort: discover our public IP via STUN and derive a BEP 42 node ID from it BEFORE
+    // the initial bootstrap delay below. The DHT starts receiving KRPC responses (each carrying
+    // our address in the "ip" field) immediately on bootstrap, and that in-DHT vote can reach
+    // EXTERNAL_IP_VOTE_THRESHOLD within a few seconds. Probing STUN first lets set_external_ip()
+    // adopt the address and regenerate the node ID up front, so the DHT bootstraps under the
+    // correct ID and the ip-field voting silently confirms the already-adopted address instead
+    // of racing it to consensus. The voting remains the fallback when STUN is unavailable or the
+    // address later changes.
+    //
+    // This runs on the discovery thread (not a standalone one) on purpose: stop_dht_discovery()
+    // joins this thread via stop_automatic_peer_discovery() BEFORE resetting the DHT clients, so
+    // set_external_ip() can never touch a destroyed DhtClient.
     if (auto_discovery_running_.load() && running_.load()) {
         auto mapped = discover_public_address("stun.l.google.com", 19302, 4000);
         if (mapped) {
@@ -296,6 +293,15 @@ void RatsClient::automatic_discovery_loop() {
         }
     }
 
+    // Initial delay to let DHT bootstrap
+    {
+        std::unique_lock<std::mutex> lock(shutdown_mutex_);
+        if (shutdown_cv_.wait_for(lock, std::chrono::seconds(INITIAL_DISCOVERY_DELAY_SECONDS), [this] { return !auto_discovery_running_.load() || !running_.load(); })) {
+            LOG_CLIENT_INFO("Automatic peer discovery loop stopped during initial delay");
+            return;
+        }
+    }
+
     // Announce immediately - this also discovers peers during traversal
     announce_rats_peer();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "librats",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Node.js bindings for librats - A high-performance peer-to-peer networking library",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",