bedrock-portal 0.7.3 → 0.8.1

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2020
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,260 +1,285 @@
-# BedrockPortal
-[![NPM version](https://img.shields.io/npm/v/bedrock-portal.svg)](http://npmjs.com/package/bedrock-portal)
-[![Discord](https://img.shields.io/badge/chat-on%20discord-brightgreen.svg)](https://discord.gg/KTyd9HWuBD)
-
-Handles and creates a Minecraft Bedrock game session which will redirect players to the specified server. Join our [Discord](https://discord.com/invite/KTyd9HWuBD) for support.
-
-## Installation
-```shell
-npm install bedrock-portal
-```
-
-### Warning
-This package is not meant to be used with your main account. It is meant to be used with alt accounts. If you use this package with your main account, you may be banned from the XSAPI. This package is not affiliated with Mojang or Microsoft.
-
-## Usage
-
-### BedrockPortal(authflow, options)
-**Parameters**
-- authflow - Takes an **Authflow** instance from [prismarine-auth](https://github.com/PrismarineJS/prismarine-auth), you can see the documentation for this [here.](https://github.com/PrismarineJS/prismarine-auth#authflow)
-- options
-  - **ip** - The IP address of the server to redirect players to (required)
-  - **port** - The port of the server to redirect players to | default: 19132
-  - **joinability** - The joinability of the session  | default: FriendsOfFriends
-  - **world** - The world config to use for the session. Changes the session card which is displayed in the Minecraft client. (optional)
-	  - **hostName** - string
-	  - **name** - string
-	  - **version** - string
-	  - **memberCount** - number
-	  - **maxMemberCount** - number
-
-### Create a session redirect to a server
-```js
-const { BedrockPortal, Joinability } = require('bedrock-portal');
-const { Authflow, Titles } = require('prismarine-auth');
-
-const main = async () => {
-  const auth = new Authflow('example', './', { authTitle: Titles.MinecraftNintendoSwitch, deviceType: 'Nintendo', flow: 'live' });
-  
-  const portal = new BedrockPortal(auth, {
-    // The server IP & port to redirect players to
-    ip: 'geyserconnect.net',
-    port: 19132,
-
-     // The joinability of the session. Joinability.FriendsOfFriends, Joinability.FriendsOnly, Joinability.InviteOnly
-    joinability: Joinability.FriendsOfFriends
-  });
-
-  await portal.start();
-	
-  // accepts a player's gamertag or xuid
-  await portal.invitePlayer('p3')
-
-};
-
-main();
-```
-
-## Modules
-
-Modules are used to extend the functionality of the BedrockPortal class.
-
-### MultipleAccounts
-
-Allows the portal to use multiple accounts to redirect players to the server. `#.use(Modules.MultipleAccounts, options);`
-
-Options:
-- **accounts**: Authflow[] - An array of authflows from [prismarine-auth](https://github.com/PrismarineJS/prismarine-auth), these accounts are automatically added to the host session and allows players to add them as a friend to join the game. (required)
-
-```js
-const { Authflow, Titles } = require('prismarine-auth')
-const { BedrockPortal, Modules } = require('bedrock-portal')
-
-const main = async () => {
-  const auth = new Authflow('example', './', { authTitle: Titles.MinecraftNintendoSwitch, deviceType: 'Nintendo', flow: 'live' })
-
-  const portal = new BedrockPortal(auth, {
-    ip: 'geyserconnect.net',
-    port: 19132,
-  })
-
-  portal.use(Modules.AutoFriendAdd, {
-    inviteOnAdd: true,
-  })
-
-  portal.use(Modules.MultipleAccounts, {
-    accounts: [
-      new Authflow('account1', './', { authTitle: Titles.MinecraftNintendoSwitch, deviceType: 'Nintendo', flow: 'live' }),
-      new Authflow('account2', './', { authTitle: Titles.MinecraftNintendoSwitch, deviceType: 'Nintendo', flow: 'live' }),
-    ],
-  })
-
-  await portal.start()
-}
-
-main()
-```
-
-
-### RedirectFromRealm
-
-> Requires [bedrock-protocol](https://github.com/PrismarineJS/bedrock-protocol) to be installed. `npm install bedrock-protocol`
-
-Invites players when they join a Realm to the specified server or if they use the chat command. `#.use(Modules.redirectFromRealm, options);`
-
-Options:
-- **clientOptions**: ClientOptions - The client options to use when connecting to the Realm. These are passed directly to a [bedrock-protocol createClient](https://github.com/PrismarineJS/bedrock-protocol/blob/master/docs/API.md#becreateclientoptions--client) function. See the documentation for more information. 
-- **chatCommand**: object - Options for the chat command
-  - **enabled**: boolean - Whether sending the command in chat should trigger an invite (default: true)
-  - **message**: string - The message to send in chat to run the command (default: 'invite')
-  - **cooldown**: number - The cooldown between being able to send the command in chat (default: 60000ms)
-
-```js
-const { BedrockPortal, Modules } = require('bedrock-portal');
-
-const portal = new BedrockPortal(auth, { ... })
-
-portal.use(Modules.RedirectFromRealm, {
-  // The client options to use when connecting to the Realm.
-  clientOptions: {
-    realms: {
-      realmInvite: ''
-    }
-  },
-  // Options for the chat command
-  chatCommand: {
-    // Whether sending the command in chat should trigger an invite (optional - defaults to true)
-    enabled: true,
-    // The message to send in chat to run the command (optional - defaults to 'invite')
-    message: 'invite',
-    // The cooldown between being able to send the command in chat (optional - defaults to 60000ms)
-    cooldown: 60000,
-  }
-}
-```
-
-### AutoFriendAdd
-
-Automatically adds the account's followers as friends and invites them to the game. `#.use(Modules.autoFriendAdd);`
-
-Options:
-- **inviteOnAdd**: boolean - Automatically invites recently added friends to the game (default: false)
-- **conditionToMeet**: (player: RawPlayer) => boolean - A function that returns a boolean. If the function returns true, followers will be added as a friend and the friends that don't will be removed (default: () => true)
-- **checkInterval**: number - How often to check for friends to add/remove (default: 30000ms)
-- **addInterval**: number - How long to wait between adding friends (default: 2000ms)
-- **removeInterval**: number - How long to wait between removing friends (default: 2000ms)
-
-```js
-const { BedrockPortal, Modules } = require('bedrock-portal');
-
-const portal = new BedrockPortal(auth, { ... })
-
-portal.use(Modules.AutoFriendAdd);
-
-// or
-
-portal.use(Modules.AutoFriendAdd, {
-  // When a friend is added, automatically invite them to the game
-  inviteOnAdd: true,
-  // Only add friends that are online and remove friends that are offline
-  conditionToMeet: (player) => player.presenceState === 'Online',
-  // How often to check for friends to add/remove (optional - defaults to 30000ms)
-  checkInterval: 30000,
-  // How long to wait between adding friends (optional - defaults to 2000ms)
-  addInterval: 2000,
-  // How long to wait between removing friends (optional - defaults to 2000ms)
-  removeInterval: 2000,
-});
-```
-
-### InviteOnMessage
-
-Automatically invites players to the game when they send a message in the chat. `#.use(Modules.inviteOnMessage);`
-
-Options:
-- **command**: string - The command to use to invite players (default: 'invite')
-- **checkInterval**: number - How often to check for messages (default: 30000ms)
-
-```js
-const { BedrockPortal, Modules } = require('bedrock-portal');
-
-const portal = new BedrockPortal(auth, { ... })
-
-portal.use(Modules.InviteOnMessage);
-
-// or
-
-portal.use(Modules.InviteOnMessage, {
-  // The command to use to invite players (optional - defaults to 'invite')
-  command: 'invite',
-  // How often to check for messages (optional - defaults to 30000ms)
-  checkInterval: 30000,
-});
-```
-
-## Modules API
-
-Creating a module is easy. You can create a module by extending the `Module` class.
-
-Note: The `stopped` property is set to `true` when the portal is stopped. You can use this to stop the module's loop (if one is present) else the process will not exit.
-
-```js
-const { Module } = require('bedrock-portal');
-
-const myModule = class MyModule extends Module {
-  constructor() {
-    super('myModule', 'Description of my module');
-    this.options = {
-      option1: true,
-    }
-  }
-
-  async run(portal) {
-    // portal - The BedrockPortal instance
-
-    // Do stuff here
-  }
-
-  async stop() {
-    super.stop();
-    // Do stuff when the module is stopped
-  }
-}
-
-portal.use(myModule, {
-  option1: false,
-});
-
-```
-
-## Events
-
-### portal.on('sessionCreated', (session) => void)
-Emitted when a session is created.
-
-### portal.on('sessionUpdated', (session) => void)
-Emitted when a session is updated.
-
-### portal.on('playerJoin', (player) => void)
-Emitted when a player joins the session.
-
-### portal.on('playerLeave', (player) => void)
-Emitted when a player leaves the session.
-
-
-### portal.on('friendAdded', (player) => void)
-Emitted when a player is added as a friend. This event is only emitted when the `autoFriendAdd` module is enabled.
-
-### portal.on('friendRemoved', (player) => void)
-Emitted when a player is removed as a friend. This event is only emitted when the `autoFriendAdd` module is enabled.
-
-### portal.on('messageRecieved', (message) => void)
-Emitted when a message is recieved from a player. This event is only emitted when the `inviteOnMessage` module is enabled.
-
-## Debugging
-
-You can enable some debugging output using the `DEBUG` enviroment variable. Through node.js, you can add `process.env.DEBUG = 'bedrock-portal*'` at the top of your code.
-
-## License
-
-[MIT](LICENSE)
+# BedrockPortal
+[![NPM version](https://img.shields.io/npm/v/bedrock-portal.svg)](http://npmjs.com/package/bedrock-portal)
+[![Discord](https://img.shields.io/badge/chat-on%20discord-brightgreen.svg)](https://discord.gg/KTyd9HWuBD)
+
+Handles and creates a Minecraft Bedrock game session which will redirect players to the specified server. Join our [Discord](https://discord.com/invite/KTyd9HWuBD) for support.
+
+## Installation
+```shell
+npm install bedrock-portal
+```
+
+### Warning
+This package is not meant to be used with your main account. It is meant to be used with alt accounts. If you use this package with your main account, you may be banned from the XSAPI. This package is not affiliated with Mojang or Microsoft.
+
+## Usage
+
+### BedrockPortal(authflow, options)
+**Parameters**
+- authflow - Takes an **Authflow** instance from [prismarine-auth](https://github.com/PrismarineJS/prismarine-auth), you can see the documentation for this [here.](https://github.com/PrismarineJS/prismarine-auth#authflow)
+- options
+  - **ip** - The IP address of the server to redirect players to (required)
+  - **port** - The port of the server to redirect players to | default: 19132
+  - **joinability** - The joinability of the session  | default: FriendsOfFriends
+  - **world** - The world config to use for the session. Changes the session card which is displayed in the Minecraft client. (optional)
+	  - **hostName** - string
+	  - **name** - string
+	  - **version** - string
+	  - **memberCount** - number
+	  - **maxMemberCount** - number
+
+### Create a session redirect to a server
+```js
+const { BedrockPortal, Joinability } = require('bedrock-portal');
+const { Authflow, Titles } = require('prismarine-auth');
+
+const main = async () => {
+  const auth = new Authflow('example', './', { authTitle: Titles.MinecraftNintendoSwitch, deviceType: 'Nintendo', flow: 'live' });
+  
+  const portal = new BedrockPortal(auth, {
+    // The server IP & port to redirect players to
+    ip: 'geyserconnect.net',
+    port: 19132,
+
+     // The joinability of the session. Joinability.FriendsOfFriends, Joinability.FriendsOnly, Joinability.InviteOnly
+    joinability: Joinability.FriendsOfFriends
+  });
+
+  await portal.start();
+	
+  // accepts a player's gamertag or xuid
+  await portal.invitePlayer('p3')
+
+};
+
+main();
+```
+
+## Modules
+
+Modules are used to extend the functionality of the BedrockPortal class.
+
+### MultipleAccounts
+
+Allows the portal to use multiple accounts to redirect players to the server. `#.use(Modules.MultipleAccounts, options);`
+
+Options:
+- **accounts**: Authflow[] - An array of authflows from [prismarine-auth](https://github.com/PrismarineJS/prismarine-auth), these accounts are automatically added to the host session and allows players to add them as a friend to join the game. (required)
+
+```js
+const { Authflow, Titles } = require('prismarine-auth')
+const { BedrockPortal, Modules } = require('bedrock-portal')
+
+const main = async () => {
+  const auth = new Authflow('example', './', { authTitle: Titles.MinecraftNintendoSwitch, deviceType: 'Nintendo', flow: 'live' })
+
+  const portal = new BedrockPortal(auth, {
+    ip: 'geyserconnect.net',
+    port: 19132,
+  })
+
+  portal.use(Modules.AutoFriendAdd, {
+    inviteOnAdd: true,
+  })
+
+  portal.use(Modules.MultipleAccounts, {
+    accounts: [
+      new Authflow('account1', './', { authTitle: Titles.MinecraftNintendoSwitch, deviceType: 'Nintendo', flow: 'live' }),
+      new Authflow('account2', './', { authTitle: Titles.MinecraftNintendoSwitch, deviceType: 'Nintendo', flow: 'live' }),
+    ],
+  })
+
+  await portal.start()
+}
+
+main()
+```
+
+
+### RedirectFromRealm
+
+> Requires [bedrock-protocol](https://github.com/PrismarineJS/bedrock-protocol) to be installed. `npm install bedrock-protocol`
+
+Invites players when they join a Realm to the specified server or if they use the chat command. `#.use(Modules.redirectFromRealm, options);`
+
+Options:
+- **clientOptions**: ClientOptions - The client options to use when connecting to the Realm. These are passed directly to a [bedrock-protocol createClient](https://github.com/PrismarineJS/bedrock-protocol/blob/master/docs/API.md#becreateclientoptions--client) function. See the documentation for more information. 
+- **chatCommand**: object - Options for the chat command
+  - **enabled**: boolean - Whether sending the command in chat should trigger an invite (default: true)
+  - **message**: string - The message to send in chat to run the command (default: 'invite')
+  - **cooldown**: number - The cooldown between being able to send the command in chat (default: 60000ms)
+
+```js
+const { BedrockPortal, Modules } = require('bedrock-portal');
+
+const portal = new BedrockPortal(auth, { ... })
+
+portal.use(Modules.RedirectFromRealm, {
+  // The client options to use when connecting to the Realm.
+  clientOptions: {
+    realms: {
+      realmInvite: ''
+    }
+  },
+  // Options for the chat command
+  chatCommand: {
+    // Whether sending the command in chat should trigger an invite (optional - defaults to true)
+    enabled: true,
+    // The message to send in chat to run the command (optional - defaults to 'invite')
+    message: 'invite',
+    // The cooldown between being able to send the command in chat (optional - defaults to 60000ms)
+    cooldown: 60000,
+  }
+}
+```
+
+### AutoFriendAdd
+
+Automatically adds the account's followers as friends and invites them to the game. `#.use(Modules.autoFriendAdd);`
+
+Options:
+- **inviteOnAdd**: boolean - Automatically invites recently added friends to the game (default: false)
+- **conditionToMeet**: (player: RawPlayer) => boolean - A function that returns a boolean. If the function returns true, followers will be added as a friend and the friends that don't will be removed (default: () => true)
+- **checkInterval**: number - How often to check for friends to add/remove (default: 30000ms)
+- **addInterval**: number - How long to wait between adding friends (default: 2000ms)
+- **removeInterval**: number - How long to wait between removing friends (default: 2000ms)
+
+```js
+const { BedrockPortal, Modules } = require('bedrock-portal');
+
+const portal = new BedrockPortal(auth, { ... })
+
+portal.use(Modules.AutoFriendAdd);
+
+// or
+
+portal.use(Modules.AutoFriendAdd, {
+  // When a friend is added, automatically invite them to the game
+  inviteOnAdd: true,
+  // Only add friends that are online and remove friends that are offline
+  conditionToMeet: (player) => player.presenceState === 'Online',
+  // How often to check for friends to add/remove (optional - defaults to 30000ms)
+  checkInterval: 30000,
+  // How long to wait between adding friends (optional - defaults to 2000ms)
+  addInterval: 2000,
+  // How long to wait between removing friends (optional - defaults to 2000ms)
+  removeInterval: 2000,
+});
+```
+
+### AutoFriendAccept
+
+Automatically accepts friend requests sent to the account. `#.use(Modules.autoFriendAdd);`
+
+Options:
+- **inviteOnAdd**: boolean - Automatically invites added friends to the game (default: false)
+- **conditionToMeet**: (player: Player) => boolean - If the function returns true then the request will be accepted (default: () => true)
+
+```js
+const { BedrockPortal, Modules } = require('bedrock-portal');
+
+const portal = new BedrockPortal(auth, { ... })
+
+portal.use(Modules.AutoFriendAccept);
+
+// or
+
+portal.use(Modules.AutoFriendAccept, {
+  // When a friend is added invite them to the game
+  inviteOnAdd: true,
+  // Only accept friends that have 'elite' in their gamertag
+  conditionToMeet: (player) => player.gamertag.includes('elite'),
+});
+```
+
+### InviteOnMessage
+
+Automatically invites players to the game when they send a message in the chat. `#.use(Modules.inviteOnMessage);`
+
+Options:
+- **command**: string - The command to use to invite players (default: 'invite')
+- **checkInterval**: number - How often to check for messages (default: 30000ms)
+
+```js
+const { BedrockPortal, Modules } = require('bedrock-portal');
+
+const portal = new BedrockPortal(auth, { ... })
+
+portal.use(Modules.InviteOnMessage);
+
+// or
+
+portal.use(Modules.InviteOnMessage, {
+  // The command to use to invite players (optional - defaults to 'invite')
+  command: 'invite',
+  // How often to check for messages (optional - defaults to 30000ms)
+  checkInterval: 30000,
+});
+```
+
+## Modules API
+
+Creating a module is easy. You can create a module by extending the `Module` class.
+
+Note: The `stopped` property is set to `true` when the portal is stopped. You can use this to stop the module's loop (if one is present) else the process will not exit.
+
+```js
+const { Module } = require('bedrock-portal');
+
+const myModule = class MyModule extends Module {
+  constructor() {
+    super('myModule', 'Description of my module');
+    this.options = {
+      option1: true,
+    }
+  }
+
+  async run(portal) {
+    // portal - The BedrockPortal instance
+
+    // Do stuff here
+  }
+
+  async stop() {
+    super.stop();
+    // Do stuff when the module is stopped
+  }
+}
+
+portal.use(myModule, {
+  option1: false,
+});
+
+```
+
+## Events
+
+### portal.on('sessionCreated', (session) => void)
+Emitted when a session is created.
+
+### portal.on('sessionUpdated', (session) => void)
+Emitted when a session is updated.
+
+### portal.on('playerJoin', (player) => void)
+Emitted when a player joins the session.
+
+### portal.on('playerLeave', (player) => void)
+Emitted when a player leaves the session.
+
+
+### portal.on('friendAdded', (player) => void)
+Emitted when a player is added as a friend. This event is only emitted when the `autoFriendAdd` module is enabled.
+
+### portal.on('friendRemoved', (player) => void)
+Emitted when a player is removed as a friend. This event is only emitted when the `autoFriendAdd` module is enabled.
+
+### portal.on('messageRecieved', (message) => void)
+Emitted when a message is recieved from a player. This event is only emitted when the `inviteOnMessage` module is enabled.
+
+## Debugging
+
+You can enable some debugging output using the `DEBUG` enviroment variable. Through node.js, you can add `process.env.DEBUG = 'bedrock-portal*'` at the top of your code.
+
+## License
+
+[MIT](LICENSE)

package/dist/classes/Host.js

@@ -31,9 +31,9 @@ class Host {
         this.rta.on('subscribe', (event) => this.onSubscribe(event));
     }
     async onSubscribe(event) {
-        debug('Received RTA subscribe event', event);
-        const connectionId = event.data.ConnectionId;
+        const connectionId = event.data?.ConnectionId;
         if (connectionId && typeof connectionId === 'string') {
+            debug('Received RTA subscribe event', event);
             try {
                 this.connectionId = connectionId;
                 await this.rest.updateConnection(this.portal.session.name, connectionId);

package/dist/common/util.d.ts

@@ -0,0 +1,2 @@
+export declare const isXuid: (xuid: string) => boolean;
+export declare const getRandomUint64: () => bigint;

package/dist/common/util.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRandomUint64 = exports.isXuid = void 0;
+const isXuid = (xuid) => /^\d{16}$/.test(xuid);
+exports.isXuid = isXuid;
+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) << BigInt(32)) | BigInt(low);
+    return result;
+};
+exports.getRandomUint64 = getRandomUint64;

package/dist/handlers/Event.js

@@ -7,6 +7,8 @@ const debug_1 = __importDefault(require("debug"));
 const Player_1 = __importDefault(require("../classes/Player"));
 const debug = (0, debug_1.default)('bedrock-portal');
 exports.default = async (portal, event) => {
+    if (!event.data.ncid)
+        return;
     portal.emit('rtaEvent', event);
     const session = await portal.getSession();
     portal.emit('sessionUpdated', session);

package/dist/index.d.ts

@@ -7,7 +7,7 @@ import Host from './classes/Host';
 import Player from './classes/Player';
 import Module from './classes/Module';
 import { Joinability } from './common/constants';
-import AutoFriendAdd from './modules/autoFriendAdd';
+import AutoFriendAdd from './modules/autoFriendAccept';
 import InviteOnMessage from './modules/inviteOnMessage';
 import RedirectFromRealm from './modules/redirectFromRealm';
 import MultipleAccounts from './modules/multipleAccounts';
@@ -149,5 +149,6 @@ declare const Modules: {
     InviteOnMessage: typeof InviteOnMessage;
     RedirectFromRealm: typeof RedirectFromRealm;
     MultipleAccounts: typeof MultipleAccounts;
+    AutoFriendAccept: typeof AutoFriendAdd;
 };
 export { Modules };

package/dist/index.js

@@ -7,26 +7,20 @@ exports.Modules = exports.Module = exports.Joinability = exports.BedrockPortal =
 const debug_1 = __importDefault(require("debug"));
 const uuid_1 = require("uuid");
 const tiny_typed_emitter_1 = require("tiny-typed-emitter");
+const bedrock_portal_nethernet_1 = require("bedrock-portal-nethernet");
 const Host_1 = __importDefault(require("./classes/Host"));
 const Module_1 = __importDefault(require("./classes/Module"));
 exports.Module = Module_1.default;
 const constants_1 = require("./common/constants");
 const Event_1 = __importDefault(require("./handlers/Event"));
-const autoFriendAdd_1 = __importDefault(require("./modules/autoFriendAdd"));
+const autoFriendAccept_1 = __importDefault(require("./modules/autoFriendAccept"));
 const inviteOnMessage_1 = __importDefault(require("./modules/inviteOnMessage"));
 const redirectFromRealm_1 = __importDefault(require("./modules/redirectFromRealm"));
 const multipleAccounts_1 = __importDefault(require("./modules/multipleAccounts"));
+const autoFriendAccept_2 = __importDefault(require("./modules/autoFriendAccept"));
 const start_game_1 = require("./common/start_game");
-const bedrock_portal_nethernet_1 = require("bedrock-portal-nethernet");
+const util_1 = require("./common/util");
 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) << BigInt(32)) | BigInt(low);
-    return result;
-};
 class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
     authflow;
     host;
@@ -40,7 +34,7 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
             ip: '',
             port: 19132,
             joinability: constants_1.Joinability.FriendsOfFriends,
-            webRTCNetworkId: getRandomUint64(),
+            webRTCNetworkId: (0, util_1.getRandomUint64)(),
             ...options,
             world: {
                 hostName: 'Bedrock Portal v0.6.0',
@@ -130,11 +124,13 @@ class BedrockPortal extends tiny_typed_emitter_1.TypedEmitter {
      */
     async invitePlayer(identifier) {
         debug(`Inviting player, identifier: ${identifier}`);
-        const profile = await this.host.rest.getProfile(identifier)
-            .catch(() => { throw new Error(`Failed to get profile for identifier: ${identifier}`); });
-        debug(`Inviting player, Got profile, xuid: ${profile.xuid}`);
-        await this.host.rest.sendInvite(this.session.name, profile.xuid);
-        debug(`Invited player, xuid: ${profile.xuid}`);
+        if (!(0, util_1.isXuid)(identifier)) {
+            const profile = await this.host.rest.getProfile(identifier)
+                .catch(() => { throw new Error(`Failed to get profile for identifier: ${identifier}`); });
+            identifier = profile.xuid;
+        }
+        await this.host.rest.sendInvite(this.session.name, identifier);
+        debug(`Invited player, xuid: ${identifier}`);
     }
     /**
      * Updates the current member count which is displayed in the Minecraft client.
@@ -253,9 +249,10 @@ exports.BedrockPortal = BedrockPortal;
 var constants_2 = require("./common/constants");
 Object.defineProperty(exports, "Joinability", { enumerable: true, get: function () { return constants_2.Joinability; } });
 const Modules = {
-    AutoFriendAdd: autoFriendAdd_1.default,
+    AutoFriendAdd: autoFriendAccept_1.default,
     InviteOnMessage: inviteOnMessage_1.default,
     RedirectFromRealm: redirectFromRealm_1.default,
     MultipleAccounts: multipleAccounts_1.default,
+    AutoFriendAccept: autoFriendAccept_2.default,
 };
 exports.Modules = Modules;

package/dist/modules/autoFriendAccept.d.ts

@@ -0,0 +1,7 @@
+import type { BedrockPortal } from '../index';
+import Module from '../classes/Module';
+export default class AutoFriendAdd extends Module {
+    constructor();
+    run(portal: BedrockPortal): Promise<void>;
+    stop(): Promise<void>;
+}

package/dist/modules/autoFriendAccept.js

@@ -0,0 +1,54 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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 {
+    constructor() {
+        super('autoFriendAdd', 'Automatically accept friend requests');
+        this.options = {
+            inviteOnAdd: false,
+            conditionToMeet: () => true,
+        };
+    }
+    async run(portal) {
+        const addXboxFriend = async (host) => {
+            host.rta?.on('event', async (event) => {
+                if (event.data.NotificationType !== 'IncomingFriendRequestCountChanged')
+                    return;
+                this.debug('Received Friend RTA event', event);
+                const requests = await host.rest.getFriendRequestsReceived()
+                    .then(res => res.filter(this.options.conditionToMeet));
+                this.debug(`Received ${requests.length} friend request(s)`);
+                if (!requests.length)
+                    return;
+                const accept = await host.rest.acceptFriendRequests(requests.map(req => req.xuid));
+                this.debug(`Accepted ${accept.updatedPeople.length} friend request(s)`);
+                for (const person of requests.filter(req => accept.updatedPeople.includes(req.xuid))) {
+                    portal.emit('friendAdded', new Player_1.default(person, null));
+                    this.debug(`Accepted ${person.gamertag}`);
+                    if (this.options.inviteOnAdd) {
+                        await portal.invitePlayer(person.xuid).catch(error => this.debug(`Error: Failed to invite ${person.gamertag}`, error));
+                    }
+                }
+            });
+            await host.rta?.subscribe(`https://social.xboxlive.com/users/xuid(${host.profile?.xuid})/friends`);
+        };
+        const multipleAccounts = portal.modules.get('multipleAccounts');
+        if (multipleAccounts && multipleAccounts instanceof multipleAccounts_1.default) {
+            for (const account of multipleAccounts.peers.values()) {
+                addXboxFriend(account)
+                    .catch(error => this.debug(`Error: ${error.message}`, error));
+            }
+        }
+        addXboxFriend(portal.host)
+            .catch(error => this.debug(`Error: ${error.message}`, error));
+    }
+    async stop() {
+        super.stop();
+    }
+}
+exports.default = AutoFriendAdd;

package/dist/rest.d.ts

@@ -2,6 +2,7 @@ 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;
 };
@@ -39,6 +40,9 @@ export default class Rest {
     getProfiles(xuids: string[]): Promise<import("./types/peoplehub").Person[]>;
     getXboxFriends(): Promise<import("./types/peoplehub").Person[]>;
     getXboxFollowers(): Promise<import("./types/peoplehub").Person[]>;
+    getFriendRequestsReceived(): Promise<import("./types/peoplehub").FriendRequestPerson[]>;
+    acceptFriendRequests(xuids: string[]): Promise<RESTSocialPostBulkFriendRequestResponse>;
+    declineFriendRequests(xuids: string[]): Promise<RESTSocialPostBulkFriendRequestResponse>;
     addXboxFriend(xuid: string): Promise<void>;
     removeXboxFriend(xuid: string): Promise<void>;
     getInboxMessages(inbox: 'primary' | 'secondary'): Promise<RESTXblmessageInboxResponse>;

package/dist/rest.js

@@ -6,6 +6,7 @@ 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");
 class Rest {
     auth;
     options;
@@ -112,8 +113,7 @@ class Rest {
     }
     async getProfile(input) {
         let xuid = input;
-        const isXuid = /^\d{16}$/.test(input);
-        if (!isXuid) {
+        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' });
             xuid = response.profileUsers[0].id;
@@ -133,6 +133,18 @@ class Rest {
         const response = await this.get('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' });
+        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' });
+        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' });
+        return response;
+    }
     async addXboxFriend(xuid) {
         await this.put(`https://social.xboxlive.com/users/me/people/xuid(${xuid})`, { contractVersion: '2' });
     }

package/dist/types/peoplehub.d.ts

@@ -20,8 +20,8 @@ export interface Person {
     modernGamertag: string;
     modernGamertagSuffix: string;
     uniqueModernGamertag: string;
-    xboxOneRep: XboxOneRep;
-    presenceState: PresenceState;
+    xboxOneRep: string;
+    presenceState: string;
     presenceText: string;
     presenceDevices: null;
     isBroadcasting: boolean;
@@ -37,7 +37,7 @@ export interface Person {
     recentPlayer: null;
     follower: Follower;
     preferredColor: PreferredColor;
-    presenceDetails: PresenceDetail[];
+    presenceDetails: null;
     titlePresence: null;
     titleSummaries: null;
     presenceTitleIds: null;
@@ -89,19 +89,6 @@ export interface PreferredColor {
     secondaryColor: string;
     tertiaryColor: string;
 }
-export interface PresenceDetail {
-    IsBroadcasting: boolean;
-    Device: Device;
-    DeviceSubType: null;
-    GameplayType: null;
-    PresenceText: string;
-    State: State;
-    TitleId: string;
-    TitleType: null;
-    IsPrimary: boolean;
-    IsGame: boolean;
-    RichPresenceText: null | string;
-}
 export declare enum Device {
     Android = "Android",
     IOS = "iOS",
@@ -111,14 +98,85 @@ export declare enum Device {
     WindowsOneCore = "WindowsOneCore",
     XboxOne = "XboxOne"
 }
-export declare enum State {
-    Active = "Active",
-    LastSeen = "LastSeen"
+export interface RESTPeoplehubGetFriendRequestResponse {
+    people: FriendRequestPerson[];
+    recommendationSummary: null;
+    friendFinderState: null;
+    accountLinkDetails: null;
+    friendRequestSummary: null;
 }
-export declare enum PresenceState {
-    Offline = "Offline",
-    Online = "Online"
+export interface FriendRequestPerson {
+    detail: FriendRequestPersonDetail;
+    follower: Follower;
+    recommendation: null;
+    isFriend: boolean;
+    friendedDateTimeUtc: null;
+    isFriendRequestReceived: boolean;
+    isFriendRequestSent: boolean;
+    xuid: string;
+    appXuid: null;
+    isFavorite: boolean;
+    isFollowingCaller: boolean;
+    isFollowedByCaller: boolean;
+    isIdentityShared: boolean;
+    addedDateTimeUtc: string;
+    displayName: string;
+    realName: string;
+    displayPicRaw: string;
+    showUserAsAvatar: string;
+    gamertag: string;
+    gamerScore: string;
+    modernGamertag: string;
+    modernGamertagSuffix: string;
+    uniqueModernGamertag: string;
+    xboxOneRep: string;
+    presenceState: string;
+    presenceText: string;
+    presenceDevices: null;
+    isBroadcasting: boolean;
+    isCloaked: null;
+    isQuarantined: boolean;
+    isXbox360Gamerpic: boolean;
+    lastSeenDateTimeUtc: string;
+    suggestion: null;
+    search: null;
+    titleHistory: null;
+    multiplayerSummary: null;
+    recentPlayer: null;
+    preferredColor: PreferredColor;
+    presenceDetails: null;
+    titlePresence: null;
+    titleSummaries: null;
+    presenceTitleIds: null;
+    communityManagerTitles: null;
+    socialManager: null;
+    broadcast: null;
+    avatar: null;
+    linkedAccounts: LinkedAccount[];
+    colorTheme: string;
+    preferredFlag: string;
+    preferredPlatforms: string[];
 }
-export declare enum XboxOneRep {
-    GoodPlayer = "GoodPlayer"
+export interface FriendRequestPersonDetail {
+    canBeFriended: boolean;
+    canBeFollowed: boolean;
+    isFriend: boolean;
+    friendCount: number;
+    isFriendRequestReceived: boolean;
+    isFriendRequestSent: boolean;
+    isFriendListShared: boolean;
+    isFollowingCaller: boolean;
+    isFollowedByCaller: boolean;
+    isFavorite: boolean;
+    accountTier: string;
+    bio: string;
+    isVerified: boolean;
+    location: string;
+    tenure: string;
+    watermarks: string[];
+    blocked: boolean;
+    mute: boolean;
+    followerCount: number;
+    followingCount: number;
+    hasGamePass: boolean;
 }

package/dist/types/peoplehub.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XboxOneRep = exports.PresenceState = exports.State = exports.Device = void 0;
+exports.Device = void 0;
 var Device;
 (function (Device) {
     Device["Android"] = "Android";
@@ -11,17 +11,3 @@ var Device;
     Device["WindowsOneCore"] = "WindowsOneCore";
     Device["XboxOne"] = "XboxOne";
 })(Device || (exports.Device = Device = {}));
-var State;
-(function (State) {
-    State["Active"] = "Active";
-    State["LastSeen"] = "LastSeen";
-})(State || (exports.State = State = {}));
-var PresenceState;
-(function (PresenceState) {
-    PresenceState["Offline"] = "Offline";
-    PresenceState["Online"] = "Online";
-})(PresenceState || (exports.PresenceState = PresenceState = {}));
-var XboxOneRep;
-(function (XboxOneRep) {
-    XboxOneRep["GoodPlayer"] = "GoodPlayer";
-})(XboxOneRep || (exports.XboxOneRep = XboxOneRep = {}));

package/dist/types/social.d.ts

@@ -0,0 +1,4 @@
+export interface RESTSocialPostBulkFriendRequestResponse {
+    updatedPeople: string[];
+    failedToUpdate: string[];
+}

package/dist/types/social.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,44 +1,44 @@
-{
-  "name": "bedrock-portal",
-  "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",
-  "scripts": {
-    "build": "tsc",
-    "watch": "tsc --watch",
-    "lint": "eslint --ignore-path .gitignore .",
-    "fix": "eslint --fix --ignore-path .gitignore ."
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/LucienHH/bedrock-portal.git"
-  },
-  "author": "Lucienn",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/LucienHH/bedrock-portal/issues"
-  },
-  "homepage": "https://github.com/LucienHH/bedrock-portal#readme",
-  "dependencies": {
-    "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",
-    "tiny-typed-emitter": "^2.1.0",
-    "uuid": "^9.0.0",
-    "xbox-rta": "^2.0.1"
-  },
-  "devDependencies": {
-    "@types/debug": "^4.1.12",
-    "@types/json-bigint": "^1.0.4",
-    "@types/node": "^20.10.6",
-    "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^6.17.0",
-    "@typescript-eslint/parser": "^6.17.0",
-    "bedrock-portal": "file:.",
-    "eslint": "^8.33.0",
-    "typescript": "^5.3.3"
-  }
-}
+{
+  "name": "bedrock-portal",
+  "version": "0.8.1",
+  "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",
+  "scripts": {
+    "build": "tsc",
+    "watch": "tsc --watch",
+    "lint": "eslint --ignore-path .gitignore .",
+    "fix": "eslint --fix --ignore-path .gitignore ."
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/LucienHH/bedrock-portal.git"
+  },
+  "author": "Lucienn",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/LucienHH/bedrock-portal/issues"
+  },
+  "homepage": "https://github.com/LucienHH/bedrock-portal#readme",
+  "dependencies": {
+    "axios": "^1.0.0",
+    "bedrock-portal-nethernet": "^1.0.6",
+    "debug": "^4.3.4",
+    "json-bigint": "^1.0.0",
+    "prismarine-auth": "github:LucienHH/prismarine-auth#playfab",
+    "tiny-typed-emitter": "^2.1.0",
+    "uuid": "^9.0.0",
+    "xbox-rta": "^2.1.0"
+  },
+  "devDependencies": {
+    "@types/debug": "^4.1.12",
+    "@types/json-bigint": "^1.0.4",
+    "@types/node": "^20.10.6",
+    "@types/uuid": "^9.0.8",
+    "@typescript-eslint/eslint-plugin": "^6.17.0",
+    "@typescript-eslint/parser": "^6.17.0",
+    "bedrock-portal": "file:.",
+    "eslint": "^8.33.0",
+    "typescript": "^5.3.3"
+  }
+}