cdk-nextjs 0.7.12 → 0.7.13

package/lib/utils/viewer-request-functions.d.ts

@@ -0,0 +1,53 @@
+/**
+ * The code of cdk-nextjs's CloudFront Functions, and of `viewerRequestFunctionCode`
+ * spliced into them. Plain strings: `NextjsDistribution` creates the functions.
+ */
+/**
+ * Where a viewer-request handler calls `viewerRequestFunctionCode`, before any
+ * logic of its own. Replaced at synth, never deployed.
+ */
+export declare const VIEWER_REQUEST_HOOK = "/*@viewerRequest@*/";
+/**
+ * CloudFront's maximum CloudFront Function size.
+ * @see https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cloudfront-limits.html#limits-functions
+ */
+export declare const MAX_FUNCTION_CODE_BYTES: number;
+/**
+ * NextjsGlobalFunctions' viewer-request handler: redirects repeated slashes,
+ * and overwrites `x-forwarded-host` with the viewer's `Host` so Next.js
+ * `request.url` is the site's domain rather than the Function URL's.
+ * @see https://open-next.js.org/advanced/workaround#workaround-set-x-forwarded-host-header-aws-specific
+ */
+export declare const X_FORWARDED_HOST_HANDLER = "\n  async function handler(event) {/*@viewerRequest@*/\n    const request = event.request;\n    const uri = request.uri;\n\n    if (/\\\\|\\/\\//.test(uri)) {\n      let location = uri.replace(/\\\\/g, \"/\").replace(/\\/\\/+/g, \"/\");\n      const qs = [];\n      Object.keys(request.querystring).forEach((name) => {\n        const q = request.querystring[name];\n        (q.multiValue || [q]).forEach((entry) => {\n          qs.push(entry.value === \"\" ? name : name + \"=\" + entry.value);\n        });\n      });\n      if (qs.length) {\n        location += \"?\" + qs.join(\"&\");\n      }\n      return {\n        statusCode: 308,\n        statusDescription: \"Permanent Redirect\",\n        headers: { location: { value: location } },\n      };\n    }\n\n    request.headers[\"x-forwarded-host\"] = request.headers.host;\n    return request;\n  }\n  ";
+/**
+ * The handler of a behavior with no viewer-request logic of its own, which
+ * only runs `viewerRequestFunctionCode`.
+ */
+export declare const PASS_THROUGH_HANDLER = "\n  async function handler(event) {/*@viewerRequest@*/\n    return event.request;\n  }\n  ";
+/**
+ * The `assetPrefix` behavior's handler: an S3 origin keys on the request URI
+ * and `originPath` can only prepend, so the prefix is swapped for the
+ * `basePath` here. Both are synth-time literals.
+ */
+export declare function assetPrefixRewriteHandler(basePath: string, assetPrefix: string): string;
+/**
+ * Checks `viewerRequestFunctionCode` defines `viewerRequest` and doesn't use
+ * the name `handler`.
+ *
+ * Any use of `handler` is refused, not just a declaration: an assignment
+ * (`var handler =`, destructuring, `globalThis["handler"] =`) would replace
+ * cdk-nextjs's handler, and with it the `x-forwarded-host` overwrite, and a
+ * `let`/`const`/`class` would make the file a syntax error. Telling these
+ * apart from a local of the same name takes a parser, so a local, or the
+ * word in a comment or string, is refused too; that errs towards refusing
+ * code that would have worked.
+ */
+export declare function checkViewerRequestCode(userCode: string): void;
+/**
+ * The deployed code of a cdk-nextjs handler: with `userCode` first in the file
+ * (where CloudFront wants `import cf from "cloudfront"`) and awaited where the
+ * handler says {@link VIEWER_REQUEST_HOOK}, or with the marker dropped when
+ * there is none. Indentation is dropped too, since it counts toward the
+ * 10 KB; none of this code has a multi-line string for that to change.
+ */
+export declare function spliceViewerRequest(handler: string, userCode: string | undefined): string;

package/lib/utils/viewer-request-functions.js

@@ -0,0 +1,172 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PASS_THROUGH_HANDLER = exports.X_FORWARDED_HOST_HANDLER = exports.MAX_FUNCTION_CODE_BYTES = exports.VIEWER_REQUEST_HOOK = void 0;
+exports.assetPrefixRewriteHandler = assetPrefixRewriteHandler;
+exports.checkViewerRequestCode = checkViewerRequestCode;
+exports.spliceViewerRequest = spliceViewerRequest;
+const constants_1 = require("../constants");
+/**
+ * The code of cdk-nextjs's CloudFront Functions, and of `viewerRequestFunctionCode`
+ * spliced into them. Plain strings: `NextjsDistribution` creates the functions.
+ */
+/**
+ * Where a viewer-request handler calls `viewerRequestFunctionCode`, before any
+ * logic of its own. Replaced at synth, never deployed.
+ */
+exports.VIEWER_REQUEST_HOOK = "/*@viewerRequest@*/";
+/**
+ * CloudFront's maximum CloudFront Function size.
+ * @see https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cloudfront-limits.html#limits-functions
+ */
+exports.MAX_FUNCTION_CODE_BYTES = 10 * 1024;
+// Next.js answers any path containing a backslash or a repeated
+// slash with a 308 to the collapsed path
+// (`normalizeRepeatedSlashes`, called from `base-server.ts`), and so
+// does this runtime. Behind a Lambda Function URL the origin never
+// gets the chance: Origin Access Control signs the raw path while the
+// Function URL canonicalizes it before verifying, so the origin
+// answers 403 SignatureDoesNotMatch. Doing the redirect here is what
+// makes `/basepath//to-sv` behave as it does under `next start`.
+//
+// A bare `//` reaches here too, and is answered the same way -
+// measured, because `//` at the start of a request target is also the
+// authority form and it was not obvious CloudFront would route it to a
+// function at all. It does: `GET //` answers 308 to `/` with
+// `x-cache: FunctionGeneratedResponse`, over both HTTP/1.1 and HTTP/2,
+// which is what `test/e2e/hydration` asks for.
+//
+// Two things Next.js does that this does not:
+//
+// - the body it sends with its own redirect (the destination, as
+//   text). A generated response can carry one on
+//   cloudfront-js-2.0, but none is sent yet; no known client reads
+//   it.
+// - the original order of the query string. The event exposes
+//   `querystring` as an object, never as the raw string, so
+//   `/x//y?a=1&b=2` redirects to `/x/y?b=2&a=1`. The pairs all
+//   survive; only their order is CloudFront's rather than the
+//   client's, and a redirect target is not order-sensitive.
+//
+// A repeated key's `multiValue` already holds its first value, which
+// `value` repeats, so it is one or the other, never both. Names and
+// values arrive as the client sent them, still percent-encoded
+// (measured: `?a=%20b%26c&p=1+2` reads back unchanged), so they are
+// joined as-is; encoding them again would turn `%20` into `%2520`.
+//
+// These notes live out here rather than in the code because
+// CloudFront counts comments toward the function's 10 KB, which
+// `viewerRequestFunctionCode` shares.
+//
+// Only the ES6+ that cloudfront-js-2.0 documents: `const`/`let`, arrow
+// functions, `Object.keys`; no destructuring, spread or `for...of`.
+// Strings are concatenated rather than templated, since a template
+// literal in here would need every backtick and `${` escaped.
+// https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/functions-javascript-runtime-20.html
+/**
+ * NextjsGlobalFunctions' viewer-request handler: redirects repeated slashes,
+ * and overwrites `x-forwarded-host` with the viewer's `Host` so Next.js
+ * `request.url` is the site's domain rather than the Function URL's.
+ * @see https://open-next.js.org/advanced/workaround#workaround-set-x-forwarded-host-header-aws-specific
+ */
+exports.X_FORWARDED_HOST_HANDLER = `
+  async function handler(event) {${exports.VIEWER_REQUEST_HOOK}
+    const request = event.request;
+    const uri = request.uri;
+
+    if (/\\\\|\\/\\//.test(uri)) {
+      let location = uri.replace(/\\\\/g, "/").replace(/\\/\\/+/g, "/");
+      const qs = [];
+      Object.keys(request.querystring).forEach((name) => {
+        const q = request.querystring[name];
+        (q.multiValue || [q]).forEach((entry) => {
+          qs.push(entry.value === "" ? name : name + "=" + entry.value);
+        });
+      });
+      if (qs.length) {
+        location += "?" + qs.join("&");
+      }
+      return {
+        statusCode: 308,
+        statusDescription: "Permanent Redirect",
+        headers: { location: { value: location } },
+      };
+    }
+
+    request.headers["x-forwarded-host"] = request.headers.host;
+    return request;
+  }
+  `;
+/**
+ * The handler of a behavior with no viewer-request logic of its own, which
+ * only runs `viewerRequestFunctionCode`.
+ */
+exports.PASS_THROUGH_HANDLER = `
+  async function handler(event) {${exports.VIEWER_REQUEST_HOOK}
+    return event.request;
+  }
+  `;
+/**
+ * The `assetPrefix` behavior's handler: an S3 origin keys on the request URI
+ * and `originPath` can only prepend, so the prefix is swapped for the
+ * `basePath` here. Both are synth-time literals.
+ */
+function assetPrefixRewriteHandler(basePath, assetPrefix) {
+    return `
+  async function handler(event) {${exports.VIEWER_REQUEST_HOOK}
+    const request = event.request;
+    request.uri = ${JSON.stringify(basePath ? `/${basePath}` : "")} + request.uri.slice(${assetPrefix.length});
+    return request;
+  }
+  `;
+}
+/**
+ * Checks `viewerRequestFunctionCode` defines `viewerRequest` and doesn't use
+ * the name `handler`.
+ *
+ * Any use of `handler` is refused, not just a declaration: an assignment
+ * (`var handler =`, destructuring, `globalThis["handler"] =`) would replace
+ * cdk-nextjs's handler, and with it the `x-forwarded-host` overwrite, and a
+ * `let`/`const`/`class` would make the file a syntax error. Telling these
+ * apart from a local of the same name takes a parser, so a local, or the
+ * word in a comment or string, is refused too; that errs towards refusing
+ * code that would have worked.
+ */
+function checkViewerRequestCode(userCode) {
+    if (!/\bfunction\s+viewerRequest\s*\(|(?:\b(?:var|let|const)\s+|,\s*)viewerRequest\s*=(?!=)/.test(userCode)) {
+        throw new Error(`${constants_1.LOG_PREFIX} \`viewerRequestFunctionCode\` must define ` +
+            `\`viewerRequest(event)\`, as a function or a \`var\`/\`let\`/` +
+            `\`const\`, which cdk-nextjs calls from its own viewer-request ` +
+            `handler.`);
+    }
+    if (/\bhandler\b/.test(userCode)) {
+        throw new Error(`${constants_1.LOG_PREFIX} \`viewerRequestFunctionCode\` uses the name ` +
+            `\`handler\`, which is cdk-nextjs's own function in the same file. ` +
+            `Rename it (a mention in a comment or string counts too); your entry ` +
+            `point is \`viewerRequest\`, called with the same event, and it may ` +
+            `return the same request or response.`);
+    }
+}
+/**
+ * The deployed code of a cdk-nextjs handler: with `userCode` first in the file
+ * (where CloudFront wants `import cf from "cloudfront"`) and awaited where the
+ * handler says {@link VIEWER_REQUEST_HOOK}, or with the marker dropped when
+ * there is none. Indentation is dropped too, since it counts toward the
+ * 10 KB; none of this code has a multi-line string for that to change.
+ */
+function spliceViewerRequest(handler, userCode) {
+    const dedent = (code) => code.replace(/^[ \t]+/gm, "");
+    if (userCode === undefined) {
+        return dedent(handler.replace(exports.VIEWER_REQUEST_HOOK, ""));
+    }
+    // A response has a status; anything else returned is the request to carry
+    // on with. `await` takes a synchronous `viewerRequest` as it is.
+    return `${userCode}\n${dedent(handler.replace(exports.VIEWER_REQUEST_HOOK, `
+      const viewerResult = await viewerRequest(event);
+      if (viewerResult && viewerResult.statusCode) {
+        return viewerResult;
+      }
+      if (viewerResult) {
+        event.request = viewerResult;
+      }`))}`;
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"viewer-request-functions.js","sourceRoot":"","sources":["../../src/utils/viewer-request-functions.ts"],"names":[],"mappings":";;;AAiHA,8DAaC;AAcD,wDAsBC;AASD,kDAuBC;AAlMD,4CAA0C;AAE1C;;;GAGG;AAEH;;;GAGG;AACU,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;AAEzD;;;GAGG;AACU,QAAA,uBAAuB,GAAG,EAAE,GAAG,IAAI,CAAC;AAEjD,gEAAgE;AAChE,yCAAyC;AACzC,qEAAqE;AACrE,mEAAmE;AACnE,sEAAsE;AACtE,gEAAgE;AAChE,qEAAqE;AACrE,iEAAiE;AACjE,EAAE;AACF,+DAA+D;AAC/D,sEAAsE;AACtE,uEAAuE;AACvE,6DAA6D;AAC7D,uEAAuE;AACvE,+CAA+C;AAC/C,EAAE;AACF,8CAA8C;AAC9C,EAAE;AACF,iEAAiE;AACjE,iDAAiD;AACjD,mEAAmE;AACnE,QAAQ;AACR,8DAA8D;AAC9D,4DAA4D;AAC5D,+DAA+D;AAC/D,8DAA8D;AAC9D,4DAA4D;AAC5D,EAAE;AACF,qEAAqE;AACrE,oEAAoE;AACpE,+DAA+D;AAC/D,oEAAoE;AACpE,mEAAmE;AACnE,EAAE;AACF,4DAA4D;AAC5D,gEAAgE;AAChE,sCAAsC;AACtC,EAAE;AACF,uEAAuE;AACvE,oEAAoE;AACpE,mEAAmE;AACnE,8DAA8D;AAC9D,0GAA0G;AAE1G;;;;;GAKG;AACU,QAAA,wBAAwB,GAAG;mCACL,2BAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BnD,CAAC;AAEJ;;;GAGG;AACU,QAAA,oBAAoB,GAAG;mCACD,2BAAmB;;;GAGnD,CAAC;AAEJ;;;;GAIG;AACH,SAAgB,yBAAyB,CACvC,QAAgB,EAChB,WAAmB;IAEnB,OAAO;mCAC0B,2BAAmB;;oBAElC,IAAI,CAAC,SAAS,CAC5B,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAC/B,wBAAwB,WAAW,CAAC,MAAM;;;GAG5C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,sBAAsB,CAAC,QAAgB;IACrD,IACE,CAAC,uFAAuF,CAAC,IAAI,CAC3F,QAAQ,CACT,EACD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,GAAG,sBAAU,6CAA6C;YACxD,+DAA+D;YAC/D,gEAAgE;YAChE,UAAU,CACb,CAAC;IACJ,CAAC;IACD,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,GAAG,sBAAU,+CAA+C;YAC1D,oEAAoE;YACpE,sEAAsE;YACtE,qEAAqE;YACrE,sCAAsC,CACzC,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,OAAe,EACf,QAA4B;IAE5B,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC/D,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,2BAAmB,EAAE,EAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;IACD,0EAA0E;IAC1E,iEAAiE;IACjE,OAAO,GAAG,QAAQ,KAAK,MAAM,CAC3B,OAAO,CAAC,OAAO,CACb,2BAAmB,EACnB;;;;;;;QAOE,CACH,CACF,EAAE,CAAC;AACN,CAAC","sourcesContent":["import { LOG_PREFIX } from \"../constants\";\n\n/**\n * The code of cdk-nextjs's CloudFront Functions, and of `viewerRequestFunctionCode`\n * spliced into them. Plain strings: `NextjsDistribution` creates the functions.\n */\n\n/**\n * Where a viewer-request handler calls `viewerRequestFunctionCode`, before any\n * logic of its own. Replaced at synth, never deployed.\n */\nexport const VIEWER_REQUEST_HOOK = \"/*@viewerRequest@*/\";\n\n/**\n * CloudFront's maximum CloudFront Function size.\n * @see https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cloudfront-limits.html#limits-functions\n */\nexport const MAX_FUNCTION_CODE_BYTES = 10 * 1024;\n\n// Next.js answers any path containing a backslash or a repeated\n// slash with a 308 to the collapsed path\n// (`normalizeRepeatedSlashes`, called from `base-server.ts`), and so\n// does this runtime. Behind a Lambda Function URL the origin never\n// gets the chance: Origin Access Control signs the raw path while the\n// Function URL canonicalizes it before verifying, so the origin\n// answers 403 SignatureDoesNotMatch. Doing the redirect here is what\n// makes `/basepath//to-sv` behave as it does under `next start`.\n//\n// A bare `//` reaches here too, and is answered the same way -\n// measured, because `//` at the start of a request target is also the\n// authority form and it was not obvious CloudFront would route it to a\n// function at all. It does: `GET //` answers 308 to `/` with\n// `x-cache: FunctionGeneratedResponse`, over both HTTP/1.1 and HTTP/2,\n// which is what `test/e2e/hydration` asks for.\n//\n// Two things Next.js does that this does not:\n//\n// - the body it sends with its own redirect (the destination, as\n//   text). A generated response can carry one on\n//   cloudfront-js-2.0, but none is sent yet; no known client reads\n//   it.\n// - the original order of the query string. The event exposes\n//   `querystring` as an object, never as the raw string, so\n//   `/x//y?a=1&b=2` redirects to `/x/y?b=2&a=1`. The pairs all\n//   survive; only their order is CloudFront's rather than the\n//   client's, and a redirect target is not order-sensitive.\n//\n// A repeated key's `multiValue` already holds its first value, which\n// `value` repeats, so it is one or the other, never both. Names and\n// values arrive as the client sent them, still percent-encoded\n// (measured: `?a=%20b%26c&p=1+2` reads back unchanged), so they are\n// joined as-is; encoding them again would turn `%20` into `%2520`.\n//\n// These notes live out here rather than in the code because\n// CloudFront counts comments toward the function's 10 KB, which\n// `viewerRequestFunctionCode` shares.\n//\n// Only the ES6+ that cloudfront-js-2.0 documents: `const`/`let`, arrow\n// functions, `Object.keys`; no destructuring, spread or `for...of`.\n// Strings are concatenated rather than templated, since a template\n// literal in here would need every backtick and `${` escaped.\n// https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/functions-javascript-runtime-20.html\n\n/**\n * NextjsGlobalFunctions' viewer-request handler: redirects repeated slashes,\n * and overwrites `x-forwarded-host` with the viewer's `Host` so Next.js\n * `request.url` is the site's domain rather than the Function URL's.\n * @see https://open-next.js.org/advanced/workaround#workaround-set-x-forwarded-host-header-aws-specific\n */\nexport const X_FORWARDED_HOST_HANDLER = `\n  async function handler(event) {${VIEWER_REQUEST_HOOK}\n    const request = event.request;\n    const uri = request.uri;\n\n    if (/\\\\\\\\|\\\\/\\\\//.test(uri)) {\n      let location = uri.replace(/\\\\\\\\/g, \"/\").replace(/\\\\/\\\\/+/g, \"/\");\n      const qs = [];\n      Object.keys(request.querystring).forEach((name) => {\n        const q = request.querystring[name];\n        (q.multiValue || [q]).forEach((entry) => {\n          qs.push(entry.value === \"\" ? name : name + \"=\" + entry.value);\n        });\n      });\n      if (qs.length) {\n        location += \"?\" + qs.join(\"&\");\n      }\n      return {\n        statusCode: 308,\n        statusDescription: \"Permanent Redirect\",\n        headers: { location: { value: location } },\n      };\n    }\n\n    request.headers[\"x-forwarded-host\"] = request.headers.host;\n    return request;\n  }\n  `;\n\n/**\n * The handler of a behavior with no viewer-request logic of its own, which\n * only runs `viewerRequestFunctionCode`.\n */\nexport const PASS_THROUGH_HANDLER = `\n  async function handler(event) {${VIEWER_REQUEST_HOOK}\n    return event.request;\n  }\n  `;\n\n/**\n * The `assetPrefix` behavior's handler: an S3 origin keys on the request URI\n * and `originPath` can only prepend, so the prefix is swapped for the\n * `basePath` here. Both are synth-time literals.\n */\nexport function assetPrefixRewriteHandler(\n  basePath: string,\n  assetPrefix: string,\n): string {\n  return `\n  async function handler(event) {${VIEWER_REQUEST_HOOK}\n    const request = event.request;\n    request.uri = ${JSON.stringify(\n      basePath ? `/${basePath}` : \"\",\n    )} + request.uri.slice(${assetPrefix.length});\n    return request;\n  }\n  `;\n}\n\n/**\n * Checks `viewerRequestFunctionCode` defines `viewerRequest` and doesn't use\n * the name `handler`.\n *\n * Any use of `handler` is refused, not just a declaration: an assignment\n * (`var handler =`, destructuring, `globalThis[\"handler\"] =`) would replace\n * cdk-nextjs's handler, and with it the `x-forwarded-host` overwrite, and a\n * `let`/`const`/`class` would make the file a syntax error. Telling these\n * apart from a local of the same name takes a parser, so a local, or the\n * word in a comment or string, is refused too; that errs towards refusing\n * code that would have worked.\n */\nexport function checkViewerRequestCode(userCode: string): void {\n  if (\n    !/\\bfunction\\s+viewerRequest\\s*\\(|(?:\\b(?:var|let|const)\\s+|,\\s*)viewerRequest\\s*=(?!=)/.test(\n      userCode,\n    )\n  ) {\n    throw new Error(\n      `${LOG_PREFIX} \\`viewerRequestFunctionCode\\` must define ` +\n        `\\`viewerRequest(event)\\`, as a function or a \\`var\\`/\\`let\\`/` +\n        `\\`const\\`, which cdk-nextjs calls from its own viewer-request ` +\n        `handler.`,\n    );\n  }\n  if (/\\bhandler\\b/.test(userCode)) {\n    throw new Error(\n      `${LOG_PREFIX} \\`viewerRequestFunctionCode\\` uses the name ` +\n        `\\`handler\\`, which is cdk-nextjs's own function in the same file. ` +\n        `Rename it (a mention in a comment or string counts too); your entry ` +\n        `point is \\`viewerRequest\\`, called with the same event, and it may ` +\n        `return the same request or response.`,\n    );\n  }\n}\n\n/**\n * The deployed code of a cdk-nextjs handler: with `userCode` first in the file\n * (where CloudFront wants `import cf from \"cloudfront\"`) and awaited where the\n * handler says {@link VIEWER_REQUEST_HOOK}, or with the marker dropped when\n * there is none. Indentation is dropped too, since it counts toward the\n * 10 KB; none of this code has a multi-line string for that to change.\n */\nexport function spliceViewerRequest(\n  handler: string,\n  userCode: string | undefined,\n): string {\n  const dedent = (code: string) => code.replace(/^[ \\t]+/gm, \"\");\n  if (userCode === undefined) {\n    return dedent(handler.replace(VIEWER_REQUEST_HOOK, \"\"));\n  }\n  // A response has a status; anything else returned is the request to carry\n  // on with. `await` takes a synchronous `viewerRequest` as it is.\n  return `${userCode}\\n${dedent(\n    handler.replace(\n      VIEWER_REQUEST_HOOK,\n      `\n      const viewerResult = await viewerRequest(event);\n      if (viewerResult && viewerResult.statusCode) {\n        return viewerResult;\n      }\n      if (viewerResult) {\n        event.request = viewerResult;\n      }`,\n    ),\n  )}`;\n}\n"]}

package/lib/utils/viewer-request-functions.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/viewer-request-functions.test.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const viewer_request_functions_1 = require("./viewer-request-functions");
+describe("spliceViewerRequest", () => {
+    it.each([
+        ["x-forwarded-host", viewer_request_functions_1.X_FORWARDED_HOST_HANDLER],
+        ["pass-through", viewer_request_functions_1.PASS_THROUGH_HANDLER],
+        ["assetPrefix rewrite", (0, viewer_request_functions_1.assetPrefixRewriteHandler)("base", "/cdn")],
+    ])("drops the marker and indentation from the %s handler", (_, handler) => {
+        const code = (0, viewer_request_functions_1.spliceViewerRequest)(handler, undefined);
+        expect(code).not.toContain(viewer_request_functions_1.VIEWER_REQUEST_HOOK);
+        expect(code).not.toMatch(/^[ \t]/m);
+        expect(code).toMatch(/^async function handler\(event\) \{$/m);
+    });
+    it("puts the user's code first and awaits viewerRequest at the marker", () => {
+        const code = (0, viewer_request_functions_1.spliceViewerRequest)(viewer_request_functions_1.PASS_THROUGH_HANDLER, 'import cf from "cloudfront";\nfunction viewerRequest(event) {}');
+        expect(code.startsWith('import cf from "cloudfront";')).toBe(true);
+        expect(code).toMatch(/async function handler\(event\) \{\nconst viewerResult = await viewerRequest\(event\);/);
+    });
+});
+describe("assetPrefixRewriteHandler", () => {
+    it("swaps the prefix for the basePath", () => {
+        expect((0, viewer_request_functions_1.assetPrefixRewriteHandler)("base", "/cdn")).toContain('request.uri = "/base" + request.uri.slice(4);');
+        expect((0, viewer_request_functions_1.assetPrefixRewriteHandler)("", "/cdn")).toContain('request.uri = "" + request.uri.slice(4);');
+    });
+});
+describe("checkViewerRequestCode", () => {
+    it.each([
+        "function viewerRequest(event) {}",
+        "async function viewerRequest(event) {}",
+        "const viewerRequest = (event) => {};",
+        "var x = 1, viewerRequest = (event) => {};",
+    ])("accepts %s", (code) => {
+        expect(() => (0, viewer_request_functions_1.checkViewerRequestCode)(code)).not.toThrow();
+    });
+    it("refuses code that never defines viewerRequest", () => {
+        expect(() => (0, viewer_request_functions_1.checkViewerRequestCode)("const ok = viewerRequest === 1;")).toThrow(/must define `viewerRequest\(event\)`/);
+    });
+    it("refuses code that uses the name handler", () => {
+        expect(() => (0, viewer_request_functions_1.checkViewerRequestCode)("function viewerRequest(event) {} // handler")).toThrow(/uses the name `handler`/);
+    });
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmlld2VyLXJlcXVlc3QtZnVuY3Rpb25zLnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvdmlld2VyLXJlcXVlc3QtZnVuY3Rpb25zLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5RUFPb0M7QUFFcEMsUUFBUSxDQUFDLHFCQUFxQixFQUFFLEdBQUcsRUFBRTtJQUNuQyxFQUFFLENBQUMsSUFBSSxDQUFDO1FBQ04sQ0FBQyxrQkFBa0IsRUFBRSxtREFBd0IsQ0FBQztRQUM5QyxDQUFDLGNBQWMsRUFBRSwrQ0FBb0IsQ0FBQztRQUN0QyxDQUFDLHFCQUFxQixFQUFFLElBQUEsb0RBQXlCLEVBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0tBQ25FLENBQUMsQ0FBQyxzREFBc0QsRUFBRSxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUN4RSxNQUFNLElBQUksR0FBRyxJQUFBLDhDQUFtQixFQUFDLE9BQU8sRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNyRCxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyw4Q0FBbUIsQ0FBQyxDQUFDO1FBQ2hELE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3BDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsdUNBQXVDLENBQUMsQ0FBQztJQUNoRSxDQUFDLENBQUMsQ0FBQztJQUVILEVBQUUsQ0FBQyxtRUFBbUUsRUFBRSxHQUFHLEVBQUU7UUFDM0UsTUFBTSxJQUFJLEdBQUcsSUFBQSw4Q0FBbUIsRUFDOUIsK0NBQW9CLEVBQ3BCLGdFQUFnRSxDQUNqRSxDQUFDO1FBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsOEJBQThCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuRSxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUNsQix3RkFBd0YsQ0FDekYsQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDLENBQUM7QUFFSCxRQUFRLENBQUMsMkJBQTJCLEVBQUUsR0FBRyxFQUFFO0lBQ3pDLEVBQUUsQ0FBQyxtQ0FBbUMsRUFBRSxHQUFHLEVBQUU7UUFDM0MsTUFBTSxDQUFDLElBQUEsb0RBQXlCLEVBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUN6RCwrQ0FBK0MsQ0FDaEQsQ0FBQztRQUNGLE1BQU0sQ0FBQyxJQUFBLG9EQUF5QixFQUFDLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FDckQsMENBQTBDLENBQzNDLENBQUM7SUFDSixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyxDQUFDO0FBRUgsUUFBUSxDQUFDLHdCQUF3QixFQUFFLEdBQUcsRUFBRTtJQUN0QyxFQUFFLENBQUMsSUFBSSxDQUFDO1FBQ04sa0NBQWtDO1FBQ2xDLHdDQUF3QztRQUN4QyxzQ0FBc0M7UUFDdEMsMkNBQTJDO0tBQzVDLENBQUMsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUN4QixNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBQSxpREFBc0IsRUFBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzRCxDQUFDLENBQUMsQ0FBQztJQUVILEVBQUUsQ0FBQywrQ0FBK0MsRUFBRSxHQUFHLEVBQUU7UUFDdkQsTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUNWLElBQUEsaURBQXNCLEVBQUMsaUNBQWlDLENBQUMsQ0FDMUQsQ0FBQyxPQUFPLENBQUMsc0NBQXNDLENBQUMsQ0FBQztJQUNwRCxDQUFDLENBQUMsQ0FBQztJQUVILEVBQUUsQ0FBQyx5Q0FBeUMsRUFBRSxHQUFHLEVBQUU7UUFDakQsTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUNWLElBQUEsaURBQXNCLEVBQUMsNkNBQTZDLENBQUMsQ0FDdEUsQ0FBQyxPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FBQztJQUN2QyxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgYXNzZXRQcmVmaXhSZXdyaXRlSGFuZGxlcixcbiAgY2hlY2tWaWV3ZXJSZXF1ZXN0Q29kZSxcbiAgUEFTU19USFJPVUdIX0hBTkRMRVIsXG4gIHNwbGljZVZpZXdlclJlcXVlc3QsXG4gIFZJRVdFUl9SRVFVRVNUX0hPT0ssXG4gIFhfRk9SV0FSREVEX0hPU1RfSEFORExFUixcbn0gZnJvbSBcIi4vdmlld2VyLXJlcXVlc3QtZnVuY3Rpb25zXCI7XG5cbmRlc2NyaWJlKFwic3BsaWNlVmlld2VyUmVxdWVzdFwiLCAoKSA9PiB7XG4gIGl0LmVhY2goW1xuICAgIFtcIngtZm9yd2FyZGVkLWhvc3RcIiwgWF9GT1JXQVJERURfSE9TVF9IQU5ETEVSXSxcbiAgICBbXCJwYXNzLXRocm91Z2hcIiwgUEFTU19USFJPVUdIX0hBTkRMRVJdLFxuICAgIFtcImFzc2V0UHJlZml4IHJld3JpdGVcIiwgYXNzZXRQcmVmaXhSZXdyaXRlSGFuZGxlcihcImJhc2VcIiwgXCIvY2RuXCIpXSxcbiAgXSkoXCJkcm9wcyB0aGUgbWFya2VyIGFuZCBpbmRlbnRhdGlvbiBmcm9tIHRoZSAlcyBoYW5kbGVyXCIsIChfLCBoYW5kbGVyKSA9PiB7XG4gICAgY29uc3QgY29kZSA9IHNwbGljZVZpZXdlclJlcXVlc3QoaGFuZGxlciwgdW5kZWZpbmVkKTtcbiAgICBleHBlY3QoY29kZSkubm90LnRvQ29udGFpbihWSUVXRVJfUkVRVUVTVF9IT09LKTtcbiAgICBleHBlY3QoY29kZSkubm90LnRvTWF0Y2goL15bIFxcdF0vbSk7XG4gICAgZXhwZWN0KGNvZGUpLnRvTWF0Y2goL15hc3luYyBmdW5jdGlvbiBoYW5kbGVyXFwoZXZlbnRcXCkgXFx7JC9tKTtcbiAgfSk7XG5cbiAgaXQoXCJwdXRzIHRoZSB1c2VyJ3MgY29kZSBmaXJzdCBhbmQgYXdhaXRzIHZpZXdlclJlcXVlc3QgYXQgdGhlIG1hcmtlclwiLCAoKSA9PiB7XG4gICAgY29uc3QgY29kZSA9IHNwbGljZVZpZXdlclJlcXVlc3QoXG4gICAgICBQQVNTX1RIUk9VR0hfSEFORExFUixcbiAgICAgICdpbXBvcnQgY2YgZnJvbSBcImNsb3VkZnJvbnRcIjtcXG5mdW5jdGlvbiB2aWV3ZXJSZXF1ZXN0KGV2ZW50KSB7fScsXG4gICAgKTtcbiAgICBleHBlY3QoY29kZS5zdGFydHNXaXRoKCdpbXBvcnQgY2YgZnJvbSBcImNsb3VkZnJvbnRcIjsnKSkudG9CZSh0cnVlKTtcbiAgICBleHBlY3QoY29kZSkudG9NYXRjaChcbiAgICAgIC9hc3luYyBmdW5jdGlvbiBoYW5kbGVyXFwoZXZlbnRcXCkgXFx7XFxuY29uc3Qgdmlld2VyUmVzdWx0ID0gYXdhaXQgdmlld2VyUmVxdWVzdFxcKGV2ZW50XFwpOy8sXG4gICAgKTtcbiAgfSk7XG59KTtcblxuZGVzY3JpYmUoXCJhc3NldFByZWZpeFJld3JpdGVIYW5kbGVyXCIsICgpID0+IHtcbiAgaXQoXCJzd2FwcyB0aGUgcHJlZml4IGZvciB0aGUgYmFzZVBhdGhcIiwgKCkgPT4ge1xuICAgIGV4cGVjdChhc3NldFByZWZpeFJld3JpdGVIYW5kbGVyKFwiYmFzZVwiLCBcIi9jZG5cIikpLnRvQ29udGFpbihcbiAgICAgICdyZXF1ZXN0LnVyaSA9IFwiL2Jhc2VcIiArIHJlcXVlc3QudXJpLnNsaWNlKDQpOycsXG4gICAgKTtcbiAgICBleHBlY3QoYXNzZXRQcmVmaXhSZXdyaXRlSGFuZGxlcihcIlwiLCBcIi9jZG5cIikpLnRvQ29udGFpbihcbiAgICAgICdyZXF1ZXN0LnVyaSA9IFwiXCIgKyByZXF1ZXN0LnVyaS5zbGljZSg0KTsnLFxuICAgICk7XG4gIH0pO1xufSk7XG5cbmRlc2NyaWJlKFwiY2hlY2tWaWV3ZXJSZXF1ZXN0Q29kZVwiLCAoKSA9PiB7XG4gIGl0LmVhY2goW1xuICAgIFwiZnVuY3Rpb24gdmlld2VyUmVxdWVzdChldmVudCkge31cIixcbiAgICBcImFzeW5jIGZ1bmN0aW9uIHZpZXdlclJlcXVlc3QoZXZlbnQpIHt9XCIsXG4gICAgXCJjb25zdCB2aWV3ZXJSZXF1ZXN0ID0gKGV2ZW50KSA9PiB7fTtcIixcbiAgICBcInZhciB4ID0gMSwgdmlld2VyUmVxdWVzdCA9IChldmVudCkgPT4ge307XCIsXG4gIF0pKFwiYWNjZXB0cyAlc1wiLCAoY29kZSkgPT4ge1xuICAgIGV4cGVjdCgoKSA9PiBjaGVja1ZpZXdlclJlcXVlc3RDb2RlKGNvZGUpKS5ub3QudG9UaHJvdygpO1xuICB9KTtcblxuICBpdChcInJlZnVzZXMgY29kZSB0aGF0IG5ldmVyIGRlZmluZXMgdmlld2VyUmVxdWVzdFwiLCAoKSA9PiB7XG4gICAgZXhwZWN0KCgpID0+XG4gICAgICBjaGVja1ZpZXdlclJlcXVlc3RDb2RlKFwiY29uc3Qgb2sgPSB2aWV3ZXJSZXF1ZXN0ID09PSAxO1wiKSxcbiAgICApLnRvVGhyb3coL211c3QgZGVmaW5lIGB2aWV3ZXJSZXF1ZXN0XFwoZXZlbnRcXClgLyk7XG4gIH0pO1xuXG4gIGl0KFwicmVmdXNlcyBjb2RlIHRoYXQgdXNlcyB0aGUgbmFtZSBoYW5kbGVyXCIsICgpID0+IHtcbiAgICBleHBlY3QoKCkgPT5cbiAgICAgIGNoZWNrVmlld2VyUmVxdWVzdENvZGUoXCJmdW5jdGlvbiB2aWV3ZXJSZXF1ZXN0KGV2ZW50KSB7fSAvLyBoYW5kbGVyXCIpLFxuICAgICkudG9UaHJvdygvdXNlcyB0aGUgbmFtZSBgaGFuZGxlcmAvKTtcbiAgfSk7XG59KTtcbiJdfQ==

package/package.json

@@ -20,6 +20,7 @@
     "@aws-sdk/client-s3": "^3.1141.0",
     "@aws-sdk/client-ssm": "^3.1141.0",
     "@aws-sdk/lib-storage": "^3.1141.0",
+    "@iconify-json/logos": "1.2.16",
     "@mrgrain/jsii-struct-builder": "^0.7.64",
     "@next/routing": "16.4.0",
     "@smithy/signature-v4": "^2.3.0",
@@ -84,7 +85,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.12",
+  "version": "0.7.13",
   "jest": {
     "coverageProvider": "v8",
     "testPathIgnorePatterns": [
@@ -190,6 +191,8 @@
     "compat": "pnpm dlx projen compat",
     "compile": "pnpm dlx projen compile",
     "default": "pnpm dlx projen default",
+    "diagrams": "pnpm dlx projen diagrams",
+    "diagrams:check": "pnpm dlx projen diagrams:check",
     "docgen": "pnpm dlx projen docgen",
     "eject": "pnpm dlx projen eject",
     "eslint": "pnpm dlx projen eslint",

package/scripts/e2e-harness/app.js

@@ -205,8 +205,13 @@ class HarnessStack extends Stack {
  * `use-cache-metadata-route-handler`'s `/[slug]` page, which threw on it (a 500,
  * past the ALB's 200-499 range, so the task under test kept being replaced);
  * `/_next/__cdk-nextjs-harness-health` was taken by `sub-shell-generation`'s
- * `/[lang]/[slug]` as `lang: "_next"`, and the health check's renders left
- * `/es/*` served a runtime root layout instead of the build-time shell.
+ * `/[lang]/[slug]` as `lang: "_next"`. Its fallback shell revalidates 15 minutes
+ * after `next build` (`fallbackRevalidate: 900`, the `'use cache'` root layout's
+ * default lifetime), and the first request past that serves it stale and
+ * regenerates it at runtime, so `/es/*` then reports a runtime root layout -
+ * `next start` does the same. The health check was simply that first request,
+ * well before the test's own; the test still fails if it runs more than 15
+ * minutes after the build (#274).
  */
 const HEALTH_CHECK_PATH = "/_next/static/__cdk-nextjs-harness-health";
 

package/scripts/render-diagrams.mjs

@@ -0,0 +1,121 @@
+#!/usr/bin/env node
+/**
+ * Render the README architecture diagrams with real AWS icons.
+ *
+ *   pnpm diagrams          # docs/diagrams/*.mmd -> docs/diagrams/*.svg
+ *   pnpm diagrams:check    # fail if an .svg is missing, orphaned or stale
+ *
+ * Why committed SVGs and not ```mermaid blocks. GitHub's Mermaid renderer can't
+ * register icon packs, so `architecture-beta` there is limited to its generic
+ * built-in icons; and npm and Construct Hub don't render Mermaid at all. An SVG
+ * renders everywhere the README is shown.
+ *
+ * Why the check compares a hash and not the rendered bytes. Chromium lays out
+ * labels with whatever fonts the machine has, so a render on macOS and one on an
+ * Ubuntu runner differ even from the same source. Each SVG instead carries a
+ * SHA-256 of the `.mmd` it was rendered from and the `mmdc` and icon pack
+ * versions, which the check (no Chrome needed) recomputes from what's on disk.
+ *
+ * `mmdc` runs through `npx`, not as a devDependency: it pulls in Puppeteer, whose
+ * Chrome download pnpm blocks as a build script, and every install would pay for
+ * it. The icon pack is an exact-pinned devDependency, which keeps it out of the
+ * automated `upgrade-dev-deps` PRs: bumping either version is a hand edit that
+ * `diagrams:check` then makes you re-render for.
+ */
+import { execFileSync } from "node:child_process";
+import { createHash } from "node:crypto";
+import {
+  existsSync,
+  mkdtempSync,
+  readFileSync,
+  readdirSync,
+  rmSync,
+  writeFileSync,
+} from "node:fs";
+import { tmpdir } from "node:os";
+import { basename, join, resolve } from "node:path";
+import { pathToFileURL } from "node:url";
+
+const MERMAID_CLI = "@mermaid-js/mermaid-cli@12.0.0";
+const DIAGRAMS_DIR = resolve("docs", "diagrams");
+const ICON_PACK_DIR = resolve("node_modules", "@iconify-json", "logos");
+const ICON_PACK = join(ICON_PACK_DIR, "icons.json");
+const ICON_PACK_VERSION = JSON.parse(
+  readFileSync(join(ICON_PACK_DIR, "package.json"), "utf8"),
+).version;
+const STAMP = /^<!-- source-sha256: ([0-9a-f]{64}) -->\n/;
+
+const files = readdirSync(DIAGRAMS_DIR);
+const sources = files.filter((f) => f.endsWith(".mmd")).sort();
+
+const stampOf = (source) =>
+  createHash("sha256")
+    .update(`${MERMAID_CLI}\n@iconify-json/logos@${ICON_PACK_VERSION}\n`)
+    .update(readFileSync(join(DIAGRAMS_DIR, source)))
+    .digest("hex");
+
+if (process.argv.includes("--check")) {
+  const stale = sources.filter((source) => {
+    const svg = join(DIAGRAMS_DIR, source.replace(/\.mmd$/, ".svg"));
+    if (!existsSync(svg)) return true;
+    return STAMP.exec(readFileSync(svg, "utf8"))?.[1] !== stampOf(source);
+  });
+  const orphaned = files.filter(
+    (f) => f.endsWith(".svg") && !sources.includes(f.replace(/\.svg$/, ".mmd")),
+  );
+  if (stale.length) {
+    console.error(
+      `Stale diagrams (run \`pnpm diagrams\` and commit the SVGs): ${stale.join(", ")}`,
+    );
+  }
+  if (orphaned.length) {
+    console.error(`SVGs with no .mmd source: ${orphaned.join(", ")}`);
+  }
+  process.exit(stale.length || orphaned.length ? 1 : 0);
+}
+
+// Chrome's sandbox can't start on GitHub's Ubuntu runners or in most containers.
+const work = mkdtempSync(join(tmpdir(), "render-diagrams-"));
+const puppeteerConfig = join(work, "puppeteer.json");
+writeFileSync(puppeteerConfig, JSON.stringify({ args: ["--no-sandbox"] }));
+
+try {
+  for (const source of sources) {
+    const name = basename(source, ".mmd");
+    const input = join(DIAGRAMS_DIR, source);
+    const output = join(DIAGRAMS_DIR, `${name}.svg`);
+    execFileSync(
+      "npx",
+      [
+        "--yes",
+        MERMAID_CLI,
+        "--quiet",
+        "--puppeteerConfigFile",
+        puppeteerConfig,
+        "--iconPacksNamesAndUrls",
+        `logos#${pathToFileURL(ICON_PACK)}`,
+        "--input",
+        input,
+        "--output",
+        output,
+      ],
+      // `npx` is `npx.cmd` on Windows, which only a shell can run.
+      { stdio: "inherit", shell: process.platform === "win32" },
+    );
+    // Iconify names gradient ids with a random prefix; renumber them so an
+    // unchanged source re-renders to the same bytes on the same machine.
+    const ids = new Map();
+    const svg = readFileSync(output, "utf8").replace(
+      /IconifyId[0-9a-f]+/g,
+      (id) => {
+        if (!ids.has(id)) ids.set(id, `${name}-icon-${ids.size}`);
+        return ids.get(id);
+      },
+    );
+    const stamp = `<!-- source-sha256: ${stampOf(source)} -->\n`;
+    writeFileSync(output, `${stamp}${svg}\n`);
+    console.log(`rendered ${output}`);
+  }
+} finally {
+  rmSync(work, { recursive: true, force: true });
+}