Merge pull request #15 from Moesif/determine-event-version-when-version-donot-exist

Determine event version when version donot exist

Author: xinghengwang

lib/index.js

@@ -304,7 +304,7 @@ function constructBaseLogData(
       event.requestContext.http.method;
   }
 
-  logData.request.apiVerion = options.getApiVersion(event, context);
+  logData.request.apiVersion = options.getApiVersion(event, context);
 
   if (isV1) {
     logData.request.ipAddress =
@@ -364,6 +364,24 @@ function constructBaseLogData(
   return logData;
 }
 
+function determineIsEventVersionV1(event) {
+  if (event.version === '1.0') {
+    return true;
+  }
+
+  if (event.version === '2.0') {
+    return false;
+  }
+  // per aws event spec https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
+  // events suppose to have version specified.
+  // For some reason, the version is not specified in some cases.
+  // so we use heuristic below.
+  if (event.httpMethod) {
+    return true;
+  }
+
+  return false;
+}
 
 function logEvent(event, context, err, result, options, moesifController) {
   // v1 has httpMethod, v2 has requestContext
@@ -382,7 +400,7 @@ function logEvent(event, context, err, result, options, moesifController) {
     return Promise.resolve();
   }
 
-  const isV1 = event.version === '1.0';
+  const isV1 = determineIsEventVersionV1(event);
 
   var logData = constructBaseLogData(
     event,

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "moesif-aws-lambda",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "API Monitoring Middleware for AWS Lambda",
   "main": "lib/index.js",
   "keywords": [