create initial game state outside reducer

src/ai/bot.test.js

@@ -7,7 +7,7 @@
  */
 
 import Game from '../core/game';
-import { CreateGameReducer } from '../core/reducer';
+import { InitializeGame } from '../core/reducer';
 import { MAKE_MOVE, GAME_EVENT } from '../core/action-types';
 import { makeMove } from '../core/action-creators';
 import { Simulate, Bot, RandomBot, MCTSBot } from './bot';
@@ -86,16 +86,14 @@ describe('Simulate', () => {
   };
 
   test('multiple bots', () => {
-    const reducer = CreateGameReducer({ game: TicTacToe });
-    const state = reducer(undefined, { type: 'init' });
+    const state = InitializeGame({ game: TicTacToe });
     const { state: endState } = Simulate({ game: TicTacToe, bots, state });
     expect(endState.ctx.gameover).not.toBe(undefined);
   });
 
   test('single bot', () => {
     const bot = new RandomBot({ seed: 'test', enumerate });
-    const reducer = CreateGameReducer({ game: TicTacToe });
-    const state = reducer(undefined, { type: 'init' });
+    const state = InitializeGame({ game: TicTacToe });
     const { state: endState } = Simulate({
       game: TicTacToe,
       bots: bot,
@@ -146,8 +144,7 @@ describe('MCTSBot', () => {
 
   test('game that never ends', () => {
     const game = Game({});
-    const reducer = CreateGameReducer({ game });
-    const state = reducer(undefined, { type: 'init' });
+    const state = InitializeGame({ game });
     const bot = new MCTSBot({ seed: 'test', game, enumerate: () => [] });
     const { state: endState } = Simulate({ game, bots: bot, state });
     expect(endState.ctx.turn).toBe(0);
@@ -165,17 +162,17 @@ describe('MCTSBot', () => {
       }),
     };
 
-    const reducer = CreateGameReducer({ game: TicTacToe });
+    const initialState = InitializeGame({ game: TicTacToe });
 
     for (let i = 0; i < 5; i++) {
-      const state = reducer(undefined, { type: 'init' });
+      const state = initialState;
       const { state: endState } = Simulate({ game: TicTacToe, bots, state });
       expect(endState.ctx.gameover).not.toEqual({ winner: '0' });
     }
   });
 
   test('MCTSBot vs. MCTSBot', () => {
-    const reducer = CreateGameReducer({ game: TicTacToe });
+    const initialState = InitializeGame({ game: TicTacToe });
     const iterations = 400;
 
     for (let i = 0; i < 5; i++) {
@@ -195,7 +192,7 @@ describe('MCTSBot', () => {
           iterations,
         }),
       };
-      const state = reducer(undefined, { type: 'init' });
+      const state = initialState;
       const { state: endState } = Simulate({ game: TicTacToe, bots, state });
       expect(endState.ctx.gameover).toEqual({ draw: true });
     }
@@ -209,8 +206,7 @@ describe('MCTSBot', () => {
       },
     });
 
-    const reducer = CreateGameReducer({ game: TicTacToe });
-    const state = reducer(undefined, { type: 'init' });
+    const state = InitializeGame({ game: TicTacToe });
 
     for (let i = 0; i < 10; i++) {
       const bot = new MCTSBot({

src/client/client.js

@@ -11,7 +11,7 @@ import * as Actions from '../core/action-types';
 import * as ActionCreators from '../core/action-creators';
 import { SocketIO } from './transport/socketio';
 import { Local, LocalMaster } from './transport/local';
-import { CreateGameReducer } from '../core/reducer';
+import { InitializeGame, CreateGameReducer } from '../core/reducer';
 
 /**
  * createDispatchers
@@ -117,8 +117,13 @@ class _ClientImpl {
       };
     }
 
+    let initialState = null;
+    if (multiplayer === undefined) {
+      initialState = InitializeGame({ game, numPlayers });
+    }
+
     this.reset = () => {
-      this.store.dispatch(ActionCreators.reset());
+      this.store.dispatch(ActionCreators.reset(initialState));
     };
     this.undo = () => {
       this.store.dispatch(ActionCreators.undo());
@@ -209,7 +214,7 @@ class _ClientImpl {
       enhancer = applyMiddleware(LogMiddleware, TransportMiddleware);
     }
 
-    this.store = createStore(this.reducer, enhancer);
+    this.store = createStore(this.reducer, initialState, enhancer);
 
     if (multiplayer && multiplayer.master_ !== undefined) {
       this.transport = new Local({

src/client/client.test.js

@@ -7,7 +7,7 @@
  */
 
 import { createStore } from 'redux';
-import { CreateGameReducer } from '../core/reducer';
+import { InitializeGame, CreateGameReducer } from '../core/reducer';
 import { Client, GetOpts, createMoveDispatchers } from './client';
 import { Local } from './transport/local';
 import { SocketIO } from './transport/socketio';
@@ -243,9 +243,10 @@ describe('move dispatchers', () => {
     },
   });
   const reducer = CreateGameReducer({ game });
+  const initialState = InitializeGame({ game });
 
   test('basic', () => {
-    const store = createStore(reducer);
+    const store = createStore(reducer, initialState);
     const api = createMoveDispatchers(game.moveNames, store);
 
     expect(Object.getOwnPropertyNames(api)).toEqual(['A', 'B', 'C']);
@@ -268,14 +269,14 @@ describe('move dispatchers', () => {
   });
 
   test('with undefined playerID - singleplayer mode', () => {
-    const store = createStore(reducer);
+    const store = createStore(reducer, initialState);
     const api = createMoveDispatchers(game.moveNames, store);
     api.B();
     expect(store.getState().G).toMatchObject({ moved: '0' });
   });
 
   test('with undefined playerID - multiplayer mode', () => {
-    const store = createStore(reducer);
+    const store = createStore(reducer, initialState);
     const api = createMoveDispatchers(
       game.moveNames,
       store,
@@ -288,14 +289,14 @@ describe('move dispatchers', () => {
   });
 
   test('with null playerID - singleplayer mode', () => {
-    const store = createStore(reducer);
+    const store = createStore(reducer, initialState);
     const api = createMoveDispatchers(game.moveNames, store, null);
     api.B();
     expect(store.getState().G).toMatchObject({ moved: '0' });
   });
 
   test('with null playerID - multiplayer mode', () => {
-    const store = createStore(reducer);
+    const store = createStore(reducer, initialState);
     const api = createMoveDispatchers(game.moveNames, store, null, null, true);
     api.B();
     expect(store.getState().G).toMatchObject({ moved: null });

src/client/log/log.test.js

@@ -11,7 +11,7 @@ import { Client } from '../client';
 import { makeMove, gameEvent } from '../../core/action-creators';
 import Game from '../../core/game';
 import { GameLog } from './log';
-import { CreateGameReducer } from '../../core/reducer';
+import { InitializeGame, CreateGameReducer } from '../../core/reducer';
 import Enzyme from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 
@@ -28,7 +28,7 @@ describe('layout', () => {
     },
   });
   const reducer = CreateGameReducer({ game });
-  const state = reducer(undefined, { type: 'init' });
+  const state = InitializeGame({ game });
 
   test('sanity', () => {
     const log = [
@@ -161,7 +161,7 @@ describe('pinning', () => {
   });
 
   const reducer = CreateGameReducer({ game });
-  let state = reducer(undefined, { type: 'init' });
+  let state = InitializeGame({ game });
   const initialState = state;
   const log = [
     { action: makeMove('A') },
@@ -240,7 +240,7 @@ describe('pinning', () => {
 describe('payload', () => {
   const game = Game({});
   const reducer = CreateGameReducer({ game });
-  const state = reducer(undefined, { type: 'init' });
+  const state = InitializeGame({ game });
 
   const log = [
     { action: makeMove('moveA'), payload: { test_payload: 'payload123' } },

src/client/react-native.test.js

@@ -123,7 +123,7 @@ test('update gameID / playerID', () => {
       },
     }),
     board: TestBoard,
-    multiplayer: true,
+    multiplayer: { local: true },
   });
   game = Enzyme.mount(<Board gameID="a" playerID="1" credentials="foo" />);
   const m = game.instance().client.transport;

src/client/react.test.js

@@ -135,7 +135,7 @@ test('update gameID / playerID', () => {
       },
     }),
     board: TestBoard,
-    multiplayer: true,
+    multiplayer: { local: true },
   });
   game = Enzyme.mount(<Board gameID="a" playerID="1" credentials="foo" />);
   const m = game.instance().client.transport;

src/client/transport/local.js

@@ -131,7 +131,7 @@ export class Local {
    */
   async updateGameID(id) {
     this.gameID = this.gameName + ':' + id;
-    const action = ActionCreators.reset();
+    const action = ActionCreators.reset(null);
     this.store.dispatch(action);
     await this.master.onSync(this.gameID, this.playerID, this.numPlayers);
   }
@@ -142,7 +142,7 @@ export class Local {
    */
   async updatePlayerID(id) {
     this.playerID = id;
-    const action = ActionCreators.reset();
+    const action = ActionCreators.reset(null);
     this.store.dispatch(action);
     await this.master.onSync(this.gameID, this.playerID, this.numPlayers);
   }

src/client/transport/local.test.js

@@ -10,7 +10,7 @@ import { createStore } from 'redux';
 import { Local, LocalMaster } from './local';
 import Game from '../../core/game';
 import { makeMove, gameEvent } from '../../core/action-creators';
-import { CreateGameReducer } from '../../core/reducer';
+import { InitializeGame, CreateGameReducer } from '../../core/reducer';
 
 describe('LocalMaster', () => {
   const game = Game({});
@@ -91,7 +91,9 @@ describe('Local', () => {
     let store = null;
 
     beforeEach(() => {
-      m.store = store = createStore(CreateGameReducer({ game }));
+      const reducer = CreateGameReducer({ game });
+      const initialState = InitializeGame({ game });
+      m.store = store = createStore(reducer, initialState);
     });
 
     test('returns a valid store', () => {

src/client/transport/socketio.js

@@ -128,7 +128,7 @@ export class SocketIO {
   updateGameID(id) {
     this.gameID = this.gameName + ':' + id;
 
-    const action = ActionCreators.reset();
+    const action = ActionCreators.reset(null);
     this.store.dispatch(action);
 
     if (this.socket) {
@@ -143,7 +143,7 @@ export class SocketIO {
   updatePlayerID(id) {
     this.playerID = id;
 
-    const action = ActionCreators.reset();
+    const action = ActionCreators.reset(null);
     this.store.dispatch(action);
 
     if (this.socket) {

src/client/transport/socketio.test.js

@@ -10,7 +10,7 @@ import { createStore } from 'redux';
 import { SocketIO } from './socketio';
 import Game from '../../core/game';
 import { makeMove } from '../../core/action-creators';
-import { CreateGameReducer } from '../../core/reducer';
+import { InitializeGame, CreateGameReducer } from '../../core/reducer';
 import * as Actions from '../../core/action-types';
 
 class MockSocket {
@@ -85,7 +85,9 @@ describe('multiplayer', () => {
   let store = null;
 
   beforeEach(() => {
-    m.store = store = createStore(CreateGameReducer({ game }));
+    const reducer = CreateGameReducer({ game });
+    const initialState = InitializeGame({ game });
+    m.store = store = createStore(reducer, initialState);
   });
 
   test('returns a valid store', () => {

src/core/action-creators.js

@@ -74,9 +74,11 @@ export const update = (state, deltalog) => ({
 
 /**
  * Used to reset the game state.
+ * @param {object} state - The initial state.
  */
-export const reset = () => ({
+export const reset = state => ({
   type: Actions.RESET,
+  state,
   clientOnly: true,
 });
 

src/core/events.test.js

@@ -9,7 +9,7 @@
 import { Events } from './events';
 import { makeMove } from './action-creators';
 import Game from './game';
-import { CreateGameReducer } from './reducer';
+import { InitializeGame, CreateGameReducer } from './reducer';
 
 test('constructor', () => {
   const flow = {};
@@ -52,9 +52,8 @@ test('update ctx', () => {
       },
     },
   });
-  const reducer = CreateGameReducer({ game, numPlayers: 2 });
-
-  let state = reducer(undefined, { type: 'init' });
+  const reducer = CreateGameReducer({ game });
+  let state = InitializeGame({ game });
   expect(state.ctx.turn).toBe(0);
   state = reducer(state, makeMove('A'));
   expect(state.ctx.turn).toBe(1);