@decentnetwork/peer 0.1.55 → 0.1.56

package/dist/peer.js

@@ -1470,13 +1470,21 @@ export class Peer {
             this.#debugLog(`hs_recv friend=${friendId} initiated=${weInitiated ? 1 : 0} remote=${remote.address}:${remote.port}`);
             if (!wasEstablished) {
                 this.#debugLog(`friend_connected friend=${friendId} remote=${remote.address}:${remote.port}`);
-                // If we only have a TCP-relay path, immediately tell the peer our
-                // public UDP endpoint so they can hole-punch — don't wait for the
-                // 15s UDP-retry loop, which can miss a flapping relay session's
-                // short-lived establishment window. Both sides do this on every
-                // (re)establishment, so a brief tcp-relay window is enough to
-                // bootstrap the direct UDP path. See docs/UDP-DIRECT-PLAN.md.
-                if (state.hasTcpRoute && !state.remote) {
+                // Send our UDP endpoint offer (public srflx + LAN host candidate)
+                // whenever the current path isn't already a same-LAN direct one:
+                //  - relay-only sessions need it to bootstrap a direct UDP path; and
+                //  - sessions that came up over a PUBLIC UDP endpoint (internet
+                //    hairpin) when both peers are actually on the SAME LAN — without
+                //    the offer they never learn each other's 10.x/192.168.x address and
+                //    stay stuck on the public path, which a symmetric / hairpin NAT
+                //    breaks one-way (observed: two boxes on one LAN where each only saw
+                //    the other one-directionally). The peer's same-subnet filter drops
+                //    the LAN candidate when it doesn't apply, so offering is always safe.
+                const r = state.remote;
+                const remoteIsSameLan = !!r && isPrivateAddress(r.host) && !isCgnatAddress(r.host) &&
+                    getPhysicalLanSubnets().some((s) => isInIpv4Subnet(r.host, s));
+                const haveLanToOffer = getPhysicalLanAddresses().some((ip) => isPrivateAddress(ip) && !isCgnatAddress(ip));
+                if ((state.hasTcpRoute && !r) || (!remoteIsSameLan && haveLanToOffer)) {
                     void this.#sendUdpEndpointOffer(friendId).catch(() => undefined);
                 }
             }
@@ -3961,6 +3969,25 @@ export class Peer {
             if (!node.isTcp)
                 void this.#sendDhtPing(node);
         }
+        // 4. LAN-direct upgrade. Re-offer our endpoint (public srflx + LAN host
+        //    candidate) to any established friend whose current path is NOT already
+        //    a same-LAN address, as long as we have a LAN address to advertise. This
+        //    upgrades sessions that came up over a public UDP endpoint (internet
+        //    hairpin) to the direct LAN path even without a re-establish, and self-
+        //    stops once the path becomes same-LAN. The peer's same-subnet filter
+        //    drops the candidate when it doesn't apply, so this is always safe.
+        const haveLan = getPhysicalLanAddresses().some((ip) => isPrivateAddress(ip) && !isCgnatAddress(ip));
+        if (haveLan) {
+            for (const [friendId, session] of this.#friendSessions.entries()) {
+                if (!session.established)
+                    continue;
+                const r = session.remote;
+                const remoteIsSameLan = !!r && isPrivateAddress(r.host) && !isCgnatAddress(r.host) &&
+                    getPhysicalLanSubnets().some((s) => isInIpv4Subnet(r.host, s));
+                if (!remoteIsSameLan)
+                    void this.#sendUdpEndpointOffer(friendId).catch(() => undefined);
+            }
+        }
     }
     /**
      * Send an onion DHT-PK announcement to a friend so they learn our DHT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/peer",
-  "version": "0.1.55",
+  "version": "0.1.56",
   "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",