@sanctumterra/raknet 1.4.11 → 1.4.13

package/dist/client/client.d.ts

@@ -20,6 +20,7 @@ export declare class Client extends EventEmitter<ClientEvents> {
     private resolvedAddress;
     private proxyReady;
     private lastPongTime;
+    private lastActivityTime;
     private isDisconnected;
     constructor(options?: Partial<ClientOptions>);
     private setupProxy;

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,EAEN,YAAY,EAWZ,QAAQ,EAIR,KAAK,KAAK,EAKV,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EACN,KAAK,aAAa,EAElB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAgB,KAAK,UAAU,EAAe,MAAM,YAAY,CAAC;AAKxE,qBAAa,MAAO,SAAQ,YAAY,CAAC,YAAY,CAAC;IACrD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAiC;IACnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAO;IACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAO;IAE3C,OAAO,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,MAAM,CAAmB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,cAAc,CAAS;gBAEnB,OAAO,GAAE,OAAO,CAAC,aAAa,CAAM;YAmBlC,UAAU;IAoGxB,OAAO,CAAC,wBAAwB;IAIhC,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,qBAAqB;IA4B7B,OAAO,CAAC,oBAAoB;IA2Bf,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAiD9B,MAAM,IAAI,IAAI;IA6BrB,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,OAAO;IAgBR,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAuEhD,YAAY,CAAC,IAAI,EAAE,MAAM;IAgDzB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,QAA0B;IAI5D,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,QAA0B;IAI/D,IAAI,IAAI,IAAI;IAOZ,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAWxB,UAAU,IAAI,IAAI;CAWzB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,YAAY,EAWZ,QAAQ,EAIR,KAAK,KAAK,EAKV,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EACN,KAAK,aAAa,EAElB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAgB,KAAK,UAAU,EAAe,MAAM,YAAY,CAAC;AAKxE,qBAAa,MAAO,SAAQ,YAAY,CAAC,YAAY,CAAC;IACrD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAiC;IACnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAO;IACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAO;IAE3C,OAAO,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,MAAM,CAAmB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,cAAc,CAAS;gBAEnB,OAAO,GAAE,OAAO,CAAC,aAAa,CAAM;YAmBlC,UAAU;IAoGxB,OAAO,CAAC,wBAAwB;IAIhC,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,qBAAqB;IA4B7B,OAAO,CAAC,oBAAoB;IA2Bf,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAiD9B,MAAM,IAAI,IAAI;IA6BrB,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,OAAO;IAgBR,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAmEhD,YAAY,CAAC,IAAI,EAAE,MAAM;IAkDzB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,QAA0B;IAI5D,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,QAA0B;IAI/D,IAAI,IAAI,IAAI;IAOZ,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAWxB,UAAU,IAAI,IAAI;CAWzB"}

package/dist/client/client.js

@@ -25,6 +25,7 @@ class Client extends shared_1.EventEmitter {
     resolvedAddress = null;
     proxyReady = false;
     lastPongTime = Date.now();
+    lastActivityTime = Date.now();
     isDisconnected = false;
     constructor(options = {}) {
         super();
@@ -35,7 +36,7 @@ class Client extends shared_1.EventEmitter {
         this.socket.bind();
         this.interval = setInterval(this.onTick.bind(this), 1000 / this.options.tickRate);
         this.socket.on("message", this.onMessage.bind(this));
-        this.session = new shared_1.NetworkSession(this.options.mtu);
+        this.session = new shared_1.NetworkSession(this.options.mtu, this.options.debug);
         this.session.send = this.send.bind(this);
         this.session.handle = (data) => {
             this.handleOnline(data);
@@ -255,9 +256,9 @@ class Client extends shared_1.EventEmitter {
             if (this.tick % Client.PING_INTERVAL_TICKS === 0) {
                 this.sendConnectedPing();
             }
-            // Check for stale connection
-            const timeSinceLastPong = Date.now() - this.lastPongTime;
-            if (timeSinceLastPong > Client.STALE_TIMEOUT_MS) {
+            // Check for stale connection (no activity at all)
+            const timeSinceLastActivity = Date.now() - this.lastActivityTime;
+            if (timeSinceLastActivity > Client.STALE_TIMEOUT_MS) {
                 this.handleDisconnect("Connection timed out (stale)");
                 return;
             }
@@ -337,23 +338,19 @@ class Client extends shared_1.EventEmitter {
                 break;
             }
             case shared_1.Packets.FrameSet: {
-                try {
-                    const frameSet = new shared_1.FrameSet(actualData).deserialize();
-                    this.session.onFrameSet(frameSet);
-                }
-                catch (error) {
-                    const message = error instanceof Error ? error.message : "Unknown error";
-                    shared_2.Logger.error(`Frame set error: ${message}`);
-                    this.handleDisconnect(`Frame set error: ${message}`);
-                }
+                this.lastActivityTime = Date.now();
+                const frameSet = new shared_1.FrameSet(actualData).deserialize();
+                this.session.onFrameSet(frameSet);
                 break;
             }
             case shared_1.Packets.Ack: {
+                this.lastActivityTime = Date.now();
                 const ack = new shared_1.Ack(actualData).deserialize();
                 this.session.onAck(ack);
                 break;
             }
             case shared_1.Packets.Nack: {
+                this.lastActivityTime = Date.now();
                 const nack = new shared_1.Ack(actualData).deserialize();
                 this.session.onNack(nack);
                 break;
@@ -397,7 +394,9 @@ class Client extends shared_1.EventEmitter {
                 this.frameAndSend(nic.serialize(), shared_1.Priority.High);
                 this.status = shared_1.ConnectionStatus.Connected;
                 this.lastPongTime = Date.now(); // Reset stale timer on connect
+                this.lastActivityTime = Date.now();
                 this.emit("connect");
+                console.log("Raknet Connected");
                 break;
             }
             default: {

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

@@ -13,6 +13,7 @@ export type ClientOptions = {
     pingRate: number;
     timeout: number;
     proxy?: ProxyOptions;
+    debug: boolean;
 };
 export declare const generateGuid: () => bigint;
 export declare const createDefaultClientOptions: () => ClientOptions;

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

@@ -1 +1 @@
-{"version":3,"file":"client-options.d.ts","sourceRoot":"","sources":["../../../src/client/types/client-options.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,YAAY,QAAO,MAC0B,CAAC;AAE3D,eAAO,MAAM,0BAA0B,QAAO,aAQ5C,CAAC"}
+{"version":3,"file":"client-options.d.ts","sourceRoot":"","sources":["../../../src/client/types/client-options.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,YAAY,QAAO,MAC0B,CAAC;AAE3D,eAAO,MAAM,0BAA0B,QAAO,aAS5C,CAAC"}

package/dist/client/types/client-options.js

@@ -11,5 +11,6 @@ const createDefaultClientOptions = () => ({
     tickRate: 20,
     pingRate: 40,
     timeout: 30000,
+    debug: false,
 });
 exports.createDefaultClientOptions = createDefaultClientOptions;

package/dist/server/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/server/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,GAAG,EAOR,YAAY,EACZ,KAAK,KAAK,EACV,KAAK,QAAQ,EAIb,QAAQ,EACR,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,qBAAa,UAAW,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IAS5D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,IAAI;IAXb,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAO;IAElD,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,cAAc,CAAS;gBAGtB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,UAAU,EACjB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM;IAQd,MAAM,CAAC,IAAI,EAAE,MAAM;IAoBnB,UAAU,CAAC,MAAM,SAAiB,GAAG,IAAI;IAYzC,OAAO,IAAI,OAAO;IAIlB,UAAU,CAAC,QAAQ,EAAE,QAAQ;IAW7B,UAAU,IAAI,UAAU;IAIxB,SAAS,CAAC,IAAI,EAAE,MAAM;IA2DtB,KAAK,CAAC,OAAO,EAAE,GAAG;IAIzB,uFAAuF;IAChF,MAAM,CAAC,OAAO,EAAE,GAAG;IAInB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,QAAwB;IAI1D,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,QAAwB;IAIhE,IAAI,CAAC,IAAI,EAAE,MAAM;CAGxB"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/server/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,GAAG,EAOR,YAAY,EACZ,KAAK,KAAK,EACV,KAAK,QAAQ,EAIb,QAAQ,EACR,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,qBAAa,UAAW,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IAS5D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,IAAI;IAXb,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAO;IAElD,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,cAAc,CAAS;gBAGtB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,UAAU,EACjB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM;IAWd,MAAM,CAAC,IAAI,EAAE,MAAM;IAoBnB,UAAU,CAAC,MAAM,SAAiB,GAAG,IAAI;IAYzC,OAAO,IAAI,OAAO;IAIlB,UAAU,CAAC,QAAQ,EAAE,QAAQ;IAK7B,UAAU,IAAI,UAAU;IAIxB,SAAS,CAAC,IAAI,EAAE,MAAM;IA8DtB,KAAK,CAAC,OAAO,EAAE,GAAG;IAIzB,uFAAuF;IAChF,MAAM,CAAC,OAAO,EAAE,GAAG;IAInB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,QAAwB;IAI1D,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,QAAwB;IAIhE,IAAI,CAAC,IAAI,EAAE,MAAM;CAGxB"}

package/dist/server/connection.js

@@ -18,7 +18,7 @@ class Connection extends shared_1.EventEmitter {
         this.rinfo = rinfo;
         this.mtu = mtu;
         this.guid = guid;
-        this.session = new shared_1.NetworkSession(this.mtu);
+        this.session = new shared_1.NetworkSession(this.mtu, this.server.options.enableServerLogs);
         this.session.send = this.send.bind(this);
         this.session.handle = this.onMessage.bind(this);
     }
@@ -46,22 +46,15 @@ class Connection extends shared_1.EventEmitter {
         // Send disconnect packet to client
         const disconnect = new shared_1.DisconnectMessage();
         this.session.frameAndSend(disconnect.serialize(), shared_1.Priority.High);
-        // Emit disconnect event
-        this.server.emit("disconnect", this);
+        // Emit disconnect event with reason
+        this.server.emit("disconnect", { connection: this, reason });
     }
     isStale() {
         return this.isDisconnected;
     }
     onFrameSet(frameSet) {
         this.lastActivityTime = Date.now();
-        try {
-            this.session.onFrameSet(frameSet);
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : "Unknown error";
-            shared_1.Logger.error(`Frame set error: ${message}`);
-            this.disconnect(`Frame set error: ${message}`);
-        }
+        this.session.onFrameSet(frameSet);
     }
     getAddress() {
         return this.rinfo;
@@ -88,7 +81,10 @@ class Connection extends shared_1.EventEmitter {
             }
             case shared_1.Packets.Disconnect: {
                 this.isDisconnected = true;
-                this.server.emit("disconnect", this);
+                this.server.emit("disconnect", {
+                    connection: this,
+                    reason: "Client disconnected",
+                });
                 break;
             }
             case shared_1.Packets.ConnectedPing: {

package/dist/server/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,YAAY,EAQZ,MAAM,WAAW,CAAC;AAEnB,OAAO,EACN,KAAK,aAAa,EAElB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAExB,MAAM,SAAS,CAAC;AAGjB,qBAAa,MAAO,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAS;IACvB,SAAgB,OAAO,EAAE,mBAAmB,CAAC;IACtC,aAAa,EAAE,aAAa,CAAC;IACpC,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,YAAY,CAAiB;gBAEzB,OAAO,GAAE,OAAO,CAAC,mBAAmB,CAAM;IAuB/C,IAAI;IAOJ,MAAM;IAab,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,SAAS;IA6EV,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAGzD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,YAAY,EAQZ,MAAM,WAAW,CAAC;AAEnB,OAAO,EACN,KAAK,aAAa,EAElB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAExB,MAAM,SAAS,CAAC;AAGjB,qBAAa,MAAO,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAS;IACvB,SAAgB,OAAO,EAAE,mBAAmB,CAAC;IACtC,aAAa,EAAE,aAAa,CAAC;IACpC,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,YAAY,CAAiB;gBAEzB,OAAO,GAAE,OAAO,CAAC,mBAAmB,CAAM;IAuB/C,IAAI;IAOJ,MAAM;IAab,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,SAAS;IA6EV,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAGzD"}

package/dist/server/server.js

@@ -47,15 +47,12 @@ class Server extends shared_1.EventEmitter {
         this.socket.on("message", this.onMessage.bind(this));
         this.on("disconnect", this.onDisconnect.bind(this));
     }
-    onDisconnect(connection, executedByServer = false) {
+    onDisconnect({ connection, reason, }) {
         const address = connection.getAddress();
         this.connections.delete(`${address.address}:${address.port}`);
         this.advertisement.playerCount = this.connections.size;
-        if (executedByServer) {
-            this.emit("disconnect", connection);
-        }
         if (this.options.enableServerLogs) {
-            shared_1.Logger.info(`Client disconnected ${address.address}:${address.port}`);
+            shared_1.Logger.info(`Client disconnected ${address.address}:${address.port} - ${reason}`);
         }
     }
     onMessage(message, rinfo) {

package/dist/server/types/server-events.d.ts

@@ -1,7 +1,11 @@
 import type { Connection } from "../connection";
+export interface DisconnectEvent {
+    connection: Connection;
+    reason: string;
+}
 export interface RaknetServerEvents {
     listening: undefined;
     connect: Connection;
-    disconnect: Connection;
+    disconnect: DisconnectEvent;
 }
 //# sourceMappingURL=server-events.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"server-events.d.ts","sourceRoot":"","sources":["../../../src/server/types/server-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,WAAW,kBAAkB;IAClC,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CACvB"}
+{"version":3,"file":"server-events.d.ts","sourceRoot":"","sources":["../../../src/server/types/server-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,WAAW,eAAe;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IAClC,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,UAAU,EAAE,eAAe,CAAC;CAC5B"}

package/dist/shared/network_session.d.ts

@@ -1,6 +1,7 @@
 import { Ack, Frame, FrameSet, Priority } from "./proto";
 export declare class NetworkSession {
     mtu: number;
+    debug: boolean;
     send: (data: Buffer) => void;
     handle: (data: Buffer) => void;
     outputReliableIndex: number;
@@ -12,13 +13,23 @@ export declare class NetworkSession {
     outputBackup: Map<number, Frame[]>;
     receivedFrameSequences: Set<number>;
     lostFrameSequences: Set<number>;
+    pendingAcks: Set<number>;
     lastInputSequence: number;
-    fragmentsQueue: Map<number, Map<number, Frame>>;
+    fragmentsQueue: Map<number, {
+        frames: Map<number, Frame>;
+        timestamp: number;
+    }>;
     inputHighestSequenceIndex: Array<number>;
     inputOrderIndex: Array<number>;
     protected inputOrderingQueue: Map<number, Map<number, Frame>>;
-    constructor(mtu: number);
-    onTick(): void;
+    private receivedReliableFrameIndices;
+    private highestReliableIndex;
+    private static readonly RECEIVE_WINDOW_SIZE;
+    private static readonly RELIABLE_WINDOW_SIZE;
+    private static readonly FRAGMENT_TIMEOUT_MS;
+    private static readonly ORDER_QUEUE_MAX_SIZE;
+    constructor(mtu: number, debug?: boolean);
+    onTick(_tick?: number): void;
     onAck(ack: Ack): void;
     onNack(nack: Ack): void;
     frameAndSend(data: Buffer, priority?: Priority): void;

package/dist/shared/network_session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network_session.d.ts","sourceRoot":"","sources":["../../src/shared/network_session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAW,QAAQ,EAAe,MAAM,SAAS,CAAC;AAK/E,qBAAa,cAAc;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,MAAM,EAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAGhC,mBAAmB,SAAK;IACxB,gBAAgB,SAAK;IAC5B,SAAS,CAAC,cAAc,SAAK;IACtB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC,KAAK,CAAC,CAAa;IACrC,YAAY,uBAA8B;IAG1C,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAChD,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAC5C,iBAAiB,SAAM;IACvB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAa;IAC5D,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtC,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAa;gBAE9D,GAAG,EAAE,MAAM;IAUvB,MAAM;IAuBN,KAAK,CAAC,GAAG,EAAE,GAAG;IAMd,MAAM,CAAC,IAAI,EAAE,GAAG;IAeT,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,QAA0B;IAQ/D,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,QAA0B;IA8C5D,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ;IAW3C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAiB/B,UAAU,CAAC,QAAQ,EAAE,QAAQ;IA+B7B,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAY/B,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAiCpC,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAcnC,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;CA8BxC"}
+{"version":3,"file":"network_session.d.ts","sourceRoot":"","sources":["../../src/shared/network_session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAW,QAAQ,EAAe,MAAM,SAAS,CAAC;AAK/E,qBAAa,cAAc;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,MAAM,EAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAGhC,mBAAmB,SAAK;IACxB,gBAAgB,SAAK;IAC5B,SAAS,CAAC,cAAc,SAAK;IACtB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC,KAAK,CAAC,CAAa;IACrC,YAAY,uBAA8B;IAG1C,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAChD,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAC5C,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IACrC,iBAAiB,SAAM;IACvB,cAAc,EAAE,GAAG,CACzB,MAAM,EACN;QAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CACjD,CAAa;IACP,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtC,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAa;IAE1E,OAAO,CAAC,4BAA4B,CAA0B;IAC9D,OAAO,CAAC,oBAAoB,CAAM;IAGlC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAQ;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAQ;IACpD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IACpD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAO;gBAEvC,GAAG,EAAE,MAAM,EAAE,KAAK,UAAQ;IAWtC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM;IAuDrB,KAAK,CAAC,GAAG,EAAE,GAAG;IAMd,MAAM,CAAC,IAAI,EAAE,GAAG;IAeT,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,QAA0B;IAQ/D,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,QAA0B;IA8C5D,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ;IAW3C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAiB/B,UAAU,CAAC,QAAQ,EAAE,QAAQ;IAkD7B,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAwB/B,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IA2CpC,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAenC,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;CAyCxC"}

package/dist/shared/network_session.js

@@ -7,6 +7,7 @@ const logger_1 = require("./logger");
 const MTU_HEADER_SIZE = 36;
 class NetworkSession {
     mtu;
+    debug;
     send;
     handle;
     // Output
@@ -20,13 +21,22 @@ class NetworkSession {
     // Input
     receivedFrameSequences = new Set();
     lostFrameSequences = new Set();
+    pendingAcks = new Set();
     lastInputSequence = -1;
     fragmentsQueue = new Map();
     inputHighestSequenceIndex;
     inputOrderIndex;
     inputOrderingQueue = new Map();
-    constructor(mtu) {
+    receivedReliableFrameIndices = new Set();
+    highestReliableIndex = -1;
+    // goofy ahh geyser stuff
+    static RECEIVE_WINDOW_SIZE = 2048;
+    static RELIABLE_WINDOW_SIZE = 4096;
+    static FRAGMENT_TIMEOUT_MS = 30000;
+    static ORDER_QUEUE_MAX_SIZE = 256;
+    constructor(mtu, debug = false) {
         this.mtu = mtu;
+        this.debug = debug;
         this.outputOrderIndex = new Array(32).fill(0);
         this.outputSequenceIndex = new Array(32).fill(0);
         this.inputHighestSequenceIndex = Array.from({ length: 32 }).fill(0);
@@ -34,10 +44,36 @@ class NetworkSession {
         for (let index = 0; index < 32; index++)
             this.inputOrderingQueue.set(index, new Map());
     }
-    onTick() {
-        if (this.receivedFrameSequences.size > 0) {
-            const ackSeqs = Array.from(this.receivedFrameSequences);
-            this.receivedFrameSequences.clear();
+    onTick(_tick) {
+        const now = Date.now();
+        const windowStart = this.lastInputSequence - NetworkSession.RECEIVE_WINDOW_SIZE;
+        if (windowStart > 0) {
+            for (const seq of this.receivedFrameSequences) {
+                if (seq < windowStart)
+                    this.receivedFrameSequences.delete(seq);
+            }
+            for (const seq of this.lostFrameSequences) {
+                if (seq < windowStart)
+                    this.lostFrameSequences.delete(seq);
+            }
+        }
+        const reliableWindowStart = this.highestReliableIndex - NetworkSession.RELIABLE_WINDOW_SIZE;
+        if (reliableWindowStart > 0) {
+            for (const idx of this.receivedReliableFrameIndices) {
+                if (idx < reliableWindowStart)
+                    this.receivedReliableFrameIndices.delete(idx);
+            }
+        }
+        for (const [splitId, entry] of this.fragmentsQueue) {
+            if (now - entry.timestamp > NetworkSession.FRAGMENT_TIMEOUT_MS) {
+                if (this.debug)
+                    logger_1.Logger.warn(`Fragment queue ${splitId} timed out, dropping ${entry.frames.size} fragments`);
+                this.fragmentsQueue.delete(splitId);
+            }
+        }
+        if (this.pendingAcks.size > 0) {
+            const ackSeqs = Array.from(this.pendingAcks);
+            this.pendingAcks.clear();
             const ack = new proto_1.Ack();
             ack.sequences = ackSeqs;
             this.send(ack.serialize());
@@ -145,27 +181,53 @@ class NetworkSession {
         this.send(buffer);
     }
     onFrameSet(frameSet) {
+        // Already received this exact sequence so ignore duplicate
         if (this.receivedFrameSequences.has(frameSet.sequence)) {
-            throw new Error("Duplicate frame set received");
+            if (this.debug)
+                logger_1.Logger.warn(`Duplicate frame set received: sequence ${frameSet.sequence}`);
+            return;
         }
+        // Remove from lost if we finally got it
         this.lostFrameSequences.delete(frameSet.sequence);
-        const isLess = frameSet.sequence < this.lastInputSequence;
-        const isEqual = frameSet.sequence === this.lastInputSequence;
-        if (isLess || isEqual) {
-            throw new Error("Frame set received is out of order");
-        }
+        // Track this sequence as received and queue ACK
         this.receivedFrameSequences.add(frameSet.sequence);
-        const diff = frameSet.sequence - this.lastInputSequence;
-        if (diff > 1) {
-            for (let index = this.lastInputSequence + 1; index < frameSet.sequence; index++)
-                this.lostFrameSequences.add(index);
+        this.pendingAcks.add(frameSet.sequence);
+        // If this is a newer sequence than we've seen, update tracking
+        if (frameSet.sequence > this.lastInputSequence) {
+            const diff = frameSet.sequence - this.lastInputSequence;
+            // Mark any gaps as lost (for NACK)
+            if (diff > 1) {
+                for (let index = this.lastInputSequence + 1; index < frameSet.sequence; index++) {
+                    // Only mark as lost if we haven't already received it
+                    if (!this.receivedFrameSequences.has(index)) {
+                        this.lostFrameSequences.add(index);
+                    }
+                }
+            }
+            this.lastInputSequence = frameSet.sequence;
         }
-        this.lastInputSequence = frameSet.sequence;
+        else {
+            // zOut-of-order packet (arrived late but still valid)
+            if (this.debug)
+                logger_1.Logger.warn(`Out-of-order frame set received: sequence ${frameSet.sequence} (expected > ${this.lastInputSequence})`);
+        }
+        // Process all frames
         for (const frame of frameSet.frames) {
             this.handleFrame(frame);
         }
     }
     handleFrame(frame) {
+        // Duplicate detection for reliable frames
+        if (frame.isReliable()) {
+            if (this.receivedReliableFrameIndices.has(frame.reliableFrameIndex)) {
+                // Already processed tsis reliable frame, skip
+                return;
+            }
+            this.receivedReliableFrameIndices.add(frame.reliableFrameIndex);
+            if (frame.reliableFrameIndex > this.highestReliableIndex) {
+                this.highestReliableIndex = frame.reliableFrameIndex;
+            }
+        }
         if (frame.isSplit()) {
             this.handleSplitFrame(frame);
         }
@@ -183,38 +245,49 @@ class NetworkSession {
         const splitId = frame.splitId;
         let entry = this.fragmentsQueue.get(splitId);
         if (!entry) {
-            entry = new Map();
+            entry = { frames: new Map(), timestamp: Date.now() };
             this.fragmentsQueue.set(splitId, entry);
         }
-        entry.set(frame.splitFrameIndex, frame);
-        if (entry.size === frame.splitSize) {
-            {
-                const stream = new binarystream_1.BinaryStream();
-                for (let index = 0; index < frame.splitSize; index++) {
-                    const sframe = entry.get(index);
-                    if (!sframe) {
-                        throw new Error(`Missing fragment at index ${index} for splitId=${frame.splitId}`);
-                    }
-                    stream.write(sframe.payload);
+        entry.frames.set(frame.splitFrameIndex, frame);
+        if (entry.frames.size === frame.splitSize) {
+            const stream = new binarystream_1.BinaryStream();
+            for (let index = 0; index < frame.splitSize; index++) {
+                const sframe = entry.frames.get(index);
+                if (!sframe) {
+                    if (this.debug)
+                        logger_1.Logger.warn(`Missing fragment at index ${index} for splitId=${frame.splitId}`);
+                    this.fragmentsQueue.delete(splitId);
+                    return;
                 }
-                const reassembledFrame = new proto_1.Frame();
-                reassembledFrame.reliability = frame.reliability;
-                reassembledFrame.reliableFrameIndex = frame.reliableFrameIndex;
-                reassembledFrame.sequenceFrameIndex = frame.sequenceFrameIndex;
-                reassembledFrame.orderedFrameIndex = frame.orderedFrameIndex;
-                reassembledFrame.orderChannel = frame.orderChannel;
-                reassembledFrame.payload = stream.getBuffer();
-                this.handleFrame(reassembledFrame);
+                stream.write(sframe.payload);
             }
+            const reassembledFrame = new proto_1.Frame();
+            reassembledFrame.reliability = frame.reliability;
+            reassembledFrame.reliableFrameIndex = frame.reliableFrameIndex;
+            reassembledFrame.sequenceFrameIndex = frame.sequenceFrameIndex;
+            reassembledFrame.orderedFrameIndex = frame.orderedFrameIndex;
+            reassembledFrame.orderChannel = frame.orderChannel;
+            reassembledFrame.payload = stream.getBuffer();
             this.fragmentsQueue.delete(splitId);
+            // Process the reassembled frame (but skip split handling since it's no longer split)
+            if (reassembledFrame.isSequenced()) {
+                this.handleSequenced(reassembledFrame);
+            }
+            else if (reassembledFrame.isOrdered()) {
+                this.handleOrdered(reassembledFrame);
+            }
+            else {
+                this.handle(reassembledFrame.payload);
+            }
         }
     }
     handleSequenced(frame) {
         const channel = frame.orderChannel;
-        const currentHighestSequence = this.inputHighestSequenceIndex[channel];
-        const isLess = frame.sequenceFrameIndex < currentHighestSequence;
-        if (isLess || frame.orderedFrameIndex === this.inputOrderIndex[channel]) {
-            logger_1.Logger.warn("Frame dropped, sequence is less than current highest sequence");
+        const currentHighestSequence = this.inputHighestSequenceIndex[channel] ?? 0;
+        // Sequenced frames: drop if older than what we've seen, otherwise process immediately
+        // They don't need ordering, just drop stale ones
+        if (frame.sequenceFrameIndex < currentHighestSequence) {
+            // Old sequenced frame, drop it
             return;
         }
         this.inputHighestSequenceIndex[channel] = frame.sequenceFrameIndex + 1;
@@ -222,32 +295,42 @@ class NetworkSession {
     }
     handleOrdered(frame) {
         const channel = frame.orderChannel;
-        const expectedOrderIndex = this.inputOrderIndex[channel];
-        const isEqual = frame.orderedFrameIndex === expectedOrderIndex;
-        if (frame.orderedFrameIndex > expectedOrderIndex) {
-            const unordered = this.inputOrderingQueue.get(channel);
-            if (!unordered) {
-                logger_1.Logger.warn("No unordered queue found");
-                return;
+        const expectedOrderIndex = this.inputOrderIndex[channel] ?? 0;
+        if (frame.orderedFrameIndex === expectedOrderIndex) {
+            // This is the frame we're waiting for - process it
+            this.inputHighestSequenceIndex[channel] = 0;
+            this.inputOrderIndex[channel] = expectedOrderIndex + 1;
+            this.handle(frame.payload);
+            // Now flush any queued frames that are now in order
+            const outOfOrderQueue = this.inputOrderingQueue.get(channel);
+            if (outOfOrderQueue) {
+                let nextIndex = expectedOrderIndex + 1;
+                while (outOfOrderQueue.has(nextIndex)) {
+                    const queuedFrame = outOfOrderQueue.get(nextIndex);
+                    if (queuedFrame) {
+                        this.handle(queuedFrame.payload);
+                        outOfOrderQueue.delete(nextIndex);
+                    }
+                    nextIndex++;
+                }
+                this.inputOrderIndex[channel] = nextIndex;
             }
-            unordered.set(frame.orderedFrameIndex, frame);
         }
-        else if (isEqual) {
-            this.inputHighestSequenceIndex[frame.orderChannel] = 0;
-            this.inputOrderIndex[frame.orderChannel] = frame.orderedFrameIndex + 1;
-            this.handle(frame.payload);
-            let index = this.inputOrderIndex[frame.orderChannel];
-            const outOfOrderQueue = this.inputOrderingQueue.get(frame.orderChannel);
-            for (; outOfOrderQueue.has(index); index++) {
-                const frame = outOfOrderQueue.get(index);
-                if (!frame)
-                    break;
-                this.handle(frame.payload);
-                outOfOrderQueue.delete(index);
+        else if (frame.orderedFrameIndex > expectedOrderIndex) {
+            // Future frame n queue it for later
+            const outOfOrderQueue = this.inputOrderingQueue.get(channel);
+            if (outOfOrderQueue) {
+                // Prevent unbounded queue growth
+                if (outOfOrderQueue.size < NetworkSession.ORDER_QUEUE_MAX_SIZE) {
+                    outOfOrderQueue.set(frame.orderedFrameIndex, frame);
+                }
+                else {
+                    if (this.debug)
+                        logger_1.Logger.debug(`Order queue for channel ${channel} is full, dropping frame ${frame.orderedFrameIndex}`);
+                }
             }
-            this.inputOrderingQueue.set(frame.orderChannel, outOfOrderQueue);
-            this.inputOrderIndex[frame.orderChannel] = index;
         }
+        // If frame.orderedFrameIndex < expectedOrderIndex, it's a duplicate/old frame - ignore it
     }
 }
 exports.NetworkSession = NetworkSession;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanctumterra/raknet",
-  "version": "1.4.11",
+  "version": "1.4.13",
   "description": "",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",