cdk-nextjs 0.7.4 → 0.7.6

package/lib/adapter/use-cache-default-handler.mjs

@@ -26825,7 +26825,7 @@ var require_dist_cjs13 = __commonJS({
     var { setCredentialFeature: setCredentialFeature2 } = (init_client3(), __toCommonJS(client_exports2));
     var { CredentialsProviderError: CredentialsProviderError2, parseKnownFiles: parseKnownFiles2, getProfileName: getProfileName2 } = (init_config2(), __toCommonJS(config_exports));
     var { HttpRequest: HttpRequest2 } = (init_protocols(), __toCommonJS(protocols_exports));
-    var { createHash: createHash5, createPrivateKey, createPublicKey, sign: sign2 } = __require("node:crypto");
+    var { createHash: createHash6, createPrivateKey, createPublicKey, sign: sign2 } = __require("node:crypto");
     var { promises } = __require("node:fs");
     var { homedir: homedir2 } = __require("node:os");
     var { dirname, join: join5 } = __require("node:path");
@@ -26994,7 +26994,7 @@ var require_dist_cjs13 = __commonJS({
       getTokenFilePath() {
         const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join5(homedir2(), ".aws", "login", "cache");
         const loginSessionBytes = Buffer.from(this.loginSession, "utf8");
-        const loginSessionSha256 = createHash5("sha256").update(loginSessionBytes).digest("hex");
+        const loginSessionSha256 = createHash6("sha256").update(loginSessionBytes).digest("hex");
         return join5(directory, `${loginSessionSha256}.json`);
       }
       derToRawSignature(derSignature) {
@@ -34170,6 +34170,14 @@ var import_debug5 = __toESM(require_src());
 
 // src/adapter/aws-cache-store.ts
 var import_client_dynamodb = __toESM(require_dist_cjs19());
+
+// src/adapter/cache-utils.ts
+import { createHash as createHash5 } from "node:crypto";
+function sha256Hex(value) {
+  return createHash5("sha256").update(value).digest("hex");
+}
+
+// src/adapter/aws-cache-store.ts
 function resolveAwsCacheConfig() {
   return {
     bucketName: process.env.CDK_NEXTJS_CACHE_BUCKET_NAME || "",
@@ -34232,6 +34240,13 @@ function markerOf(item) {
 }
 var BATCH_GET_MAX_KEYS = 100;
 var DEFAULT_TAG_REFRESH_MS = 1e3;
+function hashedTag(tag) {
+  return `#${sha256Hex(tag)}`;
+}
+var MAX_TAG_BYTES = 768;
+function sortKeyTag(tag) {
+  return Buffer.byteLength(tag) <= MAX_TAG_BYTES ? tag : hashedTag(tag);
+}
 var TagMarkerTable = class {
   constructor(client, tableName, buildId) {
     this.client = client;
@@ -34254,7 +34269,7 @@ var TagMarkerTable = class {
         TableName: this.tableName,
         Key: {
           pk: { S: this.buildId },
-          sk: { S: tag }
+          sk: { S: sortKeyTag(tag) }
         },
         ...markerUpdate(now, durations),
         ReturnValues: "ALL_NEW"
@@ -34274,7 +34289,13 @@ var TagMarkerTable = class {
     const unique = Array.from(new Set(tags));
     const markers = /* @__PURE__ */ new Map();
     for (let i5 = 0; i5 < unique.length; i5 += BATCH_GET_MAX_KEYS) {
-      let keys = unique.slice(i5, i5 + BATCH_GET_MAX_KEYS).map((tag) => ({ pk: { S: buildId }, sk: { S: tag } }));
+      const tagBySk = new Map(
+        unique.slice(i5, i5 + BATCH_GET_MAX_KEYS).map((tag) => [sortKeyTag(tag), tag])
+      );
+      let keys = Array.from(
+        tagBySk.keys(),
+        (sk) => ({ pk: { S: buildId }, sk: { S: sk } })
+      );
       for (let attempt = 0; keys?.length && attempt < 3; attempt++) {
         const response = await this.client.send(
           new import_client_dynamodb.BatchGetItemCommand({
@@ -34287,7 +34308,7 @@ var TagMarkerTable = class {
           })
         );
         for (const item of response.Responses?.[tableName] ?? []) {
-          const tag = item.sk?.S;
+          const tag = tagBySk.get(item.sk?.S ?? "");
           if (tag !== void 0) {
             markers.set(tag, markerOf(item));
           }
@@ -34325,11 +34346,13 @@ var RevalidationLog = class {
    * to {@link LOG_PUT_ATTEMPTS} times.
    */
   async put(tag, at, marker) {
+    const skTag = sortKeyTag(tag);
     for (let attempt = 1; ; attempt++) {
       const item = {
         pk: { S: this.pk },
-        sk: { S: `${logSkPrefix(at)}#${tag}` },
-        ttl: { N: String(Math.ceil((at + REVALIDATION_LOG_TTL_MS) / 1e3)) }
+        sk: { S: `${logSkPrefix(at)}#${skTag}` },
+        ttl: { N: String(Math.ceil((at + REVALIDATION_LOG_TTL_MS) / 1e3)) },
+        ...skTag !== tag && { longTag: { S: tag } }
       };
       for (const field of MARKER_FIELDS) {
         const value = marker[field];
@@ -34374,7 +34397,7 @@ var RevalidationLog = class {
             ":pk": { S: this.pk },
             ":since": { S: logSkPrefix(Math.max(0, since)) }
           },
-          ProjectionExpression: "sk, revalidatedAt, staleAt, expiredAt",
+          ProjectionExpression: "sk, longTag, revalidatedAt, staleAt, expiredAt",
           ExclusiveStartKey: startKey
         })
       );
@@ -34386,7 +34409,7 @@ var RevalidationLog = class {
         rows.push({
           sk,
           at: Number(sk.slice(0, LOG_SK_DIGITS)),
-          tag: sk.slice(LOG_SK_DIGITS + 1),
+          tag: item.longTag?.S ?? sk.slice(LOG_SK_DIGITS + 1),
           marker: markerOf(item)
         });
       }

package/lib/adapter/use-cache-remote-handler.js

@@ -16,7 +16,6 @@ exports.createRemoteUseCacheHandler = createRemoteUseCacheHandler;
   `'use cache'`.
 */
 /* eslint-disable import/no-extraneous-dependencies */
-const node_crypto_1 = require("node:crypto");
 const client_s3_1 = require("@aws-sdk/client-s3");
 const debug_1 = __importDefault(require("debug"));
 const aws_cache_store_1 = require("./aws-cache-store");
@@ -60,7 +59,7 @@ function createRemoteUseCacheHandler(options = {}) {
     const memory = new use_cache_common_1.EntryLru((0, use_cache_common_1.numberFromEnv)("CDK_NEXTJS_USE_CACHE_MEMORY_BYTES", use_cache_common_1.DEFAULT_MEMORY_BYTES));
     const pending = new use_cache_common_1.PendingSets();
     const debug = (0, debug_1.default)("cdk-nextjs:cache-handler:use-cache:remote");
-    const s3Key = (cacheKey) => (0, aws_cache_store_1.useCacheS3Key)(buildId, (0, node_crypto_1.createHash)("sha256").update(cacheKey).digest("hex"));
+    const s3Key = (cacheKey) => (0, aws_cache_store_1.useCacheS3Key)(buildId, (0, cache_utils_1.sha256Hex)(cacheKey));
     async function readFromS3(cacheKey) {
         if (!bucket) {
             return undefined;
@@ -183,4 +182,4 @@ function createRemoteUseCacheHandler(options = {}) {
     };
 }
 exports.default = (0, use_cache_common_1.lazyHandler)(() => createRemoteUseCacheHandler());
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"use-cache-remote-handler.js","sourceRoot":"","sources":["../../src/adapter/use-cache-remote-handler.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n  The `cacheHandlers.remote` handler, for `'use cache: remote'`.\n  See: https://nextjs.org/docs/app/api-reference/config/next-config-js/cacheHandlers\n\n  Entries are stored in the cache bucket, so every instance reads what any\n  instance wrote, with a bounded in-memory tier in front. Tags go through the\n  revalidation table's marker rows, shared with plain `'use cache'` and with the\n  incremental cache. Without this, Next.js maps `remote` to its in-memory\n  default handler, and `'use cache: remote'` is no more shared than\n  `'use cache'`.\n*/\n/* eslint-disable import/no-extraneous-dependencies */\nimport { createHash } from \"node:crypto\";\nimport { S3Client } from \"@aws-sdk/client-s3\";\nimport getDebug from \"debug\";\nimport type {\n  CacheEntry,\n  CacheHandler,\n} from \"next/dist/server/lib/cache-handlers/types\";\nimport {\n  CacheBucket,\n  resolveAwsCacheConfig,\n  TrackedTagMarkers,\n  useCacheS3Key,\n} from \"./aws-cache-store\";\nimport { parseCacheValue, serializeCacheValue } from \"./cache-utils\";\nimport {\n  cacheEntryOf,\n  DEFAULT_MEMORY_BYTES,\n  EntryLru,\n  isBuildPhase,\n  isDynamicEntry,\n  lazyHandler,\n  now,\n  numberFromEnv,\n  PendingSets,\n  sharedTagManifest,\n  StoredEntry,\n  storedEntryOf,\n  tagMethods,\n} from \"./use-cache-common\";\n\nexport interface RemoteUseCacheHandlerOptions {\n  /**\n   * The bucket entries are stored in, or `null` for memory only. From\n   * `CDK_NEXTJS_CACHE_BUCKET_NAME` by default, and never at build time.\n   */\n  bucket?: CacheBucket | null;\n  /** Prefixes every S3 key; `CDK_NEXTJS_BUILD_ID` by default. */\n  buildId?: string;\n  /** Tag state; the process-wide one from the environment by default. */\n  tags?: TrackedTagMarkers;\n}\n\n/** What is written to S3 for one entry. */\ninterface SerializedEntry extends Omit<StoredEntry, \"value\"> {\n  /** The full cache key, checked on read; the object key is only its hash. */\n  key: string;\n  value: Buffer;\n}\n\nfunction bucketFromEnv(): CacheBucket | null {\n  if (isBuildPhase()) {\n    // No credentials, and nothing a build-time entry could be read back by:\n    // prerenders keep what they need in their own resume data cache.\n    return null;\n  }\n  const { bucketName, region } = resolveAwsCacheConfig();\n  if (!bucketName) {\n    console.warn(\n      \"CDK_NEXTJS_CACHE_BUCKET_NAME environment variable not set, 'use cache: remote' entries are local to each instance\",\n    );\n    return null;\n  }\n  return new CacheBucket(new S3Client({ region }), bucketName);\n}\n\n/** Whether `stored` is past `revalidate`, so a fresher copy may exist. */\nfunction isPastRevalidate(stored: StoredEntry, at: number): boolean {\n  return at > stored.timestamp + stored.revalidate * 1000;\n}\n\n/** Whether `stored` is past `expire`, and may no longer be served at all. */\nfunction isPastExpire(stored: StoredEntry, at: number): boolean {\n  return at > stored.timestamp + stored.expire * 1000;\n}\n\n/**\n * A `'use cache: remote'` handler: S3 for storage, memory in front, and the\n * revalidation table for tags.\n *\n * Unlike the default handler an entry is served until `expire`, not dropped at\n * `revalidate`: a remote read is worth serving stale while Next.js's wrapper\n * regenerates it in the background, which is what `revalidate` is for. A memory\n * copy past `revalidate` is checked against S3 first, since another instance may\n * already have written the regenerated entry.\n */\nexport function createRemoteUseCacheHandler(\n  options: RemoteUseCacheHandlerOptions = {},\n): CacheHandler {\n  const bucket =\n    options.bucket === undefined ? bucketFromEnv() : options.bucket;\n  const buildId = options.buildId ?? resolveAwsCacheConfig().buildId;\n  const tags = options.tags ?? sharedTagManifest();\n  const memory = new EntryLru(\n    numberFromEnv(\"CDK_NEXTJS_USE_CACHE_MEMORY_BYTES\", DEFAULT_MEMORY_BYTES),\n  );\n  const pending = new PendingSets();\n  const debug = getDebug(\"cdk-nextjs:cache-handler:use-cache:remote\");\n\n  const s3Key = (cacheKey: string) =>\n    useCacheS3Key(buildId, createHash(\"sha256\").update(cacheKey).digest(\"hex\"));\n\n  async function readFromS3(\n    cacheKey: string,\n  ): Promise<StoredEntry | undefined> {\n    if (!bucket) {\n      return undefined;\n    }\n    const key = s3Key(cacheKey);\n    try {\n      const object = await bucket.get(key);\n      if (!object) {\n        debug(`S3 MISS ${cacheKey}`);\n        return undefined;\n      }\n      const parsed = parseCacheValue(object) as SerializedEntry;\n      if (parsed.key !== cacheKey) {\n        // A hash collision, or an object that is not ours: never serve it.\n        console.warn(`'use cache: remote' entry ${key} is for another key`);\n        return undefined;\n      }\n      return {\n        tags: parsed.tags,\n        stale: parsed.stale,\n        timestamp: parsed.timestamp,\n        expire: parsed.expire,\n        revalidate: parsed.revalidate,\n        value: new Uint8Array(parsed.value),\n      };\n    } catch (error) {\n      console.error(\n        `Error reading 'use cache: remote' entry ${key} from S3:`,\n        error,\n      );\n      return undefined;\n    }\n  }\n\n  async function writeToS3(cacheKey: string, stored: StoredEntry) {\n    if (!bucket) {\n      return;\n    }\n    const key = s3Key(cacheKey);\n    const serialized: SerializedEntry = {\n      ...stored,\n      key: cacheKey,\n      value: Buffer.from(stored.value),\n    };\n    try {\n      await bucket.putJson(key, serializeCacheValue(serialized));\n      debug(`S3 SET ${cacheKey} (${key})`);\n    } catch (error) {\n      // The entry is still in memory here; other instances just miss.\n      console.error(\n        `Error writing 'use cache: remote' entry ${key} to S3:`,\n        error,\n      );\n    }\n  }\n\n  return {\n    async get(cacheKey: string): Promise<CacheEntry | undefined> {\n      await pending.wait(cacheKey);\n      const at = now();\n\n      let stored = memory.get(cacheKey);\n      if (stored) {\n        await tags.ensure(stored.tags);\n      }\n\n      // Past `revalidate`, or stale or expired by tag: another instance may\n      // already have written the regenerated entry, and serving that beats\n      // regenerating it here too. An expired entry S3 has nothing newer for is\n      // dropped below.\n      if (\n        !stored ||\n        isPastRevalidate(stored, at) ||\n        tags.state(stored.tags, stored.timestamp) !== \"fresh\"\n      ) {\n        const fromS3 = await readFromS3(cacheKey);\n        if (fromS3 && (!stored || fromS3.timestamp > stored.timestamp)) {\n          stored = fromS3;\n          // An entry written by another instance: its tags may have been\n          // revalidated at any time since, so they are read before judging it.\n          await tags.ensure(stored.tags);\n          memory.set(cacheKey, stored);\n        }\n      }\n\n      if (!stored) {\n        debug(`MISS ${cacheKey}`);\n        return undefined;\n      }\n      if (isPastExpire(stored, at)) {\n        debug(`EXPIRED ${cacheKey}`);\n        memory.delete(cacheKey);\n        return undefined;\n      }\n      const state = tags.state(stored.tags, stored.timestamp);\n      if (state === \"expired\") {\n        debug(`EXPIRED BY TAG ${cacheKey}`);\n        memory.delete(cacheKey);\n        return undefined;\n      }\n      debug(`HIT ${cacheKey}${state === \"stale\" ? \" (stale tag)\" : \"\"}`);\n      // `revalidate: -1` makes the wrapper serve the entry and regenerate it in\n      // the background, the built-in handler's answer to a stale tag.\n      return cacheEntryOf(stored, state === \"stale\" ? -1 : stored.revalidate);\n    },\n\n    async set(\n      cacheKey: string,\n      pendingEntry: Promise<CacheEntry>,\n    ): Promise<void> {\n      const done = pending.begin(cacheKey);\n      let stored: StoredEntry;\n      try {\n        stored = await storedEntryOf(pendingEntry);\n      } catch (error) {\n        // The stream errored: store nothing rather than a partial entry.\n        debug(`SET FAILED ${cacheKey}`, error);\n        done();\n        return;\n      }\n      if (isDynamicEntry(stored)) {\n        debug(`SKIP dynamic entry ${cacheKey}`);\n        done();\n        return;\n      }\n      memory.set(cacheKey, stored);\n      tags.track(stored.tags);\n      // A `get` waiting on this `set` can be answered from memory now; only\n      // other instances need the S3 copy.\n      done();\n      await writeToS3(cacheKey, stored);\n    },\n\n    ...tagMethods(tags),\n  };\n}\n\nexport default lazyHandler(() => createRemoteUseCacheHandler());\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"use-cache-remote-handler.js","sourceRoot":"","sources":["../../src/adapter/use-cache-remote-handler.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n  The `cacheHandlers.remote` handler, for `'use cache: remote'`.\n  See: https://nextjs.org/docs/app/api-reference/config/next-config-js/cacheHandlers\n\n  Entries are stored in the cache bucket, so every instance reads what any\n  instance wrote, with a bounded in-memory tier in front. Tags go through the\n  revalidation table's marker rows, shared with plain `'use cache'` and with the\n  incremental cache. Without this, Next.js maps `remote` to its in-memory\n  default handler, and `'use cache: remote'` is no more shared than\n  `'use cache'`.\n*/\n/* eslint-disable import/no-extraneous-dependencies */\nimport { S3Client } from \"@aws-sdk/client-s3\";\nimport getDebug from \"debug\";\nimport type {\n  CacheEntry,\n  CacheHandler,\n} from \"next/dist/server/lib/cache-handlers/types\";\nimport {\n  CacheBucket,\n  resolveAwsCacheConfig,\n  TrackedTagMarkers,\n  useCacheS3Key,\n} from \"./aws-cache-store\";\nimport { parseCacheValue, serializeCacheValue, sha256Hex } from \"./cache-utils\";\nimport {\n  cacheEntryOf,\n  DEFAULT_MEMORY_BYTES,\n  EntryLru,\n  isBuildPhase,\n  isDynamicEntry,\n  lazyHandler,\n  now,\n  numberFromEnv,\n  PendingSets,\n  sharedTagManifest,\n  StoredEntry,\n  storedEntryOf,\n  tagMethods,\n} from \"./use-cache-common\";\n\nexport interface RemoteUseCacheHandlerOptions {\n  /**\n   * The bucket entries are stored in, or `null` for memory only. From\n   * `CDK_NEXTJS_CACHE_BUCKET_NAME` by default, and never at build time.\n   */\n  bucket?: CacheBucket | null;\n  /** Prefixes every S3 key; `CDK_NEXTJS_BUILD_ID` by default. */\n  buildId?: string;\n  /** Tag state; the process-wide one from the environment by default. */\n  tags?: TrackedTagMarkers;\n}\n\n/** What is written to S3 for one entry. */\ninterface SerializedEntry extends Omit<StoredEntry, \"value\"> {\n  /** The full cache key, checked on read; the object key is only its hash. */\n  key: string;\n  value: Buffer;\n}\n\nfunction bucketFromEnv(): CacheBucket | null {\n  if (isBuildPhase()) {\n    // No credentials, and nothing a build-time entry could be read back by:\n    // prerenders keep what they need in their own resume data cache.\n    return null;\n  }\n  const { bucketName, region } = resolveAwsCacheConfig();\n  if (!bucketName) {\n    console.warn(\n      \"CDK_NEXTJS_CACHE_BUCKET_NAME environment variable not set, 'use cache: remote' entries are local to each instance\",\n    );\n    return null;\n  }\n  return new CacheBucket(new S3Client({ region }), bucketName);\n}\n\n/** Whether `stored` is past `revalidate`, so a fresher copy may exist. */\nfunction isPastRevalidate(stored: StoredEntry, at: number): boolean {\n  return at > stored.timestamp + stored.revalidate * 1000;\n}\n\n/** Whether `stored` is past `expire`, and may no longer be served at all. */\nfunction isPastExpire(stored: StoredEntry, at: number): boolean {\n  return at > stored.timestamp + stored.expire * 1000;\n}\n\n/**\n * A `'use cache: remote'` handler: S3 for storage, memory in front, and the\n * revalidation table for tags.\n *\n * Unlike the default handler an entry is served until `expire`, not dropped at\n * `revalidate`: a remote read is worth serving stale while Next.js's wrapper\n * regenerates it in the background, which is what `revalidate` is for. A memory\n * copy past `revalidate` is checked against S3 first, since another instance may\n * already have written the regenerated entry.\n */\nexport function createRemoteUseCacheHandler(\n  options: RemoteUseCacheHandlerOptions = {},\n): CacheHandler {\n  const bucket =\n    options.bucket === undefined ? bucketFromEnv() : options.bucket;\n  const buildId = options.buildId ?? resolveAwsCacheConfig().buildId;\n  const tags = options.tags ?? sharedTagManifest();\n  const memory = new EntryLru(\n    numberFromEnv(\"CDK_NEXTJS_USE_CACHE_MEMORY_BYTES\", DEFAULT_MEMORY_BYTES),\n  );\n  const pending = new PendingSets();\n  const debug = getDebug(\"cdk-nextjs:cache-handler:use-cache:remote\");\n\n  const s3Key = (cacheKey: string) =>\n    useCacheS3Key(buildId, sha256Hex(cacheKey));\n\n  async function readFromS3(\n    cacheKey: string,\n  ): Promise<StoredEntry | undefined> {\n    if (!bucket) {\n      return undefined;\n    }\n    const key = s3Key(cacheKey);\n    try {\n      const object = await bucket.get(key);\n      if (!object) {\n        debug(`S3 MISS ${cacheKey}`);\n        return undefined;\n      }\n      const parsed = parseCacheValue(object) as SerializedEntry;\n      if (parsed.key !== cacheKey) {\n        // A hash collision, or an object that is not ours: never serve it.\n        console.warn(`'use cache: remote' entry ${key} is for another key`);\n        return undefined;\n      }\n      return {\n        tags: parsed.tags,\n        stale: parsed.stale,\n        timestamp: parsed.timestamp,\n        expire: parsed.expire,\n        revalidate: parsed.revalidate,\n        value: new Uint8Array(parsed.value),\n      };\n    } catch (error) {\n      console.error(\n        `Error reading 'use cache: remote' entry ${key} from S3:`,\n        error,\n      );\n      return undefined;\n    }\n  }\n\n  async function writeToS3(cacheKey: string, stored: StoredEntry) {\n    if (!bucket) {\n      return;\n    }\n    const key = s3Key(cacheKey);\n    const serialized: SerializedEntry = {\n      ...stored,\n      key: cacheKey,\n      value: Buffer.from(stored.value),\n    };\n    try {\n      await bucket.putJson(key, serializeCacheValue(serialized));\n      debug(`S3 SET ${cacheKey} (${key})`);\n    } catch (error) {\n      // The entry is still in memory here; other instances just miss.\n      console.error(\n        `Error writing 'use cache: remote' entry ${key} to S3:`,\n        error,\n      );\n    }\n  }\n\n  return {\n    async get(cacheKey: string): Promise<CacheEntry | undefined> {\n      await pending.wait(cacheKey);\n      const at = now();\n\n      let stored = memory.get(cacheKey);\n      if (stored) {\n        await tags.ensure(stored.tags);\n      }\n\n      // Past `revalidate`, or stale or expired by tag: another instance may\n      // already have written the regenerated entry, and serving that beats\n      // regenerating it here too. An expired entry S3 has nothing newer for is\n      // dropped below.\n      if (\n        !stored ||\n        isPastRevalidate(stored, at) ||\n        tags.state(stored.tags, stored.timestamp) !== \"fresh\"\n      ) {\n        const fromS3 = await readFromS3(cacheKey);\n        if (fromS3 && (!stored || fromS3.timestamp > stored.timestamp)) {\n          stored = fromS3;\n          // An entry written by another instance: its tags may have been\n          // revalidated at any time since, so they are read before judging it.\n          await tags.ensure(stored.tags);\n          memory.set(cacheKey, stored);\n        }\n      }\n\n      if (!stored) {\n        debug(`MISS ${cacheKey}`);\n        return undefined;\n      }\n      if (isPastExpire(stored, at)) {\n        debug(`EXPIRED ${cacheKey}`);\n        memory.delete(cacheKey);\n        return undefined;\n      }\n      const state = tags.state(stored.tags, stored.timestamp);\n      if (state === \"expired\") {\n        debug(`EXPIRED BY TAG ${cacheKey}`);\n        memory.delete(cacheKey);\n        return undefined;\n      }\n      debug(`HIT ${cacheKey}${state === \"stale\" ? \" (stale tag)\" : \"\"}`);\n      // `revalidate: -1` makes the wrapper serve the entry and regenerate it in\n      // the background, the built-in handler's answer to a stale tag.\n      return cacheEntryOf(stored, state === \"stale\" ? -1 : stored.revalidate);\n    },\n\n    async set(\n      cacheKey: string,\n      pendingEntry: Promise<CacheEntry>,\n    ): Promise<void> {\n      const done = pending.begin(cacheKey);\n      let stored: StoredEntry;\n      try {\n        stored = await storedEntryOf(pendingEntry);\n      } catch (error) {\n        // The stream errored: store nothing rather than a partial entry.\n        debug(`SET FAILED ${cacheKey}`, error);\n        done();\n        return;\n      }\n      if (isDynamicEntry(stored)) {\n        debug(`SKIP dynamic entry ${cacheKey}`);\n        done();\n        return;\n      }\n      memory.set(cacheKey, stored);\n      tags.track(stored.tags);\n      // A `get` waiting on this `set` can be answered from memory now; only\n      // other instances need the S3 copy.\n      done();\n      await writeToS3(cacheKey, stored);\n    },\n\n    ...tagMethods(tags),\n  };\n}\n\nexport default lazyHandler(() => createRemoteUseCacheHandler());\n"]}

package/lib/adapter/use-cache-remote-handler.mjs

@@ -46261,12 +46261,69 @@ var require_dist_cjs20 = __commonJS({
 // src/adapter/use-cache-remote-handler.ts
 var import_client_s32 = __toESM(require_dist_cjs16());
 var import_debug6 = __toESM(require_src());
-import { createHash as createHash6 } from "node:crypto";
 
 // src/adapter/aws-cache-store.ts
 var import_client_dynamodb = __toESM(require_dist_cjs20());
 var import_client_s3 = __toESM(require_dist_cjs16());
 import { join as join5 } from "node:path";
+
+// src/adapter/cache-utils.ts
+import { createHash as createHash6 } from "node:crypto";
+function preprocessValue(value) {
+  if (value == null) {
+    return value;
+  }
+  if (Buffer.isBuffer(value)) {
+    return {
+      __type: "Buffer",
+      base64: value.toString("base64")
+    };
+  }
+  if (value instanceof Map) {
+    const entries = {};
+    for (const [key, val] of value.entries()) {
+      entries[key] = preprocessValue(val);
+    }
+    return {
+      __type: "Map",
+      data: entries
+    };
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => preprocessValue(item));
+  }
+  if (typeof value === "object") {
+    const processed = {};
+    for (const [key, val] of Object.entries(value)) {
+      processed[key] = preprocessValue(val);
+    }
+    return processed;
+  }
+  return value;
+}
+function serializeCacheValue(value) {
+  const processed = preprocessValue(value);
+  return JSON.stringify(processed);
+}
+function parseCacheValue(jsonString) {
+  return JSON.parse(jsonString, (_key, val) => {
+    if (val && typeof val === "object" && val.__type === "Map") {
+      return new Map(Object.entries(val.data));
+    }
+    if (val && typeof val === "object" && val.__type === "Buffer") {
+      return typeof val.base64 === "string" ? Buffer.from(val.base64, "base64") : Buffer.from(val.data);
+    }
+    if (val && typeof val === "object" && val.type === "Buffer" && Array.isArray(val.data)) {
+      return Buffer.from(val.data);
+    }
+    return val;
+  });
+}
+function sha256Hex(value) {
+  return createHash6("sha256").update(value).digest("hex");
+}
+
+// src/adapter/aws-cache-store.ts
 function resolveAwsCacheConfig() {
   return {
     bucketName: process.env.CDK_NEXTJS_CACHE_BUCKET_NAME || "",
@@ -46333,6 +46390,13 @@ function markerOf(item) {
 }
 var BATCH_GET_MAX_KEYS = 100;
 var DEFAULT_TAG_REFRESH_MS = 1e3;
+function hashedTag(tag) {
+  return `#${sha256Hex(tag)}`;
+}
+var MAX_TAG_BYTES = 768;
+function sortKeyTag(tag) {
+  return Buffer.byteLength(tag) <= MAX_TAG_BYTES ? tag : hashedTag(tag);
+}
 var TagMarkerTable = class {
   constructor(client, tableName, buildId) {
     this.client = client;
@@ -46355,7 +46419,7 @@ var TagMarkerTable = class {
         TableName: this.tableName,
         Key: {
           pk: { S: this.buildId },
-          sk: { S: tag }
+          sk: { S: sortKeyTag(tag) }
         },
         ...markerUpdate(now, durations),
         ReturnValues: "ALL_NEW"
@@ -46375,7 +46439,13 @@ var TagMarkerTable = class {
     const unique = Array.from(new Set(tags));
     const markers = /* @__PURE__ */ new Map();
     for (let i5 = 0; i5 < unique.length; i5 += BATCH_GET_MAX_KEYS) {
-      let keys = unique.slice(i5, i5 + BATCH_GET_MAX_KEYS).map((tag) => ({ pk: { S: buildId }, sk: { S: tag } }));
+      const tagBySk = new Map(
+        unique.slice(i5, i5 + BATCH_GET_MAX_KEYS).map((tag) => [sortKeyTag(tag), tag])
+      );
+      let keys = Array.from(
+        tagBySk.keys(),
+        (sk) => ({ pk: { S: buildId }, sk: { S: sk } })
+      );
       for (let attempt = 0; keys?.length && attempt < 3; attempt++) {
         const response = await this.client.send(
           new import_client_dynamodb.BatchGetItemCommand({
@@ -46388,7 +46458,7 @@ var TagMarkerTable = class {
           })
         );
         for (const item of response.Responses?.[tableName] ?? []) {
-          const tag = item.sk?.S;
+          const tag = tagBySk.get(item.sk?.S ?? "");
           if (tag !== void 0) {
             markers.set(tag, markerOf(item));
           }
@@ -46426,11 +46496,13 @@ var RevalidationLog = class {
    * to {@link LOG_PUT_ATTEMPTS} times.
    */
   async put(tag, at, marker) {
+    const skTag = sortKeyTag(tag);
     for (let attempt = 1; ; attempt++) {
       const item = {
         pk: { S: this.pk },
-        sk: { S: `${logSkPrefix(at)}#${tag}` },
-        ttl: { N: String(Math.ceil((at + REVALIDATION_LOG_TTL_MS) / 1e3)) }
+        sk: { S: `${logSkPrefix(at)}#${skTag}` },
+        ttl: { N: String(Math.ceil((at + REVALIDATION_LOG_TTL_MS) / 1e3)) },
+        ...skTag !== tag && { longTag: { S: tag } }
       };
       for (const field of MARKER_FIELDS) {
         const value = marker[field];
@@ -46475,7 +46547,7 @@ var RevalidationLog = class {
             ":pk": { S: this.pk },
             ":since": { S: logSkPrefix(Math.max(0, since)) }
           },
-          ProjectionExpression: "sk, revalidatedAt, staleAt, expiredAt",
+          ProjectionExpression: "sk, longTag, revalidatedAt, staleAt, expiredAt",
           ExclusiveStartKey: startKey
         })
       );
@@ -46487,7 +46559,7 @@ var RevalidationLog = class {
         rows.push({
           sk,
           at: Number(sk.slice(0, LOG_SK_DIGITS)),
-          tag: sk.slice(LOG_SK_DIGITS + 1),
+          tag: item.longTag?.S ?? sk.slice(LOG_SK_DIGITS + 1),
           marker: markerOf(item)
         });
       }
@@ -47036,58 +47108,6 @@ var CacheBucket = class {
   }
 };
 
-// src/adapter/cache-utils.ts
-function preprocessValue(value) {
-  if (value == null) {
-    return value;
-  }
-  if (Buffer.isBuffer(value)) {
-    return {
-      __type: "Buffer",
-      base64: value.toString("base64")
-    };
-  }
-  if (value instanceof Map) {
-    const entries = {};
-    for (const [key, val] of value.entries()) {
-      entries[key] = preprocessValue(val);
-    }
-    return {
-      __type: "Map",
-      data: entries
-    };
-  }
-  if (Array.isArray(value)) {
-    return value.map((item) => preprocessValue(item));
-  }
-  if (typeof value === "object") {
-    const processed = {};
-    for (const [key, val] of Object.entries(value)) {
-      processed[key] = preprocessValue(val);
-    }
-    return processed;
-  }
-  return value;
-}
-function serializeCacheValue(value) {
-  const processed = preprocessValue(value);
-  return JSON.stringify(processed);
-}
-function parseCacheValue(jsonString) {
-  return JSON.parse(jsonString, (_key, val) => {
-    if (val && typeof val === "object" && val.__type === "Map") {
-      return new Map(Object.entries(val.data));
-    }
-    if (val && typeof val === "object" && val.__type === "Buffer") {
-      return typeof val.base64 === "string" ? Buffer.from(val.base64, "base64") : Buffer.from(val.data);
-    }
-    if (val && typeof val === "object" && val.type === "Buffer" && Array.isArray(val.data)) {
-      return Buffer.from(val.data);
-    }
-    return val;
-  });
-}
-
 // src/adapter/use-cache-common.ts
 var import_client_dynamodb2 = __toESM(require_dist_cjs20());
 var import_debug5 = __toESM(require_src());
@@ -47293,7 +47313,7 @@ function createRemoteUseCacheHandler(options = {}) {
   );
   const pending = new PendingSets();
   const debug = (0, import_debug6.default)("cdk-nextjs:cache-handler:use-cache:remote");
-  const s3Key = (cacheKey) => useCacheS3Key(buildId, createHash6("sha256").update(cacheKey).digest("hex"));
+  const s3Key = (cacheKey) => useCacheS3Key(buildId, sha256Hex(cacheKey));
   async function readFromS3(cacheKey) {
     if (!bucket) {
       return void 0;

package/lib/nextjs-api.js

@@ -22,7 +22,7 @@ const API_PATH_PART = /^[a-zA-Z0-9:._\-$]+$/;
  * Creates an API Gateway REST API for Next.js applications
  */
 class NextjsApi extends constructs_1.Construct {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "cdk-nextjs.NextjsApi", version: "0.7.4" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "cdk-nextjs.NextjsApi", version: "0.7.6" };
     /**
      * The API Gateway REST API
      */

package/lib/nextjs-build/nextjs-build.d.ts

@@ -81,13 +81,6 @@ export interface NextjsFunctionGroupBehavior {
  * natively, so it can only match the synth machine.
  */
 export declare function deploymentArchitecture(props: NextjsBuildProps): Architecture;
-/** {@link NextjsBuild.buildId}: Next.js's build ID, suffixed with the app's `deploymentId`. */
-export declare function deploymentBuildId(manifest: {
-    readonly buildId: string;
-    readonly config: {
-        readonly deploymentId: string;
-    };
-}): string;
 export interface PublicDirEntry {
     readonly name: string;
     readonly isDirectory: boolean;