@sanctumterra/raknet 1.4.2 → 1.4.3

package/dist/client/client.d.ts

@@ -3,12 +3,15 @@ import type { ClientEvents } from "./types";
 import { type ClientOptions } from "./types/client-options";
 import { type RemoteInfo } from "node:dgram";
 export declare class Client extends EventEmitter<ClientEvents> {
+    private static readonly MTU_VALUES;
+    private static readonly MTU_RETRY_INTERVAL;
     options: ClientOptions;
     private socket;
     private interval;
     private status;
     tick: number;
     private session;
+    private gotReply1;
     constructor(options?: Partial<ClientOptions>);
     connect(): Promise<void>;
     onTick(): 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,EAEN,YAAY,EAWZ,QAAQ,EAIR,KAAK,KAAK,EAIV,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;AAGxE,qBAAa,MAAO,SAAQ,YAAY,CAAC,YAAY,CAAC;IAC9C,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;gBAEpB,OAAO,GAAE,OAAO,CAAC,aAAa,CAAM;IAmBzC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBxB,MAAM,IAAI,IAAI;IAYd,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAqDhD,YAAY,CAAC,IAAI,EAAE,MAAM;IAwCzB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,QAA0B;IAI5D,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,QAA0B;IAI/D,IAAI,IAAI,IAAI;IAQZ,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxB,UAAU,IAAI,IAAI;CAIzB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,YAAY,EAWZ,QAAQ,EAIR,KAAK,KAAK,EAIV,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;AAGxE,qBAAa,MAAO,SAAQ,YAAY,CAAC,YAAY,CAAC;IACrD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAA2B;IAC7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAO;IAE1C,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;gBAEd,OAAO,GAAE,OAAO,CAAC,aAAa,CAAM;IAmBzC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6CxB,MAAM,IAAI,IAAI;IAYd,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAuDhD,YAAY,CAAC,IAAI,EAAE,MAAM;IAwCzB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,QAA0B;IAI5D,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,QAA0B;IAI/D,IAAI,IAAI,IAAI;IAQZ,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxB,UAAU,IAAI,IAAI;CAIzB"}

package/dist/client/client.js

@@ -6,12 +6,15 @@ const client_options_1 = require("./types/client-options");
 const node_dgram_1 = require("node:dgram");
 const shared_2 = require("../shared");
 class Client extends shared_1.EventEmitter {
+    static MTU_VALUES = [1492, 1400, 1200, 576];
+    static MTU_RETRY_INTERVAL = 500;
     options;
     socket;
     interval;
     status;
     tick;
     session;
+    gotReply1 = false;
     constructor(options = {}) {
         super();
         this.options = { ...client_options_1.defaultClientOptions, ...options };
@@ -30,18 +33,41 @@ class Client extends shared_1.EventEmitter {
     connect() {
         return new Promise((resolve, reject) => {
             this.status = shared_1.ConnectionStatus.Connecting;
-            const request = new shared_1.OpenConnectionRequestOne();
-            request.mtu = this.options.mtu;
-            request.protocol = 11; // Only 11 is supported
-            const serialized = request.serialize();
-            this.send(serialized);
+            this.gotReply1 = false;
+            let mtuIndex = 0;
+            let retryTimeout = null;
+            const sendRequest = () => {
+                if (mtuIndex >= Client.MTU_VALUES.length) {
+                    reject(new Error("Connection timed out, all MTU values exhausted"));
+                    return;
+                }
+                const mtu = Client.MTU_VALUES[mtuIndex];
+                // Should not happen but for the linter sake
+                if (!mtu)
+                    throw new Error("MTU value is undefined");
+                const request = new shared_1.OpenConnectionRequestOne();
+                request.mtu = mtu;
+                request.protocol = 11;
+                this.send(request.serialize());
+                retryTimeout = setTimeout(() => {
+                    if (!this.gotReply1) {
+                        mtuIndex++;
+                        sendRequest();
+                    }
+                }, Client.MTU_RETRY_INTERVAL);
+            };
             const timeout = setTimeout(() => {
+                if (retryTimeout)
+                    clearTimeout(retryTimeout);
                 reject(new Error("Connection timed out"));
             }, this.options.timeout);
             this.once("connect", () => {
                 clearTimeout(timeout);
+                if (retryTimeout)
+                    clearTimeout(retryTimeout);
                 resolve();
             });
+            sendRequest();
         });
     }
     onTick() {
@@ -67,11 +93,13 @@ class Client extends shared_1.EventEmitter {
                 break;
             }
             case shared_1.Packets.OpenConnectionReply1: {
+                this.gotReply1 = true;
                 const reply = new shared_1.OpenConnectionReplyOne(data).deserialize();
                 const request = new shared_1.OpenConnectionRequestTwo();
                 request.address = shared_1.Address.fromIdentifier(rinfo);
                 request.mtu = reply.mtu;
                 request.guid = this.options.guid;
+                request.cookie = reply.cookie;
                 this.send(request.serialize());
                 break;
             }

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;IAYpB,OAAO,CAAC,SAAS;IA8EV,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAGzD"}

package/dist/server/server.js

@@ -65,6 +65,7 @@ class Server extends shared_1.EventEmitter {
             id = 0x80;
         switch (id) {
             case shared_1.Packets.UnconnectedPing: {
+                console.log("Received Ping! from: ", rinfo.address);
                 const pong = new shared_1.UnconnectedPong();
                 pong.guid = this.options.guid;
                 pong.message = (0, types_1.AdvertisementToString)(this.advertisement);

package/dist/shared/proto/offline/open-connection-reply-one.d.ts

@@ -2,6 +2,7 @@ import { BinaryStream } from "@serenityjs/binarystream";
 export declare class OpenConnectionReplyOne extends BinaryStream {
     guid: bigint;
     security: boolean;
+    cookie: number | null;
     mtu: number;
     serialize(): Buffer;
     deserialize(): OpenConnectionReplyOne;

package/dist/shared/proto/offline/open-connection-reply-one.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-connection-reply-one.d.ts","sourceRoot":"","sources":["../../../../src/shared/proto/offline/open-connection-reply-one.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,EAKZ,MAAM,0BAA0B,CAAC;AAIlC,qBAAa,sBAAuB,SAAQ,YAAY;IAChD,IAAI,EAAG,MAAM,CAAC;IACd,QAAQ,EAAG,OAAO,CAAC;IACnB,GAAG,EAAG,MAAM,CAAC;IAEb,SAAS,IAAI,MAAM;IASnB,WAAW,IAAI,sBAAsB;CAQ5C"}
+{"version":3,"file":"open-connection-reply-one.d.ts","sourceRoot":"","sources":["../../../../src/shared/proto/offline/open-connection-reply-one.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,EAMZ,MAAM,0BAA0B,CAAC;AAIlC,qBAAa,sBAAuB,SAAQ,YAAY;IAChD,IAAI,EAAG,MAAM,CAAC;IACd,QAAQ,EAAG,OAAO,CAAC;IACnB,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IACvB,GAAG,EAAG,MAAM,CAAC;IAEb,SAAS,IAAI,MAAM;IAYnB,WAAW,IAAI,sBAAsB;CAY5C"}

package/dist/shared/proto/offline/open-connection-reply-one.js

@@ -7,12 +7,16 @@ const types_1 = require("../types");
 class OpenConnectionReplyOne extends binarystream_1.BinaryStream {
     guid;
     security;
+    cookie;
     mtu;
     serialize() {
         binarystream_1.Uint8.write(this, enums_1.Packets.OpenConnectionReply1);
         types_1.Magic.write(this);
         binarystream_1.Int64.write(this, this.guid);
         binarystream_1.Bool.write(this, this.security);
+        if (this.security && this.cookie != null) {
+            binarystream_1.Int32.write(this, this.cookie);
+        }
         binarystream_1.Int16.write(this, this.mtu);
         return this.getBuffer();
     }
@@ -21,6 +25,10 @@ class OpenConnectionReplyOne extends binarystream_1.BinaryStream {
         types_1.Magic.read(this);
         this.guid = binarystream_1.Int64.read(this);
         this.security = binarystream_1.Bool.read(this);
+        this.cookie = null;
+        if (this.security) {
+            this.cookie = binarystream_1.Int32.read(this);
+        }
         this.mtu = binarystream_1.Int16.read(this);
         return this;
     }

package/dist/shared/proto/offline/open-connection-request-two.d.ts

@@ -4,6 +4,7 @@ export declare class OpenConnectionRequestTwo extends BinaryStream {
     address: Address;
     mtu: number;
     guid: bigint;
+    cookie: number | null;
     serialize(): Buffer;
     deserialize(): OpenConnectionRequestTwo;
 }

package/dist/shared/proto/offline/open-connection-request-two.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-connection-request-two.d.ts","sourceRoot":"","sources":["../../../../src/shared/proto/offline/open-connection-request-two.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuB,MAAM,0BAA0B,CAAC;AAE7E,OAAO,EAAE,OAAO,EAAS,MAAM,UAAU,CAAC;AAE1C,qBAAa,wBAAyB,SAAQ,YAAY;IAClD,OAAO,EAAG,OAAO,CAAC;IAClB,GAAG,EAAG,MAAM,CAAC;IACb,IAAI,EAAG,MAAM,CAAC;IAEd,SAAS,IAAI,MAAM;IASnB,WAAW,IAAI,wBAAwB;CAQ9C"}
+{"version":3,"file":"open-connection-request-two.d.ts","sourceRoot":"","sources":["../../../../src/shared/proto/offline/open-connection-request-two.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,EAMZ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,OAAO,EAAS,MAAM,UAAU,CAAC;AAE1C,qBAAa,wBAAyB,SAAQ,YAAY;IAClD,OAAO,EAAG,OAAO,CAAC;IAClB,GAAG,EAAG,MAAM,CAAC;IACb,IAAI,EAAG,MAAM,CAAC;IACd,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IAEvB,SAAS,IAAI,MAAM;IAanB,WAAW,IAAI,wBAAwB;CAW9C"}

package/dist/shared/proto/offline/open-connection-request-two.js

@@ -8,9 +8,14 @@ class OpenConnectionRequestTwo extends binarystream_1.BinaryStream {
     address;
     mtu;
     guid;
+    cookie;
     serialize() {
         binarystream_1.Uint8.write(this, enums_1.Packets.OpenConnectionRequest2);
         types_1.Magic.write(this);
+        if (this.cookie != null) {
+            binarystream_1.Int32.write(this, this.cookie);
+            binarystream_1.Bool.write(this, true); //Not sure about this (https://minecraft.wiki/w/RakNet#Open_Connection_Reply_2)
+        }
         types_1.Address.write(this, this.address);
         binarystream_1.Int16.write(this, this.mtu);
         binarystream_1.Int64.write(this, this.guid);
@@ -19,6 +24,9 @@ class OpenConnectionRequestTwo extends binarystream_1.BinaryStream {
     deserialize() {
         binarystream_1.Uint8.read(this);
         types_1.Magic.read(this);
+        //TODO:If server uses security need to Deserialize cookie
+        //But this implemntion doesnt seem to use cookies
+        //https://minecraft.wiki/w/RakNet#Open_Connection_Request_2
         this.address = types_1.Address.read(this);
         this.mtu = binarystream_1.Int16.read(this);
         this.guid = binarystream_1.Int64.read(this);

package/dist/tests/client-once.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const client_1 = require("../client");
-const client = new client_1.Client();
+const client = new client_1.Client({
+    address: "donutsmp.net",
+});
 client.on("unconnectedPong", (packet) => {
     console.log(packet);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanctumterra/raknet",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "",
   
   "types": "dist/index.d.ts",