Merge branch 'develop' into feature/ping-pong

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mancala-backend",
-  "version": "0.1.3-beta.7",
+  "version": "0.1.3-beta.8",
   "description": "",
   "main": "index.js",
   "scripts": {

src/index.ts

@@ -12,6 +12,6 @@ const matchMaker = new MatchMakerImpl();
 const gameManager = new GameManager({ rtmt, gameStore, matchMaker })
 
 const expressApp = new ExpressApp();
-const server = new WebServer({expressApp});
+const server = new WebServer({ expressApp: expressApp.app });
 
 rtmt.initWebSocket(server.server, (userKey: string) => gameManager.fireOnPlayerConnected(userKey));

src/server/ExpressApp.ts

@@ -6,6 +6,10 @@ import fs from "fs";
 import { generateKey } from "../util/key_factory";
 
 export class ExpressApp {
+    app: Express.Application;
+    constructor() {
+        this.app = this.createExpressApp();
+    }
     private createAccessLogMiddleware() {
         return morgan("common", {
             stream: fs.createWriteStream("./access.log", { flags: "a" }),