@uxf/scripts 11.62.3 → 11.64.0

package/package.json

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

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

@@ -254,7 +254,7 @@ async function fetchUrl(url, webUrl, parentUrl = undefined, ttl = 1) {
             url,
             parentUrl,
             isImg: isImageUrl(url),
-            isWebPage: response.headers.get("content-type").includes("text/html"),
+            isWebPage: response.headers.get("content-type")?.includes("text/html") ?? true,
             ttl,
             status: response.status,
             skipped: false,
@@ -301,7 +301,7 @@ async function testUrl(url, webUrl, parentUrl = undefined) {
             redirected: result.redirected,
             indexable:
                 result.isWebPage && typeof result.html === "string"
-                    ? cheerio.load(result.html)("meta[name='robots']").attr("content") !== "noindex"
+                    ? !cheerio.load(result.html)("meta[name='robots']").attr("content")?.includes("noindex")
                     : false,
             canonicalUrl:
                 result.isWebPage && typeof result.html === "string"
@@ -590,25 +590,34 @@ module.exports = async function run(sitemapUrl, skip, withNested, withImages, ch
 
     logInitialInfo(sitemapUrl, webUrl, withNested, withImages, checkMissing, shouldReportMissing);
 
-    const startTime = performance.now();
-    const sitemapUrls = await Sitemap.getSitemap(sitemapUrl);
-    await testSitemapUrls(sitemapUrls, webUrl, sitemapUrl, skip, withNested, withImages);
-    const finishTime = performance.now();
+    try {
+        const startTime = performance.now();
+        const sitemapUrls = await Sitemap.getSitemap(sitemapUrl);
+        await testSitemapUrls(sitemapUrls, webUrl, sitemapUrl, skip, withNested, withImages);
+        const finishTime = performance.now();
 
-    const result = getResult(webUrl, sitemapUrls, shouldReportMissing);
+        const result = getResult(webUrl, sitemapUrls, shouldReportMissing);
 
-    if (result.errorsSum > 0) {
-        const chatMessage = logResultErrors(webUrl, result);
+        if (result.errorsSum > 0) {
+            const chatMessage = logResultErrors(webUrl, result);
 
-        await sendGoogleChatMessage(chatMessage, googleWebhookUrl);
-    }
+            await sendGoogleChatMessage(chatMessage, googleWebhookUrl);
+        }
 
-    if (result.skippedUrls.length > 0) {
-        const skippedUrlsText = createSkippedResult(result.skippedUrls);
-        logErrors(skippedUrlsText, "\nSkipped origins:\n");
-    }
+        if (result.skippedUrls.length > 0) {
+            const skippedUrlsText = createSkippedResult(result.skippedUrls);
+            logErrors(skippedUrlsText, "\nSkipped origins:\n");
+        }
 
-    logStatistics(result.ok, Math.ceil(finishTime - startTime));
+        logStatistics(result.ok, Math.ceil(finishTime - startTime));
+
+        process.exit(result.errorsSum > 0 ? 1 : 0);
+    } catch (e) {
+        stdout.write("⛔ Error: " + e.message + "\n");
+
+        await sendGoogleChatMessage(`Sitemap check failed completely:\n\n${e.message}`, googleWebhookUrl);
+
+        process.exit(1);
+    }
 
-    process.exit(result.errorsSum > 0 ? 1 : 0);
 };