Skip to content

dns: refactor and use validators #40022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

dns: refactor and use validators #40022

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions lib/internal/dns/promises.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ const {
QueryReqWrap
} = internalBinding('cares_wrap');
const {
ERR_INVALID_ARG_TYPE,
ERR_INVALID_ARG_VALUE,
ERR_MISSING_ARGS,
} = codes;
Expand All @@ -45,7 +44,7 @@ function onlookup(err, addresses) {
return;
}

const family = this.family ? this.family : isIP(addresses[0]);
const family = this.family || isIP(addresses[0]);
this.resolve({ address: addresses[0], family });
}

Expand All @@ -62,7 +61,7 @@ function onlookupall(err, addresses) {

addresses[i] = {
address,
family: family ? family : isIP(addresses[i])
family: family || isIP(addresses[i])
};
}

Expand Down Expand Up @@ -108,9 +107,11 @@ function lookup(hostname, options) {
var verbatim = getDefaultVerbatim();

// Parse arguments
if (hostname && typeof hostname !== 'string') {
throw new ERR_INVALID_ARG_TYPE('hostname', 'string', hostname);
} else if (options !== null && typeof options === 'object') {
if (hostname) {
validateString(hostname, 'hostname');
}

if (options !== null && typeof options === 'object') {
if (options.hints != null && typeof options.hints !== 'number') {
emitTypeCoercionDeprecationWarning();
}
Expand Down Expand Up @@ -257,15 +258,15 @@ Resolver.prototype.reverse = resolver('getHostByAddr');
Resolver.prototype.resolve = function resolve(hostname, rrtype) {
var resolver;

if (typeof rrtype === 'string') {
if (rrtype !== undefined) {
validateString(rrtype, 'rrtype');

resolver = resolveMap[rrtype];

if (typeof resolver !== 'function')
throw new ERR_INVALID_ARG_VALUE('rrtype', rrtype);
} else if (rrtype === undefined) {
resolver = resolveMap.A;
} else {
throw new ERR_INVALID_ARG_TYPE('rrtype', 'string', rrtype);
resolver = resolveMap.A;
}

return ReflectApply(resolver, this, [hostname]);
Expand Down