@middy/http-event-normalizer 5.0.0-alpha.0 → 5.0.0-alpha.2

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.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,40 @@
 const httpEventNormalizerMiddleware = ()=>{
     const httpEventNormalizerMiddlewareBefore = async (request)=>{
-        const { event  } = request;
-        const version = event.version ?? '1.0';
+        const { event } = request;
+        const version = pickVersion(event);
         const isHttpEvent = isVersionHttpEvent[version]?.(event);
         if (!isHttpEvent) {
-            throw new Error('[http-event-normalizer] Unknown http event format');
+            throw new Error('Unknown http event format', {
+                cause: {
+                    package: '@middy/http-event-normalizer'
+                }
+            });
         }
-        event.pathParameters ??= {};
-        event.queryStringParameters ??= {};
+        // VPC Lattice is an http event, however uses a different notation
+        // - query_string_parameters
+        // - is_base64_encoded
         if (version === '1.0') {
             event.multiValueQueryStringParameters ??= {};
+        } else if (version === 'vpc') {
+            event.queryStringParameters = event.query_string_parameters;
+            event.isBase64Encoded = event.is_base64_encoded;
         }
+        // event.headers ??= {} // Will always have at least one header
+        event.pathParameters ??= {};
+        event.queryStringParameters ??= {};
     };
     return {
         before: httpEventNormalizerMiddlewareBefore
     };
 };
+const pickVersion = (event)=>{
+    // '1.0' is a safer default
+    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": "5.0.0-alpha.0",
+  "version": "5.0.0-alpha.2",
   "description": "Http event normalizer middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -10,24 +10,18 @@
   "publishConfig": {
     "access": "public"
   },
-  "main": "./index.cjs",
   "module": "./index.js",
   "exports": {
     ".": {
       "import": {
         "types": "./index.d.ts",
         "default": "./index.js"
-      },
-      "require": {
-        "types": "./index.d.ts",
-        "default": "./index.cjs"
       }
     }
   },
   "types": "index.d.ts",
   "files": [
     "index.js",
-    "index.cjs",
     "index.d.ts"
   ],
   "scripts": {
@@ -65,9 +59,9 @@
     "type": "github",
     "url": "https://github.com/sponsors/willfarrell"
   },
-  "gitHead": "08c35e3dba9efdad0b86666ce206ce302cc65d07",
+  "gitHead": "ebce8d5df8783077fa49ba62ee9be20e8486a7f1",
   "devDependencies": {
-    "@middy/core": "5.0.0-alpha.0",
+    "@middy/core": "5.0.0-alpha.2",
     "@types/aws-lambda": "^8.10.101"
   }
 }

package/index.cjs

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(module, "exports", {
-    enumerable: true,
-    get: ()=>_default
-});
-const httpEventNormalizerMiddleware = ()=>{
-    const httpEventNormalizerMiddlewareBefore = async (request)=>{
-        const { event  } = request;
-        const version = event.version ?? '1.0';
-        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 ??= {};
-        }
-    };
-    return {
-        before: httpEventNormalizerMiddlewareBefore
-    };
-};
-const isVersionHttpEvent = {
-    '1.0': (event)=>typeof event.httpMethod !== 'undefined',
-    '2.0': (event)=>typeof event.requestContext.http.method !== 'undefined'
-};
-const _default = httpEventNormalizerMiddleware;
-