zgrzyt 2.2.0 → 2.2.2

package/index.js

@@ -1,8 +1,8 @@
 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';
+import { zgrzyt } from './lib/zgrzyt.js';
 
 const conf = rc('zgrzyt');
 const apis = prepareConfig(conf);

package/lib/check.js

@@ -18,15 +18,17 @@ const USER_AGENT = `${name}/${version} (${homepage})`;
 
 /* global URL */
 
-export {
-  checkServices
-};
+export { checkServices };
 
 async function checkService(server, api) {
   const { ipv4 = true, ipv6 = false } = api;
   const addresses = await resolve(server, { ipv4, ipv6 });
   if (debug.enabled) {
-    debug('Resolved %s to %s', server, addresses.map(a => a.address).join(', '));
+    debug(
+      'Resolved %s to %s',
+      server,
+      addresses.map(a => a.address).join(', ')
+    );
   }
   const oks = await Promise.all(addresses.map(a => checkApi(api, a)));
   // collate results
@@ -41,13 +43,7 @@ async function checkService(server, api) {
 }
 
 async function checkApi(api, { address, family }) {
-
-  const {
-    url,
-    method = 'HEAD',
-    timeout = 5000,
-    headers = {}
-  } = api;
+  const { url, method = 'HEAD', timeout = 5000, headers = {} } = api;
 
   debug('Checking %s on %s with timeout %dms', url, address, timeout);
 
@@ -67,26 +63,28 @@ async function checkApi(api, { address, family }) {
   return result;
 
   function makeRequest() {
-    return new Promise(resolve => request(url, {
-      method,
-      family,
-      lookup,
-      timeout,
-      headers: {
-        'User-Agent': USER_AGENT,
-        ...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', e => {
-        debug('request error:', e);
-        resolve(false);
+    return new Promise(resolve =>
+      request(url, {
+        method,
+        family,
+        lookup,
+        timeout,
+        headers: {
+          'User-Agent': USER_AGENT,
+          ...headers
+        }
       })
-      .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', e => {
+          debug('request error:', e);
+          resolve(false);
+        })
+        .end()
+    );
 
     function isOk({ statusCode }) {
       const ok = statusCode >= 200 && statusCode < 300;

package/lib/cloudflare.js

@@ -1,38 +1,74 @@
-import got from 'got';
 import makeDebug from 'debug';
 
 const debug = makeDebug('zgrzyt:cloudflare');
 
 export default client;
 
+/* global AbortController, fetch, URLSearchParams */
+
 class CloudflareError extends Error {
   constructor(errors) {
     super(`Cloudflare API error: ${errors[0].message}`);
   }
 }
 
-function client({ token, timeout = 4000, retry = 2 }) {
-  const cf = got.extend({
-    prefixUrl: 'https://api.cloudflare.com/client/v4',
-    resolveBodyOnly: true,
-    responseType: 'json',
-    timeout: { request: timeout },
-    retry: { limit: retry },
-    headers: {
-      'Authorization': `Bearer ${token}`
+function makeFetch({ token, timeout, retry }) {
+  const authorization = `Bearer ${token}`;
+  return {
+    put: (...args) => retryFetch('PUT', ...args),
+    get: (...args) => retryFetch('GET', ...args)
+  };
+
+  async function retryFetch(...args) {
+    while (true) {
+      try {
+        return await doFetch(...args);
+      } catch (err) {
+        if (--retry <= 0) {
+          throw err;
+        }
+      }
     }
-  });
+  }
+
+  async function doFetch(method, command, { searchParams, json }) {
+    const controller = new AbortController();
+    const id = setTimeout(() => controller.abort(), timeout);
+    const url = new URL(command, 'https://api.cloudflare.com/client/v4/');
+    if (searchParams) {
+      url.search = new URLSearchParams(searchParams);
+    }
+    const options = {
+      method,
+      headers: { authorization },
+      signal: controller.signal
+    };
+    if (json) {
+      options.headers['Content-Type'] = 'application/json';
+      options.body = JSON.stringify(json);
+    }
+    const res = await fetch(url, options);
+    clearTimeout(id);
+    return res.json();
+  }
+}
+
+function client({ token, timeout = 4000, retry = 2 }) {
+  const cf = makeFetch({ token, timeout, retry });
   const cacheZones = Object.create(null);
   let pZones;
+  return {
+    switchToService,
+    listRecords
+  };
 
   async function switchToService(zoneName, domain, good) {
     const zone = await getZone(zoneName);
     const record = await getRecord(zone.id, domain);
     if (record.type === 'CNAME') {
       return updateRecord(zone.id, record.id, record.proxied, domain, good);
-    } else {
-      console.error('Cannot only update CNAME records');
     }
+    console.error('Cannot only update CNAME records');
   }
 
   async function listRecords(zoneName, domain) {
@@ -63,12 +99,7 @@ function client({ token, timeout = 4000, retry = 2 }) {
 
     async function getPage(page) {
       debug('Getting page %d', page);
-      const {
-        success,
-        errors,
-        result,
-        result_info: { total_count }
-      } = await cf.get('zones', {
+      const { success, errors, result, result_info } = await cf.get('zones', {
         searchParams: {
           status: 'active',
           page,
@@ -81,23 +112,26 @@ function client({ token, timeout = 4000, retry = 2 }) {
       }
 
       zones.push(...result);
-      return zones.length < total_count;
+      return zones.length < result_info.total_count;
     }
 
     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;
   }
 
   async function getRecord(zoneId, domain) {
-    const { success, result, errors } = await cf.get(`zones/${zoneId}/dns_records`, {
-      searchParams: {
-        name: domain,
-        type: 'CNAME'
+    const { success, result, errors } = await cf.get(
+      `zones/${zoneId}/dns_records`,
+      {
+        searchParams: {
+          name: domain,
+          type: 'CNAME'
+        }
       }
-    });
+    );
 
     if (!success) {
       throw new CloudflareError(errors);
@@ -111,14 +145,17 @@ function client({ token, timeout = 4000, retry = 2 }) {
   }
 
   async function updateRecord(zoneId, recordId, proxied, domain, good) {
-    const { success, errors, result } = await cf.put(`zones/${zoneId}/dns_records/${recordId}`, {
-      json: {
-        name: domain,
-        proxied,
-        content: good.server,
-        type: 'CNAME'
+    const { success, errors, result } = await cf.put(
+      `zones/${zoneId}/dns_records/${recordId}`,
+      {
+        json: {
+          name: domain,
+          proxied,
+          content: good.server,
+          type: 'CNAME'
+        }
       }
-    });
+    );
 
     debug('Update record', success, errors, result);
 
@@ -128,9 +165,4 @@ function client({ token, timeout = 4000, retry = 2 }) {
 
     return success;
   }
-
-  return {
-    switchToService,
-    listRecords
-  };
 }

package/lib/config.js

@@ -1,4 +1,4 @@
-import { parseDomain, fromUrl } from 'parse-domain';
+import { fromUrl, parseDomain } from 'parse-domain';
 import makeClient from './cloudflare.js';
 
 export default prepareConfig;
@@ -15,21 +15,17 @@ function getDomainAndZone({ url, domain: apiDomain }) {
 }
 
 function prepareConfig(config) {
-  const {
-    cloudflare,
-    api = {},
-    cluster = {}
-  } = config;
+  const { cloudflare, api = {}, cluster = {} } = config;
 
   if (!cloudflare?.token) {
     console.error('Cloudflare API token not configured');
     return;
   }
   if (typeof cloudflare.timeout === 'string') {
-    cloudflare.timeout = parseInt(cloudflare.timeout);
+    cloudflare.timeout = Number.parseInt(cloudflare.timeout);
   }
   if (typeof cloudflare.retry === 'string') {
-    cloudflare.retry = parseInt(cloudflare.retry);
+    cloudflare.retry = Number.parseInt(cloudflare.retry);
   }
 
   // collect all APIs
@@ -49,10 +45,10 @@ function prepareConfig(config) {
     }
 
     const { domain, zone } = getDomainAndZone(api);
-    const timeout = parseInt(api.timeout || config.timeout, 10) || 250;
-    const retry = parseInt(api.retry || config.retry, 10) || 2;
+    const timeout = Number.parseInt(api.timeout || config.timeout, 10) || 250;
+    const retry = Number.parseInt(api.retry || config.retry, 10) || 2;
     const force = 'force' in api ? api.force : config.force;
-    const repair = parseInt(api.repair || config.repair, 10) || 5;
+    const repair = Number.parseInt(api.repair || config.repair, 10) || 5;
     const ipv6 = Boolean(api.ipv6 ?? config.ipv6);
     const ipv4 = Boolean(api.ipv4 ?? config.ipv4 ?? true);
 
@@ -88,6 +84,5 @@ function prepareConfig(config) {
       force,
       repair
     };
-
   }
 }

package/lib/dns.js

@@ -39,7 +39,10 @@ async function doResolve(domain) {
   async function resolveWithFamily(rrtype) {
     try {
       const addresses = await resolver.resolve(domain, rrtype);
-      return addresses.map(address => ({ address, family: RRTYPE_TO_FAMILY[rrtype] }));
+      return addresses.map(address => ({
+        address,
+        family: RRTYPE_TO_FAMILY[rrtype]
+      }));
     } catch (error) {
       debug('Failed to resolve %s with type %s: %s', domain, rrtype, error);
       return [];

package/lib/report.js

@@ -13,10 +13,21 @@ function collect(context, { url, domain, record, good, switched }) {
   if (!good) {
     context.missing.push(url);
   } else if (switched) {
-    const line = sprintf('%-25s %-25s => %-25s [%s]', domain, record.content, good.server, good.address);
+    const line = sprintf(
+      '%-25s %-25s => %-25s [%s]',
+      domain,
+      record.content,
+      good.server,
+      good.address
+    );
     context.switched.push(line);
   } else {
-    const line = sprintf('%-25s %-25s [%s]', record.name, good.server, good.address);
+    const line = sprintf(
+      '%-25s %-25s [%s]',
+      record.name,
+      good.server,
+      good.address
+    );
     context.noops.push(line);
   }
   return context;
@@ -28,11 +39,7 @@ function formatError(err) {
 }
 
 function reportAll(collected, errors) {
-  const {
-    missing,
-    noops,
-    switched
-  } = collected;
+  const { missing, noops, switched } = collected;
 
   let exitCode = 0;
   const lines = [];
@@ -49,7 +56,7 @@ function reportAll(collected, errors) {
     lines.push('No changes:\n', ...noops, '\n');
   }
   if (errors.length) {
-    lines.push('Errors:\n', ...errors, `\n`);
+    lines.push('Errors:\n', ...errors, '\n');
     exitCode = -1;
   }
 

package/lib/state.js

@@ -1,14 +1,8 @@
-import { readFile, writeFile, } from 'node:fs/promises';
+import { readFile, writeFile } from 'node:fs/promises';
 
-export {
-  updateHealth,
-  onExit
-};
-
-const {
-  ZGRZYT_STATE = '/var/lib/zgrzyt/state.json'
-} = process.env;
+export { updateHealth, onExit };
 
+const { ZGRZYT_STATE = '/var/lib/zgrzyt/state.json' } = process.env;
 
 const state_p = read();
 let hook;

package/lib/zgrzyt.js

@@ -3,7 +3,10 @@ import { checkServices } from './check.js';
 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 });
+  const good = await checkServices(servers, record.content, api, {
+    force,
+    repair
+  });
   const result = {
     url: api.url,
     domain,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zgrzyt",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Poor man's load balancing DNS switcher.",
   "type": "module",
   "author": {
@@ -27,13 +27,12 @@
   },
   "dependencies": {
     "debug": "~4",
-    "got": "~14",
     "parse-domain": "~8",
     "rc": "^1.2.8",
     "sprintfjs": "^1.2.16"
   },
   "devDependencies": {
-    "@pirxpilot/jshint": "^3.0.0"
+    "@biomejs/biome": "^1.9.4"
   },
   "scripts": {
     "test": "make check"
@@ -43,4 +42,4 @@
     "lib",
     "bin"
   ]
-}
+}