zgrzyt 2.2.2 → 2.2.3

package/lib/check.js

@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs';
 import http from 'node:http';
 import https from 'node:https';
 import makeDebug from 'debug';
@@ -8,11 +7,12 @@ const debug = makeDebug('zgrzyt:check');
 import { resolve } from './dns.js';
 import { updateHealth } from './state.js';
 
+import packageJson from '../package.json' with { type: 'json' };
 const {
   name,
   version,
   homepage = 'https://github.com/pirxpilot/zgrzyt'
-} = JSON.parse(readFileSync(new URL('../package.json', import.meta.url)));
+} = packageJson;
 
 const USER_AGENT = `${name}/${version} (${homepage})`;
 

package/lib/cloudflare.js

@@ -4,8 +4,6 @@ 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}`);
@@ -32,8 +30,6 @@ function makeFetch({ token, timeout, retry }) {
   }
 
   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);
@@ -41,14 +37,13 @@ function makeFetch({ token, timeout, retry }) {
     const options = {
       method,
       headers: { authorization },
-      signal: controller.signal
+      signal: AbortSignal.timeout(timeout)
     };
     if (json) {
       options.headers['Content-Type'] = 'application/json';
       options.body = JSON.stringify(json);
     }
     const res = await fetch(url, options);
-    clearTimeout(id);
     return res.json();
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zgrzyt",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Poor man's load balancing DNS switcher.",
   "type": "module",
   "author": {