zgrzyt 2.0.3 → 2.1.1

package/index.js

@@ -17,8 +17,17 @@ main(apis).catch(e => {
 });
 
 async function main(apis) {
-  const results = await Promise.all(apis.map(zgrzyt));
-  const { exitCode, lines } = report(results);
+  const promises = await Promise.allSettled(apis.map(zgrzyt));
+  const results = [];
+  const errors = [];
+  promises.forEach(p => {
+    if (p.status === 'fulfilled') {
+      results.push(p.value);
+    } else {
+      errors.push(p.reason);
+    }
+  });
+  const { exitCode, lines } = report(results, errors);
   console.log(lines.join('\n'));
   await onExit();
   process.exit(exitCode);

package/lib/cloudflare.js

@@ -11,13 +11,13 @@ class CloudflareError extends Error {
   }
 }
 
-function client({ token }) {
+function client({ token, timeout = 4000, retry = 2 }) {
   const cf = got.extend({
     prefixUrl: 'https://api.cloudflare.com/client/v4',
     resolveBodyOnly: true,
     responseType: 'json',
-    timeout: { request: 4000 },
-    retry: { limit: 2 },
+    timeout: { request: timeout },
+    retry: { limit: retry },
     headers: {
       'Authorization': `Bearer ${token}`
     }
@@ -85,7 +85,7 @@ function client({ token }) {
     }
 
     debug('Listing zones...');
-    for (let page = 1; await getPage(page); page++) {}
+    for (let page = 1; await getPage(page); page++) { }
     debug('Listing zones done.');
 
     return zones;

package/lib/config.js

@@ -21,10 +21,16 @@ function prepareConfig(config) {
     cluster = {}
   } = config;
 
-  if (!cloudflare || !cloudflare.token) {
+  if (!cloudflare?.token) {
     console.error('Cloudflare API token not configured');
     return;
   }
+  if (typeof cloudflare.timeout === 'string') {
+    cloudflare.timeout = parseInt(cloudflare.timeout);
+  }
+  if (typeof cloudflare.retry === 'string') {
+    cloudflare.retry = parseInt(cloudflare.retry);
+  }
 
   // collect all APIs
   const apis = [

package/lib/report.js

@@ -1,12 +1,12 @@
 import sprintf from 'sprintfjs';
 
-export function report(results) {
+export function report(results, errors) {
   const collected = results.reduce(collect, {
     missing: [],
     switched: [],
     noops: []
   });
-  return reportAll(collected);
+  return reportAll(collected, errors.map(formatError));
 }
 
 function collect(context, { url, domain, record, good, switched }) {
@@ -22,7 +22,12 @@ function collect(context, { url, domain, record, good, switched }) {
   return context;
 }
 
-function reportAll(collected) {
+function formatError(err) {
+  console.error(err);
+  return err.toString();
+}
+
+function reportAll(collected, errors) {
   const {
     missing,
     noops,
@@ -43,6 +48,10 @@ function reportAll(collected) {
   if (noops.length > 0) {
     lines.push('No changes:\n', ...noops, '\n');
   }
+  if (errors.length) {
+    lines.push('Errors:\n', ...errors, `\n`);
+    exitCode = -1;
+  }
 
   return { exitCode, lines: lines.slice(0, -1) };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zgrzyt",
-  "version": "2.0.3",
+  "version": "2.1.1",
   "description": "Poor man's load balancing DNS switcher.",
   "type": "module",
   "author": {
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "debug": "~4",
-    "got": "~13",
-    "parse-domain": "~7",
+    "got": "~14",
+    "parse-domain": "~8",
     "rc": "^1.2.8",
     "sprintfjs": "^1.2.16"
   },