@uxf/scripts 1.5.3 → 1.5.5

package/Makefile

@@ -1,2 +1,2 @@
 uxf-release:
-	CI_SERVER_URL=https://gitlab.uxf.cz GITLAB_TOKEN= SLACK_TOKEN=xoxb- ./bin/uxf-release.js --slack-channel=C01NQK3LY9Z --project-id=156 --message=":beer: Kalkulator.cz"
+	CI_SERVER_URL=https://gitlab.uxf.cz GITLAB_TOKEN= SLACK_TOKEN=xoxb- GOOGLE_WEBHOOK_URL="https://chat.googleapis.com/v1/spaces/AAAAREmdmUk/messages?key=AIzaSyDdI0hCZtE6vySjMm-WEfRq3CPzqKqqsHI&token=Id5HWMI4jMIp2JZx0kK4eJCiKmLUjUJuxpZtpqGqjfY%3D" ./bin/uxf-release.js --slack-channel=C01NQK3LY9Z --project-id=156 --message=":beer-mug: Kalkulator.cz"

package/package.json

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

package/src/GoogleChat.js

@@ -0,0 +1,20 @@
+const { env } = require("process");
+const { create } = require("axios");
+
+const axios = create({});
+
+/**
+ * @see https://developers.google.com/chat/api/reference/rest/v1/cards-v1
+ * @returns {Promise<void>}
+ */
+async function chatPostMessage(data, dryRun) {
+    if (env.GOOGLE_WEBHOOK_URL && !dryRun) {
+        await axios.post(env.GOOGLE_WEBHOOK_URL, { ...data });
+    } else {
+        process.stdout.write("GOOGLE CHAT: chat.postMessage - skipped");
+    }
+}
+
+module.exports = {
+    chatPostMessage,
+};

package/src/uxf-release/index.js

@@ -1,5 +1,6 @@
 const GitLab = require("../GitLab");
 const Slack = require("../Slack");
+const GoogleChat = require("../GoogleChat");
 
 function addCommitsToIssues(commits, issues) {
     issues.forEach(issue => {
@@ -41,6 +42,21 @@ function generateSlackMessage(issues, commitsWithoutIssues, messageTitle) {
     return message;
 }
 
+function generateGoogleMessage(issues, commitsWithoutIssues, messageTitle) {
+    const texts = [messageTitle];
+    issues.forEach(issue => {
+        texts.push(`*${issue.title}* <${issue.web_url}|#${issue.iid}>`);
+        issue.commits.forEach((commit) => texts.push(generateSlackCommitMessage(commit)));
+    });
+    if (commitsWithoutIssues.length > 0) {
+        texts.push(`*Commity bez issue*`);
+        commitsWithoutIssues.forEach((commit) => texts.push(generateSlackCommitMessage(commit)));
+    }
+    return {
+        text: texts.join('\n')
+    };
+}
+
 function generateSlackCommitMessage(commit) {
     const { title, parsedTitle, short_id, web_url, author_email } = commit;
 
@@ -74,5 +90,10 @@ module.exports = async (dryRun, channel, messageTitle) => {
         dryRun,
     );
 
+    await GoogleChat.chatPostMessage(
+        generateGoogleMessage(issues, commitsWithoutIssue, messageTitle),
+        dryRun,
+    );
+
     await GitLab.createRelease(commits.map(generateCommitMessage).join("\n"), dryRun);
 };

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

@@ -4,10 +4,11 @@ const { performance } = require("perf_hooks");
 const { env, stdout } = require("process");
 const { axios } = require("../Sitemap");
 const cheerio = require("cheerio");
+const GoogleChat = require("../GoogleChat");
 
 /**
  *
- * @typedef {{parentUrl: (string | undefined), isImg: boolean, time: number, ttl: number, url: string, status: number}} UrlCheckResponse
+ * @typedef {{parentUrl: (string | undefined), isImg: boolean, time: number, ttl: number, url: string, status: number, message: (string | undefined)}} UrlCheckResponse
  */
 
 const MAX_TTL = 3;
@@ -39,7 +40,7 @@ function isImageUrl(url) {
  * @return {string}
  */
 function createErrorList(errors) {
-    return errors.map(err => `${createTabSpace(3)}${err.url}${createTabSpace()}${err.status}`).join("\n");
+    return errors.map(err => `${createTabSpace(3)}${err.url}${createTabSpace()}${err.status}${err.message ? ` – ${err.message}` : ""}`).join("\n");
 }
 
 /**
@@ -114,8 +115,8 @@ async function fetchUrl(url, parentUrl = undefined, ttl = 1) {
         const { status } = await Sitemap.axios.get(url);
         const t1 = performance.now();
 
-        if (status !== 200) {
-            throw new Error("Status must be 200");
+        if (status !== 200 && ttl < MAX_TTL) {
+            return await fetchUrl(url, parentUrl, ttl + 1);
         }
 
         return {
@@ -127,17 +128,14 @@ async function fetchUrl(url, parentUrl = undefined, ttl = 1) {
             time: Math.ceil(t1 - t0),
         };
     } catch (e) {
-        if (ttl < MAX_TTL) {
-            return fetchUrl(url, parentUrl, ttl + 1);
-        }
-
         return {
             url,
             parentUrl,
             isImg: isImageUrl(url),
             ttl,
-            status: Number.parseInt((e && e.response && e.response.status) || "0"),
+            status: Number.parseInt((e && e.response && e.response.status) || -1, 10),
             time: 0,
+            message: e.message,
         };
     }
 }
@@ -173,9 +171,11 @@ async function testSitemapUrls(urls, webUrl, sitemapUrl, skip, testNested) {
         const changedUrl = webUrl ? `${webUrl}${new URL(url).pathname}` : null;
 
         printUrlInfo(changedUrl ?? url, i, urls.length);
-        printUrlResult(await testUrl(changedUrl ?? url));
 
-        if (testNested) {
+        const result = await testUrl(changedUrl ?? url);
+        printUrlResult(result);
+
+        if (testNested && result.status === 200) {
             await testAllNestedUrls(changedUrl ?? url, i, webUrl ?? sitemapUrl.split("/").slice(0, 3).join("/"));
         }
     }
@@ -244,8 +244,8 @@ function printUrlInfo(url, urlIndex, allUrlsCount, prefix = "") {
  * @param result {UrlCheckResponse}
  */
 function printUrlResult(result) {
-    const { ttl, status, time } = result;
-    stdout.write(`${createTabSpace()}${status} (${time}ms) ttl=${ttl} ${status === 200 ? "✅ " : "❌ "}\n`);
+    const { ttl, status, time, message } = result;
+    stdout.write(`${createTabSpace()}${status}${message ? " – " + message : ""} (${time}ms) ttl=${ttl} ${status === 200 ? "✅ " : "❌ "}\n`);
 }
 
 /**
@@ -312,6 +312,15 @@ async function sendSlackMessage(errorText, slackChannel) {
     });
 }
 
+/**
+ * @return {Promise<void>}
+ */
+async function sendGoogleChatMessage(resultErrors) {
+    await GoogleChat.chatPostMessage({
+        text: "*Odkazy uvedené v sitemap.xml nejsou dostupné*\n" + resultErrors.map(r => `${r.url} ${r.status}`).join('\n')
+    });
+}
+
 /**
  *
  * @param sitemapUrl {string}
@@ -338,7 +347,7 @@ module.exports = async function run(sitemapUrl, webUrl, slackChannel, skip, test
     }
 
     const startTime = performance.now();
-    await testSitemapUrls(await Sitemap.getSitemap(sitemapUrl), webUrl, sitemapUrl, skip, testNested);
+    await testSitemapUrls((await Sitemap.getSitemap(sitemapUrl)), webUrl, sitemapUrl, skip, testNested);
     const finishTime = performance.now();
 
     const errors = TESTED_URLS.filter(r => r.status !== 200);
@@ -348,6 +357,7 @@ module.exports = async function run(sitemapUrl, webUrl, slackChannel, skip, test
         const errorText = createErrorResult(errors);
         logErrors(errorText);
         await sendSlackMessage(errorText, slackChannel);
+        await sendGoogleChatMessage(errors);
     }
     logStatistics(ok, Math.ceil(finishTime - startTime));