Merge pull request #856 from thecodingmachine/alonemode

Adding an "alone" mode

front/src/Connexion/ConnectionManager.ts

@@ -14,11 +14,11 @@ class ConnectionManager {
     private connexionType?: GameConnexionTypes
     private reconnectingTimeout: NodeJS.Timeout|null = null;
     private _unloading:boolean = false;
-    
+
     get unloading () {
         return this._unloading;
     }
-    
+
     constructor() {
         window.addEventListener('beforeunload', () => {
             this._unloading = true;
@@ -42,7 +42,7 @@ class ConnectionManager {
             const worldSlug = data.worldSlug;
             const roomSlug = data.roomSlug;
 
-            const room = new Room('/@/'+organizationSlug+'/'+worldSlug+'/'+roomSlug + window.location.hash);
+            const room = new Room('/@/'+organizationSlug+'/'+worldSlug+'/'+roomSlug + window.location.search + window.location.hash);
             urlManager.pushRoomIdToUrl(room);
             return Promise.resolve(room);
         } else if (connexionType === GameConnexionTypes.organization || connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
@@ -64,7 +64,7 @@ class ConnectionManager {
             if (connexionType === GameConnexionTypes.empty) {
                 roomId = START_ROOM_URL;
             } else {
-                roomId = window.location.pathname + window.location.hash;
+                roomId = window.location.pathname + window.location.search + window.location.hash;
             }
             return Promise.resolve(new Room(roomId));
         }

front/src/Connexion/Room.ts

@@ -6,24 +6,25 @@ export class Room {
     public readonly isPublic: boolean;
     private mapUrl: string|undefined;
     private instance: string|undefined;
+    private _search: URLSearchParams;
 
     constructor(id: string) {
-        if (id.startsWith('/')) {
+        const url = new URL(id, 'https://example.com');
-            id = id.substr(1);
+
+        this.id = url.pathname;
+
+        if (this.id.startsWith('/')) {
+            this.id = this.id.substr(1);
         }
-        this.id = id;
+        if (this.id.startsWith('_/')) {
-        if (id.startsWith('_/')) {
             this.isPublic = true;
-        } else if (id.startsWith('@/')) {
+        } else if (this.id.startsWith('@/')) {
             this.isPublic = false;
         } else {
             throw new Error('Invalid room ID');
         }
 
-        const indexOfHash = this.id.indexOf('#');
+        this._search = new URLSearchParams(url.search);
-        if (indexOfHash !== -1) {
-            this.id = this.id.substr(0, indexOfHash);
-        }
     }
 
     public static getIdFromIdentifier(identifier: string, baseUrl: string, currentInstance: string): {roomId: string, hash: string} {
@@ -117,4 +118,17 @@ export class Room {
         }
         return results;
     }
+
+    public isDisconnected(): boolean
+    {
+        const alone = this._search.get('alone');
+        if (alone && alone !== '0' && alone.toLowerCase() !== 'false') {
+            return true;
+        }
+        return false;
+    }
+
+    public get search(): URLSearchParams {
+        return this._search;
+    }
 }

front/src/Phaser/Game/GameScene.ts

@@ -384,19 +384,21 @@ export class GameScene extends ResizableScene implements CenterListener {
         this.initCirclesCanvas();
 
         // Let's pause the scene if the connection is not established yet
-        if (this.isReconnecting) {
+        if (!this.room.isDisconnected()) {
-            setTimeout(() => {
+            if (this.isReconnecting) {
-            this.scene.sleep();
+                setTimeout(() => {
-            this.scene.launch(ReconnectingSceneName);
-            }, 0);
-        } else if (this.connection === undefined) {
-            // Let's wait 1 second before printing the "connecting" screen to avoid blinking
-            setTimeout(() => {
-                if (this.connection === undefined) {
                     this.scene.sleep();
                     this.scene.launch(ReconnectingSceneName);
-                }
+                }, 0);
-            }, 1000);
+            } else if (this.connection === undefined) {
+                // Let's wait 1 second before printing the "connecting" screen to avoid blinking
+                setTimeout(() => {
+                    if (this.connection === undefined) {
+                        this.scene.sleep();
+                        this.scene.launch(ReconnectingSceneName);
+                    }
+                }, 1000);
+            }
         }
 
         this.createPromiseResolve();
@@ -423,6 +425,16 @@ export class GameScene extends ResizableScene implements CenterListener {
         this.triggerOnMapLayerPropertyChange();
         this.listenToIframeEvents();
 
+
+        if (!this.room.isDisconnected()) {
+            this.connect();
+        }
+    }
+
+    /**
+     * Initializes the connection to Pusher.
+     */
+    private connect(): void {
         const camera = this.cameras.main;
 
         connectionManager.connectToRoomSocket(
@@ -560,7 +572,6 @@ export class GameScene extends ResizableScene implements CenterListener {
         });
     }
 
-
     //todo: into dedicated classes
     private initCirclesCanvas(): void {
         // Let's generate the circle for the group delimiter

front/src/Url/UrlManager.ts

@@ -35,7 +35,8 @@ class UrlManager {
     public pushRoomIdToUrl(room:Room): void {
         if (window.location.pathname === room.id) return;
         const hash = window.location.hash;
-        history.pushState({}, 'WorkAdventure', room.id+hash);
+        const search = room.search.toString();
+        history.pushState({}, 'WorkAdventure', room.id+(search?'?'+search:'')+hash);
     }
 
     public getStartLayerNameFromUrl(): string|null {