@uxf/scripts 1.4.0 → 1.5.1

package/.eslintrc.json

@@ -1,3 +1,3 @@
 {
-  "parser": "babel-eslint"
+  "parser": "@babel/eslint-parser"
 }

package/babel.config.js

@@ -0,0 +1,22 @@
+"use strict";
+/**
+babel.config.js with useful plugins.
+*/
+module.exports = function (api) {
+    api.cache(true);
+    api.assertVersion("^7.4.5");
+
+    return {
+        presets: [
+            [
+                "@babel/preset-env",
+                {
+                    targets: {
+                        esmodules: true,
+                        node: true,
+                    },
+                },
+            ],
+        ],
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/scripts",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -23,8 +23,9 @@
     "yargs": "^16.0.3"
   },
   "devDependencies": {
-    "babel-eslint": "^10.1.0",
-    "eslint": "^7.20.0",
+    "@babel/eslint-parser": "^7.17.0",
+    "@babel/preset-env": "^7.16.11",
+    "eslint": "^8.8.0",
     "prettier": "^2.1.2"
   },
   "scripts": {

package/src/Slack.js

@@ -19,7 +19,7 @@ async function chatPostMessage(channel, data, dryRun = false) {
             process.stdout.write("SLACK: chat.postMessage error - " + JSON.stringify(res.data));
         }
     } else {
-        process.stdout.write("SLACK: chat.postMessage - skipped");
+        process.stdout.write("SLACK: chat.postMessage - skipped\n");
     }
 }
 

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

@@ -39,13 +39,19 @@ Environment variables:
             type: "string",
             group: "Options",
         })
+        .option("skip", {
+            describe: "Number of skipped urls.",
+            type: "string",
+            group: "Options",
+        })
         .option("h", { alias: "help", group: "Options" })
         .strict(false)
         .exitProcess(false);
 
     try {
         const { help, url, ...options } = cli.parse(argv.slice(2));
-        const webUrl = options["web-url"] ?? null;
+        const skip = options.skip ? Number.parseInt(options.skip) : null;
+        const webUrl = options["web-url"] || null;
 
         if (Boolean(help)) {
             return 0;
@@ -56,7 +62,7 @@ Environment variables:
             env.HTTP_PASSWORD = options["http-password"];
         }
 
-        await require("./index")(url, webUrl, options["slack-channel"]);
+        await require("./index")(url, webUrl, options["slack-channel"], skip);
     } catch (e) {
         console.error(e);
         return 1;

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

@@ -35,7 +35,7 @@ async function tryUrl(url, ttl = 1) {
     }
 }
 
-module.exports = async function run(sitemapUrl, webUrl, slackChannel) {
+module.exports = async function run(sitemapUrl, webUrl, slackChannel, skip) {
     if (!sitemapUrl) {
         stdout.write("⛔ Required parameter --url is empty.\n");
         return process.exit(1);
@@ -55,16 +55,13 @@ module.exports = async function run(sitemapUrl, webUrl, slackChannel) {
 
     const results = [];
 
-    let i = 0;
-    for (const url of urls) {
-        if (i > 4) {
-            continue;
-        }
+    for (let i = skip || 0; i < urls.length; i++) {
+        const url = urls[i];
         const changedUrl = webUrl ? `${webUrl}${new URL(url).pathname}` : null;
 
-        stdout.write(`${++i} / ${urls.length} ${url}${changedUrl ? ` => ${changedUrl}` : ""}`);
+        stdout.write(`${i + 1} / ${urls.length} ${url}${changedUrl ? ` => ${changedUrl}` : ""}`);
 
-        const result = await tryUrl(changedUrl ?? url);
+        const result = await tryUrl(changedUrl || url);
         results.push(result);
         const { ttl, status, time } = result;
 
@@ -74,14 +71,20 @@ module.exports = async function run(sitemapUrl, webUrl, slackChannel) {
     const avgTime = Math.round(results.reduce((prev, curr) => prev + curr.time, 0) / results.length);
     const maxTime = Math.round(results.reduce((prev, curr) => (curr.time > prev ? curr.time : prev), 0));
     const minTime = Math.round(results.reduce((prev, curr) => (curr.time < prev ? curr.time : prev), Number.MAX_VALUE));
+    const resultErrors = results.filter(r => r.status !== 200);
+
+    if (resultErrors.length > 0) {
+        stdout.write("\nErrors:\n");
+        stdout.write(resultErrors.map(re => `    ${re.url} ${re.status}`)).join("\n");
+        stdout.write("\n");
+    }
+
     stdout.write("\n");
     stdout.write("Summary:\n");
     stdout.write(`    Average time  ${avgTime}ms\n`);
     stdout.write(`    Min time      ${minTime}ms\n`);
     stdout.write(`    Max time      ${maxTime}ms\n\n`);
 
-    const resultErrors = results.filter(r => r.status !== 200);
-
     if (resultErrors.length > 0) {
         await Slack.chatPostMessage(slackChannel, {
             text: ":warning: Odkazy uvedené v sitemap.xml nejsou dostupné",