@ikonintegration/ikapi 2.4.12 → 2.5.2

package/index.js

@@ -12,6 +12,7 @@ module.exports = {
   IKRouter: require("./src/IKRouter.js").default,
   IKEventProcessor: require('./src/IKEventProcessor.js').default,
   IKDynamoStream: require('./src/IKDynamoStream.js').default,
+  IKStepTransaction: require('./src/IKStepTransaction.js').default,
 
   //Extra components
   IKMailer: require('./src/Mailer/IKMailer.js').default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "2.4.12",
+  "version": "2.5.2",
   "description": "",
   "main": "index.js",
   "module": "main.js",

package/src/API/IKResponse.js

@@ -4,9 +4,11 @@ export default class IKResponse {
   constructor(statusCode, body) {
     this._statusCode = statusCode;
     this._body = body;
+    //
     this._streamingOut = false;
     this._isStream = false;
-    this._isStepFunction = false;
+    this._contextRawBody = false;
+    //
     this._headers = {
       "Access-Control-Allow-Origin": "*",
       "Access-Control-Allow-Credentials": true,
@@ -18,10 +20,12 @@ export default class IKResponse {
   appendIntoBody(key, value) { this._body[key] = value; }
   appendHeader(key, value) { this._headers[key] = value; }
   build(context, requestID, onQueue, transaction) {
-    //Check if not streaming
+    //Stream support
     if (this._streamingOut) return;
     if (this._isStream) return this._pipe(context, requestID);
-    if (this._isStepFunction) return this.succeedContext(context, requestID, transaction);
+    //Raw response support
+    if (this._contextRawBody) return this.rawContext(context, requestID, transaction);
+    
     //append default fields
     if (requestID && this._body) this.appendIntoBody('transactionID', requestID); //append transaction ID
     //build response
@@ -46,12 +50,22 @@ export default class IKResponse {
     //log response and respond to context
     context.succeed(b);
   }
-  succeedContext(context, requestID, transaction) {
+  rawContext(context, requestID, transaction) {
     //append default fields
     if(requestID && this._body) this.appendIntoBody('transactionID', requestID); //append transaction ID
     //log response and respond to context
     transaction.logger.debug(this._body)
-    context.succeed(this._body);
+    if (this.getCode() <= 200 && this.getCode() <= 299) context.succeed(this._body);
+    else {
+      //
+      function CustomError(message) {
+        this.name = this._body && this._body.error ? this._body.error : 'UnknownError';
+        this.message = message;
+      }
+      CustomError.prototype = new Error();
+      //
+      context.fail(new CustomError(this.body));
+    }
   }
 }
 
@@ -91,8 +105,8 @@ export function IKSuccessStreamResponse(stream, contentType) {
   if (contentType) resp.appendHeader('Content-type', contentType);
   return resp;
 }
-export function IKStepFunctionResponse(body) {
-  const resp = new IKResponse(200, body);
-  resp._isStepFunction = true;
+export function IKStepFunctionResponse(body, optionalCode) {
+  const resp = new IKResponse(optionalCode || 200, body);
+  resp._contextRawBody = true;
   return resp;
 }

package/src/BaseEvent/IKTransaction.js

@@ -22,7 +22,7 @@ export default class IKTransaction {
     this._config = config;
     //queue support
     this._onQueue = _isQueue;
-    this._queueResp = null;
+    this._resp = null;
     //
     this.logger = new IKLogger({/*COFIG S3/SQS HERE*/}, Utils.logLevel(), (context.awsRequestId ? context.awsRequestId : (event.requestContext ? event.requestContext.requestId : 'unknown')));
     this.request = new IKRequest(this._event, this._context, this);
@@ -39,7 +39,7 @@ export default class IKTransaction {
         return await this._execute(executionFunc);
       });
     });
-    if (this._onQueue) return this._queueResp;
+    if (this._onQueue) return this._resp;
   }
   //Executions
   async _execute(executionFunc) {
@@ -47,22 +47,22 @@ export default class IKTransaction {
     //safe execution handler
     try { //Execute
       this.logger.debug("Starting main request code");
-      this._queueResp = await executionFunc(this);
+      this._resp = await executionFunc(this);
       //Answer client
-      if (this._queueResp && this._queueResp instanceof IKResponse) {
-        this._queueResp.build(this._context, this.request.getRequestID(), this._onQueue, this);
-        executionFailed = !!(this._queueResp.getBody() && this._queueResp.getBody().rollback);
+      if (this._resp && this._resp instanceof IKResponse) {
+        this._resp.build(this._context, this.request.getRequestID(), this._onQueue, this);
+        executionFailed = !!(this._resp.getBody() && this._resp.getBody().rollback);
       } else {
-        this._queueResp = IKBadRequestResponseWithRollback(IKGlobals.ErrorResponseInvalidServerResponse, IKGlobals.ErrorCode_APIError)
-        this._queueResp.build(this._context, this.request.getRequestID(), this._onQueue, this);
+        this._resp = this._getErrorResponse(IKGlobals.ErrorResponseInvalidServerResponse, IKGlobals.ErrorCode_APIError)
+        this._resp.build(this._context, this.request.getRequestID(), this._onQueue, this);
         this.logger.error("Invalid response object from main request code.");
       }
     } catch (e) { /*EXECUTION FAIL*/
       this.logger.error('Exception when executing main request code.');
       this.logger.exception(e);
       if (executionFailed) {
-        this._queueResp = IKBadRequestResponseWithRollback(IKGlobals.ErrorResponseUnhandledError, IKGlobals.ErrorCode_APIError);
-        this._queueResp.build(this._context, this.request.getRequestID(), this._onQueue, this);
+        this._resp = this._getErrorResponse(IKGlobals.ErrorResponseUnhandledError, IKGlobals.ErrorCode_APIError);
+        this._resp.build(this._context, this.request.getRequestID(), this._onQueue, this);
       }
     } return executionFailed;
   }
@@ -112,4 +112,8 @@ export default class IKTransaction {
       if (this._config.cache.type == IKGlobals.CacheDrivers.REDIS) return new IKCacheRedis(this._config.cache, this);
     } return null;
   }
+  /* Response support */
+  _getErrorResponse(error, code) {
+    return IKBadRequestResponseWithRollback(error, code);
+  }
 }

package/src/IKStepTransaction.js

@@ -0,0 +1,13 @@
+//
+import IKTransaction from './BaseEvent/IKTransaction';
+import { IKStepFunctionResponse } from './API/IKResponse';
+//
+export default class IKStepTransaction extends IKTransaction {
+  constructor(event, context, config) {
+    super(event, context, config, false);
+  }
+  /* Response support */
+  _getErrorResponse(error, code) {
+    return IKStepFunctionResponse({ err: error, errCode: code }, 400);
+  }
+}

package/src/Mailer/IKMailer.js

@@ -1,7 +1,4 @@
-import { SES } from 'aws-sdk';
-//
 const nodemailer = require("nodemailer");
-const path = require("path");
 const AWS = require('aws-sdk');
 const Email = require('email-templates');
 //