baltica 0.1.23 → 0.1.25

package/dist/client/client.d.ts

@@ -57,7 +57,6 @@ export declare class Client extends Emitter<ClientEvents> {
     disconnect(reason?: string): void;
     private cleanup;
     startEncryption(iv: Buffer): void;
-    private waitForSessionReady;
     /**
      * Sends Packets to the server.
      *

package/dist/client/client.js

@@ -45,20 +45,22 @@ class Client extends shared_1.Emitter {
         /** Create ClientData to store and handle auth data */
         this.data = new types_2.ClientData(this);
         this.raknet.on("disconnect", () => this.cleanup());
-        this.once("session", () => {
-            this.sessionReady = true;
-        });
-        this.options.offline ? (0, shared_1.createOfflineSession)(this) : (0, shared_1.authenticate)(this);
     }
     /** Connect to the server and start sending/receiving packets. */
     async connect() {
+        // Authenticate first before connecting to raknet
+        if (this.options.offline) {
+            await (0, shared_1.createOfflineSession)(this);
+        }
+        else {
+            await (0, shared_1.authenticate)(this);
+        }
+        this.sessionReady = true;
         await this.raknet.connect();
         this.status = raknet_1.ConnectionStatus.Connecting;
         this.packetCompressor = new shared_1.PacketCompressor(this);
         this.handleGamePackets();
         this.raknet.on("encapsulated", this.handleEncapsulated.bind(this));
-        // Wait for authentication to complete before sending network settings request
-        await this.waitForSessionReady();
         const request = new protocol_1.RequestNetworkSettingsPacket();
         request.protocol = types_1.ProtocolList[types_1.CurrentVersionConst];
         this.send(request);
@@ -118,7 +120,6 @@ class Client extends shared_1.Emitter {
             this._compressionEnabled = true;
             this.options.compressionMethod = this.packetCompressor.getMethod(packet.compressionMethod);
             this.options.compressionThreshold = packet.compressionThreshold;
-            await this.waitForSessionReady();
             const loginPacket = this.data.createLoginPacket();
             this.send(loginPacket);
         });
@@ -205,11 +206,6 @@ class Client extends shared_1.Emitter {
         this.packetEncryptor = new shared_1.PacketEncryptor(this, iv);
         this._encryptionEnabled = true;
     }
-    async waitForSessionReady() {
-        while (!this.sessionReady) {
-            await new Promise((resolve) => setTimeout(resolve, 50));
-        }
-    }
     /**
      * Sends Packets to the server.
      *

package/dist/shared/auth/authentication.js

@@ -231,9 +231,10 @@ async function getMicrosoftAccessToken(email, password, proxiedFetch) {
     });
     // Check for access token in redirect
     let location = loginResp.headers.get("location") || "";
+    const allCookies = `${cookies}; ${extractCookies(loginResp.headers)}`;
     // Follow redirects manually to find the access token
     let attempts = 0;
-    while (attempts < 5 && !location.includes("access_token=")) {
+    while (attempts < 10 && !location.includes("access_token=")) {
         if (!location) {
             // Check if we got an error page
             const responseText = await loginResp.text();
@@ -245,12 +246,28 @@ async function getMicrosoftAccessToken(email, password, proxiedFetch) {
                 responseText.includes("idA_PWD_SwitchToCredPicker")) {
                 throw new Error("2FA is enabled on this account. Direct login requires 2FA to be disabled.");
             }
+            if (responseText.includes("identity/confirm")) {
+                throw new Error("Microsoft requires identity confirmation. Please log in via browser first.");
+            }
+            if (responseText.includes("recover?") ||
+                responseText.includes("account.live.com/recover")) {
+                throw new Error("Microsoft requires account recovery. Please verify your account via browser.");
+            }
             // Try to extract access token from response body (some flows embed it)
             const tokenMatch = responseText.match(/access_token=([^&"']+)/);
             if (tokenMatch) {
                 return decodeURIComponent(tokenMatch[1]);
             }
-            throw new Error("Failed to get redirect URL from login response");
+            // Check for urlPost redirect in response (sometimes login returns another form)
+            const urlPostMatch = responseText.match(/urlPost:\s*'([^']+)'/);
+            if (urlPostMatch) {
+                location = urlPostMatch[1];
+                attempts++;
+                continue;
+            }
+            throw new Error("Failed to get redirect URL from login response. " +
+                "This can happen due to rate limiting, CAPTCHA, or security challenges. " +
+                "Try again in a few minutes or log in via browser first.");
         }
         if (location.includes("access_token=")) {
             break;
@@ -258,11 +275,20 @@ async function getMicrosoftAccessToken(email, password, proxiedFetch) {
         const redirectResp = await proxiedFetch(location, {
             headers: {
                 "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
-                Cookie: cookies,
+                Cookie: allCookies,
             },
             redirect: "manual",
         });
-        location = redirectResp.headers.get("location") || "";
+        // Check response body for token if no redirect
+        const newLocation = redirectResp.headers.get("location") || "";
+        if (!newLocation && !newLocation.includes("access_token=")) {
+            const body = await redirectResp.text();
+            const tokenMatch = body.match(/access_token=([^&"']+)/);
+            if (tokenMatch) {
+                return decodeURIComponent(tokenMatch[1]);
+            }
+        }
+        location = newLocation;
         attempts++;
     }
     // Extract access token from URL fragment

package/dist/shared/auth.js

@@ -81,12 +81,11 @@ async function authenticate(client) {
         const profile = extractProfile(chains[1]);
         const sessionToken = await getMultiplayerSessionToken(authflow, client);
         client.data.loginToken = sessionToken;
+        await setupClientProfile(client, profile, chains);
+        await setupClientChains(client);
         const endTime = Date.now();
         raknet_1.Logger.info(`Authentication with Xbox took ${(endTime - startTime) / 1000}s.`);
-        await setupClientProfile(client, profile, chains);
-        setupClientChains(client).then((value) => {
-            client.emit("session");
-        });
+        client.emit("session");
     }
     catch (error) {
         raknet_1.Logger.error(`Authentication failed: ${error instanceof Error ? error.message : String(error)}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "baltica",
   "description": "Library for Minecraft Bedrock Edition community developers.",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "minecraft": "1.21.130",
   "main": "dist/index.js",
   "license": "MIT",
@@ -21,13 +21,13 @@
     }
   ],
   "dependencies": {
-    "@sanctumterra/raknet": "^1.4.11",
+    "@sanctumterra/raknet": "^1.4.12",
     "@serenityjs/binarystream": "^3.0.10",
     "@serenityjs/protocol": "^0.8.17",
     "fetch-socks": "^1.3.2",
     "jose": "^5.10.0",
     "prismarine-auth": "^2.7.0",
-    "undici": "^7.18.2",
+    "undici": "^7.19.0",
     "uuid-1345": "^1.0.2"
   },
   "devDependencies": {