api: Add disconnect

Author: bperel

apps/duckguessr/api/services/game.ts

@@ -68,7 +68,7 @@ const onGuess = async (
   user: player,
   personcode: string | null,
 ): Promise<boolean> => {
-  const { _socket, ...events } = gameServices;
+  const { _socket } = gameServices;
   const currentRound = _socket.data.currentRound;
   console.log(
     `${user.username} is guessing ${JSON.stringify(personcode)} on round ${
@@ -82,7 +82,7 @@ const onGuess = async (
         personcode,
       }));
     if (guessResultsData) {
-      events.playerGuessed(guessResultsData);
+      gameServices.playerGuessed(guessResultsData);
       _socket.broadcast.emit("playerGuessed", {
         ...guessResultsData,
         answer: null,
@@ -120,7 +120,7 @@ const getPlayersMissingRoundScore = async (currentRound: round) =>
     `;
 
 const startRound = (socket: GameServices) => {
-  const { _socket, ...events } = socket;
+  const { _socket } = socket;
   const currentRound = socket._socket.data.currentRound;
   _socket.data.currentRoundEndTimeout = setTimeout(
     () => finishRound(socket),
@@ -133,7 +133,7 @@ const startRound = (socket: GameServices) => {
         "firstRoundWillStartSoon",
         currentRound.startedAt!,
       );
-      events.firstRoundWillStartSoon(currentRound.startedAt!);
+      socket.firstRoundWillStartSoon(currentRound.startedAt!);
     }, 200);
   }
 
@@ -143,7 +143,7 @@ const startRound = (socket: GameServices) => {
   };
   setTimeout(async () => {
     _socket.broadcast.emit("roundStarts", roundWithoutPersoncode);
-    events.roundStarts(roundWithoutPersoncode);
+    socket.roundStarts(roundWithoutPersoncode);
 
     const botPlayer = (
       await prisma.gamePlayer.findFirst({
@@ -177,7 +177,7 @@ const startRound = (socket: GameServices) => {
 };
 
 const finishRound = async (gameServices: GameServices) => {
-  const { _socket, ...events } = gameServices;
+  const { _socket } = gameServices;
   let { currentRound } = _socket.data;
   const currentGame = _socket.data.currentGame;
   console.log(`Round ${currentRound.id} finished`);
@@ -198,9 +198,9 @@ const finishRound = async (gameServices: GameServices) => {
   };
   if (currentRound.roundNumber === numberOfRounds) {
     _socket.broadcast.emit("roundEnds", roundWithScores);
-    events.roundEnds(roundWithScores);
+    gameServices.roundEnds(roundWithScores);
     _socket.broadcast.emit("gameEnds");
-    events.gameEnds();
+    gameServices.gameEnds();
   } else {
     currentRound = await setRoundTimes(
       currentGame!.rounds.find(
@@ -216,7 +216,7 @@ const finishRound = async (gameServices: GameServices) => {
       roundWithScores,
       roundWithoutPersoncode,
     );
-    events.roundEnds(roundWithScores, roundWithoutPersoncode);
+    gameServices.roundEnds(roundWithScores, roundWithoutPersoncode);
     startRound(gameServices);
   }
 };
@@ -256,48 +256,49 @@ const removePlayer = async (
   }
 };
 
-const listenEvents = ({ _socket, ...events }: GameServices) => ({
-  removeBot: async () => {
-    validateGameForBotAddOrRemove(
-      _socket.data.user.id,
-      _socket.data.currentGame,
-    );
-    await removePlayer(
-      await getUser(`bot_${_socket.data.currentGame.dataset.name}`),
-      _socket,
-      events.playerLeft,
-    );
-    _socket.data.currentGame = (await getGameWithRoundsDatasetPlayers(
-      _socket.data.gameId,
-    ))!;
-  },
-  addBot: async () => {
-    validateGameForBotAddOrRemove(
-      _socket.data.user.id,
-      _socket.data.currentGame,
-    );
+const listenEvents = (gameServices: GameServices) => {
+  const { _socket } = gameServices;
+  return {
+    removeBot: async () => {
+      validateGameForBotAddOrRemove(
+        _socket.data.user.id,
+        _socket.data.currentGame,
+      );
+      await removePlayer(
+        await getUser(`bot_${_socket.data.currentGame.dataset.name}`),
+        _socket,
+        gameServices.playerLeft,
+      );
+      _socket.data.currentGame = (await getGameWithRoundsDatasetPlayers(
+        _socket.data.currentGame.id,
+      ))!;
+    },
+    addBot: async () => {
+      validateGameForBotAddOrRemove(
+        _socket.data.user.id,
+        _socket.data.currentGame,
+      );
 
-    const botUsername = `bot_${_socket.data.currentGame.dataset.name}`;
-    const botPlayer = await getUser(botUsername);
-    await checkAndAssociatePlayer(_socket.data.currentGame, botPlayer);
-    _socket.data.currentGame = (await getGameWithRoundsDatasetPlayers(
-      _socket.data.gameId,
-    ))!;
-
-    _socket.broadcast.emit("playerJoined", botPlayer);
-    _socket.emit("playerJoined", botPlayer);
-  },
-  joinMatch: async () => {
-    {
+      const botUsername = `bot_${_socket.data.currentGame.dataset.name}`;
+      const botPlayer = await getUser(botUsername);
+      await checkAndAssociatePlayer(_socket.data.currentGame, botPlayer);
+      _socket.data.currentGame = (await getGameWithRoundsDatasetPlayers(
+        _socket.data.currentGame.id,
+      ))!;
+
+      _socket.broadcast.emit("playerJoined", botPlayer);
+      _socket.emit("playerJoined", botPlayer);
+    },
+    joinMatch: async () => {
       const player = await checkAndAssociatePlayer(
         _socket.data.currentGame,
         _socket.data.user,
       );
       _socket.data.currentGame = (await getGameWithRoundsDatasetPlayers(
-        _socket.data.gameId,
+        _socket.data.currentGame.id,
       ))!;
 
-      events.playerJoined(player);
+      gameServices.playerJoined(player);
 
       const players = _socket.data.currentGame.gamePlayers.map(
         ({ player }) => player,
@@ -312,57 +313,64 @@ const listenEvents = ({ _socket, ...events }: GameServices) => ({
         players,
         playerStats: await getPlayerStatistics(players.map(({ id }) => id)),
       };
-    }
-  },
-  startMatch: async () => {
-    if (
-      _socket.data.currentGame?.gamePlayers[0] &&
-      _socket.data.user.id !== _socket.data.currentGame.gamePlayers[0].playerId
-    ) {
-      console.error(
-        "The player starting the match must be the one who created it!",
-      );
-      return false;
-    }
+    },
+    startMatch: async () => {
+      if (
+        _socket.data.currentGame?.gamePlayers[0] &&
+        _socket.data.user.id !==
+          _socket.data.currentGame.gamePlayers[0].playerId
+      ) {
+        console.error(
+          "The player starting the match must be the one who created it!",
+        );
+        return false;
+      }
 
-    console.log(`Game ${_socket.data.gameId} is starting!`);
+      console.log(`Game ${_socket.data.currentGame.id} is starting!`);
 
-    _socket.data.currentRound = await setRoundTimes(_socket.data.currentRound);
-    startRound({ _socket, ...events });
+      _socket.data.currentRound = await setRoundTimes(
+        _socket.data.currentRound,
+      );
+      startRound(gameServices);
 
-    _socket.data.currentGame = (await getGameWithRoundsDatasetPlayers(
-      _socket.data.gameId,
-    ))!;
+      _socket.data.currentGame = (await getGameWithRoundsDatasetPlayers(
+        _socket.data.currentGame.id,
+      ))!;
 
-    _socket.broadcast.emit("matchStarts");
-    events.matchStarts();
-  },
-  guess: async (personcode: string | null) => {
-    const haveAllPlayersGuessed = await onGuess(
-      { _socket, ...events },
-      _socket.data.user,
-      personcode,
-    );
-    if (haveAllPlayersGuessed) {
-      return haveAllPlayersGuessed;
-    }
-  },
-  disconnect: async ({ _socket }: GameServices, reason: string) => {
-    if (reason !== "client namespace disconnect") {
-      if (
-        _socket &&
-        _socket.data.currentGame.gamePlayers.findIndex(
-          ({ player }) => player.id === _socket.data.user.id,
-        ) > 0
-      ) {
-        await removePlayer(_socket.data.user, _socket, events.playerLeft);
-        _socket.data.currentGame = (await getGameWithRoundsDatasetPlayers(
-          _socket.data.gameId,
-        ))!;
+      _socket.broadcast.emit("matchStarts");
+      gameServices.matchStarts();
+    },
+    guess: async (personcode: string | null) => {
+      const haveAllPlayersGuessed = await onGuess(
+        gameServices,
+        _socket.data.user,
+        personcode,
+      );
+      if (haveAllPlayersGuessed) {
+        return haveAllPlayersGuessed;
       }
-    }
-  },
-});
+    },
+    disconnect: async (reason: string) => {
+      if (reason !== "client namespace disconnect") {
+        if (
+          _socket &&
+          _socket.data.currentGame.gamePlayers.findIndex(
+            ({ player }) => player.id === _socket.data.user.id,
+          ) > 0
+        ) {
+          await removePlayer(
+            _socket.data.user,
+            _socket,
+            gameServices.playerLeft,
+          );
+          _socket.data.currentGame = (await getGameWithRoundsDatasetPlayers(
+            _socket.data.currentGame.id,
+          ))!;
+        }
+      }
+    },
+  };
+};
 
 const getPublicGame = async (
   game: Awaited<ReturnType<typeof getGameWithRoundsDatasetPlayers>>,

apps/duckguessr/api/types/socketEvents.ts

@@ -8,7 +8,6 @@ export type CurrentGame = NonNullable<
 export type InterServerEvents = Record<string, never>;
 export type SocketGameData = {
   user: player;
-  gameId: number;
   currentRound: round;
   currentRoundEndTimeout: NodeJS.Timeout;
   currentGame: CurrentGame;

apps/duckguessr/app/components/GameStartingSoonModal.vue

@@ -42,7 +42,7 @@ const { firstRoundStartDate } = defineProps<{
   firstRoundStartDate: Date;
 }>();
 
-const timeBeforeFirstRound = ref(null as number | null);
+const timeBeforeFirstRound = ref<number>();
 
 const { t } = useI18n();
 

apps/duckguessr/app/components/Matchmaking.vue

@@ -3,7 +3,7 @@
     v-if="players.length"
     :players="players"
     :game-players-stats="gamePlayersStats!"
-    :game-id="gameId"
+    :game-id="game.id"
     :is-bot-available="isBotAvailableForGame === true"
     @start-match="startMatch"
     @add-bot="addBot"
@@ -15,17 +15,18 @@
 import type { MatchDetails } from "~duckguessr-types/matchDetails";
 import { playerStore } from "~/stores/player";
 import type { player, userMedalPoints } from "~duckguessr-prisma-browser";
+import type { GameFullNoPersoncode } from "~duckguessr-types/game";
 
-const players = ref([] as player[]);
-const gamePlayersStats = ref(null as userMedalPoints[] | null);
-const isBotAvailableForGame = ref(null as boolean | null);
+const players = ref<player[]>([]);
+const gamePlayersStats = ref<userMedalPoints[]>();
+const isBotAvailableForGame = ref<boolean>();
 
-const { gameId } = defineProps<{
-  gameId: number;
+const { game } = defineProps<{
+  game: GameFullNoPersoncode;
 }>();
 
 const { getGameSocketFromId } = inject(duckguessrSocketInjectionKey)!;
-const gameSocket = getGameSocketFromId(gameId);
+const gameSocket = getGameSocketFromId(game.id);
 
 const emit = defineEmits<{
   (e: "start-match"): void;
@@ -59,17 +60,16 @@ watch(
   () => playerStore().playerUser,
   (value) => {
     if (value) {
-      gameSocket.sendGame = () => {
-        gameSocket
-          .joinMatch()
-          .then(({ players, isBotAvailable, playerStats }: MatchDetails) => {
-            isBotAvailableForGame.value = isBotAvailable;
-            gamePlayersStats.value = playerStats;
-            for (const currentPlayer of players) {
-              addPlayer(currentPlayer);
-            }
-          });
-      };
+      gameSocket
+        .joinMatch()
+        .then(({ players, isBotAvailable, playerStats }: MatchDetails) => {
+          debugger;
+          isBotAvailableForGame.value = isBotAvailable;
+          gamePlayersStats.value = playerStats;
+          for (const currentPlayer of players) {
+            addPlayer(currentPlayer);
+          }
+        });
       gameSocket.playerJoined = (player: player) => {
         console.debug(`${player.username} is also ready`);
         addPlayer(player);
@@ -79,7 +79,7 @@ watch(
         removePlayer(player);
       };
       gameSocket.matchStarts = () => {
-        console.debug(`Match starts on game ${gameId}`);
+        console.debug(`Match starts on game ${game.id}`);
         emit("start-match");
       };
     }

apps/duckguessr/app/components/RoundResultModal.stories.ts

@@ -80,7 +80,7 @@ export const LastRound: Story = {
       fullname: "Carl Barks",
       nationalitycountrycode: "us",
     },
-    nextRoundStartDate: null,
+    nextRoundStartDate: undefined,
     hasEverybodyGuessed: false,
   },
 };

apps/duckguessr/app/components/RoundResultModal.vue

@@ -80,7 +80,7 @@ const time = new Date().getTime();
 const initialTimeBeforeNextRound = computed(() =>
   nextRoundStartTime.value ? nextRoundStartTime.value - time : null,
 );
-const timeBeforeNextRound = ref(null as number | null);
+const timeBeforeNextRound = ref<number>();
 
 const emit = defineEmits<{
   (e: "next-round"): void;
@@ -91,15 +91,12 @@ const { t } = useI18n();
 const url = computed(() => getUrl(roundUrl));
 
 const updateTimeBeforeNextRound = () => {
-  timeBeforeNextRound.value =
-    nextRoundStartDate === null
-      ? null
-      : Math.max(
-          0,
-          Math.ceil(
-            (nextRoundStartDate.getTime() - new Date().getTime()) / 1000,
-          ),
-        );
+  timeBeforeNextRound.value = !nextRoundStartDate
+    ? undefined
+    : Math.max(
+        0,
+        Math.ceil((nextRoundStartDate.getTime() - new Date().getTime()) / 1000),
+      );
 };
 
 onMounted(() => {