Align dev server with CF Pages behavior

website/components/DashboardRoomList.tsx

@@ -38,13 +38,11 @@ export default function DashboardRoomsList() {
       <div className="flex flex-col">
         <CreateRoomCard />
         {rooms ? (
-          rooms
-            .sort((a, b) => moment(b.updatedAt).diff(moment(a.updatedAt)))
-            .map((room) => (
-              <div key={room.id} className="flex flex-row">
-                <WaitingRoomDashboardCard room={room} />
-              </div>
-            ))
+          rooms.map((room) => (
+            <div key={room.id} className="flex flex-row">
+              <WaitingRoomDashboardCard room={room} />
+            </div>
+          ))
         ) : (
           <>
             <Spinner />

website/components/WaitingRoomDashboardCard.tsx

@@ -34,7 +34,7 @@ export default function WaitingRoomDashboardCard({
     initialData: { urlReady: false },
     queryFn: async () => {
       const roomUrl = `/room/${room.id}`;
-      const response = await fetch(roomUrl);
+      const response = await fetch(roomUrl, { method: "HEAD" });
       if (!response.ok) {
         throw new Error("Url not live yet");
       }

website/pages/room/@id/index.page.server.tsx

@@ -13,6 +13,9 @@ async function prerender() {
 async function onBeforeRender(pageContext: PageContextServer) {
   const id = pageContext.routeParams.id;
   const room = await findRoomById(id);
+  if (!room) {
+    throw render(404, "Room not found");
+  }
   if (!room.published) {
     throw render(403, "Room not published");
   }

website/utils/queries.ts

@@ -1,49 +1,35 @@
 import moment from "moment/moment";
 import { prisma } from "../server/db";
 
-const queryCache = new Map();
+const roomFilter = {
+  published: true,
+  AND: {
+    closesAt: {
+      gt: moment().subtract(1, "day").toDate(),
+    },
+  },
+};
 
 export async function findPublishedRooms() {
-  const rooms = await prisma.waitingRoom.findMany({
-    where: {
-      published: true,
-      AND: {
-        closesAt: {
-          gt: moment().subtract(1, "day").toDate(),
-        },
-      },
-    },
+  return prisma.waitingRoom.findMany({
+    where: roomFilter,
     include: {
       owner: true,
     },
     orderBy: {
       closesAt: "asc",
     },
   });
-
-  rooms.forEach((room) => {
-    queryCache.set(room.id, room);
-  });
-
-  return rooms;
 }
 
 export async function findRoomById(id: string) {
-  async function getRoomById() {
-    return prisma.waitingRoom.findUniqueOrThrow({
-      where: {
-        id,
-      },
-      include: {
-        owner: true,
-      },
-    });
-  }
-
-  if (queryCache.has(id)) {
-    return queryCache.get(id) as Awaited<ReturnType<typeof getRoomById>>;
-  }
-  const room = await getRoomById();
-  queryCache.set(room.id, room);
-  return room;
+  return prisma.waitingRoom.findFirst({
+    where: {
+      id,
+      ...roomFilter,
+    },
+    include: {
+      owner: true,
+    },
+  });
 }