rewrote the login workflow

front/src/Phaser/Game/AddPlayerInterface.ts

@@ -1,4 +1,4 @@
-import {PointInterface} from "../../Connection";
+import {PointInterface} from "../../Connexion/Connection";
 
 export interface AddPlayerInterface {
     userId: number;

front/src/Phaser/Game/GameManager.ts

@@ -1,9 +1,10 @@
 import {GameScene} from "./GameScene";
 import {
     StartMapInterface
-} from "../../Connection";
+} from "../../Connexion/ConnexionModels";
 import Axios from "axios";
 import {API_URL} from "../../Enum/EnvironmentVariable";
+import {adminDataFetchPromise} from "../../register";
 
 export interface HasMovedEvent {
     direction: string;
@@ -29,13 +30,23 @@ export class GameManager {
     }
 
     loadStartMap() : Promise<StartMapInterface> {
-        return Axios.get(`${API_URL}/start-map`)
-            .then((res) => {
-                return res.data;
-            }).catch((err) => {
-                console.error(err);
-                throw err;
-            });
+        if (adminDataFetchPromise) {
+            return adminDataFetchPromise.then(data => {
+                return {
+                    mapUrlStart: data.mapUrlStart,
+                    startInstance: data.startInstance,
+                }
+            })
+        } else {
+            //todo: remove this call, merge with the admin workflow?
+            return Axios.get(`${API_URL}/start-map`)
+                .then((res) => {
+                    return res.data;
+                }).catch((err) => {
+                    console.error(err);
+                    throw err;
+                });
+        }
     }
 
     getPlayerName(): string {

front/src/Phaser/Game/GameScene.ts

@@ -1,6 +1,5 @@
 import {GameManager, gameManager, HasMovedEvent} from "./GameManager";
 import {
-    Connection,
     GroupCreatedUpdatedMessageInterface,
     MessageUserJoined,
     MessageUserMovedInterface,
@@ -8,7 +7,7 @@ import {
     PointInterface,
     PositionInterface,
     RoomJoinedMessageInterface
-} from "../../Connection";
+} from "../../Connexion/ConnexionModels";
 import {CurrentGamerInterface, hasMovedEventName, Player} from "../Player/Player";
 import {DEBUG_MODE, JITSI_URL, POSITION_DELAY, RESOLUTION, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable";
 import {
@@ -42,6 +41,8 @@ import {ActionableItem} from "../Items/ActionableItem";
 import {UserInputManager} from "../UserInput/UserInputManager";
 import {UserMovedMessage} from "../../Messages/generated/messages_pb";
 import {ProtobufClientUtils} from "../../Network/ProtobufClientUtils";
+import {connectionManager} from "../../Connexion/ConnectionManager";
+import {RoomConnection} from "../../Connexion/RoomConnection";
 
 
 export enum Textures {
@@ -100,9 +101,9 @@ export class GameScene extends Phaser.Scene implements CenterListener {
     pendingEvents: Queue<InitUserPositionEventInterface|AddPlayerEventInterface|RemovePlayerEventInterface|UserMovedEventInterface|GroupCreatedUpdatedEventInterface|DeleteGroupEventInterface> = new Queue<InitUserPositionEventInterface|AddPlayerEventInterface|RemovePlayerEventInterface|UserMovedEventInterface|GroupCreatedUpdatedEventInterface|DeleteGroupEventInterface>();
     private initPosition: PositionInterface|null = null;
     private playersPositionInterpolator = new PlayersPositionInterpolator();
-    private connection!: Connection;
+    private connection!: RoomConnection;
     private simplePeer!: SimplePeer;
-    private connectionPromise!: Promise<Connection>
+    private connectionPromise!: Promise<RoomConnection>
     private connectionAnswerPromise: Promise<RoomJoinedMessageInterface>;
     private connectionAnswerPromiseResolve!: (value?: RoomJoinedMessageInterface | PromiseLike<RoomJoinedMessageInterface>) => void;
     // A promise that will resolve when the "create" method is called (signaling loading is ended)
@@ -202,8 +203,10 @@ export class GameScene extends Phaser.Scene implements CenterListener {
 
         this.load.bitmapFont('main_font', 'resources/fonts/arcade.png', 'resources/fonts/arcade.xml');
 
-        this.connectionPromise = Connection.createConnection(gameManager.getPlayerName(), gameManager.getCharacterSelected()).then((connection : Connection) => {
+        this.connectionPromise = connectionManager.connectToRoomSocket().then((connection : RoomConnection) => {
             this.connection = connection;
+            
+            this.connection.emitPlayerDetailsMessage(gameManager.getCharacterSelected())
 
             connection.onUserJoins((message: MessageUserJoined) => {
                 const userMessage: AddPlayerInterface = {
@@ -778,7 +781,7 @@ export class GameScene extends Phaser.Scene implements CenterListener {
         this.createCollisionObject();
 
         //join room
-        this.connectionPromise.then((connection: Connection) => {
+        this.connectionPromise.then((connection: RoomConnection) => {
             const camera = this.cameras.main;
             connection.joinARoom(this.RoomId,
                 this.startX,

front/src/Phaser/Game/PlayerMovement.ts

@@ -1,6 +1,6 @@
 import {HasMovedEvent} from "./GameManager";
 import {MAX_EXTRAPOLATION_TIME} from "../../Enum/EnvironmentVariable";
-import {PositionInterface} from "../../Connection";
+import {PositionInterface} from "../../Connexion/ConnexionModels";
 
 export class PlayerMovement {
     public constructor(private startPosition: PositionInterface, private startTick: number, private endPosition: HasMovedEvent, private endTick: number) {