diff --git a/package.json b/package.json index 68b124a..13afc03 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "api.mojis.dev", "type": "module", "private": true, - "packageManager": "pnpm@10.6.4", + "packageManager": "pnpm@10.6.5", "scripts": { "dev": "wrangler dev", "build": "wrangler deploy --dry-run --outdir=dist", @@ -18,12 +18,12 @@ "dependencies": { "@hono/zod-openapi": "^0.19.2", "@mojis/internal-utils": "^0.0.5", - "@scalar/hono-api-reference": "^0.7.1", + "@scalar/hono-api-reference": "^0.7.2", "hono": "^4.7.4", "zod": "^3.24.2" }, "devDependencies": { - "@cloudflare/vitest-pool-workers": "^0.8.1", + "@cloudflare/vitest-pool-workers": "^0.8.2", "@luxass/eslint-config": "^4.17.1", "@stoplight/spectral-cli": "^6.14.3", "eslint": "^9.22.0", @@ -31,7 +31,7 @@ "tsx": "^4.19.3", "typescript": "^5.8.2", "vitest": "^3.0.9", - "wrangler": "^4.1.0" + "wrangler": "^4.2.0" }, "pnpm": { "onlyBuiltDependencies": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d7ae51c..d01459d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ importers: specifier: ^0.0.5 version: 0.0.5 '@scalar/hono-api-reference': - specifier: ^0.7.1 - version: 0.7.1(hono@4.7.4) + specifier: ^0.7.2 + version: 0.7.2(hono@4.7.4) hono: specifier: ^4.7.4 version: 4.7.4 @@ -25,8 +25,8 @@ importers: version: 3.24.2 devDependencies: '@cloudflare/vitest-pool-workers': - specifier: ^0.8.1 - version: 0.8.1(@vitest/runner@3.0.9)(@vitest/snapshot@3.0.9)(vitest@3.0.9(@types/debug@4.1.12)(@types/node@22.13.9)(tsx@4.19.3)(yaml@2.7.0)) + specifier: ^0.8.2 + version: 0.8.2(@vitest/runner@3.0.9)(@vitest/snapshot@3.0.9)(vitest@3.0.9(@types/debug@4.1.12)(@types/node@22.13.9)(tsx@4.19.3)(yaml@2.7.0)) '@luxass/eslint-config': specifier: ^4.17.1 version: 4.17.1(@typescript-eslint/utils@8.26.1(eslint@9.22.0)(typescript@5.8.2))(@vue/compiler-sfc@3.5.13)(eslint-plugin-format@1.0.1(eslint@9.22.0))(eslint@9.22.0)(typescript@5.8.2)(vitest@3.0.9(@types/debug@4.1.12)(@types/node@22.13.9)(tsx@4.19.3)(yaml@2.7.0)) @@ -49,8 +49,8 @@ importers: specifier: ^3.0.9 version: 3.0.9(@types/debug@4.1.12)(@types/node@22.13.9)(tsx@4.19.3)(yaml@2.7.0) wrangler: - specifier: ^4.1.0 - version: 4.1.0 + specifier: ^4.2.0 + version: 4.2.0 packages: @@ -105,8 +105,8 @@ packages: workerd: optional: true - '@cloudflare/vitest-pool-workers@0.8.1': - resolution: {integrity: sha512-hKU0rqeC90XBAiPotQzcF9Hz9xgG7/kjsEuWy2WUJh4vhHa1JofKe34yddTIQ2dU7tA9KEAZ5Mkd7pnMJI+znQ==} + '@cloudflare/vitest-pool-workers@0.8.2': + resolution: {integrity: sha512-j2Gk6//skSawZl10hqbJJtuQyTwMwgx5mWncn8WODHKyOfWRISr9I7v8XVYqju3qD77nUAjtaIRuMNJrz9PtNA==} peerDependencies: '@vitest/runner': 2.0.x - 3.0.x '@vitest/snapshot': 2.0.x - 3.0.x @@ -853,12 +853,12 @@ packages: cpu: [x64] os: [win32] - '@scalar/core@0.2.1': - resolution: {integrity: sha512-3/K8EsnNcDtwGZwPFycIi0fXfCa3nW3Yapjjw1tRWXUs61tQkIyxNa8/L35zXxt+HcOxjXJMERe/TedhAWYHIg==} + '@scalar/core@0.2.2': + resolution: {integrity: sha512-jT6vfz37yQnqVjj8kXYEmV2cZvODW1A0PXjxZ9DzKqjm9tIssNwP4vvcdD1FSuiMcj+rgxAxOjIYMI+ybI/9RQ==} engines: {node: '>=18'} - '@scalar/hono-api-reference@0.7.1': - resolution: {integrity: sha512-GSAQchWm1LFkbMiRBh+Z+ICrB4WWtENlRBn5Tyvobdar9UHZRK/rQr2UJYF8WWFMXAcMWMqBznXdp1uEovfsqA==} + '@scalar/hono-api-reference@0.7.2': + resolution: {integrity: sha512-CnxRjGfAWPGkV0D5TEwogvn7JSx/f9+ag6vQ6g25GigSDyj/UkxYbZqwe/QOV/+2EWruY3ypOvPuNMf7nEQhdQ==} engines: {node: '>=18'} peerDependencies: hono: ^4.0.0 @@ -867,8 +867,8 @@ packages: resolution: {integrity: sha512-HQQudOSQBU7ewzfnBW9LhDmBE2XOJgSfwrh5PlUB7zJup/kaRkBGNgV2wMjNz9Af/uztiU/xNrO179FysmUT+g==} engines: {node: '>=18'} - '@scalar/types@0.1.1': - resolution: {integrity: sha512-LlUX6AmOOGoRqOMoO835V2FezM1KiO5UlvQC3poT/s7oqD6ranqwRNFxyrPz/IxClPYR+SV1yBUSNKely4ZQhQ==} + '@scalar/types@0.1.2': + resolution: {integrity: sha512-5kCLQRwAYWt1ds110EaUb9yonc3KoQYNyo4YUCigJLOnoNugbqkEX0zRudGevItiuk+xg4uOYd30r3C+6xAasA==} engines: {node: '>=18'} '@stoplight/better-ajv-errors@1.0.3': @@ -2317,8 +2317,8 @@ packages: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} - miniflare@4.20250317.0: - resolution: {integrity: sha512-fCyFTa3G41Vyo24QUZD5xgdm+6RMKT6VC3vk9Usmr+Pwf/15HcH1AVLPVgzmJaJosWVb8r4S0HQ9a/+bmmZx0Q==} + miniflare@4.20250317.1: + resolution: {integrity: sha512-FFReRGco05fkgAB/x9VmxTuQ3KXW4JcpKkpuMZJn+JoZ2dd8hY5J1W9HBI4tSwfQ+hVyd9X7oXbn4BimoD3i8A==} engines: {node: '>=18.0.0'} hasBin: true @@ -3026,8 +3026,8 @@ packages: engines: {node: '>=16'} hasBin: true - wrangler@4.1.0: - resolution: {integrity: sha512-HcQZ2YappySGipEDEdbjMq01g3v+mv+xZYZSzwPTmRsoTfnbL5yteObshcK1JX9jdx7Qw23Ywd/4BPa1JyKIUQ==} + wrangler@4.2.0: + resolution: {integrity: sha512-wY+jq6tsaBVrxCesJ9NF9R63T+96W6Ht9xEkAdw9JnkstUWM6lGywMOeupYP8Ji8x4roNa98XrT0Gw8qu+QRNQ==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: @@ -3155,7 +3155,7 @@ snapshots: optionalDependencies: workerd: 1.20250317.0 - '@cloudflare/vitest-pool-workers@0.8.1(@vitest/runner@3.0.9)(@vitest/snapshot@3.0.9)(vitest@3.0.9(@types/debug@4.1.12)(@types/node@22.13.9)(tsx@4.19.3)(yaml@2.7.0))': + '@cloudflare/vitest-pool-workers@0.8.2(@vitest/runner@3.0.9)(@vitest/snapshot@3.0.9)(vitest@3.0.9(@types/debug@4.1.12)(@types/node@22.13.9)(tsx@4.19.3)(yaml@2.7.0))': dependencies: '@vitest/runner': 3.0.9 '@vitest/snapshot': 3.0.9 @@ -3163,10 +3163,10 @@ snapshots: cjs-module-lexer: 1.4.3 devalue: 4.3.3 esbuild: 0.24.2 - miniflare: 4.20250317.0 + miniflare: 4.20250317.1 semver: 7.7.1 vitest: 3.0.9(@types/debug@4.1.12)(@types/node@22.13.9)(tsx@4.19.3)(yaml@2.7.0) - wrangler: 4.1.0 + wrangler: 4.2.0 zod: 3.24.2 transitivePeerDependencies: - '@cloudflare/workers-types' @@ -3689,18 +3689,18 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.34.9': optional: true - '@scalar/core@0.2.1': + '@scalar/core@0.2.2': dependencies: - '@scalar/types': 0.1.1 + '@scalar/types': 0.1.2 - '@scalar/hono-api-reference@0.7.1(hono@4.7.4)': + '@scalar/hono-api-reference@0.7.2(hono@4.7.4)': dependencies: - '@scalar/core': 0.2.1 + '@scalar/core': 0.2.2 hono: 4.7.4 '@scalar/openapi-types@0.1.9': {} - '@scalar/types@0.1.1': + '@scalar/types@0.1.2': dependencies: '@scalar/openapi-types': 0.1.9 '@unhead/schema': 1.11.20 @@ -5699,7 +5699,7 @@ snapshots: min-indent@1.0.1: {} - miniflare@4.20250317.0: + miniflare@4.20250317.1: dependencies: '@cspotcode/source-map-support': 0.8.1 acorn: 8.14.0 @@ -6524,13 +6524,13 @@ snapshots: '@cloudflare/workerd-linux-arm64': 1.20250317.0 '@cloudflare/workerd-windows-64': 1.20250317.0 - wrangler@4.1.0: + wrangler@4.2.0: dependencies: '@cloudflare/kv-asset-handler': 0.4.0 '@cloudflare/unenv-preset': 2.0.2(unenv@2.0.0-rc.14)(workerd@1.20250317.0) blake3-wasm: 2.1.5 esbuild: 0.24.2 - miniflare: 4.20250317.0 + miniflare: 4.20250317.1 path-to-regexp: 6.3.0 unenv: 2.0.0-rc.14 workerd: 1.20250317.0 diff --git a/src/cache.ts b/src/cache.ts deleted file mode 100644 index 9089929..0000000 --- a/src/cache.ts +++ /dev/null @@ -1 +0,0 @@ -export const EMOJI_VERSION_CACHE_KEY = "emoji_version_cache"; diff --git a/src/routes/gateway_github.ts b/src/routes/gateway_github.ts index 183e604..075bbb6 100644 --- a/src/routes/gateway_github.ts +++ b/src/routes/gateway_github.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().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>(); - cache(c, 3600, true); - return c.json(emojis, 200); }); diff --git a/src/routes/random-emoji.ts b/src/routes/random-emoji.ts index e64223c..9d220e3 100644 --- a/src/routes/random-emoji.ts +++ b/src/routes/random-emoji.ts @@ -1,10 +1,16 @@ 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(); -RANDOM_EMOJI_ROUTER.get("/random-emoji.png", async (c) => { - cache(c, 60 * 60); - return c.redirect("https://image.luxass.dev/api/image/emoji"); -}); +RANDOM_EMOJI_ROUTER.get( + "/random-emoji.png", + cache({ + cacheName: "random-emoji", + cacheControl: "max-age=3600, immutable", + }), + async (c) => { + return c.redirect("https://image.luxass.dev/api/image/emoji"); + }, +); diff --git a/src/routes/v1_categories.ts b/src/routes/v1_categories.ts index 99c43a1..c06cfd2 100644 --- a/src/routes/v1_categories.ts +++ b/src/routes/v1_categories.ts @@ -1,5 +1,7 @@ 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 { createError } from "../utils"; @@ -9,19 +11,24 @@ export const V1_CATEGORIES_ROUTER = new OpenAPIHono().basePath("/ap 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"); - const res = await fetch(`https://raw.githubusercontent.com/mojisdev/emoji-data/refs/heads/main/data/v${version}/groups.json`); - - if (!res.ok) { - return createError(c, 500, "failed to fetch categories"); + const res = await c.env.EMOJI_DATA.get(`v${version}/groups.json`); + if (res == null) { + throw new HTTPException(500, { + message: "failed to fetch categories", + }); } const data = await res.json(); const result = z.array(EmojiCategorySchema).safeParse(data); - if (!result.success) { return createError(c, 500, "failed to parse categories"); } @@ -38,10 +45,12 @@ V1_CATEGORIES_ROUTER.openapi(GET_CATEGORY_ROUTE, async (c) => { const version = c.req.param("version"); const categorySlug = c.req.param("category"); - const res = await fetch(`https://raw.githubusercontent.com/mojisdev/emoji-data/refs/heads/main/data/v${version}/groups.json`); + const res = await c.env.EMOJI_DATA.get(`v${version}/groups.json`); - if (!res.ok) { - return createError(c, 500, "failed to fetch categories"); + if (res == null) { + throw new HTTPException(500, { + message: "failed to fetch categories", + }); } const data = await res.json(); diff --git a/src/utils.ts b/src/utils.ts index 6638c72..ae60a07 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -32,15 +32,3 @@ export async function getAvailableVersions(): Promise { return result.data.versions; } - -export function cache(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(", ")); -}; diff --git a/test/routes/v1_categories.test.ts b/test/routes/v1_categories.test.ts index 4153d7e..e4133ba 100644 --- a/test/routes/v1_categories.test.ts +++ b/test/routes/v1_categories.test.ts @@ -4,9 +4,36 @@ import { env, waitOnExecutionContext, } from "cloudflare:test"; -import { describe, expect, it } from "vitest"; +import { beforeAll, describe, expect, it } from "vitest"; import worker from "../../src"; +beforeAll(async () => { + await env.EMOJI_DATA.put("v15.1/groups.json", JSON.stringify([ + { + name: "Smileys & Emotion", + slug: "smileys-emotion", + subgroups: [ + "face-smiling", + "face-affection", + "face-tongue", + "face-hand", + "face-neutral-skeptical", + "face-sleepy", + "face-unwell", + "face-hat", + "face-glasses", + "face-concerned", + "face-negative", + "face-costume", + "cat-face", + "monkey-face", + "heart", + "emotion", + ], + }, + ])); +}); + describe("v1_categories", () => { it("should return 404 for non-existent version", async () => { const request = new Request("https://api.mojis.dev/api/v1/categories/999.0"); diff --git a/tsconfig.json b/tsconfig.json index ffa7bd3..19372d5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,6 +7,7 @@ "resolveJsonModule": true, "types": [ "./worker-configuration.d.ts", + "./worker-configuration-test.d.ts", // for `cloudflare:test` types "@cloudflare/vitest-pool-workers" ], diff --git a/vitest.config.ts b/vitest.config.ts index f5e516f..0595dec 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -6,6 +6,7 @@ export default defineWorkersProject({ poolOptions: { workers: { singleWorker: true, + isolatedStorage: true, miniflare: { compatibilityFlags: ["nodejs_compat"], bindings: { diff --git a/worker-configuration-test.d.ts b/worker-configuration-test.d.ts new file mode 100644 index 0000000..de7fde2 --- /dev/null +++ b/worker-configuration-test.d.ts @@ -0,0 +1,5 @@ +declare module "cloudflare:test" { + // eslint-disable-next-line ts/no-empty-object-type + interface ProvidedEnv extends CloudflareBindings { + } +} diff --git a/worker-configuration.d.ts b/worker-configuration.d.ts index da897fe..dfdee1b 100644 --- a/worker-configuration.d.ts +++ b/worker-configuration.d.ts @@ -1,10 +1,11 @@ -// Generated by Wrangler by running `wrangler types --env-interface CloudflareBindings` (hash: e71cf0de9c927e7e3f2e02a5b583aba3) +// Generated by Wrangler by running `wrangler types --env-interface CloudflareBindings` (hash: c476c03844aa0429b0aacf2d2d7c8815) // Runtime types generated with workerd@1.20250317.0 2025-03-13 declare namespace Cloudflare { interface Env { API_VERSION: "x.y.z"; ENVIRONMENT: "preview" | "production"; GITHUB_TOKEN: string; + EMOJI_DATA: R2Bucket; } } interface CloudflareBindings extends Cloudflare.Env {} diff --git a/wrangler.jsonc b/wrangler.jsonc index 7425edb..fc9d2aa 100644 --- a/wrangler.jsonc +++ b/wrangler.jsonc @@ -13,6 +13,12 @@ "GITHUB_TOKEN": "", "API_VERSION": "x.y.z" }, + "r2_buckets": [ + { + "binding": "EMOJI_DATA", + "bucket_name": "mojis" + } + ], "placement": { "mode": "smart" }, "env": { "preview": { @@ -24,7 +30,13 @@ "route": { "custom_domain": true, "pattern": "api.preview.mojis.dev" - } + }, + "r2_buckets": [ + { + "binding": "EMOJI_DATA", + "bucket_name": "mojis-preview" + } + ] }, "production": { "name": "mojis-api", @@ -35,7 +47,13 @@ "route": { "custom_domain": true, "pattern": "api.mojis.dev" - } + }, + "r2_buckets": [ + { + "binding": "EMOJI_DATA", + "bucket_name": "mojis" + } + ] } } }