From 0be35d257bd5af4f6022b2bc622fb8670201b060 Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gmail.com>
Date: Tue, 30 Jun 2026 02:12:06 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20robust=20tracker=20reconnect=20=E2=80=94?=
 =?UTF-8?q?=20re-register=20proactively=20after=20outage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previous logic caught 404 on heartbeat and re-registered, but the re-
registration failed silently if the tracker wasn't fully ready yet.

New approach: after any connection-refused streak, the heartbeat loop
switches to re-registration mode and keeps retrying until the tracker
accepts the registration (instead of sending heartbeats into a fresh
registry that doesn't know this node). Falls back to the 404 path for
the case where a node is purged without a full tracker restart.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 packages/node/meshnet_node/startup.py | 46 ++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/packages/node/meshnet_node/startup.py b/packages/node/meshnet_node/startup.py
index efedf12..a712590 100644
--- a/packages/node/meshnet_node/startup.py
+++ b/packages/node/meshnet_node/startup.py
@@ -40,28 +40,58 @@ def _start_heartbeat(
     register_payload: dict,
     interval: float = 20.0,
 ) -> threading.Thread:
-    """Daemon thread: sends heartbeats; re-registers automatically on 404 (tracker restart)."""
+    """Daemon thread: sends heartbeats and re-registers automatically after tracker restarts."""
+    def _reregister() -> bool:
+        nonlocal node_id
+        try:
+            resp = _post_json(f"{tracker_url}/v1/nodes/register", register_payload)
+            node_id = resp.get("node_id", node_id)
+            return True
+        except Exception:
+            return False
+
     def _loop() -> None:
         nonlocal node_id
         hb_url = f"{tracker_url}/v1/nodes/{node_id}/heartbeat"
+        outage_streak = 0  # consecutive intervals where tracker was unreachable
+
         while True:
             time.sleep(interval)
+
+            if outage_streak > 0:
+                # Tracker was down — attempt re-registration first (it may have restarted
+                # with a clean slate and won't know this node).
+                if _reregister():
+                    hb_url = f"{tracker_url}/v1/nodes/{node_id}/heartbeat"
+                    print(f"  [node] re-registered after outage — node ID: {node_id}", flush=True)
+                    outage_streak = 0
+                else:
+                    outage_streak += 1
+                    if outage_streak <= 3 or outage_streak % 10 == 0:
+                        print(
+                            f"  [node] WARNING: tracker still unreachable "
+                            f"({outage_streak * interval:.0f}s)",
+                            flush=True,
+                        )
+                continue
+
             try:
                 _post_json(hb_url, {})
             except urllib.error.HTTPError as exc:
                 if exc.code == 404:
+                    # Node was purged (e.g. long gap before restart noticed) — re-register now.
                     print("  [node] tracker lost registration — re-registering...", flush=True)
-                    try:
-                        resp = _post_json(f"{tracker_url}/v1/nodes/register", register_payload)
-                        node_id = resp.get("node_id", node_id)
+                    if _reregister():
                         hb_url = f"{tracker_url}/v1/nodes/{node_id}/heartbeat"
                         print(f"  [node] re-registered — node ID: {node_id}", flush=True)
-                    except Exception as re_exc:
-                        print(f"  [node] WARNING: re-registration failed: {re_exc}", flush=True)
+                    else:
+                        print("  [node] WARNING: re-registration failed", flush=True)
+                        outage_streak = 1
                 else:
-                    print(f"  [node] WARNING: heartbeat failed: {exc}", flush=True)
+                    print(f"  [node] WARNING: heartbeat failed ({exc.code}): {exc}", flush=True)
             except Exception as exc:
-                print(f"  [node] WARNING: heartbeat failed: {exc}", flush=True)
+                outage_streak = 1
+                print(f"  [node] WARNING: tracker unreachable: {exc}", flush=True)
 
     t = threading.Thread(target=_loop, daemon=True, name="heartbeat")
     t.start()