@middy/http-event-normalizer 4.4.3 → 4.5.0

package/README.md

@@ -19,8 +19,9 @@
   <a href="https://snyk.io/test/github/middyjs/middy">
     <img src="https://snyk.io/test/github/middyjs/middy/badge.svg" alt="Known Vulnerabilities" data-canonical-src="https://snyk.io/test/github/middyjs/middy" style="max-width:100%;">
   </a>
-  <a href="https://lgtm.com/projects/g/middyjs/middy/context:javascript">
-    <img src="https://img.shields.io/lgtm/grade/javascript/g/middyjs/middy.svg?logo=lgtm&logoWidth=18" alt="Language grade: JavaScript" style="max-width:100%;">
+  <a href="https://github.com/middyjs/middy/actions/workflows/sast.yml">
+    <img src="https://github.com/middyjs/middy/actions/workflows/sast.yml/badge.svg
+?branch=main&event=push" alt="CodeQL" style="max-width:100%;">
   </a>
   <a href="https://bestpractices.coreinfrastructure.org/projects/5280">
     <img src="https://bestpractices.coreinfrastructure.org/projects/5280/badge" alt="Core Infrastructure Initiative (CII) Best Practices"  style="max-width:100%;">

package/index.cjs

@@ -11,24 +11,31 @@ Object.defineProperty(module, "exports", {
 const httpEventNormalizerMiddleware = ()=>{
     const httpEventNormalizerMiddlewareBefore = async (request)=>{
         const { event  } = request;
-        const version = event.version ?? '1.0';
+        const version = pickVersion(event);
         const isHttpEvent = isVersionHttpEvent[version]?.(event);
         if (!isHttpEvent) {
             throw new Error('[http-event-normalizer] Unknown http event format');
         }
-        event.pathParameters ??= {};
-        event.queryStringParameters ??= {};
         if (version === '1.0') {
             event.multiValueQueryStringParameters ??= {};
+        } else if (version === 'vpc') {
+            event.queryStringParameters = event.query_string_parameters;
+            event.isBase64Encoded = event.is_base64_encoded;
         }
+        event.pathParameters ??= {};
+        event.queryStringParameters ??= {};
     };
     return {
         before: httpEventNormalizerMiddlewareBefore
     };
 };
+const pickVersion = (event)=>{
+    return event.version ?? (event.method ? 'vpc' : '1.0');
+};
 const isVersionHttpEvent = {
     '1.0': (event)=>typeof event.httpMethod !== 'undefined',
-    '2.0': (event)=>typeof event.requestContext.http.method !== 'undefined'
+    '2.0': (event)=>typeof event.requestContext.http.method !== 'undefined',
+    vpc: (event)=>typeof event.method !== 'undefined'
 };
 const _default = httpEventNormalizerMiddleware;
 

package/index.d.ts

@@ -4,6 +4,7 @@ import {
   APIGatewayProxyEventMultiValueQueryStringParameters,
   APIGatewayProxyEventPathParameters,
   APIGatewayProxyEventQueryStringParameters
+  // TODO add in VPC Lattice event
 } from 'aws-lambda'
 
 export type Event = APIGatewayEvent & {

package/index.js

@@ -1,24 +1,31 @@
 const httpEventNormalizerMiddleware = ()=>{
     const httpEventNormalizerMiddlewareBefore = async (request)=>{
         const { event  } = request;
-        const version = event.version ?? '1.0';
+        const version = pickVersion(event);
         const isHttpEvent = isVersionHttpEvent[version]?.(event);
         if (!isHttpEvent) {
             throw new Error('[http-event-normalizer] Unknown http event format');
         }
-        event.pathParameters ??= {};
-        event.queryStringParameters ??= {};
         if (version === '1.0') {
             event.multiValueQueryStringParameters ??= {};
+        } else if (version === 'vpc') {
+            event.queryStringParameters = event.query_string_parameters;
+            event.isBase64Encoded = event.is_base64_encoded;
         }
+        event.pathParameters ??= {};
+        event.queryStringParameters ??= {};
     };
     return {
         before: httpEventNormalizerMiddlewareBefore
     };
 };
+const pickVersion = (event)=>{
+    return event.version ?? (event.method ? 'vpc' : '1.0');
+};
 const isVersionHttpEvent = {
     '1.0': (event)=>typeof event.httpMethod !== 'undefined',
-    '2.0': (event)=>typeof event.requestContext.http.method !== 'undefined'
+    '2.0': (event)=>typeof event.requestContext.http.method !== 'undefined',
+    vpc: (event)=>typeof event.method !== 'undefined'
 };
 export default httpEventNormalizerMiddleware;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-event-normalizer",
-  "version": "4.4.3",
+  "version": "4.5.0",
   "description": "Http event normalizer middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -65,9 +65,9 @@
     "type": "github",
     "url": "https://github.com/sponsors/willfarrell"
   },
-  "gitHead": "089df92081ae593696c59fad7c604c2ac2eebe1a",
+  "gitHead": "200d1cd90c6e0bd25bb96c525cdebd1a74d813a6",
   "devDependencies": {
-    "@middy/core": "4.4.3",
+    "@middy/core": "4.5.0",
     "@types/aws-lambda": "^8.10.101"
   }
 }