bedrock-portal 0.0.8 → 0.0.10

package/package.json

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

@@ -39,7 +39,6 @@ module.exports = class BedrockPortal extends EventEmitter {
 	}
 
 	async start() {
-
 		this.sessionOwner = await this.#rest.getXboxProfile('me');
 
 		if (!this.options.disableAltCheck) {
@@ -51,6 +50,16 @@ module.exports = class BedrockPortal extends EventEmitter {
 
 		const connectionId = await this.#rta.subscribe('https://sessiondirectory.xboxlive.com/connections/').then(e => e.data.ConnectionId);
 
+		const session = await this.createAndPublishSession(connectionId);
+
+		await this.#handleSessionEvents();
+
+		return session;
+	}
+
+	async createAndPublishSession(connectionId) {
+		this.players = [];
+
 		await this.updateSession(this.#createSessionBody(connectionId));
 
 		debug(`Created session, name: ${this.session.name}`);
@@ -61,8 +70,6 @@ module.exports = class BedrockPortal extends EventEmitter {
 
 		await this.updateSession({ properties: session.properties });
 
-		await this.#handleSessionEvents();
-
 		debug(`Published session, name: ${this.session.name}`);
 
 		return session;
@@ -135,13 +142,23 @@ module.exports = class BedrockPortal extends EventEmitter {
 	async #handleSessionEvents() {
 		this.#rta.on('reconnect', async () => {
 			const connectionId = await this.#rta.subscribe('https://sessiondirectory.xboxlive.com/connections/').then(e => e.data.ConnectionId);
-			await this.updateConnection(connectionId);
+
+			try {
+				await this.updateConnection(connectionId);
+				await this.updateHandle(this.#createHandleBody('activity'));
+			}
+			catch (e) {
+				debug('Failed to update connection, session may have been abandoned', e);
+				await this.createAndPublishSession(connectionId);
+			}
 		});
 
 		this.#rta.on('event', async ({ type, subId, data }) => {
 			this.emit('rtaEvent', { type, subId, data });
 			const session = await this.getSession();
 
+			debug('Received RTA event, session has been updated', session);
+
 			const sessionMembers = Object.keys(session.members).map(key => session.members[key]).filter(member => member.constants.system.xuid !== this.sessionOwner.xuid);
 			const xuids = sessionMembers.map(e => e.constants.system.xuid);