zgrzyt 1.6.0 → 2.0.0

package/Readme.md

@@ -84,8 +84,8 @@ MIT © [Damian Krzeminski](https://pirxpilot.me)
 [rc]: https://www.npmjs.com/package/rc
 [Cloudflare DNS]: https://www.cloudflare.com/dns/
 
-[npm-image]: https://img.shields.io/npm/v/zgrzyt.svg
+[npm-image]: https://img.shields.io/npm/v/zgrzyt
 [npm-url]: https://npmjs.org/package/zgrzyt
 
 [build-url]: https://github.com/pirxpilot/zgrzyt/actions/workflows/check.yaml
-[build-image]: https://img.shields.io/github/workflow/status/pirxpilot/zgrzyt/check
+[build-image]: https://img.shields.io/github/actions/workflow/status/pirxpilot/zgrzyt/check.yaml?branch=main

package/bin/zgrzyt.cjs

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import('../index.js');

package/index.js

@@ -1,9 +1,10 @@
-const conf = require('rc')('zgrzyt');
-const prepareConfig = require('./lib/config');
-const zgrzyt = require('./lib/zgrzyt');
-const report = require('./lib/report');
-const { onExit } = require('./lib/state');
+import rc from 'rc';
+import prepareConfig from './lib/config.js';
+import { zgrzyt } from './lib/zgrzyt.js';
+import { report } from './lib/report.js';
+import { onExit } from './lib/state.js';
 
+const conf = rc('zgrzyt');
 const apis = prepareConfig(conf);
 
 if (!apis) {
@@ -17,7 +18,7 @@ main(apis).catch(e => {
 
 async function main(apis) {
   const results = await Promise.all(apis.map(zgrzyt));
-  const { exitCode, lines }  = report(results);
+  const { exitCode, lines } = report(results);
   console.log(lines.join('\n'));
   await onExit();
   process.exit(exitCode);

package/lib/check.js

@@ -1,26 +1,29 @@
-const http = require('http');
-const https = require('https');
-const debug = require('debug')('zgrzyt:check');
+import { readFileSync } from 'node:fs';
+import http from 'node:http';
+import https from 'node:https';
+import makeDebug from 'debug';
 
-const { resolve } = require('./dns');
-const { updateHealth } = require('./state');
+const debug = makeDebug('zgrzyt:check');
+
+import { resolve } from './dns.js';
+import { updateHealth } from './state.js';
 
 const {
   name,
   version,
   homepage = 'https://github.com/pirxpilot/zgrzyt'
-} = require('../package.json');
+} = JSON.parse(readFileSync(new URL('../package.json', import.meta.url)));
 
 const USER_AGENT = `${name}/${version} (${homepage})`;
 
 /* global URL */
 
-module.exports = {
+export {
   checkServices
 };
 
 async function checkService(server, api) {
-  const address = await resolve(server) ;
+  const address = await resolve(server);
   debug('Resolved %s to %s', server, address);
   const ok = await checkApi(api, address);
   const health = await updateHealth(api, server, ok);
@@ -49,7 +52,7 @@ async function checkApi({ url, timeout, method = 'HEAD', headers = {}, retry = 2
       break;
     }
     await waitRandom(timeout);
-  } while(--retry);
+  } while (--retry);
 
   return result;
 
@@ -63,13 +66,13 @@ async function checkApi({ url, timeout, method = 'HEAD', headers = {}, retry = 2
         ...headers
       }
     })
-    .on('timeout', function () {
-      debug('Timeout for %s on %s', url, address);
-      this.destroy(new Error('Request timeout.'));
-    })
-    .on('response', res => resolve(isOk(res)))
-    .on('error', () => resolve(false))
-    .end());
+      .on('timeout', function () {
+        debug('Timeout for %s on %s', url, address);
+        this.destroy(new Error('Request timeout.'));
+      })
+      .on('response', res => resolve(isOk(res)))
+      .on('error', () => resolve(false))
+      .end());
 
     function isOk({ statusCode }) {
       const ok = statusCode >= 200 && statusCode < 300;
@@ -86,6 +89,9 @@ async function checkApi({ url, timeout, method = 'HEAD', headers = {}, retry = 2
 async function checkServices(servers, selected, api, { force, repair }) {
   const items = await Promise.all(servers.map(s => checkService(s, api)));
   const okItems = items.filter(item => item.ok);
+  if (okItems.length === 0) {
+    return;
+  }
   if (force) {
     return okItems[0];
   }

package/lib/cloudflare.js

@@ -1,8 +1,9 @@
-const got = require('got');
-const debug = require('debug')('zgrzyt:cloudflare');
+import got from 'got';
+import makeDebug from 'debug';
 
+const debug = makeDebug('zgrzyt:cloudflare');
 
-module.exports = client;
+export default client;
 
 class CloudflareError extends Error {
   constructor(errors) {

package/lib/config.js

@@ -1,7 +1,7 @@
-const { parseDomain, fromUrl } = require('parse-domain');
-const makeClient = require('./cloudflare');
+import { parseDomain, fromUrl } from 'parse-domain';
+import makeClient from './cloudflare.js';
 
-module.exports = prepareConfig;
+export default prepareConfig;
 
 function getDomainAndZone({ url, domain: apiDomain }) {
   if (!apiDomain) {
@@ -55,10 +55,10 @@ function prepareConfig(config) {
     }
 
     if (api.header && !Array.isArray(api.header)) {
-      api.header = [ api.header ];
+      api.header = [api.header];
     }
     const headers = (api.header || []).reduce((headers, str) => {
-      const [ name, value ] = str.split('=', 2);
+      const [name, value] = str.split('=', 2);
       headers[name] = value;
       return headers;
     }, {});
@@ -80,6 +80,4 @@ function prepareConfig(config) {
     };
 
   }
-
-
 }

package/lib/dns.js

@@ -1,15 +1,12 @@
-const { Resolver } = require('dns').promises;
-const resolver = new Resolver();
-
-const debug = require('debug')('dns:zgrzyt');
+import { Resolver } from 'node:dns/promises';
+import makeDebug from 'debug';
 
-module.exports = {
-  resolve
-};
+const resolver = new Resolver();
+const debug = makeDebug('dns:zgrzyt');
 
 const cache = Object.create(null);
 
-function resolve(domain) {
+export function resolve(domain) {
   let p = cache[domain];
   if (!p) {
     cache[domain] = p = doResolve(domain);

package/lib/report.js

@@ -1,8 +1,6 @@
-const sprintf = require('sprintfjs');
+import sprintf from 'sprintfjs';
 
-module.exports = report;
-
-function report(results) {
+export function report(results) {
   const collected = results.reduce(collect, {
     missing: [],
     switched: [],

package/lib/state.js

@@ -1,9 +1,6 @@
-const {
-  readFile,
-  writeFile,
-} = require('fs').promises;
+import { readFile, writeFile, } from 'node:fs/promises';
 
-module.exports = {
+export {
   updateHealth,
   onExit
 };

package/lib/zgrzyt.js

@@ -1,10 +1,7 @@
 
-const { checkServices } = require('./check');
+import { checkServices } from './check.js';
 
-module.exports = zgrzyt;
-
-
-async function zgrzyt({ servers, api, client, force, repair }) {
+export async function zgrzyt({ servers, api, client, force, repair }) {
   const { domain, zone } = api;
   const record = await client.listRecords(zone, domain);
   const good = await checkServices(servers, record.content, api, { force, repair });

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "zgrzyt",
-  "version": "1.6.0",
+  "version": "2.0.0",
   "description": "Poor man's load balancing DNS switcher.",
+  "type": "module",
   "author": {
     "name": "Damian Krzeminski",
     "email": "pirxpilot@furkot.com",
     "url": "https://pirxpilot.me"
   },
   "repository": "pirxpilot/zgrzyt",
-  "bin": "./bin/zgrzyt",
+  "bin": "./bin/zgrzyt.cjs",
   "license": "MIT",
   "keywords": [
     "zgrzyt",
@@ -16,17 +17,18 @@
     "load balancing",
     "monitor"
   ],
+  "engines": {
+    "node": ">= 16"
+  },
   "dependencies": {
     "debug": "~4",
-    "got": "^11.8.0",
-    "parse-domain": "~4",
+    "got": "~12",
+    "parse-domain": "~7",
     "rc": "^1.2.8",
     "sprintfjs": "^1.2.16"
   },
   "devDependencies": {
-    "jshint": "^2.10.2",
-    "tap-diff": "^0.1.1",
-    "tape": "~5"
+    "jshint": "^2.10.2"
   },
   "scripts": {
     "test": "make check"

package/bin/zgrzyt

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require('..');