zgrzyt 2.2.0 → 2.2.1

package/lib/cloudflare.js

@@ -1,29 +1,66 @@
-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);
@@ -128,9 +165,4 @@ function client({ token, timeout = 4000, retry = 2 }) {
 
     return success;
   }
-
-  return {
-    switchToService,
-    listRecords
-  };
 }

package/package.json

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