truemark-cdk-lib 1.22.14 → 1.22.15

package/dist/aws-cloudfront/lib/redirect-function.d.ts

@@ -4,6 +4,14 @@ import { DomainName } from '../../aws-route53/index';
 export type TrailingSlashBehavior = 'None' | 'ForwardToIndex' | 'RedirectNoSlash';
 export type NoFileIndexBehavior = 'None' | 'ForwardToIndex' | 'RedirectToSlash';
 export type RobotsBehavior = 'None' | 'Allow' | 'Disallow';
+/**
+ * Controls redirecting between the apex domain and the "www" subdomain.
+ *
+ * - "None" - no redirect is performed.
+ * - "RedirectToApex" - requests to "www.example.com" are redirected to "example.com".
+ * - "RedirectToWww" - requests to "example.com" are redirected to "www.example.com".
+ */
+export type WwwRedirectBehavior = 'None' | 'RedirectToApex' | 'RedirectToWww';
 export interface RedirectFunctionProps {
     /**
      * Optional domain to redirect to if the host header does not match.
@@ -31,6 +39,26 @@ export interface RedirectFunctionProps {
      * Sets the behavior for /robots.txt requests. Default is "Allow".
      */
     readonly robotsBehavior?: RobotsBehavior;
+    /**
+     * Redirects between the apex domain and the "www" subdomain. Default is "None".
+     *
+     * Note that this is evaluated before `apexDomain`. Generally only one of
+     * `wwwRedirectBehavior` or `apexDomain` should be set. Combinations that
+     * would produce an infinite redirect loop ("RedirectToWww" with a non-www
+     * `apexDomain`, or "RedirectToApex" with a www `apexDomain`) throw at
+     * construction time.
+     *
+     * "RedirectToWww" only prepends "www." to the apex host. When `apexDomain`
+     * is set the apex is derived from it, so other subdomains (e.g.
+     * `api.example.com`) are not turned into non-resolving names like
+     * `www.api.example.com` and instead fall through to the `apexDomain`
+     * redirect. When `apexDomain` is not set there is no apex anchor, so this
+     * option assumes traffic only arrives on the apex and will prepend "www."
+     * to any non-www host.
+     *
+     * @default "None"
+     */
+    readonly wwwRedirectBehavior?: WwwRedirectBehavior;
 }
 export declare class RedirectFunction extends Function {
     constructor(scope: Construct, id: string, props: RedirectFunctionProps);

package/dist/aws-cloudfront/lib/redirect-function.js

@@ -4,12 +4,48 @@ exports.RedirectFunction = void 0;
 const aws_cloudfront_1 = require("aws-cdk-lib/aws-cloudfront");
 class RedirectFunction extends aws_cloudfront_1.Function {
     constructor(scope, id, props) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
+        const apexDomain = (_b = (_a = props.apexDomain) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
+        const wwwRedirectBehavior = (_c = props.wwwRedirectBehavior) !== null && _c !== void 0 ? _c : 'None';
+        if (apexDomain !== '' && wwwRedirectBehavior !== 'None') {
+            const apexIsWww = apexDomain.startsWith('www.');
+            if (wwwRedirectBehavior === 'RedirectToWww' && !apexIsWww) {
+                throw new Error(`RedirectFunction: wwwRedirectBehavior "RedirectToWww" with a non-www apexDomain ("${apexDomain}") creates an infinite redirect loop (host -> www.host -> apexDomain -> ...). Set apexDomain to the www host or remove one of these options.`);
+            }
+            if (wwwRedirectBehavior === 'RedirectToApex' && apexIsWww) {
+                throw new Error(`RedirectFunction: wwwRedirectBehavior "RedirectToApex" with a www apexDomain ("${apexDomain}") creates an infinite redirect loop (www.host -> host -> apexDomain -> ...). Set apexDomain to the apex host or remove one of these options.`);
+            }
+        }
         super(scope, id, {
             code: aws_cloudfront_1.FunctionCode.fromInline(`
 function handler(event) {
   var host = event.request.headers.host.value;
   var uri = event.request.uri;
+  if ("WWW_REDIRECT_BEHAVIOR" === "RedirectToApex" && host.startsWith("www.")) {
+    return {
+      statusCode: 301,
+      statusDescription: "Permanently moved",
+      headers: {
+        "location": { "value": "https://" + host.substring(4) + uri }
+      }
+    }
+  }
+  if ("WWW_REDIRECT_BEHAVIOR" === "RedirectToWww" && !host.startsWith("www.")) {
+    // Only redirect the apex itself. Prepending "www." to an arbitrary host
+    // would produce non-resolving names like "www.api.example.com", so other
+    // subdomains are left for the apexDomain block below. When no apexDomain
+    // is configured there is no apex anchor, so we assume traffic only
+    // arrives on the apex and redirect unconditionally.
+    if ("APEX_DOMAIN" === "" || host === "APEX_DOMAIN".substring(4)) {
+      return {
+        statusCode: 301,
+        statusDescription: "Permanently moved",
+        headers: {
+          "location": { "value": "https://www." + host + uri }
+        }
+      }
+    }
+  }
   if ("APEX_DOMAIN" !== "" && host !== "APEX_DOMAIN") {
     return {
       statusCode: 301,
@@ -68,13 +104,14 @@ function handler(event) {
   }
   return event.request;
 }`
-                .replace(/APEX_DOMAIN/g, (_b = (_a = props.apexDomain) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '')
-                .replace(/INDEX_FILE/g, (_c = props.indexFile) !== null && _c !== void 0 ? _c : 'index.html')
-                .replace(/NO_FILE_EXTENSION_BEHAVIOR/g, (_d = props.noFileExtensionBehavior) !== null && _d !== void 0 ? _d : 'None')
-                .replace(/TRAILING_SLASH_BEHAVIOR/g, (_e = props.trailingSlashBehavior) !== null && _e !== void 0 ? _e : 'ForwardToIndex')
-                .replace(/ROBOTS_BEHAVIOR/g, (_f = props.robotsBehavior) !== null && _f !== void 0 ? _f : 'Allow')),
+                .replace(/APEX_DOMAIN/g, apexDomain)
+                .replace(/INDEX_FILE/g, (_d = props.indexFile) !== null && _d !== void 0 ? _d : 'index.html')
+                .replace(/NO_FILE_EXTENSION_BEHAVIOR/g, (_e = props.noFileExtensionBehavior) !== null && _e !== void 0 ? _e : 'None')
+                .replace(/TRAILING_SLASH_BEHAVIOR/g, (_f = props.trailingSlashBehavior) !== null && _f !== void 0 ? _f : 'ForwardToIndex')
+                .replace(/ROBOTS_BEHAVIOR/g, (_g = props.robotsBehavior) !== null && _g !== void 0 ? _g : 'Allow')
+                .replace(/WWW_REDIRECT_BEHAVIOR/g, wwwRedirectBehavior)),
         });
     }
 }
 exports.RedirectFunction = RedirectFunction;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXJlY3QtZnVuY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXdzLWNsb3VkZnJvbnQvbGliL3JlZGlyZWN0LWZ1bmN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLCtEQUFrRTtBQThDbEUsTUFBYSxnQkFBaUIsU0FBUSx5QkFBUTtJQUM1QyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQTRCOztRQUNwRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLElBQUksRUFBRSw2QkFBWSxDQUFDLFVBQVUsQ0FDM0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUE2RE47aUJBQ1MsT0FBTyxDQUFDLGNBQWMsRUFBRSxNQUFBLE1BQUEsS0FBSyxDQUFDLFVBQVUsMENBQUUsUUFBUSxFQUFFLG1DQUFJLEVBQUUsQ0FBQztpQkFDM0QsT0FBTyxDQUFDLGFBQWEsRUFBRSxNQUFBLEtBQUssQ0FBQyxTQUFTLG1DQUFJLFlBQVksQ0FBQztpQkFDdkQsT0FBTyxDQUNOLDZCQUE2QixFQUM3QixNQUFBLEtBQUssQ0FBQyx1QkFBdUIsbUNBQUksTUFBTSxDQUN4QztpQkFDQSxPQUFPLENBQ04sMEJBQTBCLEVBQzFCLE1BQUEsS0FBSyxDQUFDLHFCQUFxQixtQ0FBSSxnQkFBZ0IsQ0FDaEQ7aUJBQ0EsT0FBTyxDQUFDLGtCQUFrQixFQUFFLE1BQUEsS0FBSyxDQUFDLGNBQWMsbUNBQUksT0FBTyxDQUFDLENBQ2hFO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBaEZELDRDQWdGQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7RnVuY3Rpb24sIEZ1bmN0aW9uQ29kZX0gZnJvbSAnYXdzLWNkay1saWIvYXdzLWNsb3VkZnJvbnQnO1xuaW1wb3J0IHtDb25zdHJ1Y3R9IGZyb20gJ2NvbnN0cnVjdHMnO1xuaW1wb3J0IHtEb21haW5OYW1lfSBmcm9tICcuLi8uLi9hd3Mtcm91dGU1My9pbmRleCc7XG5cbmV4cG9ydCB0eXBlIFRyYWlsaW5nU2xhc2hCZWhhdmlvciA9XG4gIHwgJ05vbmUnXG4gIHwgJ0ZvcndhcmRUb0luZGV4J1xuICB8ICdSZWRpcmVjdE5vU2xhc2gnO1xuXG5leHBvcnQgdHlwZSBOb0ZpbGVJbmRleEJlaGF2aW9yID0gJ05vbmUnIHwgJ0ZvcndhcmRUb0luZGV4JyB8ICdSZWRpcmVjdFRvU2xhc2gnO1xuXG5leHBvcnQgdHlwZSBSb2JvdHNCZWhhdmlvciA9ICdOb25lJyB8ICdBbGxvdycgfCAnRGlzYWxsb3cnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJlZGlyZWN0RnVuY3Rpb25Qcm9wcyB7XG4gIC8qKlxuICAgKiBPcHRpb25hbCBkb21haW4gdG8gcmVkaXJlY3QgdG8gaWYgdGhlIGhvc3QgaGVhZGVyIGRvZXMgbm90IG1hdGNoLlxuICAgKi9cbiAgcmVhZG9ubHkgYXBleERvbWFpbj86IHN0cmluZyB8IERvbWFpbk5hbWU7XG5cbiAgLyoqXG4gICAqIFRoZSBkZWZhdWx0IGZpbGUgdG8gcmVxdWVzdCB3aGVuIHRoZSBVUkkgZW5kcyB3aXRoIGEgJy8nLiBTZXQgdG8gZW4gZW1wdHkgc3RyaW5nIHRvIGRpc2FibGUuXG4gICAqXG4gICAqIEBkZWZhdWx0IFwiaW5kZXguaHRtbFwiXG4gICAqL1xuICByZWFkb25seSBpbmRleEZpbGU/OiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIFNldHMgdGhlIGJlaGF2aW9yIG9mIHBhdGhzIHdpdGggdHJhaWxpbmcgc2xhc2hlcy4gRGVmYXVsdCBpcyBcIkZvcndhcmRUb0luZGV4XCIuXG4gICAqXG4gICAqIEBkZWZhdWx0IFwiRm9yd2FyZFRvSW5kZXhcIlxuICAgKi9cbiAgcmVhZG9ubHkgdHJhaWxpbmdTbGFzaEJlaGF2aW9yPzogVHJhaWxpbmdTbGFzaEJlaGF2aW9yO1xuXG4gIC8qKlxuICAgKiBTZXRzIHRoZSBiZWhhdmlvciBvZiBwYXRocyB3aXRoIG5vIGZpbGUgZXh0ZW5zaW9uLiBEZWZhdWx0IGlzIFwiTm9uZVwiXG4gICAqXG4gICAqIEBkZWZhdWx0IFwiTm9uZVwiXG4gICAqL1xuICByZWFkb25seSBub0ZpbGVFeHRlbnNpb25CZWhhdmlvcj86IE5vRmlsZUluZGV4QmVoYXZpb3I7XG5cbiAgLyoqXG4gICAqIFNldHMgdGhlIGJlaGF2aW9yIGZvciAvcm9ib3RzLnR4dCByZXF1ZXN0cy4gRGVmYXVsdCBpcyBcIkFsbG93XCIuXG4gICAqL1xuICByZWFkb25seSByb2JvdHNCZWhhdmlvcj86IFJvYm90c0JlaGF2aW9yO1xufVxuXG5leHBvcnQgY2xhc3MgUmVkaXJlY3RGdW5jdGlvbiBleHRlbmRzIEZ1bmN0aW9uIHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFJlZGlyZWN0RnVuY3Rpb25Qcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgY29kZTogRnVuY3Rpb25Db2RlLmZyb21JbmxpbmUoXG4gICAgICAgIGBcbmZ1bmN0aW9uIGhhbmRsZXIoZXZlbnQpIHtcbiAgdmFyIGhvc3QgPSBldmVudC5yZXF1ZXN0LmhlYWRlcnMuaG9zdC52YWx1ZTtcbiAgdmFyIHVyaSA9IGV2ZW50LnJlcXVlc3QudXJpO1xuICBpZiAoXCJBUEVYX0RPTUFJTlwiICE9PSBcIlwiICYmIGhvc3QgIT09IFwiQVBFWF9ET01BSU5cIikge1xuICAgIHJldHVybiB7XG4gICAgICBzdGF0dXNDb2RlOiAzMDEsXG4gICAgICBzdGF0dXNEZXNjcmlwdGlvbjogXCJQZXJtYW5lbnRseSBtb3ZlZFwiLFxuICAgICAgaGVhZGVyczoge1xuICAgICAgICBcImxvY2F0aW9uXCI6IHsgXCJ2YWx1ZVwiOiBcImh0dHBzOi8vQVBFWF9ET01BSU5cIiArIHVyaSB9XG4gICAgICB9XG4gICAgfVxuICB9XG4gIGlmIChcIklOREVYX0ZJTEVcIiAhPT0gXCJcIiAmJiBcIk5PX0ZJTEVfRVhURU5TSU9OX0JFSEFWSU9SXCIgIT09IFwiTm9uZVwiICYmIHVyaS5zcGxpdChcIi9cIikucG9wKCkuc3BsaXQoXCIuXCIpLmxlbmd0aCA8PSAxKSB7XG4gICAgaWYgKFwiTk9fRklMRV9FWFRFTlNJT05fQkVIQVZJT1JcIiA9PT0gXCJGb3J3YXJkVG9JbmRleFwiKSB7XG4gICAgICBldmVudC5yZXF1ZXN0LnVyaSA9IHVyaSArIFwiL0lOREVYX0ZJTEVcIjtcbiAgICB9IGVsc2Uge1xuICAgICAgcmV0dXJuIHtcbiAgICAgICAgc3RhdHVzQ29kZTogMzAxLFxuICAgICAgICBzdGF0dXNEZXNjcmlwdGlvbjogXCJQZXJtYW5lbnRseSBtb3ZlZFwiLFxuICAgICAgICBoZWFkZXJzOiB7XG4gICAgICAgICAgXCJsb2NhdGlvblwiOiB7IFwidmFsdWVcIjogdXJpICsgXCIvXCIgfVxuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG4gIGlmIChcIklOREVYX0ZJTEVcIiAhPT0gXCJcIiAmJiBcIlRSQUlMSU5HX1NMQVNIX0JFSEFWSU9SXCIgIT09IFwiTm9uZVwiICYmIHVyaS5lbmRzV2l0aChcIi9cIikpIHtcbiAgICBpZiAoXCJUUkFJTElOR19TTEFTSF9CRUhBVklPUlwiID09PSBcIkZvcndhcmRUb0luZGV4XCIgfHwgdXJpID09PSBcIi9cIikge1xuICAgICAgZXZlbnQucmVxdWVzdC51cmkgPSB1cmkgKyBcIklOREVYX0ZJTEVcIjtcbiAgICB9IGVsc2Uge1xuICAgICAgcmV0dXJuIHtcbiAgICAgICAgc3RhdHVzQ29kZTogMzAxLFxuICAgICAgICBzdGF0dXNEZXNjcmlwdGlvbjogXCJQZXJtYW5lbnRseSBtb3ZlZFwiLFxuICAgICAgICBoZWFkZXJzOiB7XG4gICAgICAgICAgXCJsb2NhdGlvblwiOiB7IFwidmFsdWVcIjogdXJpLnJlcGxhY2UoLy4kLywgXCJcIikgfVxuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG4gIGlmIChldmVudC5yZXF1ZXN0LnVyaSA9PT0gXCIvcm9ib3RzLnR4dFwiICYmIFwiUk9CT1RTX0JFSEFWSU9SXCIgIT09IFwiTm9uZVwiKSB7XG4gICAgaWYgKFwiUk9CT1RTX0JFSEFWSU9SXCIgPT09IFwiQWxsb3dcIikge1xuICAgICAgcmV0dXJuIHtcbiAgICAgICAgc3RhdHVzQ29kZTogMjAwLFxuICAgICAgICBzdGF0dXNEZXNjcmlwdGlvbjogXCJPS1wiLFxuICAgICAgICBoZWFkZXJzOiB7XG4gICAgICAgICBcImNvbnRlbnQtdHlwZVwiOiB7IFwidmFsdWVcIjogXCJ0ZXh0L3BsYWluXCIgfVxuICAgICAgICB9LFxuICAgICAgICBib2R5OiBcIlVzZXItYWdlbnQ6ICpcXFxcbkFsbG93OiAvXCJcbiAgICAgIH1cbiAgICB9IGVsc2UgeyAvLyBEaXNhbGxvd1xuICAgICAgcmV0dXJuIHtcbiAgICAgICAgc3RhdHVzQ29kZTogMjAwLFxuICAgICAgICBzdGF0dXNEZXNjcmlwdGlvbjogXCJPS1wiLFxuICAgICAgICBoZWFkZXJzOiB7XG4gICAgICAgICBcImNvbnRlbnQtdHlwZVwiOiB7IFwidmFsdWVcIjogXCJ0ZXh0L3BsYWluXCIgfVxuICAgICAgICB9LFxuICAgICAgICBib2R5OiBcIlVzZXItYWdlbnQ6ICpcXFxcbkRpc2FsbG93OiAvXCJcbiAgICAgIH1cbiAgICB9XG4gIH1cbiAgcmV0dXJuIGV2ZW50LnJlcXVlc3Q7XG59YFxuICAgICAgICAgIC5yZXBsYWNlKC9BUEVYX0RPTUFJTi9nLCBwcm9wcy5hcGV4RG9tYWluPy50b1N0cmluZygpID8/ICcnKVxuICAgICAgICAgIC5yZXBsYWNlKC9JTkRFWF9GSUxFL2csIHByb3BzLmluZGV4RmlsZSA/PyAnaW5kZXguaHRtbCcpXG4gICAgICAgICAgLnJlcGxhY2UoXG4gICAgICAgICAgICAvTk9fRklMRV9FWFRFTlNJT05fQkVIQVZJT1IvZyxcbiAgICAgICAgICAgIHByb3BzLm5vRmlsZUV4dGVuc2lvbkJlaGF2aW9yID8/ICdOb25lJyxcbiAgICAgICAgICApXG4gICAgICAgICAgLnJlcGxhY2UoXG4gICAgICAgICAgICAvVFJBSUxJTkdfU0xBU0hfQkVIQVZJT1IvZyxcbiAgICAgICAgICAgIHByb3BzLnRyYWlsaW5nU2xhc2hCZWhhdmlvciA/PyAnRm9yd2FyZFRvSW5kZXgnLFxuICAgICAgICAgIClcbiAgICAgICAgICAucmVwbGFjZSgvUk9CT1RTX0JFSEFWSU9SL2csIHByb3BzLnJvYm90c0JlaGF2aW9yID8/ICdBbGxvdycpLFxuICAgICAgKSxcbiAgICB9KTtcbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"redirect-function.js","sourceRoot":"","sources":["../../../src/aws-cloudfront/lib/redirect-function.ts"],"names":[],"mappings":";;;AAAA,+DAAkE;AA4ElE,MAAa,gBAAiB,SAAQ,yBAAQ;IAC5C,YAAY,KAAgB,EAAE,EAAU,EAAE,KAA4B;;QACpE,MAAM,UAAU,GAAG,MAAA,MAAA,KAAK,CAAC,UAAU,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;QACtD,MAAM,mBAAmB,GAAG,MAAA,KAAK,CAAC,mBAAmB,mCAAI,MAAM,CAAC;QAChE,IAAI,UAAU,KAAK,EAAE,IAAI,mBAAmB,KAAK,MAAM,EAAE,CAAC;YACxD,MAAM,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAChD,IAAI,mBAAmB,KAAK,eAAe,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC1D,MAAM,IAAI,KAAK,CACb,qFAAqF,UAAU,8IAA8I,CAC9O,CAAC;YACJ,CAAC;YACD,IAAI,mBAAmB,KAAK,gBAAgB,IAAI,SAAS,EAAE,CAAC;gBAC1D,MAAM,IAAI,KAAK,CACb,kFAAkF,UAAU,+IAA+I,CAC5O,CAAC;YACJ,CAAC;QACH,CAAC;QACD,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE;YACf,IAAI,EAAE,6BAAY,CAAC,UAAU,CAC3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsFN;iBACS,OAAO,CAAC,cAAc,EAAE,UAAU,CAAC;iBACnC,OAAO,CAAC,aAAa,EAAE,MAAA,KAAK,CAAC,SAAS,mCAAI,YAAY,CAAC;iBACvD,OAAO,CACN,6BAA6B,EAC7B,MAAA,KAAK,CAAC,uBAAuB,mCAAI,MAAM,CACxC;iBACA,OAAO,CACN,0BAA0B,EAC1B,MAAA,KAAK,CAAC,qBAAqB,mCAAI,gBAAgB,CAChD;iBACA,OAAO,CAAC,kBAAkB,EAAE,MAAA,KAAK,CAAC,cAAc,mCAAI,OAAO,CAAC;iBAC5D,OAAO,CAAC,wBAAwB,EAAE,mBAAmB,CAAC,CAC1D;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAzHD,4CAyHC","sourcesContent":["import {Function, FunctionCode} from 'aws-cdk-lib/aws-cloudfront';\nimport {Construct} from 'constructs';\nimport {DomainName} from '../../aws-route53/index';\n\nexport type TrailingSlashBehavior =\n  | 'None'\n  | 'ForwardToIndex'\n  | 'RedirectNoSlash';\n\nexport type NoFileIndexBehavior = 'None' | 'ForwardToIndex' | 'RedirectToSlash';\n\nexport type RobotsBehavior = 'None' | 'Allow' | 'Disallow';\n\n/**\n * Controls redirecting between the apex domain and the \"www\" subdomain.\n *\n * - \"None\" - no redirect is performed.\n * - \"RedirectToApex\" - requests to \"www.example.com\" are redirected to \"example.com\".\n * - \"RedirectToWww\" - requests to \"example.com\" are redirected to \"www.example.com\".\n */\nexport type WwwRedirectBehavior = 'None' | 'RedirectToApex' | 'RedirectToWww';\n\nexport interface RedirectFunctionProps {\n  /**\n   * Optional domain to redirect to if the host header does not match.\n   */\n  readonly apexDomain?: string | DomainName;\n\n  /**\n   * The default file to request when the URI ends with a '/'. Set to en empty string to disable.\n   *\n   * @default \"index.html\"\n   */\n  readonly indexFile?: string;\n\n  /**\n   * Sets the behavior of paths with trailing slashes. Default is \"ForwardToIndex\".\n   *\n   * @default \"ForwardToIndex\"\n   */\n  readonly trailingSlashBehavior?: TrailingSlashBehavior;\n\n  /**\n   * Sets the behavior of paths with no file extension. Default is \"None\"\n   *\n   * @default \"None\"\n   */\n  readonly noFileExtensionBehavior?: NoFileIndexBehavior;\n\n  /**\n   * Sets the behavior for /robots.txt requests. Default is \"Allow\".\n   */\n  readonly robotsBehavior?: RobotsBehavior;\n\n  /**\n   * Redirects between the apex domain and the \"www\" subdomain. Default is \"None\".\n   *\n   * Note that this is evaluated before `apexDomain`. Generally only one of\n   * `wwwRedirectBehavior` or `apexDomain` should be set. Combinations that\n   * would produce an infinite redirect loop (\"RedirectToWww\" with a non-www\n   * `apexDomain`, or \"RedirectToApex\" with a www `apexDomain`) throw at\n   * construction time.\n   *\n   * \"RedirectToWww\" only prepends \"www.\" to the apex host. When `apexDomain`\n   * is set the apex is derived from it, so other subdomains (e.g.\n   * `api.example.com`) are not turned into non-resolving names like\n   * `www.api.example.com` and instead fall through to the `apexDomain`\n   * redirect. When `apexDomain` is not set there is no apex anchor, so this\n   * option assumes traffic only arrives on the apex and will prepend \"www.\"\n   * to any non-www host.\n   *\n   * @default \"None\"\n   */\n  readonly wwwRedirectBehavior?: WwwRedirectBehavior;\n}\n\nexport class RedirectFunction extends Function {\n  constructor(scope: Construct, id: string, props: RedirectFunctionProps) {\n    const apexDomain = props.apexDomain?.toString() ?? '';\n    const wwwRedirectBehavior = props.wwwRedirectBehavior ?? 'None';\n    if (apexDomain !== '' && wwwRedirectBehavior !== 'None') {\n      const apexIsWww = apexDomain.startsWith('www.');\n      if (wwwRedirectBehavior === 'RedirectToWww' && !apexIsWww) {\n        throw new Error(\n          `RedirectFunction: wwwRedirectBehavior \"RedirectToWww\" with a non-www apexDomain (\"${apexDomain}\") creates an infinite redirect loop (host -> www.host -> apexDomain -> ...). Set apexDomain to the www host or remove one of these options.`,\n        );\n      }\n      if (wwwRedirectBehavior === 'RedirectToApex' && apexIsWww) {\n        throw new Error(\n          `RedirectFunction: wwwRedirectBehavior \"RedirectToApex\" with a www apexDomain (\"${apexDomain}\") creates an infinite redirect loop (www.host -> host -> apexDomain -> ...). Set apexDomain to the apex host or remove one of these options.`,\n        );\n      }\n    }\n    super(scope, id, {\n      code: FunctionCode.fromInline(\n        `\nfunction handler(event) {\n  var host = event.request.headers.host.value;\n  var uri = event.request.uri;\n  if (\"WWW_REDIRECT_BEHAVIOR\" === \"RedirectToApex\" && host.startsWith(\"www.\")) {\n    return {\n      statusCode: 301,\n      statusDescription: \"Permanently moved\",\n      headers: {\n        \"location\": { \"value\": \"https://\" + host.substring(4) + uri }\n      }\n    }\n  }\n  if (\"WWW_REDIRECT_BEHAVIOR\" === \"RedirectToWww\" && !host.startsWith(\"www.\")) {\n    // Only redirect the apex itself. Prepending \"www.\" to an arbitrary host\n    // would produce non-resolving names like \"www.api.example.com\", so other\n    // subdomains are left for the apexDomain block below. When no apexDomain\n    // is configured there is no apex anchor, so we assume traffic only\n    // arrives on the apex and redirect unconditionally.\n    if (\"APEX_DOMAIN\" === \"\" || host === \"APEX_DOMAIN\".substring(4)) {\n      return {\n        statusCode: 301,\n        statusDescription: \"Permanently moved\",\n        headers: {\n          \"location\": { \"value\": \"https://www.\" + host + uri }\n        }\n      }\n    }\n  }\n  if (\"APEX_DOMAIN\" !== \"\" && host !== \"APEX_DOMAIN\") {\n    return {\n      statusCode: 301,\n      statusDescription: \"Permanently moved\",\n      headers: {\n        \"location\": { \"value\": \"https://APEX_DOMAIN\" + uri }\n      }\n    }\n  }\n  if (\"INDEX_FILE\" !== \"\" && \"NO_FILE_EXTENSION_BEHAVIOR\" !== \"None\" && uri.split(\"/\").pop().split(\".\").length <= 1) {\n    if (\"NO_FILE_EXTENSION_BEHAVIOR\" === \"ForwardToIndex\") {\n      event.request.uri = uri + \"/INDEX_FILE\";\n    } else {\n      return {\n        statusCode: 301,\n        statusDescription: \"Permanently moved\",\n        headers: {\n          \"location\": { \"value\": uri + \"/\" }\n        }\n      }\n    }\n  }\n  if (\"INDEX_FILE\" !== \"\" && \"TRAILING_SLASH_BEHAVIOR\" !== \"None\" && uri.endsWith(\"/\")) {\n    if (\"TRAILING_SLASH_BEHAVIOR\" === \"ForwardToIndex\" || uri === \"/\") {\n      event.request.uri = uri + \"INDEX_FILE\";\n    } else {\n      return {\n        statusCode: 301,\n        statusDescription: \"Permanently moved\",\n        headers: {\n          \"location\": { \"value\": uri.replace(/.$/, \"\") }\n        }\n      }\n    }\n  }\n  if (event.request.uri === \"/robots.txt\" && \"ROBOTS_BEHAVIOR\" !== \"None\") {\n    if (\"ROBOTS_BEHAVIOR\" === \"Allow\") {\n      return {\n        statusCode: 200,\n        statusDescription: \"OK\",\n        headers: {\n         \"content-type\": { \"value\": \"text/plain\" }\n        },\n        body: \"User-agent: *\\\\nAllow: /\"\n      }\n    } else { // Disallow\n      return {\n        statusCode: 200,\n        statusDescription: \"OK\",\n        headers: {\n         \"content-type\": { \"value\": \"text/plain\" }\n        },\n        body: \"User-agent: *\\\\nDisallow: /\"\n      }\n    }\n  }\n  return event.request;\n}`\n          .replace(/APEX_DOMAIN/g, apexDomain)\n          .replace(/INDEX_FILE/g, props.indexFile ?? 'index.html')\n          .replace(\n            /NO_FILE_EXTENSION_BEHAVIOR/g,\n            props.noFileExtensionBehavior ?? 'None',\n          )\n          .replace(\n            /TRAILING_SLASH_BEHAVIOR/g,\n            props.trailingSlashBehavior ?? 'ForwardToIndex',\n          )\n          .replace(/ROBOTS_BEHAVIOR/g, props.robotsBehavior ?? 'Allow')\n          .replace(/WWW_REDIRECT_BEHAVIOR/g, wwwRedirectBehavior),\n      ),\n    });\n  }\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "truemark-cdk-lib",
   "description": "AWS CDK constructs created by TrueMark",
-  "version": "1.22.14",
+  "version": "1.22.15",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "typesVersions": {
@@ -101,7 +101,7 @@
     "prettier": "^3.8.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.59.0",
+    "typescript-eslint": "^8.59.1",
     "vitest": "4.1.5"
   },
   "peerDependencies": {