dns: expose getDefaultResultOrder

btea · targos · commit ce8820e29232 · 2023-05-02T09:34:07.000+02:00
PR-URL: #46973 Fixes: #46919 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Paolo Insogna <paolo@cowtech.it>
diff --git a/doc/api/dns.md b/doc/api/dns.md
@@ -792,6 +792,18 @@ priority than [`--dns-result-order`][]. When using [worker threads][],
 [`dns.setDefaultResultOrder()`][] from the main thread won't affect the default
 dns orders in workers.
 
+## `dns.getDefaultResultOrder()`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+Get the default value for `verbatim` in [`dns.lookup()`][] and
+[`dnsPromises.lookup()`][]. The value could be:
+
+* `ipv4first`: for `verbatim` defaulting to `false`.
+* `verbatim`: for `verbatim` defaulting to `true`.
+
 ## `dns.setServers(servers)`
 
 <!-- YAML
@@ -1351,6 +1363,14 @@ higher priority than [`--dns-result-order`][]. When using [worker threads][],
 [`dnsPromises.setDefaultResultOrder()`][] from the main thread won't affect the
 default dns orders in workers.
 
+### `dnsPromises.getDefaultResultOrder()`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+Get the value of `dnsOrder`.
+
 ### `dnsPromises.setServers(servers)`
 
 <!-- YAML
diff --git a/lib/dns.js b/lib/dns.js
@@ -38,6 +38,7 @@ const {
   validateHints,
   emitInvalidHostnameWarning,
   getDefaultVerbatim,
+  getDefaultResultOrder,
   setDefaultResultOrder,
   errorCodes: dnsErrorCodes,
 } = require('internal/dns/utils');
@@ -305,6 +306,7 @@ module.exports = {
   lookupService,
 
   Resolver,
+  getDefaultResultOrder,
   setDefaultResultOrder,
   setServers: defaultResolverSetServers,
 
diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js
@@ -14,6 +14,7 @@ const {
   emitInvalidHostnameWarning,
   getDefaultVerbatim,
   errorCodes: dnsErrorCodes,
+  getDefaultResultOrder,
   setDefaultResultOrder,
   setDefaultResolver,
 } = require('internal/dns/utils');
@@ -335,6 +336,7 @@ module.exports = {
   lookup,
   lookupService,
   Resolver,
+  getDefaultResultOrder,
   setDefaultResultOrder,
   setServers: defaultResolverSetServers,
 
diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
@@ -284,6 +284,10 @@ function setDefaultResultOrder(value) {
   dnsOrder = value;
 }
 
+function getDefaultResultOrder() {
+  return dnsOrder;
+}
+
 function createResolverClass(resolver) {
   const resolveMap = { __proto__: null };
 
@@ -346,6 +350,7 @@ module.exports = {
   validateTries,
   emitInvalidHostnameWarning,
   getDefaultVerbatim,
+  getDefaultResultOrder,
   setDefaultResultOrder,
   errorCodes,
   createResolverClass,
diff --git a/test/internet/test-dns-getDefaultResultOrder.js b/test/internet/test-dns-getDefaultResultOrder.js
@@ -0,0 +1,24 @@
+'use strict';
+
+const common = require('../common');
+
+const assert = require('assert');
+const dns = require('dns');
+
+dns.setDefaultResultOrder('ipv4first');
+let dnsOrder = dns.getDefaultResultOrder();
+assert.ok(dnsOrder === 'ipv4first');
+dns.setDefaultResultOrder('verbatim');
+dnsOrder = dns.getDefaultResultOrder();
+assert.ok(dnsOrder === 'verbatim');
+
+{
+  (async function() {
+    const result = await dns.promises.lookup('localhost');
+    const result1 = await dns.promises.lookup('localhost', { verbatim: true });
+    assert.ok(result !== undefined);
+    assert.ok(result1 !== undefined);
+    assert.ok(result.address === result1.address);
+    assert.ok(result.family === result1.family);
+  })().then(common.mustCall());
+}
