@mimik/rediser 1.4.15 → 1.5.2

package/index.js

@@ -17,6 +17,7 @@ const DISCONNECTED = 2;
 let displayCreate = true;
 let displayDisconnect = true;
 let state = DISCONNECTED;
+let clusterConnectInterval;
 
 module.exports = (set, config) => {
   const { redisSettings } = config;
@@ -69,22 +70,59 @@ module.exports = (set, config) => {
       else logger.info('creating a cache connection', { type, settings: redisSettings }, correlationId);
       displayCreate = false;
     }
-    const client = redis.createClient({ url: redisSettings.url, ...redisSettings.options });
-    client.connect();
-
+    let client;
+    const isClusterEnabled = redisSettings.cluster.set === 'on';
+    if (isClusterEnabled) {
+      const clusterConfig = {
+        rootNodes: redisSettings.domain.split(',').map((url) => ({ url: `redis://${url}` })),
+        useReplicas: redisSettings.cluster.useReplicas === 'on',
+        minimizeConnections: redisSettings.cluster.minimizeConnections === 'on',
+      };
+      if (redisSettings.username && redisSettings.password) {
+        clusterConfig.defaults = {
+          username: redisSettings.username,
+          password: redisSettings.password,
+        };
+      }
+      client = redis.createCluster(clusterConfig);
+    }
+    else {
+      client = redis.createClient({ url: redisSettings.url, ...redisSettings.options });
+    }
     client.on('error', (err) => {
       state = err;
-    });
-    client.on('reconnecting', disconnectHandler);
-    client.on('ready', () => {
-      state = CONNECTED;
-      if (interval) {
-        clearInterval(interval);
-        interval = null;
-      }
-    });
-    client.on('end', () => disconnectHandler);
+    })
+      .on('reconnecting', disconnectHandler)
+      .on('ready', () => {
+        state = CONNECTED;
+        if (interval) {
+          clearInterval(interval);
+          interval = null;
+        }
+      })
+      .on('end', () => disconnectHandler)
+      .connect();
 
+    // Todo: remove this if block, when redis library has events implemented for cluster connections
+    if (!clusterConnectInterval && isClusterEnabled) {
+      const connectionTestKey = 'b7ddc6b6-57a8-4cde-80a1-c6a8f174f386';
+      clusterConnectInterval = setInterval(() => {
+        if (state !== CONNECTED) {
+          client.set('connectionTestKey', connectionTestKey)
+            .then(() => client.get('connectionTestKey'))
+            .then((value) => {
+              if (value === connectionTestKey) state = CONNECTED;
+            })
+            .catch((error) => {
+              logger.error('connection not ready yet', { error }, correlationId);
+            });
+        }
+        else {
+          clearInterval(clusterConnectInterval);
+          clusterConnectInterval = null;
+        }
+      }, redisSettings.validationCheck);
+    }
     return client;
   };
 
@@ -113,20 +151,21 @@ module.exports = (set, config) => {
       }
     }, config.redisSettings.connectTimeout * 1000); // convert in seconds
 
-    return Promise.delay(redisSettings.validationCheck).then(() => {
-      if (state !== DISCONNECTED && state !== CONNECTED) {
-        const error = new Error(`cache connection not established: ${state}`);
+    return Promise.delay(redisSettings.validationCheck)
+      .then(() => {
+        if (state !== DISCONNECTED && state !== CONNECTED) {
+          const error = new Error(`cache connection not established: ${state}`);
 
-        logger.error('cache connection error', { type, error }, correlationId);
-        throw error;
-      }
-      if (state === DISCONNECTED) {
-        return validate();
-      }
-      clearInterval(interval);
-      logger.info('cache connection established', { type }, correlationId);
-      return null;
-    });
+          logger.error('cache connection error', { type, error }, correlationId);
+          throw error;
+        }
+        if (state === DISCONNECTED) {
+          return validate();
+        }
+        clearInterval(interval);
+        logger.info('cache connection established', { type }, correlationId);
+        return null;
+      });
   };
 
   if (state !== CONNECTED) initializeSync();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mimik/rediser",
-  "version": "1.4.15",
+  "version": "1.5.2",
   "description": "Helper for setting up redis using redis for mimik microservices",
   "main": "index.js",
   "scripts": {
@@ -32,12 +32,12 @@
     "@mimik/lib-filters": "^1.4.8",
     "@mimik/sumologic-winston-logger": "^1.6.19",
     "bluebird": "3.7.2",
-    "redis": "4.6.8"
+    "redis": "4.6.10"
   },
   "devDependencies": {
     "@mimik/eslint-plugin-dependencies": "^2.4.5",
     "@mimik/eslint-plugin-document-env": "^1.0.5",
-    "eslint": "8.48.0",
+    "eslint": "8.50.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-plugin-import": "2.28.1",
     "eslint-plugin-jsx-a11y": "6.7.1",