eip-cloud-services 1.1.9 → 1.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eip-cloud-services",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "Houses a collection of helpers for connecting with Cloud services.",
   "main": "index.js",
   "scripts": {
@@ -24,4 +24,4 @@
     "mysql": "^2.18.1",
     "redis": "^4.6.7"
   }
-}
+}

package/src/cdn.js

@@ -11,6 +11,8 @@ const packageJson = require ( '../package.json' );
 const { cwd } = require ( 'process' );
 const { log } = config?.s3?.logsFunction ? require ( `${  cwd ()}/${config.s3.logsFunction}` ) : console;
 
+const redis = require('./redis');
+
 /**
  * Create a CDN invalidation for the specified key(s) and environment.
  *
@@ -44,8 +46,24 @@ exports.createInvalidation = async ( cdn, key, environment = 'production' ) => {
         throw new Error ( 'Invalid key argument. Expected a string or an array of strings.' );
     }
 
+    if ( config?.redis?.host ) {
+        const redisKey = `cdn-invalidation:${cdn}:${environment}:${key}`;
+        const redisValue = await redis.get(redisKey);
+
+        if(redisValue) {
+            if ( config.cdn.log )
+                log ( `CDN [INVALIDATE]: Invalidation already in progress - skipping: ${paths.map ( path => `https://${cdn}${environment !== 'production' ? '-test' : ''}.eip.telegraph.co.uk${path}` ).join ( ', ' )}\n` );
+            await redis.increment(redisKey);
+
+            return;
+        }
+        else{
+            await redis.set(redisKey, 1, cdnSettings.type === 'google' ? 300 : 120); // 5 minutes for google, 2 minutes for amazon
+        }
+    }
+
     if ( config.cdn.log )
-        log ( `CDN [INVALIDATE]: ${paths.map ( path => `https://${cdn}${environment !== 'production' ? '-test' : ''}.eip.telegraph.co.uk/${path}` ).join ( ', ' )}\n` );
+        log ( `CDN [INVALIDATE]: ${paths.map ( path => `https://${cdn}${environment !== 'production' ? '-test' : ''}.eip.telegraph.co.uk${path}` ).join ( ', ' )}\n` );
 
     switch ( cdnSettings.type ) {
         case 'google':

package/src/redis.js

@@ -607,6 +607,46 @@ exports.listRange = async ( key, start = 0, end = -1 ) => {
     }
 };
 
+/**
+ * Increments the integer value of a key by the provided amount, or by 1 if no amount is specified.
+ * @param {string} key - The key whose value is to be incremented.
+ * @param {number} [increment=1] - The amount by which to increment the key's value. Defaults to 1.
+ * @returns {Promise<number>} - A promise that resolves with the new value after increment.
+ *
+ * @description This method uses the Redis INCRBY command to increment the value of the key.
+ * It defaults to incrementing by 1 if no specific increment value is provided.
+ */
+exports.increment = async (key, increment = 1) => {
+    try {
+        const client = await getClient();
+        const fullKey = (!config?.redis?.prefix || key.startsWith(config?.redis?.prefix)) ? key : config?.redis?.prefix + key;
+        return await client.incrby(fullKey, increment);
+    } catch (error) {
+        console.log('REDIS LIB ERROR [increment]', error);
+        throw error;
+    }
+};
+
+/**
+ * Decrements the integer value of a key by the provided amount, or by 1 if no amount is specified.
+ * @param {string} key - The key whose value is to be decremented.
+ * @param {number} [decrement=1] - The amount by which to decrement the key's value. Defaults to 1.
+ * @returns {Promise<number>} - A promise that resolves with the new value after decrement.
+ *
+ * @description This method uses the Redis DECRBY command to decrement the value of the key.
+ * It defaults to decrementing by 1 if no specific decrement value is provided.
+ */
+exports.decrement = async (key, decrement = 1) => {
+    try {
+        const client = await getClient();
+        const fullKey = (!config?.redis?.prefix || key.startsWith(config?.redis?.prefix)) ? key : config?.redis?.prefix + key;
+        return await client.decrby(fullKey, decrement);
+    } catch (error) {
+        console.log('REDIS LIB ERROR [decrement]', error);
+        throw error;
+    }
+};
+
 /**
  * Retrieves the expiration time of a key in seconds.
  * @param {string} key - The key to get the expiration time of.