baltica 2.0.11 → 2.0.13

package/dist/bridge/bridge-player.js

@@ -19,6 +19,9 @@ class BridgePlayer extends utils_1.Emitter {
             address: this.bridge.options.destination.address,
             port: this.bridge.options.destination.port,
             offline: this.bridge.options.offline,
+            proxy: this.bridge.options.proxy,
+            email: this.bridge.options.email,
+            password: this.bridge.options.password,
         });
         this.client.stopPastLogin = true;
         this.client.once("PlayStatusPacket", (packet) => {

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

@@ -1,3 +1,4 @@
+import type { Socks5Options } from "@baltica/raknet";
 import { type ServerOptions } from "../../server";
 export type BridgeOptions = ServerOptions & {
     destination: {
@@ -5,5 +6,8 @@ export type BridgeOptions = ServerOptions & {
         port: number;
     };
     offline: boolean;
+    proxy?: Socks5Options;
+    email?: string;
+    password?: string;
 };
 export declare const defaultBridgeOptions: BridgeOptions;

package/dist/client/client.d.ts

@@ -15,7 +15,7 @@ export declare class Client extends Emitter<ClientEvents> {
     startGameData: StartGamePacket;
     private isDisconnected;
     constructor(options: Partial<ClientOptions>);
-    connect(): Promise<void>;
+    connect(): Promise<Client>;
     private registerHandshakeHandlers;
     private onNetworkSettings;
     private onServerHandshake;

package/dist/client/client.js

@@ -39,7 +39,7 @@ class Client extends utils_1.Emitter {
         this.requestNetworkSettings();
         return new Promise((resolve, reject) => {
             this.once("SetLocalPlayerAsInitializedPacket", () => {
-                resolve();
+                resolve(this);
                 this.emit("connect");
             });
             this.once("disconnect", (reason) => {
@@ -92,14 +92,17 @@ class Client extends utils_1.Emitter {
     onResourcePacksInfo(packet) {
         const response = new protocol_1.ResourcePackClientResponsePacket();
         response.packs = packet.packs.map((p) => new protocol_1.RequestedResourcePack(p.uuid, p.version));
-        response.response = protocol_1.ResourcePackResponse.HaveAllPacks;
+        response.response = response.packs.length > 0
+            // TODO: Maybe add packet downloading later if specified in options
+            ? protocol_1.ResourcePackResponse.HaveAllPacks
+            : protocol_1.ResourcePackResponse.HaveAllPacks;
         const cacheStatus = new protocol_1.ClientCacheStatusPacket();
         cacheStatus.enabled = false;
         this.send([response.serialize(), cacheStatus.serialize()]);
     }
     onResourcePackStack(packet) {
         const response = new protocol_1.ResourcePackClientResponsePacket();
-        response.packs = packet.texturePacks.map((p) => new protocol_1.RequestedResourcePack(p.uuid, p.version));
+        response.packs = [];
         response.response = protocol_1.ResourcePackResponse.Completed;
         this.send(response.serialize());
     }
@@ -176,6 +179,7 @@ class Client extends utils_1.Emitter {
         };
         this.loginData = types_1.LoginData.prepare(this.options, this.profile);
         this.loginData.clientIdentityChain = await this.loginData.createClientChain(this.profile, null, true);
+        this.loginData.loginToken = await this.loginData.createOfflineToken(this.profile);
         this.loginData.clientUserChain = await this.loginData.createClientUserChain(this.loginData.privateKey, this.profile, this.options);
     }
     authenticateOnline() {

package/dist/client/types/login/login-data.d.ts

@@ -77,6 +77,7 @@ export declare class LoginData {
     payload: Payload;
     static prepare(options: ClientOptions, profile: PlayerProfile): LoginData;
     createLoginPacket(options: ClientOptions): LoginPacket;
+    createOfflineToken(profile: PlayerProfile): Promise<string>;
     createClientChain(profile: PlayerProfile, mojangKey: string | null, offline: boolean): Promise<string>;
     createClientUserChain(privateKey: KeyObject, profile: PlayerProfile, options: ClientOptions): Promise<string>;
     static createSharedSecret(privateKey: KeyObject, publicKey: KeyObject): Buffer;

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

@@ -130,7 +130,7 @@ class LoginData {
     }
     createLoginPacket(options) {
         const loginPacket = new protocol_1.LoginPacket();
-        const chain = [this.clientIdentityChain, ...this.accessToken];
+        const chain = [this.clientIdentityChain, ...this.accessToken].filter((value) => typeof value === "string" && value.length > 0);
         const certificate = JSON.stringify({ chain });
         const identityObj = {
             AuthenticationType: options.offline ? 2 : 0,
@@ -143,6 +143,25 @@ class LoginData {
         loginPacket.tokens = new protocol_1.LoginTokens(this.clientUserChain, JSON.stringify(identityObj));
         return loginPacket;
     }
+    async createOfflineToken(profile) {
+        const josePrivateKey = await jose.importPKCS8(this.privateKey.export({ format: "pem", type: "pkcs8" }), ALGORITHM);
+        const payload = {
+            aud: "api://auth-minecraft-services/multiplayer",
+            cpk: this.clientX509,
+            exp: Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 365,
+            leguuid: profile.uuid,
+            mid: LoginData.nextUUID(profile.name).replace(/-/g, "").slice(0, 16).toUpperCase(),
+            nid: "",
+            nname: "",
+            pid: "",
+            pname: "",
+            xid: profile.xuid || "",
+            xname: profile.name,
+        };
+        return new jose.SignJWT(payload)
+            .setProtectedHeader({ alg: ALGORITHM, x5u: this.clientX509 })
+            .sign(josePrivateKey);
+    }
     async createClientChain(profile, mojangKey, offline) {
         let payload;
         let header;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./client";
 export * from "./server";
 export * from "./bridge";
+export * from "@baltica/utils";

package/dist/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./client"), exports);
 __exportStar(require("./server"), exports);
 __exportStar(require("./bridge"), exports);
+__exportStar(require("@baltica/utils"), exports);

package/dist/server/login-payload.d.ts

@@ -0,0 +1,6 @@
+export type LoginPayloadObject = Record<string, unknown>;
+export declare function decodeJwtPayload(jwt: string): LoginPayloadObject | null;
+export declare function summarizeUnknownIdentityPayloadFields(payload: LoginPayloadObject): string[];
+export declare function summarizeUnknownClientPayloadFields(payload: LoginPayloadObject): string[];
+export declare function summarizeUnknownTokenPayloadFields(payload: LoginPayloadObject): string[];
+export declare function summarizeClientPayloadForLog(payload: LoginPayloadObject): LoginPayloadObject;

package/dist/server/login-payload.js

@@ -0,0 +1,160 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeJwtPayload = decodeJwtPayload;
+exports.summarizeUnknownIdentityPayloadFields = summarizeUnknownIdentityPayloadFields;
+exports.summarizeUnknownClientPayloadFields = summarizeUnknownClientPayloadFields;
+exports.summarizeUnknownTokenPayloadFields = summarizeUnknownTokenPayloadFields;
+exports.summarizeClientPayloadForLog = summarizeClientPayloadForLog;
+const KNOWN_IDENTITY_KEYS = new Set([
+    "certificateAuthority",
+    "cpk",
+    "exp",
+    "extraData",
+    "iat",
+    "identityPublicKey",
+    "iss",
+    "mid",
+    "nbf",
+    "pfcd",
+    "randomNonce",
+    "tid",
+    "xid",
+    "xname",
+]);
+const KNOWN_IDENTITY_EXTRA_DATA_KEYS = new Set([
+    "XUID",
+    "displayName",
+    "identity",
+    "sandboxId",
+    "titleId",
+]);
+const KNOWN_CLIENT_DATA_KEYS = new Set([
+    "AnimatedImageData",
+    "ArmSize",
+    "CapeData",
+    "CapeId",
+    "CapeImageHeight",
+    "CapeImageWidth",
+    "CapeOnClassicSkin",
+    "ClientRandomId",
+    "CompatibleWithClientSideChunkGen",
+    "CurrentInputMode",
+    "DefaultInputMode",
+    "DeviceId",
+    "DeviceModel",
+    "DeviceOS",
+    "GameVersion",
+    "GraphicsMode",
+    "GuiScale",
+    "IsEditorMode",
+    "LanguageCode",
+    "MaxViewDistance",
+    "MemoryTier",
+    "OverrideSkin",
+    "PartyId",
+    "PersonaPieces",
+    "PersonaSkin",
+    "PieceTintColors",
+    "PlatformOfflineId",
+    "PlatformOnlineId",
+    "PlatformType",
+    "PlayFabId",
+    "PlayformType",
+    "PremiumSkin",
+    "SelfSignedId",
+    "ServerAddress",
+    "SkinAnimationData",
+    "SkinColor",
+    "SkinData",
+    "SkinGeometryData",
+    "SkinGeometryDataEngineVersion",
+    "SkinId",
+    "SkinImageHeight",
+    "SkinImageWidth",
+    "SkinResourcePatch",
+    "ThirdPartyName",
+    "ThirdPartyNameOnly",
+    "TrustedSkin",
+    "UIProfile",
+    "pfcd",
+]);
+const KNOWN_TOKEN_KEYS = new Set([
+    "aud",
+    "cpk",
+    "exp",
+    "iat",
+    "ipt",
+    "iss",
+    "leguuid",
+    "mid",
+    "nbf",
+    "nid",
+    "nname",
+    "pfcd",
+    "pid",
+    "pname",
+    "sub",
+    "tid",
+    "xid",
+    "xname",
+]);
+function decodeJwtPayload(jwt) {
+    const payload = jwt.split(".")[1];
+    if (!payload)
+        return null;
+    try {
+        return JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
+    }
+    catch {
+        try {
+            return JSON.parse(Buffer.from(payload, "base64").toString("utf8"));
+        }
+        catch {
+            return null;
+        }
+    }
+}
+function unknownKeys(payload, knownKeys) {
+    return Object.keys(payload)
+        .filter((key) => !knownKeys.has(key))
+        .sort();
+}
+function summarizeUnknownIdentityPayloadFields(payload) {
+    const unknown = unknownKeys(payload, KNOWN_IDENTITY_KEYS);
+    const extraData = payload.extraData;
+    if (extraData && typeof extraData === "object" && !Array.isArray(extraData)) {
+        const nestedUnknown = unknownKeys(extraData, KNOWN_IDENTITY_EXTRA_DATA_KEYS).map((key) => `extraData.${key}`);
+        unknown.push(...nestedUnknown);
+    }
+    return unknown.sort();
+}
+function summarizeUnknownClientPayloadFields(payload) {
+    return unknownKeys(payload, KNOWN_CLIENT_DATA_KEYS);
+}
+function summarizeUnknownTokenPayloadFields(payload) {
+    return unknownKeys(payload, KNOWN_TOKEN_KEYS);
+}
+function summarizeClientPayloadForLog(payload) {
+    const summary = {};
+    const copyIfPresent = (key) => {
+        if (payload[key] !== undefined) {
+            summary[key] = payload[key];
+        }
+    };
+    copyIfPresent("DeviceId");
+    copyIfPresent("DeviceOS");
+    copyIfPresent("DeviceModel");
+    copyIfPresent("GameVersion");
+    copyIfPresent("SkinId");
+    copyIfPresent("PartyId");
+    copyIfPresent("PlayFabId");
+    copyIfPresent("PlatformOnlineId");
+    copyIfPresent("SelfSignedId");
+    if (typeof payload.SkinData === "string") {
+        summary.SkinDataLength = payload.SkinData.length;
+    }
+    if (Array.isArray(payload.PersonaPieces)) {
+        summary.PersonaPiecesCount = payload.PersonaPieces.length;
+    }
+    return summary;
+}

package/dist/server/player.js

@@ -40,10 +40,16 @@ const protocol_1 = require("@serenityjs/protocol");
 const jose = __importStar(require("jose"));
 const node_crypto_1 = require("node:crypto");
 const shared_1 = require("../shared");
+const login_payload_1 = require("./login-payload");
 const SALT = "\u{1F9C2}";
 const SALT_BUFFER = Buffer.from(SALT);
 const CURVE = "secp384r1";
 const ALGORITHM = "ES384";
+function asRecord(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return null;
+    return value;
+}
 class Player extends utils_1.Emitter {
     packetCompressor;
     packetEncryptor = null;
@@ -99,17 +105,38 @@ class Player extends utils_1.Emitter {
         const identity = JSON.parse(identityRaw);
         const certData = JSON.parse(identity.Certificate ?? identity.certificate ?? "{}");
         const chain = certData.chain ?? [];
+        // console.log(packet);
         let displayName = "";
         let xuid = "";
         let identityPublicKey = "";
+        const clientPayload = (0, login_payload_1.decodeJwtPayload)(packet.tokens.client);
+        if (clientPayload) {
+            // console.log("Login client data payload:", clientPayload);
+            // Logger.debug("Login client data payload:", clientPayload);
+            const unknownFields = (0, login_payload_1.summarizeUnknownClientPayloadFields)(clientPayload);
+            if (unknownFields.length > 0) {
+                utils_1.Logger.warn(`Unparsed client login payload fields: ${unknownFields.join(", ")}`);
+            }
+        }
+        else {
+            utils_1.Logger.warn("Failed to decode client data login payload");
+        }
         for (const jwt of chain) {
             try {
-                const payload = JSON.parse(Buffer.from(jwt.split(".")[1], "base64").toString());
-                if (payload?.extraData?.displayName) {
-                    displayName = payload.extraData.displayName;
-                    xuid = payload.extraData.XUID ?? "";
+                const payload = (0, login_payload_1.decodeJwtPayload)(jwt);
+                if (!payload)
+                    continue;
+                utils_1.Logger.debug("Login identity payload:", payload);
+                const unknownFields = (0, login_payload_1.summarizeUnknownIdentityPayloadFields)(payload);
+                if (unknownFields.length > 0) {
+                    utils_1.Logger.warn(`Unparsed identity login payload fields: ${unknownFields.join(", ")}`);
+                }
+                const extraData = asRecord(payload.extraData);
+                if (typeof extraData?.displayName === "string") {
+                    displayName = extraData.displayName;
+                    xuid = typeof extraData.XUID === "string" ? extraData.XUID : "";
                 }
-                if (payload?.identityPublicKey) {
+                if (typeof payload.identityPublicKey === "string") {
                     identityPublicKey = payload.identityPublicKey;
                 }
             }
@@ -121,12 +148,21 @@ class Player extends utils_1.Emitter {
             const token = identity.Token ?? identity.token;
             if (token) {
                 try {
-                    const payload = JSON.parse(Buffer.from(token.split(".")[1], "base64").toString());
-                    if (payload?.cpk)
+                    const payload = (0, login_payload_1.decodeJwtPayload)(token);
+                    if (!payload) {
+                        utils_1.Logger.warn("Failed to decode client login payload");
+                        return;
+                    }
+                    utils_1.Logger.debug("Login client payload:", payload);
+                    const unknownFields = (0, login_payload_1.summarizeUnknownTokenPayloadFields)(payload);
+                    if (unknownFields.length > 0) {
+                        utils_1.Logger.warn(`Unparsed login token payload fields: ${unknownFields.join(", ")}`);
+                    }
+                    if (typeof payload.cpk === "string")
                         identityPublicKey = payload.cpk;
-                    if (payload?.xname && !displayName)
+                    if (typeof payload.xname === "string" && !displayName)
                         displayName = payload.xname;
-                    if (payload?.xid && !xuid)
+                    if (typeof payload.xid === "string" && !xuid)
                         xuid = payload.xid;
                 }
                 catch { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baltica",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "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.19",
+    "@serenityjs/protocol": "^0.8.20",
     "jose": "^6.1.3"
   },
   "files": [