@sanctumterra/raknet 1.3.75 → 1.3.76

package/dist/client/framer.d.ts

@@ -29,10 +29,14 @@ export declare class Framer {
     outputBackup: Map<number, Frame[]>;
     _tickCount: number;
     private mtuDiff;
+    private readonly BATCH_SIZE;
+    private readonly MAX_BATCH_INTERVAL;
+    private lastBatchTime;
     private readonly ORDERING_QUEUE_TIMEOUT;
-    private readonly FRAGMENT_TIMEOUT;
     constructor(client: Client);
     tick(): void;
+    private processBatchedAcksAndNacks;
+    private processBatchedOrderedFrames;
     incommingMessage(payload: Buffer, rinfo: RemoteInfo): void;
     private processFrame;
     handle(frameSet: Frameset): void;

package/dist/client/framer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"framer.d.ts","sourceRoot":"","sources":["../../src/client/framer.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,KAAK,EAGL,QAAQ,EAWR,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,UAAU,WAAW;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,MAAM;IAClB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,iBAAiB,CAAM;IAC/B,OAAO,CAAC,sBAAsB,CAA0B;IACxD,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,yBAAyB,CAAmC;IACpE,OAAO,CAAC,eAAe,CAAmC;IAC1D,SAAS,CAAC,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAG3D;IACF,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CACrC,MAAM,EACN;QAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CACpD,CAAa;IAEP,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,gBAAgB,EAAE,QAAQ,CAAC;IAClC,SAAS,CAAC,cAAc,SAAK;IAC7B,SAAS,CAAC,gBAAgB,SAAK;IAC/B,SAAS,CAAC,mBAAmB,SAAK;IAC3B,YAAY,EAAE,KAAK,EAAE,CAAM;IAClC,OAAO,CAAC,sBAAsB,CAAK;IAC5B,YAAY,uBAA8B;IAC1C,UAAU,SAAK;IAEtB,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAO;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;gBAE7B,MAAM,EAAE,MAAM;IASnB,IAAI;IAkFJ,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAyF1D,OAAO,CAAC,YAAY;IA6Eb,MAAM,CAAC,QAAQ,EAAE,QAAQ;IAqDhC,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,oBAAoB;IAkB5B,OAAO,CAAC,eAAe;IAyBvB,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,4BAA4B;IA6B7B,YAAY,CAClB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,QAA0B,GAClC,IAAI;IAOA,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IA+BxD,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,UAAU;IAgBX,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CA8BtC"}
+{"version":3,"file":"framer.d.ts","sourceRoot":"","sources":["../../src/client/framer.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,KAAK,EAGL,QAAQ,EAUR,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,UAAU,WAAW;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,MAAM;IAClB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,iBAAiB,CAAM;IAC/B,OAAO,CAAC,sBAAsB,CAA0B;IACxD,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,yBAAyB,CAAmC;IACpE,OAAO,CAAC,eAAe,CAAmC;IAC1D,SAAS,CAAC,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAG3D;IACF,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CACrC,MAAM,EACN;QAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CACpD,CAAa;IAEP,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,gBAAgB,EAAE,QAAQ,CAAC;IAClC,SAAS,CAAC,cAAc,SAAK;IAC7B,SAAS,CAAC,gBAAgB,SAAK;IAC/B,SAAS,CAAC,mBAAmB,SAAK;IAC3B,YAAY,EAAE,KAAK,EAAE,CAAM;IAClC,OAAO,CAAC,sBAAsB,CAAK;IAC5B,YAAY,uBAA8B;IAC1C,UAAU,SAAK;IAEtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAM;IACjC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAM;IACzC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAO;gBAElC,MAAM,EAAE,MAAM;IASnB,IAAI;IAmCX,OAAO,CAAC,0BAA0B;IAoBlC,OAAO,CAAC,2BAA2B;IAiC5B,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAoE1D,OAAO,CAAC,YAAY;IA6Eb,MAAM,CAAC,QAAQ,EAAE,QAAQ;IA0DhC,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,oBAAoB;IAqB5B,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,4BAA4B;IA2B7B,YAAY,CAClB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,QAA0B,GAClC,IAAI;IAOA,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IA+BxD,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,UAAU;IAqBX,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CA6BtC"}

package/dist/client/framer.js

@@ -26,8 +26,10 @@ class Framer {
     outputBackup = new Map();
     _tickCount = 0;
     mtuDiff;
+    BATCH_SIZE = 32; // Maximum frames to process in a batch
+    MAX_BATCH_INTERVAL = 50; // Maximum time (ms) to wait before processing a batch
+    lastBatchTime = 0;
     ORDERING_QUEUE_TIMEOUT = 500;
-    FRAGMENT_TIMEOUT = 5000;
     constructor(client) {
         this.client = client;
         this.outputFrameQueue = new proto_2.Frameset();
@@ -38,82 +40,84 @@ class Framer {
     }
     tick() {
         this._tickCount++;
+        const now = Date.now();
         if (this.client.status === proto_1.Status.Disconnected ||
             this.client.status === proto_1.Status.Disconnecting) {
-            if (this.client.options.debug) {
-                utils_1.Logger.debug(`[Framer] Skipping tick - client status: ${proto_1.Status[this.client.status]}`);
-            }
             return;
         }
         // Send a ping every 50 ticks.
         if (this._tickCount % 50 === 0) {
-            const now = Date.now();
             const ping = new proto_1.ConnectedPing();
             ping.timestamp = BigInt(now);
             this.frameAndSend(ping.serialize(), proto_1.Priority.Immediate);
         }
-        // Process ACKs.
+        // Batch process ACKs and NACKs
+        this.processBatchedAcksAndNacks();
+        // Process ordered frames in batches
+        this.processBatchedOrderedFrames(now);
+        // Send queued frames if we have enough or enough time has passed
+        if (this.outputFrames.length >= this.BATCH_SIZE ||
+            (this.outputFrames.length > 0 &&
+                now - this.lastBatchTime >= this.MAX_BATCH_INTERVAL)) {
+            this.sendQueue(this.outputFrames.length);
+            this.lastBatchTime = now;
+        }
+    }
+    processBatchedAcksAndNacks() {
+        // Batch process ACKs
         if (this.receivedFrameSequences.size > 0) {
             const ackSeqs = Array.from(this.receivedFrameSequences);
             this.receivedFrameSequences.clear();
-            if (this.client.options.debug) {
-                utils_1.Logger.debug(`[Framer] Sending ACK for ${ackSeqs.length} sequences`);
-            }
             const ack = new proto_1.Ack();
             ack.sequences = ackSeqs;
             this.client.send(ack.serialize());
         }
-        // Process NACKs.
+        // Batch process NACKs
         if (this.lostFrameSequences.size > 0) {
             const nackSeqs = Array.from(this.lostFrameSequences);
             this.lostFrameSequences.clear();
-            if (this.client.options.debug) {
-                utils_1.Logger.debug(`[Framer] Sending NACK for ${nackSeqs.length} sequences`);
-            }
             const nack = new proto_1.Nack();
             nack.sequences = nackSeqs;
             this.client.send(nack.serialize());
         }
-        const now = Date.now();
+    }
+    processBatchedOrderedFrames(now) {
+        const processedChannels = new Set();
         for (let channel = 0; channel < this.inputOrderingQueue.length; channel++) {
+            if (processedChannels.has(channel))
+                continue;
             const queue = this.inputOrderingQueue[channel];
+            let processed = 0;
             let expected = this.inputOrderIndex[channel];
-            if (queue.has(expected)) {
-                // biome-ignore lint/style/noNonNullAssertion: <explanation>
+            while (queue.has(expected) && processed < this.BATCH_SIZE) {
                 const queued = queue.get(expected);
+                if (!queued) {
+                    expected++;
+                    continue;
+                }
                 if (now - queued.timestamp > this.ORDERING_QUEUE_TIMEOUT) {
-                    utils_1.Logger.warn(`[Framer] Timeout waiting for ordered frame ${expected} on channel ${channel}; skipping it`);
                     this.processFrame(queued.frame);
                     queue.delete(expected);
                     expected++;
-                    this.inputOrderIndex[channel] = expected;
+                    processed++;
+                }
+                else {
+                    break;
                 }
             }
-        }
-        for (const [splitId, entry] of this.fragmentsQueue.entries()) {
-            if (now - entry.timestamp > this.FRAGMENT_TIMEOUT) {
-                utils_1.Logger.warn(`[Framer] Timeout reassembling fragments for splitId=${splitId}; discarding incomplete fragments`);
-                this.fragmentsQueue.delete(splitId);
+            if (processed > 0) {
+                this.inputOrderIndex[channel] = expected;
+                processedChannels.add(channel);
             }
         }
-        if (this.client.options.debug) {
-            utils_1.Logger.debug(`[Framer] Queue state - Frames: ${this.outputFrames.length}, Backup: ${this.outputBackup.size}`);
-        }
-        this.sendQueue(this.outputFrames.length);
     }
     incommingMessage(payload, rinfo) {
         let header = payload.readUint8();
         if ((header & 0xf0) === 0x80)
             header = 0x80;
-        if (this.client.options.debug) {
-            utils_1.Logger.debug(`[Framer] Received packet ${header} from ${rinfo.address}:${rinfo.port}`);
-        }
         switch (header) {
             case proto_1.Packet.Ack: {
                 const ack = new proto_1.Ack(payload).deserialize();
-                if (this.client.options.debug) {
-                    utils_1.Logger.debug(`[Framer] Processing ACK with ${ack.sequences.length} sequences`);
-                }
                 for (let i = 0, len = ack.sequences.length; i < len; i++) {
                     this.outputBackup.delete(ack.sequences[i]);
                 }
@@ -121,15 +125,9 @@ class Framer {
             }
             case proto_1.Packet.Nack: {
                 const nack = new proto_1.Nack(payload).deserialize();
-                if (this.client.options.debug) {
-                    utils_1.Logger.debug(`[Framer] Processing NACK with ${nack.sequences.length} sequences`);
-                }
                 for (let i = 0, len = nack.sequences.length; i < len; i++) {
                     const seq = nack.sequences[i];
                     const lostFrames = this.outputBackup.get(seq) || [];
-                    if (this.client.options.debug) {
-                        utils_1.Logger.debug(`[Framer] Resending ${lostFrames.length} lost frames for sequence ${seq}`);
-                    }
                     for (let j = 0, lostLen = lostFrames.length; j < lostLen; j++) {
                         this.sendFrame(lostFrames[j], proto_1.Priority.Immediate);
                     }
@@ -157,7 +155,6 @@ class Framer {
                 const packet = new proto_1.OpenConnectionReplyTwo(payload).deserialize();
                 this.client.emit("open-connection-reply-two", packet);
                 this.client.options.mtuSize = packet.mtu;
-                // this.mtuDiff = this.client.options.mtuSize - 36;
                 const conReq = new proto_1.ConnectionRequest();
                 conReq.clientGuid = this.client.options.clientId;
                 conReq.timestamp = BigInt(Date.now());
@@ -269,12 +266,17 @@ class Framer {
                 }
             }
             this.lastInputSequence = frameSet.sequence;
-            for (let i = 0, len = frameSet.frames.length; i < len; i++) {
-                try {
-                    this.handleFrame(frameSet.frames[i]);
-                }
-                catch (err) {
-                    utils_1.Logger.error("[Framer] Error handling frame", err);
+            // Process frames in batches
+            const frames = frameSet.frames;
+            for (let i = 0; i < frames.length; i += this.BATCH_SIZE) {
+                const batch = frames.slice(i, i + this.BATCH_SIZE);
+                for (const frame of batch) {
+                    try {
+                        this.handleFrame(frame);
+                    }
+                    catch (err) {
+                        utils_1.Logger.error("[Framer] Error handling frame", err);
+                    }
                 }
             }
         }
@@ -283,9 +285,6 @@ class Framer {
         }
     }
     handleFrame(frame) {
-        if (this.client.options.debug) {
-            utils_1.Logger.debug(`[Framer] Handling frame - Split: ${frame.isSplit}, Sequenced: ${frame.isSequenced}, Ordered: ${frame.isOrdered}`);
-        }
         if (frame.isSplit) {
             this.handleSplit(frame);
         }
@@ -306,19 +305,11 @@ class Framer {
             this.processOrderedFrames(frame);
         }
         else if (frame.orderedFrameIndex > expectedOrderIndex) {
-            if (this.client.options.debug) {
-                utils_1.Logger.debug(`Queuing out-of-order frame: ${frame.orderedFrameIndex}`);
-            }
             this.inputOrderingQueue[channel].set(frame.orderedFrameIndex, {
                 frame,
                 timestamp: Date.now(),
             });
         }
-        else {
-            if (this.client.options.debug) {
-                utils_1.Logger.debug(`Discarding old frame: ${frame.orderedFrameIndex}`);
-            }
-        }
     }
     processOrderedFrames(frame) {
         const channel = frame.orderChannel;
@@ -328,8 +319,11 @@ class Framer {
         const queue = this.inputOrderingQueue[channel];
         let nextOrderIndex = this.inputOrderIndex[channel];
         while (queue.has(nextOrderIndex)) {
-            // biome-ignore lint/style/noNonNullAssertion: <explanation>
             const queued = queue.get(nextOrderIndex);
+            if (!queued) {
+                nextOrderIndex++;
+                continue;
+            }
             this.processFrame(queued.frame);
             queue.delete(nextOrderIndex);
             nextOrderIndex++;
@@ -339,14 +333,8 @@ class Framer {
     handleSequenced(frame) {
         const channel = frame.orderChannel;
         const currentHighestSequence = this.inputHighestSequenceIndex[channel];
-        if (this.client.options.debug) {
-            utils_1.Logger.debug(`Handling sequenced frame: sequenceFrameIndex=${frame.sequenceFrameIndex}, currentHighest=${currentHighestSequence}`);
-        }
         if (frame.sequenceFrameIndex < currentHighestSequence ||
             frame.orderedFrameIndex === this.inputOrderIndex[channel]) {
-            if (this.client.options.debug) {
-                utils_1.Logger.debug(`Discarding old sequenced frame: ${frame.sequenceFrameIndex}`);
-            }
             return;
         }
         this.inputHighestSequenceIndex[channel] = frame.sequenceFrameIndex + 1;
@@ -362,19 +350,18 @@ class Framer {
         entry.fragments.set(frame.splitFrameIndex, frame);
         if (entry.fragments.size === frame.splitCount) {
             this.reassembleAndProcessFragment(frame, entry.fragments);
+            this.fragmentsQueue.delete(splitId);
         }
     }
     reassembleAndProcessFragment(frame, fragment) {
         const stream = new binarystream_1.BinaryStream();
         for (let index = 0; index < frame.splitCount; index++) {
             const sframe = fragment.get(index);
-            if (sframe) {
-                stream.writeBuffer(sframe.payload);
-            }
-            else {
+            if (!sframe) {
                 utils_1.Logger.error(`Missing fragment at index ${index} for splitId=${frame.splitId}`);
                 return;
             }
+            stream.writeBuffer(sframe.payload);
         }
         const reassembledFrame = new proto_1.Frame();
         reassembledFrame.reliability = frame.reliability;
@@ -383,7 +370,6 @@ class Framer {
         reassembledFrame.orderedFrameIndex = frame.orderedFrameIndex;
         reassembledFrame.orderChannel = frame.orderChannel;
         reassembledFrame.payload = stream.getBuffer();
-        this.fragmentsQueue.delete(frame.splitId);
         this.handleFrame(reassembledFrame);
     }
     frameAndSend(payload, priority = proto_1.Priority.Normal) {
@@ -436,32 +422,39 @@ class Framer {
     queueFrame(frame, priority) {
         const frameLength = frame.getByteLength();
         const totalLength = 4 + this.outputFramesByteLength + frameLength;
-        if (totalLength > this.mtuDiff) {
+        if (totalLength > this.mtuDiff ||
+            this.outputFrames.length >= this.BATCH_SIZE) {
             this.sendQueue(this.outputFrames.length);
+            this.lastBatchTime = Date.now();
         }
         this.outputFrames.push(frame);
         this.outputFramesByteLength += frameLength;
         if (priority === proto_1.Priority.Immediate) {
             this.sendQueue(1);
+            this.lastBatchTime = Date.now();
         }
     }
     sendQueue(amount) {
         if (this.outputFrames.length === 0)
             return;
-        if (this.client.options.debug) {
-            utils_1.Logger.debug(`[Framer] Sending queue with ${amount} frames, total queued: ${this.outputFrames.length}`);
-        }
         const frameset = new proto_2.Frameset();
         frameset.sequence = this.outputSequence++;
-        const framesToSend = this.outputFrames.splice(0, amount);
-        frameset.frames = framesToSend;
-        const sentLength = framesToSend.reduce((sum, f) => sum + f.getByteLength(), 0);
-        this.outputFramesByteLength -= sentLength;
-        this.outputBackup.set(frameset.sequence, framesToSend);
-        if (this.client.options.debug) {
-            utils_1.Logger.debug(`[Framer] Frameset sequence: ${frameset.sequence}, remaining in queue: ${this.outputFrames.length}`);
+        // Send in batches if amount is larger than batch size
+        const remainingFrames = [...this.outputFrames];
+        this.outputFrames = [];
+        while (remainingFrames.length > 0) {
+            const batchSize = Math.min(this.BATCH_SIZE, remainingFrames.length);
+            const framesToSend = remainingFrames.splice(0, batchSize);
+            frameset.frames = framesToSend;
+            const sentLength = framesToSend.reduce((sum, f) => sum + f.getByteLength(), 0);
+            this.outputFramesByteLength -= sentLength;
+            this.outputBackup.set(frameset.sequence, framesToSend);
+            this.client.send(frameset.serialize());
+            // Increment sequence for next batch if there are more frames
+            if (remainingFrames.length > 0) {
+                frameset.sequence = this.outputSequence++;
+            }
         }
-        this.client.send(frameset.serialize());
     }
 }
 exports.Framer = Framer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanctumterra/raknet",
-  "version": "1.3.75",
+  "version": "1.3.76",
   "description": "",
   "main": "dist/index.js",
   "module": "commonjs",