Revert "inspector: move process.binding to internalBinding"

This reverts commit c168672. PR-URL: #25446 Reviewed-By: Anna Henningsen <[email protected]>
nodejs · Jan 14, 2019 · 8cc9757 · 8cc9757
1 parent 1805236
commit 8cc9757
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 11 deletions.
diff --git a/lib/inspector.js b/lib/inspector.js
@@ -11,7 +11,7 @@ const {
 } = require('internal/errors').codes;
 const { validateString } = require('internal/validators');
 const util = require('util');
-const { Connection, open, url } = internalBinding('inspector');
+const { Connection, open, url } = process.binding('inspector');
 
 if (!Connection)
   throw new ERR_INSPECTOR_NOT_AVAILABLE();

diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -85,7 +85,6 @@
     'fs_event_wrap',
     'http_parser',
     'icu',
-    'inspector',
     'js_stream',
     'natives',
     'os',

diff --git a/lib/internal/inspector_async_hook.js b/lib/internal/inspector_async_hook.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const inspector = internalBinding('inspector');
+const inspector = process.binding('inspector');
 
 if (!inspector || !inspector.asyncTaskScheduled) {
   exports.setup = function() {};

diff --git a/lib/internal/modules/cjs/helpers.js b/lib/internal/modules/cjs/helpers.js
@@ -108,7 +108,7 @@ if (getOptionValue('--experimental-worker')) {
   builtinLibs.sort();
 }
 
-if (typeof internalBinding('inspector').open === 'function') {
+if (typeof process.binding('inspector').open === 'function') {
   builtinLibs.push('inspector');
   builtinLibs.sort();
 }

diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -706,7 +706,7 @@ Module.prototype._compile = function(content, filename) {
     // Set breakpoint on module start
     if (filename === resolvedArgv) {
       delete process._breakFirstLine;
-      inspectorWrapper = internalBinding('inspector').callAndPauseOnStart;
+      inspectorWrapper = process.binding('inspector').callAndPauseOnStart;
     }
   }
   var dirname = path.dirname(filename);

diff --git a/lib/internal/modules/esm/module_job.js b/lib/internal/modules/esm/module_job.js
@@ -73,7 +73,7 @@ class ModuleJob {
     try {
       if (this.isMain && process._breakFirstLine) {
         delete process._breakFirstLine;
-        const initWrapper = internalBinding('inspector').callAndPauseOnStart;
+        const initWrapper = process.binding('inspector').callAndPauseOnStart;
         initWrapper(this.module.instantiate, this.module);
       } else {
         this.module.instantiate();

diff --git a/lib/internal/process/coverage.js b/lib/internal/process/coverage.js
@@ -51,7 +51,7 @@ function disableAllAsyncHooks() {
 exports.writeCoverage = writeCoverage;
 
 function setup() {
-  const { Connection } = internalBinding('inspector');
+  const { Connection } = process.binding('inspector');
   if (!Connection) {
     console.warn('inspector not enabled');
     return;

diff --git a/src/inspector_js_api.cc b/src/inspector_js_api.cc
@@ -315,5 +315,5 @@ void Initialize(Local<Object> target, Local<Value> unused,
 }  // namespace inspector
 }  // namespace node
 
-NODE_MODULE_CONTEXT_AWARE_INTERNAL(inspector,
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(inspector,
                                   node::inspector::Initialize);
diff --git a/src/node.cc b/src/node.cc
@@ -2238,5 +2238,5 @@ int Start(int argc, char** argv) {
 #if !HAVE_INSPECTOR
 void Initialize() {}
 
-NODE_MODULE_CONTEXT_AWARE_INTERNAL(inspector, Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(inspector, Initialize)
 #endif  // !HAVE_INSPECTOR
diff --git a/test/parallel/test-process-binding-internalbinding-whitelist.js b/test/parallel/test-process-binding-internalbinding-whitelist.js
@@ -16,5 +16,4 @@ assert(process.binding('url'));
 assert(process.binding('spawn_sync'));
 assert(process.binding('js_stream'));
 assert(process.binding('buffer'));
-assert(process.binding('inspector'));
 assert(process.binding('os'));
diff --git a/test/sequential/test-async-wrap-getasyncid.js b/test/sequential/test-async-wrap-getasyncid.js
@@ -291,7 +291,7 @@ if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check
 
 if (process.config.variables.v8_enable_inspector !== 0 &&
     common.isMainThread) {
-  const binding = internalBinding('inspector');
+  const binding = process.binding('inspector');
   const handle = new binding.Connection(() => {});
   testInitialized(handle, 'Connection');
   handle.disconnect();