Simplifying promises

back/src/Model/GameRoom.ts

@@ -436,18 +436,10 @@ export class GameRoom {
 
     private getVariableManager(): Promise<VariablesManager> {
         if (!this.variableManagerPromise) {
-            this.variableManagerPromise = new Promise<VariablesManager>((resolve, reject) => {
+            this.variableManagerPromise = this.getMap()
-                this.getMap()
                 .then((map) => {
                     const variablesManager = new VariablesManager(this.roomUrl, map);
-                        variablesManager
+                    return variablesManager.init();
-                            .init()
-                            .then(() => {
-                                resolve(variablesManager);
-                            })
-                            .catch((e) => {
-                                reject(e);
-                            });
                 })
                 .catch((e) => {
                     if (e instanceof LocalUrlError) {
@@ -465,19 +457,11 @@ export class GameRoom {
                         }, 1000);
 
                         const variablesManager = new VariablesManager(this.roomUrl, null);
-                            variablesManager
+                        return variablesManager.init();
-                                .init()
-                                .then(() => {
-                                    resolve(variablesManager);
-                                })
-                                .catch((e) => {
-                                    reject(e);
-                                });
                     } else {
-                            reject(e);
+                        throw e;
                     }
                 });
-            });
         }
         return this.variableManagerPromise;
     }

back/src/Services/VariablesManager.ts

@@ -45,14 +45,15 @@ export class VariablesManager {
     /**
      * Let's load data from the Redis backend.
      */
-    public async init(): Promise<void> {
+    public async init(): Promise<VariablesManager> {
         if (!this.shouldPersist()) {
-            return;
+            return this;
         }
         const variables = await variablesRepository.loadVariables(this.roomUrl);
         for (const key in variables) {
             this._variables.set(key, variables[key]);
         }
+        return this;
     }
 
     /**