@decentnetwork/peer 0.1.103 → 0.1.104

package/dist/peer.js

@@ -210,8 +210,22 @@ const RECV_REQUEST_MIN_INTERVAL_MS = 200;
 export class Peer {
     #opts;
     #events = new EventEmitter();
+    /** While negotiating a non-LAN file, temporarily stop sending this friend
+     *  UDP control traffic. Peer <=0.1.94 routes FILE_CONTROL UDP-only whenever
+     *  it has seen recent inbound UDP, even when that public/NAT path is one-way.
+     *  Repeated relay-only offers let that 4s freshness expire, after which the
+     *  old peer returns ACCEPT/ACK over its reliable TCP relay. */
+    #fileRelayNegotiationUntil = new Map();
     // Toxcore-standard file transfer (wire-compatible with native Carrier/toxcore).
-    #fileTransfer = new FileTransferManager((friendId, packetId, payload) => this.#sendMessengerPacket(friendId, packetId, payload), (event, payload) => { this.#events.emit(event, payload); }, (friendId) => {
+    #fileTransfer = new FileTransferManager((friendId, packetId, payload) => {
+        if (packetId === PACKET_ID_FILE_SENDREQUEST) {
+            const session = this.#friendSessions.get(friendId);
+            const lan = !!session?.lanRemoteHost && session.remote?.host === session.lanRemoteHost;
+            if (!lan)
+                this.#fileRelayNegotiationUntil.set(friendId, Date.now() + 6_000);
+        }
+        return this.#sendMessengerPacket(friendId, packetId, payload);
+    }, (event, payload) => { this.#events.emit(event, payload); }, (friendId) => {
         const session = this.#friendSessions.get(friendId);
         return !!session?.lanRemoteHost && session.remote?.host === session.lanRemoteHost;
     });
@@ -604,6 +618,7 @@ export class Peer {
             clearTimeout(timer);
         this.#profileRetryTimers.clear();
         this.#profileRetryAttempts.clear();
+        this.#fileRelayNegotiationUntil.clear();
         if (this.#expressPollTimer) {
             clearInterval(this.#expressPollTimer);
             this.#expressPollTimer = undefined;
@@ -980,6 +995,7 @@ export class Peer {
         }
         const existed = this.#friends.delete(friendId);
         this.#friendSessions.delete(friendId);
+        this.#fileRelayNegotiationUntil.delete(friendId);
         this.#pendingFriendRequests.delete(friendId);
         this.#cookieRetryCount.delete(friendId);
         this.#lastCookieSentKey.delete(friendId);
@@ -3345,6 +3361,11 @@ export class Peer {
      *  buffered packets through the exact same dispatch. `kind` is the first
      *  payload byte (never undefined here — the caller defaults it). */
     #deliverLosslessPayload(friendId, state, kind, inner, remote, packetNumber = 0) {
+        // Any file response proves the receiver can hear this session. Release the
+        // old-peer relay-only negotiation guard before the data pump chooses its
+        // normal LAN/reliable-public path.
+        if (kind === PACKET_ID_FILE_CONTROL)
+            this.#fileRelayNegotiationUntil.delete(friendId);
         // Toxcore file transfer (FILE_SENDREQUEST/CONTROL/DATA = 80/81/82).
         if (this.#fileTransfer.handlePacket(friendId, kind, inner))
             return;
@@ -3964,6 +3985,8 @@ export class Peer {
         const udpFresh = !!realUdpRemote &&
             s?.lastUdpRecvMs !== undefined &&
             Date.now() - s.lastUdpRecvMs < 4_000;
+        const forceFileRelay = (this.#fileRelayNegotiationUntil.get(friendId) ?? 0) > Date.now() &&
+            !(s?.lanRemoteHost && s.remote?.host === s.lanRemoteHost);
         // A freshly-received UDP packet proves only the peer -> us direction.
         // That is enough for lossy IP/video bulk, whose inner TCP stream can
         // recover a dropped packet, but not for reliable file data: returning
@@ -3980,7 +4003,8 @@ export class Peer {
         // lastUdpRecvMs). This converts a multi-second blackout into a few
         // seconds of higher relay latency. Control packets always probe UDP
         // (to keep the NAT mapping warm) so we still try UDP for them.
-        const tryUdp = realUdpRemote &&
+        const tryUdp = !forceFileRelay &&
+            realUdpRemote &&
             (isBulkData ? udpFresh && fileUdpOnlyConfirmed : true);
         if (tryUdp && s?.remote) {
             try {

package/package.json

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