@digitraffic/common 2023.5.22-1 → 2023.5.25-1

package/dist/aws/infra/api/response.d.ts

@@ -12,7 +12,7 @@ import { IModel } from "aws-cdk-lib/aws-apigateway/lib/model";
  * If fileName is set, then Content-Disposition-header will be set to use it
  * If timestamp is set, then ETag & Last-Modified headers will be set
  */
-export declare const RESPONSE_DEFAULT_LAMBDA = "#set($inputRoot = $input.path('$'))\n#if ($inputRoot.status != 200)\n#set ($context.responseOverride.status = $inputRoot.status)\n#set ($context.responseOverride.header.Content-Type = 'text/plain')\n#end\n#set ($context.responseOverride.header.Access-Control-Allow-Origin = '*')\n#if (\"$!inputRoot.timestamp\" != \"\")\n#set ($context.responseOverride.header.ETag = $inputRoot.timestamp)\n#set ($context.responseOverride.header.Last-Modified = $inputRoot.timestamp)\n#end\n#if (\"$!inputRoot.fileName\" != \"\")\n#set ($disposition = 'attachment; filename=\"FN\"')\n#set ($context.responseOverride.header.Content-Disposition = $disposition.replaceAll('FN', $inputRoot.fileName))\n#end\n$util.base64Decode($inputRoot.body)";
+export declare const RESPONSE_DEFAULT_LAMBDA = "#set($inputRoot = $input.path('$'))\n#if ($inputRoot.status != 200)\n#set ($context.responseOverride.status = $inputRoot.status)\n#set ($context.responseOverride.header.Content-Type = 'text/plain')\n#end\n#set ($context.responseOverride.header.Access-Control-Allow-Origin = '*')\n#if (\"$!inputRoot.timestamp\" != \"\")\n#set ($context.responseOverride.header.Last-Modified = $inputRoot.timestamp)\n#end\n#if (\"$!inputRoot.etag\" != \"\")\n#set ($context.responseOverride.header.ETag = $inputRoot.etag)\n#end\n#if (\"$!inputRoot.fileName\" != \"\")\n#set ($disposition = 'attachment; filename=\"FN\"')\n#set ($context.responseOverride.header.Content-Disposition = $disposition.replaceAll('FN', $inputRoot.fileName))\n#end\n$util.base64Decode($inputRoot.body)";
 /**
  * Use this for deprecated integrations.
  * Will add HTTP headers Deprecation and Sunset to response.

package/dist/aws/infra/api/response.js

@@ -22,9 +22,11 @@ exports.RESPONSE_DEFAULT_LAMBDA = `#set($inputRoot = $input.path('$'))
 #end
 #set ($context.responseOverride.header.Access-Control-Allow-Origin = '*')
 #if ("$!inputRoot.timestamp" != "")
-#set ($context.responseOverride.header.ETag = $inputRoot.timestamp)
 #set ($context.responseOverride.header.Last-Modified = $inputRoot.timestamp)
 #end
+#if ("$!inputRoot.etag" != "")
+#set ($context.responseOverride.header.ETag = $inputRoot.etag)
+#end
 #if ("$!inputRoot.fileName" != "")
 #set ($disposition = 'attachment; filename="FN"')
 #set ($context.responseOverride.header.Content-Disposition = $disposition.replaceAll('FN', $inputRoot.fileName))

package/dist/aws/types/lambda-response.d.ts

@@ -3,6 +3,7 @@ export declare class LambdaResponse {
     readonly body: string;
     readonly fileName?: string;
     readonly timestamp?: string;
+    readonly etag: string;
     constructor(status: number, body: string, fileName?: string, timestamp?: Date);
     withTimestamp(timestamp: Date): LambdaResponse;
     /**

package/dist/aws/types/lambda-response.js

@@ -1,12 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LambdaResponse = void 0;
+const etag_1 = __importDefault(require("etag"));
 class LambdaResponse {
     constructor(status, body, fileName, timestamp) {
         this.status = status;
         this.body = body;
         this.fileName = fileName;
         this.timestamp = timestamp?.toUTCString();
+        this.etag = (0, etag_1.default)(body); // create strong etag by default
     }
     withTimestamp(timestamp) {
         return new LambdaResponse(this.status, this.body, this.fileName, timestamp);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2023.5.22-1",
+  "version": "2023.5.25-1",
   "description": "",
   "repository": {
     "type": "git",
@@ -24,6 +24,7 @@
     "axios": "^1.2.6",
     "change-case": "^4.1.2",
     "constructs": "^10.2.17",
+    "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
     "moment": "^2.29.4",
     "node-ttl": "^0.2.0",
@@ -34,6 +35,7 @@
     "@aws-cdk/aws-synthetics-alpha": "2.78.0-alpha.0",
     "@types/aws-lambda": "~8.10.115",
     "@types/geojson": "^7946.0.10",
+    "@types/etag": "^1.8.1",
     "@types/jest": "^29.5.1",
     "@types/lodash": "^4.14.194",
     "@types/node": "18.15.13",

package/src/aws/infra/api/response.ts

@@ -27,9 +27,11 @@ export const RESPONSE_DEFAULT_LAMBDA = `#set($inputRoot = $input.path('$'))
 #end
 #set ($context.responseOverride.header.Access-Control-Allow-Origin = '*')
 #if ("$!inputRoot.timestamp" != "")
-#set ($context.responseOverride.header.ETag = $inputRoot.timestamp)
 #set ($context.responseOverride.header.Last-Modified = $inputRoot.timestamp)
 #end
+#if ("$!inputRoot.etag" != "")
+#set ($context.responseOverride.header.ETag = $inputRoot.etag)
+#end
 #if ("$!inputRoot.fileName" != "")
 #set ($disposition = 'attachment; filename="FN"')
 #set ($context.responseOverride.header.Content-Disposition = $disposition.replaceAll('FN', $inputRoot.fileName))

package/src/aws/types/lambda-response.ts

@@ -1,8 +1,11 @@
+import etag from "etag";
+
 export class LambdaResponse {
     readonly status: number;
     readonly body: string;
     readonly fileName?: string;
     readonly timestamp?: string;
+    readonly etag: string;
 
     constructor(
         status: number,
@@ -14,6 +17,7 @@ export class LambdaResponse {
         this.body = body;
         this.fileName = fileName;
         this.timestamp = timestamp?.toUTCString();
+        this.etag = etag(body); // create strong etag by default
     }
 
     withTimestamp(timestamp: Date) {