From 82206b066ab9550945b7ad58bf5dbe4df0e68d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=85=E8=86=80?= Date: Sat, 17 Oct 2026 18:16:49 +0800 Subject: [PATCH] fix(admin-api): bypass browser cache locks for live requests Use no-store on both client requests and admin responses. Personalized live data must not be reused, and one stalled same-URL cache entry must not block later log requests behind the browser cache lock. --- app/composables/useApi.ts | 4 ++++ server/routes/admin/api/[...slug].ts | 10 +++++++++- tests/admin-api-route.test.ts | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tests/admin-api-route.test.ts diff --git a/app/composables/useApi.ts b/app/composables/useApi.ts index 17bf707..b40221b 100644 --- a/app/composables/useApi.ts +++ b/app/composables/useApi.ts @@ -15,6 +15,10 @@ export function useAuthState() { export async function apiFetch(path: string, init?: RequestInit): Promise { const res = await fetch(path, { credentials: "same-origin", + // Live data, never from the browser cache. This also keeps requests out of + // its per-URL cache lock: otherwise one request that never answers makes + // every later request for the same URL wait up to 20 s behind it. + cache: "no-store", ...init, // JSON in/out: h3's readBody only parses JSON bodies when the request // declares application/json, and the browser defaults string bodies to diff --git a/server/routes/admin/api/[...slug].ts b/server/routes/admin/api/[...slug].ts index f8d408d..2f7f84f 100644 --- a/server/routes/admin/api/[...slug].ts +++ b/server/routes/admin/api/[...slug].ts @@ -1,4 +1,10 @@ -import { defineEventHandler, getMethod, getRouterParam, setResponseStatus } from "h3"; +import { + defineEventHandler, + getMethod, + getRouterParam, + setResponseHeader, + setResponseStatus, +} from "h3"; import { adminApiMe, adminApiGroupsGet, @@ -27,6 +33,8 @@ import { export default defineEventHandler((event) => { const method = getMethod(event); const seg = (getRouterParam(event, "slug") ?? "").split("/").filter(Boolean); + // Per-user, live admin data: no browser or proxy may store or reuse it. + setResponseHeader(event, "Cache-Control", "no-store"); if (seg[0] === "me" && method === "GET") return adminApiMe(event); if (seg[0] === "groups" && seg.length === 1) { diff --git a/tests/admin-api-route.test.ts b/tests/admin-api-route.test.ts new file mode 100644 index 0000000..4f55e5d --- /dev/null +++ b/tests/admin-api-route.test.ts @@ -0,0 +1,14 @@ +import { describe, it, expect } from "bun:test"; +import handler from "../server/routes/admin/api/[...slug]"; +import { makeEvent, responseHeader, responseStatus } from "./helpers"; + +describe("admin API route", () => { + it("never lets a response be cached", async () => { + const event = makeEvent("/admin/api/nope", { env: { GITHUB_WEBHOOK_SECRET: "s" } as never }); + event.context.params = { slug: "nope" }; + const res = await handler(event); + expect(responseStatus(event)).toBe(404); + expect(res).toEqual({ error: "Not found" }); + expect(responseHeader(event, "cache-control")).toBe("no-store"); + }); +});