tangerine 1.4.0 → 1.4.2

package/index.js

@@ -7,7 +7,7 @@ const { debuglog } = require('node:util');
 const { getEventListeners, setMaxListeners } = require('node:events');
 const { isIP, isIPv4, isIPv6 } = require('node:net');
 
-const { toASCII } = require('punycode/');
+const autoBind = require('auto-bind');
 const getStream = require('get-stream');
 const ipaddr = require('ipaddr.js');
 const mergeOptions = require('merge-options');
@@ -18,6 +18,8 @@ const packet = require('dns-packet');
 const semver = require('semver');
 const structuredClone = require('@ungap/structured-clone').default;
 const { getService } = require('port-numbers');
+// eslint-disable-next-line import/order
+const { toASCII } = require('punycode/');
 
 const pkg = require('./package.json');
 
@@ -363,6 +365,13 @@ class Tangerine extends dns.promises.Resolver {
 
     // manage set of abort controllers
     this.abortControllers = new Set();
+
+    //
+    // NOTE: bind methods so we don't have to programmatically call `.bind`
+    // (e.g. `getDmarcRecord(name, resolver.resolve.bind(resolver))`)
+    // (alternative to `autoBind(this)` is `this[method] = this[method].bind(this)`)
+    //
+    autoBind(this);
   }
 
   setLocalAddress(ipv4, ipv6) {
@@ -455,7 +464,7 @@ class Tangerine extends dns.promises.Resolver {
 
     // if options is an integer, it must be 4 or 6
     if (typeof options === 'number') {
-      if (options !== 4 && options !== 6) {
+      if (options !== 0 && options !== 4 && options !== 6) {
         const err = new TypeError(
           `The argument 'family' must be one of: 0, 4, 6. Received ${options}`
         );
@@ -479,6 +488,8 @@ class Tangerine extends dns.promises.Resolver {
     if (options?.family === 'IPv4') options.family = 4;
     else if (options?.family === 'IPv6') options.family = 6;
 
+    if (typeof options.family !== 'number') options.family = 0;
+
     // validate hints
     // eslint-disable-next-line no-bitwise
     if ((options?.hints & ~(dns.ADDRCONFIG | dns.ALL | dns.V4MAPPED)) !== 0) {
@@ -526,18 +537,16 @@ class Tangerine extends dns.promises.Resolver {
     let answers = [];
 
     try {
-      // `any` or `all` is based off !options.family || options.family === 0
-      // (according to official nodejs dns.lookup docs)
-      answers = await Promise[
-        typeof options.family === 'undefined' || options.family === 0
-          ? 'all'
-          : 'any'
-      ]([
-        // the only downside here is that if one succeeds the other won't be aborted (iff "any")
+      answers = await Promise.all([
         this.resolve4(name, { purgeCache, noThrowOnNODATA: true }),
         this.resolve6(name, { purgeCache, noThrowOnNODATA: true })
       ]);
-      answers = answers.flat();
+      // default node behavior seems to return IPv4 by default always regardless
+      answers =
+        answers[0].length > 0 &&
+        (typeof options.family === 'undefined' || options.family === 0)
+          ? answers[0]
+          : answers.flat();
     } catch (_err) {
       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.4.0",
+  "version": "1.4.2",
   "author": "Forward Email (https://forwardemail.net)",
   "bugs": {
     "url": "https://github.com/forwardemail/tangerine/issues"
@@ -11,6 +11,7 @@
   ],
   "dependencies": {
     "@ungap/structured-clone": "^1.0.2",
+    "auto-bind": "4",
     "dns-packet": "^5.4.0",
     "dohdec": "^5.0.3",
     "get-stream": "6",