@ikonintegration/ikapi 2.6.9 → 3.0.0-alpha2

package/package.json

@@ -1,18 +1,22 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "2.6.9",
+  "version": "3.0.0-alpha2",
   "description": "",
   "main": "index.js",
   "module": "main.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "pre-publish": "npm i -production && curl -sf https://gobinaries.com/tj/node-prune | sh && node-prune"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@aws/dynamodb-auto-marshaller": "^0.7.1",
+    "@aws-sdk/client-dynamodb": "^3.72.0",
+    "@aws-sdk/client-ses": "^3.72.0",
+    "@aws-sdk/client-sns": "^3.72.0",
+    "@aws-sdk/node-http-handler": "^3.58.0",
+    "@aws-sdk/util-dynamodb": "^3.72.0",
     "abind": "^1.0.5",
-    "aws-sdk": "^2.1034.0",
     "bluebird": "^3.7.2",
     "email-templates": "^8.0.8",
     "esm": "^3.2.25",
@@ -20,7 +24,6 @@
     "is-uuid": "^1.0.2",
     "json-stringify-safe": "^5.0.1",
     "ksuid": "^3.0.0",
-    "libphonenumber-js": "^1.9.43",
     "nodemailer": "^6.7.1",
     "path-to-regexp": "^6.2.0",
     "pg": "^8.7.1",

package/src/API/IKRequest.js

@@ -1,5 +1,4 @@
 /** Ikon Integration DynamoDB wrapper**/
-import AWS from "aws-sdk";
 import Utils from "./IKUtils";
 //
 export default class IKRequest {

package/src/API/IKUtils.js

@@ -1,6 +1,6 @@
-import AWS from "aws-sdk";
+
 import KSUID from 'ksuid';
-import { Marshaller } from '@aws/dynamodb-auto-marshaller';
+import { convertToAttr, marshall, unmarshall } from "@aws-sdk/util-dynamodb";
 //
 export default class IKUtils {}
 IKUtils.isOffline = function() { return process.env.IS_OFFLINE; }
@@ -32,17 +32,15 @@ IKUtils.caseInsensitiveSetObjectForKey = function(obj, key, value) {
 IKUtils.encapsulateForDB = function(item) {
   if (Array.isArray(item)) return {L: item.map(_i => IKUtils.encapsulateForDB(_i))};
   else if (typeof item === 'object' && isNaN(parseInt(item))) {
-    const marshaller = new Marshaller({onEmpty: 'omit'});
-    return {M: marshaller.marshallItem(item)};
-  } else return AWS.DynamoDB.Converter.input(item);
+    return {M: marshall(item, {removeUndefinedValues: true})};
+  } else return convertToAttr(item);
 }
 IKUtils.decapsulateForDB = function(item) {
   if (!item && item !== false) return null;
   if (Array.isArray(item)) {
     return item.map(_item => IKUtils.decapsulateForDB(_item));
   } else if (typeof item === 'object') {
-    const marshaller = new Marshaller({onEmpty: 'omit'});
-    return marshaller.unmarshallItem(item);
+    return unmarshall(item, { removeUndefinedValues: true });
   } return item;
 }
 //Threads

package/src/Cache/Redis/IKRedis.js

@@ -81,10 +81,7 @@ export default class IKCache_Redis extends IKCache {
   }
   _isRedisClientV4() {
     let isV4 = false;
-    try { 
-      const test = require('redis').createClient({}); 
-      if (test.connect) isV4 = true;
-    } 
+    try {  isV4 = !!require('redis').createCluster; } 
     catch (e) { }
     return isV4;
   }

package/src/Database/DDB/IKDB.js

@@ -1,5 +1,5 @@
-import AWS from "aws-sdk";
-import HTTPS from "https";
+import { DynamoDB } from "@aws-sdk/client-dynamodb";
+import { NodeHttpHandler } from "@aws-sdk/node-http-handler";
 import Utils from "./../../API/IKUtils";
 import sha1 from 'sha1';
 //
@@ -15,7 +15,7 @@ export default class IKDB_DDB extends IKDB {
     this.tableName = config.tableName;
     this.region = config.region;
     //
-    const localConsole = (transaction ? transaction.logger : console);
+    // const localConsole = (transaction ? transaction.logger : console);
     // if (config && this.tableName) { localConsole.debug(`Using table: ${this.tableName} on region: ${this.region}`); }
   }
 
@@ -28,15 +28,16 @@ export default class IKDB_DDB extends IKDB {
     //setup db
     if (Utils.isOffline()) {
       localConsole.debug("Starting offline database connection");
-      this.connection = new AWS.DynamoDB(IKGlobals.DynamoDBLocalConfig);
+      this.connection = new DynamoDB(IKGlobals.DynamoDBLocalConfig);
     } else {
       // localConsole.debug("Starting remote database connection");
-      //setup ssl
-      const sslAgent = new HTTPS.Agent({ keepAlive: true, maxSockets: 50, rejectUnauthorized: true });
-      sslAgent.setMaxListeners(50);
       //initialize connection
-      AWS.config.update({httpOptions: sslAgent, region: this.region});
-      this.connection = new AWS.DynamoDB();
+      this.connection = new DynamoDB({ 
+        region: this.region,
+        requestHandler: new NodeHttpHandler({
+          httpsAgent: new Agent({ keepAlive: false, maxSockets: 50, rejectUnauthorized: true }),
+        })
+      });
       //Reusable logic
       DDB_CONN = this.connection;
       DDB_CONN_HASH = sha1(this.region);

package/src/Database/DDB/IKDBQueryPut.js

@@ -80,19 +80,3 @@ export default class IKDBQueryPut extends IKDBBaseQuery {
     } return expression;
   }
 }
-
-
-/*marshalling should be done
-let unMarshalled = dbResp.Items.map((item) => {
-  let i = AWS.DynamoDB.Converter.unmarshall(item);
-  const  { gsi1sk, gsi3pk,...otherProps } = i;
-  const activitydate = gsi1sk;
-  const ctid = gsi3pk;
-  const ret = { activitydate, ctid, ...otherProps };
-  console.log("um:", ret);
-  return ret;
-});
-unMarshalled.request_data = AWS.DynamoDB.Converter.unmarshall(unMarshalled.request_data);
-console.log(unMarshalled);
-return unMarshalled;
-*/

package/src/Database/DDB/_IKDBQueryTransactionalRead.js

@@ -1,4 +1,5 @@
 import IKDBQuery from './IKDBQuery';
+import { convertToAttr, marshall, unmarshall } from "@aws-sdk/util-dynamodb";
 //
 export default class IKDBQueryPut extends IKDBQuery {
   constructor() {
@@ -17,8 +18,8 @@ export default class IKDBQueryPut extends IKDBQuery {
         (source[key].length > 0))) {
       //Check for object conversion
       let val;
-      if (isObject) val = {"M": AWS.DynamoDB.Converter.marshall(source[key])};
-      else val = AWS.DynamoDB.Converter.input(source[key]);
+      if (isObject) val = {"M": marshall(source[key])};
+      else val = convertToAttr(source[key]);
       //valid
       if (val != undefined) { this.putItems[key]= val; }
       // console.debug("Apppending key:", key, " val:", val);
@@ -32,7 +33,7 @@ export default class IKDBQueryPut extends IKDBQuery {
     localConsole.log('Putting item: ', query);
     const resp = await dbManager.connection.putItem(query).promise();
     // localConsole.log('Raw result: ', resp);
-    const unmarshalled = resp.Items.map(AWS.DynamoDB.Converter.unmarshall);
+    const unmarshalled = resp.Items.map(unmarshall);
     localConsole.log('Parsed result: ', unmarshalled);
     return unmarshalled;
   }

package/src/IKGlobals.js

@@ -11,8 +11,6 @@ IKGlobals.ErrorResponseValidationFail = 'Input validation failed: '; //400
 IKGlobals.ErrorResponseInvalidServerResponse = 'No valid response, this is a system error.'; //400
 IKGlobals.ErrorResponseUnhandledError = 'Unhandled error when processing request.'; //400
 IKGlobals.ErrorResponseNoRecords = 'No events to be processed.'; //400
-//Validation engine
-IKGlobals.ValidationEngine_PhoneNumberLocalization = 'CA';
 //Development Configs
 IKGlobals.DynamoDBLocalConfig = {region: "localhost", endpoint: "http://localhost:8000", accessKeyId: 'DEFAULT_ACCESS_KEY', secretAccessKey: 'DEFAULT_SECRET'};
 

package/src/Logger/IKLogger.js

@@ -1,4 +1,3 @@
-import AWS from "aws-sdk";
 const abind = require('abind');
 const stackTrace = require('stack-trace');
 const stringify = require('json-stringify-safe');

package/src/Mailer/IKMailer.js

@@ -1,7 +1,7 @@
 const nodemailer = require("nodemailer");
-const AWS = require('aws-sdk');
 const Email = require('email-templates');
 //
+import { SESClient } from "@aws-sdk/client-ses";
 import Utils from "./../API/IKUtils";
 //
 export default class IKMailer {
@@ -11,10 +11,9 @@ export default class IKMailer {
     //setup local stuff
     let configObj = {region: region};
     if (Utils.isOffline()) configObj = {region: region, accessKeyId: process.env.AWS_ACCESS_KEY_ID, secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY};
-    AWS.config.update(configObj);
     //
     this.transporter = nodemailer.createTransport({
-      SES: new AWS.SES({ apiVersion: "2010-12-01" })
+      SES: new SESClient({ apiVersion: "2010-12-01", ...configObj })
     });
   }
 

package/src/Publisher/IKPublisher.js

@@ -1,4 +1,4 @@
-import AWS from "aws-sdk";
+import { SNSClient } from "@aws-sdk/client-sns";
 import sha1 from 'sha1';
 //
 import Utils from "./../API/IKUtils";
@@ -37,8 +37,7 @@ export default class IKPublisher {
       //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 };
-      AWS.config.update(configObj);
-      PUBLISHER_CONN = (new AWS.SNS({ apiVersion: '2010-03-31' }));
+      PUBLISHER_CONN = (new SNSClient({ apiVersion: '2010-03-31', ...config }));
       PUBLISHER_CONN_HASH = sha1(this.region);
     }
   }

package/src/Validation/IKValidation.js

@@ -4,7 +4,6 @@ import IKResponse, { IKBadRequestResponse } from './../API/IKResponse';
 //https://www.npmjs.com/package/superstruct
 import { struct, superstruct } from 'superstruct';
 //validation libs
-import { parsePhoneNumberFromString } from 'libphonenumber-js'; //phone number validation and parse
 import isUuid from 'is-uuid';
 import isEmail from 'is-email';
 //
@@ -66,11 +65,6 @@ IKValidation.internalTypes = function() {
       for (let id of value) if (id.length < 10) return false;
       return true;
     },
-    phoneNumber: value => {
-      if (!value) return false;
-      const v = parsePhoneNumberFromString(value, IKGlobals.ValidationEngine_PhoneNumberLocalization);
-      return ((v && v.isValid()) == true);
-    },
     //TODO: this should be moved out to the project requiring this
     ACEArray: value => {
       if (!value || !value.length) return false;