quidproquo-deploy-awscdk 0.0.65 → 0.0.67

package/lib/constructs/QpqWebserverWebEntryConstruct.js

@@ -96,11 +96,20 @@ class QpqWebserverWebEntryConstruct extends QpqConstruct_1.QpqConstruct {
                 description: `access to s3 bucket ${this.resourceName(originBucket.bucketName)}`,
             },
         });
+        const cachePolicy = new aws_cdk_lib_1.aws_cloudfront.CachePolicy(this, `dist-cp`, {
+            cachePolicyName: this.resourceName(props.setting.name),
+            defaultTtl: cdk.Duration.seconds(props.setting.cache.defaultTTLInSeconds),
+            minTtl: cdk.Duration.seconds(props.setting.cache.minTTLInSeconds),
+            maxTtl: cdk.Duration.seconds(props.setting.cache.maxTTLInSeconds),
+            enableAcceptEncodingGzip: true,
+            enableAcceptEncodingBrotli: true,
+        });
         // Create a CloudFront distribution using the S3 bucket as the origin
         const distributionOrigin = new aws_cdk_lib_1.aws_cloudfront_origins.S3Origin(originBucket);
         const distribution = new aws_cdk_lib_1.aws_cloudfront.Distribution(this, 'MyDistribution', {
             defaultBehavior: {
                 origin: distributionOrigin,
+                cachePolicy: cachePolicy,
             },
             domainNames: [deployDomain],
             certificate: myCertificate,
@@ -157,8 +166,18 @@ class QpqWebserverWebEntryConstruct extends QpqConstruct_1.QpqConstruct {
                 if (seo.deprecated) {
                     continue;
                 }
+                const seoCachePolicy = new aws_cdk_lib_1.aws_cloudfront.CachePolicy(this, `seo-cp-${seo.uniqueKey}`, {
+                    cachePolicyName: this.resourceName(`${props.setting.name}-${seo.uniqueKey}`),
+                    headerBehavior: aws_cdk_lib_1.aws_cloudfront.CacheHeaderBehavior.allowList(quidproquo_webserver_1.qpqHeaderIsBot, ...seo.cache.headers),
+                    defaultTtl: cdk.Duration.seconds(seo.cache.defaultTTLInSeconds),
+                    minTtl: cdk.Duration.seconds(seo.cache.minTTLInSeconds),
+                    maxTtl: cdk.Duration.seconds(seo.cache.maxTTLInSeconds),
+                    enableAcceptEncodingGzip: true,
+                    enableAcceptEncodingBrotli: true,
+                });
                 const wildcardPath = seo.path.replaceAll(/{(.+?)}/g, '*');
                 distribution.addBehavior(wildcardPath, distributionOrigin, {
+                    cachePolicy: seoCachePolicy,
                     edgeLambdas: [
                         {
                             functionVersion: edgeFunctionVR.currentVersion,

package/lib/lambdas/lambdaEventViewerRequest.js

@@ -10,18 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeEventViewerRequest = exports.getViewerRequestEventExecutor = void 0;
+const quidproquo_webserver_1 = require("quidproquo-webserver");
 const getViewerRequestEventExecutor = () => {
     return (event, context) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         console.log(JSON.stringify(event));
         const request = event.Records[0].cf.request;
         const headers = request.headers;
-        const customUserAgentHeaderName = 'x-qpq-is-bot';
         const userAgent = ((_a = headers['user-agent'][0]) === null || _a === void 0 ? void 0 : _a.value) || 'unknown';
         let isBot = userAgent.match(/bot|crawl|spider|slurp|facebot|facebookexternalhit/i);
-        return Object.assign(Object.assign({}, request), { headers: Object.assign(Object.assign({}, request.headers), { [customUserAgentHeaderName]: [
+        return Object.assign(Object.assign({}, request), { headers: Object.assign(Object.assign({}, request.headers), { [quidproquo_webserver_1.qpqHeaderIsBot]: [
                     {
-                        key: customUserAgentHeaderName,
+                        key: quidproquo_webserver_1.qpqHeaderIsBot,
                         value: isBot ? 'true' : 'false',
                     },
                 ] }) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-deploy-awscdk",
-  "version": "0.0.65",
+  "version": "0.0.67",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",

package/src/constructs/QpqWebserverWebEntryConstruct.ts

@@ -13,7 +13,11 @@ import {
 } from 'aws-cdk-lib';
 import * as cdk from 'aws-cdk-lib';
 
-import { WebEntryQPQWebServerConfigSetting, qpqWebServerUtils } from 'quidproquo-webserver';
+import {
+  WebEntryQPQWebServerConfigSetting,
+  qpqWebServerUtils,
+  qpqHeaderIsBot,
+} from 'quidproquo-webserver';
 import { QpqConstruct, QpqConstructProps } from './core/QpqConstruct';
 import { Construct } from 'constructs';
 
@@ -110,11 +114,22 @@ export class QpqWebserverWebEntryConstruct extends QpqConstruct<WebEntryQPQWebSe
       },
     );
 
+    const cachePolicy = new aws_cloudfront.CachePolicy(this, `dist-cp`, {
+      cachePolicyName: this.resourceName(props.setting.name),
+      defaultTtl: cdk.Duration.seconds(props.setting.cache.defaultTTLInSeconds),
+      minTtl: cdk.Duration.seconds(props.setting.cache.minTTLInSeconds),
+      maxTtl: cdk.Duration.seconds(props.setting.cache.maxTTLInSeconds),
+
+      enableAcceptEncodingGzip: true,
+      enableAcceptEncodingBrotli: true,
+    });
+
     // Create a CloudFront distribution using the S3 bucket as the origin
     const distributionOrigin = new aws_cloudfront_origins.S3Origin(originBucket);
     const distribution = new aws_cloudfront.Distribution(this, 'MyDistribution', {
       defaultBehavior: {
         origin: distributionOrigin,
+        cachePolicy: cachePolicy,
       },
       domainNames: [deployDomain],
       certificate: myCertificate,
@@ -211,9 +226,22 @@ export class QpqWebserverWebEntryConstruct extends QpqConstruct<WebEntryQPQWebSe
           continue;
         }
 
-        const wildcardPath = seo.path.replaceAll(/{(.+?)}/g, '*');
+        const seoCachePolicy = new aws_cloudfront.CachePolicy(this, `seo-cp-${seo.uniqueKey}`, {
+          cachePolicyName: this.resourceName(`${props.setting.name}-${seo.uniqueKey}`),
+          headerBehavior: aws_cloudfront.CacheHeaderBehavior.allowList(
+            qpqHeaderIsBot,
+            ...seo.cache.headers,
+          ),
+          defaultTtl: cdk.Duration.seconds(seo.cache.defaultTTLInSeconds),
+          minTtl: cdk.Duration.seconds(seo.cache.minTTLInSeconds),
+          maxTtl: cdk.Duration.seconds(seo.cache.maxTTLInSeconds),
+          enableAcceptEncodingGzip: true,
+          enableAcceptEncodingBrotli: true,
+        });
 
+        const wildcardPath = seo.path.replaceAll(/{(.+?)}/g, '*');
         distribution.addBehavior(wildcardPath, distributionOrigin, {
+          cachePolicy: seoCachePolicy,
           edgeLambdas: [
             {
               functionVersion: edgeFunctionVR.currentVersion,

package/src/lambdas/lambdaEventViewerRequest.ts

@@ -1,4 +1,5 @@
 import { CloudFrontRequestEvent, Context } from 'aws-lambda';
+import { qpqHeaderIsBot } from 'quidproquo-webserver';
 
 export const getViewerRequestEventExecutor = () => {
   return async (event: CloudFrontRequestEvent, context: Context) => {
@@ -6,7 +7,7 @@ export const getViewerRequestEventExecutor = () => {
 
     const request = event.Records[0].cf.request;
     const headers = request.headers;
-    const customUserAgentHeaderName = 'x-qpq-is-bot';
+
     const userAgent = headers['user-agent'][0]?.value || 'unknown';
 
     let isBot = userAgent.match(/bot|crawl|spider|slurp|facebot|facebookexternalhit/i);
@@ -15,9 +16,9 @@ export const getViewerRequestEventExecutor = () => {
       ...request,
       headers: {
         ...request.headers,
-        [customUserAgentHeaderName]: [
+        [qpqHeaderIsBot]: [
           {
-            key: customUserAgentHeaderName,
+            key: qpqHeaderIsBot,
             value: isBot ? 'true' : 'false',
           },
         ],