fix race condition in game instantiation inside onSync

boardgameio · Jan 22, 2019 · 3334d38 · 3334d38
1 parent 7c0521c
commit 3334d38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/master/master.js b/src/master/master.js
@@ -78,7 +78,7 @@ export class Master {
    * along with a deltalog.
    */
   async onUpdate(action, stateID, gameID, playerID) {
-    const key = `${this.game.name}:${gameID}`;
+    const key = gameID;
     let state = await this.storageAPI.get(key);
 
     if (state === undefined) {
@@ -170,7 +170,7 @@ export class Master {
    * Returns the latest game state and the entire log.
    */
   async onSync(gameID, playerID, numPlayers) {
-    const key = `${this.game.name}:${gameID}`;
+    const key = gameID;
 
     let state = await this.storageAPI.get(key);
 
@@ -179,6 +179,7 @@ export class Master {
     if (state === undefined) {
       state = InitializeGame({ game: this.game, numPlayers });
       await this.storageAPI.set(key, state);
+      state = await this.storageAPI.get(key);
     }
 
     const filteredState = {

diff --git a/src/master/master.test.js b/src/master/master.test.js
@@ -181,7 +181,7 @@ describe('update', async () => {
   });
 
   test('invalid gameID', async () => {
-    await master.onUpdate(action, 1, 'unknown', '1');
+    await master.onUpdate(action, 1, 'default:unknown', '1');
     expect(sendAll).not.toHaveBeenCalled();
     expect(error).toHaveBeenCalledWith(
       `game not found, gameID=[default:unknown]`