From 30a4d504e42b05b8a19c2163deac9e9a9eff21fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Thu, 2 Jul 2020 10:11:12 +0200
Subject: [PATCH] Refactoring connection to use async/await

---
 front/src/Connection.ts            | 56 +++++++++++++++++-------------
 front/src/Phaser/Game/GameScene.ts |  4 +++
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/front/src/Connection.ts b/front/src/Connection.ts
index c4ac92c6..62eae8c6 100644
--- a/front/src/Connection.ts
+++ b/front/src/Connection.ts
@@ -23,6 +23,7 @@ enum EventMessage{
     GROUP_DELETE = "group-delete",
     SET_PLAYER_DETAILS = "set-player-details", // Send the name and character to the server (on connect), receive back the id.
 
+    CONNECT = "connect",
     CONNECT_ERROR = "connect_error",
 }
 
@@ -109,37 +110,38 @@ export class Connection implements Connection {
         })
     }
 
-    public static createConnection(name: string, characterSelected: string): Promise<Connection> {
-        return Axios.post(`${API_URL}/login`, {name: name})
-            .then((res) => {
+    public static async createConnection(name: string, characterSelected: string): Promise<Connection> {
+        try {
+            const res = await Axios.post(`${API_URL}/login`, {name: name})
 
-                return new Promise<Connection>((resolve, reject) => {
-                    const connection = new Connection(res.data.token);
-
-                    connection.onConnectError((error: object) => {
-                        console.log('An error occurred while connecting to socket server. Retrying');
-                        reject(error);
-                    });
-
-                    connection.socket.emit(EventMessage.SET_PLAYER_DETAILS, {
-                        name: name,
-                        character: characterSelected
-                    } as SetPlayerDetailsMessage, (id: string) => {
-                        connection.userId = id;
-                    });
+            return new Promise<Connection>((resolve, reject) => {
+                const connection = new Connection(res.data.token);
 
+                connection.onConnect(() => {
                     resolve(connection);
                 });
-            })
-            .catch((err) => {
-                // Let's retry in 4-6 seconds
-                return new Promise<Connection>((resolve, reject) => {
-                    setTimeout(() => {
-                        Connection.createConnection(name, characterSelected).then((connection) => resolve(connection))
-                            .catch((error) => reject(error));
-                    }, 4000 + Math.floor(Math.random() * 2000) );
+
+                connection.onConnectError((error: object) => {
+                    console.log('An error occurred while connecting to socket server. Retrying');
+                    reject(error);
+                });
+
+                connection.socket.emit(EventMessage.SET_PLAYER_DETAILS, {
+                    name: name,
+                    character: characterSelected
+                } as SetPlayerDetailsMessage, (id: string) => {
+                    connection.userId = id;
                 });
             });
+        } catch (err) {
+            // Let's retry in 4-6 seconds
+            return new Promise<Connection>((resolve, reject) => {
+                setTimeout(() => {
+                    Connection.createConnection(name, characterSelected).then((connection) => resolve(connection))
+                        .catch((error) => reject(error));
+                }, 4000 + Math.floor(Math.random() * 2000) );
+            });
+        }
     }
 
     public closeConnection(): void {
@@ -184,6 +186,10 @@ export class Connection implements Connection {
         this.socket.on(EventMessage.GROUP_DELETE, callback)
     }
 
+    public onConnect(callback: () => void): void {
+        this.socket.on(EventMessage.CONNECT, callback)
+    }
+
     public onConnectError(callback: (error: object) => void): void {
         this.socket.on(EventMessage.CONNECT_ERROR, callback)
     }
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 44c4feb6..b988ded2 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -213,6 +213,10 @@ export class GameScene extends Phaser.Scene {
             this.scene.sleep(ReconnectingSceneName);
 
             return connection;
+        }).catch(err => {
+            console.log(err);
+            // TODO: go to error screen / reconnect
+            throw err;
         });
     }