@uxf/scripts 11.61.3 → 11.61.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@uxf/scripts",
-    "version": "11.61.3",
+    "version": "11.61.5",
     "description": "",
     "main": "index.js",
     "bin": {

package/src/uxf-sitemap-check/index.js

@@ -17,6 +17,7 @@ const URLS_LABEL = "🔗 Links:";
 
 const TESTED_URLS = [];
 const URLS_TO_CHECK = new Set();
+const ERRORS = [];
 
 const robotsParser = robotsTxtParser({ userAgent: "uxf-bot", allowOnNeutral: false });
 
@@ -73,6 +74,7 @@ function createErrorList(errors) {
 function createErrorResult(errors) {
     let parentPages = "";
     let nestedPages = "";
+    let generalErrors = "";
 
     const parentPagesErrors = errors.filter((url) => url.parentUrl === undefined);
     if (parentPagesErrors.length > 0) {
@@ -103,7 +105,14 @@ function createErrorResult(errors) {
         }
     }
 
-    return parentPages + nestedPages;
+    if (ERRORS.length > 0) {
+        generalErrors = `\n\nGeneral errors:\n`;
+        for (const error of ERRORS) {
+            generalErrors += `${createTabSpace(1)}${error}\n`;
+        }
+    }
+
+    return parentPages + nestedPages + generalErrors;
 }
 
 /**
@@ -251,7 +260,15 @@ async function testUrl(url, webUrl, parentUrl = undefined) {
     const indexInChecked = TESTED_URLS.findIndex((result) => result.url === url);
     if (indexInChecked === -1) {
         const result = await fetchUrl(url, webUrl, parentUrl);
-        TESTED_URLS.push(result);
+        TESTED_URLS.push({
+            isImg: result.isImg,
+            message: result.message,
+            parentUrl: result.parentUrl,
+            skipped: result.skipped,
+            status: result.status,
+            ttl: result.ttl,
+            url: result.url,
+        });
         return result;
     }
     return TESTED_URLS[indexInChecked];
@@ -296,13 +313,17 @@ async function testSitemapUrls(urls, webUrl, sitemapUrl, skip, withNested, withI
  * @return {Promise<void>}
  */
 async function testNestedUrls(html, parentUrl, parentIndex, webUrl) {
-    const $ = cheerio.load(html);
-    const urls = createCorrectLinks(
-        $("a[href]").map((i, node) => $(node).attr("href")),
-        webUrl,
-    );
+    try {
+        const $ = cheerio.load(html);
+        const urls = createCorrectLinks(
+            $("a[href]").map((i, node) => $(node).attr("href")),
+            webUrl,
+        );
 
-    await testNested(urls, parentIndex, parentUrl, createTabSpace() + URLS_LABEL, webUrl);
+        await testNested(urls, parentIndex, parentUrl, createTabSpace() + URLS_LABEL, webUrl);
+    } catch (e) {
+        ERRORS.push(`Can't test all nested pages for ${parentUrl} - ${e.message}`);
+    }
 }
 
 /**
@@ -313,13 +334,17 @@ async function testNestedUrls(html, parentUrl, parentIndex, webUrl) {
  * @return {Promise<void>}
  */
 async function testNestedImages(html, parentUrl, parentIndex, webUrl) {
-    const $ = cheerio.load(html);
-    const images = createCorrectLinks(
-        $("img[src]").map((i, node) => $(node).attr("src")),
-        webUrl,
-    );
+    try {
+        const $ = cheerio.load(html);
+        const images = createCorrectLinks(
+            $("img[src]").map((i, node) => $(node).attr("src")),
+            webUrl,
+        );
 
-    await testNested(images, parentIndex, parentUrl, createTabSpace() + IMAGES_LABEL, webUrl);
+        await testNested(images, parentIndex, parentUrl, createTabSpace() + IMAGES_LABEL, webUrl);
+    } catch (e) {
+        ERRORS.push(`Can't test all nested images for ${parentUrl} - ${e.message}`);
+    }
 }
 
 /**
@@ -452,7 +477,7 @@ module.exports = async function run(sitemapUrl, skip, withNested, withImages, go
     const skippedUrls = TESTED_URLS.filter((r) => r.status !== 200 && r.skipped === true);
     const ok = TESTED_URLS.filter((r) => r.status === 200);
 
-    if (errors.length > 0) {
+    if (errors.length > 0 || ERRORS.length > 0) {
         const errorText = createErrorResult(errors);
         logErrors(errorText, "\n\n\nErrors:\n");
         await sendGoogleChatMessage(errorText, googleWebhookUrl);