From 6bbb86f91ce84808ea1a637d8466b972eb795d8a Mon Sep 17 00:00:00 2001 From: Dorseuil Nicolas Date: Fri, 14 Mar 2025 20:39:56 +0100 Subject: [PATCH 1/6] Simple D1 next mode tag cache --- .../cloudflare/src/api/d1-next-tag-cache.ts | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 packages/cloudflare/src/api/d1-next-tag-cache.ts diff --git a/packages/cloudflare/src/api/d1-next-tag-cache.ts b/packages/cloudflare/src/api/d1-next-tag-cache.ts new file mode 100644 index 00000000..1e7fd8f5 --- /dev/null +++ b/packages/cloudflare/src/api/d1-next-tag-cache.ts @@ -0,0 +1,74 @@ +import { debug } from "@opennextjs/aws/adapters/logger.js"; +import type { OpenNextConfig } from "@opennextjs/aws/types/open-next.js"; +import type { NextModeTagCache } from "@opennextjs/aws/types/overrides.js"; +import { RecoverableError } from "@opennextjs/aws/utils/error.js"; + +import { getCloudflareContext } from "./cloudflare-context.js"; + +export class D1NextModeTagCache implements NextModeTagCache { + mode = "nextMode" as const; + name = "d1-next-mode-tag-cache"; + + async hasBeenRevalidated(tags: string[], lastModified?: number): Promise { + const { isDisabled, db, tables } = this.getConfig(); + if (isDisabled) return false; + const result = await db + .prepare( + `SELECT COUNT(*) as cnt FROM ${JSON.stringify(tables.revalidations)} WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ?` + ) + .bind(...tags.map((tag) => this.getCacheKey(tag)), lastModified ?? Date.now()) + .first<{ cnt: number }>(); + if (!result) throw new RecoverableError(`D1 select failed for ${tags}`); + + return result.cnt > 0; + } + + async writeTags(tags: string[]): Promise { + const { isDisabled, db, tables } = this.getConfig(); + if (isDisabled) return Promise.resolve(); + const result = await db.batch( + tags.map((tag) => + db + .prepare(`INSERT INTO ${JSON.stringify(tables.revalidations)} (tag, revalidatedAt) VALUES (?, ?)`) + .bind(this.getCacheKey(tag), Date.now()) + ) + ); + if (!result) throw new RecoverableError(`D1 insert failed for ${tags}`); + } + + private getConfig() { + const cfEnv = getCloudflareContext().env; + const db = cfEnv.NEXT_CACHE_D1; + + if (!db) debug("No D1 database found"); + + const isDisabled = !!(globalThis as unknown as { openNextConfig: OpenNextConfig }).openNextConfig + .dangerous?.disableTagCache; + + if (!db || isDisabled) { + return { isDisabled: true as const }; + } + + return { + isDisabled: false as const, + db, + tables: { + revalidations: cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? "revalidations", + }, + }; + } + + protected removeBuildId(key: string) { + return key.replace(`${this.getBuildId()}/`, ""); + } + + protected getCacheKey(key: string) { + return `${this.getBuildId()}/${key}`.replaceAll("//", "/"); + } + + protected getBuildId() { + return process.env.NEXT_BUILD_ID ?? "no-build-id"; + } +} + +export default new D1NextModeTagCache(); From 109dbe5e61b2058087ba961dad574a7094f1b7f4 Mon Sep 17 00:00:00 2001 From: Dorseuil Nicolas Date: Mon, 17 Mar 2025 11:27:53 +0100 Subject: [PATCH 2/6] add e2e tests --- examples/common/apps.ts | 2 + examples/common/config-e2e.ts | 4 +- examples/overrides/d1-tag-next/.gitignore | 47 ++++++++++++++++++ examples/overrides/d1-tag-next/app/action.ts | 11 ++++ .../app/components/revalidationButtons.tsx | 27 ++++++++++ .../overrides/d1-tag-next/app/favicon.ico | Bin 0 -> 25931 bytes .../overrides/d1-tag-next/app/globals.css | 14 ++++++ examples/overrides/d1-tag-next/app/layout.tsx | 28 +++++++++++ .../overrides/d1-tag-next/app/page.module.css | 17 +++++++ examples/overrides/d1-tag-next/app/page.tsx | 26 ++++++++++ .../overrides/d1-tag-next/e2e/base.spec.ts | 47 ++++++++++++++++++ .../d1-tag-next/e2e/playwright.config.ts | 4 ++ examples/overrides/d1-tag-next/next.config.ts | 11 ++++ .../overrides/d1-tag-next/open-next.config.ts | 8 +++ examples/overrides/d1-tag-next/package.json | 30 +++++++++++ examples/overrides/d1-tag-next/tsconfig.json | 27 ++++++++++ examples/overrides/d1-tag-next/wrangler.jsonc | 27 ++++++++++ pnpm-lock.yaml | 34 +++++++++++++ pnpm-workspace.yaml | 1 + 19 files changed, 364 insertions(+), 1 deletion(-) create mode 100644 examples/overrides/d1-tag-next/.gitignore create mode 100644 examples/overrides/d1-tag-next/app/action.ts create mode 100644 examples/overrides/d1-tag-next/app/components/revalidationButtons.tsx create mode 100644 examples/overrides/d1-tag-next/app/favicon.ico create mode 100644 examples/overrides/d1-tag-next/app/globals.css create mode 100644 examples/overrides/d1-tag-next/app/layout.tsx create mode 100644 examples/overrides/d1-tag-next/app/page.module.css create mode 100644 examples/overrides/d1-tag-next/app/page.tsx create mode 100644 examples/overrides/d1-tag-next/e2e/base.spec.ts create mode 100644 examples/overrides/d1-tag-next/e2e/playwright.config.ts create mode 100644 examples/overrides/d1-tag-next/next.config.ts create mode 100644 examples/overrides/d1-tag-next/open-next.config.ts create mode 100644 examples/overrides/d1-tag-next/package.json create mode 100644 examples/overrides/d1-tag-next/tsconfig.json create mode 100644 examples/overrides/d1-tag-next/wrangler.jsonc diff --git a/examples/common/apps.ts b/examples/common/apps.ts index ee320f23..c61bdf34 100644 --- a/examples/common/apps.ts +++ b/examples/common/apps.ts @@ -12,6 +12,8 @@ const apps = [ "app-pages-router", "app-router", "pages-router", + // overrides + "d1-tag-next", // bugs "gh-119", "gh-219", diff --git a/examples/common/config-e2e.ts b/examples/common/config-e2e.ts index 17c8cfc0..9996f261 100644 --- a/examples/common/config-e2e.ts +++ b/examples/common/config-e2e.ts @@ -13,6 +13,8 @@ export function configurePlaywright( isWorker = true, // Tests with multiple browsers multipleBrowsers = false, + // Whether to run tests in single file in parallel + parallel = true, } = {} ) { const port = getAppPort(app, { isWorker }); @@ -60,7 +62,7 @@ export function configurePlaywright( /* ignore runtime specific tests */ testIgnore: isWorker ? "*next.spec.ts" : "*cloudflare.spec.ts", /* Run tests in files in parallel */ - fullyParallel: true, + fullyParallel: parallel, /* Fail the build on CI if you accidentally left test.only in the source code. */ forbidOnly: isCI, /* Retry on CI only */ diff --git a/examples/overrides/d1-tag-next/.gitignore b/examples/overrides/d1-tag-next/.gitignore new file mode 100644 index 00000000..3f753f29 --- /dev/null +++ b/examples/overrides/d1-tag-next/.gitignore @@ -0,0 +1,47 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/versions + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# misc +.DS_Store +*.pem + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* +.pnpm-debug.log* + +# env files (can opt-in for committing if needed) +.env* + +# vercel +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts + +# playwright +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ diff --git a/examples/overrides/d1-tag-next/app/action.ts b/examples/overrides/d1-tag-next/app/action.ts new file mode 100644 index 00000000..76441c9a --- /dev/null +++ b/examples/overrides/d1-tag-next/app/action.ts @@ -0,0 +1,11 @@ +"use server"; + +import { revalidatePath, revalidateTag } from "next/cache"; + +export async function revalidateTagAction() { + revalidateTag("date"); +} + +export async function revalidatePathAction() { + revalidatePath("/"); +} diff --git a/examples/overrides/d1-tag-next/app/components/revalidationButtons.tsx b/examples/overrides/d1-tag-next/app/components/revalidationButtons.tsx new file mode 100644 index 00000000..a84652a4 --- /dev/null +++ b/examples/overrides/d1-tag-next/app/components/revalidationButtons.tsx @@ -0,0 +1,27 @@ +"use client"; + +import { revalidateTagAction, revalidatePathAction } from "../action"; + +export default function RevalidationButtons() { + return ( +
+ + + +
+ ); +} diff --git a/examples/overrides/d1-tag-next/app/favicon.ico b/examples/overrides/d1-tag-next/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c GIT binary patch literal 25931 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 LrJugUA?W`A8`#=m literal 0 HcmV?d00001 diff --git a/examples/overrides/d1-tag-next/app/globals.css b/examples/overrides/d1-tag-next/app/globals.css new file mode 100644 index 00000000..6e6f12f3 --- /dev/null +++ b/examples/overrides/d1-tag-next/app/globals.css @@ -0,0 +1,14 @@ +html, +body { + max-width: 100vw; + overflow-x: hidden; + height: 100vh; + display: flex; + flex-direction: column; +} + +footer { + padding: 1rem; + display: flex; + justify-content: end; +} diff --git a/examples/overrides/d1-tag-next/app/layout.tsx b/examples/overrides/d1-tag-next/app/layout.tsx new file mode 100644 index 00000000..d3d960b2 --- /dev/null +++ b/examples/overrides/d1-tag-next/app/layout.tsx @@ -0,0 +1,28 @@ +import type { Metadata } from "next"; +import "./globals.css"; + +import { getCloudflareContext } from "@opennextjs/cloudflare"; + +export const metadata: Metadata = { + title: "SSG App", + description: "An app in which all the routes are SSG'd", +}; + +export default async function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) { + const cloudflareContext = await getCloudflareContext({ + async: true, + }); + + return ( + + + {children} +
{cloudflareContext.env.APP_VERSION}
+ + + ); +} diff --git a/examples/overrides/d1-tag-next/app/page.module.css b/examples/overrides/d1-tag-next/app/page.module.css new file mode 100644 index 00000000..1217984e --- /dev/null +++ b/examples/overrides/d1-tag-next/app/page.module.css @@ -0,0 +1,17 @@ +.page { + display: grid; + grid-template-rows: 20px 1fr 20px; + align-items: center; + justify-items: center; + flex: 1; + border: 3px solid gray; + margin: 1rem; + margin-block-end: 0; +} + +.main { + display: flex; + flex-direction: column; + gap: 32px; + grid-row-start: 2; +} diff --git a/examples/overrides/d1-tag-next/app/page.tsx b/examples/overrides/d1-tag-next/app/page.tsx new file mode 100644 index 00000000..19ff70ad --- /dev/null +++ b/examples/overrides/d1-tag-next/app/page.tsx @@ -0,0 +1,26 @@ +import { unstable_cache } from "next/cache"; +import styles from "./page.module.css"; +import RevalidationButtons from "./components/revalidationButtons"; + +const fetchedDateCb = unstable_cache( + async () => { + return Date.now(); + }, + ["date"], + { tags: ["date"] } +); + +export default async function Home() { + const fetchedDate = await fetchedDateCb(); + return ( +
+
+

Hello from a Statically generated page

+

{Date.now()}

+

{fetchedDate}

+ + +
+
+ ); +} diff --git a/examples/overrides/d1-tag-next/e2e/base.spec.ts b/examples/overrides/d1-tag-next/e2e/base.spec.ts new file mode 100644 index 00000000..8e003c42 --- /dev/null +++ b/examples/overrides/d1-tag-next/e2e/base.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from "@playwright/test"; + +test.describe("d1-tag-next", () => { + test("the index page should work", async ({ page }) => { + await page.goto("/"); + await expect(page.getByText("Hello from a Statically generated page")).toBeVisible(); + }); + + test("the index page should keep the same date on reload", async ({ page }) => { + await page.goto("/"); + const date = await page.getByTestId("date-local").textContent(); + expect(date).not.toBeNull(); + await page.reload(); + const newDate = await page.getByTestId("date-local").textContent(); + expect(date).toEqual(newDate); + }); + + test("the index page should revalidate the date on click on revalidateTag", async ({ page }) => { + await page.goto("/"); + const date = await page.getByTestId("date-fetched").textContent(); + await page.getByTestId("revalidate-tag").click(); + await page.waitForTimeout(100); + const newDate = await page.getByTestId("date-fetched").textContent(); + expect(date).not.toEqual(newDate); + }); + + test("the index page should revalidate the date on click on revalidatePath", async ({ page }) => { + await page.goto("/"); + const date = await page.getByTestId("date-fetched").textContent(); + await page.getByTestId("revalidate-path").click(); + await page.waitForTimeout(100); + const newDate = await page.getByTestId("date-fetched").textContent(); + expect(date).not.toEqual(newDate); + }); + + test("the index page should keep the same date on reload after revalidation", async ({ page }) => { + await page.goto("/"); + const initialDate = await page.getByTestId("date-fetched").textContent(); + await page.getByTestId("revalidate-tag").click(); + await page.waitForTimeout(100); + const date = await page.getByTestId("date-fetched").textContent(); + expect(initialDate).not.toEqual(date); + await page.reload(); + const newDate = await page.getByTestId("date-fetched").textContent(); + expect(date).toEqual(newDate); + }); +}); diff --git a/examples/overrides/d1-tag-next/e2e/playwright.config.ts b/examples/overrides/d1-tag-next/e2e/playwright.config.ts new file mode 100644 index 00000000..5413ac14 --- /dev/null +++ b/examples/overrides/d1-tag-next/e2e/playwright.config.ts @@ -0,0 +1,4 @@ +import { configurePlaywright } from "../../../common/config-e2e"; + +// Here we don't want to run the tests in parallel +export default configurePlaywright("d1-tag-next", { isCI: !!process.env.CI, parallel: false }); diff --git a/examples/overrides/d1-tag-next/next.config.ts b/examples/overrides/d1-tag-next/next.config.ts new file mode 100644 index 00000000..4b075e44 --- /dev/null +++ b/examples/overrides/d1-tag-next/next.config.ts @@ -0,0 +1,11 @@ +import type { NextConfig } from "next"; +import { initOpenNextCloudflareForDev } from "@opennextjs/cloudflare"; + +initOpenNextCloudflareForDev(); + +const nextConfig: NextConfig = { + typescript: { ignoreBuildErrors: true }, + eslint: { ignoreDuringBuilds: true }, +}; + +export default nextConfig; diff --git a/examples/overrides/d1-tag-next/open-next.config.ts b/examples/overrides/d1-tag-next/open-next.config.ts new file mode 100644 index 00000000..b41b414b --- /dev/null +++ b/examples/overrides/d1-tag-next/open-next.config.ts @@ -0,0 +1,8 @@ +import { defineCloudflareConfig } from "@opennextjs/cloudflare"; +import kvIncrementalCache from "@opennextjs/cloudflare/kv-cache"; +import d1NextTagCache from "@opennextjs/cloudflare/d1-next-tag-cache"; + +export default defineCloudflareConfig({ + incrementalCache: kvIncrementalCache, + tagCache: d1NextTagCache, +}); diff --git a/examples/overrides/d1-tag-next/package.json b/examples/overrides/d1-tag-next/package.json new file mode 100644 index 00000000..01bdf566 --- /dev/null +++ b/examples/overrides/d1-tag-next/package.json @@ -0,0 +1,30 @@ +{ + "name": "d1-tag-next", + "version": "0.1.0", + "private": true, + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint", + "d1:clean": "wrangler d1 execute NEXT_CACHE_D1 --command \"DROP TABLE IF EXISTS revalidations\"", + "d1:setup": "wrangler d1 execute NEXT_CACHE_D1 --command \"CREATE TABLE IF NOT EXISTS revalidations (tag TEXT NOT NULL, revalidatedAt INTEGER NOT NULL, UNIQUE(tag) ON CONFLICT REPLACE);\"", + "build:worker": "opennextjs-cloudflare && pnpm d1:clean && pnpm d1:setup", + "preview": "pnpm build:worker && pnpm wrangler dev", + "e2e": "playwright test -c e2e/playwright.config.ts" + }, + "dependencies": { + "react": "^19.0.0", + "react-dom": "^19.0.0", + "next": "15.1.7" + }, + "devDependencies": { + "@opennextjs/cloudflare": "workspace:*", + "@playwright/test": "catalog:", + "@types/node": "catalog:", + "@types/react": "^19", + "@types/react-dom": "^19", + "typescript": "catalog:", + "wrangler": "catalog:" + } +} diff --git a/examples/overrides/d1-tag-next/tsconfig.json b/examples/overrides/d1-tag-next/tsconfig.json new file mode 100644 index 00000000..d8b93235 --- /dev/null +++ b/examples/overrides/d1-tag-next/tsconfig.json @@ -0,0 +1,27 @@ +{ + "compilerOptions": { + "target": "ES2017", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "bundler", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true, + "plugins": [ + { + "name": "next" + } + ], + "paths": { + "@/*": ["./*"] + } + }, + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], + "exclude": ["node_modules"] +} diff --git a/examples/overrides/d1-tag-next/wrangler.jsonc b/examples/overrides/d1-tag-next/wrangler.jsonc new file mode 100644 index 00000000..f2122ede --- /dev/null +++ b/examples/overrides/d1-tag-next/wrangler.jsonc @@ -0,0 +1,27 @@ +{ + "$schema": "node_modules/wrangler/config-schema.json", + "main": ".open-next/worker.js", + "name": "ssg-app", + "compatibility_date": "2025-02-04", + "compatibility_flags": ["nodejs_compat"], + "assets": { + "directory": ".open-next/assets", + "binding": "ASSETS" + }, + "vars": { + "APP_VERSION": "1.2.345" + }, + "kv_namespaces": [ + { + "binding": "NEXT_CACHE_WORKERS_KV", + "id": "" + } + ], + "d1_databases": [ + { + "binding": "NEXT_CACHE_D1", + "database_id": "NEXT_CACHE_D1", + "database_name": "NEXT_CACHE_D1" + } + ] +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7b31632a..6c448fd6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -683,6 +683,40 @@ importers: specifier: 'catalog:' version: 3.114.1(@cloudflare/workers-types@4.20250224.0) + examples/overrides/d1-tag-next: + dependencies: + next: + specifier: 15.1.7 + version: 15.1.7(@opentelemetry/api@1.9.0)(@playwright/test@1.47.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: + specifier: ^19.0.0 + version: 19.0.0 + react-dom: + specifier: ^19.0.0 + version: 19.0.0(react@19.0.0) + devDependencies: + '@opennextjs/cloudflare': + specifier: workspace:* + version: link:../../../packages/cloudflare + '@playwright/test': + specifier: 'catalog:' + version: 1.47.0 + '@types/node': + specifier: 'catalog:' + version: 22.2.0 + '@types/react': + specifier: ^19 + version: 19.0.8 + '@types/react-dom': + specifier: ^19 + version: 19.0.3(@types/react@19.0.8) + typescript: + specifier: 'catalog:' + version: 5.7.3 + wrangler: + specifier: 'catalog:' + version: 3.111.0(@cloudflare/workers-types@4.20250224.0) + examples/playground14: dependencies: next: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 866d972e..c03004c4 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -3,6 +3,7 @@ packages: - examples/* - examples/e2e/* - examples/bugs/* + - examples/overrides/* - "!examples/common" - benchmarking From 4ac16497bd38ae62ddf8364206b1c3b8c8f54700 Mon Sep 17 00:00:00 2001 From: Dorseuil Nicolas Date: Mon, 17 Mar 2025 11:36:14 +0100 Subject: [PATCH 3/6] don't crash on get --- .../cloudflare/src/api/d1-next-tag-cache.ts | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/packages/cloudflare/src/api/d1-next-tag-cache.ts b/packages/cloudflare/src/api/d1-next-tag-cache.ts index 1e7fd8f5..c960de53 100644 --- a/packages/cloudflare/src/api/d1-next-tag-cache.ts +++ b/packages/cloudflare/src/api/d1-next-tag-cache.ts @@ -1,4 +1,4 @@ -import { debug } from "@opennextjs/aws/adapters/logger.js"; +import { debug, error } from "@opennextjs/aws/adapters/logger.js"; import type { OpenNextConfig } from "@opennextjs/aws/types/open-next.js"; import type { NextModeTagCache } from "@opennextjs/aws/types/overrides.js"; import { RecoverableError } from "@opennextjs/aws/utils/error.js"; @@ -12,15 +12,22 @@ export class D1NextModeTagCache implements NextModeTagCache { async hasBeenRevalidated(tags: string[], lastModified?: number): Promise { const { isDisabled, db, tables } = this.getConfig(); if (isDisabled) return false; - const result = await db - .prepare( - `SELECT COUNT(*) as cnt FROM ${JSON.stringify(tables.revalidations)} WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ?` - ) - .bind(...tags.map((tag) => this.getCacheKey(tag)), lastModified ?? Date.now()) - .first<{ cnt: number }>(); - if (!result) throw new RecoverableError(`D1 select failed for ${tags}`); + try { + const result = await db + .prepare( + `SELECT COUNT(*) as cnt FROM ${JSON.stringify(tables.revalidations)} WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ?` + ) + .bind(...tags.map((tag) => this.getCacheKey(tag)), lastModified ?? Date.now()) + .first<{ cnt: number }>(); + if (!result) throw new RecoverableError(`D1 select failed for ${tags}`); - return result.cnt > 0; + return result.cnt > 0; + } catch (e) { + error(e); + // By default we don't want to crash here, so we return false + // We still log the error though so we can debug it + return false; + } } async writeTags(tags: string[]): Promise { From b1bd2a0e5177f516f22fdb4dd8572b9a05091e1e Mon Sep 17 00:00:00 2001 From: Dorseuil Nicolas Date: Mon, 17 Mar 2025 11:39:53 +0100 Subject: [PATCH 4/6] changeset --- .changeset/ten-mice-clean.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/ten-mice-clean.md diff --git a/.changeset/ten-mice-clean.md b/.changeset/ten-mice-clean.md new file mode 100644 index 00000000..81ee8dcc --- /dev/null +++ b/.changeset/ten-mice-clean.md @@ -0,0 +1,5 @@ +--- +"@opennextjs/cloudflare": patch +--- + +Implement next mode for d1 tag cache that will reduce write From b80781a7a733facbb4a44c49860a9b6bd00abe46 Mon Sep 17 00:00:00 2001 From: Dorseuil Nicolas Date: Wed, 19 Mar 2025 12:47:36 +0100 Subject: [PATCH 5/6] review --- packages/cloudflare/src/api/constants.ts | 1 + packages/cloudflare/src/api/d1-next-tag-cache.ts | 9 +++++---- packages/cloudflare/src/api/d1-tag-cache.ts | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 packages/cloudflare/src/api/constants.ts diff --git a/packages/cloudflare/src/api/constants.ts b/packages/cloudflare/src/api/constants.ts new file mode 100644 index 00000000..2fbe4055 --- /dev/null +++ b/packages/cloudflare/src/api/constants.ts @@ -0,0 +1 @@ +export const DEFAULT_NEXT_CACHE_D1_REVALIDATIONS_TABLE = "revalidations"; diff --git a/packages/cloudflare/src/api/d1-next-tag-cache.ts b/packages/cloudflare/src/api/d1-next-tag-cache.ts index c960de53..224d6f54 100644 --- a/packages/cloudflare/src/api/d1-next-tag-cache.ts +++ b/packages/cloudflare/src/api/d1-next-tag-cache.ts @@ -4,10 +4,11 @@ import type { NextModeTagCache } from "@opennextjs/aws/types/overrides.js"; import { RecoverableError } from "@opennextjs/aws/utils/error.js"; import { getCloudflareContext } from "./cloudflare-context.js"; +import { DEFAULT_NEXT_CACHE_D1_REVALIDATIONS_TABLE } from "./constants.js"; export class D1NextModeTagCache implements NextModeTagCache { - mode = "nextMode" as const; - name = "d1-next-mode-tag-cache"; + readonly mode = "nextMode" as const; + readonly name = "d1-next-mode-tag-cache"; async hasBeenRevalidated(tags: string[], lastModified?: number): Promise { const { isDisabled, db, tables } = this.getConfig(); @@ -15,7 +16,7 @@ export class D1NextModeTagCache implements NextModeTagCache { try { const result = await db .prepare( - `SELECT COUNT(*) as cnt FROM ${JSON.stringify(tables.revalidations)} WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ?` + `SELECT COUNT(*) as cnt FROM ${JSON.stringify(tables.revalidations)} WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ? LIMIT 1` ) .bind(...tags.map((tag) => this.getCacheKey(tag)), lastModified ?? Date.now()) .first<{ cnt: number }>(); @@ -60,7 +61,7 @@ export class D1NextModeTagCache implements NextModeTagCache { isDisabled: false as const, db, tables: { - revalidations: cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? "revalidations", + revalidations: cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? DEFAULT_NEXT_CACHE_D1_REVALIDATIONS_TABLE, }, }; } diff --git a/packages/cloudflare/src/api/d1-tag-cache.ts b/packages/cloudflare/src/api/d1-tag-cache.ts index 149e969d..b32ea6d0 100644 --- a/packages/cloudflare/src/api/d1-tag-cache.ts +++ b/packages/cloudflare/src/api/d1-tag-cache.ts @@ -4,6 +4,7 @@ import type { OriginalTagCache } from "@opennextjs/aws/types/overrides.js"; import { RecoverableError } from "@opennextjs/aws/utils/error.js"; import { getCloudflareContext } from "./cloudflare-context.js"; +import { DEFAULT_NEXT_CACHE_D1_REVALIDATIONS_TABLE } from "./constants.js"; /** * An instance of the Tag Cache that uses a D1 binding (`NEXT_CACHE_D1`) as it's underlying data store. @@ -154,7 +155,7 @@ class D1TagCache implements OriginalTagCache { db, tables: { tags: cfEnv.NEXT_CACHE_D1_TAGS_TABLE ?? "tags", - revalidations: cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? "revalidations", + revalidations: cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? DEFAULT_NEXT_CACHE_D1_REVALIDATIONS_TABLE, }, }; } From 3326da121038335b0111255d0a66b9a7d7dbf071 Mon Sep 17 00:00:00 2001 From: Dorseuil Nicolas Date: Wed, 19 Mar 2025 12:50:55 +0100 Subject: [PATCH 6/6] fix broken lockfile --- pnpm-lock.yaml | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6c448fd6..f286e900 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -715,7 +715,7 @@ importers: version: 5.7.3 wrangler: specifier: 'catalog:' - version: 3.111.0(@cloudflare/workers-types@4.20250224.0) + version: 3.114.1(@cloudflare/workers-types@4.20250224.0) examples/playground14: dependencies: @@ -16180,7 +16180,7 @@ snapshots: debug: 4.3.6 enhanced-resolve: 5.17.1 eslint: 8.57.1 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1) fast-glob: 3.3.2 get-tsconfig: 4.8.0 is-bun-module: 1.2.1 @@ -16199,7 +16199,7 @@ snapshots: debug: 4.3.6 enhanced-resolve: 5.17.1 eslint: 8.57.1 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1) fast-glob: 3.3.2 get-tsconfig: 4.8.0 is-bun-module: 1.2.1 @@ -16218,7 +16218,7 @@ snapshots: debug: 4.3.6 enhanced-resolve: 5.17.1 eslint: 9.11.1(jiti@1.21.6) - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1(jiti@1.21.6)) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.11.1(jiti@1.21.6)))(eslint@9.11.1(jiti@1.21.6)) fast-glob: 3.3.2 get-tsconfig: 4.8.0 is-bun-module: 1.2.1 @@ -16237,7 +16237,7 @@ snapshots: debug: 4.3.6 enhanced-resolve: 5.17.1 eslint: 9.19.0(jiti@1.21.6) - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@1.21.6)) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@1.21.6)))(eslint@9.19.0(jiti@1.21.6)) fast-glob: 3.3.2 get-tsconfig: 4.8.0 is-bun-module: 1.2.1 @@ -16250,7 +16250,18 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): + eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1): + dependencies: + debug: 3.2.7 + optionalDependencies: + '@typescript-eslint/parser': 8.7.0(eslint@8.57.1)(typescript@5.7.3) + eslint: 8.57.1 + eslint-import-resolver-node: 0.3.9 + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1) + transitivePeerDependencies: + - supports-color + + eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: @@ -16261,7 +16272,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1(jiti@1.21.6)): + eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.11.1(jiti@1.21.6)))(eslint@9.11.1(jiti@1.21.6)): dependencies: debug: 3.2.7 optionalDependencies: @@ -16272,7 +16283,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@1.21.6)): + eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@1.21.6)))(eslint@9.19.0(jiti@1.21.6)): dependencies: debug: 3.2.7 optionalDependencies: @@ -16283,7 +16294,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: @@ -16294,7 +16305,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1(jiti@1.21.6)): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.11.1(jiti@1.21.6)))(eslint@9.11.1(jiti@1.21.6)): dependencies: debug: 3.2.7 optionalDependencies: @@ -16305,7 +16316,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@1.21.6)): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@1.21.6)))(eslint@9.19.0(jiti@1.21.6)): dependencies: debug: 3.2.7 optionalDependencies: @@ -16327,7 +16338,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -16355,7 +16366,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -16384,7 +16395,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.11.1(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1(jiti@1.21.6)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.11.1(jiti@1.21.6)))(eslint@9.11.1(jiti@1.21.6)) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -16413,7 +16424,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.19.0(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@1.21.6)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@1.21.6)))(eslint@9.19.0(jiti@1.21.6)) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3