@decentnetwork/peer 0.1.52 → 0.1.54

package/dist/compat/filetransfer.js

@@ -30,10 +30,18 @@ export const MAX_CONCURRENT_FILE_PIPES = 256;
 export const MAX_FILE_DATA_SIZE = 1367;
 export const FILECONTROL = { ACCEPT: 0, PAUSE: 1, KILL: 2, SEEK: 3, ACK: 4 };
 export const FILEKIND = { DATA: 0, AVATAR: 1 };
-// Reliability tuning.
-const WINDOW_CHUNKS = 192; // chunks in flight (≈ 256 KB) for throughput on high-BDP paths
-const RETRANSMIT_MS = 600; // resend window from the ack point if no progress in this long
-const ACK_THROTTLE_MS = 25; // coalesce receiver acks
+// Reliability tuning. We use a FIXED in-flight window (not TCP-style AIMD): a
+// file transfer over a private direct path should treat packet loss as RANDOM
+// (lossy Wi-Fi / long-haul jitter), NOT as congestion — backing the window off
+// on every random drop collapsed throughput to a crawl (minutes for a big
+// file). Instead, keep the window large and just retransmit the gaps fast. The
+// 4 MB UDP socket buffer absorbs the burst; the receiver buffers by offset, so
+// reordering is free.
+const WINDOW_CHUNKS = 768; // ~1 MB in flight — fills a 200ms-RTT path at ~5 MB/s
+const WATCHDOG_MS = 150; // resend from the ack point if no progress this long
+const FAST_RT_MIN_MS = 40; // min gap between fast-retransmits of the same hole (≈1 RTT)
+const ACK_THROTTLE_MS = 15; // coalesce receiver acks (fast enough to drive fast-retransmit)
+const REACK_MS = 200; // receiver keep-alive re-ack cadence
 const SEND_GIVEUP_MS = 60000; // abandon a send after this long with no ack progress (peer gone)
 function u32be(n) {
     const b = new Uint8Array(4);
@@ -127,13 +135,34 @@ export class FileTransferManager {
         if (fileNumber < 0)
             return null;
         const fileId = randomBytes(FILE_ID_LENGTH);
+        const req = encodeFileSendRequest(fileNumber, opts.kind ?? FILEKIND.DATA, BigInt(data.length), fileId, opts.name);
         const st = {
             fileNumber, fileId, name: opts.name, data, size: data.length,
-            acked: 0, pumping: false, lastProgressAcked: 0, lastAckAdvanceMs: nowMs(),
+            acked: 0, highestSent: 0, started: false, req, startMs: nowMs(),
+            lastProgressAcked: 0, lastAckAdvanceMs: nowMs(), lastResendMs: 0,
         };
         this.#map(this.#sending, friendId).set(fileNumber, st);
-        const req = encodeFileSendRequest(fileNumber, opts.kind ?? FILEKIND.DATA, BigInt(data.length), fileId, opts.name);
         void this.send(friendId, PACKET_ID_FILE_SENDREQUEST, req).catch(() => undefined);
+        // Retransmit the offer until the receiver responds — on a lossy path the
+        // offer itself can drop and nothing else would start the transfer.
+        let offerSinceMs = nowMs();
+        st.offerTimer = setInterval(() => {
+            const cur = this.#map(this.#sending, friendId).get(fileNumber);
+            if (!cur || cur.started) {
+                if (st.offerTimer)
+                    clearInterval(st.offerTimer);
+                st.offerTimer = undefined;
+                return;
+            }
+            if (nowMs() - offerSinceMs >= SEND_GIVEUP_MS) {
+                this.#endSend(friendId, fileNumber);
+                this.emit("file-cancel", { friendId, fileId: hex(fileId), sending: true, reason: "no-response" });
+                return;
+            }
+            void this.send(friendId, PACKET_ID_FILE_SENDREQUEST, cur.req).catch(() => undefined);
+        }, WATCHDOG_MS * 3);
+        if (typeof st.offerTimer.unref === "function")
+            st.offerTimer.unref();
         return hex(fileId);
     }
     accept(friendId, fileNumber) {
@@ -155,7 +184,7 @@ export class FileTransferManager {
                     return;
                 }
                 this.#sendAck(friendId, cur);
-            }, RETRANSMIT_MS);
+            }, REACK_MS);
             if (typeof st.reackTimer.unref === "function")
                 st.reackTimer.unref();
         }
@@ -189,12 +218,14 @@ export class FileTransferManager {
             return;
         const size = Number(r.fileSize);
         const existing = this.#map(this.#receiving, friendId).get(r.fileNumber);
-        if (existing && !existing.done)
-            return; // active transfer already on this slot
+        if (existing && !existing.done) {
+            this.#sendAck(friendId, existing);
+            return;
+        } // re-offer (our accept/ack lost) → re-ack
         const st = {
             fileNumber: r.fileNumber, fileId: r.fileId, name: r.filename, size,
             buf: new Uint8Array(size), got: new Uint8Array(chunkCount(size)),
-            contiguous: 0, done: false, ackDirty: false,
+            contiguous: 0, maxByte: 0, done: false, ackDirty: false,
         };
         this.#map(this.#receiving, friendId).set(r.fileNumber, st);
         this.emit("file-offer", { friendId, fileNumber: r.fileNumber, fileId: hex(r.fileId), name: r.filename, size, kind: r.fileType });
@@ -210,8 +241,17 @@ export class FileTransferManager {
             const st = this.#map(this.#sending, friendId).get(c.fileNumber);
             if (!st)
                 return;
+            if (c.controlType === FILECONTROL.ACCEPT || c.controlType === FILECONTROL.ACK) {
+                if (!st.started) {
+                    st.started = true;
+                    if (st.offerTimer) {
+                        clearInterval(st.offerTimer);
+                        st.offerTimer = undefined;
+                    }
+                }
+            }
             if (c.controlType === FILECONTROL.ACCEPT) {
-                void this.#pump(friendId, st);
+                this.#pump(friendId, st);
             }
             else if (c.controlType === FILECONTROL.ACK) {
                 this.#onAck(friendId, st, c.data);
@@ -249,6 +289,8 @@ export class FileTransferManager {
         const idx = Math.floor(offset / MAX_FILE_DATA_SIZE);
         if (offset % MAX_FILE_DATA_SIZE !== 0 || idx >= st.got.length)
             return; // not a chunk boundary
+        if (offset + data.length > st.maxByte)
+            st.maxByte = offset + data.length;
         if (!st.got[idx]) {
             st.buf.set(data, offset);
             st.got[idx] = 1;
@@ -304,35 +346,46 @@ export class FileTransferManager {
     #sendAck(friendId, st) {
         st.ackDirty = false;
         // send_receive=1: the ACK refers to a file the PEER is SENDING (it lives in
-        // the peer's #sending table), so its #onControl routes it there.
-        void this.send(friendId, PACKET_ID_FILE_CONTROL, encodeFileControl(1, st.fileNumber, FILECONTROL.ACK, u32be(st.contiguous))).catch(() => undefined);
+        // the peer's #sending table). Carries [contiguous][maxByte] so the sender
+        // sees the gap (maxByte − contiguous) = loss/reorder, for congestion control.
+        const body = new Uint8Array(8);
+        body.set(u32be(st.contiguous), 0);
+        body.set(u32be(st.maxByte), 4);
+        void this.send(friendId, PACKET_ID_FILE_CONTROL, encodeFileControl(1, st.fileNumber, FILECONTROL.ACK, body)).catch(() => undefined);
     }
     // ── sender ────────────────────────────────────────────────────────
     #onAck(friendId, st, data) {
         if (data.length < 4)
             return;
         const ackedOffset = readU32be(data, 0);
+        const maxRecv = data.length >= 8 ? readU32be(data, 4) : ackedOffset;
         if (ackedOffset > st.acked) {
+            // Progress.
             st.acked = Math.min(ackedOffset, st.size);
             st.lastAckAdvanceMs = nowMs();
-            if (st.acked - st.lastProgressAcked >= 64 * 1024 || st.acked >= st.size) {
+            if (st.acked - st.lastProgressAcked >= 256 * 1024 || st.acked >= st.size) {
                 st.lastProgressAcked = st.acked;
                 this.emit("file-progress", { friendId, fileId: hex(st.fileId), received: st.acked, total: st.size, sending: true });
             }
         }
+        else if (maxRecv > st.acked + MAX_FILE_DATA_SIZE && nowMs() - st.lastResendMs >= FAST_RT_MIN_MS) {
+            // Duplicate ack WITH a gap → the chunk at `acked` was lost. Fast-retransmit
+            // the hole region immediately (rate-limited to ~1 RTT so a burst of
+            // dup-acks for one loss doesn't storm). No window backoff: file-path loss
+            // is treated as random, not congestion.
+            st.lastResendMs = nowMs();
+            this.#resendRange(friendId, st, st.acked, maxRecv);
+        }
         if (st.acked >= st.size) {
             this.#completeSend(friendId, st);
             return;
         }
-        void this.#pump(friendId, st); // window slid → send more
+        this.#pump(friendId, st); // send new data
     }
-    async #pump(friendId, st) {
-        if (st.pumping)
-            return;
-        st.pumping = true;
-        // Retransmit watchdog: if the ack hasn't advanced within RETRANSMIT_MS,
-        // rewind the send cursor to the ack point (go-back-N) so the lost chunk and
-        // anything after it are re-sent. Cumulative acks make this self-correcting.
+    #pump(friendId, st) {
+        // Watchdog: if the ack hasn't advanced within WATCHDOG_MS, a chunk (or the
+        // fast-retransmit) was lost → go-back-N resend from the ack point. Backstop
+        // to the dup-ack fast-retransmit above.
         if (!st.timer) {
             let stalledSinceMs = nowMs();
             st.timer = setInterval(() => {
@@ -345,53 +398,62 @@ export class FileTransferManager {
                 }
                 if (st.acked >= st.size)
                     return;
-                const sinceAck = nowMs() - st.lastAckAdvanceMs;
-                if (sinceAck < RETRANSMIT_MS) {
+                if (nowMs() - st.lastAckAdvanceMs < WATCHDOG_MS) {
                     stalledSinceMs = nowMs();
                     return;
                 }
-                // Give up if the receiver has gone silent for too long (disconnected /
-                // closed the app) rather than retransmitting forever.
                 if (nowMs() - stalledSinceMs >= SEND_GIVEUP_MS) {
                     this.#endSend(friendId, st.fileNumber);
                     this.emit("file-cancel", { friendId, fileId: hex(st.fileId), sending: true, reason: "timeout" });
                     return;
                 }
                 st.lastAckAdvanceMs = nowMs();
-                void this.#pumpFrom(friendId, st, st.acked);
-            }, Math.ceil(RETRANSMIT_MS / 2));
+                st.highestSent = st.acked; // go-back-N: re-send from the ack point
+                st.lastResendMs = nowMs();
+                this.#pumpFrom(friendId, st, st.acked);
+            }, WATCHDOG_MS);
             if (typeof st.timer.unref === "function")
                 st.timer.unref();
         }
-        try {
-            await this.#pumpFrom(friendId, st, st.acked);
-        }
-        finally {
-            st.pumping = false;
-        }
+        // Send only NEW data, from the high-water mark up to the fixed window edge.
+        this.#pumpFrom(friendId, st, Math.max(st.acked, st.highestSent));
     }
-    // Send chunks from `from` up to the window edge (acked + window).
-    async #pumpFrom(friendId, st, from) {
+    // Fire chunks from `from` up to the window edge. Fire-and-forget: the fixed
+    // window bounds in-flight bytes and the 4 MB socket buffer absorbs the burst,
+    // so we don't serialize on a per-chunk await (which capped throughput at one
+    // chunk per event-loop turn → minutes for a big file).
+    #pumpFrom(friendId, st, from) {
         const windowEnd = Math.min(st.acked + WINDOW_CHUNKS * MAX_FILE_DATA_SIZE, st.size);
         let off = from;
         while (off < windowEnd) {
             if (!this.#map(this.#sending, friendId).has(st.fileNumber))
                 return; // cancelled
             const end = Math.min(off + MAX_FILE_DATA_SIZE, st.size);
-            const chunk = st.data.subarray(off, end);
-            try {
-                await this.send(friendId, PACKET_ID_FILE_DATA, encodeFileData(st.fileNumber, off, chunk));
-            }
-            catch {
-                return; // transport down; the watchdog will retry from the ack point
-            }
+            void this.send(friendId, PACKET_ID_FILE_DATA, encodeFileData(st.fileNumber, off, st.data.subarray(off, end))).catch(() => undefined);
+            off = end;
+        }
+        if (off > st.highestSent)
+            st.highestSent = off;
+    }
+    // Re-send the chunks in [from, to) — the gap region the receiver is missing.
+    // Already-received chunks are idempotent (placed by offset on the receiver).
+    #resendRange(friendId, st, from, to) {
+        let off = from;
+        const end0 = Math.min(to, st.size);
+        while (off < end0) {
+            if (!this.#map(this.#sending, friendId).has(st.fileNumber))
+                return;
+            const end = Math.min(off + MAX_FILE_DATA_SIZE, st.size);
+            void this.send(friendId, PACKET_ID_FILE_DATA, encodeFileData(st.fileNumber, off, st.data.subarray(off, end))).catch(() => undefined);
             off = end;
         }
     }
     #completeSend(friendId, st) {
+        const durationMs = nowMs() - st.startMs;
+        const mbps = durationMs > 0 ? st.size / 1024 / 1024 / (durationMs / 1000) : 0;
         this.#endSend(friendId, st.fileNumber);
         this.emit("file-progress", { friendId, fileId: hex(st.fileId), received: st.size, total: st.size, sending: true });
-        this.emit("file-complete", { friendId, fileId: hex(st.fileId), name: st.name, size: st.size, sending: true });
+        this.emit("file-complete", { friendId, fileId: hex(st.fileId), name: st.name, size: st.size, sending: true, durationMs, mbps });
     }
     #endSend(friendId, fileNumber) {
         const st = this.#map(this.#sending, friendId).get(fileNumber);
@@ -399,6 +461,10 @@ export class FileTransferManager {
             clearInterval(st.timer);
             st.timer = undefined;
         }
+        if (st?.offerTimer) {
+            clearInterval(st.offerTimer);
+            st.offerTimer = undefined;
+        }
         this.#map(this.#sending, friendId).delete(fileNumber);
     }
     #endRecv(friendId, fileNumber) {
@@ -414,9 +480,12 @@ export class FileTransferManager {
         this.#map(this.#receiving, friendId).delete(fileNumber);
     }
     clearFriend(friendId) {
-        for (const st of this.#map(this.#sending, friendId).values())
+        for (const st of this.#map(this.#sending, friendId).values()) {
             if (st.timer)
                 clearInterval(st.timer);
+            if (st.offerTimer)
+                clearInterval(st.offerTimer);
+        }
         for (const st of this.#map(this.#receiving, friendId).values()) {
             if (st.ackTimer)
                 clearTimeout(st.ackTimer);

package/package.json

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