baltica 2.0.10 → 2.0.11

package/dist/bridge/bridge.d.ts

@@ -9,5 +9,7 @@ export declare class Bridge extends Emitter<BridgeEvents> {
     private clients;
     constructor(options: Partial<BridgeOptions>);
     start(): Promise<void>;
+    private pollBackendMotd;
+    private fetchBackendMotd;
     disconnect(player: BridgePlayer): void;
 }

package/dist/bridge/bridge.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bridge = void 0;
+const node_dgram_1 = require("node:dgram");
 const utils_1 = require("@baltica/utils");
 const protocol_1 = require("@serenityjs/protocol");
 const server_1 = require("../server");
@@ -18,6 +19,7 @@ class Bridge extends utils_1.Emitter {
     }
     async start() {
         await this.server.start();
+        this.pollBackendMotd();
         this.server.on("playerConnect", (player) => {
             const bridgePlayer = new bridge_player_1.BridgePlayer(player, this);
             const key = player.connection.identifier;
@@ -26,6 +28,69 @@ class Bridge extends utils_1.Emitter {
             this.emit("connect", bridgePlayer);
         });
     }
+    pollBackendMotd() {
+        this.fetchBackendMotd().then((motd) => {
+            if (motd)
+                this.server.raknet.message = motd;
+        }).finally(() => {
+            setTimeout(() => this.pollBackendMotd(), 5000);
+        });
+    }
+    fetchBackendMotd() {
+        return new Promise((resolve) => {
+            const socket = (0, node_dgram_1.createSocket)("udp4");
+            const timeout = setTimeout(() => {
+                try {
+                    socket.close();
+                }
+                catch { }
+                resolve(null);
+            }, 2000);
+            socket.on("error", () => {
+                clearTimeout(timeout);
+                try {
+                    socket.close();
+                }
+                catch { }
+                resolve(null);
+            });
+            socket.on("message", (buffer) => {
+                clearTimeout(timeout);
+                try {
+                    socket.close();
+                }
+                catch { }
+                try {
+                    if (buffer[0] === 0x1c) {
+                        const pong = new raknet_1.UnconnectedPong(buffer.subarray(1)).deserialize();
+                        resolve(pong.message);
+                    }
+                    else {
+                        resolve(null);
+                    }
+                }
+                catch {
+                    resolve(null);
+                }
+            });
+            socket.bind(0, () => {
+                try {
+                    const ping = new raknet_1.UnconnectedPing();
+                    ping.timestamp = BigInt(Date.now());
+                    ping.guid = BigInt(Math.floor(Math.random() * 0xffffffff));
+                    socket.send(ping.serialize(), this.options.destination.port, this.options.destination.address);
+                }
+                catch {
+                    clearTimeout(timeout);
+                    try {
+                        socket.close();
+                    }
+                    catch { }
+                    resolve(null);
+                }
+            });
+        });
+    }
     disconnect(player) {
         utils_1.Logger.info(`Disconnecting player ${player.player.username}`);
         try {

package/dist/client/client.js

@@ -38,12 +38,11 @@ class Client extends utils_1.Emitter {
         await this.raknet.connect();
         this.requestNetworkSettings();
         return new Promise((resolve, reject) => {
-            this.on("SetLocalPlayerAsInitializedPacket", () => {
+            this.once("SetLocalPlayerAsInitializedPacket", () => {
                 resolve();
-                this.emit("spawn");
                 this.emit("connect");
             });
-            this.on("disconnect", (reason) => {
+            this.once("disconnect", (reason) => {
                 reject(new Error(`Disconnected during login: ${reason}`));
             });
         });
@@ -110,10 +109,15 @@ class Client extends utils_1.Emitter {
         radius.radius = this.options.viewDistance;
         radius.maxRadius = this.options.viewDistance;
         this.send(radius.serialize());
+        const loadingScreen = new protocol_1.ServerboundLoadingScreenPacketPacket();
+        loadingScreen.type = protocol_1.ServerboundLoadingScreenType.StartLoadingScreen;
+        loadingScreen.hasScreenId = false;
+        this.send(loadingScreen.serialize());
     }
     onPlayStatus(packet) {
         if (packet.status !== protocol_1.PlayStatus.PlayerSpawn)
             return;
+        this.emit("spawn"); // Spawn is just spawning. not fully connected yet
         const init = new protocol_1.SetLocalPlayerAsInitializedPacket();
         init.runtimeEntityId = this.startGameData.runtimeEntityId;
         const loadingScreen = new protocol_1.ServerboundLoadingScreenPacketPacket();
@@ -243,7 +247,12 @@ class Client extends utils_1.Emitter {
         try {
             const decompressed = this.packetCompressor.decompress(packet);
             for (const packet of decompressed) {
-                this.handlePacket(packet);
+                try {
+                    this.handlePacket(packet);
+                }
+                catch (err) {
+                    utils_2.Logger.error("Failed to handle packet", err);
+                }
             }
         }
         catch (err) {
@@ -262,7 +271,12 @@ class Client extends utils_1.Emitter {
             return;
         if (this.listenerCount(PacketClass.name) > 0) {
             const deserialized = new PacketClass(buffer).deserialize();
-            this.emit(PacketClass.name, deserialized);
+            try {
+                this.emit(PacketClass.name, deserialized);
+            }
+            catch (err) {
+                utils_2.Logger.error(`Error in packet handler for ${PacketClass.name}:`, err);
+            }
         }
     }
     sendUncompressed(packet, priority = raknet_1.Priority.Medium) {

package/dist/client/types/login/login-data.js

@@ -156,6 +156,7 @@ class LoginData {
                     displayName: profile.name,
                     identity: profile.uuid,
                     titleId: "89692877",
+                    sandboxId: "",
                     XUID: "",
                 },
                 certificateAuthority: true,

package/dist/server/player.js

@@ -115,6 +115,23 @@ class Player extends utils_1.Emitter {
             }
             catch { }
         }
+        // New client versions use Token instead of Certificate chain.
+        // The Token JWT payload contains cpk (client public key), xname, and xid.
+        if (!identityPublicKey) {
+            const token = identity.Token ?? identity.token;
+            if (token) {
+                try {
+                    const payload = JSON.parse(Buffer.from(token.split(".")[1], "base64").toString());
+                    if (payload?.cpk)
+                        identityPublicKey = payload.cpk;
+                    if (payload?.xname && !displayName)
+                        displayName = payload.xname;
+                    if (payload?.xid && !xuid)
+                        xuid = payload.xid;
+                }
+                catch { }
+            }
+        }
         this.username = displayName;
         this.xuid = xuid;
         if (!identityPublicKey) {

package/dist/shared/types/protocol.d.ts

@@ -3,7 +3,8 @@ export type PacketNames = {
     [K in keyof typeof Protocol]: K extends `${string}Packet` ? K extends "Packet" | "DataPacket" ? never : K : never;
 }[keyof typeof Protocol];
 export declare enum ProtocolList {
-    "1.26.1" = 924
+    "1.26.1" = 924,
+    "1.26.10" = 944
 }
-export type CurrentVersion = "1.26.1";
+export type CurrentVersion = "1.26.10";
 export declare const CurrentVersionConst: CurrentVersion;

package/dist/shared/types/protocol.js

@@ -4,5 +4,6 @@ exports.CurrentVersionConst = exports.ProtocolList = void 0;
 var ProtocolList;
 (function (ProtocolList) {
     ProtocolList[ProtocolList["1.26.1"] = 924] = "1.26.1";
+    ProtocolList[ProtocolList["1.26.10"] = 944] = "1.26.10";
 })(ProtocolList || (exports.ProtocolList = ProtocolList = {}));
-exports.CurrentVersionConst = "1.26.1";
+exports.CurrentVersionConst = "1.26.10";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baltica",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "Core baltica package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "@baltica/auth": "*",
     "@baltica/raknet": "*",
     "@baltica/utils": "*",
-    "@serenityjs/protocol": "^0.8.18",
+    "@serenityjs/protocol": "^0.8.19",
     "jose": "^6.1.3"
   },
   "files": [