@decentnetwork/peer 0.1.55 → 0.1.57

package/dist/peer.d.ts

@@ -194,6 +194,9 @@ export declare class Peer {
          *  tcp-relay, discovery itself is broken — we don't even know
          *  where to send a cookie request. */
         endpointCandidatesCount: number;
+        /** The actual candidate endpoints (host:port) — lets diag see whether a
+         *  same-LAN host candidate (e.g. 10.0.0.x) was received but not adopted. */
+        endpointCandidates: string[];
         /** Last time we sent an outbound cookie request via UDP for this
          *  peer (null = never). Used to confirm Phase 1.2 retries are
          *  actually firing. */

package/dist/peer.js

@@ -1062,6 +1062,7 @@ export class Peer {
             ourLocalUdpPort: this.#udp?.localPort() ?? null,
             friendUdpEndpoint: friendUdp,
             endpointCandidatesCount: s.endpointCandidates?.length ?? 0,
+            endpointCandidates: (s.endpointCandidates ?? []).map((c) => `${c.host}:${c.port}`),
             cookieRequestSentMs: s.cookieRequestSentMs ?? null,
         };
     }
@@ -1470,13 +1471,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);
                 }
             }
@@ -1620,7 +1629,19 @@ export class Peer {
                     state.lastRelayRecvMs = Date.now();
                 }
                 else {
-                    state.remote = { host: remote.address, port: remote.port };
+                    // Adopt the source as our send endpoint — but NEVER downgrade from a
+                    // same-LAN (physical) path to a non-LAN source. A packet that loops in
+                    // via the peer's public / Tailscale-exit endpoint must not knock us off
+                    // the direct LAN path, which is strictly better. (This is the other
+                    // half of the "use the physical LAN, not Tailscale" rule.)
+                    const cur = state.remote?.host;
+                    const onSameLanAlready = !!cur && !cur.startsWith("tcp:") && isPrivateAddress(cur) && !isCgnatAddress(cur) &&
+                        getPhysicalLanSubnets().some((s) => isInIpv4Subnet(cur, s));
+                    const incomingSameLan = isPrivateAddress(remote.address) && !isCgnatAddress(remote.address) &&
+                        getPhysicalLanSubnets().some((s) => isInIpv4Subnet(remote.address, s));
+                    if (incomingSameLan || !onSameLanAlready) {
+                        state.remote = { host: remote.address, port: remote.port };
+                    }
                     if (!state.lastUdpRecvMs) {
                         this.#debugLog(`udp_confirmed friend=${friendId} via=${remote.address}:${remote.port} (direct UDP path live)`);
                     }
@@ -3345,8 +3366,19 @@ export class Peer {
                     if (++ln >= 6)
                         clearInterval(lanTimer);
                 }, 120);
-                const haveRealUdp = session.remote && !session.remote.host?.startsWith("tcp:") && session.remote.port !== 0;
-                if (!haveRealUdp) {
+                // The physical LAN is strictly better than ANY public path — direct, no
+                // NAT, no relay, and crucially no Tailscale-exit hairpin (a peer whose
+                // internet egresses via Tailscale advertises its exit's public IP as
+                // its srflx, so the "direct" public path actually loops out through
+                // Tailscale and back). So adopt the LAN candidate as session.remote even
+                // when we already have a public "real UDP" remote — UNLESS we're already
+                // on a same-LAN address (don't flap between two LAN candidates). Without
+                // this the session stuck to the public/Tailscale endpoint and never sent
+                // over the LAN (observed: session.remote stayed public, data on relay).
+                const cur = session.remote?.host;
+                const onSameLanAlready = !!cur && !cur.startsWith("tcp:") && isPrivateAddress(cur) && !isCgnatAddress(cur) &&
+                    getPhysicalLanSubnets().some((s) => isInIpv4Subnet(cur, s));
+                if (!onSameLanAlready) {
                     session.remote = { host: lanHost, port: lanPort };
                 }
                 if (session.established) {
@@ -3961,6 +3993,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
@@ -4893,7 +4944,15 @@ function isInIpv4Subnet(host, subnet) {
 // path onto the overlay or loops into our own mesh, then silently falls back to
 // the relay — the snoopy/lili "lastUdpRecv=never -> bufferbloat" path. (lili
 // runs Tailscale; that's exactly this.)
-const VIRTUAL_IFACE_RE = /^(utun|tun|tap|wg|tailscale|zt|ham|agentnet|awdl|llw|gif|stf|bridge|vnic|vmnet|veth|docker)/i;
+// Names of interfaces that are NOT a real physical LAN — overlays (tailscale,
+// zerotier, wireguard, the agentnet TUN), and especially container/VM bridges.
+// Docker creates `docker0` AND per-network `br-<hash>` bridges (172.x); libvirt
+// `virbr0`; k8s `cni0`/`flannel`/`kube`. These were leaking their 172.x address
+// into the LAN host-candidate offer, so a peer on a real 10.x LAN advertised a
+// Docker-bridge IP its LAN partner could never match → LAN-direct never engaged
+// (observed: two boxes on one 10.0.0.0/24 stuck hairpinning through the public
+// internet). `^bridge` did NOT cover `br-…`.
+const VIRTUAL_IFACE_RE = /^(utun|tun|tap|wg|tailscale|zt|ham|agentnet|awdl|llw|gif|stf|bridge|br-|virbr|cni|flannel|weave|kube|vnet|vnic|vmnet|veth|docker)/i;
 /** True for RFC 6598 carrier-grade-NAT space 100.64.0.0/10 (Tailscale's range). */
 function isCgnatAddress(host) {
     const o = host.split(".");

package/package.json

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