Merge pull request #21 from mojisdev/improve-version-redirect

improve version redirect

Author: luxass

package.json

@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@hono/zod-openapi": "^0.19.2",
-    "@mojis/internal-utils": "^0.0.5",
+    "@mojis/internal-utils": "^0.0.6",
     "@scalar/hono-api-reference": "^0.7.2",
     "hono": "^4.7.5",
     "zod": "^3.24.2"
@@ -29,7 +29,7 @@
     "@cloudflare/vitest-pool-workers": "^0.8.3",
     "@luxass/eslint-config": "^4.17.1",
     "@stoplight/spectral-cli": "^6.14.3",
-    "eslint": "^9.22.0",
+    "eslint": "^9.23.0",
     "eslint-plugin-format": "^1.0.1",
     "nanotar": "^0.2.0",
     "tsx": "^4.19.3",

pnpm-lock.yaml

@@ -9,7 +9,7 @@ const app = new Hono<{
 }>();
 
 app.post(
-  "/upload",
+  "/setup",
   async (c) => {
     const body = await c.req.parseBody();
 
@@ -51,6 +51,21 @@ app.post(
       promises.push(c.env.EMOJI_DATA.put(normalizedEntryName, entry.text));
     }
 
+    // fetch and save the emojis.lock file
+    const lockResponse = await fetch("https://raw.githubusercontent.com/mojisdev/emoji-data/refs/heads/main/emojis.lock", {
+      headers: {
+        "User-Agent": "luxass - (api.mojis.dev)",
+      },
+    });
+
+    if (!lockResponse.ok) {
+      throw new HTTPException(500, {
+        message: "Failed to fetch emojis.lock file",
+      });
+    }
+    const lockData = await lockResponse.json();
+    promises.push(c.env.EMOJI_DATA.put("versions.json", JSON.stringify(lockData)));
+
     try {
       await Promise.all(promises);
       return c.json({

scripts/setup-dev/setup-worker.ts

@@ -18,7 +18,7 @@ async function run() {
   formData.append("file", blob, "emoji-data.tar.gz");
 
   console.log("sending request to worker");
-  const res = await worker.fetch("https://api.mojis.dev/upload", {
+  const res = await worker.fetch("https://api.mojis.dev/setup", {
     method: "POST",
     // @ts-expect-error hmmm
     body: formData,

scripts/setup-dev/setup.ts

@@ -1,5 +1,6 @@
-import type { ApiError, HonoContext } from "./types";
+import type { ApiError, HonoEnv } from "./types";
 import { OpenAPIHono } from "@hono/zod-openapi";
+import { getAllEmojiVersions } from "@mojis/internal-utils/versions";
 import { apiReference } from "@scalar/hono-api-reference";
 import { env } from "hono/adapter";
 import { HTTPException } from "hono/http-exception";
@@ -9,7 +10,7 @@ import { RANDOM_EMOJI_ROUTER } from "./routes/random-emoji";
 import { V1_CATEGORIES_ROUTER } from "./routes/v1_categories";
 import { V1_VERSIONS_ROUTER } from "./routes/v1_versions";
 
-const app = new OpenAPIHono<HonoContext>();
+const app = new OpenAPIHono<HonoEnv>();
 
 app.route("/", V1_VERSIONS_ROUTER);
 app.route("/", V1_CATEGORIES_ROUTER);
@@ -101,4 +102,23 @@ app.notFound(async (c) => {
   } satisfies ApiError, 404);
 });
 
-export default app;
+export default {
+  fetch: app.fetch,
+  scheduled: async (_, env) => {
+    const versions = await getAllEmojiVersions();
+
+    const firstNonDraftVersion = versions.find((v) => !v.draft);
+
+    if (firstNonDraftVersion == null) {
+      throw new Error("no non-draft version found");
+    }
+
+    await env.EMOJI_DATA.put(`versions.json`, JSON.stringify({
+      latest_version: firstNonDraftVersion.emoji_version,
+      versions,
+    }));
+
+    // eslint-disable-next-line no-console
+    console.log("cron processed");
+  },
+} satisfies ExportedHandler<HonoEnv["Bindings"]>;

src/index.ts

@@ -1,35 +1,53 @@
+import type { Context } from "hono";
+import type { HonoEnv } from "../types";
 import { createMiddleware } from "hono/factory";
-import { createError, getAvailableVersions } from "../utils";
+import { createError } from "../utils";
 
 const DEFAULT_FALLBACK_VERSION = "15.1";
 
-export const versionMiddleware = createMiddleware(async (c, next) => {
+function redirectLatest(c: Context, path: string, latestVersion: string | null) {
+  return c.redirect(path.replace("latest", latestVersion ?? DEFAULT_FALLBACK_VERSION));
+}
+
+export const versionMiddleware = createMiddleware<HonoEnv>(async (c, next) => {
   const version = c.req.param("version");
   const fullPath = c.req.path;
 
   if (version == null) {
     return createError(c, 400, "missing version");
   }
 
-  // TODO(@luxass): cache the available versions for x amount of time.
-  const availableVersions = await getAvailableVersions();
+  try {
+    const res = await c.env.EMOJI_DATA.get("versions.json");
 
-  if (version !== "latest" && !availableVersions.some((v) => v.emoji_version === version)) {
-    return createError(c, 404, "version not found");
-  }
+    if (res == null) {
+      return await next();
+    }
+
+    const payload = await res.json<{
+      latest_version: string;
+      versions: {
+        emoji_version: string;
+        unicode_version: string;
+        draft: boolean;
+      }[];
+    }>();
 
-  if (version === "latest") {
-    // redirect to the latest version, that isn't a draft.
-    const latestVersion = availableVersions.find((v) => !v.draft);
+    const versions = payload.versions;
+    const latestVersion = payload.latest_version;
 
-    if (latestVersion == null) {
-      return createError(c, 404, "no versions available");
+    if (version !== "latest" && !versions.some((v) => v.emoji_version === version)) {
+      return createError(c, 404, "version not found");
     }
 
-    const path = fullPath.replace("latest", latestVersion.emoji_version ?? DEFAULT_FALLBACK_VERSION);
+    if (version === "latest") {
+      return redirectLatest(c, fullPath, latestVersion);
+    }
 
-    return c.redirect(path);
-  }
+    return await next();
+  } catch (err) {
+    console.error(err);
 
-  await next();
+    return redirectLatest(c, fullPath, null);
+  }
 });

src/middlewares/version.ts

@@ -1,10 +1,10 @@
-import type { HonoContext } from "../types";
+import type { HonoEnv } from "../types";
 import { OpenAPIHono } from "@hono/zod-openapi";
 import { cache } from "../middlewares/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");
+export const GATEWAY_GITHUB_ROUTER = new OpenAPIHono<HonoEnv>().basePath("/api/gateway/github");
 
 GATEWAY_GITHUB_ROUTER.get("*", cache({
   cacheName: "github-emojis",

src/routes/gateway_github.ts

@@ -1,8 +1,8 @@
-import type { HonoContext } from "../types";
+import type { HonoEnv } from "../types";
 import { Hono } from "hono";
 import { cache } from "../middlewares/cache";
 
-export const RANDOM_EMOJI_ROUTER = new Hono<HonoContext>();
+export const RANDOM_EMOJI_ROUTER = new Hono<HonoEnv>();
 
 RANDOM_EMOJI_ROUTER.get(
   "/random-emoji.png",

src/routes/random-emoji.ts

@@ -1,4 +1,4 @@
-import type { HonoContext } from "../types";
+import type { HonoEnv } from "../types";
 import { OpenAPIHono, z } from "@hono/zod-openapi";
 import { HTTPException } from "hono/http-exception";
 import { cache } from "../middlewares/cache";
@@ -7,7 +7,7 @@ import { EmojiCategorySchema } from "../schemas";
 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");
+export const V1_CATEGORIES_ROUTER = new OpenAPIHono<HonoEnv>().basePath("/api/v1/categories/:version");
 
 V1_CATEGORIES_ROUTER.use(versionMiddleware);
 

src/routes/v1_categories.ts

@@ -1,10 +1,10 @@
-import type { HonoContext } from "../types";
+import type { HonoEnv } from "../types";
 import { OpenAPIHono } from "@hono/zod-openapi";
 import { cache } from "../middlewares/cache";
 import { createError, getAvailableVersions } from "../utils";
 import { ALL_EMOJI_VERSIONS_ROUTE, DRAFT_EMOJI_VERSIONS_ROUTE, LATEST_EMOJI_VERSIONS_ROUTE } from "./v1_versions.openapi";
 
-export const V1_VERSIONS_ROUTER = new OpenAPIHono<HonoContext>().basePath("/api/v1/versions");
+export const V1_VERSIONS_ROUTER = new OpenAPIHono<HonoEnv>().basePath("/api/v1/versions");
 
 V1_VERSIONS_ROUTER.get("*", cache({
   cacheName: "v1-versions",

src/routes/v1_versions.ts

@@ -1,12 +1,10 @@
 import type { z } from "zod";
 import type { ApiErrorSchema, EMOJI_LOCK_SCHEMA, EmojiCategorySchema, EmojiVersionSchema } from "./schemas";
 
-export interface HonoContext {
+export interface HonoEnv {
   Bindings: CloudflareBindings;
 }
 
-export type HonoBindings = HonoContext["Bindings"];
-
 export type ApiError = z.infer<typeof ApiErrorSchema>;
 export type EmojiLock = z.infer<typeof EMOJI_LOCK_SCHEMA>;
 export type EmojiVersion = z.infer<typeof EmojiVersionSchema>;

src/types.ts

@@ -19,6 +19,11 @@
       "bucket_name": "mojis"
     }
   ],
+  "triggers": {
+    "crons": [
+      "0 */12 * * *"
+    ]
+  },
   "placement": { "mode": "smart" },
   "env": {
     "preview": {