mod-build 4.0.91 → 4.0.92

package/tasks/templates.js

@@ -1,21 +1,17 @@
-import axios from 'axios';
 import footer from '../src/data/footer.js';
 import fs from 'node:fs';
 import merge from 'lodash.merge';
 import cloneDeep from 'lodash.clonedeep';
-import { responseInterceptor } from '../src/scripts/retry-axios.js';
+import { createRetryFetch } from '../src/scripts/retry-fetch.js';
 
 import { defaultSettings } from '../src/data/config.js';
 
 import setupDevOpsTrackingId from './setupDevOpsTrackingId.js';
 import addSeasonalchanges from './addSeasonalchanges.js';
 
-const axiosInstance = axios.create();
-const tcpaAxiosInstance = axios.create();
-const consentCaptureAxiosInstance = axios.create();
-const axiosResponseInterceptor = responseInterceptor(axiosInstance);
-const tcpaAxiosResponseInterceptor = responseInterceptor(tcpaAxiosInstance);
-const consentCaptureAxiosResponseInterceptor = responseInterceptor(consentCaptureAxiosInstance);
+const fetchWithRetryDefault = createRetryFetch();
+const fetchWithRetryTcpa = createRetryFetch();
+const fetchWithRetryConsent = createRetryFetch();
 
 async function mergeDefaultFormFieldConfigOnSteps(defaultConfig, data, parentConfig) {
 	if (!data || typeof data !== 'object') {
@@ -75,19 +71,17 @@ const getDefaultFormFieldConfig = async (config, folder = 'accessible-components
 	console.log('Starting fetch-default-form-config: ');
 
 	await new Promise((resolve) => {
-		axiosInstance.get(`https://${defaultSettings.nodeEnv}/quote/resources/mod-site/${folder}/steps/defaultFormFieldConfig.json`)
+		fetchWithRetryDefault(`https://${defaultSettings.nodeEnv}/quote/resources/mod-site/${folder}/steps/defaultFormFieldConfig.json`)
 			.then(async resp => {
 				if (resp.status !== 200) {
 					throw new Error(`${resp.status}:  Error while fetching ${folder}/defaultFormFieldConfig.json`);
 				}
-				const defaultConfig = resp.data;
+				const defaultConfig = await resp.json();
 				mergeDefaultFormFieldConfigOnSteps(defaultConfig, config, config);
 				resolve();
 			}).catch(error => {
 				console.error(error);
 				process.exit(1);
-			}).finally(() => {
-				axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 			});
 	});
 };
@@ -103,21 +97,15 @@ const fetchTcpaFromSitegenie = async (config, tempConfig, pathSubdirectory) => {
 
 	const url = `${apiEnv}coreg/getTCPAConsent?website=${website}&service=${service?.replace(/\s/g, '_')}&affiliateKey=${affiliateKey}&c_level=${c_level}`;
 
-	const options = {
-		url,
-		method: 'get',
-		timeout: 2000,
-	};
-
 	console.log('Starting fetch-tcpa-from-sitegenie: ', url);
 	return new Promise((resolve) => {
-		tcpaAxiosInstance(options)
+		fetchWithRetryTcpa(url, { signal: AbortSignal.timeout(2000) })
 			.then(async resp => {
 				if (resp.status !== 200) {
 					throw new Error(`${resp.status}: Error while fetching TCPA`);
 				}
 
-				const responseJson = resp.data;
+				const responseJson = await resp.json();
 				console.log('SiteGenie TCPA response successful: ', responseJson);
 
 				let finalTCPA = await responseJson.tcpa.replace(/QuinStreet/g, 'Modernize');
@@ -138,7 +126,7 @@ const fetchTcpaFromSitegenie = async (config, tempConfig, pathSubdirectory) => {
 				resolve(finalTCPA);
 			})
 			.catch(error => {
-				if (error.code === 'ECONNABORTED') {
+				if (error?.name === 'AbortError' || error?.name === 'TimeoutError') {
 					console.log('Request timed out...using default TCPA language');
 				} else {
 					console.log('Response error...using default TCPA language');
@@ -162,8 +150,6 @@ const fetchTcpaFromSitegenie = async (config, tempConfig, pathSubdirectory) => {
 
 				tempConfig.tcpaText = defaultTcpa.tcpaText;
 				resolve(error);
-			}).finally(() => {
-				tcpaAxiosInstance.interceptors.response.eject(tcpaAxiosResponseInterceptor);
 			});
 	});
 };
@@ -193,13 +179,13 @@ function findVendorKey(config) {
 }
 
 async function embedBrandedDisplayName(apiUrl, consentCaptureObject, key, service) {
-	let resp = '';
-	const getBrandedDisplayName = await axios.get(apiUrl);
+	const getBrandedDisplayName = await fetch(apiUrl);
 	if (getBrandedDisplayName.status !== 200) {
-		throw new Error(`${resp.status}: Error while getting branded display name from HS Form Service`);
+		throw new Error(`${getBrandedDisplayName.status}: Error while getting branded display name from HS Form Service`);
 	}
 
-	const brandedDisplayName = getBrandedDisplayName.data.data[key];
+	const body = await getBrandedDisplayName.json();
+	const brandedDisplayName = body.data[key];
 	consentCaptureObject.brandedConsentCapture.tcpaStart = consentCaptureObject.brandedConsentCapture.tcpaStart.replace(/<span data-branded-consent><\/span>/g, `<span data-branded-consent>${brandedDisplayName}</span>`);
 	consentCaptureObject.brandedIncludeExclusivelyConsentCapture.tcpaStart = consentCaptureObject.brandedIncludeExclusivelyConsentCapture.tcpaStart.replace(/<span data-branded-consent><\/span>/g, `<span data-branded-consent>${brandedDisplayName}</span>`);
 	consentCaptureObject.brandedIncludeServiceConsentCapture.tcpaStart = consentCaptureObject.brandedIncludeServiceConsentCapture.tcpaStart.replace(/<span data-branded-consent><\/span>/g, `<span data-branded-consent>${brandedDisplayName}</span>`).replace(/<span data-service><\/span>/g, `<span data-service>${service}</span>`);
@@ -207,20 +193,22 @@ async function embedBrandedDisplayName(apiUrl, consentCaptureObject, key, servic
 
 const getConsentCaptureLanguage = async function(config, tempConfig) {
 	await new Promise((resolve) => {
-		consentCaptureAxiosInstance.get(`https://${defaultSettings.nodeEnv}/quote/resources/mod-site/consent-capture/tcpa.json`)
+		fetchWithRetryConsent(`https://${defaultSettings.nodeEnv}/quote/resources/mod-site/consent-capture/tcpa.json`)
 			.then(async resp => {
 				if (resp.status !== 200) {
 					throw new Error(`${resp.status}: Error while fetching tcpa.json`);
 				}
 
-				let consentCaptureObject = resp.data,
+				let consentCaptureObject = await resp.json(),
 					service = config.service ? config.service.toLowerCase().replace('_', ' ') : config.primary_trade.toLowerCase().replace('_', ' ');
 
-				const brandedSiteIdentifiers = await axios.get(`https://${defaultSettings.nodeEnv}/quote/resources/mod-site/data/branded-site-identifiers.json`);
-				if (brandedSiteIdentifiers.status !== 200) {
-					throw new Error(`${resp.status}: Error while fetching branded-site-identifiers.json`);
+				const brandedSiteIdentifiersResp = await fetch(`https://${defaultSettings.nodeEnv}/quote/resources/mod-site/data/branded-site-identifiers.json`);
+				if (brandedSiteIdentifiersResp.status !== 200) {
+					throw new Error(`${brandedSiteIdentifiersResp.status}: Error while fetching branded-site-identifiers.json`);
 				}
 
+				const brandedSiteIdentifiersData = await brandedSiteIdentifiersResp.json();
+
 				if (config.isBranded) {
 					const websiteName = config.website_name.toLowerCase(),
 						companyName = config.company_name,
@@ -228,13 +216,13 @@ const getConsentCaptureLanguage = async function(config, tempConfig) {
 
 					let apiUrl = '';
 
-					if (brandedSiteIdentifiers.data[websiteName] && (brandedSiteIdentifiers.data[websiteName].publicKey || brandedSiteIdentifiers.data[websiteName][companyName] && brandedSiteIdentifiers.data[websiteName][companyName].publicKey)) {
-						const publicKey = brandedSiteIdentifiers.data[websiteName][companyName] ? brandedSiteIdentifiers.data[websiteName][companyName].publicKey : brandedSiteIdentifiers.data[websiteName].publicKey;
+					if (brandedSiteIdentifiersData[websiteName] && (brandedSiteIdentifiersData[websiteName].publicKey || brandedSiteIdentifiersData[websiteName][companyName] && brandedSiteIdentifiersData[websiteName][companyName].publicKey)) {
+						const publicKey = brandedSiteIdentifiersData[websiteName][companyName] ? brandedSiteIdentifiersData[websiteName][companyName].publicKey : brandedSiteIdentifiersData[websiteName].publicKey;
 
 						apiUrl = `${apiDomain}utils/vendor-display-name?publicKey=${encodeURIComponent(publicKey)}`;
-						const getBrandedDisplayName = await axios.get(apiUrl);
+						const getBrandedDisplayName = await fetch(apiUrl);
 						if (getBrandedDisplayName.status !== 200) {
-							throw new Error(`${resp.status}: Error while getting branded display name from HS Form Service`);
+							throw new Error(`${getBrandedDisplayName.status}: Error while getting branded display name from HS Form Service`);
 						}
 
 						await embedBrandedDisplayName(apiUrl, consentCaptureObject, publicKey, service);
@@ -245,11 +233,12 @@ const getConsentCaptureLanguage = async function(config, tempConfig) {
 							profileApiUrl = `${profileApiDomain}v1/client-profiles/profiles?filters[matches][]=${vendorKey},QMP`;
 
 						if (vendorKey !== null) {
-							const getBrandedProfileId = await axios.get(profileApiUrl);
+							const getBrandedProfileId = await fetch(profileApiUrl);
 							if (getBrandedProfileId.status !== 200) {
-								throw new Error(`${resp.status}: Error while getting branded display name from HS Form Service`);
+								throw new Error(`${getBrandedProfileId.status}: Error while getting branded display name from HS Form Service`);
 							}
-							const brandedProfileId = getBrandedProfileId.data.data[0].profileId;
+							const profileBody = await getBrandedProfileId.json();
+							const brandedProfileId = profileBody.data[0].profileId;
 							apiUrl = `${apiDomain}utils/vendor-display-name?profileId=${brandedProfileId}`;
 
 							await embedBrandedDisplayName(apiUrl, consentCaptureObject, brandedProfileId, service);
@@ -262,8 +251,6 @@ const getConsentCaptureLanguage = async function(config, tempConfig) {
 			}).catch(error => {
 				console.error(error);
 				process.exit(1);
-			}).finally(() => {
-				consentCaptureAxiosInstance.interceptors.response.eject(consentCaptureAxiosResponseInterceptor);
 			});
 	});
 };

package/src/scripts/retry-axios.js

@@ -1,23 +0,0 @@
-export const responseInterceptor = (instance) => {
-	let retryCount = 0; 
-
-	const interceptorId = instance.interceptors.response.use(
-		(response) => {
-			return response;
-		},
-		(error) => {
-			console.error('Response failed:', error.response.status);
-
-			// Retry the request if the error code is 4xx or 5xx and retry count is less than 2
-			if (error.response && error.response.status >= 400 && error.response.status < 600 && retryCount < 2) {
-				retryCount++;
-				console.log('Retrying request...', retryCount);
-				return instance(error.config);
-			}
-
-			return Promise.reject(error);
-		}
-	);
-
-	return interceptorId;
-};