fix(frontend): fix duplicate events after re-login

PascalHonegger · May 5, 2021 · c58702b · c58702b
1 parent 9fa688b
commit c58702b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/frontend/src/components/Game.svelte b/frontend/src/components/Game.svelte
@@ -5,19 +5,29 @@
     import type { GameUpdateEvent } from "../gen/game_pb";
     import type { ChaosConnectServiceClient } from "../gen/JoestarServiceClientPb";
     import { authMetadata } from "../stores/Auth";
-    import { onMount } from "svelte";
+    import { onDestroy, onMount } from "svelte";
     import Grid from "./Grid.svelte";
     import PlayerList from "./PlayerList.svelte";
     import FactionSelect from "./FactionSelect.svelte";
 
     export let client: ChaosConnectServiceClient;
 
+    function applyGameUpdate(gameUpdateEvent: GameUpdateEvent) {
+        gameState.apply(gameUpdateEvent);
+    }
+
+    let updateStream: ClientReadableStream<GameUpdateEvent>;
     onMount(() => {
-        const updateStream = client.getGameUpdates(
+        gameState.reset();
+        updateStream = client.getGameUpdates(
             newEmpty(),
             $authMetadata
         ) as ClientReadableStream<GameUpdateEvent>;
-        updateStream.on("data", (updateEvent) => gameState.apply(updateEvent));
+        updateStream.on('data', applyGameUpdate);
+    });
+    onDestroy(() => {
+        updateStream.cancel();
+        updateStream.removeListener('data', applyGameUpdate);
     });
 </script>
 

diff --git a/frontend/src/stores/GameState.ts b/frontend/src/stores/GameState.ts
@@ -10,6 +10,9 @@ function createGameStateStore() {
         subscribe,
         apply(updateEvent: GameUpdateEvent) {
             update(currentState => applyUpdate(currentState, updateEvent));
+        },
+        reset() {
+            update(initialGameState);
         }
     }
 }