Skip to content

Commit ef9f748

Browse files
committed
dns: move setServers to internal/dns/promise.js
1 parent 29ff235 commit ef9f748

File tree

3 files changed

+17
-22
lines changed

3 files changed

+17
-22
lines changed

lib/dns.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ ObjectDefineProperties(module.exports, {
386386
get() {
387387
if (promises === null) {
388388
promises = require('internal/dns/promises');
389-
promises.setServers = defaultResolverSetServers;
390389
}
391390
return promises;
392391
}

lib/dns/promises.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
'use strict';
22

3-
const dnsPromises = require('internal/dns/promises');
4-
dnsPromises.setServers = require('dns').setServers;
5-
module.exports = dnsPromises;
3+
module.exports = require('internal/dns/promises');

lib/internal/dns/promises.js

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,19 @@ const {
1010

1111
const {
1212
bindDefaultResolver,
13-
Resolver: CallbackResolver,
13+
Resolver,
1414
validateHints,
15-
validateTimeout,
16-
validateTries,
1715
emitInvalidHostnameWarning,
1816
getDefaultVerbatim,
1917
setDefaultResultOrder,
18+
setDefaultResolver,
2019
} = require('internal/dns/utils');
2120
const { codes, dnsException } = require('internal/errors');
2221
const { toASCII } = require('internal/idna');
2322
const { isIP } = require('internal/net');
2423
const {
2524
getaddrinfo,
2625
getnameinfo,
27-
ChannelWrap,
2826
GetAddrInfoReqWrap,
2927
GetNameInfoReqWrap,
3028
QueryReqWrap
@@ -270,19 +268,6 @@ function resolver(bindingName) {
270268

271269
const resolveMap = ObjectCreate(null);
272270

273-
// Resolver instances correspond 1:1 to c-ares channels.
274-
class Resolver {
275-
constructor(options = undefined) {
276-
const timeout = validateTimeout(options);
277-
const tries = validateTries(options);
278-
this._handle = new ChannelWrap(timeout, tries);
279-
}
280-
}
281-
282-
Resolver.prototype.getServers = CallbackResolver.prototype.getServers;
283-
Resolver.prototype.setServers = CallbackResolver.prototype.setServers;
284-
Resolver.prototype.cancel = CallbackResolver.prototype.cancel;
285-
Resolver.prototype.setLocalAddress = CallbackResolver.prototype.setLocalAddress;
286271
Resolver.prototype.resolveAny = resolveMap.ANY = resolver('queryAny');
287272
Resolver.prototype.resolve4 = resolveMap.A = resolver('queryA');
288273
Resolver.prototype.resolve6 = resolveMap.AAAA = resolver('queryAaaa');
@@ -313,6 +298,19 @@ Resolver.prototype.resolve = function resolve(hostname, rrtype) {
313298
return ReflectApply(resolver, this, [hostname]);
314299
};
315300

301+
function defaultResolverSetServers(servers) {
302+
const resolver = new Resolver();
316303

317-
module.exports = { lookup, lookupService, Resolver, setDefaultResultOrder };
304+
resolver.setServers(servers);
305+
setDefaultResolver(resolver);
306+
bindDefaultResolver(module.exports, Resolver.prototype);
307+
}
308+
309+
module.exports = {
310+
lookup,
311+
lookupService,
312+
Resolver,
313+
setDefaultResultOrder,
314+
setServers: defaultResolverSetServers,
315+
};
318316
bindDefaultResolver(module.exports, Resolver.prototype);

0 commit comments

Comments
 (0)