baltica 2.0.2 → 2.0.3

package/dist/bridge/bridge-player.js

@@ -40,33 +40,61 @@ class BridgePlayer extends utils_1.Emitter {
         this.client.connect();
     }
     routePacket(rawBuffer, clientBound) {
-        let buffer = rawBuffer;
         const id = (0, protocol_1.getPacketId)(rawBuffer);
         const PacketClass = protocol_1.Packets[id];
         if (!PacketClass) {
             if (clientBound)
-                this.player.send(buffer);
+                this.player.send(rawBuffer);
             else
-                this.client.send(buffer);
+                this.client.send(rawBuffer);
             return;
         }
-        const event = `${clientBound ? "client" : "server"}Bound-${PacketClass.name}`;
-        if (this.listenerCount(event) > 0) {
+        const direction = clientBound ? "clientBound" : "serverBound";
+        const event = `${direction}-${PacketClass.name}`;
+        const wildcard = `${direction}-*`;
+        const hasSpecific = this.listenerCount(event) > 0;
+        const hasWildcard = this.listenerCount(wildcard) > 0;
+        let cancelled = false;
+        let outBuffer = rawBuffer;
+        if (hasSpecific || hasWildcard) {
+            let deserialized = null;
             const ctx = {
-                packet: new PacketClass(buffer).deserialize(),
+                get packet() {
+                    if (!deserialized) {
+                        try {
+                            deserialized = new PacketClass(Buffer.from(rawBuffer)).deserialize();
+                        }
+                        catch {
+                            deserialized = rawBuffer;
+                        }
+                    }
+                    return deserialized;
+                },
+                set packet(v) { deserialized = v; },
                 cancelled: false,
                 modified: false,
             };
-            this.emit(event, ctx);
-            if (ctx.cancelled)
-                return;
-            if (ctx.modified)
-                buffer = ctx.packet.serialize();
+            try {
+                if (hasSpecific)
+                    this.emit(event, ctx);
+                if (hasWildcard)
+                    this.emit(wildcard, ctx, PacketClass.name);
+            }
+            catch { }
+            cancelled = ctx.cancelled;
+            if (ctx.modified && deserialized) {
+                try {
+                    outBuffer = deserialized.serialize();
+                }
+                catch { }
+            }
         }
+        if (cancelled)
+            return;
         if (clientBound)
-            this.player.send(buffer);
+            this.player.send(outBuffer);
         else
-            this.client.send(buffer);
+            this.client.send(outBuffer);
     }
 }
 exports.BridgePlayer = BridgePlayer;

package/dist/bridge/types/bridge-player-events.d.ts

@@ -9,4 +9,7 @@ export type BridgePlayerEvents = {
     [K in PacketNames as `clientBound-${K}`]: [signal: BridgePacketSignal<InstanceType<(typeof Protocol)[K]>>];
 } & {
     [K in PacketNames as `serverBound-${K}`]: [signal: BridgePacketSignal<InstanceType<(typeof Protocol)[K]>>];
+} & {
+    "clientBound-*": [signal: BridgePacketSignal<Protocol.DataPacket>, name: string];
+    "serverBound-*": [signal: BridgePacketSignal<Protocol.DataPacket>, name: string];
 };

package/dist/client/client.d.ts

@@ -26,6 +26,7 @@ export declare class Client extends Emitter<ClientEvents> {
     private onPlayStatus;
     private registerDiagnosticHandlers;
     close(): void;
+    disconnect(reason?: string): void;
     private authenticate;
     private authenticateOffline;
     private authenticateOnline;

package/dist/client/client.js

@@ -131,8 +131,8 @@ class Client extends utils_1.Emitter {
         this.on("DisconnectPacket", (pkt) => {
             const reason = pkt?.message?.message ?? pkt?.message ?? "Unknown reason";
             utils_2.Logger.info(`Disconnected by server: ${reason}`);
-            this.close();
             this.emit("disconnect", String(reason));
+            this.close();
         });
     }
     close() {
@@ -142,6 +142,13 @@ class Client extends utils_1.Emitter {
         catch { }
         this.removeAllListeners();
     }
+    disconnect(reason = "client disconnect") {
+        this.emit("disconnect", reason);
+        setTimeout(() => {
+            this.raknet.disconnect();
+            this.removeAllListeners();
+        }, 50);
+    }
     async authenticate() {
         if (this.options.offline) {
             return this.authenticateOffline();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baltica",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Core baltica package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",