mod-build 4.0.91 → 4.0.92

package/tasks/add-editorconfig.js

@@ -1,16 +1,16 @@
 import { defaultSettings } from '../src/data/config.js';
 import { promises as fs } from 'node:fs';
-import axios from 'axios';
 
 async function addEditorConfig(defaultSettings) {
     try {
-        const response = await axios.get(`https://${defaultSettings.nodeEnv}/quote/resources/mod-site/configurations/editorconfig.editorconfig`);
+        const response = await fetch(`https://${defaultSettings.nodeEnv}/quote/resources/mod-site/configurations/editorconfig.editorconfig`);
 
         if (response.status !== 200) {
             throw new Error(`${response.status}: Error while fetching editorconfig`);
         }
 
-        await fs.writeFile('.editorconfig', response.data, 'utf8');
+        const text = await response.text();
+        await fs.writeFile('.editorconfig', text, 'utf8');
     } catch (error) {
         console.error('Error occurred:', error.message);
     }

package/tasks/get-default-trade-questions.js

@@ -1,6 +1,5 @@
 /* globals Promise */
 import merge from 'lodash.merge';
-import axios from 'axios';
 import { defaultSettings } from '../src/data/config.js';
 
 function mergeDefaultTradeQuestionsConfigOnSteps(config, steps) {
@@ -182,25 +181,26 @@ export default async function(config) {
 		const tradeQuestionsURL = `https://${defaultSettings.nodeEnv}/${resourcePath}/${trade?.replace(/\s/g, '_')}.json`;
 		await new Promise(async (resolve) => {
 			console.log(`Started fetching common questions config...\n ${commonQuestionsURL}`);
-			await axios.get(commonQuestionsURL)
+			await fetch(commonQuestionsURL)
 				.then(async (resp) => {
 					if (resp.status !== 200) {
 						throw new Error(`${resp.status}: Error while fetching ${commonQuestionsURL}`);
 					}
 
-					commonQuestions = { ...commonQuestions, ...resp.data };
+					const commonData = await resp.json();
+					commonQuestions = { ...commonQuestions, ...commonData };
 
 					console.log('Finished fetching common questions config...');
 					console.log(`Started fetching ${trade} questions config...\n ${tradeQuestionsURL}`);
-					await axios.get(tradeQuestionsURL)
-						.then((response) => {
-							if (resp.status !== 200) {
-								throw new Error(`${resp.status}: Error while fetching ${tradeQuestionsURL}`);
+					await fetch(tradeQuestionsURL)
+						.then(async (response) => {
+							if (response.status !== 200) {
+								throw new Error(`${response.status}: Error while fetching ${tradeQuestionsURL}`);
 							}
 
 							console.log(`Finished fetching ${trade} questions config...`);
 
-							const steps = response.data;
+							const steps = await response.json();
 							steps.OwnHome = commonQuestions.OwnHome;
 							steps.BuyTimeframe = commonQuestions.BuyTimeframe;
 

package/tasks/grab-b2b-data.js

@@ -1,16 +1,11 @@
 import { defaultSettings } from '../src/data/config.js';
-import axios from 'axios';
-import { createWriteStream } from 'node:fs';
-import * as stream from 'node:stream';
-import { promisify } from 'node:util';
+import { createRetryFetch } from '../src/scripts/retry-fetch.js';
 import fs from 'node:fs';
-import { responseInterceptor } from '../src/scripts/retry-axios.js';
+import { promises as fsPromises } from 'node:fs';
 
-const axiosInstance = axios.create();
-const axiosResponseInterceptor = responseInterceptor(axiosInstance);
+const fetchWithRetry = createRetryFetch();
 
 function streamToDestination(inputPath, destPath, fileName) {
-	const finished = promisify(stream.finished);
 	const url = `https://${defaultSettings.nodeEnv}${inputPath}`;
 
 	return new Promise(resolve => {
@@ -18,33 +13,19 @@ function streamToDestination(inputPath, destPath, fileName) {
 			fs.mkdirSync(`${destPath}`, { recursive: true });
 		}
 
-		const writer = createWriteStream(`${destPath}${fileName}`);
-		const options = {
-			url,
-			method: 'get',
-			responseType: 'stream',
-		};
+		const filePath = `${destPath}${fileName}`;
 
-		// Collect data chunks to parse JSON
-		let jsonData = '';
-
-		axiosInstance(options).then(resp => {
+		fetchWithRetry(url).then(async resp => {
 			if (resp.status !== 200) {
 				throw new Error(`${resp.status}: Error while fetching ${url}`);
 			}
 
-			// Capture data while streaming to file
-			resp.data.on('data', chunk => {
-				jsonData += chunk.toString();
-			});
-
-			resp.data.pipe(writer);
+			const text = await resp.text();
+			await fsPromises.writeFile(filePath, text, 'utf8');
 			console.log(`${url} created...`);
-			return finished(writer);
-		}).then(() => {
-			// Parse the JSON data we collected
+
 			try {
-				const parsedData = JSON.parse(jsonData);
+				const parsedData = JSON.parse(text);
 				resolve(parsedData);
 			} catch (error) {
 				console.error(`Error parsing JSON from ${url}:`, error.message);
@@ -53,8 +34,6 @@ function streamToDestination(inputPath, destPath, fileName) {
 		}).catch(error => {
 			console.error(`Error fetching ${url}:`, error.message);
 			process.exit(1);
-		}).finally(() => {
-			axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 		});
 	});
 }

package/tasks/grab-cdn.js

@@ -1,14 +1,12 @@
 import { defaultSettings } from '../src/data/config.js';
-import axios from 'axios';
+import { createRetryFetch, streamResponseToWriter } from '../src/scripts/retry-fetch.js';
 import { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
 import { promisify } from 'node:util';
 import fs from 'node:fs';
 import path from 'node:path';
-import { responseInterceptor } from '../src/scripts/retry-axios.js';
 
-const axiosInstance = axios.create();
-const axiosResponseInterceptor = responseInterceptor(axiosInstance);
+const fetchWithRetry = createRetryFetch();
 
 async function duplicateHtmlFilestoHbs(externalResources) {
 	for (const inputPath in externalResources) {
@@ -42,17 +40,12 @@ function streamToDestination(inputPath, destPath, fileName) {
 			resolve();
 		} else {
 			const writer = createWriteStream(`${destPath}${fileName}`);
-			const options = {
-				url,
-				method: 'get',
-				responseType: 'stream',
-			};
 
-			axiosInstance(options).then(resp => {
+			fetchWithRetry(url).then(async resp => {
 				if (resp.status !== 200) {
 					throw new Error(`${resp.status}: Error while fetching ${url}`);
 				}
-				resp.data.pipe(writer);
+				await streamResponseToWriter(resp, writer);
 				console.log(`${destPath}${fileName} created...`);
 				return finished(writer);
 			}).then(() => {
@@ -60,8 +53,6 @@ function streamToDestination(inputPath, destPath, fileName) {
 			}).catch(error => {
 				console.error(error);
 				process.exit(1);
-			}).finally(() => {
-				axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 			});
 		}
 	});

package/tasks/grab-code-review-rules.js

@@ -1,18 +1,19 @@
 import { defaultSettings } from '../src/data/config.js';
 import { promises as fs } from 'node:fs';
-import axios from 'axios';
 
 async function grabRules() {
 	try {
 		const url = `https://${defaultSettings.nodeEnv}/quote/resources/mod-site/code-review-rules/review-agent.md`;
-		const response = await axios.get(url);
+		const response = await fetch(url);
 
 		if (response.status !== 200) {
 			throw new Error(`${response.status}: Error while fetching review-agent.md`);
 		}
 
+		const text = await response.text();
+
 		await fs.mkdir('.rovodev', { recursive: true });
-		await fs.writeFile('.rovodev/.review-agent.md', response.data, 'utf8');
+		await fs.writeFile('.rovodev/.review-agent.md', text, 'utf8');
 	} catch (error) {
 		console.error('Error occurred:', error.message);
 	}

package/tasks/grab-form-helpers.js

@@ -1,16 +1,13 @@
 import { defaultSettings } from '../src/data/config.js';
-import axios from 'axios';
+import { createRetryFetch, streamResponseToWriter } from '../src/scripts/retry-fetch.js';
 import { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
 import { promisify } from 'node:util';
 import fs from 'node:fs';
-import { responseInterceptor } from '../src/scripts/retry-axios.js';
 
 const resourcePath = 'quote/resources/mod-form/form';
-const axiosInstance = axios.create();
-const helpersAxiosInstance = axios.create();
-const axiosResponseInterceptor = responseInterceptor(axiosInstance);
-const helpersAxiosResponseInterceptor = responseInterceptor(helpersAxiosInstance);
+const fetchWithRetryStream = createRetryFetch();
+const fetchWithRetryList = createRetryFetch();
 
 // helper to allow us to define an "end" event to multiple streams
 const streamToDestination = (destPath, fileName) => {
@@ -32,18 +29,13 @@ const streamToDestination = (destPath, fileName) => {
 		if (fs.existsSync(`${folderPath}/${fileName}`)) {
 			resolve();
 		} else {
-			const writer = createWriteStream(`${folderPath}/${fileName}`)
-			const options = {
-				url,
-				method: 'get',
-				responseType: 'stream'
-			};
+			const writer = createWriteStream(`${folderPath}/${fileName}`);
 
-			axiosInstance(options).then(resp => {
+			fetchWithRetryStream(url).then(async resp => {
 				if (resp.status !== 200) {
 					throw new Error(`${resp.status}: Error while fetching ${url}`);
 				}
-				resp.data.pipe(writer);
+				await streamResponseToWriter(resp, writer);
 				console.log(`${destPath}${fileName} created...`);
 				return finished(writer);
 			}).then(() => {
@@ -51,8 +43,6 @@ const streamToDestination = (destPath, fileName) => {
 			}).catch(error => {
 				console.error(error);
 				process.exit(1);
-			}).finally(() => {
-				axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 			});
 		}
 	});
@@ -61,24 +51,18 @@ const streamToDestination = (destPath, fileName) => {
 async function getHelpers() {
 	let helpers = [];
 	await new Promise(resolve => {
-		const options = {
-			url: `https://${defaultSettings.nodeEnv}/${resourcePath}/chunks.txt`,
-			method: 'get'
-		}
+		const url = `https://${defaultSettings.nodeEnv}/${resourcePath}/chunks.txt`;
 
-		helpersAxiosInstance(options).then(resp => {
+		fetchWithRetryList(url).then(async resp => {
 			if (resp.status !== 200) {
-				throw new Error(`${resp.status}: Error while fetching ${options.url}`);
+				throw new Error(`${resp.status}: Error while fetching ${url}`);
 			}
-			helpers = resp.data.split('\n');
-			resolve();
-		}).then(() => {
+			const text = await resp.text();
+			helpers = text.split('\n');
 			resolve();
 		}).catch(error => {
 			console.error(error);
 			resolve();
-		}).finally(() => {
-			helpersAxiosInstance.interceptors.response.eject(helpersAxiosResponseInterceptor);
 		});
 	});
 

package/tasks/grab-global-fonts.js

@@ -1,11 +1,10 @@
 import { defaultSettings } from '../src/data/config.js';
-import axios from 'axios';
+import { createRetryFetch, streamResponseToWriter } from '../src/scripts/retry-fetch.js';
 import { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
 import { promisify } from 'node:util';
 import fs from 'node:fs';
 import path from 'node:path';
-import { responseInterceptor } from '../src/scripts/retry-axios.js';
 import addFilesToGitignore from './add-files-to-gitignore.js';
 
 // Font variants and extensions to download for each font
@@ -13,8 +12,7 @@ const fontVariants = ['regular', 'bold'];
 const fontExtensions = ['ttf', 'woff2'];
 const finished = promisify(stream.finished);
 
-const axiosInstance = axios.create();
-responseInterceptor(axiosInstance);
+const fetchWithRetry = createRetryFetch();
 
 const getFontPath = (...parts) => path.join(
 	defaultSettings.publicFolder,
@@ -32,8 +30,8 @@ const directoryHasItems = (dirPath) => {
 const getFontDownloadUrls = async (fontName) => {
 	try {
 		const url = `https://gwfh.mranftl.com/api/fonts/${fontName}?subsets=latin`;
-		const response = await axiosInstance.get(url);
-		const fontData = response.data;
+		const response = await fetchWithRetry(url);
+		const fontData = await response.json();
 		
 		if (!fontData?.variants) {
 			throw new Error('Invalid font data received');
@@ -77,11 +75,7 @@ const downloadFontFile = async (fontName, variant, extension, downloadUrl) => {
 	}
 
 	try {
-		const resp = await axiosInstance({
-			url: downloadUrl,
-			method: 'get',
-			responseType: 'stream'
-		});
+		const resp = await fetchWithRetry(downloadUrl);
 
 		if (resp.status !== 200) {
 			throw new Error(`${resp.status}: Error while fetching ${downloadUrl}`);
@@ -89,7 +83,7 @@ const downloadFontFile = async (fontName, variant, extension, downloadUrl) => {
 
 		console.log(`Downloading ${filePath}...`);
 		const writer = createWriteStream(filePath);
-		resp.data.pipe(writer);
+		await streamResponseToWriter(resp, writer);
 		await finished(writer);
 		console.log(`${filePath} downloaded successfully`);
 	} catch (error) {
@@ -145,4 +139,4 @@ export default async function(config) {
 
 	await Promise.all(fontNames.map(downloadFont));
 	await updateGitignore(fontNames);
-}
+}

package/tasks/grab-jsdoc.js

@@ -1,17 +1,14 @@
 import { defaultSettings } from '../src/data/config.js';
-import axios from 'axios';
+import { createRetryFetch, streamResponseToWriter } from '../src/scripts/retry-fetch.js';
 import fs, { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
 import { promisify } from 'node:util';
 import path from 'node:path';
-import { responseInterceptor } from '../src/scripts/retry-axios.js';
 import addFilesToGitignore from './add-files-to-gitignore.js';
 
 const resourcePath = 'quote/resources/mod-form';
-const axiosInstance = axios.create();
-const jsdocAxiosInstance = axios.create();
-const axiosResponseInterceptor = responseInterceptor(axiosInstance);
-const jsdocResponseInterceptor = responseInterceptor(jsdocAxiosInstance);
+const fetchWithRetryStream = createRetryFetch();
+const fetchWithRetryJson = createRetryFetch();
 
 // Helper to stream a JSDoc file to the destination directory
 const streamToDestination = async (filePath) => {
@@ -39,56 +36,40 @@ const streamToDestination = async (filePath) => {
 	}
 
 	const writer = createWriteStream(fileFullPath);
-	const options = {
-		url,
-		method: 'get',
-		responseType: 'stream'
-	};
 
 	try {
-		const resp = await axiosInstance(options);
+		const resp = await fetchWithRetryStream(url);
 
 		if (resp.status !== 200) {
 			throw new Error(`${resp.status}: Error while fetching ${url}`);
 		}
 
-		resp.data.pipe(writer);
+		await streamResponseToWriter(resp, writer);
 		console.log(`${fileFullPath} created...`);
 		await finished(writer);
 	} catch (error) {
 		console.error(error);
 		process.exit(1);
-	} finally {
-		axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 	}
 }
 
 async function getJSDocFiles() {
 	// Add cachebuster to avoid server/browser caching issues
 	const cachebuster = Math.round(Date.now() / 1000);
-	const options = {
-		url: `https://${defaultSettings.nodeEnv}/${resourcePath}/jsdoc.json?cb=${cachebuster}`,
-		method: 'get'
-	}
+	const url = `https://${defaultSettings.nodeEnv}/${resourcePath}/jsdoc.json?cb=${cachebuster}`;
 
 	try {
-		const resp = await jsdocAxiosInstance(options);
+		const resp = await fetchWithRetryJson(url);
 
 		if (resp.status !== 200) {
-			throw new Error(`${resp.status}: Error while fetching ${options.url}`);
-		}
-
-		// axios may parse JSON automatically, so check if it's already an object
-		if (typeof resp.data === 'string') {
-			return JSON.parse(resp.data);
+			throw new Error(`${resp.status}: Error while fetching ${url}`);
 		}
 
-		return resp.data;
+		const text = await resp.text();
+		return JSON.parse(text);
 	} catch (error) {
 		console.error(error);
 		throw error;
-	} finally {
-		jsdocAxiosInstance.interceptors.response.eject(jsdocResponseInterceptor);
 	}
 }
 
@@ -113,4 +94,3 @@ export default async function grabJSDoc() {
 	];
 	await addFilesToGitignore(gitignoreFiles, 'JSDoc generated files');
 }
-

package/tasks/grab-shared-components.js

@@ -1,15 +1,13 @@
 import { defaultSettings } from '../src/data/config.js';
-import axios from 'axios';
+import { createRetryFetch, streamResponseToWriter } from '../src/scripts/retry-fetch.js';
 import { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
 import { promisify } from 'node:util';
 import fs from 'node:fs';
-import { responseInterceptor } from '../src/scripts/retry-axios.js';
 
 const resourcePath = 'quote/resources/mod-site';
 
-const axiosInstance = axios.create();
-const axiosResponseInterceptor = responseInterceptor(axiosInstance);
+const fetchWithRetry = createRetryFetch();
 
 const streamSharedCompsToDestination = (defaultSettings, folder, fileName) => {
 	const finished = promisify(stream.finished);
@@ -27,24 +25,20 @@ const streamSharedCompsToDestination = (defaultSettings, folder, fileName) => {
 			resolve();
 		} else {
 			const writer = createWriteStream(`${folderPath}/${fileName}`);
-			const options = {
-				url: `https://${defaultSettings.nodeEnv}/${resourcePath}/${folder}/${fileName}`,
-				method: 'get',
-				responseType: 'stream'
-			};
+			const url = `https://${defaultSettings.nodeEnv}/${resourcePath}/${folder}/${fileName}`;
 
-			axios(options).then(resp => {
+			fetch(url).then(async resp => {
 				if (resp.status !== 200) {
-					throw new Error(`${resp.status}: Error while fetching ${options.url}`);
+					throw new Error(`${resp.status}: Error while fetching ${url}`);
 				}
 				console.log(`${folderPath}/${fileName} created...`);
-				resp.data.pipe(writer);
+				await streamResponseToWriter(resp, writer);
 				return finished(writer);
 			}).then(() => {
 				resolve();
 			}).catch(error => {
 				console.error(error);
-				throw new Error(`${error?.response?.statusText} [${error?.status}]: Error while fetching ${options.url}`);
+				throw new Error(`${error.message}: Error while fetching ${url}`);
 			});
 		}
 	});
@@ -58,12 +52,12 @@ const getListOfSharedComponents = (defaultSettings, componentFolders) => {
 		}
 
 		return new Promise(resolve => {
-			axiosInstance.get(`https://${defaultSettings.nodeEnv}/${resourcePath}/${folder}/all.json`)
-				.then(resp => {
+			fetchWithRetry(`https://${defaultSettings.nodeEnv}/${resourcePath}/${folder}/all.json`)
+				.then(async resp => {
 					if (resp.status !== 200) {
 						throw new Error(`${resp.status}: Error while fetching ${folder}/all.json`);
 					}
-					const listOfComponents = resp.data;
+					const listOfComponents = await resp.json();
 					const componentPromises = listOfComponents.map(resource => {
 						return streamSharedCompsToDestination(defaultSettings, folder, `${resource}`);
 					});
@@ -73,9 +67,6 @@ const getListOfSharedComponents = (defaultSettings, componentFolders) => {
 				.catch(err => {
 					console.log(defaultSettings.nodeEnv);
 					throw new Error(`Error while fetching ${folder}/all.json: ${err.message}`);
-				})
-				.finally(() => {
-					axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 				});
 		});
 	});

package/tasks/grab-shared-scripts.js

@@ -1,5 +1,5 @@
 import { defaultSettings } from '../src/data/config.js';
-import axios from 'axios';
+import { createRetryFetch, streamResponseToWriter } from '../src/scripts/retry-fetch.js';
 import { createWriteStream } from 'node:fs';
 import * as stream from 'node:stream';
 import { promisify } from 'node:util';
@@ -9,8 +9,6 @@ import tap from 'gulp-tap';
 import hash from 'gulp-hash';
 import replace from 'gulp-replace';
 import { getFileFromURL } from '../src/scripts/utils.js';
-import { responseInterceptor } from '../src/scripts/retry-axios.js';
-
 let fileNames = {};
 let componentFolderPath = '';
 let replacementFunctions = [];
@@ -18,8 +16,7 @@ let replacementFunctions = [];
 let pathSubdirectory = '';
 let useAccessibleComponents = false;
 
-const axiosInstance = axios.create();
-const axiosResponseInterceptor = responseInterceptor(axiosInstance);
+const fetchWithRetry = createRetryFetch();
 
 function replaceHeadScripts(gulp, defaultSettings) {
 	const resourcePath = '/resources/scripts';
@@ -225,18 +222,14 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 		if (fs.existsSync(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}/${file}`)) {
 			resolve();
 		} else {
-			const options = {
-				url: `https://${task.config.defaultSettings.nodeEnv}/${resourcePath}/${url}`,
-				method: 'get',
-				responseType: 'stream'
-			}
-			axiosInstance(options).then(resp => {
+			const resourceUrl = `https://${task.config.defaultSettings.nodeEnv}/${resourcePath}/${url}`;
+			fetchWithRetry(resourceUrl).then(async resp => {
 				if (resp.status !== 200) {
 					throw new Error(`${resp.status}: Error while fetching ${url}`);
 				}
 
 				const writer = createWriteStream(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}/${file}`);
-				resp.data.pipe(writer);
+				await streamResponseToWriter(resp, writer);
 				console.log(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}/${file} created...`);
 				return finished(writer);
 			})
@@ -268,17 +261,14 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 				const mapFileUrl = `${url}.map`;
    				const mapFile = getFileFromURL(mapFileUrl);
 
-				return axiosInstance({
-					url: `https://${task.config.defaultSettings.nodeEnv}/${resourcePath}/${mapFileUrl}`,
-					method: 'get',
-					responseType: 'stream'
-				}).then(resp => {
+				const mapUrl = `https://${task.config.defaultSettings.nodeEnv}/${resourcePath}/${mapFileUrl}`;
+				return fetchWithRetry(mapUrl).then(async resp => {
 					if (resp.status !== 200) {
 						throw new Error(`${resp.status}: Error while fetching map file ${mapFileUrl}`);
 					}
 
 					const mapWriter = createWriteStream(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}/${mapFile}`);
-					resp.data.pipe(mapWriter);
+					await streamResponseToWriter(resp, mapWriter);
 					console.log(`${task.config.defaultSettings.publicFolder}/resources/${config.dest}/${mapFile} created...`);
 					return finished(mapWriter);
 				});
@@ -299,9 +289,6 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 			})
 			.catch((error) => {
 				console.error('Error:', error);
-			})
-			.finally(() => {
-				axiosInstance.interceptors.response.eject(axiosResponseInterceptor);
 			});
 		}
 	})