Make creating games asynchronous

Thus allowing for (later) adding HTTP requests when selecting start/goal articles

src/MatchMaker.js

@@ -20,8 +20,8 @@ module.exports = class MatchMaker {
    * Create a new game hosted by the given player.
    */
 
-  createGame (player) {
-    const [origin, goal] = this.wikiPages.randomPair()
+  async createGame (player) {
+    const [origin, goal] = await this.wikiPages.randomPair()
     const game = new WikiBattle(origin, goal)
     game.connect(player)
     return game
@@ -32,7 +32,7 @@ module.exports = class MatchMaker {
    * either the previous, or the next player that is passed to this method.
    */
 
-  pair (player) {
+  async pair (player) {
     if (this.waitingPair) {
       debug('pairing with existing')
       const game = this.waitingPair
@@ -49,7 +49,7 @@ module.exports = class MatchMaker {
     }
 
     debug('waiting for pairing')
-    const game = this.createGame(player)
+    const game = await this.createGame(player)
     this.waitingPair = game
 
     player.notifyJoinedGame(game)
@@ -63,10 +63,10 @@ module.exports = class MatchMaker {
    * shareable URL.
    */
 
-  new (player) {
+  async new (player) {
     debug('forcing new game')
 
-    const game = this.createGame(player)
+    const game = await this.createGame(player)
     this.games[game.id] = game
 
     player.notifyJoinedGame(game)

src/SocketHandler.js

@@ -14,13 +14,13 @@ module.exports = class SocketHandler {
     const sock = new SocketEvents(raw)
     const player = new Player(sock)
 
-    sock.on('gameType', (type, id) => {
+    sock.on('gameType', async (type, id) => {
       switch (type) {
         case 'pair':
-          game = this.matchMaker.pair(player)
+          game = await this.matchMaker.pair(player)
           break
         case 'new':
-          game = this.matchMaker.new(player)
+          game = await this.matchMaker.new(player)
           break
         case 'join':
           try {
@@ -47,8 +47,8 @@ module.exports = class SocketHandler {
       }
     })
 
-    raw.on('close', () => {
-      if (game) {
+    raw.on('close', async () => {
+      if (await game) {
         game.disconnect(player)
 
         this.matchMaker.disconnected(game)

src/WikiPages.js

@@ -59,7 +59,7 @@ module.exports = class WikiPages extends EventEmitter {
    * Get a pair of random article names, guaranteed to be two different pages.
    */
 
-  randomPair () {
+  async randomPair () {
     const one = this.random()
 
     let two = this.random()