@sanctumterra/raknet 1.3.79 → 1.3.80

package/dist/client/client.d.ts

@@ -1,9 +1,8 @@
 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, Frame, type Priority, Status } from "../proto";
-import { type ClientOptions } from "./client-options";
+import { Framer } from "./framer";
+import { type ClientEvents, type ClientOptions } from "./types";
 export declare class Client extends Emitter<ClientEvents> {
     socket: Socket | null;
     framer: Framer | null;
@@ -16,13 +15,10 @@ export declare class Client extends Emitter<ClientEvents> {
     constructor(options?: Partial<ClientOptions>);
     initSocket(): void;
     ping(): Promise<Advertisement>;
-    connect(): Promise<Advertisement>;
+    connect(): Promise<Advertisement | null>;
     sendFrame(frame: Frame, priority: Priority): void;
     frameAndSend(payload: Buffer, priority: Priority): void;
     send(buffer: Buffer): void;
-    private cleanupSocket;
-    private cleanupFramer;
-    cleanup(): void;
     disconnect(): Promise<void>;
 }
 //# sourceMappingURL=client.d.ts.map

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,EAClB,KAAK,EAIL,KAAK,QAAQ,EACb,MAAM,EAGN,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,kBAAkB,CAAC;AAO5E,qBAAa,MAAO,SAAQ,OAAO,CAAC,YAAY,CAAC;IACzC,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,iBAAiB,CAAC,CAAiB;IAC3C,OAAO,CAAC,eAAe,CAAC,CAAiB;IAClC,aAAa,EAAG,OAAO,GAAG,IAAI,CAAC;IAE/B,MAAM,SAAuB;gBAExB,OAAO,GAAE,OAAO,CAAC,aAAa,CAAwB;IAM3D,UAAU;IAuBJ,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC;IAkB9B,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC;IA4GvC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAYjD,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAOvD,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAiCjC,OAAO,CAAC,aAAa;IAgDrB,OAAO,CAAC,aAAa;IAOd,OAAO,IAAI,IAAI;IAqCf,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAkClC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EACN,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,EAIL,KAAK,QAAQ,EACb,MAAM,EAGN,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,aAAa,EAElB,MAAM,SAAS,CAAC;AAKjB,qBAAa,MAAO,SAAQ,OAAO,CAAC,YAAY,CAAC;IACzC,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,iBAAiB,CAAC,CAAiB;IAC3C,OAAO,CAAC,eAAe,CAAC,CAAiB;IAClC,aAAa,EAAG,OAAO,GAAG,IAAI,CAAC;IAE/B,MAAM,SAAuB;gBAExB,OAAO,GAAE,OAAO,CAAC,aAAa,CAAwB;IAM3D,UAAU;IAuBJ,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC;IAkB9B,OAAO,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAmG9C,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAYjD,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAOvD,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAiC1B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAiClC"}

package/dist/client/client.js

@@ -6,11 +6,11 @@ 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");
+const framer_1 = require("./framer");
+const types_1 = require("./types");
 const TICK_INTERVAL = 50;
 const REQUEST_INTERVAL = 500;
 class Client extends emitter_1.Emitter {
@@ -22,9 +22,9 @@ class Client extends emitter_1.Emitter {
     requestInterval;
     serverAddress;
     status = proto_1.Status.Disconnected;
-    constructor(options = client_options_1.defaultClientOptions) {
+    constructor(options = types_1.defaultClientOptions) {
         super();
-        this.options = { ...client_options_1.defaultClientOptions, ...options };
+        this.options = { ...types_1.defaultClientOptions, ...options };
         this.maxListeners = 60;
     }
     initSocket() {
@@ -71,90 +71,75 @@ class Client extends emitter_1.Emitter {
         this.status = proto_1.Status.Connecting;
         this.initSocket();
         this.tickTimer = setInterval(() => this.emit("tick"), TICK_INTERVAL);
-        try {
-            const advertisement = await this.ping();
-            if (!advertisement)
-                throw new Error("Failed to get server advertisement");
-            return new Promise((resolve, reject) => {
-                let isResolved = false;
-                let currentStage = "request-one"; // Track connection stage
-                const cleanup = () => {
-                    if (this.connectionTimeout) {
-                        clearTimeout(this.connectionTimeout);
-                        this.connectionTimeout = undefined;
-                    }
-                    if (this.requestInterval) {
-                        clearInterval(this.requestInterval);
-                        this.requestInterval = undefined;
-                    }
-                    if (!isResolved) {
-                        utils_1.Logger.error("Could not resolve connection.");
-                        this.cleanup();
-                    }
-                };
-                // Setup connection timeout
-                this.connectionTimeout = setTimeout(() => {
-                    cleanup();
+        let advertisement = null;
+        const pongHandler = (packet) => {
+            advertisement = (0, proto_1.fromString)(packet.message);
+        };
+        this.once("unconnected-pong", pongHandler);
+        const ping = new proto_1.UnconnectedPing();
+        ping.guid = this.options.clientId;
+        ping.clientTimestamp = BigInt(Date.now());
+        this.send(ping.serialize());
+        return new Promise((resolve, reject) => {
+            let isResolved = false;
+            let currentStage = 0; // 0: request-one, 1: request-two, 2: completed
+            this.connectionTimeout = setTimeout(() => {
+                if (!isResolved) {
+                    isResolved = true;
+                    this.disconnect();
                     reject(new Error("Connection timed out"));
-                }, this.options.timeout);
-                // Prepare connection request one
-                const requestOne = new proto_1.OpenConnectionRequestOne();
-                requestOne.mtu = this.options.mtuSize;
-                requestOne.protocol = this.options.protocolVersion;
-                // Handle open-connection-reply-one event
-                this.once("open-connection-reply-one", () => {
-                    currentStage = "request-two";
-                    utils_1.Logger.debug("[Client] Received OpenConnectionReplyOne, sending OpenConnectionRequestTwo");
-                    // Move to next connection stage
-                    if (this.requestInterval) {
-                        clearInterval(this.requestInterval);
-                    }
-                    // Here we would send OpenConnectionRequestTwo
-                    // The framer handles this transition
-                });
-                // Handle open-connection-reply-two event
-                this.once("open-connection-reply-two", (packet) => {
-                    const mtu = packet.mtu;
-                    if (mtu > 400 && mtu < 1500) {
-                        currentStage = "completed";
-                        utils_1.Logger.debug(`[Client] Received OpenConnectionReplyTwo with MTU: ${mtu}`);
-                    }
-                    else {
-                        cleanup();
-                        reject(new Error(`Invalid MTU size: ${mtu}`));
-                    }
-                });
-                // Send initial request
-                this.emit("open-connection-request-one", requestOne);
-                this.send(requestOne.serialize());
-                // Set up interval to resend requests
-                this.requestInterval = setInterval(() => {
-                    if (!isResolved && currentStage === "request-one") {
-                        utils_1.Logger.debug("[Client] Resending OpenConnectionRequestOne");
-                        this.send(requestOne.serialize());
-                    }
-                }, REQUEST_INTERVAL);
-                // Handle successful connection
-                this.once("new-incoming-connection", () => {
+                }
+            }, this.options.timeout);
+            const requestOne = new proto_1.OpenConnectionRequestOne();
+            requestOne.mtu = this.options.mtuSize;
+            requestOne.protocol = this.options.protocolVersion;
+            this.once("open-connection-reply-one", () => {
+                currentStage = 1;
+                utils_1.Logger.debug("[Client] Received OpenConnectionReplyOne, sending OpenConnectionRequestTwo");
+                if (this.requestInterval)
+                    clearInterval(this.requestInterval);
+            });
+            this.once("open-connection-reply-two", (packet) => {
+                const mtu = packet.mtu;
+                if (mtu < 400 || mtu > 1500) {
                     if (!isResolved) {
                         isResolved = true;
-                        this.emit("connect", advertisement);
-                        this.status = proto_1.Status.Connected;
-                        cleanup();
-                        resolve(advertisement);
+                        this.disconnect();
+                        reject(new Error(`Invalid MTU size: ${mtu}`));
                     }
-                });
-                // Handle connection errors
-                this.once("error", (error) => {
-                    cleanup();
+                    return;
+                }
+                currentStage = 2;
+                utils_1.Logger.debug(`[Client] Received OpenConnectionReplyTwo with MTU: ${mtu}`);
+            });
+            this.once("new-incoming-connection", () => {
+                if (!isResolved) {
+                    isResolved = true;
+                    this.status = proto_1.Status.Connected;
+                    this.emit("connect");
+                    if (this.connectionTimeout)
+                        clearTimeout(this.connectionTimeout);
+                    if (this.requestInterval)
+                        clearInterval(this.requestInterval);
+                    resolve(advertisement);
+                }
+            });
+            this.once("error", (error) => {
+                if (!isResolved) {
+                    isResolved = true;
+                    this.disconnect();
                     reject(error);
-                });
+                }
             });
-        }
-        catch (error) {
-            this.status = proto_1.Status.Disconnected;
-            throw error;
-        }
+            this.emit("open-connection-request-one", requestOne);
+            this.send(requestOne.serialize());
+            this.requestInterval = setInterval(() => {
+                if (!isResolved && currentStage === 0) {
+                    utils_1.Logger.debug("[Client] Resending OpenConnectionRequestOne");
+                    this.send(requestOne.serialize());
+                }
+            }, REQUEST_INTERVAL);
+        });
     }
     sendFrame(frame, priority) {
         try {
@@ -195,113 +180,30 @@ class Client extends emitter_1.Emitter {
             utils_1.Logger.error("[Client] Failed to send packet", error);
         }
     }
-    cleanupSocket() {
-        if (!this.socket)
-            return;
-        try {
-            this.socket.removeAllListeners();
-            if (this.status === proto_1.Status.Connected) {
-                const disconnect = new disconnect_1.default();
-                this.socket.send(disconnect.serialize(), 0, disconnect.serialize().length, this.options.port, this.options.address);
-            }
-            const stateSymbol = Symbol.for("state symbol");
-            const socketWithState = this.socket;
-            const state = socketWithState[stateSymbol];
-            if (state?.handle) {
-                state.handle.close();
-                state.handle = null;
-            }
-            this.socket.close(() => {
-                utils_1.Logger.info("[Client] Socket closed");
-                this.socket?.removeAllListeners();
-            });
-            // (this.socket as { _handle?: unknown })._handle = undefined;
-        }
-        catch (err) {
-            utils_1.Logger.error("[Client] Error during socket cleanup", err);
-            try {
-                const stateSymbol = Symbol.for("state symbol");
-                const socketWithState = this.socket;
-                const state = socketWithState[stateSymbol];
-                if (state?.handle) {
-                    state.handle.close();
-                    state.handle = null;
-                }
-            }
-            catch (_) { }
-            this.socket = null;
-        }
-    }
-    cleanupFramer() {
-        if (!this.framer)
-            return;
-        this.framer._events = undefined;
-        this.framer._eventsCount = undefined;
-        this.framer = null;
-    }
-    cleanup() {
-        if (this.status === proto_1.Status.Disconnected)
-            return;
-        utils_1.Logger.debug("[Client] Cleaning up connection and resources");
-        const wasConnected = this.status === proto_1.Status.Connected;
-        this.status = proto_1.Status.Disconnecting;
-        this.remove("tick", () => this.framer?.tick());
-        if (this.tickTimer) {
-            clearInterval(this.tickTimer);
-            this.tickTimer = undefined;
-        }
-        if (this.connectionTimeout) {
-            clearTimeout(this.connectionTimeout);
-            this.connectionTimeout = undefined;
-        }
-        if (this.requestInterval) {
-            clearInterval(this.requestInterval);
-            this.requestInterval = undefined;
-        }
-        this.removeAll();
-        this.removeAllAfter();
-        this.removeAllBefore();
-        this.cleanupSocket();
-        this.cleanupFramer();
-        this.serverAddress = null;
-        this._events = undefined;
-        this._eventsCount = undefined;
-        this.status = proto_1.Status.Disconnected;
-        utils_1.Logger.debug("[Client] Cleanup complete");
-    }
     disconnect() {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
             if (this.status === proto_1.Status.Disconnected) {
                 resolve();
                 return;
             }
-            const cleanupTimeout = setTimeout(() => {
-                utils_1.Logger.warn("[Client] Disconnect timeout reached, forcing cleanup");
-                try {
-                    this.cleanup();
-                    resolve();
-                }
-                catch (error) {
-                    reject(error);
+            const wasConnected = this.status === proto_1.Status.Connected;
+            this.status = proto_1.Status.Disconnected;
+            if (this.tickTimer)
+                clearInterval(this.tickTimer);
+            if (this.connectionTimeout)
+                clearTimeout(this.connectionTimeout);
+            if (this.requestInterval)
+                clearInterval(this.requestInterval);
+            if (this.socket) {
+                if (wasConnected) {
+                    const disconnect = new disconnect_1.default();
+                    this.socket.send(disconnect.serialize(), 0, disconnect.serialize().length, this.options.port, this.options.address);
                 }
-            }, 5000);
-            try {
-                setImmediate(() => {
-                    try {
-                        this.cleanup();
-                        clearTimeout(cleanupTimeout);
-                        resolve();
-                    }
-                    catch (error) {
-                        clearTimeout(cleanupTimeout);
-                        reject(error);
-                    }
-                });
-            }
-            catch (error) {
-                clearTimeout(cleanupTimeout);
-                reject(error);
+                this.socket.close();
+                this.socket = null;
             }
+            this.framer = null;
+            resolve();
         });
     }
 }

package/dist/client/framer.d.ts

@@ -1,7 +1,6 @@
-import { Frame, Priority } from "../proto";
-import { Frameset } from "../proto";
-import type { Client } from "./client";
 import type { RemoteInfo } from "node:dgram";
+import { Frame, Frameset, Priority } from "../proto";
+import type { Client } from "./client";
 interface QueuedFrame {
     frame: Frame;
     timestamp: number;
@@ -50,7 +49,7 @@ export declare class Framer {
     sendFrame(frame: Frame, priority: Priority): void;
     private createSplitFrame;
     private queueFrame;
-    sendQueue(amount: number): void;
+    sendQueue(): void;
 }
 export {};
 //# sourceMappingURL=framer.d.ts.map

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,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;AAS7C,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,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAoEzD,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;IAiCxD,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,UAAU;IAqBX,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CA6BtC"}
+{"version":3,"file":"framer.d.ts","sourceRoot":"","sources":["../../src/client/framer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAMN,KAAK,EACL,QAAQ,EAOR,QAAQ,EAIR,MAAM,UAAU,CAAC;AAGlB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AASvC,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;IA+BX,OAAO,CAAC,0BAA0B;IAkBlC,OAAO,CAAC,2BAA2B;IAiC5B,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAqEzD,OAAO,CAAC,YAAY;IA2Eb,MAAM,CAAC,QAAQ,EAAE,QAAQ;IAyDhC,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;IAiCxD,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,UAAU;IAqBX,SAAS,IAAI,IAAI;CA0BxB"}

package/dist/client/framer.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Framer = void 0;
-const proto_1 = require("../proto");
-const proto_2 = require("../proto");
-const utils_1 = require("../utils");
 const binarystream_1 = require("@serenityjs/binarystream");
+const proto_1 = require("../proto");
 const connection_request_accepted_1 = require("../proto/packets/connection-request-accepted");
+const utils_1 = require("../utils");
 // Constants for packet handling
 const PACKET_HEADER_MASK = 0xf0;
 const PACKET_HEADER_FRAMESET = 0x80;
 const PACKET_ENCAPSULATED = 0xfe;
-const PING_INTERVAL = 50; // Send ping every 50 ticks
+const PING_INTERVAL = 50;
 const MTU_HEADER_SIZE = 36;
 class Framer {
     client;
@@ -32,13 +31,13 @@ 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
+    BATCH_SIZE = 32;
+    MAX_BATCH_INTERVAL = 50;
     lastBatchTime = 0;
     ORDERING_QUEUE_TIMEOUT = 500;
     constructor(client) {
         this.client = client;
-        this.outputFrameQueue = new proto_2.Frameset();
+        this.outputFrameQueue = new proto_1.Frameset();
         this.outputFrameQueue.frames = [];
         this.outputOrderIndex = new Array(32).fill(0);
         this.outputSequenceIndex = new Array(32).fill(0);
@@ -57,20 +56,16 @@ class Framer {
             ping.timestamp = BigInt(now);
             this.frameAndSend(ping.serialize(), proto_1.Priority.Immediate);
         }
-        // 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.sendQueue();
             this.lastBatchTime = now;
         }
     }
     processBatchedAcksAndNacks() {
-        // Batch process ACKs
         if (this.receivedFrameSequences.size > 0) {
             const ackSeqs = Array.from(this.receivedFrameSequences);
             this.receivedFrameSequences.clear();
@@ -78,7 +73,6 @@ class Framer {
             ack.sequences = ackSeqs;
             this.client.send(ack.serialize());
         }
-        // Batch process NACKs
         if (this.lostFrameSequences.size > 0) {
             const nackSeqs = Array.from(this.lostFrameSequences);
             this.lostFrameSequences.clear();
@@ -170,7 +164,7 @@ class Framer {
                 break;
             }
             case PACKET_HEADER_FRAMESET: {
-                const frameset = new proto_2.Frameset(payload).deserialize();
+                const frameset = new proto_1.Frameset(payload).deserialize();
                 this.client.emit("frameset", frameset);
                 this.handle(frameset);
                 break;
@@ -210,7 +204,7 @@ class Framer {
                 }
                 case proto_1.Packet.DisconnectionNotification: {
                     utils_1.Logger.info("[Framer] Received disconnection notification while connecting");
-                    this.client.cleanup();
+                    this.client.disconnect();
                     break;
                 }
             }
@@ -240,7 +234,7 @@ class Framer {
                 }
                 case proto_1.Packet.DisconnectionNotification: {
                     utils_1.Logger.info("[Framer] Received disconnection notification");
-                    this.client.cleanup();
+                    this.client.disconnect();
                     break;
                 }
             }
@@ -272,7 +266,6 @@ class Framer {
                 }
             }
             this.lastInputSequence = frameSet.sequence;
-            // 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);
@@ -431,22 +424,21 @@ class Framer {
         const totalLength = 4 + this.outputFramesByteLength + frameLength;
         if (totalLength > this.mtuDiff ||
             this.outputFrames.length >= this.BATCH_SIZE) {
-            this.sendQueue(this.outputFrames.length);
+            this.sendQueue();
             this.lastBatchTime = Date.now();
         }
         this.outputFrames.push(frame);
         this.outputFramesByteLength += frameLength;
         if (priority === proto_1.Priority.Immediate) {
-            this.sendQueue(1);
+            this.sendQueue();
             this.lastBatchTime = Date.now();
         }
     }
-    sendQueue(amount) {
+    sendQueue() {
         if (this.outputFrames.length === 0)
             return;
-        const frameset = new proto_2.Frameset();
+        const frameset = new proto_1.Frameset();
         frameset.sequence = this.outputSequence++;
-        // Send in batches if amount is larger than batch size
         const remainingFrames = [...this.outputFrames];
         this.outputFrames = [];
         while (remainingFrames.length > 0) {
@@ -457,7 +449,6 @@ class Framer {
             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++;
             }

package/dist/client/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./client-events";
 export * from "./client";
-export * from "./client-options";
+export * from "./types";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}

package/dist/client/index.js

@@ -14,6 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./client-events"), exports);
 __exportStar(require("./client"), exports);
-__exportStar(require("./client-options"), exports);
+__exportStar(require("./types"), exports);

package/dist/client/{client-events.d.ts → types/client-events.d.ts}

@@ -1,5 +1,5 @@
-import type { Ack, Advertisement, ConnectedPing, ConnectedPong, ConnectionRequest, ConnectionRequestAccepted, NewIncomingConnection, OpenConnectionReplyOne, OpenConnectionReplyTwo, OpenConnectionRequestOne, OpenConnectionRequestTwo, UnconnectedPing, UnconnectedPong } from "../proto";
-import type { Frameset } from "../proto/packets/frameset";
+import type { Ack, 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];
     "open-connection-reply-two": [OpenConnectionReplyTwo];
@@ -17,7 +17,7 @@ export interface ClientEvents {
     ack: [Ack];
     error: [Error];
     close: [];
-    connect: [Advertisement];
+    connect: [];
     tick: [];
 }
 //# sourceMappingURL=client-events.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"client-events.d.ts","sourceRoot":"","sources":["../../../src/client/types/client-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,GAAG,EAEH,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,yBAAyB,EACzB,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,wBAAwB,EACxB,eAAe,EACf,eAAe,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE7D,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,EAAE,CAAC;IACZ,IAAI,EAAE,EAAE,CAAC;CACT"}

package/dist/client/{client-options.d.ts → types/client-options.d.ts}

@@ -9,5 +9,5 @@ type ClientOptions = {
     loggerDisabled: boolean;
 };
 declare const defaultClientOptions: ClientOptions;
-export { type ClientOptions, defaultClientOptions };
+export { defaultClientOptions, type ClientOptions };
 //# sourceMappingURL=client-options.d.ts.map

package/dist/client/types/client-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-options.d.ts","sourceRoot":"","sources":["../../../src/client/types/client-options.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,QAAA,MAAM,oBAAoB,EAAE,aAS3B,CAAC;AAEF,OAAO,EAAE,oBAAoB,EAAE,KAAK,aAAa,EAAE,CAAC"}

package/dist/client/{client-options.js → types/client-options.js}

@@ -6,9 +6,9 @@ const defaultClientOptions = {
     port: 19132,
     protocolVersion: 11,
     mtuSize: 1492,
-    clientId: BigInt(Math.floor(Math.random() * 1000000000000000000)),
+    clientId: BigInt(Math.floor(Math.random() * Number.MAX_SAFE_INTEGER)),
     debug: false,
-    timeout: 5000,
+    timeout: 10000,
     loggerDisabled: false,
 };
 exports.defaultClientOptions = defaultClientOptions;

package/dist/client/types/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./client-events";
+export * from "./client-options";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}

package/dist/client/types/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./client-events"), exports);
+__exportStar(require("./client-options"), exports);

package/dist/utils/index.d.ts

@@ -1,2 +1,3 @@
+export * from "./decorators";
 export * from "./Logger";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC"}

package/dist/utils/index.js

@@ -14,4 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./decorators"), exports);
 __exportStar(require("./Logger"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanctumterra/raknet",
-  "version": "1.3.79",
+  "version": "1.3.80",
   "description": "",
   "main": "dist/index.js",
   "module": "commonjs",
@@ -9,8 +9,8 @@
     "watch": "tsc --watch",
     "format": "npx @biomejs/biome format ./src",
     "lint": "npx @biomejs/biome lint ./src",
-    "lint-write": "npx @biomejs/biome lint --write ./src",
-    "format-write": "npx @biomejs/biome format --write ./src"
+    "lint:write": "npx @biomejs/biome lint --write ./src",
+    "format:write": "npx @biomejs/biome format --write ./src"
   },
   "keywords": [],
   "author": "",

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

@@ -1 +0,0 @@
-{"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-options.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"client-options.d.ts","sourceRoot":"","sources":["../../src/client/client-options.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,QAAA,MAAM,oBAAoB,EAAE,aAS3B,CAAC;AAEF,OAAO,EAAE,KAAK,aAAa,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/client/client_options.d.ts

@@ -1,10 +0,0 @@
-type ClientOptions = {
-    address: string;
-    port: number;
-    mtuSize: number;
-    debug: boolean;
-    timeout: number;
-};
-declare const defaultClientOptions: ClientOptions;
-export { type ClientOptions, defaultClientOptions };
-//# sourceMappingURL=client_options.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"client_options.d.ts","sourceRoot":"","sources":["../../src/client/client_options.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,QAAA,MAAM,oBAAoB,EAAE,aAM3B,CAAC;AAEF,OAAO,EAAE,KAAK,aAAa,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/client/client_options.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultClientOptions = void 0;
-const defaultClientOptions = {
-    address: "127.0.0.1",
-    port: 19132,
-    mtuSize: 1492,
-    debug: false,
-    timeout: 5000,
-};
-exports.defaultClientOptions = defaultClientOptions;