@comicrelief/lambda-wrapper 1.10.0 → 1.10.1

package/.eslintrc.yml

@@ -1,13 +1,16 @@
 root: true
 
 extends:
-  - '@comicrelief/eslint-config/mixins/base'
-  - '@comicrelief/eslint-config/mixins/flowtype'
+  - '@comicrelief/eslint-config'
   - '@comicrelief/eslint-config/mixins/jsdoc'
-  - '@comicrelief/eslint-config/mixins/sonarjs'
-  - '@comicrelief/eslint-config/mixins/unicorn'
+
+parser: '@babel/eslint-parser'
 
 ignorePatterns:
   - node_modules
   - dist
   - coverage
+  - babel.config.js
+
+rules:
+  unicorn/prefer-node-protocol: off

package/.github/workflows/main.yml

@@ -10,10 +10,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Use Node.js 12.x
-        uses: actions/setup-node@v1
+      - uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14
 
       - name: Restore cache
         uses: actions/cache@v2
@@ -34,10 +33,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Use Node.js 12.x
-        uses: actions/setup-node@v1
+      - uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14
 
       - name: Restore cache
         uses: actions/cache@v2
@@ -68,12 +66,9 @@ jobs:
 
       - name: Build and publish release.
         run: yarn install
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Publish via Semantic Release
         run: yarn semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_PUBLISHING_TOKEN }}

package/dist/DependencyInjection/DependencyInjection.class.js

@@ -110,11 +110,7 @@ class DependencyInjection {
       return true;
     }
 
-    if (process.env.USE_SERVERLESS_OFFLINE) {
-      return true;
-    }
-
-    return false;
+    return !!process.env.USE_SERVERLESS_OFFLINE;
   }
   /**
    * Returns the definitions

package/dist/Model/Response.model.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.DEFAULT_MESSAGE = exports.RESPONSE_HEADERS = void 0;
+exports.default = exports.RESPONSE_HEADERS = exports.DEFAULT_MESSAGE = void 0;
 
 var _Model = _interopRequireDefault(require("./Model.model"));
 

package/dist/Model/SQS/MarketingPreference.model.js

@@ -626,12 +626,13 @@ class MarketingPreference extends _Model.default {
       const validation = (0, _validate.default)(this.getEntityMappings(), requestConstraintsClone);
 
       if (typeof validation === 'undefined') {
-        return resolve();
+        resolve();
+        return;
       }
 
       const validationErrorResponse = ERROR_TYPES.VALIDATION_ERROR;
       validationErrorResponse.setBodyVariable('validation_errors', validation);
-      return reject(validationErrorResponse);
+      reject(validationErrorResponse);
     });
   }
 

package/dist/Service/HTTP.service.js

@@ -11,9 +11,9 @@ var _DependencyAware = _interopRequireDefault(require("../DependencyInjection/De
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+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) { 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 _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; }
 
 const COMICRELIEF_TEST_METADATA_HEADER = 'x-comicrelief-test-metadata';
 exports.COMICRELIEF_TEST_METADATA_HEADER = COMICRELIEF_TEST_METADATA_HEADER;

package/dist/Service/Logger.service.js

@@ -17,9 +17,9 @@ var _DependencyInjection = _interopRequireDefault(require("../DependencyInjectio
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+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) { 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 _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; }
 
 // Instantiate the sentry client
 const sentryIsAvailable = typeof process.env.RAVEN_DSN !== 'undefined' && typeof process.env.RAVEN_DSN === 'string' && process.env.RAVEN_DSN !== 'undefined';

package/dist/Service/Request.service.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.ERROR_TYPES = exports.HTTP_METHODS_WITH_PAYLOADS = exports.HTTP_METHODS_WITHOUT_PAYLOADS = exports.REQUEST_TYPES = void 0;
+exports.default = exports.REQUEST_TYPES = exports.HTTP_METHODS_WITH_PAYLOADS = exports.HTTP_METHODS_WITHOUT_PAYLOADS = exports.ERROR_TYPES = void 0;
 
 var _querystring = _interopRequireDefault(require("querystring"));
 
@@ -84,7 +84,6 @@ class RequestService extends _DependencyAware.default {
    * @param {string} name The name of the header.
    * @param {string} [whenMissing] Value to return if the header is missing.
    *   (default: empty string)
-   *
    * @returns {string}
    */
 

package/dist/Service/SQS.service.js

@@ -23,9 +23,9 @@ var _Message = _interopRequireDefault(require("../Model/SQS/Message.model"));
 
 var _Status = _interopRequireWildcard(require("../Model/Status.model"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+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) { 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 _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 }; }
 
@@ -328,15 +328,12 @@ class SQSService extends _DependencyAware.default {
         await this.sqs.sendMessage(messageParameters).promise();
       }
     } catch (error) {
-      switch (failureMode) {
-        case SQS_PUBLISH_FAILURE_MODES.CATCH:
-          container.get(_Dependencies.DEFINITIONS.LOGGER).error(error);
-          return null;
-
-        case SQS_PUBLISH_FAILURE_MODES.THROW:
-        default:
-          throw error;
+      if (failureMode === SQS_PUBLISH_FAILURE_MODES.CATCH) {
+        container.get(_Dependencies.DEFINITIONS.LOGGER).error(error);
+        return null;
       }
+
+      throw error;
     }
 
     return queue;

package/dist/Service/Timer.service.js

@@ -34,7 +34,7 @@ class TimerService extends _DependencyAware.default {
 
 
   start(identifier) {
-    this.timers[identifier] = new Date().getTime();
+    this.timers[identifier] = Date.now();
   }
   /**
    * Stop timer
@@ -45,7 +45,7 @@ class TimerService extends _DependencyAware.default {
 
   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`);
     }
   }

package/dist/Wrapper/LambdaWrapper.js

@@ -3,7 +3,7 @@
 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"));
 
@@ -135,7 +135,7 @@ var _default = (configuration, handler, throwError = false) => {
             // 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;

package/dist/Wrapper/PromisifiedDelay.js

@@ -15,8 +15,8 @@ const HIGH_LATENCY_DELAYS = {
   3500: 15,
   4000: 9,
   5000: 5,
-  10000: 5,
-  20000: 1
+  10_000: 5,
+  20_000: 1
 };
 /**
  * PromisifiedDelay class

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,22 +111,16 @@ 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;
   }
 });
 
@@ -156,8 +156,8 @@ 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 _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) { 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 _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.1",
   "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.18.10",
+    "@babel/core": "^7.18.10",
+    "@babel/eslint-parser": "^7.18.9",
+    "@babel/node": "^7.18.10",
+    "@babel/plugin-syntax-flow": "^7.18.6",
+    "@babel/plugin-transform-flow-strip-types": "^7.18.9",
+    "@babel/plugin-transform-react-jsx": "^7.18.10",
+    "@babel/preset-env": "^7.18.10",
+    "@comicrelief/eslint-config": "^2.0.3",
+    "@types/jest": "^28.1.6",
+    "aws-sdk": "^2.1194.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": "^28.1.3",
     "nyc": "^15.1.0",
-    "semantic-release": "^17.3.7"
+    "semantic-release": "^19.0.3"
   },
   "peerDependencies": {
-    "aws-sdk": ">=2.831.0"
+    "aws-sdk": "^2.831.0"
   },
   "dependencies": {
     "@sentry/node": "^6.0.1",
     "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.2",
     "useragent": "2.3.0",
-    "uuid": "^8.2.0",
+    "uuid": "^8.3.2",
     "validate.js": "0.13.1",
-    "winston": "^3.3.3",
+    "winston": "^3.8.1",
     "xml2js": "^0.4.23"
   }
 }