@sanctumterra/raknet 1.3.70 → 1.3.72

package/dist/client/client-events.d.ts

@@ -1,4 +1,4 @@
-import type { Ack, Advertisement, ConnectedPing, ConnectionRequest, ConnectionRequestAccepted, NewIncomingConnection, OpenConnectionReplyOne, OpenConnectionReplyTwo, OpenConnectionRequestOne, OpenConnectionRequestTwo, UnconnectedPing, UnconnectedPong } from "../proto";
+import type { Ack, Advertisement, ConnectedPing, ConnectedPong, ConnectionRequest, ConnectionRequestAccepted, NewIncomingConnection, OpenConnectionReplyOne, OpenConnectionReplyTwo, OpenConnectionRequestOne, OpenConnectionRequestTwo, UnconnectedPing, UnconnectedPong } from "../proto";
 import type { Frameset } from "../proto/packets/frameset";
 export interface ClientEvents {
     "open-connection-reply-one": [OpenConnectionReplyOne];
@@ -9,6 +9,7 @@ export interface ClientEvents {
     "unconnected-pong": [UnconnectedPong];
     frameset: [Frameset];
     "connected-ping": [ConnectedPing];
+    "connected-pong": [ConnectedPong];
     "connection-request": [ConnectionRequest];
     "connection-request-accepted": [ConnectionRequestAccepted];
     "new-incoming-connection": [NewIncomingConnection];

package/dist/client/client-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-events.d.ts","sourceRoot":"","sources":["../../src/client/client-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,GAAG,EACH,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,yBAAyB,EACzB,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,wBAAwB,EACxB,eAAe,EACf,eAAe,EACf,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,WAAW,YAAY;IAC5B,2BAA2B,EAAE,CAAC,sBAAsB,CAAC,CAAC;IACtD,2BAA2B,EAAE,CAAC,sBAAsB,CAAC,CAAC;IACtD,6BAA6B,EAAE,CAAC,wBAAwB,CAAC,CAAC;IAC1D,6BAA6B,EAAE,CAAC,wBAAwB,CAAC,CAAC;IAC1D,kBAAkB,EAAE,CAAC,eAAe,CAAC,CAAC;IACtC,kBAAkB,EAAE,CAAC,eAAe,CAAC,CAAC;IACtC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC;IACrB,gBAAgB,EAAE,CAAC,aAAa,CAAC,CAAC;IAClC,oBAAoB,EAAE,CAAC,iBAAiB,CAAC,CAAC;IAC1C,6BAA6B,EAAE,CAAC,yBAAyB,CAAC,CAAC;IAC3D,yBAAyB,EAAE,CAAC,qBAAqB,CAAC,CAAC;IACnD,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC;IACvB,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IACX,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;IACf,KAAK,EAAE,EAAE,CAAC;IACV,OAAO,EAAE,CAAC,aAAa,CAAC,CAAC;IACzB,IAAI,EAAE,EAAE,CAAC;CACT"}
+{"version":3,"file":"client-events.d.ts","sourceRoot":"","sources":["../../src/client/client-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,GAAG,EACH,aAAa,EACb,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,yBAAyB,EACzB,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,wBAAwB,EACxB,eAAe,EACf,eAAe,EACf,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,WAAW,YAAY;IAC5B,2BAA2B,EAAE,CAAC,sBAAsB,CAAC,CAAC;IACtD,2BAA2B,EAAE,CAAC,sBAAsB,CAAC,CAAC;IACtD,6BAA6B,EAAE,CAAC,wBAAwB,CAAC,CAAC;IAC1D,6BAA6B,EAAE,CAAC,wBAAwB,CAAC,CAAC;IAC1D,kBAAkB,EAAE,CAAC,eAAe,CAAC,CAAC;IACtC,kBAAkB,EAAE,CAAC,eAAe,CAAC,CAAC;IACtC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC;IACrB,gBAAgB,EAAE,CAAC,aAAa,CAAC,CAAC;IAClC,gBAAgB,EAAE,CAAC,aAAa,CAAC,CAAC;IAClC,oBAAoB,EAAE,CAAC,iBAAiB,CAAC,CAAC;IAC1C,6BAA6B,EAAE,CAAC,yBAAyB,CAAC,CAAC;IAC3D,yBAAyB,EAAE,CAAC,qBAAqB,CAAC,CAAC;IACnD,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC;IACvB,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IACX,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;IACf,KAAK,EAAE,EAAE,CAAC;IACV,OAAO,EAAE,CAAC,aAAa,CAAC,CAAC;IACzB,IAAI,EAAE,EAAE,CAAC;CACT"}

package/dist/client/client.d.ts

@@ -2,7 +2,7 @@ import { Emitter } from "@serenityjs/emitter";
 import type { ClientEvents } from "./client-events";
 import { type Socket } from "node:dgram";
 import { Framer } from "./framer";
-import { type Address, type Advertisement, type Frame, type Priority, Status } from "../proto";
+import { type Address, type Advertisement, Frame, type Priority, Status } from "../proto";
 import { type ClientOptions } from "./client-options";
 export declare class Client extends Emitter<ClientEvents> {
     socket: Socket;
@@ -17,6 +17,7 @@ export declare class Client extends Emitter<ClientEvents> {
     ping(): Promise<Advertisement | null>;
     connect(): Promise<Advertisement>;
     sendFrame(frame: Frame, priority: Priority): void;
+    frameAndSend(payload: Buffer, priority: Priority): void;
     send(buffer: Buffer): void;
     cleanup(): void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAmB,KAAK,MAAM,EAAgB,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAEN,KAAK,OAAO,EACZ,KAAK,aAAa,EAElB,KAAK,KAAK,EAOV,KAAK,QAAQ,EACb,MAAM,EAGN,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,kBAAkB,CAAC;AAI5E,qBAAa,MAAO,SAAQ,OAAO,CAAC,YAAY,CAAC;IACzC,MAAM,EAAG,MAAM,CAAC;IAChB,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,OAAO,CAAkB;IAC1B,aAAa,EAAG,OAAO,CAAC;IAExB,MAAM,SAAuB;gBAExB,OAAO,GAAE,OAAO,CAAC,aAAa,CAAwB;IAO3D,UAAU;IAiBJ,IAAI,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAkBrC,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC;IA2EvC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAIjD,IAAI,CAAC,MAAM,EAAE,MAAM;IAcnB,OAAO,IAAI,IAAI;CAQtB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAmB,KAAK,MAAM,EAAgB,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAEN,KAAK,OAAO,EACZ,KAAK,aAAa,EAElB,KAAK,EAOL,KAAK,QAAQ,EAEb,MAAM,EAGN,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,kBAAkB,CAAC;AAI5E,qBAAa,MAAO,SAAQ,OAAO,CAAC,YAAY,CAAC;IACzC,MAAM,EAAG,MAAM,CAAC;IAChB,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,OAAO,CAAkB;IAC1B,aAAa,EAAG,OAAO,CAAC;IAExB,MAAM,SAAuB;gBAExB,OAAO,GAAE,OAAO,CAAC,aAAa,CAAwB;IAO3D,UAAU;IAgBJ,IAAI,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAkBrC,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC;IA8EvC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAQjD,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAOvD,IAAI,CAAC,MAAM,EAAE,MAAM;IAwBnB,OAAO,IAAI,IAAI;CA4BtB"}

package/dist/client/client.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = void 0;
 const emitter_1 = require("@serenityjs/emitter");
 const node_dgram_1 = require("node:dgram");
 const framer_1 = require("./framer");
 const proto_1 = require("../proto");
+const disconnect_1 = __importDefault(require("../proto/packets/disconnect"));
 const client_options_1 = require("./client-options");
 const utils_1 = require("../utils");
 class Client extends emitter_1.Emitter {
@@ -56,6 +60,9 @@ class Client extends emitter_1.Emitter {
         if (this.status === proto_1.Status.Connecting) {
             throw new Error("Connection attempt already in progress");
         }
+        if (this.status === proto_1.Status.Connected) {
+            throw new Error("Already connected");
+        }
         this.status = proto_1.Status.Connecting;
         this.initSocket();
         this.timer = setInterval(() => this.emit("tick"), 50);
@@ -118,20 +125,59 @@ class Client extends emitter_1.Emitter {
         }
     }
     sendFrame(frame, priority) {
-        this.framer.sendFrame(frame, priority);
+        try {
+            this.framer.sendFrame(frame, priority);
+        }
+        catch (error) {
+            utils_1.Logger.error("[Raknet] Failed to send frame", error);
+        }
+    }
+    frameAndSend(payload, priority) {
+        const frame = new proto_1.Frame();
+        frame.payload = payload;
+        frame.orderChannel = 0;
+        this.sendFrame(frame, priority);
     }
     send(buffer) {
-        if (this.options.debug)
-            utils_1.Logger.debug(`Sending ${buffer[0]}, ${buffer.length} bytes to ${this.options.address}:${this.options.port}`);
-        this.socket.send(buffer, 0, buffer.length, this.options.port, this.options.address);
+        if (this.status === proto_1.Status.Disconnected) {
+            utils_1.Logger.warn("[Client] Attempting to send packet while disconnected");
+            return;
+        }
+        utils_1.Logger.debug(`[Client] Sending packet ${buffer[0]}, ${buffer.length} bytes to ${this.options.address}:${this.options.port}`);
+        try {
+            this.socket.send(buffer, 0, buffer.length, this.options.port, this.options.address);
+        }
+        catch (error) {
+            utils_1.Logger.error("[Client] Failed to send packet", error);
+            // this.cleanup();
+        }
     }
     cleanup() {
-        this.removeAll();
-        this.socket.removeAllListeners();
-        this.socket.close();
-        clearInterval(this.timer);
-        clearTimeout(this.timeout);
-        this.status = proto_1.Status.Disconnected;
+        if (this.status === proto_1.Status.Disconnected) {
+            return;
+        }
+        utils_1.Logger.info("[Client] Cleaning up connection and resources");
+        const wasConnected = this.status === proto_1.Status.Connected;
+        this.status = proto_1.Status.Disconnecting;
+        try {
+            // Send disconnect notification if we were connected
+            if (wasConnected) {
+                const disconnect = new disconnect_1.default();
+                this.send(disconnect.serialize());
+            }
+            this.removeAll();
+            this.socket.removeAllListeners();
+            this.socket.close();
+            clearInterval(this.timer);
+            clearTimeout(this.timeout);
+        }
+        catch (error) {
+            utils_1.Logger.error("[Client] Error during cleanup", error);
+        }
+        finally {
+            this.status = proto_1.Status.Disconnected;
+            utils_1.Logger.info("[Client] Cleanup complete, status set to Disconnected");
+        }
     }
 }
 exports.Client = Client;

package/dist/client/framer.d.ts

@@ -9,7 +9,7 @@ export declare class Framer {
     private lostFrameSequences;
     private inputHighestSequenceIndex;
     private inputOrderIndex;
-    protected inputOrderingQueue: Map<number, Map<number, Frame>>;
+    protected inputOrderingQueue: Array<Map<number, Frame>>;
     protected readonly fragmentsQueue: Map<number, Map<number, Frame>>;
     outputOrderIndex: number[];
     outputSequenceIndex: number[];
@@ -17,7 +17,8 @@ export declare class Framer {
     protected outputSequence: number;
     protected outputSplitIndex: number;
     protected outputReliableIndex: number;
-    protected outputFrames: Set<Frame>;
+    outputFrames: Frame[];
+    private outputFramesByteLength;
     outputBackup: Map<number, Frame[]>;
     _tickCount: number;
     constructor(client: Client);
@@ -33,7 +34,6 @@ export declare class Framer {
     private reassembleAndProcessFragment;
     frameAndSend(payload: Buffer, priority?: Priority): void;
     sendFrame(frame: Frame, priority: Priority): void;
-    private handleLargePayload;
     private createSplitFrame;
     private queueFrame;
     sendQueue(amount: number): 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,qBAAa,MAAM;IAClB,OAAO,CAAC,MAAM,CAAS;IAEvB,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,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAa;IAC1E,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CACvD;IAEJ,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;IAClC,SAAS,CAAC,YAAY,aAAoB;IACnC,YAAY,uBAA8B;IAC1C,UAAU,SAAK;gBAEV,MAAM,EAAE,MAAM;IAYnB,IAAI;IAiCJ,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAyE1D,OAAO,CAAC,YAAY;IA8Db,MAAM,CAAC,QAAQ,EAAE,QAAQ;IA6ChC,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,aAAa;IAmBrB,OAAO,CAAC,oBAAoB;IAsB5B,OAAO,CAAC,eAAe;IAwBvB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,4BAA4B;IA6B7B,YAAY,CAClB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,QAA0B,GAClC,IAAI;IAQA,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAuBxD,OAAO,CAAC,kBAAkB;IAkB1B,OAAO,CAAC,gBAAgB;IAwBxB,OAAO,CAAC,UAAU;IAiBX,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAStC"}
+{"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,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,KAAK,CAAC,CAAC,CAGrD;IACF,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CACvD;IAEJ,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;gBAEV,MAAM,EAAE,MAAM;IAQnB,IAAI;IA2CJ,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAgF1D,OAAO,CAAC,YAAY;IAqEb,MAAM,CAAC,QAAQ,EAAE,QAAQ;IAoDhC,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,eAAe;IAwBvB,OAAO,CAAC,WAAW;IAmBnB,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;IAiCxD,OAAO,CAAC,gBAAgB;IAwBxB,OAAO,CAAC,UAAU;IAgBX,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CA2BtC"}

package/dist/client/framer.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Framer = void 0;
 const proto_1 = require("../proto");
@@ -9,7 +6,6 @@ const proto_2 = require("../proto");
 const utils_1 = require("../utils");
 const binarystream_1 = require("@serenityjs/binarystream");
 const connection_request_accepted_1 = require("../proto/packets/connection-request-accepted");
-const disconnect_1 = __importDefault(require("../proto/packets/disconnect"));
 class Framer {
     client;
     lastInputSequence = -1;
@@ -17,7 +13,7 @@ class Framer {
     lostFrameSequences = new Set();
     inputHighestSequenceIndex = new Array(64).fill(0);
     inputOrderIndex = new Array(64).fill(0);
-    inputOrderingQueue = new Map();
+    inputOrderingQueue = Array.from({ length: 64 }, () => new Map());
     fragmentsQueue = new Map();
     outputOrderIndex;
     outputSequenceIndex;
@@ -25,7 +21,8 @@ class Framer {
     outputSequence = 0;
     outputSplitIndex = 0;
     outputReliableIndex = 0;
-    outputFrames = new Set();
+    outputFrames = [];
+    outputFramesByteLength = 0;
     outputBackup = new Map();
     _tickCount = 0;
     constructor(client) {
@@ -34,47 +31,48 @@ class Framer {
         this.outputFrameQueue.frames = [];
         this.outputOrderIndex = Array.from({ length: 32 }).fill(0);
         this.outputSequenceIndex = Array.from({ length: 32 }).fill(0);
-        for (let index = 0; index < 64; index++) {
-            this.inputOrderingQueue.set(index, new Map());
-        }
     }
     tick() {
         this._tickCount++;
         if (this.client.status === proto_1.Status.Disconnected ||
-            this.client.status === proto_1.Status.Disconnecting)
+            this.client.status === proto_1.Status.Disconnecting) {
+            utils_1.Logger.debug(`[Framer] Skipping tick - client status: ${proto_1.Status[this.client.status]}`);
             return;
-        if (this.receivedFrameSequences.size > 0) {
+        }
+        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);
+        }
+        const ackSeqs = this.receivedFrameSequences;
+        if (ackSeqs.size > 0) {
+            this.receivedFrameSequences = new Set();
+            utils_1.Logger.debug(`[Framer] Sending ACK for ${ackSeqs.size} sequences`);
             const ack = new proto_1.Ack();
-            ack.sequences = Array.from(this.receivedFrameSequences).map((seq) => {
-                this.receivedFrameSequences.delete(seq);
-                return seq;
-            });
+            ack.sequences = Array.from(ackSeqs);
             this.client.send(ack.serialize());
         }
-        if (this.lostFrameSequences.size > 0) {
+        const nackSeqs = this.lostFrameSequences;
+        if (nackSeqs.size > 0) {
+            this.lostFrameSequences = new Set();
+            utils_1.Logger.debug(`[Framer] Sending NACK for ${nackSeqs.size} sequences`);
             const pk = new proto_1.Nack();
-            pk.sequences = Array.from(this.lostFrameSequences).map((seq) => {
-                this.lostFrameSequences.delete(seq);
-                return seq;
-            });
+            pk.sequences = Array.from(nackSeqs);
             this.client.send(pk.serialize());
         }
-        if (this._tickCount % 10 === 0) {
-            const ping = new proto_1.ConnectedPing();
-            ping.timestamp = BigInt(Date.now());
-            this.frameAndSend(ping.serialize(), proto_1.Priority.Normal);
-        }
-        this.sendQueue(this.outputFrames.size);
+        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(`Received packet ${header} from ${rinfo.address}:${rinfo.port}`);
+        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();
+                utils_1.Logger.debug(`[Framer] Processing ACK with ${ack.sequences.length} sequences`);
                 for (const seq of ack.sequences) {
                     this.outputBackup.delete(seq);
                 }
@@ -82,12 +80,13 @@ class Framer {
             }
             case proto_1.Packet.Nack: {
                 const nack = new proto_1.Nack(payload).deserialize();
+                utils_1.Logger.debug(`[Framer] Processing NACK with ${nack.sequences.length} sequences`);
                 for (const seq of nack.sequences) {
                     const lostFrames = this.outputBackup.get(seq) ?? [];
+                    utils_1.Logger.debug(`[Framer] Resending ${lostFrames.length} lost frames for sequence ${seq}`);
                     for (const lostFrame of lostFrames) {
                         this.sendFrame(lostFrame, proto_1.Priority.Immediate);
                     }
-                    // this.outputBackup.delete(seq);
                 }
                 break;
             }
@@ -133,8 +132,7 @@ class Framer {
     }
     processFrame(frame) {
         const header = frame.payload[0];
-        if (this.client.options.debug)
-            utils_1.Logger.debug(`Received FrameSet Packet ${header}`);
+        utils_1.Logger.debug(`[Framer] Processing frame with header ${header}`);
         if (this.client.status === proto_1.Status.Connecting) {
             switch (header) {
                 case proto_1.Packet.ConnectionRequest: {
@@ -155,7 +153,7 @@ class Framer {
                     break;
                 }
                 case proto_1.Packet.DisconnectionNotification: {
-                    const packet = new disconnect_1.default(frame.payload).deserialize();
+                    utils_1.Logger.info("[Framer] Received disconnection notification while connecting");
                     this.client.cleanup();
                     break;
                 }
@@ -172,12 +170,18 @@ class Framer {
                     this.frameAndSend(pong.serialize(), proto_1.Priority.Immediate);
                     break;
                 }
+                case proto_1.Packet.ConnectedPong: {
+                    const packet = new proto_1.ConnectedPong(frame.payload).deserialize();
+                    utils_1.Logger.debug(`[Framer] Received pong, latency: ${Date.now() - Number(packet.pingTime)}ms`);
+                    this.client.emit("connected-pong", packet);
+                    break;
+                }
                 case 0xfe: {
                     this.client.emit("encapsulated", frame.payload);
                     break;
                 }
                 case proto_1.Packet.DisconnectionNotification: {
-                    const packet = new disconnect_1.default(frame.payload).deserialize();
+                    utils_1.Logger.info("[Framer] Received disconnection notification");
                     this.client.cleanup();
                     break;
                 }
@@ -187,20 +191,19 @@ class Framer {
     handle(frameSet) {
         try {
             if (this.receivedFrameSequences.has(frameSet.sequence)) {
-                if (this.client.options.debug)
-                    utils_1.Logger.debug(`Received duplicate frameset ${frameSet.sequence}`);
+                utils_1.Logger.debug(`[Framer] Received duplicate frameset ${frameSet.sequence}`);
                 return;
             }
             this.lostFrameSequences.delete(frameSet.sequence);
             if (frameSet.sequence < this.lastInputSequence ||
                 frameSet.sequence === this.lastInputSequence) {
-                if (this.client.options.debug)
-                    utils_1.Logger.debug(`Received out of order frameset ${frameSet.sequence}!`);
+                utils_1.Logger.debug(`[Framer] Received out of order frameset ${frameSet.sequence}!`);
                 return;
             }
             this.receivedFrameSequences.add(frameSet.sequence);
             const diff = frameSet.sequence - this.lastInputSequence;
             if (diff > 1) {
+                utils_1.Logger.debug(`[Framer] Detected ${diff - 1} missing sequences between ${this.lastInputSequence} and ${frameSet.sequence}`);
                 for (let index = this.lastInputSequence + 1; index < frameSet.sequence; index++) {
                     this.lostFrameSequences.add(index);
                 }
@@ -211,15 +214,18 @@ class Framer {
                     this.handleFrame(frame);
                 }
                 catch (err) {
-                    utils_1.Logger.error("Error handling frame", err);
+                    utils_1.Logger.error("[Framer] Error handling frame", err);
                 }
             }
         }
         catch (err) {
-            utils_1.Logger.error("Error handling frameset", err);
+            utils_1.Logger.error("[Framer] Error handling frameset", err);
         }
     }
     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);
         }
@@ -241,7 +247,7 @@ class Framer {
         else if (frame.orderedFrameIndex > expectedOrderIndex) {
             if (this.client.options.debug)
                 utils_1.Logger.debug(`Queuing out-of-order frame: ${frame.orderedFrameIndex}`);
-            const unorderedQueue = this.inputOrderingQueue.get(frame.orderChannel);
+            const unorderedQueue = this.inputOrderingQueue[frame.orderChannel];
             if (!unorderedQueue)
                 return;
             unorderedQueue.set(frame.orderedFrameIndex, frame);
@@ -255,7 +261,7 @@ class Framer {
         this.inputOrderIndex[frame.orderChannel] = frame.orderedFrameIndex + 1;
         this.inputHighestSequenceIndex[frame.orderChannel] = 0;
         this.processFrame(frame);
-        const outOfOrderQueue = this.inputOrderingQueue.get(frame.orderChannel);
+        const outOfOrderQueue = this.inputOrderingQueue[frame.orderChannel];
         let nextOrderIndex = this.inputOrderIndex[frame.orderChannel];
         for (; outOfOrderQueue.has(nextOrderIndex); nextOrderIndex++) {
             const nextFrame = outOfOrderQueue.get(nextOrderIndex);
@@ -264,7 +270,6 @@ class Framer {
                 outOfOrderQueue.delete(nextOrderIndex);
             }
         }
-        this.inputOrderingQueue.set(frame.orderChannel, outOfOrderQueue);
         this.inputOrderIndex[frame.orderChannel] = nextOrderIndex;
     }
     handleSequenced(frame) {
@@ -318,7 +323,6 @@ class Framer {
     }
     frameAndSend(payload, priority = proto_1.Priority.Normal) {
         const frame = new proto_1.Frame();
-        frame.reliability = proto_1.Reliability.ReliableOrdered;
         frame.orderChannel = 0;
         frame.payload = payload;
         this.sendFrame(frame, priority);
@@ -335,7 +339,11 @@ class Framer {
         const maxSize = this.client.options.mtuSize - 36;
         const splitSize = Math.ceil(frame.payload.byteLength / maxSize);
         if (frame.payload.byteLength > maxSize) {
-            this.handleLargePayload(frame, maxSize, splitSize);
+            const splitId = this.outputSplitIndex++ & 0xffff;
+            for (let index = 0; index < frame.payload.byteLength; index += maxSize) {
+                const nframe = this.createSplitFrame(frame, index, maxSize, splitId, splitSize);
+                this.queueFrame(nframe, proto_1.Priority.Immediate);
+            }
         }
         else {
             if (frame.isReliable)
@@ -343,13 +351,6 @@ class Framer {
             this.queueFrame(frame, priority);
         }
     }
-    handleLargePayload(frame, maxSize, splitSize) {
-        const splitId = this.outputSplitIndex++ % 65_536;
-        for (let index = 0; index < frame.payload.byteLength; index += maxSize) {
-            const nframe = this.createSplitFrame(frame, index, maxSize, splitId, splitSize);
-            this.queueFrame(nframe, proto_1.Priority.Immediate);
-        }
-    }
     createSplitFrame(originalFrame, index, maxSize, splitId, splitSize) {
         const nframe = new proto_1.Frame();
         nframe.reliableFrameIndex = this.outputReliableIndex++;
@@ -367,27 +368,30 @@ class Framer {
         return nframe;
     }
     queueFrame(frame, priority) {
-        let length = 4;
-        for (const queuedFrame of this.outputFrames) {
-            length += queuedFrame.getByteLength();
-        }
-        if (length + frame.getByteLength() > this.client.options.mtuSize - 36) {
-            this.sendQueue(this.outputFrames.size);
+        const frameLength = frame.getByteLength();
+        const totalLength = 4 + this.outputFramesByteLength + frameLength;
+        if (totalLength > this.client.options.mtuSize - 36) {
+            this.sendQueue(this.outputFrames.length);
         }
-        this.outputFrames.add(frame);
+        this.outputFrames.push(frame);
+        this.outputFramesByteLength += frameLength;
         if (priority === proto_1.Priority.Immediate) {
             this.sendQueue(1);
         }
     }
     sendQueue(amount) {
-        if (this.outputFrames.size === 0)
+        if (this.outputFrames.length === 0)
             return;
+        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++;
-        frameset.frames = [...this.outputFrames].slice(0, amount);
-        this.outputBackup.set(frameset.sequence, frameset.frames);
-        for (const frame of frameset.frames)
-            this.outputFrames.delete(frame);
+        const framesToSend = this.outputFrames.slice(0, amount);
+        frameset.frames = framesToSend;
+        this.outputFrames = this.outputFrames.slice(amount);
+        const sentLength = framesToSend.reduce((sum, f) => sum + f.getByteLength(), 0);
+        this.outputFramesByteLength -= sentLength;
+        this.outputBackup.set(frameset.sequence, framesToSend);
+        utils_1.Logger.debug(`[Framer] Frameset sequence: ${frameset.sequence}, remaining in queue: ${this.outputFrames.length}`);
         this.client.send(frameset.serialize());
     }
 }

package/dist/tests/server.js

@@ -11,7 +11,7 @@ const server = new server_1.Server({
 });
 server.start();
 server.on("connect", (connection) => {
-    utils_1.Logger.info(`Connection from ${connection.remoteInfo.address}:${connection.remoteInfo.port} established in ${connection.getConnectionTime()}ms`);
+    utils_1.Logger.info(`Connection from ${connection.remoteInfo.address}:${connection.remoteInfo.port} established in unknown ms`);
     connection.on("encapsulated", (packet) => {
         utils_1.Logger.info(`Received Encapsulated packet: ${packet.toString("hex")}`);
     });

package/dist/utils/Logger.d.ts

@@ -1,4 +1,4 @@
-type LogData = string | number | boolean | null | undefined | object;
+type LogData = string | number | boolean | null | undefined | object | unknown;
 declare const Logger: {
     disabled: boolean;
     debugEnabled: boolean;

package/dist/utils/Logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/utils/Logger.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAAC;AAuCrE,QAAA,MAAM,MAAM;;;kBAIG,OAAO,EAAE,GAAG,IAAI;mBAIf,OAAO,EAAE,GAAG,IAAI;kBAIjB,OAAO,EAAE,GAAG,IAAI;mBAIf,OAAO,EAAE,GAAG,IAAI;kBAKjB,OAAO,EAAE,GAAG,IAAI;YAItB,MAAM;iBAOD,OAAO,EAAE,GAAG,IAAI;kBAKf,OAAO,EAAE,GAAG,IAAI;sBAIZ,OAAO,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,EAAE;CAkClD,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,CAAC"}
+{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/utils/Logger.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAuC/E,QAAA,MAAM,MAAM;;;kBAIG,OAAO,EAAE,GAAG,IAAI;mBAIf,OAAO,EAAE,GAAG,IAAI;kBAIjB,OAAO,EAAE,GAAG,IAAI;mBAIf,OAAO,EAAE,GAAG,IAAI;kBAKjB,OAAO,EAAE,GAAG,IAAI;YAItB,MAAM;iBAOD,OAAO,EAAE,GAAG,IAAI;kBAKf,OAAO,EAAE,GAAG,IAAI;sBAIZ,OAAO,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,EAAE;CAkClD,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanctumterra/raknet",
-  "version": "1.3.70",
+  "version": "1.3.72",
   "description": "",
   "main": "dist/index.js",
   "scripts": {