hdoc-tools 0.36.1 → 0.37.0

package/hdoc-validate.js

@@ -448,12 +448,18 @@ const e = require("express");
 		return returnPaths;
 	}
 
-	const checkLinks = async (source_path, htmlFile, links, hdocbook_config, hdocbook_project, browser) => {
+	const checkLinks = async (source_path, htmlFile, links, hdocbook_config, hdocbook_project, browser, global_links_checked) => {
 		const markdown_paths = getMDPathFromHtmlPath(htmlFile);
 		const markdown_content = fs.readFileSync(markdown_paths.markdownPath, 'utf8');
 
+		// Use Puppeteer to validate link address works
+		const page = await browser.newPage();
+
 		for (let i = 0; i < links.length; i++) {
 			// Validate that link is a valid URL first
+			console.log(` - ${links[i]}`);
+			if (global_links_checked.includes(links[i])) continue;
+			global_links_checked.push(links[i]);
 			const valid_url = hdoc.valid_url(links[i]);
 			if (!valid_url) {
 				// Could be a relative path, check
@@ -559,9 +565,6 @@ const e = require("express");
 
 				try {
 
-					// Use Puppeteer to validate link address works
-					const page = await browser.newPage();
-
 					// Set a user-agent to mimic a real browser
 					await page.setUserAgent('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36');
 
@@ -615,9 +618,6 @@ const e = require("express");
 						throw error;
 					}
 
-					// Close the headless browser tab
-					page.close();
-
 				} catch (e) {
 					let error_message;
 					if (e instanceof AggregateError) {
@@ -633,6 +633,8 @@ const e = require("express");
 				}
 			}
 		}
+		// Close the headless browser tab
+		page.close();
 	};
 
 	const checkHostExistsInDNS = async (hostname) => {
@@ -1028,42 +1030,46 @@ const e = require("express");
 			warnings[html_to_validate[i].relativePath] = [];
 			htmlPromiseArray.push(html_to_validate[i]);
 		}
-		await Promise.all(
-			htmlPromiseArray.map(async (file) => {
-				// Check for British spellings in static HTML content
-				if (
-					!md_files_spellchecked[
-						file.relativePath.replace(`.${file.extension}`, "")
-					]
-				) {
-					const exclusions = await spellcheckContent(file, exclude_spellcheck);
-					if (gen_exclude && exclusions.length > 0)
-						excl_output.push({
-							document_path: file.relativePath.replace(
-								`.${file.extension}`,
-								"",
-							),
-							words: exclusions,
-						});
-				}
 
-				const links = getLinks(file);
-				if (links.href.length === 0) {
-					messages[file.relativePath].push("No links found in file");
-				} else {
-					await checkLinks(source_path, file, links.href, hdocbook_config, hdocbook_project, browser);
-				}
-				if (links.img.length === 0) {
-					messages[file.relativePath].push("No images found in file");
-				} else {
-					await checkImages(source_path, file, links.img);
-				}
+		
+		const global_links_checked = [];
 
-				// Check for multiple H1 tags
-				await checkTags(file);
-			}),
-		);
+		for (const key in html_to_validate) {
+			const file = html_to_validate[key];
+			// Check for British spellings in static HTML content
+			if (
+				!md_files_spellchecked[
+					file.relativePath.replace(`.${file.extension}`, "")
+				]
+			) {
+				const exclusions = await spellcheckContent(file, exclude_spellcheck);
+				if (gen_exclude && exclusions.length > 0)
+					excl_output.push({
+						document_path: file.relativePath.replace(
+							`.${file.extension}`,
+							"",
+						),
+						words: exclusions,
+					});
+			}
 
+			const links = getLinks(file);
+			if (links.href.length === 0) {
+				messages[file.relativePath].push("No links found in file");
+			} else {
+				console.log(`\r\nChecking Links in ${file.relativePath}`);
+				await checkLinks(source_path, file, links.href, hdocbook_config, hdocbook_project, browser, global_links_checked);
+			}
+			if (links.img.length === 0) {
+				messages[file.relativePath].push("No images found in file");
+			} else {
+				await checkImages(source_path, file, links.img);
+			}
+
+			// Check for multiple H1 tags
+			await checkTags(file);
+		}
+		
 		if (gen_exclude) console.log(JSON.stringify(excl_output, null, 2));
 
 		if (verbose) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hdoc-tools",
-	"version": "0.36.1",
+	"version": "0.37.0",
 	"description": "Hornbill HDocBook Development Support Tool",
 	"main": "hdoc.js",
 	"bin": {