@decentnetwork/peer 0.1.35 → 0.1.37

package/dist/peer.js

@@ -71,6 +71,15 @@ const FRIEND_PING_INTERVAL_MS = readEnvInt("DECENT_FRIEND_PING_INTERVAL_MS", 400
 // slow enough not to burn CPU on idle peers. Tunable via env.
 const FRIEND_CONNECTION_LOOP_MS = readEnvInt("DECENT_FRIEND_CONNECTION_LOOP_MS", 250);
 const FRIEND_TIMEOUT_MS = readEnvInt("DECENT_FRIEND_TIMEOUT_MS", 32000);
+// How long a relay path stays "confirmed" (carrying bulk data on its own, no
+// tcp-relay fan-out) after the last packet received over it. The relay
+// keepalive refreshes this every ~4s on a healthy path, so a generous window
+// tolerates several missed keepalives on a high-RTT / lossy China<->abroad link
+// instead of flapping back to fan-out — which delivered every IP packet twice
+// (the lili DUP! storm). Still well under FRIEND_TIMEOUT_MS, so a relay that
+// genuinely dies fails over (control packets always fan out, and the session
+// times out + re-handshakes) within the friend-timeout regardless.
+const RELAY_CONFIRM_WINDOW_MS = readEnvInt("DECENT_RELAY_CONFIRM_WINDOW_MS", 20000);
 const LAN_DISCOVERY_INTERVAL_MS = readEnvInt("DECENT_LAN_DISCOVERY_INTERVAL_MS", 10000);
 // When a same-LAN friend's actual address is unknown (it's not in their
 // DHT-PK extras and their NAT-mapped public IP doesn't accept our UDP),
@@ -332,6 +341,14 @@ export class Peer {
                 session.friendRealPublicKey ??= new Uint8Array(friendKey);
                 this.#friendSessions.set(friendId, session);
                 if (!session.established) {
+                    // A fresh relay-online signal means the peer just (re)connected —
+                    // almost always a restart. Clear any accumulated cookie backoff so
+                    // the connection loop retries the handshake at the 8s base cadence
+                    // instead of the 120s cap it had grown to while the peer was gone.
+                    // Without this, a peer that restarts after a long outage sits
+                    // "online but not established" for up to 2 minutes before the next
+                    // handshake attempt — the exact cn/callpass post-restart wedge.
+                    this.#cookieRetryCount.delete(friendId);
                     void this.#initiateSession(friendId).catch(() => { });
                 }
             });
@@ -1763,6 +1780,14 @@ export class Peer {
             this.#cacheFriendRemote(senderId, knownMatch.host, knownMatch.port, senderPublicKey, friendDhtPublicKey);
             this.#debugLog(`onion dhtpk matched known node for ${senderId} at ${knownMatch.host}:${knownMatch.port}`);
         }
+        // A dhtpk_update is proof the friend is announcing and reachable. If our
+        // session to them isn't established, clear the accumulated cookie backoff
+        // so the connection loop retries the handshake at the base cadence rather
+        // than the up-to-120s cap (mirrors the relay friendOnline reset; covers the
+        // UDP/onion reconnect path after a restart).
+        if (!this.#friendSessions.get(senderId)?.established) {
+            this.#cookieRetryCount.delete(senderId);
+        }
         this.#debugLog(`dhtpk_update friend=${senderId} noReplay=${noReplay.toString()} ` +
             `dhtpk=${carrierIdFromPublicKey(friendDhtPublicKey)} extraLen=${extra.length} ` +
             `extraNodes=${extraNodes.length} extraPreviewHex=${extraPreview}`);
@@ -2731,7 +2756,7 @@ export class Peer {
         let relayOk = false;
         if (s?.relayRemote && s.relayPermitted) {
             relayOk = this.#sendViaRelay(packet, s.relayRemote);
-            const relayConfirmed = s.lastRelayRecvMs !== undefined && Date.now() - s.lastRelayRecvMs < 8_000;
+            const relayConfirmed = s.lastRelayRecvMs !== undefined && Date.now() - s.lastRelayRecvMs < RELAY_CONFIRM_WINDOW_MS;
             if (isBulkData && relayOk && relayConfirmed) {
                 return;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/peer",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "description": "Pure TypeScript port of Elastos Carrier (toxcore-derived) P2P messaging. DHT, onion routing, TCP relay, FlatBuffers app payloads, Express offline relay. Wire-compatible with iOS Beagle and the Carrier C SDK.",
   "type": "module",
   "main": "./dist/index.js",