@comicrelief/lambda-wrapper 1.10.0 → 1.10.2

package/dist/Service/Timer.service.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _Dependencies = require("../Config/Dependencies");
-
 var _DependencyAware = _interopRequireDefault(require("../DependencyInjection/DependencyAware.class"));
-
 var _DependencyInjection = _interopRequireDefault(require("../DependencyInjection/DependencyInjection.class"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * TimerService class
  */
@@ -26,30 +21,26 @@ class TimerService extends _DependencyAware.default {
     super(di);
     this.timers = {};
   }
+
   /**
    * Start timer
    *
    * @param identifier
    */
-
-
   start(identifier) {
-    this.timers[identifier] = new Date().getTime();
+    this.timers[identifier] = Date.now();
   }
+
   /**
    * Stop timer
    *
    * @param identifier
    */
-
-
   stop(identifier) {
     if (typeof this.timers[identifier] !== 'undefined') {
-      const duration = new Date().getTime() - this.timers[identifier];
+      const duration = Date.now() - this.timers[identifier];
       this.getContainer().get(_Dependencies.DEFINITIONS.LOGGER).info(`Timing - ${identifier} took ${duration}ms to complete`);
     }
   }
-
 }
-
 exports.default = TimerService;

package/dist/Wrapper/LambdaTermination.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 /**
  *
  */
@@ -22,18 +21,14 @@ class LambdaTermination extends Error {
    */
   constructor(internal, code = 500, body = null, details = 'unknown error') {
     let stringified = internal;
-
     if (typeof internal !== 'string') {
       stringified = JSON.stringify(internal);
     }
-
     super(stringified);
     this.internal = internal;
     this.code = code;
     this.body = body || 'unknown error';
     this.details = details;
   }
-
 }
-
 exports.default = LambdaTermination;

package/dist/Wrapper/LambdaWrapper.js

@@ -3,18 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.handleError = exports.handleSuccess = void 0;
-
+exports.handleSuccess = exports.handleError = exports.default = void 0;
 var _epsagon = _interopRequireDefault(require("epsagon"));
-
 var _Dependencies = require("../Config/Dependencies");
-
 var _DependencyInjection = _interopRequireDefault(require("../DependencyInjection/DependencyInjection.class"));
-
 var _Response = _interopRequireDefault(require("../Model/Response.model"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /* eslint-disable sonarjs/cognitive-complexity */
 
 /**
@@ -24,11 +18,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param outcome
  */
 const handleSuccess = (di, outcome) => {
-  const logger = di.get(_Dependencies.DEFINITIONS.LOGGER); // Outcome may be undefined as not all lambdas have a return value.
+  const logger = di.get(_Dependencies.DEFINITIONS.LOGGER);
 
+  // Outcome may be undefined as not all lambdas have a return value.
   logger.metric('lambda.statusCode', outcome && outcome.statusCode || 200);
   return outcome;
 };
+
 /**
  * Gracefully handles an error
  * logging in Epsagon and generating
@@ -48,32 +44,26 @@ const handleSuccess = (di, outcome) => {
  * @param {Error} error
  * @param {boolean} [throwError=false]
  */
-
-
 exports.handleSuccess = handleSuccess;
-
 const handleError = (di, error, throwError = false) => {
   const logger = di.get(_Dependencies.DEFINITIONS.LOGGER);
   logger.metric('lambda.statusCode', error.code || 500);
-
   if (error.raiseOnEpsagon || !error.code || error.code >= 500) {
     logger.error(error);
   } else {
     logger.info(error);
   }
-
   if (throwError) {
     if (error instanceof Error) {
       return error;
-    } // We want to be absolutely sure
+    }
+
+    // We want to be absolutely sure
     // that we are returning an error
     // as Lambda sync handlers will only fail
     // if the object is instanceof Error
-
-
     return new Error(error);
   }
-
   const responseDetails = {
     body: error.body || {},
     code: error.code || 500,
@@ -81,6 +71,7 @@ const handleError = (di, error, throwError = false) => {
   };
   return _Response.default.generate(responseDetails.body, responseDetails.code, responseDetails.details);
 };
+
 /**
  * Lambda Wrapper.
  *
@@ -92,73 +83,61 @@ const handleError = (di, error, throwError = false) => {
  * @param handler
  * @param throwError
  */
-
-
 exports.handleError = handleError;
-
 var _default = (configuration, handler, throwError = false) => {
   let instance = (event, context, callback) => {
     const di = new _DependencyInjection.default(configuration, event, context);
     const request = di.get(_Dependencies.DEFINITIONS.REQUEST);
     const logger = di.get(_Dependencies.DEFINITIONS.LOGGER);
-    context.callbackWaitsForEmptyEventLoop = false; // If the event is to trigger a warm up, then don't bother returning the function.
+    context.callbackWaitsForEmptyEventLoop = false;
 
+    // If the event is to trigger a warm up, then don't bother returning the function.
     if (di.getEvent().source === 'serverless-plugin-warmup') {
       return callback(null, 'Lambda is warm!');
-    } // Log the users ip address silently for use in error tracing
-
+    }
 
+    // Log the users ip address silently for use in error tracing
     if (request.getIp() !== null) {
       logger.metric('ipAddress', request.getIp(), true);
-    } // Add metrics with user browser information for rapid debugging
-
+    }
 
+    // Add metrics with user browser information for rapid debugging
     const userBrowserAndDevice = request.getUserBrowserAndDevice();
-
     if (userBrowserAndDevice !== null && typeof userBrowserAndDevice === 'object') {
       Object.keys(userBrowserAndDevice).forEach(metricKey => {
         logger.metric(metricKey, userBrowserAndDevice[metricKey], true);
       });
     }
-
     let outcome;
-
     try {
       outcome = handler.call(instance, di, request, callback);
-
       if (outcome instanceof Promise) {
         outcome = outcome.then(value => handleSuccess(di, value)).catch(error => {
           const handled = handleError(di, error, throwError);
-
           if (throwError) {
             // AWS Lambda with async handler is looking for a rejection
             // and not an error object directly
             // and will treat resolved errors as successful
             // as it will cast the error to JSON, i.e. `{}`
-            return Promise.reject(handled);
+            throw handled;
           }
-
           return handled;
         });
       }
     } catch (error) {
       outcome = handleError(di, error, throwError);
     }
-
     return outcome;
-  }; // If the Epsagon token is enabled, then wrap the instance in the Epsagon wrapper
-
+  };
 
+  // If the Epsagon token is enabled, then wrap the instance in the Epsagon wrapper
   if (typeof process.env.EPSAGON_TOKEN === 'string' && process.env.EPSAGON_TOKEN !== 'undefined' && typeof process.env.EPSAGON_SERVICE_NAME === 'string' && process.env.EPSAGON_SERVICE_NAME !== 'undefined') {
     _epsagon.default.init({
       token: process.env.EPSAGON_TOKEN,
       appName: process.env.EPSAGON_SERVICE_NAME
     });
-
     instance = _epsagon.default.lambdaWrapper(instance);
   }
-
   return instance;
 };
-
 exports.default = _default;

package/dist/Wrapper/PromisifiedDelay.js

@@ -15,13 +15,13 @@ const HIGH_LATENCY_DELAYS = {
   3500: 15,
   4000: 9,
   5000: 5,
-  10000: 5,
-  20000: 1
+  10_000: 5,
+  20_000: 1
 };
+
 /**
  * PromisifiedDelay class
  */
-
 class PromisifiedDelay {
   /**
    * PromisifiedDelay constructor
@@ -33,19 +33,17 @@ class PromisifiedDelay {
     const delayArray = highLatency === true ? HIGH_LATENCY_DELAYS : STANDARD_LATENCY_DELAYS;
     Object.keys(delayArray).forEach(delayDuration => {
       const delayIterations = delayArray[delayDuration];
-
       for (let i = 0; i < delayIterations; i += 1) {
         this.delays.push(delayDuration);
       }
     });
   }
+
   /**
    * Create a promisified delay
    *
    * @returns {Promise<any>}
    */
-
-
   get() {
     return new Promise(resolve => {
       setTimeout(() => {
@@ -53,7 +51,5 @@ class PromisifiedDelay {
       }, this.delays[Math.floor(Math.random() * this.delays.length)]);
     });
   }
-
 }
-
 exports.default = PromisifiedDelay;

package/dist/index.js

@@ -3,6 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "BaseConfigService", {
+  enumerable: true,
+  get: function () {
+    return _BaseConfig.default;
+  }
+});
+Object.defineProperty(exports, "COMICRELIEF_TEST_METADATA_HEADER", {
+  enumerable: true,
+  get: function () {
+    return _HTTP.COMICRELIEF_TEST_METADATA_HEADER;
+  }
+});
 Object.defineProperty(exports, "DEFINITIONS", {
   enumerable: true,
   get: function () {
@@ -21,34 +33,28 @@ Object.defineProperty(exports, "DependencyInjection", {
     return _DependencyInjection.default;
   }
 });
-Object.defineProperty(exports, "Model", {
-  enumerable: true,
-  get: function () {
-    return _Model.default;
-  }
-});
-Object.defineProperty(exports, "ResponseModel", {
+Object.defineProperty(exports, "HTTPService", {
   enumerable: true,
   get: function () {
-    return _Response.default;
+    return _HTTP.default;
   }
 });
-Object.defineProperty(exports, "StatusModel", {
+Object.defineProperty(exports, "LambdaTermination", {
   enumerable: true,
   get: function () {
-    return _Status.default;
+    return _LambdaTermination.default;
   }
 });
-Object.defineProperty(exports, "STATUS_TYPES", {
+Object.defineProperty(exports, "LambdaWrapper", {
   enumerable: true,
   get: function () {
-    return _Status.STATUS_TYPES;
+    return _LambdaWrapper.default;
   }
 });
-Object.defineProperty(exports, "SQSMessageModel", {
+Object.defineProperty(exports, "LoggerService", {
   enumerable: true,
   get: function () {
-    return _Message.default;
+    return _Logger.default;
   }
 });
 Object.defineProperty(exports, "MarketingPreferenceModel", {
@@ -57,34 +63,34 @@ Object.defineProperty(exports, "MarketingPreferenceModel", {
     return _MarketingPreference.default;
   }
 });
-Object.defineProperty(exports, "BaseConfigService", {
+Object.defineProperty(exports, "Model", {
   enumerable: true,
   get: function () {
-    return _BaseConfig.default;
+    return _Model.default;
   }
 });
-Object.defineProperty(exports, "HTTPService", {
+Object.defineProperty(exports, "PromisifiedDelay", {
   enumerable: true,
   get: function () {
-    return _HTTP.default;
+    return _PromisifiedDelay.default;
   }
 });
-Object.defineProperty(exports, "COMICRELIEF_TEST_METADATA_HEADER", {
+Object.defineProperty(exports, "RequestService", {
   enumerable: true,
   get: function () {
-    return _HTTP.COMICRELIEF_TEST_METADATA_HEADER;
+    return _Request.default;
   }
 });
-Object.defineProperty(exports, "LoggerService", {
+Object.defineProperty(exports, "ResponseModel", {
   enumerable: true,
   get: function () {
-    return _Logger.default;
+    return _Response.default;
   }
 });
-Object.defineProperty(exports, "RequestService", {
+Object.defineProperty(exports, "SQSMessageModel", {
   enumerable: true,
   get: function () {
-    return _Request.default;
+    return _Message.default;
   }
 });
 Object.defineProperty(exports, "SQSService", {
@@ -105,59 +111,34 @@ Object.defineProperty(exports, "SQS_PUBLISH_FAILURE_MODES", {
     return _SQS.SQS_PUBLISH_FAILURE_MODES;
   }
 });
-Object.defineProperty(exports, "LambdaTermination", {
-  enumerable: true,
-  get: function () {
-    return _LambdaTermination.default;
-  }
-});
-Object.defineProperty(exports, "LambdaWrapper", {
+Object.defineProperty(exports, "STATUS_TYPES", {
   enumerable: true,
   get: function () {
-    return _LambdaWrapper.default;
+    return _Status.STATUS_TYPES;
   }
 });
-Object.defineProperty(exports, "PromisifiedDelay", {
+Object.defineProperty(exports, "StatusModel", {
   enumerable: true,
   get: function () {
-    return _PromisifiedDelay.default;
+    return _Status.default;
   }
 });
-
 var _Dependencies = require("./Config/Dependencies");
-
 var _DependencyAware = _interopRequireDefault(require("./DependencyInjection/DependencyAware.class"));
-
 var _DependencyInjection = _interopRequireDefault(require("./DependencyInjection/DependencyInjection.class"));
-
 var _Model = _interopRequireDefault(require("./Model/Model.model"));
-
 var _Response = _interopRequireDefault(require("./Model/Response.model"));
-
 var _Status = _interopRequireWildcard(require("./Model/Status.model"));
-
 var _Message = _interopRequireDefault(require("./Model/SQS/Message.model"));
-
 var _MarketingPreference = _interopRequireDefault(require("./Model/SQS/MarketingPreference.model"));
-
 var _BaseConfig = _interopRequireDefault(require("./Service/BaseConfig.service"));
-
 var _HTTP = _interopRequireWildcard(require("./Service/HTTP.service"));
-
 var _Logger = _interopRequireDefault(require("./Service/Logger.service"));
-
 var _Request = _interopRequireDefault(require("./Service/Request.service"));
-
 var _SQS = _interopRequireWildcard(require("./Service/SQS.service"));
-
 var _LambdaTermination = _interopRequireDefault(require("./Wrapper/LambdaTermination"));
-
 var _LambdaWrapper = _interopRequireDefault(require("./Wrapper/LambdaWrapper"));
-
 var _PromisifiedDelay = _interopRequireDefault(require("./Wrapper/PromisifiedDelay"));
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@comicrelief/lambda-wrapper",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "Lambda wrapper for all Comic Relief Serverless Projects",
   "main": "dist/index.js",
   "scripts": {
-    "lint": "yarn eslint .",
+    "lint": "eslint src tests",
     "test": "jest --coverage",
     "build": "babel src --out-dir dist --copy-files",
     "prepublish": "yarn build"
@@ -12,35 +12,41 @@
   "author": "Adam Clark",
   "license": "ISC",
   "devDependencies": {
-    "@babel/cli": "^7.12.10",
-    "@babel/core": "^7.12.10",
-    "@babel/node": "^7.12.10",
-    "@babel/plugin-syntax-flow": "^7.12.1",
-    "@babel/plugin-transform-flow-strip-types": "^7.12.10",
-    "@babel/preset-env": "^7.12.11",
-    "@comicrelief/eslint-config": "^1.3.3",
-    "@types/jest": "^26.0.20",
-    "aws-sdk": ">=2.831.0",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.3.3",
-    "eslint": "^7.18.0",
-    "jest": "^26.6.3",
+    "@babel/cli": "^7.22.9",
+    "@babel/core": "^7.22.9",
+    "@babel/eslint-parser": "^7.22.9",
+    "@babel/node": "^7.22.6",
+    "@babel/plugin-syntax-flow": "^7.22.5",
+    "@babel/plugin-transform-flow-strip-types": "^7.22.5",
+    "@babel/plugin-transform-react-jsx": "^7.22.5",
+    "@babel/preset-env": "^7.22.9",
+    "@comicrelief/eslint-config": "^2.0.3",
+    "@types/jest": "^28.1.8",
+    "aws-sdk": "^2.1427.0",
+    "babel-jest": "^28.1.3",
+    "eslint": "^8.22.0",
+    "eslint-plugin-flowtype": "^8.0.3",
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-jsdoc": "^39.3.2",
+    "eslint-plugin-sonarjs": "^0.13.0",
+    "eslint-plugin-unicorn": "^42.0.0",
+    "jest": "^29.6.2",
     "nyc": "^15.1.0",
-    "semantic-release": "^17.3.7"
+    "semantic-release": "^19.0.5"
   },
   "peerDependencies": {
-    "aws-sdk": ">=2.831.0"
+    "aws-sdk": "^2.831.0"
   },
   "dependencies": {
-    "@sentry/node": "^6.0.1",
+    "@sentry/node": "^6.19.7",
     "alai": "1.0.3",
-    "async": "^3.2.0",
-    "axios": "^0.21.1",
-    "epsagon": "^1.104.2",
+    "async": "^3.2.4",
+    "axios": "^0.27.2",
+    "epsagon": "^1.123.3",
     "useragent": "2.3.0",
-    "uuid": "^8.2.0",
+    "uuid": "^8.3.2",
     "validate.js": "0.13.1",
-    "winston": "^3.3.3",
-    "xml2js": "^0.4.23"
+    "winston": "^3.10.0",
+    "xml2js": "^0.6.2"
   }
 }