@decentnetwork/peer 0.1.1 → 0.1.3

package/dist/peer.js

@@ -2030,6 +2030,87 @@ export class Peer {
                 if (session.remote && friend.status !== "online") {
                     this.#setFriendOnline(friendId, session.remote.host, session.remote.port);
                 }
+                // Phase 1.2: keep retrying UDP holepunch even after the session
+                // is already "established" via TCP relay. The toxcore-derived
+                // logic above stops trying once anybody is reachable, which is
+                // correct for messaging (text gets through) but disastrous for
+                // IP-packet forwarding (latency stays at ~500-1500ms via the
+                // relay detour instead of dropping to ~80ms once UDP works).
+                //
+                // We detect "on TCP-relay only" as: session.hasTcpRoute is set
+                // AND session.remote is either null or the synthetic
+                // {host: "tcp:<dhtpk>", port: 0} placeholder. In that state we
+                // re-send our DHT-PK so the peer (re-)learns our UDP endpoint,
+                // re-discover their endpoint via DHT, and trigger a fresh
+                // #initiateSession that will send a UDP cookie request. If UDP
+                // succeeds, #handleCryptoHandshake overwrites session.remote
+                // with the real endpoint and #sendMessengerPacket picks UDP
+                // over TCP from then on. Throttled to UDP_RETRY_INTERVAL_MS so
+                // the loop's 250ms tick doesn't flood DHT lookups.
+                const realUdpRemote = session.remote &&
+                    !session.remote.host?.startsWith("tcp:") &&
+                    session.remote.port !== 0;
+                if (!realUdpRemote && session.hasTcpRoute) {
+                    const UDP_RETRY_INTERVAL_MS = 15_000;
+                    const lastTry = session.lastUdpRetryMs ?? 0;
+                    if (now - lastTry > UDP_RETRY_INTERVAL_MS) {
+                        session.lastUdpRetryMs = now;
+                        // Recompute friend's real public key for the DHT-PK push.
+                        // Same fallback chain as the cooldown branch below.
+                        let friendRealPk = session.friendRealPublicKey;
+                        if (!friendRealPk && friend.address) {
+                            try {
+                                friendRealPk = parseCarrierAddress(friend.address).publicKey;
+                            }
+                            catch {
+                                // Fall through to the userid form.
+                            }
+                        }
+                        if (!friendRealPk && friend.pubkey) {
+                            try {
+                                friendRealPk = base58ToBytes(friend.pubkey);
+                            }
+                            catch {
+                                // Ignore malformed.
+                            }
+                        }
+                        if (friendRealPk && friendRealPk.length === 32) {
+                            // 1. Re-announce our DHT-PK so peer learns *our* UDP endpoint
+                            //    even if their own DHT lookup against us was stale.
+                            void this.#sendOnionDhtPk(friendRealPk).catch((error) => {
+                                this.#debugLog(`UDP retry: dhtpk_send for ${friendId} failed: ${error.message}`);
+                            });
+                            // 2. Try to discover the peer's UDP endpoint and kick a
+                            //    fresh cookie request via UDP. discoverAndCacheFriend
+                            //    Endpoint accepts EITHER the DHT-PK (preferred —
+                            //    direct DHT lookup) OR the friend's real identity
+                            //    public key (onion-routed lookup). When the session
+                            //    came up via TCP-relay only, neither side has
+                            //    received an onion DHT-PK from the other yet, so
+                            //    session.friendDhtPublicKey is null. Falling back
+                            //    to friendRealPk keeps the retry from being a no-op
+                            //    in exactly the case it was designed to fix.
+                            const dhtPk = session.friendDhtPublicKey;
+                            const searchKey = dhtPk ?? friendRealPk;
+                            if (searchKey && searchKey.length === 32) {
+                                void this.#discoverAndCacheFriendEndpoint(friendId, searchKey)
+                                    .then((found) => {
+                                    if (found) {
+                                        return this.#initiateSession(friendId).catch(() => undefined);
+                                    }
+                                })
+                                    .catch(() => undefined);
+                            }
+                            // Always also retry initiate if we have a cached real
+                            // UDP endpoint — covers the case where discovery
+                            // succeeded earlier but the cookie request was lost.
+                            if (friend.remoteHost && friend.remotePort) {
+                                void this.#initiateSession(friendId).catch(() => undefined);
+                            }
+                            this.#debugLog(`UDP retry attempt for ${friendId} (currently on TCP relay, search=${dhtPk ? "dht-pk" : "real-pk"})`);
+                        }
+                    }
+                }
                 continue;
             }
             // No active session: tell the friend our DHT public key so they can

package/package.json

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