cdk-nextjs 0.6.2 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.jsii +2404 -2723
- package/.jsii.tabl.json +1 -1
- package/API.md +1681 -1930
- package/CLAUDE.md +2 -1
- package/README.md +429 -130
- package/assets/lambdas/post-deploy/post-deploy.lambda/index.js +148 -169
- package/assets/lambdas/redeploy-stage/redeploy-stage.lambda/index.js +875 -0
- package/docs/adapter-runtime.md +185 -0
- package/docs/breaking-changes.md +667 -4
- package/docs/caching-guide.md +156 -112
- package/docs/cdk-nextjs-cfn-exec-policy.json +2 -1
- package/docs/development-guide.md +1 -1
- package/docs/harness-coverage.md +598 -0
- package/docs/init-cache-deployment.md +32 -1
- package/docs/next-build-output-guide.md +30 -20
- package/examples/README.md +5 -1
- package/lib/adapter/__fixtures__/app-playground-base-path.json +4926 -0
- package/lib/adapter/__fixtures__/app-playground.json +4917 -0
- package/lib/adapter/__fixtures__/pages-i18n.json +1728 -0
- package/lib/adapter/adapter.mjs +1548 -185
- package/lib/adapter/adapter.test.js +106 -0
- package/lib/adapter/aws-cache-store.d.ts +489 -0
- package/lib/adapter/aws-cache-store.js +1004 -0
- package/lib/adapter/aws-cache-store.test.d.ts +1 -0
- package/lib/adapter/aws-cache-store.test.js +361 -0
- package/lib/adapter/build-outputs.d.ts +80 -0
- package/lib/adapter/build-outputs.js +852 -0
- package/lib/adapter/build-outputs.test.d.ts +1 -0
- package/lib/adapter/build-outputs.test.js +861 -0
- package/lib/adapter/cache-handler.d.ts +9 -2
- package/lib/adapter/cache-handler.js +72 -96
- package/lib/adapter/cache-handler.mjs +18956 -17774
- package/lib/adapter/cache-handler.test.js +263 -31
- package/lib/adapter/cache-kinds.d.ts +32 -0
- package/lib/adapter/cache-kinds.js +35 -0
- package/lib/adapter/cache-kinds.test.d.ts +1 -0
- package/lib/adapter/cache-kinds.test.js +69 -0
- package/lib/adapter/cache-utils.d.ts +90 -0
- package/lib/adapter/cache-utils.js +199 -4
- package/lib/adapter/cache-utils.test.d.ts +1 -0
- package/lib/adapter/cache-utils.test.js +179 -0
- package/lib/adapter/function-groups.d.ts +215 -0
- package/lib/adapter/function-groups.js +1099 -0
- package/lib/adapter/function-groups.test.d.ts +1 -0
- package/lib/adapter/function-groups.test.js +743 -0
- package/lib/adapter/init-cache.d.ts +6 -0
- package/lib/adapter/init-cache.js +245 -0
- package/lib/adapter/init-cache.test.d.ts +1 -0
- package/lib/adapter/init-cache.test.js +137 -0
- package/lib/adapter/local-file-cache-handler.d.ts +23 -0
- package/lib/adapter/local-file-cache-handler.js +52 -1
- package/lib/adapter/memory-cache-handler.d.ts +26 -17
- package/lib/adapter/memory-cache-handler.js +32 -50
- package/lib/adapter/memory-cache-handler.test.js +105 -85
- package/lib/adapter/s3-cache-handler.d.ts +179 -40
- package/lib/adapter/s3-cache-handler.js +807 -277
- package/lib/adapter/s3-cache-handler.test.js +1186 -31
- package/lib/adapter/use-cache-common.d.ts +90 -0
- package/lib/adapter/use-cache-common.js +250 -0
- package/lib/adapter/use-cache-common.test.d.ts +1 -0
- package/lib/adapter/use-cache-common.test.js +646 -0
- package/lib/adapter/use-cache-default-handler.d.ts +24 -0
- package/lib/adapter/use-cache-default-handler.js +90 -0
- package/lib/adapter/use-cache-default-handler.mjs +38645 -0
- package/lib/adapter/use-cache-handlers.test.d.ts +1 -0
- package/lib/adapter/use-cache-handlers.test.js +349 -0
- package/lib/adapter/use-cache-remote-handler.d.ts +26 -0
- package/lib/adapter/use-cache-remote-handler.js +186 -0
- package/lib/{image-optimization/handler.mjs → adapter/use-cache-remote-handler.mjs} +33572 -38798
- package/lib/generated-structs/OptionalNextjsApiProps.d.ts +59 -0
- package/lib/generated-structs/OptionalNextjsApiProps.js +3 -0
- package/lib/generated-structs/OptionalNextjsCacheProps.d.ts +15 -6
- package/lib/generated-structs/OptionalNextjsCacheProps.js +1 -1
- package/lib/generated-structs/OptionalNextjsContainersProps.d.ts +25 -11
- package/lib/generated-structs/OptionalNextjsContainersProps.js +1 -1
- package/lib/generated-structs/OptionalNextjsDistributionProps.d.ts +31 -9
- package/lib/generated-structs/OptionalNextjsDistributionProps.js +1 -1
- package/lib/generated-structs/OptionalNextjsPostDeployProps.d.ts +8 -0
- package/lib/generated-structs/OptionalNextjsPostDeployProps.js +1 -1
- package/lib/generated-structs/OptionalPostDeployCustomResourceProperties.d.ts +6 -4
- package/lib/generated-structs/OptionalPostDeployCustomResourceProperties.js +1 -1
- package/lib/index.d.ts +6 -7
- package/lib/index.js +2 -4
- package/lib/lambdas/post-deploy/prune-cache-bucket.d.ts +7 -3
- package/lib/lambdas/post-deploy/prune-cache-bucket.js +57 -71
- package/lib/lambdas/post-deploy/prune-cache-bucket.test.d.ts +1 -0
- package/lib/lambdas/post-deploy/prune-cache-bucket.test.js +114 -0
- package/lib/lambdas/post-deploy/prune-revalidation-table.d.ts +1 -0
- package/lib/lambdas/post-deploy/prune-revalidation-table.js +23 -31
- package/lib/lambdas/post-deploy/prune-revalidation-table.test.d.ts +1 -0
- package/lib/lambdas/post-deploy/prune-revalidation-table.test.js +71 -0
- package/lib/lambdas/post-deploy/prune-s3.d.ts +14 -5
- package/lib/lambdas/post-deploy/prune-s3.js +41 -12
- package/lib/lambdas/post-deploy/prune-s3.test.js +97 -18
- package/lib/lambdas/redeploy-stage/redeploy-stage-function.d.ts +13 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage-function.js +55 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.d.ts +24 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.js +68 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.lambda.d.ts +20 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.lambda.js +24 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.test.d.ts +1 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.test.js +93 -0
- package/lib/nextjs-api.d.ts +102 -18
- package/lib/nextjs-api.js +338 -38
- package/lib/nextjs-api.test.js +537 -1
- package/lib/nextjs-build/global-containers.Dockerfile +15 -10
- package/lib/nextjs-build/nextjs-build.d.ts +339 -63
- package/lib/nextjs-build/nextjs-build.js +684 -327
- package/lib/nextjs-build/nextjs-build.test.d.ts +1 -0
- package/lib/nextjs-build/nextjs-build.test.js +412 -0
- package/lib/nextjs-build/patch-fetch.js +1 -1
- package/lib/nextjs-build/patch-fetch.test.js +166 -11
- package/lib/nextjs-build/regional-containers.Dockerfile +17 -10
- package/lib/nextjs-cache.d.ts +82 -4
- package/lib/nextjs-cache.js +186 -10
- package/lib/nextjs-cache.test.js +176 -1
- package/lib/nextjs-compute/nextjs-compute-base-props.d.ts +21 -8
- package/lib/nextjs-compute/nextjs-compute-base-props.js +41 -1
- package/lib/nextjs-compute/nextjs-compute-base-props.test.d.ts +1 -0
- package/lib/nextjs-compute/nextjs-compute-base-props.test.js +44 -0
- package/lib/nextjs-compute/nextjs-containers.d.ts +19 -0
- package/lib/nextjs-compute/nextjs-containers.js +57 -20
- package/lib/nextjs-compute/nextjs-functions.d.ts +122 -7
- package/lib/nextjs-compute/nextjs-functions.js +113 -67
- package/lib/nextjs-compute/nextjs-functions.test.d.ts +1 -0
- package/lib/nextjs-compute/nextjs-functions.test.js +99 -0
- package/lib/nextjs-distribution.d.ts +194 -23
- package/lib/nextjs-distribution.js +535 -62
- package/lib/nextjs-distribution.test.d.ts +1 -0
- package/lib/nextjs-distribution.test.js +697 -0
- package/lib/nextjs-post-deploy.d.ts +13 -5
- package/lib/nextjs-post-deploy.js +13 -10
- package/lib/nextjs-post-deploy.test.d.ts +1 -0
- package/lib/nextjs-post-deploy.test.js +34 -0
- package/lib/nextjs-static-assets.d.ts +17 -4
- package/lib/nextjs-static-assets.js +22 -5
- package/lib/root-constructs/nextjs-base-construct.d.ts +102 -58
- package/lib/root-constructs/nextjs-base-construct.js +139 -47
- package/lib/root-constructs/nextjs-global-containers.d.ts +18 -20
- package/lib/root-constructs/nextjs-global-containers.js +20 -71
- package/lib/root-constructs/nextjs-global-functions.d.ts +26 -28
- package/lib/root-constructs/nextjs-global-functions.js +52 -70
- package/lib/root-constructs/nextjs-regional-containers.d.ts +18 -5
- package/lib/root-constructs/nextjs-regional-containers.js +8 -15
- package/lib/root-constructs/nextjs-regional-functions.d.ts +22 -18
- package/lib/root-constructs/nextjs-regional-functions.js +8 -26
- package/lib/runtime/api-gateway-path.d.ts +34 -0
- package/lib/runtime/api-gateway-path.js +71 -0
- package/lib/runtime/api-gateway-path.test.d.ts +1 -0
- package/lib/runtime/api-gateway-path.test.js +65 -0
- package/lib/runtime/case-redirect.d.ts +22 -0
- package/lib/runtime/case-redirect.js +63 -0
- package/lib/runtime/case-redirect.test.d.ts +1 -0
- package/lib/runtime/case-redirect.test.js +32 -0
- package/lib/runtime/core.d.ts +234 -0
- package/lib/runtime/core.js +1213 -0
- package/lib/runtime/core.test.d.ts +1 -0
- package/lib/runtime/core.test.js +1678 -0
- package/lib/runtime/deployment-root.d.ts +13 -0
- package/lib/runtime/deployment-root.js +29 -0
- package/lib/runtime/dispatch.d.ts +331 -0
- package/lib/runtime/dispatch.js +751 -0
- package/lib/runtime/dispatch.test.d.ts +1 -0
- package/lib/runtime/dispatch.test.js +853 -0
- package/lib/runtime/entrypoints.d.ts +57 -0
- package/lib/runtime/entrypoints.js +115 -0
- package/lib/runtime/http/abort-signal.d.ts +6 -0
- package/lib/runtime/http/abort-signal.js +19 -0
- package/lib/runtime/http/abort-signal.test.d.ts +1 -0
- package/lib/runtime/http/abort-signal.test.js +49 -0
- package/lib/runtime/http/node-server.d.ts +38 -0
- package/lib/runtime/http/node-server.js +99 -0
- package/lib/runtime/http/node-server.test.d.ts +1 -0
- package/lib/runtime/http/node-server.test.js +96 -0
- package/lib/runtime/http/node-sink.d.ts +16 -0
- package/lib/runtime/http/node-sink.js +48 -0
- package/lib/runtime/http/node-sink.test.d.ts +1 -0
- package/lib/runtime/http/node-sink.test.js +66 -0
- package/lib/runtime/http/request.d.ts +62 -0
- package/lib/runtime/http/request.js +134 -0
- package/lib/runtime/http/request.test.d.ts +1 -0
- package/lib/runtime/http/request.test.js +103 -0
- package/lib/runtime/http/response.d.ts +77 -0
- package/lib/runtime/http/response.js +229 -0
- package/lib/runtime/http/response.test.d.ts +1 -0
- package/lib/runtime/http/response.test.js +178 -0
- package/lib/runtime/http/sink.d.ts +73 -0
- package/lib/runtime/http/sink.js +188 -0
- package/lib/runtime/http/sink.test.d.ts +1 -0
- package/lib/runtime/http/sink.test.js +257 -0
- package/lib/runtime/image-utils.d.ts +78 -0
- package/lib/runtime/image-utils.js +129 -0
- package/lib/runtime/image-utils.test.d.ts +1 -0
- package/lib/runtime/image-utils.test.js +237 -0
- package/lib/runtime/image.d.ts +76 -0
- package/lib/runtime/image.js +296 -0
- package/lib/runtime/image.test.d.ts +1 -0
- package/lib/runtime/image.test.js +405 -0
- package/lib/runtime/lambda-event.d.ts +4 -0
- package/lib/runtime/lambda-event.js +113 -0
- package/lib/runtime/lambda-event.test.d.ts +1 -0
- package/lib/runtime/lambda-event.test.js +119 -0
- package/lib/runtime/lambda.mjs +41595 -0
- package/lib/runtime/load-module.d.ts +8 -0
- package/lib/runtime/load-module.js +35 -0
- package/lib/runtime/manifest.d.ts +215 -0
- package/lib/runtime/manifest.js +118 -0
- package/lib/runtime/middleware.d.ts +43 -0
- package/lib/runtime/middleware.js +113 -0
- package/lib/runtime/middleware.test.d.ts +1 -0
- package/lib/runtime/middleware.test.js +259 -0
- package/lib/runtime/next-modules.d.ts +55 -0
- package/lib/runtime/next-modules.js +124 -0
- package/lib/runtime/next-modules.test.d.ts +1 -0
- package/lib/runtime/next-modules.test.js +34 -0
- package/lib/runtime/public-files.d.ts +32 -0
- package/lib/runtime/public-files.js +117 -0
- package/lib/runtime/public-files.test.d.ts +1 -0
- package/lib/runtime/public-files.test.js +97 -0
- package/lib/runtime/server.mjs +41588 -0
- package/lib/runtime/static-files.d.ts +50 -0
- package/lib/runtime/static-files.js +266 -0
- package/lib/runtime/static-files.test.d.ts +1 -0
- package/lib/runtime/static-files.test.js +118 -0
- package/lib/runtime/util.d.ts +28 -0
- package/lib/runtime/util.js +79 -0
- package/lib/utils/base-path.d.ts +106 -13
- package/lib/utils/base-path.js +254 -41
- package/lib/utils/base-path.test.js +219 -51
- package/lib/utils/get-architecture.d.ts +7 -8
- package/lib/utils/get-architecture.js +12 -13
- package/lib/utils/zip-directory.d.ts +14 -0
- package/lib/utils/zip-directory.js +121 -0
- package/lib/utils/zip-directory.test.d.ts +1 -0
- package/lib/utils/zip-directory.test.js +99 -0
- package/package.json +22 -3
- package/scripts/capture-adapter-fixture.mjs +325 -0
- package/scripts/e2e-deploy.sh +398 -0
- package/scripts/e2e-harness/README.md +707 -0
- package/scripts/e2e-harness/app.js +370 -0
- package/scripts/e2e-harness/common.sh +249 -0
- package/scripts/e2e-harness/screen.mjs +302 -0
- package/scripts/e2e-harness/stage-proxy.mjs +145 -0
- package/scripts/e2e-harness/type-filters.mjs +47 -0
- package/scripts/e2e-logs.sh +75 -0
- package/scripts/e2e-offline.sh +91 -0
- package/scripts/e2e-sweep.sh +370 -0
- package/scripts/e2e-warm.sh +114 -0
- package/scripts/zero-config-build.mjs +418 -0
- package/docs/1k-concurrent-users-executions.png +0 -0
- package/docs/plans/adapter-runtime-release.md +0 -362
- package/docs/plans/phase-0-image-function-opt-in.md +0 -295
- package/lib/generated-structs/OptionalDockerImageFunctionProps.d.ts +0 -425
- package/lib/generated-structs/OptionalDockerImageFunctionProps.js +0 -3
- package/lib/image-optimization/handler-utils.d.ts +0 -34
- package/lib/image-optimization/handler-utils.js +0 -83
- package/lib/image-optimization/handler-utils.test.js +0 -178
- package/lib/nextjs-build/functions.Dockerfile +0 -31
- package/lib/nextjs-compute/nextjs-image-function.d.ts +0 -53
- package/lib/nextjs-compute/nextjs-image-function.js +0 -59
- package/lib/utils/experimental-flags.d.ts +0 -24
- package/lib/utils/experimental-flags.js +0 -30
- /package/lib/{image-optimization/handler-utils.test.d.ts → adapter/adapter.test.d.ts} +0 -0
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.createRemoteUseCacheHandler = createRemoteUseCacheHandler;
|
|
7
|
+
/*
|
|
8
|
+
The `cacheHandlers.remote` handler, for `'use cache: remote'`.
|
|
9
|
+
See: https://nextjs.org/docs/app/api-reference/config/next-config-js/cacheHandlers
|
|
10
|
+
|
|
11
|
+
Entries are stored in the cache bucket, so every instance reads what any
|
|
12
|
+
instance wrote, with a bounded in-memory tier in front. Tags go through the
|
|
13
|
+
revalidation table's marker rows, shared with plain `'use cache'` and with the
|
|
14
|
+
incremental cache. Without this, Next.js maps `remote` to its in-memory
|
|
15
|
+
default handler, and `'use cache: remote'` is no more shared than
|
|
16
|
+
`'use cache'`.
|
|
17
|
+
*/
|
|
18
|
+
/* eslint-disable import/no-extraneous-dependencies */
|
|
19
|
+
const node_crypto_1 = require("node:crypto");
|
|
20
|
+
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
21
|
+
const debug_1 = __importDefault(require("debug"));
|
|
22
|
+
const aws_cache_store_1 = require("./aws-cache-store");
|
|
23
|
+
const cache_utils_1 = require("./cache-utils");
|
|
24
|
+
const use_cache_common_1 = require("./use-cache-common");
|
|
25
|
+
function bucketFromEnv() {
|
|
26
|
+
if ((0, use_cache_common_1.isBuildPhase)()) {
|
|
27
|
+
// No credentials, and nothing a build-time entry could be read back by:
|
|
28
|
+
// prerenders keep what they need in their own resume data cache.
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
const { bucketName, region } = (0, aws_cache_store_1.resolveAwsCacheConfig)();
|
|
32
|
+
if (!bucketName) {
|
|
33
|
+
console.warn("CDK_NEXTJS_CACHE_BUCKET_NAME environment variable not set, 'use cache: remote' entries are local to each instance");
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
36
|
+
return new aws_cache_store_1.CacheBucket(new client_s3_1.S3Client({ region }), bucketName);
|
|
37
|
+
}
|
|
38
|
+
/** Whether `stored` is past `revalidate`, so a fresher copy may exist. */
|
|
39
|
+
function isPastRevalidate(stored, at) {
|
|
40
|
+
return at > stored.timestamp + stored.revalidate * 1000;
|
|
41
|
+
}
|
|
42
|
+
/** Whether `stored` is past `expire`, and may no longer be served at all. */
|
|
43
|
+
function isPastExpire(stored, at) {
|
|
44
|
+
return at > stored.timestamp + stored.expire * 1000;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* A `'use cache: remote'` handler: S3 for storage, memory in front, and the
|
|
48
|
+
* revalidation table for tags.
|
|
49
|
+
*
|
|
50
|
+
* Unlike the default handler an entry is served until `expire`, not dropped at
|
|
51
|
+
* `revalidate`: a remote read is worth serving stale while Next.js's wrapper
|
|
52
|
+
* regenerates it in the background, which is what `revalidate` is for. A memory
|
|
53
|
+
* copy past `revalidate` is checked against S3 first, since another instance may
|
|
54
|
+
* already have written the regenerated entry.
|
|
55
|
+
*/
|
|
56
|
+
function createRemoteUseCacheHandler(options = {}) {
|
|
57
|
+
const bucket = options.bucket === undefined ? bucketFromEnv() : options.bucket;
|
|
58
|
+
const buildId = options.buildId ?? (0, aws_cache_store_1.resolveAwsCacheConfig)().buildId;
|
|
59
|
+
const tags = options.tags ?? (0, use_cache_common_1.sharedTagManifest)();
|
|
60
|
+
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));
|
|
61
|
+
const pending = new use_cache_common_1.PendingSets();
|
|
62
|
+
const debug = (0, debug_1.default)("cdk-nextjs:cache-handler:use-cache:remote");
|
|
63
|
+
const s3Key = (cacheKey) => (0, aws_cache_store_1.useCacheS3Key)(buildId, (0, node_crypto_1.createHash)("sha256").update(cacheKey).digest("hex"));
|
|
64
|
+
async function readFromS3(cacheKey) {
|
|
65
|
+
if (!bucket) {
|
|
66
|
+
return undefined;
|
|
67
|
+
}
|
|
68
|
+
const key = s3Key(cacheKey);
|
|
69
|
+
try {
|
|
70
|
+
const object = await bucket.get(key);
|
|
71
|
+
if (!object) {
|
|
72
|
+
debug(`S3 MISS ${cacheKey}`);
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
const parsed = (0, cache_utils_1.parseCacheValue)(object);
|
|
76
|
+
if (parsed.key !== cacheKey) {
|
|
77
|
+
// A hash collision, or an object that is not ours: never serve it.
|
|
78
|
+
console.warn(`'use cache: remote' entry ${key} is for another key`);
|
|
79
|
+
return undefined;
|
|
80
|
+
}
|
|
81
|
+
return {
|
|
82
|
+
tags: parsed.tags,
|
|
83
|
+
stale: parsed.stale,
|
|
84
|
+
timestamp: parsed.timestamp,
|
|
85
|
+
expire: parsed.expire,
|
|
86
|
+
revalidate: parsed.revalidate,
|
|
87
|
+
value: new Uint8Array(parsed.value),
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
catch (error) {
|
|
91
|
+
console.error(`Error reading 'use cache: remote' entry ${key} from S3:`, error);
|
|
92
|
+
return undefined;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
async function writeToS3(cacheKey, stored) {
|
|
96
|
+
if (!bucket) {
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
const key = s3Key(cacheKey);
|
|
100
|
+
const serialized = {
|
|
101
|
+
...stored,
|
|
102
|
+
key: cacheKey,
|
|
103
|
+
value: Buffer.from(stored.value),
|
|
104
|
+
};
|
|
105
|
+
try {
|
|
106
|
+
await bucket.putJson(key, (0, cache_utils_1.serializeCacheValue)(serialized));
|
|
107
|
+
debug(`S3 SET ${cacheKey} (${key})`);
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
// The entry is still in memory here; other instances just miss.
|
|
111
|
+
console.error(`Error writing 'use cache: remote' entry ${key} to S3:`, error);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
return {
|
|
115
|
+
async get(cacheKey) {
|
|
116
|
+
await pending.wait(cacheKey);
|
|
117
|
+
const at = (0, use_cache_common_1.now)();
|
|
118
|
+
let stored = memory.get(cacheKey);
|
|
119
|
+
if (stored) {
|
|
120
|
+
await tags.ensure(stored.tags);
|
|
121
|
+
}
|
|
122
|
+
// Past `revalidate`, or stale or expired by tag: another instance may
|
|
123
|
+
// already have written the regenerated entry, and serving that beats
|
|
124
|
+
// regenerating it here too. An expired entry S3 has nothing newer for is
|
|
125
|
+
// dropped below.
|
|
126
|
+
if (!stored ||
|
|
127
|
+
isPastRevalidate(stored, at) ||
|
|
128
|
+
tags.state(stored.tags, stored.timestamp) !== "fresh") {
|
|
129
|
+
const fromS3 = await readFromS3(cacheKey);
|
|
130
|
+
if (fromS3 && (!stored || fromS3.timestamp > stored.timestamp)) {
|
|
131
|
+
stored = fromS3;
|
|
132
|
+
// An entry written by another instance: its tags may have been
|
|
133
|
+
// revalidated at any time since, so they are read before judging it.
|
|
134
|
+
await tags.ensure(stored.tags);
|
|
135
|
+
memory.set(cacheKey, stored);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
if (!stored) {
|
|
139
|
+
debug(`MISS ${cacheKey}`);
|
|
140
|
+
return undefined;
|
|
141
|
+
}
|
|
142
|
+
if (isPastExpire(stored, at)) {
|
|
143
|
+
debug(`EXPIRED ${cacheKey}`);
|
|
144
|
+
memory.delete(cacheKey);
|
|
145
|
+
return undefined;
|
|
146
|
+
}
|
|
147
|
+
const state = tags.state(stored.tags, stored.timestamp);
|
|
148
|
+
if (state === "expired") {
|
|
149
|
+
debug(`EXPIRED BY TAG ${cacheKey}`);
|
|
150
|
+
memory.delete(cacheKey);
|
|
151
|
+
return undefined;
|
|
152
|
+
}
|
|
153
|
+
debug(`HIT ${cacheKey}${state === "stale" ? " (stale tag)" : ""}`);
|
|
154
|
+
// `revalidate: -1` makes the wrapper serve the entry and regenerate it in
|
|
155
|
+
// the background, the built-in handler's answer to a stale tag.
|
|
156
|
+
return (0, use_cache_common_1.cacheEntryOf)(stored, state === "stale" ? -1 : stored.revalidate);
|
|
157
|
+
},
|
|
158
|
+
async set(cacheKey, pendingEntry) {
|
|
159
|
+
const done = pending.begin(cacheKey);
|
|
160
|
+
let stored;
|
|
161
|
+
try {
|
|
162
|
+
stored = await (0, use_cache_common_1.storedEntryOf)(pendingEntry);
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
// The stream errored: store nothing rather than a partial entry.
|
|
166
|
+
debug(`SET FAILED ${cacheKey}`, error);
|
|
167
|
+
done();
|
|
168
|
+
return;
|
|
169
|
+
}
|
|
170
|
+
if ((0, use_cache_common_1.isDynamicEntry)(stored)) {
|
|
171
|
+
debug(`SKIP dynamic entry ${cacheKey}`);
|
|
172
|
+
done();
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
memory.set(cacheKey, stored);
|
|
176
|
+
tags.track(stored.tags);
|
|
177
|
+
// A `get` waiting on this `set` can be answered from memory now; only
|
|
178
|
+
// other instances need the S3 copy.
|
|
179
|
+
done();
|
|
180
|
+
await writeToS3(cacheKey, stored);
|
|
181
|
+
},
|
|
182
|
+
...(0, use_cache_common_1.tagMethods)(tags),
|
|
183
|
+
};
|
|
184
|
+
}
|
|
185
|
+
exports.default = (0, use_cache_common_1.lazyHandler)(() => createRemoteUseCacheHandler());
|
|
186
|
+
//# 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"]}
|