rt: replace custom router

acmcsufoss · May 28, 2024 · 9cdf651 · 9cdf651 · deno-deploy · May 28, 2024
1 parent b0706cc
commit 9cdf651
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 305 deletions.
diff --git a/deno.jsonc b/deno.jsonc
@@ -9,9 +9,7 @@
     "ngrok": "ngrok http 8080",
     "dnt": "deno run -A tasks/dnt/main.ts"
   },
-  "imports": {
-    "lc-dailies/": "./"
-  },
+  "imports": { "@fartlabs/rt": "jsr:@fartlabs/rt@^0.0.3", "lc-dailies/": "./" },
   "fmt": {
     "exclude": ["./npm"]
   },

diff --git a/deno.lock b/deno.lock
diff --git a/lib/api/api.ts b/lib/api/api.ts
@@ -1,13 +1,12 @@
+import { createRouter } from "@fartlabs/rt";
 import * as discord from "lc-dailies/lib/discord/mod.ts";
 import * as leaderboard from "lc-dailies/lib/leaderboard/mod.ts";
-import * as router from "lc-dailies/lib/router/mod.ts";
 import * as discord_app from "./discord_app/mod.ts";
-import {
-  makeSeasonGetHandler,
-  makeSeasonsGetHandler,
-  makeSeasonTxtGetHandler,
-} from "./seasons.ts";
+import type { Season } from "./types.ts";
 
+/**
+ * APIRouterOptions are the options for the API router.
+ */
 export interface APIRouterOptions {
   discordApplicationID: string;
   discordPublicKey: string;
@@ -20,42 +19,69 @@ export interface APIRouterOptions {
  * LC-Dailies API.
  */
 export function makeAPIRouter(options: APIRouterOptions) {
-  return new router.Router()
+  return createRouter()
     .post(
-      new URLPattern({ pathname: "/" }),
-      discord_app.withErrorResponse(
-        discord_app.makeDiscordAppHandler(
-          options.leaderboardClient,
-          options.discordPublicKey,
-          options.discordChannelID,
-        ),
-      ),
+      "/",
+      (ctx) =>
+        discord_app.withErrorResponse(
+          discord_app.makeDiscordAppHandler(
+            options.leaderboardClient,
+            options.discordPublicKey,
+            options.discordChannelID,
+          ),
+        )(ctx.request),
     )
     .get(
-      new URLPattern({ pathname: "/invite" }),
-      () =>
-        Promise.resolve(
-          Response.redirect(makeInviteURL(options.discordApplicationID)),
-        ),
+      "/invite",
+      () => Response.redirect(makeInviteURL(options.discordApplicationID)),
     )
     .get(
-      new URLPattern({ pathname: "/source" }),
-      () =>
-        Promise.resolve(
-          Response.redirect("https://github.com/acmcsufoss/lc-dailies"),
-        ),
+      "/source",
+      () => Response.redirect("https://github.com/acmcsufoss/lc-dailies"),
     )
     .get(
-      new URLPattern({ pathname: "/seasons" }),
-      withCORS(makeSeasonsGetHandler(options.leaderboardClient)),
+      "/seasons",
+      async () => {
+        const seasons = await options.leaderboardClient.listSeasons();
+        return withCORS(new Response(JSON.stringify(seasons)));
+      },
     )
-    .get(
-      new URLPattern({ pathname: "/seasons/:season_id.txt" }),
-      withCORS(makeSeasonTxtGetHandler(options.leaderboardClient)),
+    .get<"season_id">(
+      "/seasons/:season_id.txt",
+      async (ctx) => {
+        const seasonID = ctx.params["season_id"];
+        if (!seasonID) {
+          return new Response("Missing season ID", { status: 400 });
+        }
+
+        const season = await getSeasonByIDOrLatest(
+          options.leaderboardClient,
+          seasonID,
+        );
+        if (!season) {
+          return new Response("Season not found", { status: 404 });
+        }
+
+        const text = leaderboard.formatScores(season);
+        return withCORS(
+          new Response(text, { headers: { "Content-Type": "text/plain" } }),
+        );
+      },
     )
-    .get(
-      new URLPattern({ pathname: "/seasons/:season_id" }),
-      withCORS(makeSeasonGetHandler(options.leaderboardClient)),
+    .get<"season_id">(
+      "/seasons",
+      async (ctx) => {
+        const seasonID = ctx.params["season_id"];
+        if (!seasonID) {
+          return new Response("Missing season ID", { status: 400 });
+        }
+
+        const season = await getSeasonByIDOrLatest(
+          options.leaderboardClient,
+          seasonID,
+        );
+        return withCORS(new Response(JSON.stringify(season)));
+      },
     );
 }
 
@@ -103,19 +129,38 @@ function makeInviteURL(applicationID: string) {
 }
 
 /**
- * withCORS wraps a handler with common CORS headers.
+ * withCORS wraps a Response with common CORS headers.
  */
-function withCORS(
-  handle: router.RouterHandler["handle"],
-): router.RouterHandler["handle"] {
-  return async function (request: router.RouterRequest) {
-    const response = await handle(request);
-    response.headers.set("Access-Control-Allow-Origin", "*");
-    response.headers.set("Access-Control-Allow-Methods", "GET, POST");
-    response.headers.set(
-      "Access-Control-Allow-Headers",
-      "Content-Type, Authorization",
+function withCORS(response: Response): Response {
+  response.headers.set("Access-Control-Allow-Origin", "*");
+  response.headers.set("Access-Control-Allow-Methods", "GET, POST");
+  response.headers.set(
+    "Access-Control-Allow-Headers",
+    "Content-Type, Authorization",
+  );
+
+  return response;
+}
+
+/**
+ * getSeasonByIDOrLatest gets a season by ID or the latest season.
+ */
+async function getSeasonByIDOrLatest(
+  leaderboardClient: leaderboard.LeaderboardClient,
+  seasonID: string | undefined,
+): Promise<Season | null> {
+  const season = !seasonID || seasonID === "latest"
+    ? await leaderboardClient.getLatestSeason()
+    : await leaderboardClient.getSeason(seasonID);
+  if (season && !season.scores) {
+    season.scores = await leaderboard.calculateScores(
+      leaderboard.makeDefaultCalculateScoresOptions(
+        season.players,
+        season.questions,
+        season.submissions,
+      ),
     );
-    return response;
-  };
+  }
+
+  return season;
 }
diff --git a/lib/api/discord_app/app.ts b/lib/api/discord_app/app.ts
@@ -11,7 +11,6 @@ import {
   MessageFlags,
   Utils,
 } from "lc-dailies/deps.ts";
-import * as router from "lc-dailies/lib/router/mod.ts";
 import * as discord from "lc-dailies/lib/discord/mod.ts";
 import * as leaderboard from "lc-dailies/lib/leaderboard/mod.ts";
 import {
@@ -49,11 +48,11 @@ export function makeDiscordAppHandler(
   discordChannelID: string,
 ) {
   return async function handleDiscordApp(
-    request: router.RouterRequest,
+    request: Request,
   ): Promise<Response> {
     // Verify the request is coming from Discord.
     const { error, body } = await discord.verify(
-      request.request,
+      request,
       discordPublicKey,
     );
     if (error !== null) {
@@ -180,11 +179,9 @@ async function handleSyncSubcommand(
  * and return a response using the error message.
  */
 export function withErrorResponse(
-  oldHandle: router.RouterHandler["handle"],
-): router.RouterHandler["handle"] {
-  return async function handle(
-    request: router.RouterRequest,
-  ): Promise<Response> {
+  oldHandle: (request: Request) => Promise<Response>,
+): (request: Request) => Promise<Response> {
+  return async function handle(request: Request): Promise<Response> {
     return await oldHandle(request)
       .catch((error) => {
         if (!(error instanceof Error)) {

diff --git a/lib/api/seasons.ts b/lib/api/seasons.ts
diff --git a/lib/router/mod.ts b/lib/router/mod.ts