bedrock-portal 2.4.0 → 2.6.0

package/dist/common/constants.js

@@ -5,7 +5,7 @@ exports.SessionConfig = {
     MinecraftTitleID: '896928775',
     MinecraftSCID: '4fc10100-5f7a-4470-899b-280835760c07',
     MinecraftTemplateName: 'MinecraftLobby',
-    MinecraftProtocolVersion: 1001,
+    MinecraftProtocolVersion: 2169,
 };
 var Joinability;
 (function (Joinability) {

package/dist/common/start_game.d.ts

@@ -11,7 +11,7 @@ export declare const start_game: {
         x: number;
         z: number;
     };
-    seed: never[];
+    seed: bigint;
     biome_type: number;
     biome_name: string;
     dimension: string;
@@ -46,7 +46,7 @@ export declare const start_game: {
     experiments_previously_used: boolean;
     bonus_chest: boolean;
     map_enabled: boolean;
-    permission_level: number;
+    permission_level: string;
     server_chunk_tick_range: number;
     has_locked_behavior_pack: boolean;
     has_locked_resource_pack: boolean;
@@ -66,19 +66,18 @@ export declare const start_game: {
         button_name: string;
         link_uri: string;
     };
-    is_logging_chat: boolean;
-    allow_anonymous_block_drops_in_editor_worlds: boolean;
-    server_editor_connection_policy: number;
     experimental_gameplay_override: boolean;
     chat_restriction_level: string;
     disable_player_interactions: boolean;
+    server_editor_connection_policy: number;
+    allow_anonymous_block_drops_in_editor_worlds: boolean;
     level_id: string;
     world_name: string;
     premium_world_template_id: string;
     is_trial: boolean;
     rewind_history_size: number;
     server_authoritative_block_breaking: boolean;
-    current_tick: never[];
+    current_tick: bigint;
     enchantment_seed: number;
     block_properties: never[];
     multiplayer_correlation_id: string;
@@ -89,7 +88,7 @@ export declare const start_game: {
         name: string;
         value: {};
     };
-    block_pallette_checksum: never[];
+    block_pallette_checksum: bigint;
     world_template_id: string;
     client_side_generation: boolean;
     block_network_ids_are_hashes: boolean;

package/dist/common/start_game.js

@@ -14,7 +14,7 @@ exports.start_game = {
         x: 0,
         z: 0,
     },
-    seed: [],
+    seed: 0n,
     biome_type: 0,
     biome_name: 'minecraft:plains',
     dimension: 'overworld',
@@ -40,8 +40,8 @@ exports.start_game = {
     has_confirmed_platform_locked_content: false,
     is_multiplayer: true,
     broadcast_to_lan: true,
-    xbox_live_broadcast_mode: 6,
-    platform_broadcast_mode: 6,
+    xbox_live_broadcast_mode: 3,
+    platform_broadcast_mode: 3,
     enable_commands: true,
     is_texturepacks_required: false,
     gamerules: [],
@@ -49,7 +49,7 @@ exports.start_game = {
     experiments_previously_used: false,
     bonus_chest: false,
     map_enabled: false,
-    permission_level: 4,
+    permission_level: 'member',
     server_chunk_tick_range: 4,
     has_locked_behavior_pack: false,
     has_locked_resource_pack: false,
@@ -69,30 +69,29 @@ exports.start_game = {
         button_name: '',
         link_uri: '',
     },
-    is_logging_chat: false,
-    allow_anonymous_block_drops_in_editor_worlds: false,
-    server_editor_connection_policy: 1,
     experimental_gameplay_override: false,
     chat_restriction_level: 'none',
     disable_player_interactions: false,
+    server_editor_connection_policy: 0,
+    allow_anonymous_block_drops_in_editor_worlds: false,
     level_id: 'Bedrock level',
     world_name: 'Bedrock level',
     premium_world_template_id: '00000000-0000-0000-0000-000000000000',
     is_trial: false,
     rewind_history_size: 40,
     server_authoritative_block_breaking: true,
-    current_tick: [],
+    current_tick: 0n,
     enchantment_seed: 315714801,
     block_properties: [],
     multiplayer_correlation_id: '<raknet>b31f-884c-6f27-c0fb',
     server_authoritative_inventory: true,
-    engine: '1.26.30',
+    engine: '1.26.40',
     property_data: {
         type: 'compound',
         name: '',
         value: {},
     },
-    block_pallette_checksum: [],
+    block_pallette_checksum: 0n,
     world_template_id: '00000000-0000-0000-0000-000000000000',
     client_side_generation: false,
     block_network_ids_are_hashes: true,

package/dist/handlers/Event.js

@@ -10,8 +10,7 @@ exports.default = async (portal, event) => {
     if (!event.data.ncid)
         return;
     portal.emit('rtaEvent', event);
-    const session = await portal.getSession();
-    await portal.syncSessionNonces(session);
+    const session = await portal.syncSessionNonces();
     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

@@ -138,6 +138,7 @@ export declare class BedrockPortal extends TypedEmitter<PortalEvents> {
     peers: Map<string, Host>;
     modules: Map<string, Module>;
     server: Server;
+    private nonceSync;
     constructor(options?: Partial<Omit<BedrockPortalOptions, 'world'> & {
         world?: Partial<BedrockPortalOptions['world']>;
     }>);
@@ -174,8 +175,9 @@ export declare class BedrockPortal extends TypedEmitter<PortalEvents> {
      * Updates the current session of the BedrockPortal instance with the specified payload.
      * @param payload The payload to update the session with.
      */
-    updateSession(payload: SessionRequest): Promise<void>;
-    syncSessionNonces(session: RESTSessionResponse): Promise<void>;
+    updateSession(payload: SessionRequest): Promise<RESTSessionResponse>;
+    syncSessionNonces(): Promise<RESTSessionResponse>;
+    private syncSessionNoncesInternal;
     /**
      * 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

@@ -45,6 +45,7 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
     peers;
     modules = new Map();
     server = new bedrock_portal_nethernet_1.Server();
+    nonceSync = Promise.resolve();
     constructor(options = {}) {
         super();
         this.options = {
@@ -171,13 +172,19 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
      * @param payload The payload to update the session with.
      */
     async updateSession(payload) {
-        await this.host.rest.updateSession(this.session.name, payload);
+        return await this.host.rest.updateSession(this.session.name, payload);
     }
-    async syncSessionNonces(session) {
+    async syncSessionNonces() {
+        const sync = this.nonceSync.then(() => this.syncSessionNoncesInternal());
+        this.nonceSync = sync.then(() => undefined, () => undefined);
+        return await sync;
+    }
+    async syncSessionNoncesInternal() {
         const hostProfile = this.host.profile;
         if (!hostProfile) {
-            return;
+            throw new Error('No session owner');
         }
+        const session = await this.getSession();
         const activeXuids = [...new Set(Object.values(session.members)
                 .map(member => member.constants.system.xuid)
                 .filter(xuid => xuid !== hostProfile.xuid))].sort();
@@ -185,16 +192,17 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
         const hasChanges = Object.keys(this.session.nonces).length !== activeXuids.length
             || activeXuids.some(xuid => this.session.nonces[xuid] !== nextNonces[xuid]);
         if (!hasChanges) {
-            return;
+            return session;
         }
-        this.session.nonces = nextNonces;
-        await this.updateSession({
+        const updatedSession = await this.updateSession({
             properties: {
                 custom: {
                     nonces: nextNonces,
                 },
             },
         });
+        this.session.nonces = nextNonces;
+        return updatedSession;
     }
     /**
      * Enables a module for the BedrockPortal instance.
@@ -219,7 +227,22 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
         this.modules.set(constructed.name, constructed);
     }
     onServerConnection = (client) => {
+        let nonceValidated = false;
+        client.once('login', () => {
+            const xuid = client.profile?.xuid;
+            const nonce = client.skinData?.Nonce;
+            const expectedNonce = xuid ? this.session.nonces[xuid] : undefined;
+            nonceValidated = typeof nonce === 'string' && nonce.length > 0 && nonce === expectedNonce;
+            if (!nonceValidated) {
+                debug(`Rejected client with invalid session nonce, xuid: ${xuid ?? 'unknown'}`);
+                client.disconnect('Server authentication error');
+            }
+        });
         client.on('join', () => {
+            if (!nonceValidated) {
+                client.disconnect('Server authentication error');
+                return;
+            }
             client.write('resource_packs_info', {
                 must_accept: false,
                 has_addons: false,
@@ -231,20 +254,37 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
                 },
                 texture_packs: [],
             });
-            client.write('resource_pack_stack', {
-                must_accept: false,
-                resource_packs: [],
-                game_version: '*',
-                experiments: [],
-                experiments_previously_used: false,
-                has_editor_packs: false,
-            });
-            client.once('resource_pack_client_response', () => {
-                client.write('start_game', start_game_1.start_game);
-                client.once('set_player_game_type', () => {
-                    client.write('transfer', { server_address: this.options.ip, port: this.options.port });
+            const onResourcePackResponse = (response) => {
+                if (response.response_status === 'refused') {
+                    client.off('resource_pack_client_response', onResourcePackResponse);
+                    client.disconnect('Resource packs refused');
+                    return;
+                }
+                if (response.response_status === 'send_packs' || response.response_status === 'have_all_packs') {
+                    client.write('resource_pack_stack', {
+                        must_accept: false,
+                        resource_packs: [],
+                        game_version: '*',
+                        experiments: [],
+                        experiments_previously_used: false,
+                        has_editor_packs: false,
+                    });
+                    return;
+                }
+                if (response.response_status !== 'completed')
+                    return;
+                client.off('resource_pack_client_response', onResourcePackResponse);
+                client.once('request_chunk_radius', () => {
+                    client.write('transfer', {
+                        server_address: this.options.ip,
+                        port: this.options.port,
+                        reload_world: false,
+                        gatherings_configuration: undefined,
+                    });
                 });
-            });
+                client.write('start_game', start_game_1.start_game);
+            };
+            client.on('resource_pack_client_response', onResourcePackResponse);
         });
     };
     async createAndPublishSession() {

package/dist/types/sessiondirectory.d.ts

@@ -56,6 +56,7 @@ export interface RESTSessionResponse {
             SupportedConnections: SessionConnection[];
             levelId: string;
             LanGame: boolean;
+            nonces?: Record<string, string>;
         };
     };
     members: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bedrock-portal",
-  "version": "2.4.0",
+  "version": "2.6.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",