Refactor server list queries to support offline servers

needs · needs · commit decd7f4c9bca · 2025-02-23T01:16:41.000+01:00
- Update server list pages to query GameServer instead of GameServerState
- Modify server list rendering to handle both online and offline servers
- Add support for displaying offline server information in server lists
- Implement separate row components for online and offline servers
- Update List component to handle undefined labels
diff --git a/apps/frontend/app/all/servers/page.tsx b/apps/frontend/app/all/servers/page.tsx
@@ -16,37 +16,64 @@ export default async function Index({
 }) {
   const { page } = searchParamSchema.parse(searchParams);
 
-  const gameServerStates = await prisma.gameServerState.findMany({
-    orderBy: {
-      numClients: 'desc',
-    },
-    include: {
-      gameServer: true,
-      map: true,
+  const gameServers = await prisma.gameServer.findMany({
+    select: {
+      ip: true,
+      port: true,
+      gameServerState: {
+        select: {
+          name: true,
+          numClients: true,
+          maxClients: true,
+          map: {
+            select: {
+              gameTypeName: true,
+              name: true,
+            },
+          },
+        },
+      },
     },
+    orderBy: [
+      {
+        failureCount: 'asc',
+      },
+      {
+        gameServerState: {
+          maxClients: 'desc',
+        },
+      },
+      {
+        gameServerState: {
+          numClients: 'desc',
+        },
+      },
+      {
+        playTime: 'desc',
+      },
+    ],
     take: 100,
     skip: (page - 1) * 100,
   });
 
   const globalCounts = await getGlobalCounts(redis);
 
-  const servers = gameServerStates
-    .map((gameServerState, index) => (gameServerState.gameServer ? {
-      rank: (page - 1) * 100 + index + 1,
-      name: gameServerState.name,
-      gameTypeName: gameServerState.map.gameTypeName,
-      mapName: gameServerState.map.name,
-      numClients: gameServerState.numClients,
-      maxClients: gameServerState.maxClients,
-      ip: gameServerState.gameServer.ip,
-      port: gameServerState.gameServer.port,
-    } : null))
-    .filter((server) => server !== null);
+  const servers = gameServers.map((gameServer, index) => ({
+    rank: (page - 1) * 100 + index + 1,
+    ip: gameServer.ip,
+    port: gameServer.port,
+    state: gameServer.gameServerState
+      ? {
+          name: gameServer.gameServerState.name,
+          gameTypeName: gameServer.gameServerState.map.gameTypeName,
+          mapName: gameServer.gameServerState.map.name,
+          numClients: gameServer.gameServerState.numClients,
+          maxClients: gameServer.gameServerState.maxClients,
+        }
+      : null,
+  }));
 
   return (
-    <ServerList
-      serverCount={globalCounts.gameServers}
-      servers={servers}
-    />
+    <ServerList serverCount={globalCounts.gameServers} servers={servers} />
   );
 }
diff --git a/apps/frontend/app/gametype/[gameTypeName]/(lists)/servers/page.tsx b/apps/frontend/app/gametype/[gameTypeName]/(lists)/servers/page.tsx
@@ -17,48 +17,56 @@ export default async function Index({
   const { page } = searchParamsSchema.parse(searchParams);
   const { gameTypeName } = paramsSchema.parse(params);
 
-  const gameServerStates = await prisma.gameServerState.findMany({
+  const gameServers = await prisma.gameServer.findMany({
     select: {
-      name: true,
-      numClients: true,
-      maxClients: true,
-      map: {
+      ip: true,
+      port: true,
+      gameServerState: {
         select: {
           name: true,
-          gameTypeName: true,
-        },
-      },
-      gameServer: {
-        select: {
-          ip: true,
-          port: true,
+          numClients: true,
+          maxClients: true,
+          map: {
+            select: {
+              name: true,
+              gameTypeName: true,
+            },
+          },
         },
       },
     },
     where: {
-      map: {
-        gameTypeName: {
-          equals: gameTypeName,
+      gameServerState: {
+        map: {
+          gameTypeName: {
+            equals: gameTypeName,
+          },
         },
       },
     },
     orderBy: [
       {
-        numClients: 'desc',
+        gameServerState: {
+          numClients: 'desc',
+        },
       },
       {
-        maxClients: 'desc',
+        gameServerState: {
+          maxClients: 'desc',
+        },
       },
     ],
     take: 100,
     skip: (page - 1) * 100,
   });
 
-  const serverCount = await prisma.gameServerState.count({
+  const serverCount = await prisma.gameServer.count({
     where: {
-      map: {
-        gameTypeName: {
-          equals: gameTypeName,
+      gameServerState: {
+        map: {
+          gameTypeName: {
+            equals: gameTypeName,
+          },
         },
       },
     },
@@ -67,15 +75,19 @@ export default async function Index({
   return (
     <ServerList
       serverCount={serverCount}
-      servers={gameServerStates.map((gameServerState, index) => ({
+      servers={gameServers.map((gameServer, index) => ({
         rank: (page - 1) * 100 + index + 1,
-        name: gameServerState.name,
-        gameTypeName: gameServerState.map.gameTypeName,
-        mapName: gameServerState.map.name ?? '',
-        numClients: gameServerState.numClients,
-        maxClients: gameServerState.maxClients,
-        ip: gameServerState.gameServer?.ip ?? '',
-        port: gameServerState.gameServer?.port ?? 0,
+        ip: gameServer.ip,
+        port: gameServer.port,
+        state: gameServer.gameServerState
+          ? {
+              name: gameServer.gameServerState.name,
+              gameTypeName: gameServer.gameServerState.map.gameTypeName,
+              mapName: gameServer.gameServerState.map.name,
+              numClients: gameServer.gameServerState.numClients,
+              maxClients: gameServer.gameServerState.maxClients,
+            }
+          : null,
       }))}
     />
   );
diff --git a/apps/frontend/app/gametype/[gameTypeName]/map/[mapName]/servers/page.tsx b/apps/frontend/app/gametype/[gameTypeName]/map/[mapName]/servers/page.tsx
@@ -17,54 +17,62 @@ export default async function Index({
   const { page } = searchParamsSchema.parse(searchParams);
   const { gameTypeName, mapName } = paramsSchema.parse(params);
 
-  const gameServerStates = await prisma.gameServerState.findMany({
+  const gameServers = await prisma.gameServer.findMany({
     select: {
-      name: true,
-      numClients: true,
-      maxClients: true,
-      map: {
+      ip: true,
+      port: true,
+      gameServerState: {
         select: {
           name: true,
-          gameTypeName: true,
-        },
-      },
-      gameServer: {
-        select: {
-          ip: true,
-          port: true,
+          numClients: true,
+          maxClients: true,
+          map: {
+            select: {
+              name: true,
+              gameTypeName: true,
+            },
+          },
         },
       },
     },
     where: {
-      map: {
-        name: {
-          equals: mapName,
-        },
-        gameTypeName: {
-          equals: gameTypeName,
+      gameServerState: {
+        map: {
+          name: {
+            equals: mapName,
+          },
+          gameTypeName: {
+            equals: gameTypeName,
+          },
         },
       },
     },
     orderBy: [
       {
-        numClients: 'desc',
+        gameServerState: {
+          numClients: 'desc',
+        },
       },
       {
-        maxClients: 'desc',
+        gameServerState: {
+          maxClients: 'desc',
+        },
       },
     ],
     take: 100,
     skip: (page - 1) * 100,
   });
 
-  const serverCount = await prisma.gameServerState.count({
+  const serverCount = await prisma.gameServer.count({
     where: {
-      map: {
-        name: {
-          equals: mapName,
-        },
-        gameTypeName: {
-          equals: gameTypeName,
+      gameServerState: {
+        map: {
+          name: {
+            equals: mapName,
+          },
+          gameTypeName: {
+            equals: gameTypeName,
+          },
         },
       },
     },
@@ -73,15 +81,19 @@ export default async function Index({
   return (
     <ServerList
       serverCount={serverCount}
-      servers={gameServerStates.map((gameServerState, index) => ({
+      servers={gameServers.map((gameServer, index) => ({
         rank: (page - 1) * 100 + index + 1,
-        name: gameServerState.name,
-        gameTypeName: gameServerState.map.gameTypeName,
-        mapName: gameServerState.map.name ?? '',
-        numClients: gameServerState.numClients,
-        maxClients: gameServerState.maxClients,
-        ip: gameServerState.gameServer?.ip ?? '',
-        port: gameServerState.gameServer?.port ?? 0,
+        ip: gameServer.ip,
+        port: gameServer.port,
+        state: gameServer.gameServerState
+          ? {
+              name: gameServer.gameServerState.name,
+              gameTypeName: gameServer.gameServerState.map.gameTypeName,
+              mapName: gameServer.gameServerState.map.name,
+              numClients: gameServer.gameServerState.numClients,
+              maxClients: gameServer.gameServerState.maxClients,
+            }
+          : null,
       }))}
     />
   );
diff --git a/apps/frontend/app/search/servers/page.tsx b/apps/frontend/app/search/servers/page.tsx
@@ -33,13 +33,15 @@ export default async function Index({
         serverCount={gameServers.length}
         servers={gameServers.map((gameServer, index) => ({
           rank: index + 1,
-          name: gameServer.name,
-          gameTypeName: gameServer.gameTypeName,
-          mapName: gameServer.mapName,
           ip: gameServer.ip,
           port: gameServer.port,
-          numClients: gameServer.numClients,
-          maxClients: gameServer.maxClients,
+          state: {
+            name: gameServer.name,
+            gameTypeName: gameServer.gameTypeName,
+            mapName: gameServer.mapName,
+            numClients: gameServer.numClients,
+            maxClients: gameServer.maxClients,
+          },
         }))}
       />
     </LayoutTabs>
diff --git a/apps/frontend/app/server/[ip]/[port]/page.tsx b/apps/frontend/app/server/[ip]/[port]/page.tsx
@@ -8,6 +8,8 @@ import { searchParamPageSchema } from '../../../../utils/page';
 import prisma from '../../../../utils/prisma';
 import { encodeString } from '../../../../utils/encoding';
 import { formatPlayTime } from '../../../../utils/format';
+import { GameServer } from '@prisma/client';
+import { formatDuration, intervalToDuration } from 'date-fns';
 
 export const metadata = {
   title: 'Server',
@@ -23,6 +25,31 @@ function ipAndPort(ip: string, port: number) {
   }
 }
 
+function OfflineServer({ gameServer }: { gameServer: GameServer }) {
+  return (
+    <main className="flex flex-col gap-8 py-12">
+      <header className="flex flex-row px-20 gap-8">
+        <section className="flex flex-col gap-2 grow">
+          <h1 className="text-2xl font-bold">
+            {ipAndPort(gameServer.ip, gameServer.port)}
+          </h1>
+          <div className="flex flex-row divide-x">
+            <span className="pr-4">
+              Offline for{' '}
+              {formatDuration(
+                intervalToDuration({
+                  start: gameServer.lastSeenAt,
+                  end: new Date(),
+                })
+              )}
+            </span>
+          </div>
+        </section>
+      </header>
+    </main>
+  );
+}
+
 export default async function Index({
   params,
   searchParams,
@@ -67,15 +94,21 @@ export default async function Index({
     },
   });
 
-  if (gameServer === null || gameServer.gameServerState === null) {
+  if (gameServer === null) {
     return notFound();
   }
 
+  if (gameServer.gameServerState === null) {
+    return <OfflineServer gameServer={gameServer} />;
+  }
+
   return (
     <main className="flex flex-col gap-8 py-12">
       <header className="flex flex-row px-20 gap-8">
         <section className="flex flex-col gap-2 grow">
-          <h1 className="text-2xl font-bold">{gameServer.gameServerState.name}</h1>
+          <h1 className="text-2xl font-bold">
+            {gameServer.gameServerState.name}
+          </h1>
           <div className="flex flex-row divide-x">
             <span className="pr-4">
               <Link
diff --git a/apps/frontend/components/List.tsx b/apps/frontend/components/List.tsx
diff --git a/apps/frontend/components/ServerList.tsx b/apps/frontend/components/ServerList.tsx
