tangerine 1.5.8 → 1.6.0

package/README.md

@@ -15,7 +15,7 @@
 </div>
 <hr />
 <div align="center">
-  ⚡ <a href="#tangerine-benchmarks"><i><u><strong>AS FAST AS</strong></u></i></a> native <a href="https://nodejs.org/api/dns.html" target="_blank">Node.js <code>dns</code></a>! 🚀 &bull; Supports Node v16+ with ESM/CJS &bull; Made for <a href="https://forwardemail.net" target="_blank"><strong>Forward Email</strong></a>.
+  ⚡ <a href="#tangerine-benchmarks"><i><u><strong>AS FAST AS</strong></u></i></a> native <a href="https://nodejs.org/api/dns.html" target="_blank">Node.js <code>dns</code></a>! 🚀 &bull; Supports Node v17+ with ESM/CJS &bull; Made for <a href="https://forwardemail.net" target="_blank"><strong>Forward Email</strong></a>.
 </div>
 <hr />
 

package/index.js

@@ -14,11 +14,9 @@ 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');
-const structuredClone = require('@ungap/structured-clone').default;
 const { getService } = require('port-numbers');
 const pkg = require('./package.json');
 
@@ -109,8 +107,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 +1039,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 +1063,19 @@ 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(() => {
+      if (!abortController?.signal?.aborted) abortController.abort();
+    }, timeout);
+    const response = await this.request(url, options);
+    clearTimeout(t);
     return response;
   }
 
@@ -1237,9 +1237,7 @@ class Tangerine extends dns.promises.Resolver {
       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

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.8",
+  "version": "1.6.0",
   "author": "Forward Email (https://forwardemail.net)",
   "bugs": {
     "url": "https://github.com/forwardemail/nodejs-dns-over-https-tangerine/issues"
@@ -10,7 +10,6 @@
     "Forward Email (https://forwardemail.net)"
   ],
   "dependencies": {
-    "@ungap/structured-clone": "^1.2.0",
     "auto-bind": "4",
     "dns-packet": "^5.6.1",
     "dohdec": "^5.0.3",
@@ -20,7 +19,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",
@@ -58,7 +56,7 @@
     "xo": "^0.58.0"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=17"
   },
   "files": [
     "index.js"