@comicrelief/lambda-wrapper 1.10.0 → 1.10.2

package/dist/Service/Request.service.js

@@ -3,28 +3,17 @@
 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"));
-
 var _useragent = _interopRequireDefault(require("useragent"));
-
 var _validate = _interopRequireDefault(require("validate.js/validate"));
-
 var _xml2js = _interopRequireDefault(require("xml2js"));
-
 var _Dependencies = require("../Config/Dependencies");
-
 var _DependencyAware = _interopRequireDefault(require("../DependencyInjection/DependencyAware.class"));
-
 var _Response = _interopRequireDefault(require("../Model/Response.model"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /* eslint-disable class-methods-use-this */
-
-/* eslint-disable sonarjs/no-duplicate-string */
-const REQUEST_TYPES = {
+/* eslint-disable sonarjs/no-duplicate-string */const REQUEST_TYPES = {
   DELETE: 'DELETE',
   GET: 'GET',
   HEAD: 'HEAD',
@@ -36,18 +25,18 @@ const REQUEST_TYPES = {
 exports.REQUEST_TYPES = REQUEST_TYPES;
 const HTTP_METHODS_WITHOUT_PAYLOADS = [REQUEST_TYPES.DELETE, REQUEST_TYPES.GET, REQUEST_TYPES.HEAD, REQUEST_TYPES.OPTIONS];
 exports.HTTP_METHODS_WITHOUT_PAYLOADS = HTTP_METHODS_WITHOUT_PAYLOADS;
-const HTTP_METHODS_WITH_PAYLOADS = [REQUEST_TYPES.PATCH, REQUEST_TYPES.POST, REQUEST_TYPES.PUT]; // Define action specific error types
+const HTTP_METHODS_WITH_PAYLOADS = [REQUEST_TYPES.PATCH, REQUEST_TYPES.POST, REQUEST_TYPES.PUT];
 
+// Define action specific error types
 exports.HTTP_METHODS_WITH_PAYLOADS = HTTP_METHODS_WITH_PAYLOADS;
 const ERROR_TYPES = {
   VALIDATION_ERROR: new _Response.default({}, 400, 'required fields are missing')
 };
+
 /**
  * RequestService class
  */
-
 exports.ERROR_TYPES = ERROR_TYPES;
-
 class RequestService extends _DependencyAware.default {
   /**
    * Get a parameter from the request.
@@ -58,24 +47,23 @@ class RequestService extends _DependencyAware.default {
    */
   get(parameter, ifNull = null, requestType = null) {
     const queryParameters = this.getAll(requestType);
-
     if (queryParameters === null) {
       return ifNull;
     }
-
     return typeof queryParameters[parameter] !== 'undefined' ? queryParameters[parameter] : ifNull;
   }
+
   /**
    * Get all HTTP headers included in the request.
    *
    * @returns {object} An object with a key for each header.
    */
-
-
   getAllHeaders() {
-    return { ...this.getContainer().getEvent().headers
+    return {
+      ...this.getContainer().getEvent().headers
     };
   }
+
   /**
    * Get an HTTP header from the request.
    *
@@ -84,67 +72,57 @@ 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}
    */
-
-
   getHeader(name, whenMissing = '') {
     const headers = this.getAllHeaders();
-
     if (!headers) {
       return whenMissing;
     }
-
     const lowerName = name.toLowerCase();
     const key = Object.keys(headers).find(k => k.toLowerCase() === lowerName);
     return key && headers[key] || whenMissing;
   }
+
   /**
    * Get authorization token
    *
    * @returns {*}
    */
-
-
   getAuthorizationToken() {
     const authorization = this.getHeader('Authorization');
-
     if (!authorization) {
       return null;
     }
-
     const tokenParts = authorization.split(' ');
     const tokenValue = tokenParts[1];
-
     if (!(tokenParts[0].toLowerCase() === 'bearer' && tokenValue)) {
       return null;
     }
-
     return tokenValue;
   }
+
   /**
    * Get a path parameter
    *
    * @param parameter
    * @param ifNull mixed
    */
-
-
   getPathParameter(parameter = null, ifNull = {}) {
-    const event = this.getContainer().getEvent(); // If no parameter has been requested, return all path parameters
+    const event = this.getContainer().getEvent();
 
+    // If no parameter has been requested, return all path parameters
     if (parameter === null && typeof event.pathParameters === 'object') {
       return event.pathParameters;
-    } // If a specifc parameter has been requested, return the parameter if it exists
-
+    }
 
+    // If a specifc parameter has been requested, return the parameter if it exists
     if (typeof parameter === 'string' && typeof event.pathParameters === 'object' && event.pathParameters !== null && typeof event.pathParameters[parameter] !== 'undefined') {
       return event.pathParameters[parameter];
     }
-
     return ifNull;
   }
+
   /**
    * Get all request parameters
    *
@@ -152,30 +130,25 @@ class RequestService extends _DependencyAware.default {
    * @returns {{}}
    */
   // eslint-disable-next-line sonarjs/cognitive-complexity
-
-
   getAll(requestType = null) {
     const event = this.getContainer().getEvent();
-
     if (HTTP_METHODS_WITHOUT_PAYLOADS.includes(event.httpMethod) || HTTP_METHODS_WITHOUT_PAYLOADS.includes(requestType)) {
       // get simple parameters
-      const params = { ...event.queryStringParameters
-      }; // add array parameters as arrays
-
+      const params = {
+        ...event.queryStringParameters
+      };
+      // add array parameters as arrays
       Object.keys(params).filter(key => key.endsWith('[]')).forEach(key => {
         params[key] = event.multiValueQueryStringParameters[key];
       });
       return params;
     }
-
     if (HTTP_METHODS_WITH_PAYLOADS.includes(event.httpMethod) || HTTP_METHODS_WITH_PAYLOADS.includes(requestType)) {
       const contentType = this.getHeader('Content-Type');
       let queryParameters = {};
-
       if (contentType.includes('application/x-www-form-urlencoded')) {
         queryParameters = _querystring.default.parse(event.body);
       }
-
       if (contentType.includes('application/json')) {
         try {
           queryParameters = JSON.parse(event.body);
@@ -183,55 +156,44 @@ class RequestService extends _DependencyAware.default {
           queryParameters = {};
         }
       }
-
       if (contentType.includes('text/xml')) {
         _xml2js.default.parseString(event.body, (error, result) => {
           queryParameters = error ? {} : result;
         });
       }
-
       if (contentType.includes('multipart/form-data')) {
         queryParameters = this.parseForm(true);
       }
-
       return typeof queryParameters !== 'undefined' ? queryParameters : {};
     }
-
     return null;
   }
+
   /**
    * Fetch the request IP address
    *
    * @returns {*}
    */
-
-
   getIp() {
     const event = this.getContainer().getEvent();
-
     if (typeof event.requestContext !== 'undefined' && typeof event.requestContext.identity !== 'undefined' && typeof event.requestContext.identity.sourceIp !== 'undefined') {
       return event.requestContext.identity.sourceIp;
     }
-
     return null;
   }
+
   /**
    * Get user agent
    *
    * @returns {*}
    */
-
-
   getUserBrowserAndDevice() {
     const userAgent = this.getHeader('user-agent', null);
-
     if (userAgent === null) {
       return null;
     }
-
     try {
       const agent = _useragent.default.parse(userAgent);
-
       const os = agent.os.toJSON();
       return {
         'browser-type': agent.family,
@@ -245,19 +207,17 @@ class RequestService extends _DependencyAware.default {
       return null;
     }
   }
+
   /**
    * Test a request against validation constraints
    *
    * @param constraints
    * @returns {Promise<any>}
    */
-
-
   validateAgainstConstraints(constraints) {
     const Logger = this.getContainer().get(_Dependencies.DEFINITIONS.LOGGER);
     return new Promise((resolve, reject) => {
       const validation = (0, _validate.default)(this.getAll(), constraints);
-
       if (typeof validation === 'undefined') {
         resolve();
       } else {
@@ -268,14 +228,13 @@ class RequestService extends _DependencyAware.default {
       }
     });
   }
+
   /**
    * Fetch the request multipart form
    *
    * @param useBuffer
    * @returns {*}
    */
-
-
   parseForm(useBuffer) {
     const event = this.getContainer().getEvent();
     const boundary = this.getBoundary(event);
@@ -295,23 +254,21 @@ class RequestService extends _DependencyAware.default {
     });
     return result;
   }
+
   /**
    * Fetch the request AWS event Records
    *
    * @returns {*}
    */
-
-
   getAWSRecords() {
     const event = this.getContainer().getEvent();
     const eventRecord = event.Records && event.Records[0];
-
     if (typeof event.Records !== 'undefined' && typeof event.Records[0] !== 'undefined' && typeof eventRecord.eventSource !== 'undefined') {
       return eventRecord;
     }
-
     return null;
   }
+
   /**
    * Gets a value independently from
    * the case of the key
@@ -319,24 +276,19 @@ class RequestService extends _DependencyAware.default {
    * @param object
    * @param key
    */
-
-
   getValueIgnoringKeyCase(object, key) {
     const foundKey = Object.keys(object).find(currentKey => currentKey.toLocaleLowerCase() === key.toLowerCase());
     return object[foundKey];
   }
+
   /**
    * Returns the content type
    * assoiated with the request
    *
    * @param event
    */
-
-
   getBoundary(event) {
     return this.getValueIgnoringKeyCase(event.headers, 'Content-Type').split('=')[1];
   }
-
 }
-
 exports.default = RequestService;

package/dist/Service/SQS.service.js

@@ -4,31 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.SQS_PUBLISH_FAILURE_MODES = exports.SQS_OFFLINE_MODES = void 0;
-
 var _alai = _interopRequireDefault(require("alai"));
-
 var _each = _interopRequireDefault(require("async/each"));
-
 var _awsSdk = _interopRequireDefault(require("aws-sdk"));
-
 var _uuid = require("uuid");
-
 var _Dependencies = require("../Config/Dependencies");
-
 var _DependencyAware = _interopRequireDefault(require("../DependencyInjection/DependencyAware.class"));
-
 var _DependencyInjection = _interopRequireDefault(require("../DependencyInjection/DependencyInjection.class"));
-
 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 _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 }; }
-
 /**
  * Allowed values for `process.env.LAMBDA_WRAPPER_OFFLINE_SQS_MODE`.
  */
@@ -39,24 +26,22 @@ const SQS_OFFLINE_MODES = {
    * the default.
    */
   DIRECT: 'direct',
-
   /**
    * When running offline, send messages to an offline SQS service defined by
    * `process.env.LAMBDA_WRAPPER_OFFLINE_SQS_HOST`.
    */
   LOCAL: 'local',
-
   /**
    * When running offline, send messages to AWS as normal.
    */
   AWS: 'aws'
 };
+
 /**
  * Defines the preferred behaviour
  * for SQSService.prototype.publish
  * should AWS SQS fail.
  */
-
 exports.SQS_OFFLINE_MODES = SQS_OFFLINE_MODES;
 const SQS_PUBLISH_FAILURE_MODES = {
   /**
@@ -66,19 +51,17 @@ const SQS_PUBLISH_FAILURE_MODES = {
    * and for LambdaWrapper 1.8.2 and above
    */
   CATCH: 'catch',
-
   /**
    * Throws the exception so that the caller
    * can handle it directly.
    */
   THROW: 'throw'
 };
+
 /**
  * SQSService class
  */
-
 exports.SQS_PUBLISH_FAILURE_MODES = SQS_PUBLISH_FAILURE_MODES;
-
 class SQSService extends _DependencyAware.default {
   /**
    * SQSService constructor
@@ -101,12 +84,11 @@ class SQSService extends _DependencyAware.default {
     this.queues = {};
     this.$lambda = null;
     this.$sqs = null;
-
     if (container.isOffline && !Object.values(SQS_OFFLINE_MODES).includes(offlineMode)) {
       throw new Error(`Invalid LAMBDA_WRAPPER_OFFLINE_SQS_MODE: ${offlineMode}\n` + `Please use one of: ${Object.values(SQS_OFFLINE_MODES).join(', ')}`);
-    } // Add the queues from configuration
-
+    }
 
+    // Add the queues from configuration
     if (queues !== null && Object.keys(queues).length > 0) {
       Object.keys(queues).forEach(queueDefinition => {
         if (container.isOffline && offlineMode === SQS_OFFLINE_MODES.LOCAL) {
@@ -119,11 +101,10 @@ class SQSService extends _DependencyAware.default {
       });
     }
   }
+
   /**
    * Returns an SQS client instance
    */
-
-
   get sqs() {
     if (!this.$sqs) {
       this.$sqs = new _awsSdk.default.SQS({
@@ -134,45 +115,41 @@ class SQSService extends _DependencyAware.default {
           timeout: 8 * 1000
         },
         maxRetries: 3 // default is 3, we can change that
-
       });
     }
 
     return this.$sqs;
   }
+
   /**
    * Returns a Lambda client instance
    */
-
-
   get lambda() {
     if (!this.$lambda) {
       const endpoint = process.env.SERVICE_LAMBDA_URL;
-
       if (!endpoint) {
         throw new Error('process.env.SERVICE_LAMBDA_URL must be defined.');
-      } // move to subprocess
-
+      }
 
+      // move to subprocess
       this.$lambda = new _awsSdk.default.Lambda({
         region: process.env.AWS_REGION,
         endpoint
       });
     }
-
     return this.$lambda;
   }
+
   /**
    * Returns the mode to use for offline SQS.
    *
    * This is configured by `process.env.LAMBDA_WRAPPER_OFFLINE_SQS_MODE`. The
    * default is `SQS_OFFLINE_MODES.LAMBDA`.
    */
-
-
   static get offlineMode() {
     return process.env.LAMBDA_WRAPPER_OFFLINE_SQS_MODE || SQS_OFFLINE_MODES.DIRECT;
   }
+
   /**
    * Batch delete messages
    *
@@ -180,8 +157,6 @@ class SQSService extends _DependencyAware.default {
    * @param messageModels [SQSMessageModel]
    * @returns {Promise<any>}
    */
-
-
   batchDelete(queue, messageModels) {
     const container = this.getContainer();
     const queueUrl = this.queues[queue];
@@ -190,8 +165,8 @@ class SQSService extends _DependencyAware.default {
     const timerId = `sqs-batch-delete-${(0, _uuid.v4)()} - Queue: '${queueUrl}'`;
     return new Promise(resolve => {
       const messagesForDeletion = [];
-      Timer.start(timerId); // assuming openFiles is an array of file names
-
+      Timer.start(timerId);
+      // assuming openFiles is an array of file names
       (0, _each.default)(messageModels, (messageModel, callback) => {
         if (messageModel instanceof _Message.default && messageModel.isForDeletion() === true) {
           messagesForDeletion.push({
@@ -199,36 +174,31 @@ class SQSService extends _DependencyAware.default {
             ReceiptHandle: messageModel.getReceiptHandle()
           });
         }
-
         callback();
       }, loopError => {
         if (loopError) {
           Logger.error(loopError);
           resolve();
         }
-
         this.sqs.deleteMessageBatch({
           Entries: messagesForDeletion,
           QueueUrl: queueUrl
         }, error => {
           Timer.stop(timerId);
-
           if (error) {
             Logger.error(error);
           }
-
           resolve();
         });
       });
     });
   }
+
   /**
    * Check SQS status
    *
    * @returns {Promise<any>}
    */
-
-
   checkStatus() {
     const container = this.getContainer();
     const Logger = container.get(_Dependencies.DEFINITIONS.LOGGER);
@@ -239,28 +209,24 @@ class SQSService extends _DependencyAware.default {
       this.sqs.listQueues({}, (error, data) => {
         Timer.stop(timerId);
         const statusModel = new _Status.default('SQS', _Status.STATUS_TYPES.OK);
-
         if (error) {
           Logger.error(error);
           statusModel.setStatus(_Status.STATUS_TYPES.APPLICATION_FAILURE);
         }
-
         if (typeof data.QueueUrls === 'undefined' || data.QueueUrls.length === 0) {
           statusModel.setStatus(_Status.STATUS_TYPES.APPLICATION_FAILURE);
         }
-
         resolve(statusModel);
       });
     });
   }
+
   /**
    * Get number of messages in a queue
    *
    * @param queue
    * @returns {Promise<any>}
    */
-
-
   getMessageCount(queue) {
     const container = this.getContainer();
     const queueUrl = this.queues[queue];
@@ -274,16 +240,15 @@ class SQSService extends _DependencyAware.default {
         QueueUrl: queueUrl
       }, (error, data) => {
         Timer.stop(timerId);
-
         if (error) {
           Logger.error(error);
           resolve(0);
         }
-
         resolve(Number.parseInt(data.Attributes.ApproximateNumberOfMessages, 10));
       });
     });
   }
+
   /**
    * Publish to message queue
    *
@@ -299,13 +264,10 @@ class SQSService extends _DependencyAware.default {
    *   - `throw`: errors will be thrown, causing promise to reject.
    * @returns {Promise<any>}
    */
-
-
   async publish(queue, messageObject, messageGroupId = null, failureMode = SQS_PUBLISH_FAILURE_MODES.CATCH) {
     if (!Object.values(SQS_PUBLISH_FAILURE_MODES).includes(failureMode)) {
       throw new Error(`Invalid value for 'failureMode': ${failureMode}`);
     }
-
     const container = this.getContainer();
     const queueUrl = this.queues[queue];
     const Timer = container.get(_Dependencies.DEFINITIONS.TIMER);
@@ -315,12 +277,10 @@ class SQSService extends _DependencyAware.default {
       MessageBody: JSON.stringify(messageObject),
       QueueUrl: queueUrl
     };
-
     if (queueUrl.includes('.fifo')) {
       messageParameters.MessageDeduplicationId = (0, _uuid.v4)();
       messageParameters.MessageGroupId = messageGroupId !== null ? messageGroupId : (0, _uuid.v4)();
     }
-
     try {
       if (container.isOffline && this.constructor.offlineMode === SQS_OFFLINE_MODES.DIRECT) {
         await this.publishOffline(queue, messageParameters);
@@ -328,19 +288,15 @@ 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;
   }
+
   /**
    * Sends a message to a queue consumer running in serverless-offline.
    *
@@ -351,22 +307,16 @@ class SQSService extends _DependencyAware.default {
    * @param queue
    * @param messageParameters
    */
-
-
   async publishOffline(queue, messageParameters) {
     const container = this.getContainer();
-
     if (!container.isOffline) {
       throw new Error('Can only publishOffline while running serverless offline.');
     }
-
     const consumers = container.getConfiguration('QUEUE_CONSUMERS') || {};
     const FunctionName = consumers[queue];
-
     if (!FunctionName) {
       throw new Error(`Queue consumer for queue ${queue} was not found. Please configure your application's QUEUE_CONSUMERS.`);
     }
-
     const InvocationType = 'RequestResponse';
     const Payload = JSON.stringify({
       Records: [{
@@ -380,6 +330,7 @@ class SQSService extends _DependencyAware.default {
     };
     await this.lambda.invoke(parameters).promise();
   }
+
   /**
    * Receive from message queue
    *
@@ -387,8 +338,6 @@ class SQSService extends _DependencyAware.default {
    * @param timeout number
    * @returns {Promise<any>}
    */
-
-
   receive(queue, timeout = 15) {
     const container = this.getContainer();
     const queueUrl = this.queues[queue];
@@ -403,21 +352,16 @@ class SQSService extends _DependencyAware.default {
         MaxNumberOfMessages: 10
       }, (error, data) => {
         Timer.stop(timerId);
-
         if (error) {
           Logger.error(error);
           return reject(error);
         }
-
         if (typeof data.Messages === 'undefined') {
           return resolve([]);
         }
-
         return resolve(data.Messages.map(message => new _Message.default(message)));
       });
     });
   }
-
 }
-
 exports.default = SQSService;