@ikonintegration/ikapi 3.0.0-alpha1 → 3.0.0-alpha4

package/package.json

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

package/src/Database/DDB/IKDB.js

@@ -5,6 +5,8 @@ import sha1 from 'sha1';
 //
 import IKGlobals from './../../IKGlobals';
 import IKDB from './../Prototype/IKDB';
+//
+const { Agent } = require("https");
 //reusable connection
 var DDB_CONN = null;
 var DDB_CONN_HASH = null;
@@ -32,7 +34,6 @@ export default class IKDB_DDB extends IKDB {
     } else {
       // localConsole.debug("Starting remote database connection");
       //initialize connection
-      AWS.config.update({httpOptions: sslAgent, region: this.region});
       this.connection = new DynamoDB({ 
         region: this.region,
         requestHandler: new NodeHttpHandler({

package/src/Database/DDB/IKDBQueryBatchWrite.js

@@ -21,7 +21,7 @@ export default class IKDBQueryBatchWrite extends IKDBBaseQuery {
     const query = this._rawQuery(dbManager.tableName);
     const localConsole = (dbManager.transaction ? dbManager.transaction.logger : console);
     localConsole.log('Batch writting items: ', query);
-    const resp = await dbManager.connection.batchWriteItem(query).promise();
+    const resp = await dbManager.connection.batchWriteItem(query);
     // localConsole.debug('Raw result: ', resp);
     return resp;
   }

package/src/Database/DDB/IKDBQueryDelete.js

@@ -17,7 +17,7 @@ export default class IKDBQueryUpdate extends IKDBBaseQuery {
     let query = this._rawQuery(dbManager.tableName);
     const localConsole = (dbManager.transaction ? dbManager.transaction.logger : console);
     localConsole.log("Deleting item: ", query);
-    let resp = await dbManager.connection.deleteItem(query).promise();
+    let resp = await dbManager.connection.deleteItem(query);
     // localConsole.debug('Raw result: ', resp);
     return resp;
   }

package/src/Database/DDB/IKDBQueryGet.js

@@ -35,7 +35,7 @@ export default class IKDBQueryGet extends IKDBBaseQuery {
       ...(!this.scanIndexForward ? { ScanIndexForward: false } : {}),
     };
     localConsole.log('Querying: ', query);
-    const resp = await dbManager.connection.query(query).promise();
+    const resp = await dbManager.connection.query(query);
     // localConsole.debug('Raw result: ', resp);
     return resp;
   }

package/src/Database/DDB/IKDBQueryPut.js

@@ -59,7 +59,7 @@ export default class IKDBQueryPut extends IKDBBaseQuery {
     const localConsole = (dbManager.transaction ? dbManager.transaction.logger : console);
     const query = this._rawQuery(dbManager.tableName);
     localConsole.log('Putting item: ', query);
-    const resp = await dbManager.connection.putItem(query).promise();
+    const resp = await dbManager.connection.putItem(query);
     // localConsole.debug('Raw result: ', resp);
     return resp;
   }
@@ -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/IKDBQueryScan.js

@@ -26,7 +26,7 @@ export default class IKDBQueryScan extends IKDBBaseQuery {
     const localConsole = (dbManager.transaction ? dbManager.transaction.logger : console);
     const query = this._rawQuery(dbManager.tableName);
     localConsole.log('Scanning: ', query);
-    const resp = await dbManager.connection.scan(query).promise();
+    const resp = await dbManager.connection.scan(query);
     // localConsole.debug('Raw result: ', resp);
     return resp;
   }

package/src/Database/DDB/IKDBQueryTransactionalWrite.js

@@ -24,7 +24,7 @@ export default class IKDBQueryTransactionalWrite extends IKDBBaseQuery {
     const localConsole = (dbManager.transaction ? dbManager.transaction.logger : console);
     const query = this._rawQuery(dbManager.tableName);
     localConsole.log('Batch writting items: ', query);
-    const resp = await dbManager.connection.transactWriteItems(query).promise();
+    const resp = await dbManager.connection.transactWriteItems(query);
     // localConsole.debug('Raw result: ', resp);
     return resp;
   }

package/src/Database/DDB/IKDBQueryUpdate.js

@@ -94,7 +94,7 @@ export default class IKDBQueryUpdate extends IKDBBaseQuery {
     const localConsole = (dbManager.transaction ? dbManager.transaction.logger : console);
     let query = this._rawQuery(dbManager.tableName);
     localConsole.log("Updating item: ", query);
-    let resp = await dbManager.connection.updateItem(query).promise();
+    let resp = await dbManager.connection.updateItem(query);
     // localConsole.debug('Raw result: ', resp);
     return resp;
   }

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);
@@ -30,9 +31,9 @@ export default class IKDBQueryPut extends IKDBQuery {
     const localConsole = (dbManager.transaction ? dbManager.transaction.logger : console);
     const query = this.__rawQuery(dbManager.tableName);
     localConsole.log('Putting item: ', query);
-    const resp = await dbManager.connection.putItem(query).promise();
+    const resp = await dbManager.connection.putItem(query);
     // 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/Publisher/IKPublisher.js

@@ -24,7 +24,7 @@ export default class IKPublisher {
         TopicArn: topic,
         ...(additionalProps ? additionalProps : {}),
       };
-      resp = await PUBLISHER_CONN.publish(params).promise();
+      resp = await PUBLISHER_CONN.publish(params);
     } catch (e) {
       console.error(`Error while publishing into topic ${topic} with error: ${e}`);
     }