@uxf/scripts 1.6.1 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/scripts",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "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,14 +32,14 @@ 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',
+        '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',
-        'DNT': '1',
         'Pragma': 'no-cache',
         'Sec-Ch-Ua': '"Google Chrome";v="111", "Not(A:Brand";v="8", "Chromium";v="111"',
         'Sec-Ch-Ua-Arch': '"x86"',
@@ -45,9 +50,6 @@ const axios = create({
         'Sec-Fetch-Site': 'cross-site',
         'Sec-Fetch-User': '?1',
         'Sec-Fetch-User-Agent': '?1',
-        'TE': 'Trailers',
-        'Upgrade-Insecure-Requests': '1',
-        'X-Requested-With': 'XMLHttpRequest',
     },
 });
 

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

@@ -48,6 +48,9 @@ function shouldIgnoreError(url, status, e) {
     if ((status === -1 || status === 302) && url.startsWith("https://www.facebook.com/sharer/")) {
         return true;
     }
+    if (status === -3) {
+        return true;
+    }
 
     return false;
 }
@@ -127,8 +130,8 @@ function createCorrectLinks(incorrectLinks, webUrl) {
  */
 async function fetchUrl(url, parentUrl = undefined, ttl = 1) {
     try {
-        Sitemap.axios.defaults.maxRedirects = parentUrl ? 3 : 0;
-        const encodedUrl = parentUrl ? encodeURI(url) : url;
+        Sitemap.axios.defaults.maxRedirects = parentUrl ? 10 : 0;
+        const encodedUrl = parentUrl ? encodeURI(decodeURI(url)) : url;
 
         const t0 = performance.now();
         const { status } = await Sitemap.axios.get(encodedUrl);
@@ -225,11 +228,11 @@ async function testAllNestedUrls(parentUrl, parentIndex, webUrl) {
     const { data } = await axios.get(parentUrl);
     const $ = cheerio.load(data);
     const urls = createCorrectLinks(
-        $("a").map((i, node) => $(node).attr("href")),
+        $("a[href]").map((i, node) => $(node).attr("href")),
         webUrl,
     );
     const images = createCorrectLinks(
-        $("img").map((i, node) => $(node).attr("src")),
+        $("img[src]").map((i, node) => $(node).attr("src")),
         webUrl,
     );
 
@@ -347,11 +350,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
     });
 }