feat(app-general): add synchronous rtdb initialization

eficode · Feb 1, 2021 · b4b228e · b4b228e
1 parent 872eae6
commit b4b228e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/packages/game-app/src/gameView/apis/initializeRTDBInstance.ts b/packages/game-app/src/gameView/apis/initializeRTDBInstance.ts
@@ -0,0 +1,12 @@
+import CONFIG from '@pipeline/app-config';
+import firebase from 'firebase';
+
+export function initializeRTDB(rtdbInstance: string, gameId: string) {
+  const app = firebase.initializeApp(
+    {
+      databaseURL: `https://${rtdbInstance}.firebasedatabase.app`,
+    },
+    gameId,
+  );
+  CONFIG.REACT_APP_FIREBASE_USE_EMULATORS === 'true' && app.database().useEmulator('localhost', 9000);
+}
diff --git a/packages/game-app/src/gameView/sagas/loadGame.ts b/packages/game-app/src/gameView/sagas/loadGame.ts
@@ -6,6 +6,7 @@ import { CardEntity, CardTypes } from '@pipeline/common';
 import loadGame from '../apis/callLoadGame';
 import loadCardsForDeck from '../apis/callLoadCardsForDeck';
 import { Game } from '@pipeline/models';
+import { initializeRTDB } from '../apis/initializeRTDBInstance';
 
 /*
 function firebaseGameChannel(gameId: string) {
@@ -27,13 +28,15 @@ function* executeLoadGame(action: ReturnType<typeof actions.loadGame>) {
   yield put(actions.saveCards(cards));
   // TODO load actual game state from firestore
 
-  if (game.rtdbInstance) {
-    yield put(actions.saveGame({ ...game, id: gameId }));
-  } else {
-    const bestRTDBInstance = yield call(selectBestRTDBInstance, gameId);
-    yield put(actions.saveGame({ ...game, rtdbInstance: bestRTDBInstance, id: gameId }));
+  if (!game.rtdbInstance) {
+    game.rtdbInstance = yield call(selectBestRTDBInstance, gameId);
   }
 
+  //keep initialization before game saving
+  initializeRTDB(game.rtdbInstance!, gameId);
+
+  yield put(actions.saveGame({ ...game, id: action.payload }));
+
   const gameState: GameState = {
     boardCards: [],
     deckCards: cards.filter(c => c.type === CardTypes.PipelineStep).map(c => c.id),

diff --git a/packages/game-app/src/userGameStatus/apis/callUpdateConnections.ts b/packages/game-app/src/userGameStatus/apis/callUpdateConnections.ts
@@ -1,16 +1,5 @@
 import firebase from 'firebase';
 import { RTDBPaths } from '@pipeline/common';
-import CONFIG from '@pipeline/app-config';
-
-export function initializeRTDB(rtdbInstance: string, gameId: string) {
-  const app = firebase.initializeApp(
-    {
-      databaseURL: `https://${rtdbInstance}.firebasedatabase.app`,
-    },
-    gameId,
-  );
-  CONFIG.REACT_APP_FIREBASE_USE_EMULATORS === 'true' && app.database().useEmulator('localhost', 9000);
-}
 
 export async function startListenToOnlineStatus(
   uid: string,

diff --git a/packages/game-app/src/userGameStatus/sagas/userGameStatus.ts b/packages/game-app/src/userGameStatus/sagas/userGameStatus.ts
@@ -2,11 +2,7 @@ import { call, put, select, takeEvery, take } from 'redux-saga/effects';
 import { channel } from 'redux-saga';
 import { actions } from '../slice';
 import { actions as loadGameActions, selectors as gameSelectors } from '../../gameView/slice';
-import {
-  startListenToOnlineStatus,
-  stopListenToOnlineStatus,
-  initializeRTDB as callInitializeRTDB,
-} from '../apis/callUpdateConnections';
+import { startListenToOnlineStatus, stopListenToOnlineStatus } from '../apis/callUpdateConnections';
 import { AuthUser, selectors as authSelectors } from '@pipeline/auth';
 import { GameEntity } from '@pipeline/models';
 
@@ -51,7 +47,6 @@ export function* watchStatusChannel() {
 
 function* executeInitializeRTDB(action: ReturnType<typeof loadGameActions.saveGame>) {
   if (action.payload.rtdbInstance) {
-    yield call(callInitializeRTDB, action.payload.rtdbInstance, action.payload.id);
     yield put(actions.startListenToOnlineStatus());
   }
 }