@sanctumterra/raknet 1.4.3 → 1.4.5

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;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"}
+{"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;IAyDhD,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

@@ -100,6 +100,8 @@ class Client extends shared_1.EventEmitter {
                 request.mtu = reply.mtu;
                 request.guid = this.options.guid;
                 request.cookie = reply.cookie;
+                // Set to false since we don't support libcat encryption
+                request.clientSupportsecurity = false;
                 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;IA8EV,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;IA6EV,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAGzD"}

package/dist/server/server.js

@@ -65,7 +65,6 @@ 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,7 +2,9 @@ import { BinaryStream } from "@serenityjs/binarystream";
 export declare class OpenConnectionReplyOne extends BinaryStream {
     guid: bigint;
     security: boolean;
+    hasCookie: boolean;
     cookie: number | null;
+    serverPublicKey: Buffer | 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,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"}
+{"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,SAAS,EAAG,OAAO,CAAC;IACpB,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe,EAAG,MAAM,GAAG,IAAI,CAAC;IAChC,GAAG,EAAG,MAAM,CAAC;IAEb,SAAS,IAAI,MAAM;IAYnB,WAAW,IAAI,sBAAsB;CAyB5C"}

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

@@ -7,7 +7,9 @@ const types_1 = require("../types");
 class OpenConnectionReplyOne extends binarystream_1.BinaryStream {
     guid;
     security;
+    hasCookie;
     cookie;
+    serverPublicKey;
     mtu;
     serialize() {
         binarystream_1.Uint8.write(this, enums_1.Packets.OpenConnectionReply1);
@@ -15,21 +17,33 @@ class OpenConnectionReplyOne extends binarystream_1.BinaryStream {
         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);
+            this.writeUint32(this.cookie);
         }
-        binarystream_1.Int16.write(this, this.mtu);
+        this.writeUint16(this.mtu);
         return this.getBuffer();
     }
     deserialize() {
         binarystream_1.Uint8.read(this);
         types_1.Magic.read(this);
-        this.guid = binarystream_1.Int64.read(this);
+        this.guid = this.readInt64(binarystream_1.Endianness.Little);
         this.security = binarystream_1.Bool.read(this);
         this.cookie = null;
+        this.hasCookie = false;
+        this.serverPublicKey = null;
         if (this.security) {
-            this.cookie = binarystream_1.Int32.read(this);
+            const remaining = this.buffer.byteLength - this.offset;
+            // Full security format: has_cookie (1) + cookie (4) + public_key (294) + mtu (2) = 301
+            if (remaining >= 1 + 4 + 294 + 2) {
+                this.hasCookie = binarystream_1.Bool.read(this);
+                this.cookie = this.readUint32();
+                this.serverPublicKey = this.read(294);
+            }
+            else if (remaining >= 4 + 2) {
+                // Simple security format: cookie (4) + mtu (2)
+                this.cookie = this.readUint32();
+            }
         }
-        this.mtu = binarystream_1.Int16.read(this);
+        this.mtu = this.readUint16();
         return this;
     }
 }

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

@@ -5,6 +5,7 @@ export declare class OpenConnectionRequestTwo extends BinaryStream {
     mtu: number;
     guid: bigint;
     cookie: number | null;
+    clientSupportsecurity: boolean;
     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,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"}
+{"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,EAAsB,MAAM,0BAA0B,CAAC;AAE5E,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;IACvB,qBAAqB,EAAG,OAAO,CAAC;IAEhC,SAAS,IAAI,MAAM;IAcnB,WAAW,IAAI,wBAAwB;CAc9C"}

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

@@ -9,26 +9,31 @@ class OpenConnectionRequestTwo extends binarystream_1.BinaryStream {
     mtu;
     guid;
     cookie;
+    clientSupportsecurity;
     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)
+            this.writeUint32(this.cookie);
+            // client_supports_security should be false if we don't support libcat encryption
+            binarystream_1.Bool.write(this, this.clientSupportsecurity ?? false);
         }
         types_1.Address.write(this, this.address);
-        binarystream_1.Int16.write(this, this.mtu);
+        this.writeUint16(this.mtu);
         binarystream_1.Int64.write(this, this.guid);
         return this.getBuffer();
     }
     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
+        // Check if there's enough data for cookie + clientSupportsecurity before address
+        // Cookie format: cookie (4) + clientSupportsecurity (1) = 5 bytes minimum before address
+        // We need to peek ahead to determine if security data is present
+        // For now, assume no security on deserialize (server-side typically doesn't need this)
+        this.cookie = null;
+        this.clientSupportsecurity = false;
         this.address = types_1.Address.read(this);
-        this.mtu = binarystream_1.Int16.read(this);
+        this.mtu = this.readUint16();
         this.guid = binarystream_1.Int64.read(this);
         return this;
     }

package/dist/tests/client-once.js

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

package/package.json

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