bedrock-portal 2.2.0 → 2.3.0

package/dist/common/start_game.js

@@ -61,7 +61,7 @@ exports.start_game = {
     persona_disabled: false,
     custom_skins_disabled: false,
     emote_chat_muted: false,
-    game_version: '1.26.20',
+    game_version: '*',
     limited_world_width: 16,
     limited_world_length: 16,
     is_new_nether: false,

package/dist/handlers/Event.js

@@ -11,6 +11,7 @@ exports.default = async (portal, event) => {
         return;
     portal.emit('rtaEvent', event);
     const session = await portal.getSession();
+    await portal.syncSessionNonces(session);
     portal.emit('sessionUpdated', session);
     debug('Received RTA event, session has been updated', session);
     const sessionMembers = Object.values(session.members).filter(member => member.constants.system.xuid !== portal.host?.profile?.xuid);

package/dist/index.d.ts

@@ -131,6 +131,8 @@ export declare class BedrockPortal extends TypedEmitter<PortalEvents> {
     options: BedrockPortalOptions;
     session: {
         name: string;
+        pmsgId: string;
+        nonces: Record<string, string>;
     };
     players: Map<string, Player>;
     peers: Map<string, Host>;
@@ -173,6 +175,7 @@ export declare class BedrockPortal extends TypedEmitter<PortalEvents> {
      * @param payload The payload to update the session with.
      */
     updateSession(payload: SessionRequest): Promise<void>;
+    syncSessionNonces(session: RESTSessionResponse): Promise<void>;
     /**
      * Enables a module for the BedrockPortal instance.
      * @see [Modules](https://github.com/LucienHH/bedrock-portal#modules) for a list of available modules or to create your own.

package/dist/index.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Modules = exports.Module = exports.Joinability = exports.BedrockPortal = void 0;
+const crypto_1 = require("crypto");
 const debug_1 = __importDefault(require("debug"));
 const uuid_1 = require("uuid");
 const tiny_typed_emitter_1 = require("tiny-typed-emitter");
@@ -68,7 +69,7 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
         };
         this.validateOptions(this.options);
         this.host = new Host_1.default(this, this.options.host instanceof prismarine_auth_1.Authflow ? this.options.host : new prismarine_auth_1.Authflow(this.options.host.username, this.options.host.cache, this.options.host.options, this.options.host.onMsaCode));
-        this.session = { name: '' };
+        this.session = { name: '', pmsgId: '', nonces: {} };
         this.players = new Map();
         this.peers = new Map();
         this.modules = new Map();
@@ -84,9 +85,15 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
      */
     async start() {
         this.players = new Map();
+        this.session.pmsgId = '';
+        this.session.nonces = {};
         await this.host.connect();
         this.session.name = (0, uuid_1.v4)();
         await this.server.listen(this.host.authflow, this.options.webRTCNetworkId);
+        const pmsgId = this.server.signaling?.pmsgId;
+        if (!pmsgId)
+            throw new Error('Failed to determine signaling pmsgId');
+        this.session.pmsgId = pmsgId;
         this.server.on('connect', (client) => this.onServerConnection(client));
         const session = await this.createAndPublishSession();
         await this.connectPeers();
@@ -166,6 +173,29 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
     async updateSession(payload) {
         await this.host.rest.updateSession(this.session.name, payload);
     }
+    async syncSessionNonces(session) {
+        const hostProfile = this.host.profile;
+        if (!hostProfile) {
+            return;
+        }
+        const activeXuids = [...new Set(Object.values(session.members)
+                .map(member => member.constants.system.xuid)
+                .filter(xuid => xuid !== hostProfile.xuid))].sort();
+        const nextNonces = Object.fromEntries(activeXuids.map(xuid => [xuid, this.session.nonces[xuid] ?? (0, crypto_1.randomBytes)(8).toString('hex')]));
+        const hasChanges = Object.keys(this.session.nonces).length !== activeXuids.length
+            || activeXuids.some(xuid => this.session.nonces[xuid] !== nextNonces[xuid]);
+        if (!hasChanges) {
+            return;
+        }
+        this.session.nonces = nextNonces;
+        await this.updateSession({
+            properties: {
+                custom: {
+                    nonces: nextNonces,
+                },
+            },
+        });
+    }
     /**
      * Enables a module for the BedrockPortal instance.
      * @see [Modules](https://github.com/LucienHH/bedrock-portal#modules) for a list of available modules or to create your own.
@@ -210,14 +240,8 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
                 has_editor_packs: false,
             });
             client.once('resource_pack_client_response', () => {
-                client.write('voxel_shapes', {
-                    shapes: [],
-                    name_map: [],
-                    custom_shape_count: 0,
-                });
                 client.write('start_game', start_game_1.start_game);
-                client.write('play_status', { status: 'player_spawn' });
-                client.once('set_local_player_as_initialized', () => {
+                client.once('set_player_game_type', () => {
                     client.write('transfer', { server_address: this.options.ip, port: this.options.port });
                 });
             });
@@ -278,6 +302,8 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
     createSessionBody() {
         if (!this.host.profile || !this.host.connectionId)
             throw new Error('No session owner');
+        if (!this.session.pmsgId)
+            throw new Error('No session connection payload id');
         const joinability = constants_1.JoinabilityConfig[this.options.joinability];
         return {
             properties: {
@@ -306,13 +332,14 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
                     WebRTCNetworkId: this.options.webRTCNetworkId,
                     isHardcore: this.options.world.isHardcore,
                     isEditorWorld: this.options.world.isEditor,
+                    nonces: this.session.nonces,
                     SupportedConnections: [
                         {
-                            ConnectionType: 3,
+                            ConnectionType: 7,
                             HostIpAddress: '',
                             HostPort: 0,
-                            WebRTCNetworkId: this.options.webRTCNetworkId,
                             NetherNetId: this.options.webRTCNetworkId,
+                            PmsgId: this.session.pmsgId,
                         },
                     ],
                 },

package/dist/rest.d.ts

@@ -1,35 +1,18 @@
-import { AxiosRequestConfig } from 'axios';
 import { Authflow } from 'prismarine-auth';
 import { RESTXblmessageInboxResponse } from './types/xblmessaging';
 import { SessionRequest, RESTSessionResponse, SessionHandlePayload } from './types/sessiondirectory';
 import { RESTSocialPostBulkFriendRequestResponse } from './types/social';
-type RequestHeaders = {
-    [x: string]: string | boolean | number | undefined;
-};
-type MethodRequestConfig = {
-    relyingParty?: string;
-    contractVersion?: string;
-    params?: AxiosRequestConfig['params'];
-    data?: AxiosRequestConfig['data'];
-    headers?: RequestHeaders;
-};
-type RequestConfig = MethodRequestConfig & {
-    url: string;
+type RestOptions = {
+    headers?: HeadersInit;
 };
 export default class Rest {
     auth: Authflow;
-    options: {
-        headers?: RequestHeaders;
-    };
-    constructor(authflow: Authflow, options?: {});
-    get(url: string, config?: MethodRequestConfig): Promise<any>;
-    post(url: string, config?: MethodRequestConfig): Promise<any>;
-    put(url: string, config?: MethodRequestConfig): Promise<any>;
-    delete(url: string, config?: MethodRequestConfig): Promise<any>;
-    _request(method: 'GET' | 'POST' | 'PUT' | 'DELETE', config: RequestConfig): Promise<any>;
-    sendHandle(payload: SessionHandlePayload): Promise<any>;
-    setActivity(sessionName: string): Promise<any>;
-    sendInvite(sessionName: string, xuid: string): Promise<any>;
+    options: RestOptions;
+    constructor(authflow: Authflow, options?: RestOptions);
+    private fetchJson;
+    sendHandle(payload: SessionHandlePayload): Promise<unknown>;
+    setActivity(sessionName: string): Promise<unknown>;
+    sendInvite(sessionName: string, xuid: string): Promise<unknown>;
     getSession(sessionName: string): Promise<RESTSessionResponse>;
     updateSession(sessionName: string, payload: SessionRequest): Promise<RESTSessionResponse>;
     updateMemberCount(sessionName: string, count: number, maxCount?: number): Promise<void>;

package/dist/rest.js

@@ -1,9 +1,5 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const axios_1 = __importDefault(require("axios"));
 const json_bigint_1 = require("json-bigint");
 const constants_1 = require("./common/constants");
 const util_1 = require("./common/util");
@@ -14,47 +10,39 @@ class Rest {
         this.auth = authflow;
         this.options = options;
     }
-    async get(url, config = {}) {
-        return await this._request('GET', { url, ...config });
-    }
-    async post(url, config = {}) {
-        return await this._request('POST', { url, ...config });
-    }
-    async put(url, config = {}) {
-        return await this._request('PUT', { url, ...config });
-    }
-    async delete(url, config = {}) {
-        return await this._request('DELETE', { url, ...config });
-    }
-    async _request(method, config) {
+    async fetchJson(url, init = {}) {
+        const { contractVersion, headers: requestHeaders, ...requestInit } = init;
         const auth = await this.auth.getXboxToken('http://xboxlive.com');
-        const payload = {
-            method,
-            url: config.url,
-            headers: {
-                'authorization': `XBL3.0 x=${auth.userHash};${auth.XSTSToken}`,
-                'content-type': 'application/json',
-                'accept-language': 'en-US',
-                ...config.headers,
-            },
-            data: undefined,
-            params: undefined,
-        };
-        if (config.contractVersion)
-            payload.headers['x-xbl-contract-version'] = config.contractVersion;
-        if (config.params)
-            payload.params = config.params;
-        if (config.data)
-            payload.data = config.data;
-        return (0, axios_1.default)({
-            ...payload,
-            transformResponse: [data => data ? (0, json_bigint_1.parse)(data) : undefined],
-            transformRequest: [data => data ? (0, json_bigint_1.stringify)(data) : undefined],
-        }).then(e => e.data);
+        const headers = new Headers({
+            'authorization': `XBL3.0 x=${auth.userHash};${auth.XSTSToken}`,
+            'accept-language': 'en-US',
+        });
+        for (const [key, value] of new Headers(this.options.headers).entries()) {
+            headers.set(key, value);
+        }
+        for (const [key, value] of new Headers(requestHeaders).entries()) {
+            headers.set(key, value);
+        }
+        if (requestInit.body !== undefined && !headers.has('content-type')) {
+            headers.set('content-type', 'application/json');
+        }
+        if (contractVersion)
+            headers.set('x-xbl-contract-version', contractVersion);
+        const response = await fetch(url, {
+            ...requestInit,
+            headers,
+        });
+        const body = await response.text();
+        if (!response.ok) {
+            const detail = body ? `: ${body}` : '';
+            throw new Error(`Request failed with status ${response.status} ${response.statusText}${detail}`);
+        }
+        return (body ? (0, json_bigint_1.parse)(body) : undefined);
     }
     async sendHandle(payload) {
-        return this.post('https://sessiondirectory.xboxlive.com/handles', {
-            data: payload,
+        return this.fetchJson('https://sessiondirectory.xboxlive.com/handles', {
+            method: 'POST',
+            body: (0, json_bigint_1.stringify)(payload),
             contractVersion: '107',
         });
     }
@@ -75,14 +63,15 @@ class Rest {
         });
     }
     async getSession(sessionName) {
-        const response = await this.get(`https://sessiondirectory.xboxlive.com/serviceconfigs/${constants_1.SessionConfig.MinecraftSCID}/sessionTemplates/${constants_1.SessionConfig.MinecraftTemplateName}/sessions/${sessionName}`, {
+        const response = await this.fetchJson(`https://sessiondirectory.xboxlive.com/serviceconfigs/${constants_1.SessionConfig.MinecraftSCID}/sessionTemplates/${constants_1.SessionConfig.MinecraftTemplateName}/sessions/${sessionName}`, {
             contractVersion: '107',
         });
         return response;
     }
     async updateSession(sessionName, payload) {
-        const response = await this.put(`https://sessiondirectory.xboxlive.com/serviceconfigs/${constants_1.SessionConfig.MinecraftSCID}/sessionTemplates/${constants_1.SessionConfig.MinecraftTemplateName}/sessions/${sessionName}`, {
-            data: payload,
+        const response = await this.fetchJson(`https://sessiondirectory.xboxlive.com/serviceconfigs/${constants_1.SessionConfig.MinecraftSCID}/sessionTemplates/${constants_1.SessionConfig.MinecraftTemplateName}/sessions/${sessionName}`, {
+            method: 'PUT',
+            body: (0, json_bigint_1.stringify)(payload),
             contractVersion: '107',
         });
         return response;
@@ -117,48 +106,69 @@ class Rest {
         let xuid = input;
         if (!(0, util_1.isXuid)(input)) {
             const target = input === 'me' ? 'me' : `gt(${encodeURIComponent(input)})`;
-            const response = await this.get(`https://profile.xboxlive.com/users/${target}/settings`, { contractVersion: '2' });
+            const response = await this.fetchJson(`https://profile.xboxlive.com/users/${target}/settings`, { contractVersion: '2' });
             xuid = response.profileUsers[0].id;
         }
-        const response = await this.get(`https://peoplehub.xboxlive.com/users/me/people/xuids(${xuid})/decoration/detail,preferredcolor`, { contractVersion: '5' });
+        const response = await this.fetchJson(`https://peoplehub.xboxlive.com/users/me/people/xuids(${xuid})/decoration/detail,preferredcolor`, { contractVersion: '5' });
         return response.people.shift();
     }
     async getProfiles(xuids) {
-        const response = await this.post('https://peoplehub.xboxlive.com/users/me/people/batch/decoration/detail,preferredcolor', { data: { xuids }, contractVersion: '5' });
+        const response = await this.fetchJson('https://peoplehub.xboxlive.com/users/me/people/batch/decoration/detail,preferredcolor', {
+            method: 'POST',
+            body: (0, json_bigint_1.stringify)({ xuids }),
+            contractVersion: '5',
+        });
         return response.people;
     }
     async getXboxFriends() {
-        const response = await this.get('https://peoplehub.xboxlive.com/users/me/people/social/decoration/detail,preferredColor,follower', { contractVersion: '5' });
+        const response = await this.fetchJson('https://peoplehub.xboxlive.com/users/me/people/social/decoration/detail,preferredColor,follower', { contractVersion: '5' });
         return response.people;
     }
     async getXboxFollowers() {
-        const response = await this.get('https://peoplehub.xboxlive.com/users/me/people/followers/decoration/detail,preferredColor,follower', { contractVersion: '5' });
+        const response = await this.fetchJson('https://peoplehub.xboxlive.com/users/me/people/followers/decoration/detail,preferredColor,follower', { contractVersion: '5' });
         return response.people;
     }
     async getFriendRequestsReceived() {
-        const response = await this.get('https://peoplehub.xboxlive.com/users/me/people/friendrequests(received)/decoration/detail,preferredColor,follower', { contractVersion: '7' });
+        const response = await this.fetchJson('https://peoplehub.xboxlive.com/users/me/people/friendrequests(received)/decoration/detail,preferredColor,follower', { contractVersion: '7' });
         return response.people;
     }
     async acceptFriendRequests(xuids) {
-        const response = await this.post('https://social.xboxlive.com/bulk/users/me/people/friends/v2?method=add', { data: { xuids }, contractVersion: '3' });
+        const response = await this.fetchJson('https://social.xboxlive.com/bulk/users/me/people/friends/v2?method=add', {
+            method: 'POST',
+            body: (0, json_bigint_1.stringify)({ xuids }),
+            contractVersion: '3',
+        });
         return response;
     }
     async declineFriendRequests(xuids) {
-        const response = await this.post('https://social.xboxlive.com/bulk/users/me/people/friends/v2?method=remove', { data: { xuids }, contractVersion: '3' });
+        const response = await this.fetchJson('https://social.xboxlive.com/bulk/users/me/people/friends/v2?method=remove', {
+            method: 'POST',
+            body: (0, json_bigint_1.stringify)({ xuids }),
+            contractVersion: '3',
+        });
         return response;
     }
     async addXboxFriend(xuid) {
-        await this.put(`https://social.xboxlive.com/users/me/people/xuid(${xuid})`, { contractVersion: '2' });
+        await this.fetchJson(`https://social.xboxlive.com/users/me/people/xuid(${xuid})`, {
+            method: 'PUT',
+            contractVersion: '2',
+        });
     }
     async removeXboxFriend(xuid) {
-        await this.delete(`https://social.xboxlive.com/users/me/people/xuid(${xuid})`, { contractVersion: '2' });
+        await this.fetchJson(`https://social.xboxlive.com/users/me/people/xuid(${xuid})`, {
+            method: 'DELETE',
+            contractVersion: '2',
+        });
     }
     async getInboxMessages(inbox) {
-        const response = await this.get(`https://xblmessaging.xboxlive.com/network/xbox/users/me/inbox/${inbox}`, { contractVersion: '1' });
+        const response = await this.fetchJson(`https://xblmessaging.xboxlive.com/network/xbox/users/me/inbox/${inbox}`, { contractVersion: '1' });
         return response;
     }
     async setPresence(xuid) {
-        await this.post(`https://userpresence.xboxlive.com/users/xuid(${xuid})/devices/current/titles/current`, { data: { state: 'active' } });
+        await this.fetchJson(`https://userpresence.xboxlive.com/users/xuid(${xuid})/devices/current/titles/current`, {
+            method: 'POST',
+            body: (0, json_bigint_1.stringify)({ state: 'active' }),
+        });
     }
 }
 exports.default = Rest;

package/dist/types/sessiondirectory.d.ts

@@ -97,7 +97,7 @@ export interface SessionConnection {
     HostIpAddress: string;
     HostPort: number;
     NetherNetId: bigint;
-    WebRTCNetworkId: bigint;
+    PmsgId: string;
 }
 export interface SessionRequest {
     properties?: {
@@ -127,6 +127,7 @@ export interface SessionRequest {
             TitleId?: number;
             isHardcore?: boolean;
             isEditorWorld?: boolean;
+            nonces?: Record<string, string>;
             SupportedConnections?: SessionConnection[];
         };
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bedrock-portal",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Creates a joinable session in Minecraft Bedrock Edition that can route players to their a specified host",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -21,11 +21,10 @@
   },
   "homepage": "https://github.com/LucienHH/bedrock-portal#readme",
   "dependencies": {
-    "axios": "^1.0.0",
     "bedrock-portal-nethernet": "^2.0.0",
     "debug": "^4.3.4",
     "json-bigint": "^1.0.0",
-    "prismarine-auth": "github:LucienHH/prismarine-auth#playfab",
+    "prismarine-auth": "^3.1.1",
     "tiny-typed-emitter": "^2.1.0",
     "uuid": "^9.0.0",
     "xbox-message": "^0.2.0",
@@ -40,6 +39,6 @@
     "@typescript-eslint/parser": "^6.17.0",
     "bedrock-portal": "file:.",
     "eslint": "^8.33.0",
-    "typescript": "^5.3.3"
+    "typescript": "^6.0.3"
   }
 }