From 5680bd62a7b68a37cb5f3d2a229dec60e0a710ef Mon Sep 17 00:00:00 2001
From: Luan Devecchi <luan@engineer.com>
Date: Sat, 31 Jul 2021 18:25:55 -0300
Subject: [PATCH 1/3] dns: add "tries" option to Resolve options

---
 doc/api/dns.md               |  2 ++
 lib/internal/dns/promises.js |  4 +++-
 lib/internal/dns/utils.js    | 10 +++++++++-
 src/cares_wrap.cc            | 19 ++++++++++++++-----
 src/cares_wrap.h             |  7 ++++++-
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 45b2ff79e37442..56f1522dd2f98a 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -108,6 +108,8 @@ Create a new resolver.
 * `options` {Object}
   * `timeout` {integer} Query timeout in milliseconds, or `-1` to use the
     default timeout.
+  * `tries` {integer} The number of tries the resolver will try contacting
+    each name server before giving up, `4` by default.
 
 ### `resolver.cancel()`
 <!-- YAML
diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js
index 035e7f354efc7e..e32b6a1dcd9d19 100644
--- a/lib/internal/dns/promises.js
+++ b/lib/internal/dns/promises.js
@@ -12,6 +12,7 @@ const {
   Resolver: CallbackResolver,
   validateHints,
   validateTimeout,
+  validateTries,
   emitInvalidHostnameWarning,
   getDefaultVerbatim,
 } = require('internal/dns/utils');
@@ -216,7 +217,8 @@ const resolveMap = ObjectCreate(null);
 class Resolver {
   constructor(options = undefined) {
     const timeout = validateTimeout(options);
-    this._handle = new ChannelWrap(timeout);
+    const tries = validateTries(options);
+    this._handle = new ChannelWrap(timeout, tries);
   }
 }
 
diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
index 4f5cdf1104c243..f15f8c7a779ce1 100644
--- a/lib/internal/dns/utils.js
+++ b/lib/internal/dns/utils.js
@@ -43,11 +43,18 @@ function validateTimeout(options) {
   return timeout;
 }
 
+function validateTries(options) {
+  const { tries = 4 } = { ...options };
+  validateInt32(tries, 'options.tries', 1, 2 ** 31 - 1);
+  return tries;
+}
+
 // Resolver instances correspond 1:1 to c-ares channels.
 class Resolver {
   constructor(options = undefined) {
     const timeout = validateTimeout(options);
-    this._handle = new ChannelWrap(timeout);
+    const tries = validateTries(options);
+    this._handle = new ChannelWrap(timeout, tries);
   }
 
   cancel() {
@@ -209,6 +216,7 @@ module.exports = {
   setDefaultResolver,
   validateHints,
   validateTimeout,
+  validateTries,
   Resolver,
   emitInvalidHostnameWarning,
   getDefaultVerbatim,
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index f4b069a28ea2c6..9372aa6b7cc3bf 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -631,9 +631,14 @@ int ParseSoaReply(
 }
 }  // anonymous namespace
 
-ChannelWrap::ChannelWrap(Environment* env, Local<Object> object, int timeout)
+ChannelWrap::ChannelWrap(
+      Environment* env,
+      Local<Object> object,
+      int timeout,
+      int tries)
     : AsyncWrap(env, object, PROVIDER_DNSCHANNEL),
-      timeout_(timeout) {
+      timeout_(timeout),
+      tries_(tries) {
   MakeWeak();
 
   Setup();
@@ -647,11 +652,13 @@ void ChannelWrap::MemoryInfo(MemoryTracker* tracker) const {
 
 void ChannelWrap::New(const FunctionCallbackInfo<Value>& args) {
   CHECK(args.IsConstructCall());
-  CHECK_EQ(args.Length(), 1);
+  CHECK_EQ(args.Length(), 2);
   CHECK(args[0]->IsInt32());
+  CHECK(args[1]->IsInt32());
   const int timeout = args[0].As<Int32>()->Value();
+  const int tries = args[1].As<Int32>()->Value();
   Environment* env = Environment::GetCurrent(args);
-  new ChannelWrap(env, args.This(), timeout);
+  new ChannelWrap(env, args.This(), timeout, tries);
 }
 
 GetAddrInfoReqWrap::GetAddrInfoReqWrap(
@@ -704,6 +711,7 @@ void ChannelWrap::Setup() {
   options.sock_state_cb = ares_sockstate_cb;
   options.sock_state_cb_data = this;
   options.timeout = timeout_;
+  options.tries = tries_;
 
   int r;
   if (!library_inited_) {
@@ -717,7 +725,8 @@ void ChannelWrap::Setup() {
 
   /* We do the call to ares_init_option for caller. */
   const int optmask =
-      ARES_OPT_FLAGS | ARES_OPT_TIMEOUTMS | ARES_OPT_SOCK_STATE_CB;
+      ARES_OPT_FLAGS | ARES_OPT_TIMEOUTMS |
+      ARES_OPT_SOCK_STATE_CB | ARES_OPT_TRIES;
   r = ares_init_options(&channel_, &options, optmask);
 
   if (r != ARES_SUCCESS) {
diff --git a/src/cares_wrap.h b/src/cares_wrap.h
index 27322367556374..649450315ed71e 100644
--- a/src/cares_wrap.h
+++ b/src/cares_wrap.h
@@ -155,7 +155,11 @@ struct NodeAresTask final : public MemoryRetainer {
 
 class ChannelWrap final : public AsyncWrap {
  public:
-  ChannelWrap(Environment* env, v8::Local<v8::Object> object, int timeout);
+  ChannelWrap(
+    Environment* env,
+    v8::Local<v8::Object> object,
+    int timeout,
+    int tries);
   ~ChannelWrap() override;
 
   static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
@@ -189,6 +193,7 @@ class ChannelWrap final : public AsyncWrap {
   bool is_servers_default_ = true;
   bool library_inited_ = false;
   int timeout_;
+  int tries_;
   int active_query_count_ = 0;
   NodeAresTask::List task_list_;
 };

From 56eb2271fd0626350737f204b78726006e1b55b3 Mon Sep 17 00:00:00 2001
From: Luan Devecchi <luan@engineer.com>
Date: Sat, 31 Jul 2021 23:58:14 -0300
Subject: [PATCH 2/3] doc: add missing change to resolver ctor

---
 doc/api/dns.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 56f1522dd2f98a..8a91b3f6bd8296 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -97,6 +97,9 @@ The following methods from the `dns` module are available:
 <!-- YAML
 added: v8.3.0
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/39610
+    description: The `options` object now accepts a `tries` option.
   - version: v12.18.3
     pr-url: https://github.com/nodejs/node/pull/33472
     description: The constructor now accepts an `options` object.
@@ -109,7 +112,7 @@ Create a new resolver.
   * `timeout` {integer} Query timeout in milliseconds, or `-1` to use the
     default timeout.
   * `tries` {integer} The number of tries the resolver will try contacting
-    each name server before giving up, `4` by default.
+    each name server before giving up. **Default:** `4`
 
 ### `resolver.cancel()`
 <!-- YAML

From 9e22943f7c81be1d1924d28929e7a281868b52af Mon Sep 17 00:00:00 2001
From: Luan <luan@engineer.com>
Date: Tue, 3 Aug 2021 13:19:21 -0300
Subject: [PATCH 3/3] src: fix align in cares_wrap.h

Co-authored-by: James M Snell <jasnell@gmail.com>
---
 src/cares_wrap.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cares_wrap.h b/src/cares_wrap.h
index 649450315ed71e..aee46a935b3a86 100644
--- a/src/cares_wrap.h
+++ b/src/cares_wrap.h
@@ -156,10 +156,10 @@ struct NodeAresTask final : public MemoryRetainer {
 class ChannelWrap final : public AsyncWrap {
  public:
   ChannelWrap(
-    Environment* env,
-    v8::Local<v8::Object> object,
-    int timeout,
-    int tries);
+      Environment* env,
+      v8::Local<v8::Object> object,
+      int timeout,
+      int tries);
   ~ChannelWrap() override;
 
   static void New(const v8::FunctionCallbackInfo<v8::Value>& args);