@capillarytech/creatives-library 7.17.147 → 7.17.148

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.17.147",
+  "version": "7.17.148",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/utils/cdnTransformation.js

@@ -28,6 +28,7 @@ const CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX_KEY = 'CREATIVES_CDN_TRANSFORMATIO
 const CREATIVES_CDN_OVERRIDE_DEFAULT_EMAIL_QUALITY_KEY = 'CREATIVES_CDN_OVERRIDE_DEFAULT_EMAIL_QUALITY';
 const CREATIVES_CDN_OVERRIDE_DEFAULT_EMAIL_QUALITY_MAPPING_KEY = 'CREATIVES_CDN_OVERRIDE_DEFAULT_EMAIL_QUALITY_MAPPING';
 export const CREATIVES_S3_ASSET_FILESIZES = 'CREATIVES_S3_ASSET_FILESIZES';
+export const S3_CDN_MAP_KEY = 'S3_CDN_MAP';
 
 const HTTPS_STR = "https://"
 const ALLOWED_EXTENSIONS_STR = ".*(?:jpg|png|jpeg|gif)$"
@@ -110,6 +111,35 @@ const CHANNEL_CONFIGS = {
   }
 };
 
+/**
+ * Retrieves the cluster-specific S3 CDN configuration from the given URL based on S3_CDN_MAP.
+ *
+ * @param {string} url - The URL to check for cluster-specific S3 CDN configuration.
+ * @returns {Object} - An object containing the cluster-specific S3 bucket path and CDN base URL.
+ */
+const getClusterSpecificS3CdnConfigFromUrl = (url) => {
+  const S3_CDN_MAP = getLocalStorageItem(S3_CDN_MAP_KEY, true);
+  let CREATIVES_S3_BUCKET_PATH;
+  let CREATIVES_CDN_BASE_URL;
+
+  Object.entries(S3_CDN_MAP).some(([clusterS3Url, cdnConfigs]) => {
+    const {cdn_host, bucket_path} = cdnConfigs;
+    const s3UrlRegex = new RegExp(`^https://${clusterS3Url}/${bucket_path}/\.*`);
+    const cdnUrlRegex = new RegExp(`^https://${cdn_host}/\.*${bucket_path}/\.*`);
+    
+    if(s3UrlRegex.test(url)) {
+      CREATIVES_S3_BUCKET_PATH = bucket_path;
+      CREATIVES_CDN_BASE_URL = `https://${cdn_host}`;
+      return true;
+    } else if(cdnUrlRegex.test(url)) {
+      CREATIVES_S3_BUCKET_PATH = bucket_path;
+      CREATIVES_CDN_BASE_URL = `https://${cdn_host}`;
+      return true;
+    }
+  });
+  return { CREATIVES_S3_BUCKET_PATH, CREATIVES_CDN_BASE_URL };
+}
+
 /**
  * 
  * @param {string} url : required 
@@ -144,88 +174,86 @@ export const getCdnUrl = ({
   emailOverrideQuality = null,
 }) => {
   try{
+    let cdnUrl;
     const channelName = receivedChannelName?.toUpperCase();
     const channelSubType = receivedChannelSubType?.toUpperCase();
-  
-    const CREATIVES_CDN_BASE_URL = getLocalStorageItem(CREATIVES_CDN_BASE_URL_KEY);
+
     const CREATIVES_CDN_QUALITY_CONFIG = getLocalStorageItem(CREATIVES_CDN_QUALITY_CONFIG_KEY, true);
     const CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX = getLocalStorageItem(CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX_KEY);
-    let CREATIVES_S3_BUCKET_PATH = getLocalStorageItem(CREATIVES_S3_BUCKET_PATH_KEY);
-    
-    //remove all leading and trailing forward slash with empty string, if leading/trailing forward slash is present in node env by mistake then url will not be correct hence removing them.
-    CREATIVES_S3_BUCKET_PATH = CREATIVES_S3_BUCKET_PATH?.replace(/^\/|\/$/g, '');
+
+    //Get cluster specific S3 CDN configuration from the given URL based on S3_CDN_MAP
+    let { CREATIVES_S3_BUCKET_PATH, CREATIVES_CDN_BASE_URL } = getClusterSpecificS3CdnConfigFromUrl(url);
 
     //Basic validations on data stored in local storage.
     if (
       typeof CREATIVES_CDN_QUALITY_CONFIG !== "object" ||
       Array.isArray(CREATIVES_CDN_QUALITY_CONFIG) ||
       CREATIVES_CDN_QUALITY_CONFIG === null ||
-      typeof CREATIVES_CDN_BASE_URL !== "string" || 
-      typeof CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX !== "string" || 
-      typeof CREATIVES_S3_BUCKET_PATH !== 'string'
+      !CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX ||
+      !CREATIVES_S3_BUCKET_PATH ||
+      !CREATIVES_CDN_BASE_URL
     )
       return url;
-  
+
+    //remove all leading and trailing forward slash with empty string, if leading/trailing forward slash is present in node env by mistake then url will not be correct hence removing them.
+    CREATIVES_S3_BUCKET_PATH = CREATIVES_S3_BUCKET_PATH?.replace(/^\/|\/$/g, '');
+
     const QUALITY = CREATIVES_CDN_QUALITY_CONFIG?.[channelName] || CREATIVES_CDN_QUALITY_CONFIG?.DEFAULT;
+    const [_, assetKey] = url.split(CREATIVES_S3_BUCKET_PATH);
   
     const regexWithExtension = new RegExp(HTTPS_STR + ANY_STR + CREATIVES_S3_BUCKET_PATH + ANY_STR + ALLOWED_EXTENSIONS_STR)
     const regexWithoutExtension = new RegExp(HTTPS_STR + ANY_STR + CREATIVES_S3_BUCKET_PATH + ANY_STR);
-
-    let skipTransformations = true;
-
+    
     if (
       !regexWithoutExtension.test(url) ||
       !CHANNEL_CONFIGS?.[channelName] ||
       (channelSubType && !CHANNEL_CONFIGS?.[channelName]?.[channelSubType]) ||
-      !CREATIVES_CDN_BASE_URL ||
-      !CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX ||
-      !QUALITY
+      !QUALITY ||
+      !assetKey
     )
       return url;
+    
+    let skipTransformations = true;
+    let applicableTransformations;
 
     //Skip transformations if extensions are not proper. Else consider transformations if available.
     if(regexWithExtension.test(url)){
       skipTransformations = false;
     }
-
-    const [, assetKey] = url.split(CREATIVES_S3_BUCKET_PATH);
-  
-    let newUrl = `${CREATIVES_CDN_BASE_URL}`;
-  
-    let applicableTransformations;
   
+    //Skip trasformations if transformation properties are not present in channel/subchannel.
     if (channelSubType) {
       applicableTransformations =
         CHANNEL_CONFIGS?.[channelName]?.[channelSubType]?.transformations;
     } else {
       applicableTransformations = CHANNEL_CONFIGS?.[channelName]?.transformations;
     }
+
+    cdnUrl = `${CREATIVES_CDN_BASE_URL}`;    
   
     if (!isEmpty(applicableTransformations) && !skipTransformations) {
+      cdnUrl += `/${CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX}/`;
   
-      newUrl += `/${CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX}/`;
-  
-      // Object.keys(applicableTransformations)?.forEach((transformationParam) => {
       forOwn(applicableTransformations, (transformationParamVal, transformationParam)=>{
         try {
           switch (transformationParam) {
             case "height":
               if (transformationParamVal === SPECIFIED && height) {
-                newUrl += `${transformationParam}=${height},`;
+                cdnUrl += `${transformationParam}=${height},`;
               } else if(transformationParamVal !== SPECIFIED && isNumber(transformationParamVal)) {
-                newUrl += `${transformationParam}=${transformationParamVal},`;
+                cdnUrl += `${transformationParam}=${transformationParamVal},`;
               }
               break;
             case "width":
               if (transformationParamVal === SPECIFIED && width) {
-                newUrl += `${transformationParam}=${width},`;
+                cdnUrl += `${transformationParam}=${width},`;
               } else if(transformationParamVal !== SPECIFIED && isNumber(transformationParamVal)) {
-                newUrl += `${transformationParam}=${transformationParamVal},`;
+                cdnUrl += `${transformationParam}=${transformationParamVal},`;
               }
               break;
             case "format":
               if(transformationParamVal){
-                newUrl += `${transformationParam}=${transformationParamVal},`;
+                cdnUrl += `${transformationParam}=${transformationParamVal},`;
               }
               break;
             case "quality":
@@ -234,12 +262,12 @@ export const getCdnUrl = ({
                   emailOverrideQuality &&
                   typeof emailOverrideQuality === "number"
                 ) {
-                  newUrl += `${transformationParam}=${emailOverrideQuality},`;
+                  cdnUrl += `${transformationParam}=${emailOverrideQuality},`;
                 } else {
-                  newUrl += `${transformationParam}=${QUALITY},`;
+                  cdnUrl += `${transformationParam}=${QUALITY},`;
                 }
               } else {
-                newUrl += `${transformationParam}=100,`;
+                cdnUrl += `${transformationParam}=100,`;
               }
               break;
           }
@@ -251,9 +279,8 @@ export const getCdnUrl = ({
         }
       })
     }
-    newUrl += `/${CREATIVES_S3_BUCKET_PATH}${assetKey}`;
-    return newUrl;
-
+    cdnUrl += `/${CREATIVES_S3_BUCKET_PATH}${assetKey}`;
+    return cdnUrl;
   }catch(e){
     Bugsnag.leaveBreadcrumb("Some exception occurred in getCdnUrl");
     Bugsnag.notify(e, (event) => {
@@ -389,6 +416,7 @@ export function removeAllCdnLocalStorageItems() {
     removeLocalStorageItem(CREATIVES_S3_BUCKET_PATH_KEY);
     removeLocalStorageItem(CREATIVES_CDN_OVERRIDE_DEFAULT_EMAIL_QUALITY_KEY);
     removeLocalStorageItem(CREATIVES_CDN_OVERRIDE_DEFAULT_EMAIL_QUALITY_MAPPING_KEY);
+    removeLocalStorageItem(S3_CDN_MAP_KEY);
   }catch(e){
     Bugsnag.leaveBreadcrumb("some error occured while deleting all keys for cdn");
     Bugsnag.notify(e, (event) => {
@@ -476,6 +504,13 @@ export function saveCdnConfigs(configsResponse) {
         CREATIVES_CDN_OVERRIDE_DEFAULT_EMAIL_QUALITY_MAPPING_KEY
       );
     }
+
+    if (configsResponse?.s3CdnMap) {
+      const strigifiedS3CdnMap = JSON.stringify(configsResponse?.s3CdnMap);
+      localStorage.setItem(S3_CDN_MAP_KEY, strigifiedS3CdnMap);
+    } else {
+      removeLocalStorageItem(S3_CDN_MAP_KEY);
+    }
   } catch (e) {
     Bugsnag.leaveBreadcrumb("some error while setting localstorage cdn configs");
     Bugsnag.notify(e, (event) => {
@@ -509,8 +544,8 @@ export function storeS3FileSizeDetails(url, fileSize) {
 export function getKeyFromS3Url(url) {
   if (typeof url !== "string") return url;
 
-  const bucketPathWithSlash =
-    getLocalStorageItem(CREATIVES_S3_BUCKET_PATH_KEY) + "/";
+  const { CREATIVES_S3_BUCKET_PATH }  = getClusterSpecificS3CdnConfigFromUrl(url);
+  const bucketPathWithSlash = CREATIVES_S3_BUCKET_PATH + "/";
   const [, key] = url.split(bucketPathWithSlash);
   return key;
 }
@@ -527,22 +562,20 @@ export function getKeyFromS3Url(url) {
  * 'isCdnUrl' refers that it is cdn url.
  */
 export function checkValidUrl(url){
+  const { CREATIVES_S3_BUCKET_PATH, CREATIVES_CDN_BASE_URL }  = getClusterSpecificS3CdnConfigFromUrl(url);
 
-  const CREATIVES_CDN_BASE_URL = getLocalStorageItem(CREATIVES_CDN_BASE_URL_KEY);
-
-  let CREATIVES_S3_BUCKET_PATH = getLocalStorageItem(CREATIVES_S3_BUCKET_PATH_KEY);
   const regexWithExtension = new RegExp(HTTPS_STR + ANY_STR + CREATIVES_S3_BUCKET_PATH + ANY_STR + ALLOWED_EXTENSIONS_STR)
-
+  
   //It is S3 url if tests with regex but doesn't contain cdn base url.
-
+  
   const isValidUrl = regexWithExtension.test(url);
   const isCdnUrl = url.includes(CREATIVES_CDN_BASE_URL);
   const isS3Url = isValidUrl && !isCdnUrl;
 
   return {
     isValidUrl,
-    isCdnUrl,
     isS3Url,
+    isCdnUrl,
   }
 }
 

package/utils/tests/cdnTransformation.test.js

@@ -15,6 +15,7 @@ beforeEach(() => {
       CREATIVES_CDN_BASE_URL: "https://storage.crm.n.content-cdn.io",
       CREATIVES_CDN_QUALITY_CONFIG:
         '{"EMAIL":75,"RCS":75,"VIBER":75,"WHATSAPP":75,"MOBILE_PUSH":75,"FACEBOOK":75,"LINE":75,"DEFAULT":75}',
+      S3_CDN_MAP: '{"crm-nightly-new-fileservice.s3.amazonaws.com":{"cdn_host":"storage.crm.n.content-cdn.io","bucket_path":"intouch_creative_assets"}, "crm-prod-new-fileservice.s3.amazonaws.com": { "cdn_host": "storage.crm.p.content-cdn.io", "bucket_path": "fileservice.p/intouch_creative_assets" }}',
     };
     return {
       getItem: function (key) {
@@ -99,27 +100,27 @@ describe("cdnTransformationTests", () => {
 
     it("Should replace s3 url with cdn url for email when bucket name is other than intouch_creatives_assets in case of prod.", () => {
       localStorage.setItem("CREATIVES_S3_BUCKET_PATH", "fileservice.in/intouch_creative_assets");
-      const TEST_S3_URL = `https://crm-nightly-new-fileservice.s3.amazonaws.com/fileservice.in/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
+      const TEST_S3_URL = `https://crm-prod-new-fileservice.s3.amazonaws.com/fileservice.p/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
       const GENERATED_CDN_URL = cdnUtils.getCdnUrl({
         url: TEST_S3_URL,
         channelName: "EMAIL",
         height: 100,
         width: 200,
       });
-      const EXPECTED_CDN_URL = `https://storage.crm.n.content-cdn.io/cdn-cgi/image/width=200,height=100,format=auto,quality=75,/fileservice.in/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
+      const EXPECTED_CDN_URL = `https://storage.crm.p.content-cdn.io/cdn-cgi/image/width=200,height=100,format=auto,quality=75,/fileservice.p/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
       expect(GENERATED_CDN_URL).toEqual(EXPECTED_CDN_URL);
     });
 
     it("Should replace s3 url with cdn url for email when bucket name is other than intouch_creatives_assets in case of prod. It should remove leading/trailing forward slashes from bucket path", () => {
       localStorage.setItem("CREATIVES_S3_BUCKET_PATH", "/fileservice.in/intouch_creative_assets/");
-      const TEST_S3_URL = `https://crm-nightly-new-fileservice.s3.amazonaws.com/fileservice.in/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
+      const TEST_S3_URL = `https://crm-prod-new-fileservice.s3.amazonaws.com/fileservice.p/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
       const GENERATED_CDN_URL = cdnUtils.getCdnUrl({
         url: TEST_S3_URL,
         channelName: "EMAIL",
         height: 100,
         width: 200,
       });
-      const EXPECTED_CDN_URL = `https://storage.crm.n.content-cdn.io/cdn-cgi/image/width=200,height=100,format=auto,quality=75,/fileservice.in/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
+      const EXPECTED_CDN_URL = `https://storage.crm.p.content-cdn.io/cdn-cgi/image/width=200,height=100,format=auto,quality=75,/fileservice.p/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
       expect(GENERATED_CDN_URL).toEqual(EXPECTED_CDN_URL);
     });