@uxf/scripts 11.62.0 → 11.62.1

package/package.json

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

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

@@ -15,6 +15,10 @@ const { HTTP_USERNAME, HTTP_PASSWORD } = process.env;
  * @typedef {{url: string, parentUrl: (string | undefined), canonicalUrl: (string | null), isImg: boolean, isWebPage: boolean, ttl: number, status: number, message: (string | undefined), skipped: boolean, indexable: boolean, redirected: boolean}} TestedUrlDto
  */
 
+const DUPLICATES_TITLE = "\n\n\nDuplicated pages in sitemap:\n";
+const MISSING_TITLE = "\n\n\nMissing pages in sitemap:\n";
+const ERROR_TITLE = "\n\n\nErrors:\n"
+
 const MAX_TTL = 3;
 const IMAGES_LABEL = "🏞 Images:";
 const URLS_LABEL = "🔗 Links:";
@@ -75,7 +79,7 @@ function createErrorList(errors) {
 }
 
 /**
- * @param errors {UrlCheckResponse[]}
+ * @param errors {TestedUrlDto[]}
  * @return {string}
  */
 function createErrorResult(errors) {
@@ -123,7 +127,7 @@ function createErrorResult(errors) {
 }
 
 /**
- * @param skippedUrls {UrlCheckResponse[]}
+ * @param skippedUrls {TestedUrlDto[]}
  * @return {string}
  */
 function createSkippedResult(skippedUrls) {
@@ -347,9 +351,6 @@ async function testNestedUrls(html, parentUrl, parentIndex, webUrl) {
             webUrl,
         );
 
-        // FIXME
-        urls = urls.filter((url) => url.startsWith(webUrl) || url.startsWith("/"));
-
         await testNested(urls, parentIndex, parentUrl, createTabSpace() + URLS_LABEL, webUrl);
     } catch (e) {
         ERRORS.push(`Can't test all nested pages for ${parentUrl} - ${e.message}`);
@@ -531,19 +532,25 @@ module.exports = async function run(sitemapUrl, skip, withNested, withImages, go
     const missingInSitemap = shouldBeInSitemap.filter((testedUrl) => !sitemapUrls.includes(testedUrl));
 
     if (missingInSitemap.length > 0 || duplicates.length > 0 || errors.length > 0 || ERRORS.length > 0) {
+        let chatMessage = "";
         const duplicatesText = duplicates.map((url) => `${createTabSpace()}${url}`).join("\n");
         const missingText = missingInSitemap.map((url) => `${createTabSpace()}${url}`).join("\n");
         const errorText = createErrorResult(errors);
+
         if (duplicatesText) {
-            logErrors(duplicatesText, "\n\n\nDuplicated pages in sitemap:\n");
+            logErrors(duplicatesText, DUPLICATES_TITLE);
+            chatMessage += DUPLICATES_TITLE + duplicatesText;
         }
         if (missingText) {
-            logErrors(missingText, "\n\n\nMissing pages in sitemap:\n");
+            logErrors(missingText, MISSING_TITLE);
+            chatMessage += MISSING_TITLE + missingText;
         }
         if (errorText) {
-            logErrors(errorText, "\n\n\nErrors:\n");
+            logErrors(errorText, ERROR_TITLE);
+            chatMessage += ERROR_TITLE + errorText;
         }
-        await sendGoogleChatMessage(duplicatesText + missingText + errorText, googleWebhookUrl);
+
+        await sendGoogleChatMessage(chatMessage, googleWebhookUrl);
     }
 
     if (skippedUrls.length > 0) {