eip-cloud-services 1.2.2 → 1.2.3

package/package.json

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

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;
         }

package/src/s3.js

@@ -197,13 +197,14 @@ exports.get = async ( key, bucket = config?.s3?.Bucket, options = {} ) => {
  * @description Sets an object in S3 with the provided key, body, and optional parameters.
  */
 exports.set = async ( key, body, options = {} ) => {
-    const bucket = options.bucket || config?.s3?.Bucket;
-    const contentType = options.contentType || 'application/json';
-    const cacheControl = options.cacheControl || 'max-age=25,s-maxage=30,must-revalidate';
-    const encrypt = Boolean ( options.encrypt );
-    const metadata = options.metadata || {};
-    const hasAcl = Object.prototype.hasOwnProperty.call ( options, 'acl' );
-    const acl = hasAcl ? options.acl : 'public-read';
+    const {
+        bucket = config?.s3?.Bucket,
+        contentType = 'application/json',
+        acl = 'public-read',
+        cacheControl = 'max-age=25,s-maxage=30,must-revalidate',
+        encrypt = false,
+        metadata = {}
+    } = options;
     
     if ( encrypt && ( contentType === 'application/json' || contentType === 'text/plain' ) ) {
 
@@ -233,21 +234,16 @@ exports.set = async ( key, body, options = {} ) => {
     }
 
     try {
-        const params = {
+        const command = new PutObjectCommand ( {
             Bucket: bucket,
             Key: key,
             Body: body,
             ContentType: contentType,
+            ACL: acl,
             CacheControl: cacheControl,
             Metadata: metadata,
             ContentLength: Buffer.byteLength ( body )
-        };
-
-        if ( acl !== null && acl !== undefined && acl !== false ) {
-            params.ACL = acl;
-        }
-
-        const command = new PutObjectCommand ( params );
+        } );
   
         const data = await S3.send ( command );
 
@@ -412,4 +408,4 @@ const streamToBuffer = async ( stream ) => {
     await pipelineAsync ( stream, collectorStream );
     
     return Buffer.concat ( chunks );
-};
+};