tangerine 1.5.7 → 1.5.9

package/index.js

@@ -14,7 +14,6 @@ const ipaddr = require('ipaddr.js');
 const isStream = require('is-stream');
 const mergeOptions = require('merge-options');
 const pMap = require('p-map');
-const pTimeout = require('p-timeout');
 const pWaitFor = require('p-wait-for');
 const packet = require('dns-packet');
 const semver = require('semver');
@@ -109,8 +108,6 @@ class Tangerine extends dns.promises.Resolver {
     let err;
     if (errors.length === 1) {
       err = errors[0];
-    } else if (errors.every((e) => e instanceof pTimeout.TimeoutError)) {
-      err = errors[0];
     } else {
       err = new Error(
         [...new Set(errors.map((e) => e.message).filter(Boolean))].join('; ')
@@ -1043,7 +1040,7 @@ class Tangerine extends dns.promises.Resolver {
   //
   async #request(pkt, server, abortController, timeout = this.options.timeout) {
     // safeguard in case aborted
-    if (abortController.signal.aborted) return;
+    abortController?.signal?.throwIfAborted();
 
     let localAddress;
     let localPort;
@@ -1067,15 +1064,17 @@ class Tangerine extends dns.promises.Resolver {
     // <https://github.com/hildjj/dohdec/blob/43564118c40f2127af871bdb4d40f615409d4b9c/pkg/dohdec/lib/doh.js#L117-L120>
     if (this.options.requestOptions.method.toLowerCase() === 'get') {
       if (!dohdec) await pWaitFor(() => Boolean(dohdec));
+      // safeguard in case aborted
+      abortController?.signal?.throwIfAborted();
       url += `?dns=${dohdec.DNSoverHTTPS.base64urlEncode(pkt)}`;
     } else {
       options.body = pkt;
     }
 
     debug('request', { url, options });
-    const response = await pTimeout(this.request(url, options), timeout, {
-      signal: abortController.signal
-    });
+    const t = setTimeout(() => abortController.abort(), timeout);
+    const response = await this.request(url, options);
+    clearTimeout(t);
     return response;
   }
 
@@ -1129,31 +1128,33 @@ class Tangerine extends dns.promises.Resolver {
               const statusCode = response.status || response.statusCode;
               debug('response', { statusCode, headers });
 
-              // <https://github.com/nodejs/undici/issues/3353#issuecomment-2184635954>
-              // eslint-disable-next-line max-depth
-              if (body && isStream(body) && typeof body.on === 'function')
-                body.on('error', (err) => {
-                  this.options.logger.error(err, { response });
-                });
-
               // eslint-disable-next-line max-depth
               if (body && statusCode >= 200 && statusCode < 300) {
                 // <https://sindresorhus.com/blog/goodbye-nodejs-buffer>
-                buffer = Buffer.isBuffer(body)
-                  ? body
-                  : // eslint-disable-next-line no-await-in-loop
-                    await getStream.buffer(body);
-                // <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();
-                // NOTE: we don't need to do this (causes uncaught exception)
-                // if (!abortController.signal.aborted) abortController.abort();
+                // eslint-disable-next-line max-depth
+                if (Buffer.isBuffer(body)) buffer = body;
+                else if (typeof body.arrayBuffer === 'function')
+                  // eslint-disable-next-line no-await-in-loop
+                  buffer = Buffer.from(await body.arrayBuffer());
+                // eslint-disable-next-line no-await-in-loop
+                else if (isStream(body)) buffer = await getStream.buffer(body);
+                else {
+                  const err = new TypeError('Unsupported body type');
+                  err.body = body;
+                  throw err;
+                }
+
                 break;
               }
 
               // <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();
+              if (
+                !abortController?.signal?.aborted &&
+                body &&
+                typeof body.dump === 'function'
+              )
+                // eslint-disable-next-line no-await-in-loop
+                await body.dump();
 
               // <https://github.com/nodejs/undici/blob/00dfd0bd41e73782452aecb728395f354585ca94/lib/core/errors.js#L47-L58>
               const message =
@@ -1173,14 +1174,13 @@ class Tangerine extends dns.promises.Resolver {
             // NOTE: if NOTFOUND error occurs then don't attempt further requests
             // <https://nodejs.org/api/dns.html#dnssetserversservers>
             //
-            // eslint-disable-next-line max-depth
+
             if (err.code === dns.NOTFOUND) throw 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
+
             if (
               !(
                 err.statusCode &&
@@ -1231,16 +1231,12 @@ class Tangerine extends dns.promises.Resolver {
       // https://github.com/mafintosh/dns-packet/issues/72
       return packet.decode(buffer);
     } catch (_err) {
-      // 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(
         name,
         rrtype,
-        _err instanceof pTimeout.TimeoutError || _err.name === 'TimeoutError'
-          ? dns.TIMEOUT
-          : _err.code,
+        _err.code,
         _err.errno
       );
       // then map it to dns.CONNREFUSED
@@ -1258,7 +1254,7 @@ class Tangerine extends dns.promises.Resolver {
     for (const abortController of this.abortControllers) {
       if (!abortController.signal.aborted) {
         try {
-          abortController.abort();
+          abortController.abort('Cancel invoked');
         } catch (err) {
           this.options.logger.debug(err);
         }
@@ -1281,7 +1277,7 @@ class Tangerine extends dns.promises.Resolver {
         'abort',
         () => {
           try {
-            abortController.abort();
+            abortController.abort('Parent abort controller aborted');
           } catch (err) {
             this.options.logger.debug(err);
           }

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.7",
+  "version": "1.5.9",
   "author": "Forward Email (https://forwardemail.net)",
   "bugs": {
     "url": "https://github.com/forwardemail/nodejs-dns-over-https-tangerine/issues"
@@ -20,7 +20,6 @@
     "is-stream": "2.0.1",
     "merge-options": "3.0.4",
     "p-map": "4",
-    "p-timeout": "4",
     "p-wait-for": "3",
     "port-numbers": "6.0.1",
     "private-ip": "^3.0.2",