dns: make `dns.setServers` support customized port #13723

XadillaX · 2017-06-16T17:31:18Z

Make dns.setServers parameter may be strings contain IP and port which
split by :.

eg.

dns.setServers([ "103.238.225.181:666" ]);

And dns.getServers will return IP with port if that server is not use
default port.

Refs: #7903

Checklist

make -j4 test (UNIX)
tests and/or benchmarks are included
documentation is changed or added
commit message follows commit guidelines

Affected core subsystem(s)

dns

Make `dns.setServers` parameter may be strings contain IP and port which split by `:`. eg. ``` dns.setServers([ "103.238.225.181:666" ]); ``` And `dns.getServers` will return IP with port if that server is not use default port. Refs: nodejs#7903

XadillaX · 2017-06-16T17:53:44Z

@addaleax I think we can remove in progress label now.

silverwind · 2017-06-16T18:24:33Z

Maybe it's better to have the port as a separate argument so the user doesn't have to fiddle with the [host]:port syntax of IPv6. Also, it'd be more in line with other APIs that take ports and hosts, which also separate them.

silverwind · 2017-06-16T18:30:48Z

E.g.:

dns.setServers([
  {address: '1.2.3.4', port: 5353},
  {address: '::1234:5678', port: 5353},
  '2.3.4.5'
]);

So the method could both take a object or a string. It also has the benefit that we could extend these objects with future per-server options if necessary.

XadillaX · 2017-06-16T18:31:05Z

@silverwind [host]:port is valid in the previous versions of Node.js, but the port be ignored before. I'm only making it's valid and available now.

You mean let the function support host / [host]:port and { host: ..., port: ... } all these three situations?

refack

Got a little carried away with style suggestion... 🙄

refack · 2017-06-16T18:13:27Z

doc/api/dns.md

@@ -59,8 +59,20 @@ the [Implementation considerations section][] for more information.
 added: v0.11.3
 -->

-Returns an array of IP address strings that are being used for name
-resolution.
+Returns an array of IP address and port strings that are being used for name


🚲 🎪 Suggestion:

Returns an array of IP address strings, formatted according to [rfc3986][], that are currently configured for DNS resolution. A string will include a port section if a custom port is used. ... [rfc3986]: https://tools.ietf.org/html/rfc3986#section-3.2.2

refack · 2017-06-16T18:14:59Z

doc/api/dns.md

@@ -484,10 +496,20 @@ added: v0.11.3
 -->
 - `servers` {string[]}


- `servers` {string[]} array of [rfc3986][] formatted addresses

refack · 2017-06-16T18:18:48Z

doc/api/dns.md

@@ -484,10 +496,20 @@ added: v0.11.3
 -->
 - `servers` {string[]}

-Sets the IP addresses of the servers to be used when resolving. The `servers`
-argument is an array of IPv4 or IPv6 addresses.
+Sets the IP addresses and port of the servers to be used when resolving. The


Sets the IP address and port of servers to be used when performing DNS resolution. If the port is the IANA default DNS port (53) it can be omitted.

refack · 2017-06-16T18:22:56Z

lib/dns.js

+    if (!val[1] || val[1] === 53) return val[0];
+
+    const ipVersion = isIP(val[0]);
+    return ipVersion === 6 ? `[${val[0]}]:${val[1]}` : `${val[0]}:${val[1]}`;


Personal preference nit:

const host= 6 ? `[${val[0]}]` : val[0]; return ${host}:${val[1]};

refack · 2017-06-16T18:31:23Z

lib/dns.js

-      if (ipVersion !== 0)
-        return newSet.push([ipVersion, match[1]]);
+      if (ipVersion !== 0) {
+        const portMatch = serv.match(addrSplitRE) || [];


personal style nit:

const addrSplitRE = /(^.+?)(?::(\d+))?$/; const port = parseInt(serv.replace(addrSplitRE, '$2')) || 53; return newSet.push([ipVersion, match[1], port);

refack · 2017-06-16T18:35:39Z

lib/dns.js

+      if (ipVersion !== 0) {
+        const portMatch = serv.match(addrSplitRE) || [];
+        return newSet.push([ipVersion, match[1], parseInt(portMatch[1] || 53)]);
+      }
    }

    const s = serv.split(addrSplitRE)[0];


const [, s, p] = serv.match(addrSplitRE);

refack · 2017-06-16T18:40:57Z

🤔 If I understand correctly dns.setServers([ "103.238.225.181:666" ]); used to work but ignored the port? Now it will use the port?
Need to consider semver level, and run CITGM when PR converges.

XadillaX · 2017-06-16T18:46:00Z

@refack Yes you understood right. Refer here https://nodejs.org/docs/v8.0.0/api/dns.html#dns_dns_setservers_servers.

If a port is specified on the address, it will be removed.

And the addrSplitRE in the source code used to ignore the port.

silverwind · 2017-06-16T18:49:48Z

[host]:port is valid in the previous versions of Node.js

Hmm, right the docs even mention "If a port is specified on the address, it will be removed.", so I guess we're stuck with the syntax. And no, I wouldn't support three cases. Strictly speaking, this should be semver-major, but if CITGM turns out okay (which I expect), than minor is okay.

refack

Code 💯
LGTM % semver discussion

refack · 2017-06-16T19:34:43Z

CI: https://ci.nodejs.org/job/node-test-commit/10614/

XadillaX · 2017-06-18T14:50:01Z

I think after this PR is landed, we can start the test for dns.resolveAny.

refack · 2017-06-19T02:30:15Z

🤔 If I understand correctly dns.setServers([ "103.238.225.181:666" ]) used to work but ignored the port? Now it will use the port?
Need to consider semver level, and run CITGM when PR converges.

CITGM: https://ci.nodejs.org/view/Node.js-citgm/job/citgm-smoker/880/

@addaleax @nodejs/ctc PTAL at semver level

refack · 2017-06-19T02:42:50Z

lib/dns.js

-  return cares.getServers();
+  const ret = cares.getServers();
+  return ret.map((val) => {
+    if (!val[1] || val[1] === 53) return val[0];


I just noticed this, IMHO we should format IPv6 with [], so need to move the const host up:
e.g.

return ret.map(([host, port]) => { if (isIP(host) === 6) host = `[${host}]`; return (!port || port === 53) host : `${host}:${port}`; }

But that will make this semver-major (since till now IPv6 would be represented without [])

Fix this in a future PR.
Ref: #13795

Need to think about semver-level, and IPv6 string format

XadillaX · 2017-06-19T03:15:36Z

@refack how about adding a parameter to indicate whether using customized port or not

mcollina

LGTM as semver-minor

refack · 2017-06-19T12:11:54Z

@refack how about adding a parameter to indicate whether using customized port or not

CITGM is clean.
Let's land this as is. And open a semver-major PR to fix the formatting.

refack · 2017-06-19T12:21:56Z

doc/api/dns.md

+```js
+[
+  '4.4.4.4',
+  '[2001:4860:4860::8888]',


Need to remove [] for this line.
Ref: #13795

This still needs to be changed, since currently the output will be without the []

> dns.setServers(['192.168.1.1', '2001:4860:4860::8888']) undefined > dns.getServers() [ '192.168.1.1', '2001:4860:4860::8888' ]

refack · 2017-06-19T12:22:19Z

lib/dns.js

-  return cares.getServers();
+  const ret = cares.getServers();
+  return ret.map((val) => {
+    if (!val[1] || val[1] === 53) return val[0];


Fix this in a future PR.
Ref: #13795

XadillaX · 2017-06-19T14:42:41Z

Let's land this as is. And open a semver-major PR to fix the formatting.

Land this as SEMVER-MINOR? And what formatting for SEMVER-MAJOR?

refack · 2017-06-20T22:52:08Z

Landed in 330349f
(fixed a nit in the doc /s/eg./For example:/, and the language on the commit message body)

refack · 2017-06-20T22:53:46Z

Extra sanity on master: https://ci.nodejs.org/job/node-test-commit-linuxone/6777/

allow `dns.setServers` parameter to contain port e.g. ``` dns.setServers([ '103.238.225.181:666' ]); ``` And `dns.getServers` will return IP with port if not the default port. PR-URL: #13723 Refs: #7903 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

Notable changes: * **Async Hooks** * Multiple improvements to Promise support in `async_hooks` have been made. * **Build** * The compiler version requirement to build Node with GCC has been raised to GCC 4.9.4. [[`23d41f3118`](2abaa86ba8)] [#13466](#13466) * **DNS** * The server used for DNS queries can now use a custom port. [[`2bb6614904`](8506acc1b5)] [#13723](#13723) * **V8** * The V8 engine has been upgraded to version 5.9, which has a significantly changed performance profile. [#13515](#13515) PR-URL: #13744

allow `dns.setServers` parameter to contain port e.g. ``` dns.setServers([ '103.238.225.181:666' ]); ``` And `dns.getServers` will return IP with port if not the default port. PR-URL: #13723 Refs: #7903 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

Notable changes: * **Async Hooks** * Multiple improvements to Promise support in `async_hooks` have been made. * **Build** * The compiler version requirement to build Node with GCC has been raised to GCC 4.9.4. [[`23d41f3118`](2abaa86ba8)] [#13466](#13466) * **DNS** * The server used for DNS queries can now use a custom port. [[`2bb6614904`](8506acc1b5)] [#13723](#13723) * Support for `dns.resolveAny()` has been added. [[`30bc9dc20f`](30bc9dc20f)] [#13137](#13137) * **V8** * The V8 engine has been upgraded to version 5.9, which has a significantly changed performance profile. [#13515](#13515) PR-URL: #13744

allow `dns.setServers` parameter to contain port e.g. ``` dns.setServers([ '103.238.225.181:666' ]); ``` And `dns.getServers` will return IP with port if not the default port. PR-URL: #13723 Refs: #7903 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

Notable changes: * **Async Hooks** * Multiple improvements to Promise support in `async_hooks` have been made. * **Build** * The compiler version requirement to build Node with GCC has been raised to GCC 4.9.4. [[`23d41f3118`](2abaa86ba8)] [#13466](#13466) * **DNS** * The server used for DNS queries can now use a custom port. [[`2bb6614904`](8506acc1b5)] [#13723](#13723) * Support for `dns.resolveAny()` has been added. [[`30bc9dc20f`](30bc9dc20f)] [#13137](#13137) * **V8** * The V8 engine has been upgraded to version 5.9, which has a significantly changed performance profile. [#13515](#13515) PR-URL: #13744

allow `dns.setServers` parameter to contain port e.g. ``` dns.setServers([ '103.238.225.181:666' ]); ``` And `dns.getServers` will return IP with port if not the default port. PR-URL: #13723 Refs: #7903 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

Notable changes: * **Async Hooks** * Multiple improvements to Promise support in `async_hooks` have been made. * **Build** * The compiler version requirement to build Node with GCC has been raised to GCC 4.9.4. [[`23d41f3118`](2abaa86ba8)] [#13466](#13466) * **DNS** * The server used for DNS queries can now use a custom port. [[`2bb6614904`](8506acc1b5)] [#13723](#13723) * Support for `dns.resolveAny()` has been added. [[`30bc9dc20f`](30bc9dc20f)] [#13137](#13137) * **V8** * The V8 engine has been upgraded to version 5.9, which has a significantly changed performance profile. [#13515](#13515) PR-URL: #13744

allow `dns.setServers` parameter to contain port e.g. ``` dns.setServers([ '103.238.225.181:666' ]); ``` And `dns.getServers` will return IP with port if not the default port. PR-URL: #13723 Refs: #7903 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

Notable changes: * **Async Hooks** * Multiple improvements to Promise support in `async_hooks` have been made. * **Build** * The compiler version requirement to build Node with GCC has been raised to GCC 4.9.4. [[`820b011ed6`](820b011ed6)] [#13466](#13466) * **Cluster** * Users now have more fine-grained control over the inspector port used by individual cluster workers. Previously, cluster workers would simply increment from the master's debug port. [[`dfc46e262a`](dfc46e262a)] [#14140](#14140) * **DNS** * The server used for DNS queries can now use a custom port. [[`ebe7bb29aa`](ebe7bb29aa)] [#13723](#13723) * Support for `dns.resolveAny()` has been added. [[`6e30e2558e`](6e30e2558e)] [#13137](#13137) * **npm** * The `npm` CLI has been updated to version 5.3.0. In particular, it now comes with the `npx` binary, which is also shipped with Node. [[`dc3f6b9ac1`](dc3f6b9ac1)] [#14235](#14235) * `npm` Changelogs: - [v5.0.4](https://github.com/npm/npm/releases/tag/v5.0.4) - [v5.1.0](https://github.com/npm/npm/releases/tag/v5.1.0) - [v5.2.0](https://github.com/npm/npm/releases/tag/v5.2.0) - [v5.3.0](https://github.com/npm/npm/releases/tag/v5.3.0) PR-URL: #13744

@addaleax

Big thanks to @addaleax who prepared the vast majority of this release. Notable changes: * **Async Hooks** * Multiple improvements to Promise support in `async_hooks` have been made. * **Build** * The compiler version requirement to build Node with GCC has been raised to GCC 4.9.4. [[`820b011ed6`](nodejs@820b011ed6)] [nodejs#13466](nodejs#13466) * **Cluster** * Users now have more fine-grained control over the inspector port used by individual cluster workers. Previously, cluster workers would simply increment from the master's debug port. [[`dfc46e262a`](nodejs@dfc46e262a)] [nodejs#14140](nodejs#14140) * **DNS** * The server used for DNS queries can now use a custom port. [[`ebe7bb29aa`](nodejs@ebe7bb29aa)] [nodejs#13723](nodejs#13723) * Support for `dns.resolveAny()` has been added. [[`6e30e2558e`](nodejs@6e30e2558e)] [nodejs#13137](nodejs#13137) * **npm** * The `npm` CLI has been updated to version 5.3.0. In particular, it now comes with the `npx` binary, which is also shipped with Node. [[`dc3f6b9ac1`](nodejs@dc3f6b9ac1)] [nodejs#14235](nodejs#14235) * `npm` Changelogs: - [v5.0.4](https://github.com/npm/npm/releases/tag/v5.0.4) - [v5.1.0](https://github.com/npm/npm/releases/tag/v5.1.0) - [v5.2.0](https://github.com/npm/npm/releases/tag/v5.2.0) - [v5.3.0](https://github.com/npm/npm/releases/tag/v5.3.0) PR-URL: nodejs#13744

@addaleax

Big thanks to @addaleax who prepared the vast majority of this release. Notable changes: * **Async Hooks** * Multiple improvements to Promise support in `async_hooks` have been made. * **Build** * The compiler version requirement to build Node with GCC has been raised to GCC 4.9.4. [[`820b011ed6`](820b011ed6)] [#13466](#13466) * **Cluster** * Users now have more fine-grained control over the inspector port used by individual cluster workers. Previously, cluster workers would simply increment from the master's debug port. [[`dfc46e262a`](dfc46e262a)] [#14140](#14140) * **DNS** * The server used for DNS queries can now use a custom port. [[`ebe7bb29aa`](ebe7bb29aa)] [#13723](#13723) * Support for `dns.resolveAny()` has been added. [[`6e30e2558e`](6e30e2558e)] [#13137](#13137) * **npm** * The `npm` CLI has been updated to version 5.3.0. In particular, it now comes with the `npx` binary, which is also shipped with Node. [[`dc3f6b9ac1`](dc3f6b9ac1)] [#14235](#14235) * `npm` Changelogs: - [v5.0.4](https://github.com/npm/npm/releases/tag/v5.0.4) - [v5.1.0](https://github.com/npm/npm/releases/tag/v5.1.0) - [v5.2.0](https://github.com/npm/npm/releases/tag/v5.2.0) - [v5.3.0](https://github.com/npm/npm/releases/tag/v5.3.0) PR-URL: #13744

@addaleax

Big thanks to @addaleax who prepared the vast majority of this release. Notable changes: * **Async Hooks** * Multiple improvements to Promise support in `async_hooks` have been made. * **Build** * The compiler version requirement to build Node with GCC has been raised to GCC 4.9.4. [[`820b011ed6`](820b011ed6)] [#13466](#13466) * **Cluster** * Users now have more fine-grained control over the inspector port used by individual cluster workers. Previously, cluster workers would simply increment from the master's debug port. [[`dfc46e262a`](dfc46e262a)] [#14140](#14140) * **DNS** * The server used for DNS queries can now use a custom port. [[`ebe7bb29aa`](ebe7bb29aa)] [#13723](#13723) * Support for `dns.resolveAny()` has been added. [[`6e30e2558e`](6e30e2558e)] [#13137](#13137) * **npm** * The `npm` CLI has been updated to version 5.3.0. In particular, it now comes with the `npx` binary, which is also shipped with Node. [[`dc3f6b9ac1`](dc3f6b9ac1)] [#14235](#14235) * `npm` Changelogs: - [v5.0.4](https://github.com/npm/npm/releases/tag/v5.0.4) - [v5.1.0](https://github.com/npm/npm/releases/tag/v5.1.0) - [v5.2.0](https://github.com/npm/npm/releases/tag/v5.2.0) - [v5.3.0](https://github.com/npm/npm/releases/tag/v5.3.0) PR-URL: #13744

gibfahn · 2018-01-15T22:02:25Z

Release team decided not to land on v6.x, if you disagree let us know.

nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. cares Issues and PRs related to the c-ares dependency or the cares_wrap binding. dns Issues and PRs related to the dns subsystem. labels Jun 16, 2017

addaleax added wip Issues and PRs that are still a work in progress. semver-minor PRs that contain new features and should be released in the next minor version. labels Jun 16, 2017

update the test cases and documentation

92f8619

XadillaX changed the title ~~[WIP]dns: make dns.setServers support customized port~~ dns: make dns.setServers support customized port Jun 16, 2017

addaleax removed the wip Issues and PRs that are still a work in progress. label Jun 16, 2017

refack approved these changes Jun 16, 2017

View reviewed changes

update after reviewing

41da7fa

refack previously approved these changes Jun 16, 2017

View reviewed changes

addaleax mentioned this pull request Jun 17, 2017

dns: add resolveAny support #13137

Closed

14 tasks

refack reviewed Jun 19, 2017

View reviewed changes

mcollina approved these changes Jun 19, 2017

View reviewed changes

refack reviewed Jun 19, 2017

View reviewed changes

refack closed this Jun 20, 2017

XadillaX mentioned this pull request Jun 21, 2017

v8.2.0 proposal #13744

Merged

refack mentioned this pull request Jul 15, 2017

Feature. Set DNS server port for DNS client #7903

Closed

gibfahn added the dont-land-on-v6.x label Jan 15, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dns: make `dns.setServers` support customized port #13723

dns: make `dns.setServers` support customized port #13723

XadillaX commented Jun 16, 2017 •

edited

Loading

XadillaX commented Jun 16, 2017

silverwind commented Jun 16, 2017

silverwind commented Jun 16, 2017 •

edited

Loading

XadillaX commented Jun 16, 2017 •

edited

Loading

refack left a comment

refack Jun 16, 2017

refack Jun 16, 2017

refack Jun 16, 2017

refack Jun 16, 2017

refack Jun 16, 2017

refack Jun 16, 2017

refack commented Jun 16, 2017

XadillaX commented Jun 16, 2017

silverwind commented Jun 16, 2017 •

edited

Loading

refack left a comment •

edited

Loading

refack commented Jun 16, 2017

XadillaX commented Jun 18, 2017

refack commented Jun 19, 2017 •

edited

Loading

refack Jun 19, 2017

refack Jun 19, 2017 •

edited

Loading

XadillaX commented Jun 19, 2017

mcollina left a comment

refack commented Jun 19, 2017

refack Jun 19, 2017

refack Jun 19, 2017

refack Jun 19, 2017

refack Jun 19, 2017 •

edited

Loading

XadillaX commented Jun 19, 2017

refack commented Jun 20, 2017

refack commented Jun 20, 2017

gibfahn commented Jan 15, 2018

		@@ -484,10 +496,20 @@ added: v0.11.3
		-->
		- `servers` {string[]}

dns: make dns.setServers support customized port #13723

dns: make dns.setServers support customized port #13723

Conversation

XadillaX commented Jun 16, 2017 • edited Loading

Checklist

Affected core subsystem(s)

XadillaX commented Jun 16, 2017

silverwind commented Jun 16, 2017

silverwind commented Jun 16, 2017 • edited Loading

XadillaX commented Jun 16, 2017 • edited Loading

refack left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

refack commented Jun 16, 2017

XadillaX commented Jun 16, 2017

silverwind commented Jun 16, 2017 • edited Loading

refack left a comment • edited Loading

Choose a reason for hiding this comment

refack commented Jun 16, 2017

XadillaX commented Jun 18, 2017

refack commented Jun 19, 2017 • edited Loading

Choose a reason for hiding this comment

refack Jun 19, 2017 • edited Loading

Choose a reason for hiding this comment

XadillaX commented Jun 19, 2017

mcollina left a comment

Choose a reason for hiding this comment

refack commented Jun 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

refack Jun 19, 2017 • edited Loading

Choose a reason for hiding this comment

XadillaX commented Jun 19, 2017

refack commented Jun 20, 2017

refack commented Jun 20, 2017

gibfahn commented Jan 15, 2018

dns: make `dns.setServers` support customized port #13723

dns: make `dns.setServers` support customized port #13723

XadillaX commented Jun 16, 2017 •

edited

Loading

silverwind commented Jun 16, 2017 •

edited

Loading

XadillaX commented Jun 16, 2017 •

edited

Loading

silverwind commented Jun 16, 2017 •

edited

Loading

refack left a comment •

edited

Loading

refack commented Jun 19, 2017 •

edited

Loading

refack Jun 19, 2017 •

edited

Loading

refack Jun 19, 2017 •

edited

Loading