simplified mapUrl parsing

front/src/Phaser/Game/GameManager.ts

@@ -1,4 +1,4 @@
-import {GameScene} from "./GameScene";
+import {GameScene, GameSceneInitInterface} from "./GameScene";
 import {
     StartMapInterface
 } from "../../Connexion/ConnexionModels";
@@ -13,6 +13,11 @@ export interface HasMovedEvent {
     y: number;
 }
 
+export interface loadMapResponseInterface {
+    key: string,
+    startLayerName: string;
+}
+
 export class GameManager {
     private playerName!: string;
     private characterLayers!: string[];
@@ -29,15 +34,6 @@ export class GameManager {
         this.characterLayers = layers;
     }
 
-    loadStartMap() : Promise<StartMapInterface> {
-        return connectionManager.getMapUrlStart().then(mapUrlStart => {
-            return {
-                mapUrlStart: mapUrlStart,
-                startInstance: "global", //todo: is this property still usefull?
-            }
-        });
-    }
-
     getPlayerName(): string {
         return this.playerName;
     }
@@ -46,8 +42,47 @@ export class GameManager {
         return this.characterLayers;
     }
 
-    loadMap(mapUrl: string, scene: Phaser.Scenes.ScenePlugin, instance: string): string {
-        const sceneKey = GameScene.getMapKeyByUrl(mapUrl);
+    /**
+     * Returns the map URL and the instance from the current URL
+     */
+    private findMapUrl(): [string, string]|null {
+        const path = window.location.pathname;
+        if (!path.startsWith('/_/')) {
+            return null;
+        }
+        const instanceAndMap = path.substr(3);
+        const firstSlash = instanceAndMap.indexOf('/');
+        if (firstSlash === -1) {
+            return null;
+        }
+        const instance = instanceAndMap.substr(0, firstSlash);
+        return [window.location.protocol+'//'+instanceAndMap.substr(firstSlash+1), instance];
+    }
+    
+     public loadStartingMap(scene: Phaser.Scenes.ScenePlugin): Promise<loadMapResponseInterface> {
+        // Do we have a start URL in the address bar? If so, let's redirect to this address
+        const instanceAndMapUrl = this.findMapUrl();
+        if (instanceAndMapUrl !== null) {
+            const [mapUrl, instance] = instanceAndMapUrl;
+            const key = gameManager.loadMap(mapUrl, scene, instance);
+            const startLayerName = window.location.hash ? window.location.hash.substr(1) : '';
+            return Promise.resolve({key, startLayerName});
+            
+        } else {
+            // If we do not have a map address in the URL, let's ask the server for a start map.
+            return connectionManager.getMapUrlStart().then((mapUrlStart: string) => {
+                const key = gameManager.loadMap(window.location.protocol + "//" + mapUrlStart, scene, 'global');
+                return {key, startLayerName: ''}
+            }).catch((err) => {
+                console.error(err);
+                throw err;
+            });
+        }
+        
+    }
+
+    public loadMap(mapUrl: string, scene: Phaser.Scenes.ScenePlugin, instance: string): string {
+        const sceneKey = this.getMapKeyByUrl(mapUrl);
 
         const gameIndex = scene.getIndex(sceneKey);
         if(gameIndex === -1){
@@ -56,6 +91,13 @@ export class GameManager {
         }
         return sceneKey;
     }
+
+    public getMapKeyByUrl(mapUrlStart: string) : string {
+        // FIXME: the key should be computed from the full URL of the map.
+        const startPos = mapUrlStart.indexOf('://')+3;
+        const endPos = mapUrlStart.indexOf(".json");
+        return mapUrlStart.substring(startPos, endPos);
+    }
 }
 
 export const gameManager = new GameManager();