bootstrapper: move internalBinding to NativeModule

internalBinding is used so often that it should just automatically be available for usage in internals. PR-URL: #23025 Refs: 2a9eb31 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Backport-PR-URL: #23661 Backport-Reviewed-By: Gus Caplan <[email protected]> Backport-Reviewed-By: Richard Lau <[email protected]> Backport-Reviewed-By: Michaël Zasso <[email protected]> Backport-Reviewed-By: Joyee Cheung <[email protected]> Backport-Reviewed-By: Ruben Bridgewater <[email protected]>
nodejs · Nov 29, 2018 · e872089 · e872089
1 parent c854879
commit e872089
Show file tree

Hide file tree

Showing 51 changed files with 59 additions and 67 deletions.
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
@@ -44,3 +44,4 @@ globals:
   DCHECK_LE: false
   DCHECK_LT: false
   DCHECK_NE: false
+  internalBinding: false
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -24,7 +24,7 @@
 const util = require('util');
 const net = require('net');
 const url = require('url');
-const { HTTPParser } = process.binding('http_parser');
+const { HTTPParser } = internalBinding('http_parser');
 const assert = require('assert').ok;
 const {
   _checkIsHttpToken: checkIsHttpToken,

diff --git a/lib/_http_common.js b/lib/_http_common.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-const { methods, HTTPParser } = process.binding('http_parser');
+const { methods, HTTPParser } = internalBinding('http_parser');
 
 const FreeList = require('internal/freelist');
 const { ondrain } = require('internal/http');

diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -23,7 +23,7 @@
 
 const util = require('util');
 const net = require('net');
-const { HTTPParser } = process.binding('http_parser');
+const { HTTPParser } = internalBinding('http_parser');
 const assert = require('assert').ok;
 const {
   parsers,

diff --git a/lib/_tls_common.js b/lib/_tls_common.js
@@ -34,7 +34,7 @@ const { SSL_OP_CIPHER_SERVER_PREFERENCE } = process.binding('constants').crypto;
 // Lazily loaded
 var crypto = null;
 
-const { SecureContext: NativeSecureContext } = process.binding('crypto');
+const { SecureContext: NativeSecureContext } = internalBinding('crypto');
 
 function SecureContext(secureProtocol, secureOptions, context) {
   if (!(this instanceof SecureContext)) {

diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -32,9 +32,9 @@ const common = require('_tls_common');
 const { StreamWrap } = require('_stream_wrap');
 const { Buffer } = require('buffer');
 const debug = util.debuglog('tls');
-const tls_wrap = process.binding('tls_wrap');
-const { TCP, constants: TCPConstants } = process.binding('tcp_wrap');
-const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap');
+const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
+const tls_wrap = internalBinding('tls_wrap');
+const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
 const { owner_symbol } = require('internal/async_hooks').symbols;
 const {
   SecureContext: NativeSecureContext

diff --git a/lib/buffer.js b/lib/buffer.js
@@ -41,7 +41,6 @@ const {
 // that test/parallel/test-buffer-bindingobj-no-zerofill.js is written.
 let isAnyArrayBuffer;
 try {
-  const { internalBinding } = require('internal/bootstrap/loaders');
   isAnyArrayBuffer = internalBinding('types').isAnyArrayBuffer;
 } catch (e) {
   isAnyArrayBuffer = require('util').types.isAnyArrayBuffer;

diff --git a/lib/child_process.js b/lib/child_process.js
@@ -28,7 +28,7 @@ const {
 const { isArrayBufferView } = require('internal/util/types');
 const debug = util.debuglog('child_process');
 const { Buffer } = require('buffer');
-const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap');
+const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
 const {
   ERR_INVALID_ARG_VALUE,
   ERR_CHILD_PROCESS_IPC_REQUIRED,

diff --git a/lib/console.js b/lib/console.js
@@ -29,7 +29,7 @@ const {
     ERR_INVALID_ARG_VALUE,
   },
 } = require('internal/errors');
-const { previewEntries } = process.binding('util');
+const { previewEntries } = internalBinding('util');
 const { Buffer: { isBuffer } } = require('buffer');
 const util = require('util');
 const {

diff --git a/lib/dns.js b/lib/dns.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-const cares = process.binding('cares_wrap');
+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/domain.js b/lib/domain.js
@@ -34,7 +34,6 @@ const {
   ERR_UNHANDLED_ERROR
 } = require('internal/errors').codes;
 const { createHook } = require('async_hooks');
-const { internalBinding } = require('internal/bootstrap/loaders');
 
 // overwrite process.domain with a getter/setter that will allow for more
 // effective optimizations

diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js
@@ -4,7 +4,7 @@ const {
   ERR_ASYNC_TYPE,
   ERR_INVALID_ASYNC_ID
 } = require('internal/errors').codes;
-const async_wrap = process.binding('async_wrap');
+const async_wrap = internalBinding('async_wrap');
 /* async_hook_fields is a Uint32Array wrapping the uint32_t array of
  * Environment::AsyncHooks::fields_[]. Each index tracks the number of active
  * hooks for each type.

diff --git a/lib/internal/bash_completion.js b/lib/internal/bash_completion.js
@@ -1,5 +1,4 @@
 'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { getOptions } = internalBinding('options');
 
 function print(stream) {

diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -100,7 +100,15 @@
     internalBinding = function internalBinding(module) {
       let mod = bindingObj[module];
       if (typeof mod !== 'object') {
-        mod = bindingObj[module] = getInternalBinding(module);
+        try {
+          mod = getInternalBinding(module);
+        } catch {
+          // v10.x only: Fall back to `process.binding()`,
+          // to avoid future merge conflicts when backporting changes that use
+          // `internalBinding()` to v10.x.
+          mod = process.binding(module);
+        }
+        bindingObj[module] = mod;
         moduleLoadList.push(`Internal Binding ${module}`);
       }
       return mod;
@@ -223,7 +231,7 @@
   };
 
   NativeModule.wrapper = [
-    '(function (exports, require, module, process) {',
+    '(function (exports, require, module, process, internalBinding) {',
     '\n});'
   ];
 
@@ -294,7 +302,7 @@
       const requireFn = this.id.startsWith('internal/deps/') ?
         NativeModule.requireForDeps :
         NativeModule.require;
-      fn(this.exports, requireFn, this, process);
+      fn(this.exports, requireFn, this, process, internalBinding);
 
       if (config.experimentalModules && !NativeModule.isInternal(this.id)) {
         this.exportKeys = ObjectKeys(this.exports);

diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
@@ -21,12 +21,12 @@ const dgram = require('dgram');
 const util = require('util');
 const assert = require('assert');
 
-const { Process } = process.binding('process_wrap');
-const { WriteWrap } = process.binding('stream_wrap');
-const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap');
-const { TTY } = process.binding('tty_wrap');
-const { TCP } = process.binding('tcp_wrap');
-const { UDP } = process.binding('udp_wrap');
+const { Process } = internalBinding('process_wrap');
+const { WriteWrap } = internalBinding('stream_wrap');
+const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
+const { TCP } = internalBinding('tcp_wrap');
+const { TTY } = internalBinding('tty_wrap');
+const { UDP } = internalBinding('udp_wrap');
 const SocketList = require('internal/socket_list');
 const { owner_symbol } = require('internal/async_hooks').symbols;
 const { convertToValidSignal } = require('internal/util');

diff --git a/lib/internal/cluster/round_robin_handle.js b/lib/internal/cluster/round_robin_handle.js
@@ -2,7 +2,7 @@
 const assert = require('assert');
 const net = require('net');
 const { sendHelper } = require('internal/cluster/utils');
-const uv = process.binding('uv');
+const uv = internalBinding('uv');
 
 module.exports = RoundRobinHandle;
 

diff --git a/lib/internal/crypto/keygen.js b/lib/internal/crypto/keygen.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { AsyncWrap, Providers } = process.binding('async_wrap');
+const { AsyncWrap, Providers } = internalBinding('async_wrap');
 const {
   generateKeyPairRSA,
   generateKeyPairDSA,

diff --git a/lib/internal/crypto/pbkdf2.js b/lib/internal/crypto/pbkdf2.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { AsyncWrap, Providers } = process.binding('async_wrap');
+const { AsyncWrap, Providers } = internalBinding('async_wrap');
 const { Buffer } = require('buffer');
 const { pbkdf2: _pbkdf2 } = process.binding('crypto');
 const { validateUint32 } = require('internal/validators');

diff --git a/lib/internal/crypto/random.js b/lib/internal/crypto/random.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { AsyncWrap, Providers } = process.binding('async_wrap');
+const { AsyncWrap, Providers } = internalBinding('async_wrap');
 const { Buffer, kMaxLength } = require('buffer');
 const { randomBytes: _randomBytes } = process.binding('crypto');
 const {

diff --git a/lib/internal/crypto/scrypt.js b/lib/internal/crypto/scrypt.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { AsyncWrap, Providers } = process.binding('async_wrap');
+const { AsyncWrap, Providers } = internalBinding('async_wrap');
 const { Buffer } = require('buffer');
 const { scrypt: _scrypt } = process.binding('crypto');
 const { validateUint32 } = require('internal/validators');

diff --git a/lib/internal/crypto/sig.js b/lib/internal/crypto/sig.js
@@ -5,10 +5,7 @@ const {
   ERR_INVALID_OPT_VALUE
 } = require('internal/errors').codes;
 const { validateString } = require('internal/validators');
-const {
-  Sign: _Sign,
-  Verify: _Verify
-} = process.binding('crypto');
+const { Sign: _Sign, Verify: _Verify } = internalBinding('crypto');
 const {
   RSA_PSS_SALTLEN_AUTO,
   RSA_PKCS1_PADDING

diff --git a/lib/internal/dgram.js b/lib/internal/dgram.js
@@ -1,7 +1,7 @@
 'use strict';
 const assert = require('assert');
 const { codes } = require('internal/errors');
-const { UDP } = process.binding('udp_wrap');
+const { UDP } = internalBinding('udp_wrap');
 const { ERR_INVALID_ARG_TYPE, ERR_SOCKET_BAD_TYPE } = codes;
 const kStateSymbol = Symbol('state symbol');
 let dns;  // Lazy load for startup performance.

diff --git a/lib/internal/domexception.js b/lib/internal/domexception.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { registerDOMException } = internalBinding('messaging');
 const { ERR_INVALID_THIS } = require('internal/errors').codes;
 

diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
@@ -23,7 +23,6 @@ const {
 
 const { isArrayBufferView } = require('internal/util/types');
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   isArrayBuffer
 } = internalBinding('types');

diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
@@ -31,7 +31,6 @@ const {
     owner_symbol,
   },
 } = require('internal/async_hooks');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   codes: {
     ERR_HTTP2_ALTSVC_INVALID_ORIGIN,

diff --git a/lib/internal/http2/util.js b/lib/internal/http2/util.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const binding = process.binding('http2');
+const binding = internalBinding('http2');
 const {
   ERR_HTTP2_HEADER_SINGLE_VALUE,
   ERR_HTTP2_INVALID_CONNECTION_HEADERS,

diff --git a/lib/internal/modules/esm/create_dynamic_module.js b/lib/internal/modules/esm/create_dynamic_module.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { ModuleWrap } = internalBinding('module_wrap');
 const debug = require('util').debuglog('esm');
 const ArrayJoin = Function.call.bind(Array.prototype.join);

diff --git a/lib/internal/modules/esm/default_resolve.js b/lib/internal/modules/esm/default_resolve.js
@@ -3,7 +3,7 @@
 const { URL } = require('url');
 const CJSmodule = require('internal/modules/cjs/loader');
 const internalFS = require('internal/fs/utils');
-const { NativeModule, internalBinding } = require('internal/bootstrap/loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
 const { extname } = require('path');
 const { realpathSync } = require('fs');
 const preserveSymlinks = !!process.binding('config').preserveSymlinks;

diff --git a/lib/internal/modules/esm/module_job.js b/lib/internal/modules/esm/module_job.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { ModuleWrap } = internalBinding('module_wrap');
 const { SafeSet, SafePromise } = require('internal/safe_globals');
 const { decorateErrorStack } = require('internal/util');

diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { NativeModule, internalBinding } = require('internal/bootstrap/loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
 const { ModuleWrap } = internalBinding('module_wrap');
 const {
   stripShebang,

diff --git a/lib/internal/print_help.js b/lib/internal/print_help.js
@@ -1,5 +1,4 @@
 'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { getOptions, types } = internalBinding('options');
 
 const typeLookup = [];

diff --git a/lib/internal/process/esm_loader.js b/lib/internal/process/esm_loader.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   setImportModuleDynamicallyCallback,
   setInitializeImportMetaObjectCallback

diff --git a/lib/internal/process/promises.js b/lib/internal/process/promises.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { safeToString } = process.binding('util');
+const { safeToString } = internalBinding('util');
 
 const maybeUnhandledPromises = new WeakMap();
 const pendingUnhandledRejections = [];

diff --git a/lib/internal/process/stdio.js b/lib/internal/process/stdio.js
@@ -41,7 +41,7 @@ function getMainThreadStdio() {
 
   function getStdin() {
     if (stdin) return stdin;
-    const tty_wrap = process.binding('tty_wrap');
+    const tty_wrap = internalBinding('tty_wrap');
     const fd = 0;
 
     switch (tty_wrap.guessHandleType(fd)) {
@@ -157,7 +157,7 @@ function setupProcessStdio({ getStdout, getStdin, getStderr }) {
 
 function createWritableStdioStream(fd) {
   var stream;
-  const tty_wrap = process.binding('tty_wrap');
+  const tty_wrap = internalBinding('tty_wrap');
 
   // Note stream._type is used for test-module-load-list.js
 

diff --git a/lib/internal/stream_base_commons.js b/lib/internal/stream_base_commons.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const { Buffer } = require('buffer');
-const { WriteWrap } = process.binding('stream_wrap');
-const { UV_EOF } = process.binding('uv');
+const { WriteWrap } = internalBinding('stream_wrap');
+const { UV_EOF } = internalBinding('uv');
 const { errnoException } = require('internal/errors');
 const { owner_symbol } = require('internal/async_hooks').symbols;
 

diff --git a/lib/internal/test/binding.js b/lib/internal/test/binding.js
@@ -8,7 +8,7 @@ process.emitWarning(
 // These exports should be scoped as specifically as possible
 // to avoid exposing APIs because even with that warning and
 // this file being internal people will still try to abuse it.
-const { internalBinding } = require('internal/bootstrap/loaders');
 module.exports = {
   ModuleWrap: internalBinding('module_wrap').ModuleWrap,
+  internalBinding
 };
diff --git a/lib/internal/test/heap.js b/lib/internal/test/heap.js
@@ -5,7 +5,6 @@ process.emitWarning(
   'tracked by any versioning system or deprecation process.',
   'internal/test/heap');
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { createHeapDump, buildEmbedderGraph } = internalBinding('heap_utils');
 const assert = require('assert');
 

diff --git a/lib/internal/trace_events_async_hooks.js b/lib/internal/trace_events_async_hooks.js
@@ -1,7 +1,7 @@
 'use strict';
 
 exports.setup = function(traceEvents, traceEventCategory) {
-  const async_wrap = process.binding('async_wrap');
+  const async_wrap = internalBinding('async_wrap');
   const async_hooks = require('async_hooks');
 
   // Use small letters such that chrome://tracing groups by the name.

diff --git a/lib/internal/util.js b/lib/internal/util.js
@@ -6,7 +6,6 @@ const {
   ERR_UNKNOWN_SIGNAL
 } = require('internal/errors').codes;
 const { signals } = process.binding('constants').os;
-
 const {
   getHiddenValue,
   setHiddenValue,

diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js
@@ -2,8 +2,12 @@
 
 const { compare } = process.binding('buffer');
 const { isArrayBufferView } = require('internal/util/types');
-const { internalBinding } = require('internal/bootstrap/loaders');
-const { isDate, isMap, isRegExp, isSet } = internalBinding('types');
+const {
+  isDate,
+  isMap,
+  isRegExp,
+  isSet
+} = internalBinding('types');
 const {
   getOwnNonIndexProperties,
   propertyFilter: {

diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
-
 const {
   getOwnNonIndexProperties,
   getPromiseDetails,