Fix: Event Request URI

Fix: Event Request URI
Fix: Event Response time
Add: Direction field to event model
Add: Weight field to determine the weight of an API call
Refactor: Update README.md
Refactor: Update moesifapi dependency to 2.0.7
Bump version to 1.2.5

Author: Keyur

README.md

@@ -85,7 +85,7 @@ into the [_Moesif Portal_](https://www.moesif.com/), click on the top right menu
 ## Repo file structure
 
 - `lib/index.js` the middleware lib
-- `index.js` sample AWS Lambda function using the middleware
+- `app.js` sample AWS Lambda function using the middleware
 
 
 ## Configuration options
@@ -349,7 +349,7 @@ The userId field is required.
 
 ## Other integrations
 
-To view more more documentation on integration options, please visit __[the Integration Options Documentation](https://www.moesif.com/docs/getting-started/integration-options/).__
+To view more documentation on integration options, please visit __[the Integration Options Documentation](https://www.moesif.com/docs/getting-started/integration-options/).__
 
 [ico-built-for]: https://img.shields.io/badge/built%20for-aws%20lambda-blue.svg
 [ico-license]: https://img.shields.io/badge/License-Apache%202.0-green.svg

lib/index.js

@@ -153,7 +153,7 @@ function logEvent(event, context, err, result, options, moesifController) {
     new Date(event && event.requestContext && event.requestContext.requestTimeEpoch) : 
     startTime;
 
-  logData.request.uri = getPathWithQueryStringParams(event);
+  logData.request.uri = getURLWithQueryStringParams(event);
   logData.request.verb = event.httpMethod;
   logData.request.apiVerion = options.getApiVersion(event, context);
   logData.request.ipAddress = requestIp.getClientIp(event) || (event.requestContext && event.requestContext.identity && event.requestContext.identity.sourceIp);
@@ -173,7 +173,7 @@ function logEvent(event, context, err, result, options, moesifController) {
 
   logMessage(options.debug, 'logEvent', 'created request: \n' + JSON.stringify(logData.request));
   var safeRes = result || {};
-  logData.response.time = new Date(Math.max(logData.request.time.getTime(), Date.now()));
+  logData.response.time = Math.max(new Date(logData.request.time).getTime(), Date.now());
   logData.response.status = safeRes.statusCode ? parseInt(safeRes.statusCode) : 599;
   logData.response.headers = mapResponseHeaders(event, context, safeRes);
 
@@ -197,12 +197,19 @@ function logEvent(event, context, err, result, options, moesifController) {
   logData.sessionToken = options.getSessionToken(event, context);
   logData.tags = options.getTags(event, context);
 
+  // Set API direction
+  logData.direction = "Incoming"
+
   logMessage(options.debug, 'logEvent', 'applied options to data: \n' + JSON.stringify(logData));
 
   ensureValidLogData(logData);
 
   // This is fire and forget, we don't want logging to hold up the request so don't wait for the callback
   if (!options.skip(event, context) && moesifConfigManager.shouldSend(logData && logData.userId, logData && logData.companyId)) {
+
+    let sampleRate = moesifConfigManager._getSampleRate(logData && logData.userId, logData && logData.companyId);
+    logData.weight = sampleRate === 0 ? 1 : Math.floor(100 / sampleRate);
+
     logMessage(options.debug, 'logEvent', 'sending data invoking moesifAPI');
 
     moesifController.createEvent(new EventModel(logData), function(err) {
@@ -272,9 +279,11 @@ function bodyToBase64(body) {
   }
 }
 
-function getPathWithQueryStringParams(event) {
+function getURLWithQueryStringParams(event) {
   try {
-    return url.format({ pathname: event.path, query: event.queryStringParameters });
+    var protocol = (event.headers && event.headers['X-Forwarded-Proto'] || event.headers['x-forwarded-proto']) ? (event.headers['X-Forwarded-Proto'] || event.headers['x-forwarded-proto']) : 'http';
+    var host = event.headers.Host || event.headers.host;
+    return url.format({ protocol: protocol, host: host, pathname: event.path, query: event.queryStringParameters });
   } catch (err) {
     return '/';
   }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "moesif-aws-lambda",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "API Monitoring Middleware for AWS Lambda",
   "main": "lib/index.js",
   "keywords": [
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "lodash": "^4.17.15",
-    "moesifapi": "^2.0.5",
+    "moesifapi": "^2.0.7",
     "request-ip": "^2.1.3"
   },
   "scripts": {