refactored match making logic to wss

Author: johnpgr

packages/app/.eslintrc.json

@@ -7,7 +7,7 @@
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "project": "./packages/app/tsconfig.json"
+    "project": "./tsconfig.json"
   },
 
   "rules": {

packages/app/src/app/dashboard/_components/snippetsTable.tsx

@@ -146,6 +146,7 @@ export function SnippetsTable({
         {
           id: "language",
           title: "Language",
+          //@ts-expect-error it's ok
           options: snippetLanguages,
         },
       ]}

packages/app/src/app/race/(play)/friends/page.tsx

@@ -1,14 +1,13 @@
 "use server";
-import { prisma } from "@/lib/prisma";
-import type { Race } from "@prisma/client";
-import { siteConfig } from "@/config/site";
-import { Prisma } from "@prisma/client";
-import { Snippet, User } from "@prisma/client";
+//please don't alias these paths, it will break wss
+import { type Language } from "../../../config/languages";
+import { prisma } from "../../../lib/prisma";
+import type { Snippet } from "@prisma/client";
 
 export async function getRandomSnippet(input: {
-  language: string;
+  language: Language;
   reportedSnippets?: string[];
-}) {
+}): Promise<Snippet> {
   const itemCount = await prisma.snippet.count({
     where: {
       onReview: false,
@@ -40,144 +39,12 @@ export async function getRandomSnippet(input: {
   return snippet;
 }
 
-export async function getSnippetById(snippetId: string) {
+export async function getSnippetById(
+  snippetId: string,
+): Promise<Snippet | null> {
   return await prisma.snippet.findUnique({
     where: {
       id: snippetId,
     },
   });
 }
-
-export async function raceMatchMaking(
-  snippet: Snippet,
-  userId?: User["id"],
-): Promise<Race> {
-  if (userId) {
-    // For logged in user, we choose race if:
-    // 1. its snippet is the same
-    // 2. hasn't started or ended yet
-    // 3. all participants are logged in user
-    // 4. race's participants has not reached maxiumun capacity
-    // TODO: 5. participants stats most suitable to current user
-
-    let availableRace = await prisma.race.findMany({
-      where: {
-        snippet: {
-          language: snippet.language,
-        },
-        AND: [{ startedAt: null }, { endedAt: null }],
-        participants: {
-          every: {
-            user: {
-              isNot: null,
-            },
-          },
-        },
-      },
-      include: {
-        participants: true,
-        _count: {
-          select: {
-            participants: true,
-          },
-        },
-      },
-    });
-
-    // filter out full race
-    availableRace = availableRace.filter(
-      (race) =>
-        race._count.participants <
-        siteConfig.multiplayer.maxParticipantsPerRace,
-    );
-
-    // TODO: sort races based on participant stats most suitable to current user
-    // for now we pick first one, if there isn't any create one instead
-    const race =
-      availableRace.length > 0
-        ? availableRace[0]
-        : await prisma.race.create({
-            data: {
-              snippet: {
-                connect: {
-                  id: snippet.id,
-                },
-              },
-            },
-          });
-    console.log("Picked race", race);
-    return race;
-  } else {
-    // For guest user, we choose race if:
-    // 1. its snippet is the same
-    // 2. hasn't started or ended yet
-    // 3. all participants are guest user
-    // 4. race's participants has not reached maxiumun capacity
-
-    let availableRace = await prisma.race.findMany({
-      where: {
-        snippet: {
-          language: snippet.language,
-        },
-        AND: [{ startedAt: null }, { endedAt: null }],
-        participants: {
-          every: {
-            user: null,
-          },
-        },
-      },
-      include: {
-        _count: {
-          select: {
-            participants: true,
-          },
-        },
-      },
-    });
-
-    // filter out full race
-    availableRace = availableRace.filter(
-      (race) =>
-        race._count.participants <
-        siteConfig.multiplayer.maxParticipantsPerRace,
-    );
-
-    // pick first one, if there isn't any create one instead
-    const race =
-      availableRace.length > 0
-        ? availableRace[0]
-        : await prisma.race.create({
-            data: {
-              snippet: {
-                connect: {
-                  id: snippet.id,
-                },
-              },
-            },
-          });
-    console.log("Picked race", race);
-    return race;
-  }
-}
-
-export async function createRaceParticipant(
-  raceToJoin: Prisma.RaceGetPayload<Record<string, never>>,
-  user?: any,
-) {
-  return await prisma.raceParticipant.create({
-    data: {
-      user: user
-        ? {
-            connect: {
-              id: user.id,
-            },
-          }
-        : undefined,
-      Race: {
-        connect: {
-          id: raceToJoin?.id,
-        },
-      },
-    },
-  });
-}

packages/app/src/app/race/(play)/loaders.ts

@@ -1,9 +1,7 @@
 import { getCurrentUser } from "@/lib/session";
-import NoSnippet from "../../_components/no-snippet";
-import Race from "../../_components/race/race-multiplayer";
 import { redirect } from "next/navigation";
-import { raceMatchMaking, createRaceParticipant } from "../loaders";
-import { getRandomSnippet } from "../loaders";
+import Race from "../../_components/race/race-multiplayer";
+import { Language, isValidLanguage } from "@/config/languages";
 
 export default async function MultiplayerRacePage({
   searchParams,
@@ -15,30 +13,17 @@ export default async function MultiplayerRacePage({
   if (!searchParams.lang) {
     redirect("/race");
   }
+  const isValidLang = isValidLanguage(searchParams.lang);
 
-  const snippet = await getRandomSnippet({ language: searchParams.lang });
-  if (!snippet) {
-    return (
-      <main className="flex flex-col items-center justify-between py-10 lg:p-24">
-        <NoSnippet
-          message={"Looks like there is no snippet available yet. Create one?"}
-          language={searchParams.lang}
-        />
-      </main>
-    );
+  if (!isValidLang) {
+    redirect("/race");
   }
 
   const user = await getCurrentUser();
-  const raceToJoin = await raceMatchMaking(snippet, user?.id);
-  const participant = await createRaceParticipant(raceToJoin, user);
+
   return (
     <main className="flex flex-col items-center justify-between py-10 lg:p-24">
-      <Race
-        snippet={snippet}
-        user={user}
-        raceId={raceToJoin?.id}
-        participantId={participant.id}
-      />
+      <Race user={user} language={searchParams.lang as Language} />
     </main>
   );
 }

packages/app/src/app/race/(play)/multiplayer/page.tsx

@@ -4,6 +4,8 @@ import NoSnippet from "../../_components/no-snippet";
 import Race from "../../_components/race/race-multiplayer";
 import { getSnippetById } from "../loaders";
 import { CacheBuster } from "@/components/cache-buster";
+import { Language, isValidLanguage } from "@/config/languages";
+import { redirect } from "next/navigation";
 
 async function getSearchParamSnippet(snippetId: string | string[]) {
   if (typeof snippetId === "string") {
@@ -21,17 +23,22 @@ export default async function PracticeRacePage({
   };
 }) {
   const user = await getCurrentUser();
+  const language = searchParams.lang as Language;
+  const isValidLang = isValidLanguage(language);
+  if (!isValidLang) {
+    redirect("/race");
+  }
+
   const snippet =
     (await getSearchParamSnippet(searchParams.snippetId)) ??
-    (await getRandomSnippet({ language: searchParams.lang }));
-  const language = searchParams.lang;
+    (await getRandomSnippet({ language: language }));
 
   return (
     <main>
       <CacheBuster />
       {snippet && (
         <div className="pt-8">
-          <Race snippet={snippet} user={user} />
+          <Race practiceSnippet={snippet} language={language} user={user} />
         </div>
       )}
       {!snippet && (