baltica 2.0.0 → 2.0.2

package/dist/client/client.d.ts

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

package/dist/client/client.js

@@ -36,12 +36,15 @@ class Client extends utils_1.Emitter {
         await this.authenticate();
         await this.raknet.connect();
         this.requestNetworkSettings();
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             this.on("SetLocalPlayerAsInitializedPacket", () => {
                 resolve();
                 this.emit("spawn");
                 this.emit("connect");
             });
+            this.on("disconnect", (reason) => {
+                reject(new Error(`Disconnected during login: ${reason}`));
+            });
         });
     }
     registerHandshakeHandlers() {
@@ -126,9 +129,19 @@ class Client extends utils_1.Emitter {
             utils_2.Logger.error("PacketViolation:", JSON.stringify(pkt, null, 2));
         });
         this.on("DisconnectPacket", (pkt) => {
-            utils_2.Logger.error("Disconnected:", JSON.stringify(pkt, null, 2));
+            const reason = pkt?.message?.message ?? pkt?.message ?? "Unknown reason";
+            utils_2.Logger.info(`Disconnected by server: ${reason}`);
+            this.close();
+            this.emit("disconnect", String(reason));
         });
     }
+    close() {
+        try {
+            this.raknet.close();
+        }
+        catch { }
+        this.removeAllListeners();
+    }
     async authenticate() {
         if (this.options.offline) {
             return this.authenticateOffline();
@@ -154,16 +167,26 @@ class Client extends utils_1.Emitter {
         };
         this.loginData = types_1.LoginData.prepare(this.options, tempProfile);
         const { username, tokensFolder } = this.options;
+        const flow = this.options.email && this.options.password
+            ? "password"
+            : this.options.xboxToken
+                ? "xboxToken"
+                : "deviceCode";
         const auth = new auth_1.Auth({
-            username,
+            flow,
+            username: flow === "deviceCode" ? username : undefined,
             cacheDir: tokensFolder,
             clientPublicKey: this.loginData.clientX509,
+            email: this.options.email,
+            password: this.options.password,
+            xboxToken: this.options.xboxToken,
         });
         return new Promise((resolve, reject) => {
             auth.on("deviceCode", (r) => {
                 utils_2.Logger.info(`Please login at ${r.verificationUri}?otc=${r.userCode}`);
             });
             auth.on("login", async (result) => {
+                utils_2.Logger.info(`Logged in as §a${result.profile.username}§r`);
                 this.applyAuthResult(result);
                 resolve();
             });
@@ -172,22 +195,10 @@ class Client extends utils_1.Emitter {
         });
     }
     async applyAuthResult(result) {
-        let gamertag = this.options.username;
-        let xuid = "";
-        let uuid = types_1.LoginData.nextUUID(this.options.username);
-        for (const jwt of result.bedrockChain) {
-            try {
-                const payload = JSON.parse(Buffer.from(jwt.split(".")[1], "base64").toString());
-                if (payload?.extraData?.displayName) {
-                    gamertag = payload.extraData.displayName;
-                    xuid = payload.extraData.XUID ?? "";
-                    uuid = payload.extraData.identity ?? types_1.LoginData.nextUUID(gamertag);
-                    break;
-                }
-            }
-            catch { }
-        }
-        this.profile = { name: gamertag, uuid, xuid };
+        const gamertag = result.profile.username || this.options.username;
+        const xuid = result.profile.xuid || "";
+        const uuid = result.profile.uuid || types_1.LoginData.nextUUID(gamertag);
+        this.profile = { name: result.profile.username, uuid, xuid };
         this.loginData.payload = (0, types_1.createDefaultPayload)(this.options, this.profile);
         if (this.options.skinData) {
             Object.assign(this.loginData.payload, this.options.skinData);

package/dist/client/types/client-events.d.ts

@@ -5,4 +5,5 @@ export type ClientEvents = {
 } & {
     spawn: [];
     connect: [];
+    disconnect: [reason: string];
 };

package/dist/client/types/client-options.d.ts

@@ -27,6 +27,12 @@ export type ClientOptions = {
     loginOptions: LoginOptions;
     skinData?: Partial<SkinData>;
     skinFile?: string;
+    /** Email for password auth flow */
+    email?: string;
+    /** Password for password auth flow */
+    password?: string;
+    /** XBL3.0 token for xbox token auth flow. Format: "XBL3.0 x={userHash};{token}" */
+    xboxToken?: string;
 } & RaknetOptions;
 export declare const defaultClientOptions: {
     username: string;

package/dist/server/server.js

@@ -48,6 +48,7 @@ class Server extends utils_1.Emitter {
             });
         });
         await this.raknet.start();
+        utils_1.Logger.info(`Server listening on ${this.options.address}:${this.options.port}`);
     }
     onDisconnect(player) {
         const key = this.getKey(player.connection);

package/package.json

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