dns: make process.binding('cares_wrap') internal

PR-URL: #22474 Refs: #22160 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
nodejs · Aug 30, 2018 · 8b0c482 · 8b0c482
1 parent 6046570
commit 8b0c482
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 12 deletions.
diff --git a/lib/dns.js b/lib/dns.js
@@ -21,7 +21,8 @@
 
 'use strict';
 
-const cares = process.binding('cares_wrap');
+const { internalBinding } = require('internal/bootstrap/loaders');
+const cares = internalBinding('cares_wrap');
 const { isIP, isIPv4, isLegalPort } = require('internal/net');
 const { customPromisifyArgs } = require('internal/util');
 const errors = require('internal/errors');

diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
@@ -348,6 +348,7 @@
     // internalBinding.
     const internalBindingWhitelist =
       new SafeSet([
+        'cares_wrap',
         'fs_event_wrap',
         'uv',
         'pipe_wrap',

diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js
@@ -6,14 +6,15 @@ const {
 } = require('internal/dns/utils');
 const { codes, dnsException } = require('internal/errors');
 const { isIP, isIPv4, isLegalPort } = require('internal/net');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   getaddrinfo,
   getnameinfo,
   ChannelWrap,
   GetAddrInfoReqWrap,
   GetNameInfoReqWrap,
   QueryReqWrap
-} = process.binding('cares_wrap');
+} = internalBinding('cares_wrap');
 const {
   ERR_INVALID_ARG_TYPE,
   ERR_INVALID_OPT_VALUE,

diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
@@ -1,12 +1,13 @@
 'use strict';
 const errors = require('internal/errors');
 const { isIP } = require('internal/net');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   ChannelWrap,
   strerror,
   AI_ADDRCONFIG,
   AI_V4MAPPED
-} = process.binding('cares_wrap');
+} = internalBinding('cares_wrap');
 const IANA_DNS_PORT = 53;
 const IPv6RE = /^\[([^[\]]*)\]/;
 const addrSplitRE = /(^.+?)(?::(\d+))?$/;

diff --git a/lib/internal/net.js b/lib/internal/net.js
@@ -1,7 +1,8 @@
 'use strict';
 
 const Buffer = require('buffer').Buffer;
-const { isIPv6 } = process.binding('cares_wrap');
+const { internalBinding } = require('internal/bootstrap/loaders');
+const { isIPv6 } = internalBinding('cares_wrap');
 const { writeBuffer } = process.binding('fs');
 const errors = require('internal/errors');
 

diff --git a/lib/tls.js b/lib/tls.js
@@ -35,7 +35,7 @@ const { Buffer } = require('buffer');
 const EventEmitter = require('events');
 const { URL } = require('internal/url');
 const DuplexPair = require('internal/streams/duplexpair');
-const { canonicalizeIP } = process.binding('cares_wrap');
+const { canonicalizeIP } = internalBinding('cares_wrap');
 const _tls_common = require('_tls_common');
 const _tls_wrap = require('_tls_wrap');
 

diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
@@ -2238,4 +2238,4 @@ void Initialize(Local<Object> target,
 }  // namespace cares_wrap
 }  // namespace node
 
-NODE_BUILTIN_MODULE_CONTEXT_AWARE(cares_wrap, node::cares_wrap::Initialize)
+NODE_MODULE_CONTEXT_AWARE_INTERNAL(cares_wrap, node::cares_wrap::Initialize)
diff --git a/test/internet/test-dns.js b/test/internet/test-dns.js
@@ -1,3 +1,4 @@
+// Flags: --expose-internals
 // Copyright Joyent, Inc. and other Node contributors.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -22,6 +23,7 @@
 'use strict';
 const common = require('../common');
 const { addresses } = require('../common/internet');
+const { internalBinding } = require('internal/test/binding');
 const assert = require('assert');
 const dns = require('dns');
 const net = require('net');
@@ -674,7 +676,7 @@ let getaddrinfoCallbackCalled = false;
 
 console.log(`looking up ${addresses.INET4_HOST}..`);
 
-const cares = process.binding('cares_wrap');
+const cares = internalBinding('cares_wrap');
 const req = new cares.GetAddrInfoReqWrap();
 cares.getaddrinfo(req, addresses.INET4_HOST, 4,
   /* hints */ 0, /* verbatim */ true);

diff --git a/test/parallel/test-dns-lookup.js b/test/parallel/test-dns-lookup.js
@@ -3,12 +3,11 @@
 const common = require('../common');
 const { addresses } = require('../common/internet');
 const assert = require('assert');
-const cares = process.binding('cares_wrap');
+const { internalBinding } = require('internal/test/binding');
+const cares = internalBinding('cares_wrap');
 const dns = require('dns');
 const dnsPromises = dns.promises;
 
-const { internalBinding } = require('internal/test/binding');
-
 // Stub `getaddrinfo` to *always* error.
 cares.getaddrinfo = () => internalBinding('uv').UV_ENOENT;
 

diff --git a/test/parallel/test-tls-canonical-ip.js b/test/parallel/test-tls-canonical-ip.js
@@ -1,3 +1,4 @@
+// Flags: --expose-internals
 'use strict';
 require('../common');
 
@@ -6,7 +7,8 @@ require('../common');
 // of a TLS certificate
 
 const assert = require('assert');
-const { canonicalizeIP } = process.binding('cares_wrap');
+const { internalBinding } = require('internal/test/binding');
+const { canonicalizeIP } = internalBinding('cares_wrap');
 
 assert.strictEqual(canonicalizeIP('127.0.0.1'), '127.0.0.1');
 assert.strictEqual(canonicalizeIP('10.1.0.1'), '10.1.0.1');

diff --git a/test/sequential/test-async-wrap-getasyncid.js b/test/sequential/test-async-wrap-getasyncid.js
@@ -69,7 +69,7 @@ function testInitialized(req, ctor_name) {
 
 
 {
-  const cares = process.binding('cares_wrap');
+  const cares = internalBinding('cares_wrap');
   const dns = require('dns');
 
   testUninitialized(new cares.GetAddrInfoReqWrap(), 'GetAddrInfoReqWrap');