Commit 4fe9916
dns: remove redundant code using common variable
`validFamilies` variable is defined 2 times, so remove
redundant code by defining `validFamilies` in util. Plus,
apply the same approach to `validDnsOrders` because it's
also used multiple times.
PR-URL: #57386
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Daeyeon Jeong <daeyeon.dev@gmail.com>
Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>1 parent 323e3ac commit 4fe9916
3 files changed
Lines changed: 12 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -46,6 +46,8 @@ const { | |||
| 46 | 46 | getDefaultResultOrder, | |
| 47 | 47 | setDefaultResultOrder, | |
| 48 | 48 | errorCodes: dnsErrorCodes, | |
| 49 | + validDnsOrders, | ||
| 50 | + validFamilies, | ||
| 49 | 51 | } = require('internal/dns/utils'); | |
| 50 | 52 | const { | |
| 51 | 53 | Resolver, | |
@@ -138,7 +140,6 @@ function onlookupall(err, addresses) { | |||
| 138 | 140 | ||
| 139 | 141 | // Easy DNS A/AAAA look up | |
| 140 | 142 | // lookup(hostname, [options,] callback) | |
| 141 | - const validFamilies = [0, 4, 6]; | ||
| 142 | 143 | function lookup(hostname, options, callback) { | |
| 143 | 144 | let hints = 0; | |
| 144 | 145 | let family = 0; | |
@@ -192,7 +193,7 @@ function lookup(hostname, options, callback) { | |||
| 192 | 193 | dnsOrder = options.verbatim ? 'verbatim' : 'ipv4first'; | |
| 193 | 194 | } | |
| 194 | 195 | if (options?.order != null) { | |
| 195 | - validateOneOf(options.order, 'options.order', ['ipv4first', 'ipv6first', 'verbatim']); | ||
| 196 | + validateOneOf(options.order, 'options.order', validDnsOrders); | ||
| 196 | 197 | dnsOrder = options.order; | |
| 197 | 198 | } | |
| 198 | 199 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -16,6 +16,8 @@ const { | |||
| 16 | 16 | getDefaultResultOrder, | |
| 17 | 17 | setDefaultResultOrder, | |
| 18 | 18 | setDefaultResolver, | |
| 19 | + validDnsOrders, | ||
| 20 | + validFamilies, | ||
| 19 | 21 | } = require('internal/dns/utils'); | |
| 20 | 22 | ||
| 21 | 23 | const { | |
@@ -179,7 +181,6 @@ function createLookupPromise(family, hostname, all, hints, dnsOrder) { | |||
| 179 | 181 | }); | |
| 180 | 182 | } | |
| 181 | 183 | ||
| 182 | - const validFamilies = [0, 4, 6]; | ||
| 183 | 184 | /** | |
| 184 | 185 | * Get the IP address for a given hostname. | |
| 185 | 186 | * @param {string} hostname - The hostname to resolve (ex. 'nodejs.org'). | |
@@ -227,7 +228,7 @@ function lookup(hostname, options) { | |||
| 227 | 228 | dnsOrder = options.verbatim ? 'verbatim' : 'ipv4first'; | |
| 228 | 229 | } | |
| 229 | 230 | if (options?.order != null) { | |
| 230 | - validateOneOf(options.order, 'options.order', ['ipv4first', 'ipv6first', 'verbatim']); | ||
| 231 | + validateOneOf(options.order, 'options.order', validDnsOrders); | ||
| 231 | 232 | dnsOrder = options.order; | |
| 232 | 233 | } | |
| 233 | 234 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -201,14 +201,16 @@ class ResolverBase { | |||
| 201 | 201 | ||
| 202 | 202 | let defaultResolver; | |
| 203 | 203 | let dnsOrder; | |
| 204 | + const validDnsOrders = ['verbatim', 'ipv4first', 'ipv6first']; | ||
| 205 | + const validFamilies = [0, 4, 6]; | ||
| 204 | 206 | ||
| 205 | 207 | function initializeDns() { | |
| 206 | 208 | const orderFromCLI = getOptionValue('--dns-result-order'); | |
| 207 | 209 | if (!orderFromCLI) { | |
| 208 | 210 | dnsOrder ??= 'verbatim'; | |
| 209 | 211 | } else { | |
| 210 | 212 | // Allow the deserialized application to override order from CLI. | |
| 211 | - validateOneOf(orderFromCLI, '--dns-result-order', ['verbatim', 'ipv4first', 'ipv6first']); | ||
| 213 | + validateOneOf(orderFromCLI, '--dns-result-order', validDnsOrders); | ||
| 212 | 214 | dnsOrder = orderFromCLI; | |
| 213 | 215 | } | |
| 214 | 216 | ||
@@ -281,7 +283,7 @@ function emitInvalidHostnameWarning(hostname) { | |||
| 281 | 283 | } | |
| 282 | 284 | ||
| 283 | 285 | function setDefaultResultOrder(value) { | |
| 284 | - validateOneOf(value, 'dnsOrder', ['verbatim', 'ipv4first', 'ipv6first']); | ||
| 286 | + validateOneOf(value, 'dnsOrder', validDnsOrders); | ||
| 285 | 287 | dnsOrder = value; | |
| 286 | 288 | } | |
| 287 | 289 | ||
@@ -356,4 +358,6 @@ module.exports = { | |||
| 356 | 358 | errorCodes, | |
| 357 | 359 | createResolverClass, | |
| 358 | 360 | initializeDns, | |
| 361 | + validDnsOrders, | ||
| 362 | + validFamilies, | ||
| 359 | 363 | }; | |
0 commit comments