@uxf/scripts 1.6.0 → 1.6.2

package/package.json

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

package/src/Sitemap.js

@@ -1,3 +1,4 @@
+const https = require('https');
 const { create } = require("axios");
 const cheerio = require("cheerio");
 
@@ -16,6 +17,10 @@ async function getSitemap(xml) {
     return urls;
 }
 
+const agent = new https.Agent({
+    rejectUnauthorized: false
+});
+
 const axios = create({
     auth:
         HTTP_PASSWORD && HTTP_USERNAME
@@ -27,6 +32,25 @@ const axios = create({
     withCredentials: true,
     maxRedirects: 0,
     timeout: 20000,
+    httpsAgent: agent,
+    headers: {
+        'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36',
+        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+        'Accept-Encoding': 'gzip, deflate, br',
+        'Accept-Language': 'en-US,en;q=0.9,cs-CZ;q=0.8,cs;q=0.7,de;q=0.6',
+        'Cache-Control': 'no-cache',
+        'Connection': 'keep-alive',
+        'Pragma': 'no-cache',
+        'Sec-Ch-Ua': '"Google Chrome";v="111", "Not(A:Brand";v="8", "Chromium";v="111"',
+        'Sec-Ch-Ua-Arch': '"x86"',
+        'Sec-Ch-Ua-Mobile': '?0',
+        'Sec-Ch-Ua-Platform': '"Windows"',
+        'Sec-Fetch-Dest': 'document',
+        'Sec-Fetch-Mode': 'navigate',
+        'Sec-Fetch-Site': 'cross-site',
+        'Sec-Fetch-User': '?1',
+        'Sec-Fetch-User-Agent': '?1',
+    },
 });
 
 module.exports = {

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

@@ -127,14 +127,15 @@ function createCorrectLinks(incorrectLinks, webUrl) {
  */
 async function fetchUrl(url, parentUrl = undefined, ttl = 1) {
     try {
-        Sitemap.axios.defaults.maxRedirects = parentUrl ? 1 : 0;
+        Sitemap.axios.defaults.maxRedirects = parentUrl ? 3 : 0;
+        const encodedUrl = parentUrl ? encodeURI(url) : url;
 
         const t0 = performance.now();
-        const { status } = await Sitemap.axios.get(url);
+        const { status } = await Sitemap.axios.get(encodedUrl);
         const t1 = performance.now();
 
         if (status !== 200 && ttl < MAX_TTL) {
-            return await fetchUrl(url, parentUrl, ttl + 1);
+            return await fetchUrl(encodedUrl, parentUrl, ttl + 1);
         }
 
         return {
@@ -346,11 +347,13 @@ async function sendSlackMessage(errorText, slackChannel) {
 }
 
 /**
+ *
+ * @param resultErrors {string}
  * @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')
+        text: resultErrors
     });
 }
 
@@ -393,7 +396,7 @@ module.exports = async function run(sitemapUrl, webUrl, slackChannel, skip, test
         const ignoredErrorText = createErrorResult(ignoredErrors);
         logErrors(ignoredErrorText, "\nIngored errors:\n");
         await sendSlackMessage(errorText, slackChannel);
-        await sendGoogleChatMessage(errors);
+        await sendGoogleChatMessage(errorText);
     }
 
     if (ignoredErrors.length > 0) {