use newer Serenity Raknet.

SanctumTerra · Jul 17, 2024 · 764fc5c · 764fc5c
1 parent 2487888
commit 764fc5c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sanctumterra/raknet",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "",
   "main": "dist/index.js",
   "emitDeclarationOnly": true,
@@ -24,9 +24,8 @@
   },
   "dependencies": {
     "@serenityjs/binarystream": "^2.6.6",
-    "@serenityjs/raknet": "0.4.0-beta-20240715032912",
+    "@serenityjs/raknet": "^0.4.1-beta-20240717055334",
     "chalk": "^4.1.2",
-    "i": "^0.3.7",
     "npm": "^10.8.2",
     "path": "^0.12.7"
   }

diff --git a/src/client/FrameHandler.ts b/src/client/FrameHandler.ts
@@ -1,4 +1,17 @@
-import { Ack, Address, ConnectedPing, ConnectedPong, ConnectionRequestAccepted, Frame, FrameSet, Nack, Packet, Priority, Reliability, Status } from "@serenityjs/raknet";
+import { 
+    Ack,
+    Address,
+    ConnectedPing, 
+    ConnectedPong, 
+    ConnectionRequestAccepted, 
+    Frame, 
+    FrameSet, 
+    Nack, 
+    Packet, 
+    Priority, 
+    Reliability, 
+    Status 
+} from "@serenityjs/raknet";
 import { RakNetClient } from "./RaknetClient";
 import { OhMyNewIncommingConnection } from "../packets/raknet/OhMyNewIncommingConnection";
 import { BinaryStream } from "@serenityjs/binarystream";

diff --git a/src/client/PacketHandler.ts b/src/client/PacketHandler.ts
@@ -1,10 +1,6 @@
-import { 
-    Ack,
+import {
     Address, 
-    MAX_MTU_SIZE, 
-    DGRAM_MTU_OVERHEAD, 
     Frame, 
-    Nack, 
     OpenConnectionReply1, 
     OpenConnectionRequest1, 
     OpenConnectionRequest2, 
@@ -34,7 +30,7 @@ export  class PacketHandler {
         if(!ignore.includes(packetId)) Logger.debug("Received Packet ID " + packetId)
 
         switch (packetId) {
-            case Bitflags.Valid+44: 
+            case Bitflags.Valid: 
                 this.framehandler.handleFrameSet(buffer);
             break;
             case Packet.OpenConnectionReply1:
@@ -44,7 +40,7 @@ export  class PacketHandler {
                 this.handleOpenConnectionRequest();
                 break;
             default:
-                this.otherPackets(buffer)
+                this.otherPackets(buffer);
                 Logger.debug('Received unknown packet ' + packetId);
         }
     }
@@ -99,7 +95,7 @@ export  class PacketHandler {
             "binary"
         );
         packet.protocol = this.client.protocol;
-        packet.mtu = 1024-DGRAM_MTU_OVERHEAD;
+        packet.mtu = 1024 - 36;
         const serializedPacket = packet.serialize(); 
         this.client.send(serializedPacket);
     }

diff --git a/src/client/Queue.ts b/src/client/Queue.ts
@@ -84,7 +84,7 @@ export class Queue {
 	private queueFrame(frame: Frame, priority: Priority): void {
 		let length = DGRAM_HEADER_SIZE;
 		for (const frame of this.outputFrames) length += frame.getByteLength();
-		if (length + frame.getByteLength() > this.mtu - DGRAM_MTU_OVERHEAD)
+		if (length + frame.getByteLength() > this.mtu - 36)
 			this.sendQueue(this.outputFrames.size);
 		this.outputFrames.add(frame);
 		if (priority === Priority.Immediate) return this.sendQueue(1);