eip-cloud-services 1.2.5 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eip-cloud-services",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Houses a collection of helpers for connecting with Cloud services.",
   "main": "index.js",
   "scripts": {

package/src/redis.js

@@ -53,6 +53,26 @@ const applyPrefix = (value) => {
     return value.startsWith(prefix) ? value : `${prefix}${value}`;
 };
 
+const toPlainObject = ( value ) => {
+    if ( value && typeof value === 'object' && !Array.isArray ( value ) ) {
+        return value;
+    }
+    return {};
+};
+
+const getRedisOptionsForClient = ( clientId, { cluster = false } = {} ) => {
+    const baseOptions = toPlainObject ( config?.redis?.options );
+    const perClientOptions = toPlainObject ( config?.redis?.clientOptionsById?.[ clientId ] );
+    const mergedOptions = { ...baseOptions, ...perClientOptions };
+
+    // Preserve existing cluster behaviour (TLS by default) unless explicitly overridden.
+    if ( cluster && !Object.prototype.hasOwnProperty.call ( mergedOptions, 'tls' ) ) {
+        mergedOptions.tls = {};
+    }
+
+    return mergedOptions;
+};
+
 /**
  * Creates or retrieves a Redis client instance based on a given client identifier.
  * If the client does not exist, it creates a new one, either connecting to a Redis Cluster
@@ -93,10 +113,11 @@ const getClient = async ( clientId = 'main' ) => {
                     host: node.host,
                     port: node.port
                 } ) );
+                const redisOptions = getRedisOptionsForClient ( clientId, { cluster: true } );
 
                 redisClient = new Redis.Cluster ( clusterNodes, {
                     dnsLookup: (address, callback) => callback(null, address),
-                    redisOptions: config?.redis?.options || {tls: {} }
+                    redisOptions
                 } );
 
                 // Await until the cluster is ready
@@ -113,9 +134,11 @@ const getClient = async ( clientId = 'main' ) => {
                 throw new Error ( 'Redis Cluster is enabled but there were no cluster nodes defined in config.redis.cluster' );
             }
             else {
+                const redisOptions = getRedisOptionsForClient ( clientId );
                 redisClient = new Redis ( {
                     host: config?.redis?.host,
-                    port: config?.redis?.port
+                    port: config?.redis?.port,
+                    ...redisOptions
                 } );
 
                 redisClient.on ( 'error', error => {