tangerine 1.5.5 → 1.5.7

package/index.js

@@ -1146,8 +1146,8 @@ class Tangerine extends dns.promises.Resolver {
                 // <https://github.com/nodejs/undici/issues/3353>
                 // eslint-disable-next-line no-await-in-loop, max-depth
                 if (body && typeof body.dump === 'function') await body.dump();
-                // eslint-disable-next-line max-depth
-                if (!abortController.signal.aborted) abortController.abort();
+                // NOTE: we don't need to do this (causes uncaught exception)
+                // if (!abortController.signal.aborted) abortController.abort();
                 break;
               }
 
@@ -1176,7 +1176,8 @@ class Tangerine extends dns.promises.Resolver {
             // eslint-disable-next-line max-depth
             if (err.code === dns.NOTFOUND) throw err;
 
-            ipErrors.push(err);
+            // eslint-disable-next-line max-depth
+            if (err.status >= 429) ipErrors.push(err);
 
             // break out of the loop if status code was not retryable
             // eslint-disable-next-line max-depth
@@ -1230,7 +1231,8 @@ class Tangerine extends dns.promises.Resolver {
       // https://github.com/mafintosh/dns-packet/issues/72
       return packet.decode(buffer);
     } catch (_err) {
-      if (!abortController.signal.aborted) abortController.abort();
+      // NOTE: we don't need to do this (causes uncaught exception)
+      // if (!abortController.signal.aborted) abortController.abort();
       debug(_err, { name, rrtype, ecsSubnet });
       if (this.options.returnHTTPErrors) throw _err;
       const err = this.constructor.createError(
@@ -1254,7 +1256,13 @@ class Tangerine extends dns.promises.Resolver {
   //       (instead they are called with "ABORT_ERR"; see ABORT_ERROR_CODES)
   cancel() {
     for (const abortController of this.abortControllers) {
-      if (!abortController.signal.aborted) abortController.abort();
+      if (!abortController.signal.aborted) {
+        try {
+          abortController.abort();
+        } catch (err) {
+          this.options.logger.debug(err);
+        }
+      }
     }
   }
 
@@ -1272,7 +1280,11 @@ class Tangerine extends dns.promises.Resolver {
       parentAbortController.signal.addEventListener(
         'abort',
         () => {
-          abortController.abort();
+          try {
+            abortController.abort();
+          } catch (err) {
+            this.options.logger.debug(err);
+          }
         },
         { once: true }
       );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tangerine",
   "description": "Tangerine is the best Node.js drop-in replacement for dns.promises.Resolver using DNS over HTTPS (\"DoH\") via undici with built-in retries, timeouts, smart server rotation, AbortControllers, and caching support for multiple backends (with TTL and purge support).",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "author": "Forward Email (https://forwardemail.net)",
   "bugs": {
     "url": "https://github.com/forwardemail/nodejs-dns-over-https-tangerine/issues"