@uxf/scripts 1.5.3 → 1.5.4

package/package.json

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

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

@@ -7,7 +7,7 @@ const cheerio = require("cheerio");
 
 /**
  *
- * @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 +39,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 +114,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 +127,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,
         };
     }
 }
@@ -244,8 +241,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`);
 }
 
 /**