Optimize SSI public page data caching

Author: markoblogo

src/app/[locale]/analytics/page.tsx

@@ -144,6 +144,7 @@ export default async function AnalyticsPage({
   searchParams: Promise<{
     aiAnalytics?: string;
     experimentalAnalytics?: string;
+    history?: string;
     volatilityWindow?: string;
   }>;
 }) {
@@ -153,7 +154,11 @@ export default async function AnalyticsPage({
   const fxRatesPromise = getFxRates();
   const respondentCountPromise = getActiveRespondentCountData();
   const activeRespondentCount = await respondentCountPromise;
-  const history = await getAnalyticsHistory(activeRespondentCount);
+  const useFullHistory =
+    queryParams.history === "full" ||
+    queryParams.experimentalAnalytics === "1" ||
+    queryParams.aiAnalytics === "1";
+  const history = await getAnalyticsHistory(activeRespondentCount, useFullHistory);
   const fxRates = await fxRatesPromise;
   const snapshot = buildMarketSnapshot(
     history,
@@ -638,9 +643,9 @@ function PublishedValuesTable({
   );
 }
 
-async function getAnalyticsHistory(activeRespondentCount: number) {
+async function getAnalyticsHistory(activeRespondentCount: number, useFullHistory: boolean) {
   if (hasDatabaseUrl()) {
-    const realHistory = await getRealAnalyticsHistory();
+    const realHistory = await getRealAnalyticsHistory(useFullHistory);
 
     if (realHistory.length > 0 || !allowMockFallback()) {
       return realHistory;
@@ -654,8 +659,10 @@ async function getAnalyticsHistory(activeRespondentCount: number) {
   return [];
 }
 
-async function getRealAnalyticsHistory(): Promise<AnalyticsPoint[]> {
-  const rows = await getPublicHistoryData();
+async function getRealAnalyticsHistory(useFullHistory: boolean): Promise<AnalyticsPoint[]> {
+  const rows = await getPublicHistoryData(
+    useFullHistory ? { scope: "analytics" } : undefined,
+  );
 
   return rows
     .map((row) => ({

src/app/[locale]/media-hub/page.tsx

@@ -1,3 +1,4 @@
+import { unstable_cache } from "next/cache";
 import { redirect } from "next/navigation";
 import { PublicMediaHub } from "@/components/media-hub/public-media-hub";
 import type { Locale } from "@/lib/i18n";
@@ -17,9 +18,63 @@ import {
 
 export const dynamic = "force-dynamic";
 
+const MEDIA_HUB_LIVE_CACHE_SECONDS = 60 * 60;
+const MEDIA_HUB_REPORT_CACHE_SECONDS = 12 * 60 * 60;
+const MEDIA_HUB_ARCHIVE_CACHE_SECONDS = 12 * 60 * 60;
+
+const getCachedSpikeMediaHubLiveWindows = unstable_cache(
+  async (locale: Locale) => getSpikeMediaHubLiveWindows(locale),
+  ["spike-media-hub-live-windows"],
+  {
+    revalidate: MEDIA_HUB_LIVE_CACHE_SECONDS,
+    tags: ["spike-media-hub-live"],
+  },
+);
+
+const getCachedSpikePublishedSummary = unstable_cache(
+  async (
+    kind: Exclude<MediaHubPublicationKind, "none"> | undefined,
+    locale: Locale,
+    periodEndDate: string | undefined,
+  ) =>
+    getLatestPublishedMediaHubReportSummary({
+      kind,
+      locale,
+      periodEndDate,
+      tenantId: "spike-ua",
+    }),
+  ["spike-media-hub-published-summary"],
+  {
+    revalidate: MEDIA_HUB_REPORT_CACHE_SECONDS,
+    tags: ["media-hub-report-summary"],
+  },
+);
+
+const getCachedSpikeReportArchive = unstable_cache(
+  async (
+    date: string | undefined,
+    kind: Exclude<MediaHubPublicationKind, "none"> | undefined,
+    locale: Locale,
+    query: string | undefined,
+  ) =>
+    getMediaHubReportArchive({
+      date,
+      kind,
+      locale,
+      query,
+      tenantId: "spike-ua",
+      limit: 24,
+    }),
+  ["spike-media-hub-report-archive"],
+  {
+    revalidate: MEDIA_HUB_ARCHIVE_CACHE_SECONDS,
+    tags: ["media-hub-report-archive"],
+  },
+);
+
 type MediaHubPageProps = {
   params: Promise<{ locale: Locale }>;
-  searchParams: Promise<{ date?: string; kind?: string; q?: string; window?: string }>;
+  searchParams: Promise<{ archive?: string; date?: string; kind?: string; q?: string; window?: string }>;
 };
 
 export default async function MediaHubPage({
@@ -38,21 +93,13 @@ export default async function MediaHubPage({
   const requestedDate = normalizeDate(search.date);
   const requestedQuery = normalizeQuery(search.q);
   const summaryKind = requestedKind ?? (requestedWindow ? windowToKind(requestedWindow) : undefined);
+  const shouldLoadArchive = search.archive === "1" || Boolean(requestedDate || requestedKind || requestedQuery);
   const [liveWindows, publishedSummary, archive] = await Promise.all([
-    getSpikeMediaHubLiveWindows(locale),
-    getLatestPublishedMediaHubReportSummary({
-      kind: summaryKind,
-      locale,
-      periodEndDate: requestedDate,
-      tenantId: "spike-ua",
-    }),
-    getMediaHubReportArchive({
-      date: requestedDate,
-      kind: summaryKind,
-      locale,
-      query: requestedQuery,
-      tenantId: "spike-ua",
-    }),
+    getCachedSpikeMediaHubLiveWindows(locale),
+    getCachedSpikePublishedSummary(summaryKind, locale, requestedDate),
+    shouldLoadArchive
+      ? getCachedSpikeReportArchive(requestedDate, summaryKind, locale, requestedQuery)
+      : Promise.resolve([]),
   ]);
   const selectedWindow = requestedWindow
     ? requestedWindow
@@ -75,10 +122,12 @@ export default async function MediaHubPage({
       archiveQuery={{
         date: requestedDate,
         kind: requestedKind,
+        loaded: shouldLoadArchive,
         q: requestedQuery,
       }}
       archiveHref={(filter) => {
         const params = new URLSearchParams();
+        params.set("archive", "1");
         if (filter.kind) params.set("kind", filter.kind);
         if (filter.date) params.set("date", filter.date);
         if (filter.q) params.set("q", filter.q);

src/app/[locale]/page.tsx

@@ -1,4 +1,3 @@
-import { connection } from "next/server";
 import Link from "next/link";
 import { HomeHero } from "@/components/ui/home-hero";
 import { getDictionary, type Locale } from "@/lib/i18n";
@@ -11,8 +10,6 @@ export default async function LocaleHome({
 }: {
   params: Promise<{ locale: Locale }>;
 }) {
-  await connection();
-
   const { locale } = await params;
   const dict = getDictionary(locale);
   const { activeIndex, fxRates, respondentCount, snapshot, updatedAt } =

src/app/admin/respondents/page.tsx

@@ -1,4 +1,4 @@
-import { revalidatePath } from "next/cache";
+import { revalidatePath, revalidateTag } from "next/cache";
 import dynamicImport from "next/dynamic";
 import { ManualHelpCard } from "@/components/manual/manual-ui";
 import { SITE_CONFIG } from "@/lib/constants";
@@ -359,4 +359,5 @@ function revalidateRespondentPages() {
   revalidatePath("/en/analytics");
   revalidatePath("/api/public/latest");
   revalidatePath("/api/public/history");
+  revalidateTag("public-index-data", "max");
 }

src/app/api/cron/uga-spike-demo-sync/route.ts

@@ -1,4 +1,4 @@
-import { revalidatePath } from "next/cache";
+import { revalidatePath, revalidateTag } from "next/cache";
 import { NextResponse } from "next/server";
 import { isCronRequestAuthorized } from "@/lib/cron-auth";
 import { syncUgaDemoIndicesFromSpike } from "@/lib/uga-spike-demo-sync";
@@ -36,6 +36,7 @@ export async function GET(request: Request) {
   revalidatePath("/en/analytics");
   revalidatePath("/api/public/latest");
   revalidatePath("/api/public/history");
+  revalidateTag("public-index-data", "max");
 
   return NextResponse.json(result);
 }

src/app/api/public/history/route.ts

@@ -5,7 +5,7 @@ export const dynamic = "force-dynamic";
 
 export async function GET(request: Request) {
   try {
-    return publicDataResponse(await getPublicHistoryData(), 0, request);
+    return publicDataResponse(await getPublicHistoryData(), 12 * 60 * 60, request);
   } catch (error) {
     return publicDataUnavailableResponse("public_history_unavailable", error);
   }

src/app/api/public/latest/route.ts

@@ -5,7 +5,7 @@ export const dynamic = "force-dynamic";
 
 export async function GET(request: Request) {
   try {
-    return publicDataResponse(await getPublicLatestData(), 0, request);
+    return publicDataResponse(await getPublicLatestData(), 12 * 60 * 60, request);
   } catch (error) {
     return publicDataUnavailableResponse("public_latest_unavailable", error);
   }

src/app/api/public/public-routes.test.ts

@@ -14,7 +14,7 @@ afterEach(() => {
 });
 
 describe("public API routes", () => {
-  it("returns latest data with no-store cache headers", async () => {
+  it("returns latest data with public snapshot cache headers", async () => {
     const dataModule = await import("@/lib/public-api-data");
     vi.mocked(dataModule.getPublicLatestData).mockResolvedValue([
       {
@@ -36,7 +36,7 @@ describe("public API routes", () => {
     const body = await response.json();
 
     expect(response.status).toBe(200);
-    expect(response.headers.get("cache-control")).toBe("no-store");
+    expect(response.headers.get("cache-control")).toContain("s-maxage=43200");
     expect(response.headers.get("etag")).toMatch(/^W\//);
     expect(body.data).toHaveLength(1);
   });

src/app/media-hub/page.tsx

@@ -1,3 +1,4 @@
+import { unstable_cache } from "next/cache";
 import { redirect } from "next/navigation";
 import { PublicMediaHub } from "@/components/media-hub/public-media-hub";
 import { PlatformShell } from "@/components/platform/platform-shell";
@@ -17,8 +18,60 @@ import { isPlatformSite } from "@/lib/platform-site";
 
 export const dynamic = "force-dynamic";
 
+const MEDIA_HUB_LIVE_CACHE_SECONDS = 60 * 60;
+const MEDIA_HUB_REPORT_CACHE_SECONDS = 12 * 60 * 60;
+const MEDIA_HUB_ARCHIVE_CACHE_SECONDS = 12 * 60 * 60;
+
+const getCached1d3xRssWindows = unstable_cache(
+  async () => get1d3xRssWindows(),
+  ["id3x-media-hub-rss-windows"],
+  {
+    revalidate: MEDIA_HUB_LIVE_CACHE_SECONDS,
+    tags: ["id3x-media-hub-live"],
+  },
+);
+
+const getCached1d3xPublishedSummary = unstable_cache(
+  async (
+    kind: Exclude<MediaHubPublicationKind, "none"> | undefined,
+    periodEndDate: string | undefined,
+  ) =>
+    getLatestPublishedMediaHubReportSummary({
+      kind,
+      locale: "en",
+      periodEndDate,
+      tenantId: "1d3x",
+    }),
+  ["id3x-media-hub-published-summary"],
+  {
+    revalidate: MEDIA_HUB_REPORT_CACHE_SECONDS,
+    tags: ["media-hub-report-summary"],
+  },
+);
+
+const getCached1d3xReportArchive = unstable_cache(
+  async (
+    date: string | undefined,
+    kind: Exclude<MediaHubPublicationKind, "none"> | undefined,
+    query: string | undefined,
+  ) =>
+    getMediaHubReportArchive({
+      date,
+      kind,
+      locale: "en",
+      query,
+      tenantId: "1d3x",
+      limit: 24,
+    }),
+  ["id3x-media-hub-report-archive"],
+  {
+    revalidate: MEDIA_HUB_ARCHIVE_CACHE_SECONDS,
+    tags: ["media-hub-report-archive"],
+  },
+);
+
 type PlatformMediaHubPageProps = {
-  searchParams: Promise<{ date?: string; kind?: string; q?: string; window?: string }>;
+  searchParams: Promise<{ archive?: string; date?: string; kind?: string; q?: string; window?: string }>;
 };
 
 export default async function PlatformMediaHubPage({
@@ -34,21 +87,13 @@ export default async function PlatformMediaHubPage({
   const requestedDate = normalizeDate(search.date);
   const requestedQuery = normalizeQuery(search.q);
   const summaryKind = requestedKind ?? (requestedWindow ? windowToKind(requestedWindow) : undefined);
+  const shouldLoadArchive = search.archive === "1" || Boolean(requestedDate || requestedKind || requestedQuery);
   const [liveWindows, publishedSummary, archive] = await Promise.all([
-    get1d3xRssWindows(),
-    getLatestPublishedMediaHubReportSummary({
-      kind: summaryKind,
-      locale: "en",
-      periodEndDate: requestedDate,
-      tenantId: "1d3x",
-    }),
-    getMediaHubReportArchive({
-      date: requestedDate,
-      kind: summaryKind,
-      locale: "en",
-      query: requestedQuery,
-      tenantId: "1d3x",
-    }),
+    getCached1d3xRssWindows(),
+    getCached1d3xPublishedSummary(summaryKind, requestedDate),
+    shouldLoadArchive
+      ? getCached1d3xReportArchive(requestedDate, summaryKind, requestedQuery)
+      : Promise.resolve([]),
   ]);
   const selectedWindow = requestedWindow
     ? requestedWindow
@@ -75,10 +120,12 @@ export default async function PlatformMediaHubPage({
         archiveQuery={{
           date: requestedDate,
           kind: requestedKind,
+          loaded: shouldLoadArchive,
           q: requestedQuery,
         }}
         archiveHref={(filter) => {
           const params = new URLSearchParams();
+          params.set("archive", "1");
           if (filter.kind) params.set("kind", filter.kind);
           if (filter.date) params.set("date", filter.date);
           if (filter.q) params.set("q", filter.q);