eip-cloud-services 1.1.1 → 1.1.3

package/package.json

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

package/src/redis.js

@@ -119,7 +119,7 @@ exports.keys = async ( pattern ) => {
         if ( typeof pattern === 'string' ) {
             const client = await getClient ();
 
-            const fullPattern = pattern.startsWith ( config?.redis?.prefix ) ? pattern : config?.redis?.prefix + pattern;
+            const fullPattern = ( !config?.redis?.prefix || pattern.startsWith ( config?.redis?.prefix ) ) ? pattern : config?.redis?.prefix + pattern;
 
             // Use the keys method directly instead of sendCommand
             return await client.keys ( fullPattern );
@@ -150,7 +150,7 @@ exports.scan = async ( cursor, matchPattern = '*', count = 100 ) => {
     try {
         const client = await getClient ();
 
-        const fullMatchPattern = matchPattern.startsWith ( config?.redis?.prefix ) ? matchPattern : config?.redis?.prefix + matchPattern;
+        const fullMatchPattern = ( !config?.redis?.prefix || matchPattern.startsWith ( config?.redis?.prefix ) ) ? matchPattern : config?.redis?.prefix + matchPattern;
 
         // Directly use the scan method provided by ioredis
         const result = await client.scan ( cursor, 'MATCH', fullMatchPattern, 'COUNT', count );
@@ -177,7 +177,7 @@ exports.get = async ( key ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
 
             // Use the get method directly
             const data = await client.get ( fullKey );
@@ -212,7 +212,7 @@ exports.multiGet = async ( keys ) => {
         if ( Array.isArray ( keys ) ) {
             const client = await getClient ();
 
-            const fullKeys = keys.map ( key => key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key );
+            const fullKeys = ( !config?.redis?.prefix || keys.map ( key => key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key );
 
             // Use the mget method directly
             const data = await client.mget ( ...fullKeys );
@@ -254,7 +254,7 @@ exports.set = async ( key, value, ex, px ) => {
 
             // Automatically convert objects or arrays to JSON strings
             const serializedValue = ( typeof value === 'object' && value !== null ) ? JSON.stringify ( value ) : value;
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
 
             // Use the set method directly with optional EX and PX parameters
             return await client.set ( fullKey, serializedValue, ...( ex ? [ 'EX', ex ] : [] ), ...( px ? [ 'PX', px ] : [] ) );
@@ -282,7 +282,7 @@ exports.del = async ( key ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
 
             // Use the del method directly
             return await client.del ( fullKey );
@@ -313,7 +313,7 @@ exports.multiDel = async ( keys ) => {
             const client = await getClient ();
 
             // Prepend the Redis prefix to each key if necessary
-            const fullKeys = keys.map ( key => key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key );
+            const fullKeys = ( !config?.redis?.prefix || keys.map ( key => key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key );
 
             // Use the del method with multiple keys
             return await client.del ( ...fullKeys );
@@ -343,7 +343,7 @@ exports.setAdd = async ( key, members ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
             const membersArray = Array.isArray ( members ) ? members : [ members ];
 
             // Use the sadd method directly
@@ -373,7 +373,7 @@ exports.setRemove = async ( key, members ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
             const membersArray = Array.isArray ( members ) ? members : [ members ];
 
             // Use the srem method directly
@@ -401,7 +401,7 @@ exports.setMembers = async ( key ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
 
             // Use the smembers method directly
             return await client.smembers ( fullKey );
@@ -431,7 +431,7 @@ exports.setPop = async ( key ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
 
             // Use the spop method directly
             const member = await client.spop ( fullKey );
@@ -468,7 +468,7 @@ exports.listUnshift = async ( key, values ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
             const valuesArray = Array.isArray ( values ) ? values : [ values ];
 
             // Use the lpush method directly
@@ -499,7 +499,7 @@ exports.listPush = async ( key, values ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
             const valuesArray = Array.isArray ( values ) ? values : [ values ];
 
             // Use the rpush method directly
@@ -530,7 +530,7 @@ exports.listPop = async ( key, count = 1 ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
 
             // Use the lpop method directly with the count parameter
             return await client.lpop ( fullKey, count );
@@ -556,7 +556,7 @@ exports.listPopEnd = async ( key ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
 
             return await client.rpop ( fullKey );
         }
@@ -586,7 +586,7 @@ exports.listRange = async ( key, start = 0, end = -1 ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
 
             // Use the lrange method directly
             return await client.lrange ( fullKey, start, end );
@@ -615,7 +615,7 @@ exports.getExpiryInSeconds = async ( key ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
 
             // Use the ttl method directly
             return await client.ttl ( fullKey );
@@ -644,7 +644,7 @@ exports.setExpiry = async ( key, seconds = 0 ) => {
         if ( typeof key === 'string' ) {
             const client = await getClient ();
 
-            const fullKey = key.startsWith ( config?.redis?.prefix ) ? key : config?.redis?.prefix + key;
+            const fullKey = ( !config?.redis?.prefix || key.startsWith ( config?.redis?.prefix ) ) ? key : config?.redis?.prefix + key;
 
             // Use the expire method directly
             return await client.expire ( fullKey, seconds );

package/src/s3.js

@@ -326,6 +326,45 @@ exports.move = async ( sourceKey, destinationKey, sourceBucket = config?.s3?.Buc
     }
 };
 
+/**
+ * List objects in an S3 bucket filtered by a prefix, with support for pagination.
+ *
+ * @param {string} prefix - The prefix to filter objects by.
+ * @param {string} [bucket=config?.s3?.Bucket] - The bucket name. Defaults to the configured bucket.
+ * @param {string} [continuationToken] - The continuation token for pagination (optional).
+ * @returns {Promise} A promise that resolves with the list of objects and potentially a continuation token for further pagination.
+ * @description Retrieves a list of objects from S3 that match the given prefix, with support for pagination.
+ */
+exports.listObjects = async ( prefix, bucket = config?.s3?.Bucket, continuationToken ) => {
+    try {
+        const params = {
+            Bucket: bucket,
+            Prefix: prefix,
+        };
+
+        if ( continuationToken ) {
+            params.ContinuationToken = continuationToken;
+        }
+
+        const command = new ListObjectsV2Command ( params );
+
+        const data = await S3.send ( command );
+
+        if ( config?.s3?.logs === 'outputs' || config?.s3?.logs === 'verbose' ) {
+            log ( `S3 [LIST]: Retrieved list for prefix ${prefix} on ${bucket}${continuationToken ? ' with continuation token' : ''}.` );
+        }
+
+        return {
+            objects: data.Contents,
+            isTruncated: data.IsTruncated,
+            nextContinuationToken: data.NextContinuationToken,
+        };
+    }
+    catch ( error ) {
+        throw error;
+    }
+};
+
 exports.getClient = S3;
 
 const streamToBuffer = ( stream ) =>