@ikonintegration/ikapi 2.6.0-beta1 → 2.6.2-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "2.6.0-beta1",
+  "version": "2.6.2-alpha",
   "description": "",
   "main": "index.js",
   "module": "main.js",

package/src/API/IKResponse.js

@@ -21,40 +21,38 @@ export default class IKResponse {
   getBody() { return this._body; }
   appendIntoBody(key, value) { this._body[key] = value; }
   appendHeader(key, value) { this._headers[key] = value; }
-  build(context, requestID, isBatch, transaction) {
+  async build(context, transaction, isBatch) {
     //Stream support
     if (this._streamingOut) return;
-    if (this._isStream) return this._pipe(context, requestID);
-    //Raw response support
-    if (this._contextRawBody) return this.rawContext(context, requestID, transaction);
+    if (this._isStream) return this._pipe(context);
     
     //append default fields
-    if (requestID && this._body) this.appendIntoBody('transactionID', requestID); //append transaction ID
+    if (this.request.getRequestID() && this._body) this.appendIntoBody('transactionID', this.request.getRequestID()); //append transaction ID
+    //Raw response support
+    if (this._contextRawBody) return this.rawContext(context, transaction);
+
     //build response
     let b = {
-      statusCode: this._statusCode,
+      statusCode: this._statusCode, headers: this._headers,
       ...(this._body ? { body: JSON.stringify(this._body) } : {}),
-      headers: this._headers
     };
     //log response and respond to context
     transaction.logger.debug(b)
+    //Check for transaction response proxy
+    if (transaction.responseProxy) await transaction.responseProxy(b);
+    //Batch does not succeed directly just on upper transaction (which will should be a batch)
     if (!isBatch) context.succeed(b);
   }
-  _pipe(context, requestID) {
+  _pipe(context) {
     //Check if not streaming
     if (this._streamingOut) return;
     this._streamingOut = true;
     //build response
-    let b = {
-      statusCode: this._statusCode,
-      body: this._body, headers: this._headers
-    };
+    let b = { statusCode: this._statusCode, body: this._body, headers: this._headers };
     //log response and respond to context
     context.succeed(b);
   }
-  rawContext(context, requestID, transaction) {
-    //append default fields
-    if(requestID && this._body) this.appendIntoBody('transactionID', requestID); //append transaction ID
+  rawContext(context, transaction) {
     //log response and respond to context
     transaction.logger.debug(this._body)
     if (this.getCode() <= 200 && this.getCode() <= 299) context.succeed(this._body);

package/src/BaseEvent/IKTransaction.js

@@ -23,8 +23,10 @@ export default class IKTransaction {
     //queue support
     this._isBatch = _isBatch;
     this._resp = null;
-    //
-    this._retrowErrors = _retrowErrors;
+    //Step function support
+    this._retrowErrors = _retrowErrors; /* retrow internal errors */
+    //When set, this will be called with the response context right before calling the context suceed/fail
+    this.responseProxy = 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);
@@ -52,11 +54,11 @@ export default class IKTransaction {
       this._resp = await executionFunc(this);
       //Answer client
       if (this._resp && this._resp instanceof IKResponse) {
-        this._resp.build(this._context, this.request.getRequestID(), this._isBatch, this);
+        await this._resp.build(this._context, this, this._isBatch);
         executionFailed = !!(this._resp.getBody() && this._resp.getBody().rollback);
       } else {
         this._resp = this._getErrorResponse(IKGlobals.ErrorResponseInvalidServerResponse, IKGlobals.ErrorCode_APIError)
-        this._resp.build(this._context, this.request.getRequestID(), this._isBatch, this);
+        await this._resp.build(this._context, this, this._isBatch);
         this.logger.error("Invalid response object from main request code.");
       }
     } catch (e) { /*EXECUTION FAIL*/
@@ -67,7 +69,7 @@ export default class IKTransaction {
       //envelope exception?
       if (executionFailed) {
         this._resp = this._getErrorResponse(IKGlobals.ErrorResponseUnhandledError, IKGlobals.ErrorCode_APIError);
-        this._resp.build(this._context, this.request.getRequestID(), this._isBatch, this);
+        await this._resp.build(this._context, this, this._isBatch);
       }
     } return executionFailed;
   }

package/src/Database/DDB/IKDB.js

@@ -1,6 +1,7 @@
 import AWS from "aws-sdk";
 import HTTPS from "https";
 import Utils from "./../../API/IKUtils";
+import sha1 from 'sha1';
 //
 import IKGlobals from './../../IKGlobals';
 import IKDB from './../Prototype/IKDB';

package/src/Database/DDB/IKDBQueryUpdate.js

@@ -27,7 +27,10 @@ export default class IKDBQueryUpdate extends IKDBBaseQuery {
       this.setValues[key] = val;
       console.debug(`Append ${key}@${val}`);
       return true;
-    } return false;
+    } 
+    //remove
+    this.removeValues.push(key);
+    return false;
   }
   //return if the value was appended or not
   incrementValue(val, key, prefix) {

package/src/Publisher/IKPublisher.js

@@ -1,4 +1,5 @@
 import AWS from "aws-sdk";
+import sha1 from 'sha1';
 //
 import Utils from "./../API/IKUtils";
 //reusable client
@@ -32,7 +33,7 @@ export default class IKPublisher {
   }
   /* Private */
   _connect() {
-    if ((!PUBLISHER_CONN && !PUBLISHER_CONN_HASH) || PUBLISHER_CONN_HASH != sha1(this.regiond)) {
+    if ((!PUBLISHER_CONN && !PUBLISHER_CONN_HASH) || PUBLISHER_CONN_HASH != sha1(this.region)) {
       //Configure when sending!
       let configObj = { region: this.region };
       if (Utils.isOffline()) configObj = { ...configObj, accessKeyId: process.env.AWS_ACCESS_KEY_ID, secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY };