bedrock-portal 0.7.0 → 0.7.3

package/dist/classes/Host.js

@@ -9,11 +9,14 @@ const xbox_rta_1 = require("xbox-rta");
 const rest_1 = __importDefault(require("../rest"));
 const debug = (0, debug_1.default)('bedrock-portal');
 class Host {
+    portal;
+    authflow;
+    rest;
+    rta = null;
+    profile = null;
+    connectionId = null;
+    subscriptionId = (0, uuid_1.v4)();
     constructor(portal, authflow) {
-        this.rta = null;
-        this.profile = null;
-        this.connectionId = null;
-        this.subscriptionId = (0, uuid_1.v4)();
         this.portal = portal;
         this.authflow = authflow;
         this.rest = new rest_1.default(this.authflow);
@@ -21,7 +24,6 @@ class Host {
     async connect() {
         const auth = await this.authflow.getXboxToken();
         this.profile = await this.rest.getProfile(auth.userXUID);
-        // @ts-expect-error - XboxRTA isnt using the #playfab branch
         this.rta = new xbox_rta_1.XboxRTA(this.authflow);
         await this.rta.connect();
         const subResponse = await this.rta.subscribe('https://sessiondirectory.xboxlive.com/connections/');

package/dist/classes/Module.js

@@ -5,6 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const debug_1 = __importDefault(require("debug"));
 class Module {
+    name;
+    description;
+    stopped;
+    options;
+    debug;
     constructor(name, description) {
         this.name = name;
         this.description = description;

package/dist/classes/Player.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class Player {
+    profile;
+    session;
     constructor(profileData, sessionData) {
         this.profile = {};
         this.session = {};

package/dist/index.js

@@ -17,21 +17,25 @@ const inviteOnMessage_1 = __importDefault(require("./modules/inviteOnMessage"));
 const redirectFromRealm_1 = __importDefault(require("./modules/redirectFromRealm"));
 const multipleAccounts_1 = __importDefault(require("./modules/multipleAccounts"));
 const start_game_1 = require("./common/start_game");
-// @ts-expect-error - index.d.ts isn't updated
-const bedrock_protocol_1 = require("@lucienhh/bedrock-protocol");
+const bedrock_portal_nethernet_1 = require("bedrock-portal-nethernet");
 const debug = (0, debug_1.default)('bedrock-portal');
 const getRandomUint64 = () => {
     // Generate two 32-bit random integers
     const high = Math.floor(Math.random() * 0xFFFFFFFF);
     const low = Math.floor(Math.random() * 0xFFFFFFFF);
     // Combine them to create a 64-bit unsigned integer
-    const result = (BigInt(high) << 32n) | BigInt(low);
+    const result = (BigInt(high) << BigInt(32)) | BigInt(low);
     return result;
 };
 class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
+    authflow;
+    host;
+    options;
+    session;
+    players;
+    modules = new Map();
     constructor(authflow, options) {
         super();
-        this.modules = new Map();
         this.options = {
             ip: '',
             port: 19132,
@@ -41,7 +45,7 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
             world: {
                 hostName: 'Bedrock Portal v0.6.0',
                 name: 'By LucienHH',
-                version: '0.6.0',
+                version: '0.7.1',
                 memberCount: 0,
                 maxMemberCount: 10,
                 ...options.world,
@@ -69,36 +73,18 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
         this.players = new Map();
         await this.host.connect();
         this.session.name = (0, uuid_1.v4)();
-        const server = new bedrock_protocol_1.Server({
+        const server = new bedrock_portal_nethernet_1.Server({
             version: '1.21.20', // The server version
             compressionAlgorithm: 'none',
         });
-        server.listenNethernet(this.authflow, this.options.webRTCNetworkId);
-        server.on('connect', (client) => {
+        server.listen(this.authflow, this.options.webRTCNetworkId);
+        server.on('connect', client => {
             client.on('join', () => {
                 console.log(`Client ${client.id} has joined the server.`);
-                client.write('resource_packs_info', {
-                    must_accept: false,
-                    has_scripts: false,
-                    behaviour_packs: [],
-                    texture_packs: [],
-                    resource_pack_links: [],
-                });
-                client.write('resource_pack_stack', {
-                    must_accept: false,
-                    behavior_packs: [],
-                    resource_packs: [],
-                    game_version: '',
-                    experiments: [],
-                    experiments_previously_used: false,
-                });
-                client.once('resource_pack_client_response', async (rp) => {
-                    client.write('start_game', start_game_1.start_game);
-                });
-                // TODO: Tie this to an event
-                setTimeout(() => {
+                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 });
-                }, 6000);
+                });
             });
         });
         const session = await this.createAndPublishSession();
@@ -192,11 +178,11 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
     }
     async createAndPublishSession() {
         await this.updateSession(this.createSessionBody());
-        debug(`Created session, name: ${this.session.name}`);
+        debug(`Created session, name: ${this.session.name}, ID: ${this.options.webRTCNetworkId}`);
         await this.host.rest.setActivity(this.session.name);
         const session = await this.getSession();
         await this.updateSession({ properties: session.properties });
-        debug(`Published session, name: ${this.session.name}`);
+        debug(`Published session, name: ${this.session.name}, ID: ${this.options.webRTCNetworkId}`);
         return session;
     }
     createSessionBody() {

package/dist/modules/autoFriendAdd.js

@@ -8,9 +8,9 @@ const Module_1 = __importDefault(require("../classes/Module"));
 const Player_1 = __importDefault(require("../classes/Player"));
 const multipleAccounts_1 = __importDefault(require("./multipleAccounts"));
 class AutoFriendAdd extends Module_1.default {
+    interval = null;
     constructor() {
         super('autoFriendAdd', 'Automatically adds followers as friends');
-        this.interval = null;
         this.options = {
             inviteOnAdd: false,
             conditionToMeet: () => true,

package/dist/modules/inviteOnMessage.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Module_1 = __importDefault(require("../classes/Module"));
 class IniteOnMessage extends Module_1.default {
+    interval = null;
+    cache;
     constructor() {
         super('initeOnMessage', 'Automatically invite players to the server when they message you');
-        this.interval = null;
         this.options = {
             command: 'invite',
             checkInterval: 30000,

package/dist/modules/multipleAccounts.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Module_1 = __importDefault(require("../classes/Module"));
 const Host_1 = __importDefault(require("../classes/Host"));
 class MultipleAccounts extends Module_1.default {
+    options;
+    peers;
     constructor() {
         super('multipleAccounts', 'Make the portal session joinable from multiple accounts');
         this.options = {

package/dist/modules/redirectFromRealm.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Module_1 = __importDefault(require("../classes/Module"));
 const cd = new Set();
 class RedirectFromRealm extends Module_1.default {
+    bedrock;
+    client;
+    heartbeat = null;
     constructor() {
         super('redirectFromRealm', 'Automatically invite players to the server when they join a Realm');
-        this.heartbeat = null;
         this.options = {
             clientOptions: {}, // Options for the bedrock-protocol client
             chatCommand: {

package/dist/rest.js

@@ -7,6 +7,8 @@ const axios_1 = __importDefault(require("axios"));
 const json_bigint_1 = require("json-bigint");
 const constants_1 = require("./common/constants");
 class Rest {
+    auth;
+    options;
     constructor(authflow, options = {}) {
         this.auth = authflow;
         this.options = options;
@@ -44,8 +46,8 @@ class Rest {
             payload.data = config.data;
         return (0, axios_1.default)({
             ...payload,
-            transformResponse: [data => (0, json_bigint_1.parse)(data)],
-            transformRequest: [data => (0, json_bigint_1.stringify)(data)],
+            transformResponse: [data => data ? (0, json_bigint_1.parse)(data) : undefined],
+            transformRequest: [data => data ? (0, json_bigint_1.stringify)(data) : undefined],
         }).then(e => e.data);
     }
     async sendHandle(payload) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bedrock-portal",
-  "version": "0.7.0",
+  "version": "0.7.3",
   "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,8 +21,8 @@
   },
   "homepage": "https://github.com/LucienHH/bedrock-portal#readme",
   "dependencies": {
-    "@lucienhh/bedrock-protocol": "^3.39.0",
     "axios": "^1.0.0",
+    "bedrock-portal-nethernet": "^1.0.3",
     "debug": "^4.3.4",
     "json-bigint": "^1.0.0",
     "prismarine-auth": "github:LucienHH/prismarine-auth#playfab",