@ikonintegration/ikapi 2.6.3 → 2.6.5-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "2.6.3",
+  "version": "2.6.5-beta2",
   "description": "",
   "main": "index.js",
   "module": "main.js",

package/src/Cache/Redis/IKRedis.js

@@ -79,6 +79,15 @@ export default class IKCache_Redis extends IKCache {
     catch (e) { response = false; }
     return response;
   }
+  _isRedisClientV4() {
+    let isV4 = false;
+    try { 
+      const test = require('redis').createClient({}); 
+      if (test.connect) isV4 = true;
+    } 
+    catch (e) { }
+    return isV4;
+  }
   async _connect() {
     //No connection, but waiting connection queue is valid? wait until other promise
     //fulfill this promire
@@ -97,11 +106,21 @@ export default class IKCache_Redis extends IKCache {
     //Instantiate client and initiate connection
     return new Promise((resolve, reject) => {
       const redis = require("redis");
+      const isV4 = this._isRedisClientV4();
+      //
       const connection = redis.createClient({
-        host: this.config.host, user: this.config.user, 
+        ...(isV4 ? {
+          username: this.config.user, url: this.config.host,
+          ...(this.config.enableTLS ? { socket: { tls: true } } /* https://docs.upstash.com/howto/connectwithtls */ : {})
+        } : {
+          host: this.config.host, user: this.config.user,
+          ...(this.config.enableTLS ? { tls: {} } /* https://docs.upstash.com/howto/connectwithtls */ : {})
+        }),
         password: this.config.password, 
-        ...(this.config.enableTLS ? { tls: {} } /* https://docs.upstash.com/howto/connectwithtls */ : {})
       });
+      //redis v4 & v3 compatibility
+      if (connection && connection.connect) await connection.connect();
+      //
       connection.on('connect', () => {
         this.connection = connection;
         if (this.awaitingConnectionQueue) this.awaitingConnectionQueue.forEach((resolve) => resolve());

package/src/Database/DDB/IKDB.js

@@ -16,7 +16,7 @@ export default class IKDB_DDB extends IKDB {
     this.region = config.region;
     //
     const localConsole = (transaction ? transaction.logger : console);
-    if (config && this.tableName) { localConsole.debug(`Using table: ${this.tableName} on region: ${this.region}`); }
+    // if (config && this.tableName) { localConsole.debug(`Using table: ${this.tableName} on region: ${this.region}`); }
   }
 
   async _getConnection() {
@@ -30,7 +30,7 @@ export default class IKDB_DDB extends IKDB {
       localConsole.debug("Starting offline database connection");
       this.connection = new AWS.DynamoDB(IKGlobals.DynamoDBLocalConfig);
     } else {
-      localConsole.debug("Starting remote database connection");
+      // localConsole.debug("Starting remote database connection");
       //setup ssl
       const sslAgent = new HTTPS.Agent({ keepAlive: true, maxSockets: 50, rejectUnauthorized: true });
       sslAgent.setMaxListeners(50);

package/src/Database/DDB/_IKDBQueryTransactionalRead.js

@@ -21,7 +21,7 @@ export default class IKDBQueryPut extends IKDBQuery {
       else val = AWS.DynamoDB.Converter.input(source[key]);
       //valid
       if (val != undefined) { this.putItems[key]= val; }
-      console.debug("Apppending key:", key, " val:", val);
+      // console.debug("Apppending key:", key, " val:", val);
       return true;
     } return false;
   }
@@ -31,7 +31,7 @@ export default class IKDBQueryPut extends IKDBQuery {
     const query = this.__rawQuery(dbManager.tableName);
     localConsole.log('Putting item: ', query);
     const resp = await dbManager.connection.putItem(query).promise();
-    localConsole.log('Raw result: ', resp);
+    // localConsole.log('Raw result: ', resp);
     const unmarshalled = resp.Items.map(AWS.DynamoDB.Converter.unmarshall);
     localConsole.log('Parsed result: ', unmarshalled);
     return unmarshalled;

package/src/Publisher/IKPublisher.js

@@ -10,7 +10,7 @@ export default class IKPublisher {
   constructor(config) {
     if (config && config.region) {
       this.region = config.region;
-      console.debug(`Using region: ${this.region}`);
+      // console.debug(`Using region: ${this.region}`);
     }
   }
   /* Public */