Skip to content

dns: remove redundant code using common variable #57386

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

Merged
merged 1 commit into from
Mar 11, 2025
Merged

dns: remove redundant code using common variable #57386

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions lib/dns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ const {
getDefaultResultOrder,
setDefaultResultOrder,
errorCodes: dnsErrorCodes,
validDnsOrders,
validFamilies,
} = require('internal/dns/utils');
const {
Resolver,
Expand Down Expand Up @@ -138,7 +140,6 @@ function onlookupall(err, addresses) {

// Easy DNS A/AAAA look up
// lookup(hostname, [options,] callback)
const validFamilies = [0, 4, 6];
function lookup(hostname, options, callback) {
let hints = 0;
let family = 0;
Expand Down Expand Up @@ -192,7 +193,7 @@ function lookup(hostname, options, callback) {
dnsOrder = options.verbatim ? 'verbatim' : 'ipv4first';
}
if (options?.order != null) {
validateOneOf(options.order, 'options.order', ['ipv4first', 'ipv6first', 'verbatim']);
validateOneOf(options.order, 'options.order', validDnsOrders);
dnsOrder = options.order;
}
}
Expand Down
5 changes: 3 additions & 2 deletions lib/internal/dns/promises.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ const {
getDefaultResultOrder,
setDefaultResultOrder,
setDefaultResolver,
validDnsOrders,
validFamilies,
} = require('internal/dns/utils');

const {
Expand Down Expand Up @@ -179,7 +181,6 @@ function createLookupPromise(family, hostname, all, hints, dnsOrder) {
});
}

const validFamilies = [0, 4, 6];
/**
* Get the IP address for a given hostname.
* @param {string} hostname - The hostname to resolve (ex. 'nodejs.org').
Expand Down Expand Up @@ -227,7 +228,7 @@ function lookup(hostname, options) {
dnsOrder = options.verbatim ? 'verbatim' : 'ipv4first';
}
if (options?.order != null) {
validateOneOf(options.order, 'options.order', ['ipv4first', 'ipv6first', 'verbatim']);
validateOneOf(options.order, 'options.order', validDnsOrders);
dnsOrder = options.order;
}
}
Expand Down
8 changes: 6 additions & 2 deletions lib/internal/dns/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,16 @@ class ResolverBase {

let defaultResolver;
let dnsOrder;
const validDnsOrders = ['verbatim', 'ipv4first', 'ipv6first'];
const validFamilies = [0, 4, 6];

function initializeDns() {
const orderFromCLI = getOptionValue('--dns-result-order');
if (!orderFromCLI) {
dnsOrder ??= 'verbatim';
} else {
// Allow the deserialized application to override order from CLI.
validateOneOf(orderFromCLI, '--dns-result-order', ['verbatim', 'ipv4first', 'ipv6first']);
validateOneOf(orderFromCLI, '--dns-result-order', validDnsOrders);
dnsOrder = orderFromCLI;
}

Expand Down Expand Up @@ -281,7 +283,7 @@ function emitInvalidHostnameWarning(hostname) {
}

function setDefaultResultOrder(value) {
validateOneOf(value, 'dnsOrder', ['verbatim', 'ipv4first', 'ipv6first']);
validateOneOf(value, 'dnsOrder', validDnsOrders);
dnsOrder = value;
}

Expand Down Expand Up @@ -356,4 +358,6 @@ module.exports = {
errorCodes,
createResolverClass,
initializeDns,
validDnsOrders,
validFamilies,
};
Loading