@vyriy/stack 0.1.23 → 0.2.0

package/README.md

@@ -28,6 +28,8 @@ The `aws-cdk-lib` package is listed because CDK apps and bin entrypoints use CDK
 - `cf.createDefaultBehavior(bucket, options?)` creates a CloudFront S3 origin behavior that redirects viewers to HTTPS.
 - `cf.createWebsiteRedirectBehavior(bucket, options?)` creates a CloudFront behavior for an S3 website redirect bucket.
 - `cf.createCloudFrontFunction(scope, id, props)` creates a CloudFront Function from inline JavaScript source.
+- `cf.createIndexRewriteFunctionCode({ rootDomain, wwwDomain })` creates CloudFront Function source for www redirects and clean URL index rewrites.
+- `cf.createFunctionAssociations(scope, id, { rootDomain, wwwDomain, ...props })` creates a viewer-request CloudFront Function association for www redirects and index rewrites.
 - `cf.createDistribution(scope, id, props)` creates a CloudFront distribution.
 - `route53.getHostedZone(scope, id, props)` looks up an existing Route 53 hosted zone.
 - `route53.createARecord(scope, id, props)` creates a Route 53 A record.
@@ -83,9 +85,14 @@ stack(
 
       const siteDistribution = cf.createDistribution(this, 'Distribution', {
         certificate,
-        defaultBehavior: cf.createDefaultBehavior(siteBucket),
+        defaultBehavior: cf.createDefaultBehavior(siteBucket, {
+          functionAssociations: cf.createFunctionAssociations(this, 'IndexRewriteFunction', {
+            rootDomain: domain,
+            wwwDomain: `www.${domain}`,
+          }),
+        }),
         defaultRootObject: 'index.html',
-        domainNames: [domain],
+        domainNames: [domain, `www.${domain}`],
         errorResponses: [
           {
             httpStatus: 403,

package/cloudfront/index.d.ts

@@ -1,13 +1,21 @@
 import { Construct } from 'constructs';
-import { AddBehaviorOptions, Distribution, DistributionProps, Function as CloudFrontFunction, FunctionEventType, FunctionProps, OriginProtocolPolicy, ViewerProtocolPolicy } from 'aws-cdk-lib/aws-cloudfront';
+import { AddBehaviorOptions, Distribution, DistributionProps, Function as CloudFrontFunction, FunctionAssociation, FunctionEventType, FunctionProps, OriginProtocolPolicy, ViewerProtocolPolicy } from 'aws-cdk-lib/aws-cloudfront';
 import { HttpOrigin } from 'aws-cdk-lib/aws-cloudfront-origins';
 import { Bucket } from 'aws-cdk-lib/aws-s3';
 export { FunctionEventType, OriginProtocolPolicy, ViewerProtocolPolicy };
 export interface CreateCloudFrontFunctionProps extends Omit<FunctionProps, 'code'> {
     readonly code: string;
 }
+export interface CreateIndexRewriteFunctionCodeProps {
+    readonly rootDomain: string;
+    readonly wwwDomain: string;
+}
+export interface CreateFunctionAssociationsProps extends CreateIndexRewriteFunctionCodeProps, Omit<CreateCloudFrontFunctionProps, 'code'> {
+}
 export declare const createDistribution: (scope: Construct, id: string, props: DistributionProps) => Distribution;
 export declare const createCloudFrontFunction: (scope: Construct, id: string, props: CreateCloudFrontFunctionProps) => CloudFrontFunction;
+export declare const createIndexRewriteFunctionCode: ({ rootDomain, wwwDomain }: CreateIndexRewriteFunctionCodeProps) => string;
+export declare const createFunctionAssociations: (scope: Construct, id: string, { rootDomain, wwwDomain, ...props }: CreateFunctionAssociationsProps) => FunctionAssociation[];
 export declare const createDefaultBehavior: (bucket: Bucket, options?: AddBehaviorOptions) => {
     allowedMethods?: import("aws-cdk-lib/aws-cloudfront").AllowedMethods;
     cachedMethods?: import("aws-cdk-lib/aws-cloudfront").CachedMethods;
@@ -18,7 +26,7 @@ export declare const createDefaultBehavior: (bucket: Bucket, options?: AddBehavi
     responseHeadersPolicy?: import("aws-cdk-lib/aws-cloudfront").IResponseHeadersPolicyRef;
     smoothStreaming?: boolean;
     viewerProtocolPolicy: ViewerProtocolPolicy;
-    functionAssociations?: import("aws-cdk-lib/aws-cloudfront").FunctionAssociation[];
+    functionAssociations?: FunctionAssociation[];
     edgeLambdas?: import("aws-cdk-lib/aws-cloudfront").EdgeLambda[];
     trustedKeyGroups?: import("aws-cdk-lib/aws-cloudfront").IKeyGroupRef[];
     enableGrpc?: boolean;
@@ -34,7 +42,7 @@ export declare const createWebsiteRedirectBehavior: (bucket: Bucket, options?: A
     responseHeadersPolicy?: import("aws-cdk-lib/aws-cloudfront").IResponseHeadersPolicyRef;
     smoothStreaming?: boolean;
     viewerProtocolPolicy: ViewerProtocolPolicy;
-    functionAssociations?: import("aws-cdk-lib/aws-cloudfront").FunctionAssociation[];
+    functionAssociations?: FunctionAssociation[];
     edgeLambdas?: import("aws-cdk-lib/aws-cloudfront").EdgeLambda[];
     trustedKeyGroups?: import("aws-cdk-lib/aws-cloudfront").IKeyGroupRef[];
     enableGrpc?: boolean;

package/cloudfront/index.js

@@ -6,6 +6,44 @@ export const createCloudFrontFunction = (scope, id, props) => new CloudFrontFunc
     ...props,
     code: FunctionCode.fromInline(props.code),
 });
+export const createIndexRewriteFunctionCode = ({ rootDomain, wwwDomain }) => `
+function handler(event) {
+  var request = event.request;
+  var host = request.headers.host.value;
+
+  if (host === ${JSON.stringify(wwwDomain)}) {
+    return {
+      statusCode: 301,
+      statusDescription: 'Moved Permanently',
+      headers: {
+        location: {
+          value: ${JSON.stringify(`https://${rootDomain}`)} + request.uri,
+        },
+      },
+    };
+  }
+
+  var uri = request.uri;
+  var lastSegment = uri.split('/').pop();
+
+  if (uri.endsWith('/')) {
+    request.uri = uri + 'index.html';
+  } else if (!lastSegment.includes('.')) {
+    request.uri = uri + '/index.html';
+  }
+
+  return request;
+}
+`;
+export const createFunctionAssociations = (scope, id, { rootDomain, wwwDomain, ...props }) => [
+    {
+        eventType: FunctionEventType.VIEWER_REQUEST,
+        function: createCloudFrontFunction(scope, id, {
+            ...props,
+            code: createIndexRewriteFunctionCode({ rootDomain, wwwDomain }),
+        }),
+    },
+];
 export const createDefaultBehavior = (bucket, options = {}) => ({
     origin: S3BucketOrigin.withOriginAccessControl(bucket),
     viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyriy/stack",
-  "version": "0.1.23",
+  "version": "0.2.0",
   "description": "AWS CDK stack helpers for Vyriy infrastructure",
   "type": "module",
   "main": "./index.js",