@ikonintegration/ikapi 4.0.0-alpha → 4.0.0-alpha11

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

@@ -1,61 +1,88 @@
 //Set defaults
-global.Promise = import("bluebird");
+import Bluebird from "bluebird";
+global.Promise = Bluebird;
+//Base Events
+import IKTransaction from "./src/BaseEvent/IKTransaction.js";
+import IKProcess from "./src/BaseEvent/IKProcess.js";
+//Extra Events
+import IKRouter from "./src/IKRouter.js";
+import IKEventProcessor from "./src/IKEventProcessor.js";
+import IKDynamoStream from "./src/IKDynamoStream.js";
+import IKStepTransaction from "./src/IKStepTransaction.js";
+//Extra components
+import IKMailer from "./src/Mailer/IKMailer.js";
+import IKValidation from "./src/Validation/IKValidation.js";
+//Responses
+import * as IKResponse from "./src/API/IKResponse.js";
+//Helpers
+import Utils from "./src/API/IKUtils.js";
+//Cache
+//Redis
+import IKRedis from "./src/Cache/Redis/IKRedis.js";
+//Database
+//PSQL
+import IKDBPSQLQuery from "./src/Database/PSQL/IKDBBaseQuery.js";
+//DDB
+import IKDBQueryScan from "./src/Database/DDB/IKDBQueryScan.js";
+import IKDBQueryGet from "./src/Database/DDB/IKDBQueryGet.js";
+import IKDBQueryPut from "./src/Database/DDB/IKDBQueryPut.js";
+import IKDBQueryUpdate from "./src/Database/DDB/IKDBQueryUpdate.js";
+import IKDBQueryDelete from "./src/Database/DDB/IKDBQueryDelete.js";
+import IKDBQueryBatchWrite from "./src/Database/DDB/IKDBQueryBatchWrite.js";
+import IKDBQueryBatchGet from "./src/Database/DDB/IKDBQueryBatchGet.js";
+import IKDBQueryTransactionalWrite from "./src/Database/DDB/IKDBQueryTransactionalWrite.js";
+import { IKDBExpressionOperator } from "./src/Database/DDB/IKDBBaseExpression.js";
 //
 export default {
   //Base Events
-  IKTransaction: import("./src/BaseEvent/IKTransaction.js").default,
-  IKProcess: import("./src/BaseEvent/IKProcess.js").default,
+  IKTransaction,
+  IKProcess,
   //Extra Events
-  IKRouter: import("./src/IKRouter.js").default,
-  IKEventProcessor: import('./src/IKEventProcessor.js').default,
-  IKDynamoStream: import('./src/IKDynamoStream.js').default,
-  IKStepTransaction: import('./src/IKStepTransaction.js').default,
-
+  IKRouter,
+  IKEventProcessor,
+  IKDynamoStream,
+  IKStepTransaction,
   //Extra components
-  IKMailer: import('./src/Mailer/IKMailer.js').default,
-  IKValidation: import('./src/Validation/IKValidation.js').default,
-
+  IKMailer,
+  IKValidation,
   //Responses
-  IKResponse: import("./src/API/IKResponse.js").default,
-  IKBadRequestResponse: import("./src/API/IKResponse.js").IKBadRequestResponse,
-  IKUnauthorizedResponse: import("./src/API/IKResponse.js").IKUnauthorizedResponse,
-  IKMissingParamResponse: import("./src/API/IKResponse.js").IKMissingParamResponse,
-  IKMissingQueryResponse: import("./src/API/IKResponse.js").IKMissingQueryResponse,
-  IKSuccessResponse: import("./src/API/IKResponse.js").IKSuccessResponse,
-  IKSuccessStreamResponse: import("./src/API/IKResponse.js").IKSuccessStreamResponse,
-  IKSuccessNoContentResponse: import("./src/API/IKResponse.js").IKSuccessNoContentResponse,
-  IKBadRequestResponseWithRollback: import("./src/API/IKResponse.js").IKBadRequestResponseWithRollback,
-  IKStepFunctionResponse: import("./src/API/IKResponse.js").IKStepFunctionResponse,
-  IKSimpleResponse: import("./src/API/IKResponse.js").IKSimpleResponse,
-  
+  IKResponse: IKResponse.default,
+  IKBadRequestResponse: IKResponse.IKBadRequestResponse,
+  IKUnauthorizedResponse: IKResponse.IKUnauthorizedResponse,
+  IKMissingParamResponse: IKResponse.IKMissingParamResponse,
+  IKMissingQueryResponse: IKResponse.IKMissingQueryResponse,
+  IKSuccessResponse: IKResponse.IKSuccessResponse,
+  IKSuccessStreamResponse: IKResponse.IKSuccessStreamResponse,
+  IKSuccessNoContentResponse: IKResponse.IKSuccessNoContentResponse,
+  IKBadRequestResponseWithRollback: IKResponse.IKBadRequestResponseWithRollback,
+  IKStepFunctionResponse: IKResponse.IKStepFunctionResponse,
+  IKSimpleResponse: IKResponse.IKSimpleResponse,
   //Helpers
-  Utils: import("./src/API/IKUtils.js").default,
-
+  Utils,
   //Cache
-    //Redis
-      IKRedis: import('./src/Cache/Redis/IKRedis.js').default,
-
+  //Redis
+  IKRedis,
   //Database
-    //PSQL
-      IKDBPSQLQuery: import("./src/Database/PSQL/IKDBBaseQuery.js").default,
-    //DDB
-      IKDBDDBQueryScan: import("./src/Database/DDB/IKDBQueryScan.js").default,
-      IKDBDDBQueryGet: import("./src/Database/DDB/IKDBQueryGet.js").default,
-      IKDBDDBQueryPut: import("./src/Database/DDB/IKDBQueryPut.js").default,
-      IKDBDDBQueryUpdate: import("./src/Database/DDB/IKDBQueryUpdate.js").default,
-      IKDBDDBQueryDelete: import("./src/Database/DDB/IKDBQueryDelete.js").default,
-      IKDBDDBQueryBatchWrite: import("./src/Database/DDB/IKDBQueryBatchWrite.js").default,
-      IKDBDDBQueryBatchGet: import("./src/Database/DDB/IKDBQueryBatchGet.js").default,
-      IKDBDDBQueryTransactionalWrite: import("./src/Database/DDB/IKDBQueryTransactionalWrite.js").default,
-      IKDBDDBExpressionOperator: import("./src/Database/DDB/IKDBBaseExpression.js").IKDBExpressionOperator,
-    //Legacy
-      IKDBQueryScan: import("./src/Database/DDB/IKDBQueryScan.js").default,
-      IKDBQueryGet: import("./src/Database/DDB/IKDBQueryGet.js").default,
-      IKDBQueryPut: import("./src/Database/DDB/IKDBQueryPut.js").default,
-      IKDBQueryUpdate: import("./src/Database/DDB/IKDBQueryUpdate.js").default,
-      IKDBQueryDelete: import("./src/Database/DDB/IKDBQueryDelete.js").default,
-      IKDBQueryBatchWrite: import("./src/Database/DDB/IKDBQueryBatchWrite.js").default,
-      IKDBQueryBatchGet: import("./src/Database/DDB/IKDBQueryBatchGet.js").default,
-      IKDBQueryTransactionalWrite: import("./src/Database/DDB/IKDBQueryTransactionalWrite.js").default,
-      IKDBExpressionOperator: import("./src/Database/DDB/IKDBBaseExpression.js").IKDBExpressionOperator,
+  //PSQL
+  IKDBPSQLQuery,
+  //DDB
+  IKDBDDBQueryScan: IKDBQueryScan,
+  IKDBDDBQueryGet: IKDBQueryGet,
+  IKDBDDBQueryPut: IKDBQueryPut,
+  IKDBDDBQueryUpdate: IKDBQueryUpdate,
+  IKDBDDBQueryDelete: IKDBQueryDelete,
+  IKDBDDBQueryBatchWrite: IKDBQueryBatchWrite,
+  IKDBDDBQueryBatchGet: IKDBQueryBatchGet,
+  IKDBDDBQueryTransactionalWrite: IKDBQueryTransactionalWrite,
+  IKDBDDBExpressionOperator: IKDBExpressionOperator,
+  //Legacy
+  IKDBQueryScan,
+  IKDBQueryGet,
+  IKDBQueryPut,
+  IKDBQueryUpdate,
+  IKDBQueryDelete,
+  IKDBQueryBatchWrite,
+  IKDBQueryBatchGet,
+  IKDBQueryTransactionalWrite,
+  IKDBExpressionOperator,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "4.0.0-alpha",
+  "version": "4.0.0-alpha11",
   "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/Validation/IKValidation.js

@@ -2,29 +2,30 @@ 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);
+      assertion = struct.assert(parsedRawObj, spec);
     } catch (e) {
       console.debug(e);
       const { path, value, type } = e;
@@ -38,9 +39,9 @@ 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);
   }
 }
 //