bedrock-portal 0.2.0 → 0.2.2

package/README.md

@@ -65,7 +65,7 @@ Options:
 - **autoInvite**: boolean - Automatically invites recently added friends to the game (default: false)
 
 ```js
-const { Modules } = require('bedrock-portal');
+const { BedrockPortal, Modules } = require('bedrock-portal');
 
 const portal = new BedrockPortal(auth, { ... })
 
@@ -82,7 +82,7 @@ portal.use(Modules.autoFriendAdd, {
 
 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 module is stopped. You can use this to stop the module's loop (if one is present) else the process will not exit.
+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');

package/package.json

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

package/src/index.js

@@ -4,6 +4,7 @@ const { XboxRTA } = require('xbox-rta');
 const { EventEmitter } = require('events');
 
 const { altCheck } = require('./common/util');
+const { version: pkgVersion } = require('../package.json');
 const { SessionConfig, Endpoints, Joinability } = require('./common/constants');
 
 const Rest = require('./rest');
@@ -20,14 +21,27 @@ module.exports = class BedrockPortal extends EventEmitter {
   #rest;#rta;
   constructor(authflow, options = {}) {
     super();
-    const name = options.sessionName || uuidV4();
-    this.validateOptions(options);
+    this.options = {
+      port: 19132,
+      disableAltCheck: false,
+      joinability: 'friends_of_friends',
+      ...options,
+      world: {
+        hostName: `Bedrock Portal v${pkgVersion}`,
+        worldName: 'By LucienHH',
+        version: pkgVersion,
+        memberCount: 0,
+        maxMemberCount: 10,
+        ...options.world,
+      },
+    };
+    this.validateOptions(this.options);
     this.#rest = new Rest(authflow);
     this.#rta = new XboxRTA(authflow);
-    this.options = options;
+    const uuid = uuidV4();
     this.session = {
-      url: `https://sessiondirectory.xboxlive.com/serviceconfigs/${SessionConfig.MinecraftSCID}/sessionTemplates/${SessionConfig.MinecraftTemplateName}/sessions/${name}`,
-      name,
+      url: `https://sessiondirectory.xboxlive.com/serviceconfigs/${SessionConfig.MinecraftSCID}/sessionTemplates/${SessionConfig.MinecraftTemplateName}/sessions/${uuid}`,
+      name: uuid,
       subscriptionId: uuidV4(),
     };
     this.players = [];
@@ -36,7 +50,7 @@ module.exports = class BedrockPortal extends EventEmitter {
   validateOptions(options) {
     if (!options.ip) throw new Error('No IP provided');
     if (!options.port) throw new Error('No port provided');
-    if (options.joinability && !Object.keys(Joinability).includes(options.joinability)) throw new Error('Invalid joinability - Expected one of ' + Object.keys(Joinability).join(', '));
+    if (!Object.keys(Joinability).includes(options.joinability)) throw new Error('Invalid joinability - Expected one of ' + Object.keys(Joinability).join(', '));
   }
 
   async start() {
@@ -229,7 +243,7 @@ module.exports = class BedrockPortal extends EventEmitter {
   }
 
   #createSessionBody(connectionId) {
-    const joinability = Joinability[this.options.joinability ?? 'friends_of_friends'];
+    const joinability = Joinability[this.options.joinability];
     return {
       properties: {
         system: {
@@ -238,11 +252,11 @@ module.exports = class BedrockPortal extends EventEmitter {
           closed: false,
         },
         custom: {
-          hostName: String(this.options.world?.hostName || `${this.sessionOwner.gamertag}'s Portal`),
-          worldName: String(this.options.world?.name || 'BedrockPortal'),
-          version: String(this.options.world?.version || require('../package.json').version),
-          MemberCount: Number(this.options.world?.memberCount ?? 0),
-          MaxMemberCount: Number(this.options.world?.maxMemberCount ?? 10),
+          hostName: String(this.options.world.hostName),
+          worldName: String(this.options.world.name),
+          version: String(this.options.world.version),
+          MemberCount: Number(this.options.world.memberCount),
+          MaxMemberCount: Number(this.options.world.maxMemberCount),
           Joinability: joinability.joinability,
           ownerId: this.sessionOwner.xuid,
           rakNetGUID: genRaknetGUID(),
@@ -257,7 +271,7 @@ module.exports = class BedrockPortal extends EventEmitter {
             {
               ConnectionType: 6,
               HostIpAddress: this.options.ip,
-              HostPort: Number(this.options.port ?? 19132),
+              HostPort: Number(this.options.port),
               RakNetGUID: '',
             },
           ],