@ikonintegration/ikapi 4.0.0-alpha2 → 4.0.0-alpha20

package/README.md

@@ -14,9 +14,10 @@ Ikon nodejs API foundation
 - Router
 
 ````
+import * as Config from './routes/tenant/config.js';
 
 const routes = [
-  { route: '/tenant/config', method: 'GET', handler: require('./routes/tenant/config').get },
+  { route: '/tenant/config', method: 'GET', handler: Config.get },
 ];
 //Main handler
 export const handler = async (event, context) => {

package/index.js

@@ -13,7 +13,7 @@ import IKStepTransaction from "./src/IKStepTransaction.js";
 import IKMailer from "./src/Mailer/IKMailer.js";
 import IKValidation from "./src/Validation/IKValidation.js";
 //Responses
-import IKResponse from "./src/API/IKResponse.js";
+import * as IKResponse from "./src/API/IKResponse.js";
 //Helpers
 import Utils from "./src/API/IKUtils.js";
 //Cache
@@ -46,7 +46,7 @@ export default {
   IKMailer,
   IKValidation,
   //Responses
-  IKResponse,
+  IKResponse: IKResponse.default,
   IKBadRequestResponse: IKResponse.IKBadRequestResponse,
   IKUnauthorizedResponse: IKResponse.IKUnauthorizedResponse,
   IKMissingParamResponse: IKResponse.IKMissingParamResponse,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "4.0.0-alpha2",
+  "version": "4.0.0-alpha20",
   "description": "",
   "main": "index.js",
   "module": "main.js",
@@ -32,6 +32,6 @@
     "pg": "^8.11.1",
     "sha1": "^1.1.1",
     "stack-trace": "0.0.10",
-    "superstruct": "0.8.4"
+    "superstruct": "1.0.3"
   }
 }

package/src/BaseEvent/IKTransaction.js

@@ -99,7 +99,7 @@ export default class IKTransaction {
       if (this.db) await this.db.cleanup();
     } catch (e) {
       this.logger.error('Exception when executing DB transactions.');
-      this.logger.log(e);
+      this.logger.log(e.stack);
       //retrow?
       if (this._retrowErrors) throw e;
     }

package/src/Cache/Redis/IKRedis.js

@@ -73,15 +73,18 @@ export default class IKCache_Redis extends IKCache {
     });
   }
   /* Private */
-  _isRedisClientAvailable() {
+  async _isRedisClientAvailable() {
     let response = true;
-    try { const test = require('redis'); } 
+    try { const test = await import('redis'); } 
     catch (e) { response = false; }
     return response;
   }
-  _isRedisClientV4() {
+  async _isRedisClientV4() {
     let isV4 = false;
-    try { isV4 = !!require('redis').createCluster; } 
+    try {
+      const test = await import('redis');
+      isV4 = !!test.createCluster; 
+    } 
     catch (e) { }
     return isV4;
   }
@@ -93,7 +96,7 @@ export default class IKCache_Redis extends IKCache {
     } else if (this.connection) return this.connection; //already connected
 
     //Check if redis client is available
-    if (!this._isRedisClientAvailable()) throw new Error('Redis client is not available! Please, run "npm i -S redis".');
+    if (!(await this._isRedisClientAvailable())) throw new Error('Redis client is not available! Please, run "npm i -S redis".');
 
     //Prepare
     const localConsole = (this.transaction ? this.transaction.logger : console);
@@ -102,8 +105,8 @@ export default class IKCache_Redis extends IKCache {
     
     //Instantiate client and initiate connection
     return new Promise(async (resolve, reject) => {
-      const redis = require("redis");
-      const isV4 = this._isRedisClientV4();
+      const redis = await import("redis");
+      const isV4 = await this._isRedisClientV4();
       //
       const connection = redis.createClient({
         ...(isV4 ? {

package/src/Database/DDB/IKDBQueryScan.js

@@ -1,5 +1,5 @@
-import IKDBBaseQuery from './IKDBBaseQuery.js';
 import Utils from './../../API/IKUtils.js';
+import IKDBBaseQuery from './IKDBBaseQuery.js';
 //
 export default class IKDBQueryScan extends IKDBBaseQuery {
   constructor(optIndexName) {
@@ -12,7 +12,7 @@ export default class IKDBQueryScan extends IKDBBaseQuery {
     const resp = await this.rawRun(dbManager, appendingItems);
     if (resp.Items) {
       let unmarshalled = Utils.decapsulateForDB(resp.Items);
-      localConsole.debug('Parsed result: ', unmarshalled);
+      localConsole.debug('Parsed result: ', JSON.stringify(unmarshalled).substring(0,4000));
       //Check for appending items from previous query
       if (appendingItems && appendingItems.length > 0) {
         unmarshalled = unmarshalled.concat(appendingItems);

package/src/Database/DDB/IKDBQueryUpdate.js

@@ -154,16 +154,18 @@ export default class IKDBQueryUpdate extends IKDBBaseQuery {
       if (!expression.ExpressionAttributeNames) expression.ExpressionAttributeNames = {};
       //build update expression
       for (let dbKey of Object.keys(this.incrementValues)) {
+        let initialKey = ':initial';
         let appendingKey = (':' + dbKey);
         let appendingValueKey = ('#' + dbKey);
         let val = this.incrementValues[dbKey];
         if (val != undefined) {
           let last = Object.keys(this.incrementValues).indexOf(dbKey) == (Object.keys(this.incrementValues).length - 1);
           //last
-          if (last) expression.UpdateExpression += appendingValueKey + ' =' + appendingValueKey + '+' + appendingKey;
-          else expression.UpdateExpression += appendingValueKey + ' =' + appendingValueKey + '+' + appendingKey + ', ';
+          if (last) expression.UpdateExpression += appendingValueKey + ` = if_not_exists(${appendingValueKey}, :initial) + ${appendingKey}`;
+          else expression.UpdateExpression += appendingValueKey + ` = if_not_exists(${appendingValueKey}, :initial) + ${appendingKey}` + ', ';
           //
           expression.ExpressionAttributeValues[appendingKey] = Utils.encapsulateForDB(val);
+          expression.ExpressionAttributeValues[initialKey] = Utils.encapsulateForDB(0);
           expression.ExpressionAttributeNames[appendingValueKey] = dbKey;
         }
       }

package/src/Mailer/IKMailer.js

@@ -21,12 +21,13 @@ export default class IKMailer {
     });
   }
 
-  //to can be an array or just one address
-  async sendTemplatedEmail(_to, _templates, _data, _optionalCC, _optionalAttachments) {
+  //to and cc can be an array, just one address or a comma separated string containing multiple addresses
+  async sendTemplatedEmail(_to, _templates, _data, _optionalCC, _optionalAttachments, _optionalHeaders, _optionalFrom) {
     //Generate emails
     const email = new Email({
       message: {
-        from: this.from,
+        ...(_optionalHeaders ? {headers: _optionalHeaders} : {}),
+        from: _optionalFrom ? _optionalFrom : this.from,
         to: _to,
         ...(_optionalAttachments ? {attachments: _optionalAttachments} : {}),
         ...(_optionalCC ? {cc: _optionalCC} : {})

package/src/Validation/IKValidation.js

@@ -2,29 +2,31 @@ import IKGlobals from './../IKGlobals.js';
 import Utils from './../API/IKUtils.js';
 import IKResponse, { IKBadRequestResponse } from './../API/IKResponse.js';
 //https://www.npmjs.com/package/superstruct
-import { struct, superstruct } from 'superstruct';
+import * as struct from 'superstruct';
 //validation libs
 import isUuid from 'is-uuid';
 import isEmail from 'is-email';
 //
 export default class IKValidation {
   constructor(config) {
+    this.customStruct = {};
     this._buildInternalTypes((config && config.additionalTypes ? config.additionalTypes : {}));
   }
   _buildInternalTypes(additionalTypes) {
-    this.structor = superstruct({
-      types: {
-        ...IKValidation.internalTypes(),
-        ...additionalTypes
-      }
-    });
+    for (const key in IKValidation.internalTypes()) {
+      this.customStruct[key] = struct.define(key, IKValidation.internalTypes()[key]);
+    }
+    for (const key in additionalTypes) {
+      this.customStruct[key] = struct.define(key, additionalTypes[key]);
+    }
   }
   async validate(spec, obj, request) {
-    let parsedObj = null;
+    let assertion = null;
     let err = null;
     try {
       let parsedRawObj = obj;
-      parsedObj = this.structor(spec)(parsedRawObj);
+      if (typeof spec == 'function') spec = spec(this)
+      assertion = struct.assert(parsedRawObj, spec);
     } catch (e) {
       console.debug(e);
       const { path, value, type } = e;
@@ -38,17 +40,14 @@ export default class IKValidation {
       err = IKBadRequestResponse(IKGlobals.ErrorResponseValidationFail + errorMessage, IKGlobals.ErrorCode_InvalidInput);
     }
     //Catch error as response
-    if (!parsedObj && err) return err;
+    if (err) return err;
     //run normal code out of this try/catch scope
-    return await request(parsedObj);
+    return await request(obj);
   }
 }
 //
 IKValidation.internalTypes = function() {
   return {
-    optionalNumber: value => (value == undefined || !isNaN(parseInt(value))),
-    optionalValidString: value => { return (!value || Utils.isValidString(value) == true); },
-    validString: value => { return (Utils.isValidString(value) == true); },
     email: value => { return (isEmail(value) && value.length < 256); },
     fullAddress: value => {
       if (!value) return false;