refactor: remove old cache utility and update routes to use new cache implementation

Author: luxass

src/cache.ts

@@ -1,10 +1,15 @@
 import type { HonoContext } from "../types";
 import { OpenAPIHono } from "@hono/zod-openapi";
-import { cache, createError } from "../utils";
+import { cache } from "hono/cache";
+import { createError } from "../utils";
 import { GITHUB_EMOJIS_ROUTE } from "./gateway_github.openapi";
 
 export const GATEWAY_GITHUB_ROUTER = new OpenAPIHono<HonoContext>().basePath("/api/gateway/github");
 
+GATEWAY_GITHUB_ROUTER.get("*", cache({
+  cacheName: "github-emojis",
+  cacheControl: "max-age=3600, immutable",
+}));
 GATEWAY_GITHUB_ROUTER.openapi(GITHUB_EMOJIS_ROUTE, async (c) => {
   const response = await fetch("https://api.github.com/emojis", {
     headers: {
@@ -24,7 +29,5 @@ GATEWAY_GITHUB_ROUTER.openapi(GITHUB_EMOJIS_ROUTE, async (c) => {
 
   const emojis = await response.json<Record<string, string>>();
 
-  cache(c, 3600, true);
-
   return c.json(emojis, 200);
 });

src/routes/gateway_github.ts

@@ -1,10 +1,14 @@
 import type { HonoContext } from "../types";
 import { Hono } from "hono";
-import { cache } from "../utils";
+import { cache } from "hono/cache";
 
 export const RANDOM_EMOJI_ROUTER = new Hono<HonoContext>();
 
+RANDOM_EMOJI_ROUTER.get("/random-emoji.png", cache({
+  cacheName: "random-emoji",
+  cacheControl: "max-age=3600, immutable",
+}));
+
 RANDOM_EMOJI_ROUTER.get("/random-emoji.png", async (c) => {
-  cache(c, 60 * 60);
   return c.redirect("https://image.luxass.dev/api/image/emoji");
 });

src/routes/random-emoji.ts

@@ -1,15 +1,21 @@
 import type { HonoContext } from "../types";
 import { OpenAPIHono, z } from "@hono/zod-openapi";
+import { cache } from "hono/cache";
 import { HTTPException } from "hono/http-exception";
 import { versionMiddleware } from "../middlewares/version";
 import { EmojiCategorySchema } from "../schemas";
-import { cache, createError } from "../utils";
+import { createError } from "../utils";
 import { ALL_CATEGORIES_ROUTE, GET_CATEGORY_ROUTE } from "./v1_categories.openapi";
 
 export const V1_CATEGORIES_ROUTER = new OpenAPIHono<HonoContext>().basePath("/api/v1/categories/:version");
 
 V1_CATEGORIES_ROUTER.use(versionMiddleware);
 
+V1_CATEGORIES_ROUTER.get("*", cache({
+  cacheName: "v1-categories",
+  cacheControl: "max-age=3600, immutable",
+}));
+
 V1_CATEGORIES_ROUTER.openapi(ALL_CATEGORIES_ROUTE, async (c) => {
   const version = c.req.param("version");
 
@@ -31,8 +37,6 @@ V1_CATEGORIES_ROUTER.openapi(ALL_CATEGORIES_ROUTE, async (c) => {
 
   const categories = result.data;
 
-  cache(c, 3600, true);
-
   return c.json(
     categories,
     200,
@@ -61,8 +65,6 @@ V1_CATEGORIES_ROUTER.openapi(GET_CATEGORY_ROUTE, async (c) => {
 
   const category = result.data.find((c) => c.slug === categorySlug);
 
-  cache(c, 3600, true);
-
   return c.json(
     category,
     200,

src/routes/v1_categories.ts

@@ -32,15 +32,3 @@ export async function getAvailableVersions(): Promise<EmojiLock["versions"]> {
 
   return result.data.versions;
 }
-
-export function cache<TCtx extends Context>(ctx: TCtx, age: number, immutable = false) {
-  if (age === -1) {
-    ctx.header("Expires", "0");
-    ctx.header("Pragma", "no-cache");
-    ctx.header("Cache-Control", "no-cache, no-store, must-revalidate");
-    return;
-  }
-
-  ctx.header("Expires", new Date(Date.now() + age * 1000).toUTCString());
-  ctx.header("Cache-Control", ["public", `max-age=${age}`, immutable ? "immutable" : null].filter((x) => !!x).join(", "));
-};