bedrock-portal 0.2.5 → 0.2.7

package/README.md

@@ -62,7 +62,7 @@ Modules are used to extend the functionality of the BedrockPortal class.
 Automatically adds the account's followers as friends and invites them to the game. `#.use(Modules.autoFriendAdd);`
 
 Options:
-- **autoInvite**: boolean - Automatically invites recently added friends to the game (default: false)
+- **inviteOnAdd**: boolean - Automatically invites recently added friends to the game (default: false)
 
 ```js
 const { BedrockPortal, Modules } = require('bedrock-portal');
@@ -74,7 +74,7 @@ portal.use(Modules.autoFriendAdd);
 // or
 
 portal.use(Modules.autoFriendAdd, {
-  autoInvite: true,
+  inviteOnAdd: true,
 });
 ```
 

package/examples/portal.js

@@ -1,4 +1,6 @@
 /* eslint-disable no-multi-spaces */
+// process.env.DEBUG = 'bedrock-portal*';
+
 const { BedrockPortal, Modules, Joinability } = require('bedrock-portal');
 const { Authflow, Titles } = require('prismarine-auth');
 
@@ -23,9 +25,7 @@ const main = async () => {
     inviteOnAdd: true,
   });
 
-  await portal.start();                        // Starts the session
-
-  await portal.invitePlayer('p3');             // gamertag or xuid to invite
+  // Put your event listeners before portal.start() to ensure you don't miss any events
 
   portal.on('rtaEvent', (event) => {           // Emits when an RTA event is received
     console.log('RTA Event: ', event);
@@ -51,6 +51,10 @@ const main = async () => {
     console.log('Friend Added: ', player);
   });
 
+  await portal.start();                        // Starts the session
+
+  await portal.invitePlayer('p3');             // gamertag or xuid to invite
+
 };
 
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bedrock-portal",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Creates a joinable session in Minecraft Bedrock Edition that can route players to their a specified host",
   "main": "index.js",
   "scripts": {

package/src/classes/Player.js

@@ -1,9 +1,9 @@
 class Player {
-  constructor(profileData = {}, sessionData = {}) {
+  constructor(profileData, sessionData) {
     this.profile = {};
     this.session = {};
-    this.setXboxProfile(profileData);
-    this.setSessionMember(sessionData);
+    if (profileData) this.setXboxProfile(profileData);
+    if (sessionData) this.setSessionMember(sessionData);
   }
 
   static fromSessionMember(data) {

package/src/common/constants.js

@@ -7,7 +7,7 @@ const SessionConfig = {
   MinecraftTitleID: '896928775',
   MinecraftSCID: '4fc10100-5f7a-4470-899b-280835760c07',
   MinecraftTemplateName: 'MinecraftLobby',
-  MiencraftProtocolVersion: 575,
+  MiencraftProtocolVersion: 589,
 };
 
 const Joinability = {

package/src/index.js

@@ -94,7 +94,11 @@ module.exports = class BedrockPortal extends EventEmitter {
   async invitePlayer(identifier) {
     debug(`Inviting player, identifier: ${identifier}`);
 
-    const profile = await this.#rest.getXboxProfile(identifier);
+    const profile = await this.#rest.getXboxProfile(identifier)
+      .catch(() => { throw new Error(`Failed to get profile for identifier: ${identifier}`); });
+
+    debug(`Inviting player, Got profile, xuid: ${profile.xuid}`);
+
     const invitePayload = {
       invitedXuid: String(profile.xuid),
       inviteAttributes: { titleId: SessionConfig.MinecraftTitleID },
@@ -220,11 +224,15 @@ module.exports = class BedrockPortal extends EventEmitter {
     });
 
     if (this.modules) {
-      for (const mod of Object.values(this.modules)) {
-        mod.run(this, { rest: this.#rest, rta: this.#rta })
-          .then(() => debug(`Module ${mod.name} has run`))
-          .catch(e => debug(`Module ${mod.name} failed to run`, e));
-      }
+      Object.values(this.modules).forEach(async mod => {
+        try {
+          mod.run(this, { rest: this.#rest, rta: this.#rta });
+          debug(`Module ${mod.name} has run`);
+        }
+        catch (e) {
+          debug(`Module ${mod.name} failed to run`, e);
+        }
+      });
     }
 
   }

package/src/modules/autoFriendAdd.js

@@ -21,9 +21,13 @@ class AutoFriendAdd extends Module {
           .then(people => people.map(e => e.xuid))
           .catch(() => []);
 
+        this.debug(`Found ${friends.length} friend(s)`);
+
         const followers = await rest.getXboxFollowers()
           .catch(() => []);
 
+        this.debug(`Found ${followers.length} follower(s)`);
+
         const needsAdding = followers.filter(res => !friends.includes(res.xuid));
 
         if (!needsAdding.length) {

package/src/rest.js

@@ -114,11 +114,11 @@ module.exports = class Rest {
   }
 
   async getXboxFriends() {
-    return await this.get('https://peoplehub.xboxlive.com/users/me/people/social/decoration/details', { contractVersion: 5 }).then(res => res.people.map(e => this.#parseXboxProfile(e)));
+    return await this.get('https://peoplehub.xboxlive.com/users/me/people/social/decoration/detail,preferredColor', { contractVersion: 5 }).then(res => res.people.map(e => this.#parseXboxProfile(e)));
   }
 
   async getXboxFollowers() {
-    return await this.get('https://peoplehub.xboxlive.com/users/me/people/followers/decoration/details', { contractVersion: 5 }).then(res => res.people.map(e => this.#parseXboxProfile(e)));
+    return await this.get('https://peoplehub.xboxlive.com/users/me/people/followers/decoration/detail,preferredColor', { contractVersion: 5 }).then(res => res.people.map(e => this.#parseXboxProfile(e)));
   }
 
   async addXboxFriend(xuid) {