eip-cloud-services 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eip-cloud-services",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "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

@@ -36,7 +36,10 @@ const getClient = async ( clientId = 'main' ) => {
                     port: node.port
                 } ) );
 
-                redisClient = new Redis.Cluster ( clusterNodes );
+                redisClient = new Redis.Cluster ( clusterNodes, {
+                    dnsLookup: (address, callback) => callback(null, address),
+                    redisOptions: config?.redis?.options || {tls: {} }
+                } );
 
                 // Await until the cluster is ready
                 await new Promise ( ( resolve, reject ) => {

package/src/s3.js

@@ -197,14 +197,13 @@ 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 = config?.s3?.Bucket,
-        contentType = 'application/json',
-        acl = 'public-read',
-        cacheControl = 'max-age=25,s-maxage=30,must-revalidate',
-        encrypt = false,
-        metadata = {}
-    } = 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';
     
     if ( encrypt && ( contentType === 'application/json' || contentType === 'text/plain' ) ) {
 
@@ -234,16 +233,21 @@ exports.set = async ( key, body, options = {} ) => {
     }
 
     try {
-        const command = new PutObjectCommand ( {
+        const params = {
             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 );
 
@@ -408,4 +412,4 @@ const streamToBuffer = async ( stream ) => {
     await pipelineAsync ( stream, collectorStream );
     
     return Buffer.concat ( chunks );
-};
+};