eip-cloud-services 1.2.1 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eip-cloud-services",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Houses a collection of helpers for connecting with Cloud services.",
   "main": "index.js",
   "scripts": {
@@ -24,5 +24,8 @@
     "mysql": "^2.18.1",
     "mysql2": "^3.14.4",
     "redis": "^4.6.7"
+  },
+  "overrides": {
+    "jws": "4.0.1"
   }
 }

package/src/redis.js

@@ -8,6 +8,11 @@ if ( fs.existsSync ( configDirPath ) && fs.statSync ( configDirPath ).isDirector
 }
 
 const clients = {};
+const applyPrefix = (value) => {
+    const prefix = config?.redis?.prefix;
+    if (!prefix || typeof value !== 'string') return value;
+    return value.startsWith(prefix) ? value : `${prefix}${value}`;
+};
 
 /**
  * Creates or retrieves a Redis client instance based on a given client identifier.
@@ -725,9 +730,10 @@ exports.setExpiry = async ( key, seconds = 0 ) => {
 exports.publish = async ( channel, message ) => {
     try {
         if ( typeof channel === 'string' && typeof message === 'string' ) {
-            const client = await getClient ( `${channel}_pub` );
+            const fullChannel = applyPrefix ( channel );
+            const client = await getClient ( `${fullChannel}_pub` );
 
-            return client.publish ( channel, message );
+            return client.publish ( fullChannel, message );
         }
 
         throw new Error ( 'redis.publish expects string types for both channel and message' );
@@ -749,15 +755,16 @@ exports.publish = async ( channel, message ) => {
 exports.subscribe = async ( channel, messageHandler ) => {
     try {
         if ( typeof channel === 'string' && typeof messageHandler === 'function' ) {
-            const client = await getClient ( `${channel}_sub` );
+            const fullChannel = applyPrefix ( channel );
+            const client = await getClient ( `${fullChannel}_sub` );
 
             client.on ( 'message', ( receivedChannel, message ) => {
-                if ( receivedChannel === channel ) {
+                if ( receivedChannel === fullChannel ) {
                     messageHandler ( message );
                 }
             } );
 
-            await client.subscribe ( channel );
+            await client.subscribe ( fullChannel );
         
             return;
         }
@@ -781,12 +788,13 @@ exports.subscribe = async ( channel, messageHandler ) => {
 exports.unsubscribe = async ( channel ) => {
     try {
         if ( typeof channel === 'string' ) {
-            const client = await getClient ( `${channel}_sub` );
+            const fullChannel = applyPrefix ( channel );
+            const client = await getClient ( `${fullChannel}_sub` );
 
             client.removeAllListeners ( 'message' );
 
-            await client.unsubscribe ( channel );
-            await deleteClient ( `${channel}_sub` );
+            await client.unsubscribe ( fullChannel );
+            await deleteClient ( `${fullChannel}_sub` );
 
             return;
         }