dns: make promise API fully constructed from lib/internal/dns/promises

nodejs · May 28, 2022 · eea50fa · eea50fa
1 parent 331088f
commit eea50fa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/lib/dns.js b/lib/dns.js
@@ -386,8 +386,6 @@ ObjectDefineProperties(module.exports, {
     get() {
       if (promises === null) {
         promises = require('internal/dns/promises');
-        promises.setServers = defaultResolverSetServers;
-        promises.setDefaultResultOrder = setDefaultResultOrder;
       }
       return promises;
     }

diff --git a/lib/dns/promises.js b/lib/dns/promises.js
@@ -1,5 +1,3 @@
 'use strict';
 
-const dnsPromises = require('internal/dns/promises');
-dnsPromises.setServers = require('dns').setServers;
-module.exports = dnsPromises;
+module.exports = require('internal/dns/promises');
diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js
@@ -16,6 +16,8 @@ const {
   validateTries,
   emitInvalidHostnameWarning,
   getDefaultVerbatim,
+  setDefaultResultOrder,
+  setDefaultResolver,
 } = require('internal/dns/utils');
 const { codes, dnsException } = require('internal/errors');
 const { toASCII } = require('internal/idna');
@@ -312,6 +314,19 @@ Resolver.prototype.resolve = function resolve(hostname, rrtype) {
   return ReflectApply(resolver, this, [hostname]);
 };
 
+function defaultResolverSetServers(servers) {
+  const resolver = new Resolver();
 
-module.exports = { lookup, lookupService, Resolver };
+  resolver.setServers(servers);
+  setDefaultResolver(resolver);
+  bindDefaultResolver(module.exports, Resolver.prototype);
+}
+
+module.exports = {
+  lookup,
+  lookupService,
+  Resolver,
+  setDefaultResultOrder,
+  setServers: defaultResolverSetServers,
+};
 bindDefaultResolver(module.exports, Resolver.prototype);