eip-cloud-services 1.1.10 → 1.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eip-cloud-services",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "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/mysql.js

@@ -27,9 +27,16 @@ const newQuery = ( connection, query ) => new Promise ( ( resolve, reject ) => {
     connection.query ( query, ( error, results, fields ) => {
         connection.release ();
         if ( error ) {
-            console.error ( error );
-            console.error ( `There was a problem with query: ${ query }` );
-            reject ( `There was a problem with query: ${ query }` );
+            const MAX_ERROR_LENGTH = 500;
+            const MAX_QUERY_LENGTH = 300;
+      
+            const shortError = (error?.stack || error?.message || String(error)).slice(0, MAX_ERROR_LENGTH);
+            const shortQuery = query.slice(0, MAX_QUERY_LENGTH);
+      
+            console.error("Query Error:", shortError);
+            console.error("Truncated Query:", shortQuery);
+
+            reject(`There was a problem with query: ${shortError}`);
         }
         else {
             resolve ( results );