dns: default to verbatim=true in dns.lookup()

doc/api/dns.md

@@ -163,6 +163,9 @@ section if a custom port is used.
 <!-- YAML
 added: v0.1.90
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/37681
+    description: The `verbatim` options defaults to `true` now.
   - version: v8.5.0
     pr-url: https://github.com/nodejs/node/pull/14731
     description: The `verbatim` option is supported now.
@@ -183,9 +186,7 @@ changes:
   * `verbatim` {boolean} When `true`, the callback receives IPv4 and IPv6
     addresses in the order the DNS resolver returned them. When `false`,
     IPv4 addresses are placed before IPv6 addresses.
-    **Default:** currently `false` (addresses are reordered) but this is
-    expected to change in the not too distant future.
-    New code should use `{ verbatim: true }`.
+    **Default:** `true`.
 * `callback` {Function}
   * `err` {Error}
   * `address` {string} A string representation of an IPv4 or IPv6 address.

lib/dns.js

@@ -96,7 +96,7 @@ function lookup(hostname, options, callback) {
   let hints = 0;
   let family = -1;
   let all = false;
-  let verbatim = false;
+  let verbatim = true;
 
   // Parse arguments
   if (hostname) {
@@ -113,7 +113,7 @@ function lookup(hostname, options, callback) {
       hints = options.hints >>> 0;
       family = options.family >>> 0;
       all = options.all === true;
-      verbatim = options.verbatim === true;
+      verbatim = options.verbatim !== false;
 
       validateHints(hints);
     } else {

lib/internal/dns/promises.js

@@ -103,7 +103,7 @@ function lookup(hostname, options) {
   var hints = 0;
   var family = -1;
   var all = false;
-  var verbatim = false;
+  var verbatim = true;
 
   // Parse arguments
   if (hostname && typeof hostname !== 'string') {
@@ -112,7 +112,7 @@ function lookup(hostname, options) {
     hints = options.hints >>> 0;
     family = options.family >>> 0;
     all = options.all === true;
-    verbatim = options.verbatim === true;
+    verbatim = options.verbatim !== false;
 
     validateHints(hints);
   } else {

test/common/inspector-helper.js

@@ -393,7 +393,7 @@ class NodeInstance extends EventEmitter {
     console.log('[test]', `Testing ${path}`);
     const headers = hostHeaderValue ? { 'Host': hostHeaderValue } : null;
     return this.portPromise.then((port) => new Promise((resolve, reject) => {
-      const req = http.get({ host, port, path, headers }, (res) => {
+      const req = http.get({ host, family: 4, port, path, headers }, (res) => {
         let response = '';
         res.setEncoding('utf8');
         res
@@ -418,6 +418,7 @@ class NodeInstance extends EventEmitter {
     const devtoolsUrl = response[0].webSocketDebuggerUrl;
     const port = await this.portPromise;
     return http.get({
+      family: 4,
       port,
       path: parseURL(devtoolsUrl).path,
       headers: {

test/parallel/test-cluster-message.js

@@ -111,7 +111,7 @@ if (cluster.isWorker) {
   // When a TCP server is listening in the worker connect to it
   worker.on('listening', function(address) {
 
-    client = net.connect(address.port, function() {
+    client = net.connect(address.port, '127.0.0.1', function() {
       // Send message to worker.
       worker.send('message from primary');
     });

test/parallel/test-http-localaddress.js

@@ -41,6 +41,7 @@ const server = http.createServer((req, res) => {
 
 server.listen(0, '127.0.0.1', () => {
   const options = { host: 'localhost',
+                    family: 4,
                     port: server.address().port,
                     path: '/',
                     method: 'GET',

test/parallel/test-http-upgrade-client.js

@@ -67,6 +67,7 @@ server.listen(0, '127.0.0.1', common.mustCall(function() {
 
   headers.forEach(function(h) {
     const req = http.get({
+      host: '127.0.0.1',
       port: port,
       headers: h
     });

test/parallel/test-http2-connect-options.js

@@ -25,7 +25,7 @@ server.listen(0, '127.0.0.1', common.mustCall(() => {
   const options = { localAddress: '127.0.0.2' };
 
   const client = http2.connect(
-    'http://localhost:' + server.address().port,
+    'http://127.0.0.1:' + server.address().port,
     options
   );
   const req = client.request({

test/parallel/test-https-localaddress.js

@@ -51,6 +51,7 @@ const server = https.createServer(options, function(req, res) {
 server.listen(0, '127.0.0.1', function() {
   const options = {
     host: 'localhost',
+    family: 4,
     port: this.address().port,
     path: '/',
     method: 'GET',

test/parallel/test-net-connect-options-port.js

@@ -83,7 +83,7 @@ const net = require('net');
     }
   }, expectedConnections));
 
-  server.listen(0, 'localhost', common.mustCall(() => {
+  server.listen(0, '127.0.0.1', common.mustCall(() => {
     const port = server.address().port;
 
     // Total connections = 3 * 4(canConnect) * 6(doConnect) = 72
@@ -167,25 +167,25 @@ function canConnect(port) {
   const noop = () => common.mustCall();
 
   // connect(port, cb) and connect(port)
-  const portArgFunctions = doConnect([port], noop);
+  const portArgFunctions = doConnect([port, '127.0.0.1'], noop);
   for (const fn of portArgFunctions) {
     fn();
   }
 
   // connect(port, host, cb) and connect(port, host)
-  const portHostArgFunctions = doConnect([port, 'localhost'], noop);
+  const portHostArgFunctions = doConnect([port, '127.0.0.1'], noop);
   for (const fn of portHostArgFunctions) {
     fn();
   }
 
   // connect({port}, cb) and connect({port})
-  const portOptFunctions = doConnect([{ port }], noop);
+  const portOptFunctions = doConnect([{ port, family: 4 }], noop);
   for (const fn of portOptFunctions) {
     fn();
   }
 
   // connect({port, host}, cb) and connect({port, host})
-  const portHostOptFns = doConnect([{ port, host: 'localhost' }], noop);
+  const portHostOptFns = doConnect([{ port, host: '127.0.0.1' }], noop);
   for (const fn of portHostOptFns) {
     fn();
   }
@@ -205,13 +205,13 @@ function asyncFailToConnect(port) {
   }
 
   // connect({port}, cb) and connect({port})
-  const portOptFunctions = doConnect([{ port }], dont);
+  const portOptFunctions = doConnect([{ port, family: 4 }], dont);
   for (const fn of portOptFunctions) {
     fn().on('error', onError());
   }
 
   // connect({port, host}, cb) and connect({port, host})
-  const portHostOptFns = doConnect([{ port, host: 'localhost' }], dont);
+  const portHostOptFns = doConnect([{ port, host: '127.0.0.1' }], dont);
   for (const fn of portHostOptFns) {
     fn().on('error', onError());
   }

test/parallel/test-net-dns-lookup.js

@@ -30,7 +30,7 @@ const server = net.createServer(function(client) {
 });
 
 server.listen(0, '127.0.0.1', common.mustCall(function() {
-  net.connect(this.address().port, 'localhost')
+  net.connect({ port: this.address().port, host: 'localhost', family: 4 })
     .on('lookup', common.mustCall(function(err, ip, type, host) {
       assert.strictEqual(err, null);
       assert.strictEqual(ip, '127.0.0.1');

test/parallel/test-net-pingpong.js

@@ -81,11 +81,11 @@ function pingPongTest(port, host) {
   }
 
 
-  server.listen(port, host, common.mustCall(function() {
+  server.listen(port, '127.0.0.1', common.mustCall(function() {
     if (this.address().port)
       port = this.address().port;
 
-    const client = net.createConnection(port, host);
+    const client = net.createConnection(port, '127.0.0.1');
 
     client.setEncoding('ascii');
     client.on('connect', common.mustCall(function() {
@@ -130,6 +130,4 @@ const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
 pingPongTest(common.PIPE);
 pingPongTest(0);
-pingPongTest(0, 'localhost');
-if (common.hasIPv6)
-  pingPongTest(0, '::1');
+pingPongTest(0, '127.0.0.1');

test/parallel/test-net-remote-address-port.js

@@ -48,9 +48,9 @@ const server = net.createServer(common.mustCall(function(socket) {
   socket.resume();
 }, 2));
 
-server.listen(0, 'localhost', function() {
-  const client = net.createConnection(this.address().port, 'localhost');
-  const client2 = net.createConnection(this.address().port);
+server.listen(0, '127.0.0.1', function() {
+  const client = net.createConnection(this.address().port, '127.0.0.1');
+  const client2 = net.createConnection(this.address().port, '127.0.0.1');
   client.on('connect', function() {
     assert.ok(remoteAddrCandidates.includes(client.remoteAddress));
     assert.ok(remoteFamilyCandidates.includes(client.remoteFamily));

test/parallel/test-net-writable.js

@@ -6,8 +6,8 @@ const net = require('net');
 const server = net.createServer(common.mustCall(function(s) {
   server.close();
   s.end();
-})).listen(0, 'localhost', common.mustCall(function() {
-  const socket = net.connect(this.address().port, 'localhost');
+})).listen(0, '127.0.0.1', common.mustCall(function() {
+  const socket = net.connect(this.address().port, '127.0.0.1');
   socket.on('end', common.mustCall(() => {
     assert.strictEqual(socket.writable, true);
     socket.write('hello world');

test/parallel/test-tcp-wrap-listen.js

@@ -84,7 +84,7 @@ server.onconnection = (err, client) => {
 
 const net = require('net');
 
-const c = net.createConnection(port);
+const c = net.createConnection(port, '127.0.0.1');
 
 c.on('connect', common.mustCall(() => { c.end('hello world'); }));
 

test/parallel/test-timers-socket-timeout-removes-other-socket-unref-timer.js

@@ -32,12 +32,14 @@ server.listen(0, common.localhostIPv4, common.mustCall(() => {
   const countdown = new Countdown(2, () => server.close());
 
   {
-    const client = net.connect({ port: server.address().port });
+    const client = net.connect({ port: server.address().port,
+                                 host: '127.0.0.1' });
     client.on('end', () => countdown.dec());
   }
 
   {
-    const client = net.connect({ port: server.address().port });
+    const client = net.connect({ port: server.address().port,
+                                 host: '127.0.0.1' });
     client.on('end', () => countdown.dec());
   }
 }));

test/parallel/test-tls-client-getephemeralkeyinfo.js

@@ -40,6 +40,7 @@ function test(size, type, name, cipher) {
   server.listen(0, '127.0.0.1', common.mustCall(() => {
     const client = tls.connect({
       port: server.address().port,
+      host: '127.0.0.1',
       rejectUnauthorized: false
     }, common.mustCall(function() {
       const ekeyinfo = client.getEphemeralKeyInfo();

test/parallel/test-tls-client-mindhsize.js

@@ -41,6 +41,7 @@ function test(size, err, next) {
     const client = tls.connect({
       minDHSize: 2048,
       port: this.address().port,
+      host: '127.0.0.1',
       rejectUnauthorized: false
     }, function() {
       nsuccess++;

test/parallel/test-tls-wrap-econnreset-localaddress.js

@@ -16,6 +16,7 @@ const server = net.createServer((c) => {
   let errored = false;
   tls.connect({
     port: port,
+    family: 4,
     localAddress: common.localhostIPv4
   }, common.localhostIPv4)
     .once('error', common.mustCall((e) => {

test/sequential/test-https-connect-localport.js

@@ -17,7 +17,7 @@ const assert = require('assert');
     res.end();
   }));
 
-  server.listen(0, 'localhost', common.mustCall(() => {
+  server.listen(0, '127.0.0.1', common.mustCall(() => {
     const port = server.address().port;
     const req = https.get({
       host: 'localhost',

test/sequential/test-inspector-open.js

@@ -80,7 +80,7 @@ function reopenAfterClose(msg) {
 }
 
 function ping(port, callback) {
-  net.connect(port)
+  net.connect(port, '127.0.0.1')
     .on('connect', function() { close(this); })
     .on('error', function(err) { close(this, err); });
 

test/sequential/test-net-better-error-messages-port.js

@@ -3,7 +3,7 @@ const common = require('../common');
 const net = require('net');
 const assert = require('assert');
 
-const c = net.createConnection(common.PORT);
+const c = net.createConnection(common.PORT, common.localhostIPv4);
 
 c.on('connect', common.mustNotCall());
 

test/sequential/test-net-connect-local-error.js

@@ -10,14 +10,16 @@ const expectedErrorCodes = ['ECONNREFUSED', 'EADDRINUSE'];
 const optionsIPv4 = {
   port: common.PORT,
   localPort: common.PORT + 1,
-  localAddress: common.localhostIPv4
+  localAddress: common.localhostIPv4,
+  family: 4
 };
 
 const optionsIPv6 = {
   host: '::1',
   port: common.PORT + 2,
   localPort: common.PORT + 3,
   localAddress: '::1',
+  family: 6
 };
 
 function onError(err, options) {