REVIEW: Address node api changes

codebytere · deepak1556 · commit d375b501c3a8 · 2018-01-06T19:02:53.000+05:30
- Always start the inspector agent for nodejs/node#17085 - Set the tracing controller for node nodejs/node#15538 - Isolate data creation now requires plaform nodejs/node#16700
diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc
@@ -10,6 +10,7 @@
 #include "atom/common/api/atom_bindings.h"
 #include "atom/common/crash_reporter/crash_reporter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/node_bindings.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/task_scheduler/task_scheduler.h"
@@ -48,14 +49,16 @@ int NodeMain(int argc, char *argv[]) {
     // Initialize gin::IsolateHolder.
     JavascriptEnvironment gin_env;
 
+    // Explicitly register electron's builtin modules.
+    NodeBindings::RegisterBuiltinModules();
+
     int exec_argc;
     const char** exec_argv;
     node::Init(&argc, const_cast<const char**>(argv), &exec_argc, &exec_argv);
 
-    node::IsolateData isolate_data(gin_env.isolate(), loop);
     node::Environment* env = node::CreateEnvironment(
-        &isolate_data, gin_env.context(), argc, argv,
-        exec_argc, exec_argv);
+        node::CreateIsolateData(gin_env.isolate(), loop, gin_env.platform()),
+        gin_env.context(), argc, argv, exec_argc, exec_argv);
 
     // Enable support for v8 inspector.
     NodeDebugger node_debugger(env);
@@ -77,6 +80,7 @@ int NodeMain(int argc, char *argv[]) {
     bool more;
     do {
       more = uv_run(env->event_loop(), UV_RUN_ONCE);
+      gin_env.platform()->DrainBackgroundTasks(env->isolate());
       if (more == false) {
         node::EmitBeforeExit(env);
 
@@ -90,6 +94,8 @@ int NodeMain(int argc, char *argv[]) {
 
     exit_code = node::EmitExit(env);
     node::RunAtExit(env);
+    gin_env.platform()->DrainBackgroundTasks(env->isolate());
+    gin_env.platform()->CancelPendingDelayedTasks(env->isolate());
 
     node::FreeEnvironment(env);
   }
diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc
@@ -135,8 +135,8 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
   node_bindings_->Initialize();
 
   // Create the global environment.
-  node::Environment* env =
-      node_bindings_->CreateEnvironment(js_env_->context());
+  node::Environment* env = node_bindings_->CreateEnvironment(
+      js_env_->context(), js_env_->platform());
   node_env_.reset(new NodeEnvironment(env));
 
   // Enable support for v8 inspector
diff --git a/atom/browser/javascript_environment.cc b/atom/browser/javascript_environment.cc
@@ -15,6 +15,7 @@
 #include "gin/v8_initializer.h"
 
 #include "atom/common/node_includes.h"
+#include "vendor/node/src/tracing/trace_event.h"
 
 namespace atom {
 
@@ -50,7 +51,8 @@ bool JavascriptEnvironment::Initialize() {
   platform_ = node::CreatePlatform(
       base::RecommendedMaxNumberOfThreadsInPool(3, 8, 0.1, 0), nullptr);
   v8::V8::InitializePlatform(platform_);
-
+  node::tracing::TraceEventHelper::SetTracingController(
+      new v8::TracingController());
   gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
                                  gin::IsolateHolder::kStableV8Extras,
                                  gin::ArrayBufferAllocator::SharedInstance(),
diff --git a/atom/browser/node_debugger.cc b/atom/browser/node_debugger.cc
@@ -34,17 +34,16 @@ void NodeDebugger::Start(node::MultiIsolatePlatform* platform) {
 #endif
   }
 
-  if (options.inspector_enabled()) {
-    // Set process._debugWaitConnect if --inspect-brk was specified to stop
-    // the debugger on the first line
-    if (options.wait_for_connect()) {
-      mate::Dictionary process(env_->isolate(), env_->process_object());
-      process.Set("_breakFirstLine", true);
-    }
-
-    inspector->Start(static_cast<node::NodePlatform*>(platform),
-    nullptr, options);
+  // Set process._debugWaitConnect if --inspect-brk was specified to stop
+  // the debugger on the first line
+  if (options.wait_for_connect()) {
+    mate::Dictionary process(env_->isolate(), env_->process_object());
+    process.Set("_breakFirstLine", true);
   }
+
+  inspector->Start(static_cast<node::NodePlatform*>(platform), nullptr,
+                   options);
+  DCHECK(env_->inspector_agent()->IsStarted());
 }
 
 }  // namespace atom
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
@@ -122,12 +122,6 @@ base::FilePath GetResourcesPath(bool is_browser) {
   return resources_path;
 }
 
-void RegisterBuiltinModules() {
-#define V(modname) _register_##modname();
-  ELECTRON_BUILTIN_MODULES(V)
-#undef V
-}
-
 }  // namespace
 
 NodeBindings::NodeBindings(BrowserEnvironment browser_env)
@@ -161,6 +155,12 @@ NodeBindings::~NodeBindings() {
     stop_and_close_uv_loop(uv_loop_);
 }
 
+void NodeBindings::RegisterBuiltinModules() {
+#define V(modname) _register_##modname();
+  ELECTRON_BUILTIN_MODULES(V)
+#undef V
+}
+
 void NodeBindings::Initialize() {
   // Open node's error reporting system for browser process.
   node::g_standalone_mode = browser_env_ == BROWSER;
@@ -172,13 +172,13 @@ void NodeBindings::Initialize() {
     AtomCommandLine::InitializeFromCommandLine();
 #endif
 
+  // Explicitly register electron's builtin modules.
+  RegisterBuiltinModules();
+
   // Init node.
   // (we assume node::Init would not modify the parameters under embedded mode).
   node::Init(nullptr, nullptr, nullptr, nullptr);
 
-  // Explicitly register electron's builtin modules.
-  RegisterBuiltinModules();
-
 #if defined(OS_WIN)
   // uv_init overrides error mode to suppress the default crash dialog, bring
   // it back if user wants to show it.
@@ -189,7 +189,8 @@ void NodeBindings::Initialize() {
 }
 
 node::Environment* NodeBindings::CreateEnvironment(
-    v8::Handle<v8::Context> context) {
+    v8::Handle<v8::Context> context,
+    node::MultiIsolatePlatform* platform) {
   auto args = AtomCommandLine::argv();
 
   // Feed node the path to initialization script.
@@ -215,8 +216,8 @@ node::Environment* NodeBindings::CreateEnvironment(
 
   std::unique_ptr<const char*[]> c_argv = StringVectorToArgArray(args);
   node::Environment* env = node::CreateEnvironment(
-      new node::IsolateData(context->GetIsolate(), uv_loop_), context,
-      args.size(), c_argv.get(), 0, nullptr);
+      node::CreateIsolateData(context->GetIsolate(), uv_loop_, platform),
+      context, args.size(), c_argv.get(), 0, nullptr);
 
   if (browser_env_ == BROWSER) {
     // SetAutorunMicrotasks is no longer called in node::CreateEnvironment
diff --git a/atom/common/node_bindings.h b/atom/common/node_bindings.h
@@ -17,6 +17,7 @@ class MessageLoop;
 
 namespace node {
 class Environment;
+class MultiIsolatePlatform;
 }
 
 namespace atom {
@@ -30,14 +31,17 @@ class NodeBindings {
   };
 
   static NodeBindings* Create(BrowserEnvironment browser_env);
+  static void RegisterBuiltinModules();
 
   virtual ~NodeBindings();
 
   // Setup V8, libuv.
   void Initialize();
 
   // Create the environment and load node.js.
-  node::Environment* CreateEnvironment(v8::Handle<v8::Context> context);
+  node::Environment* CreateEnvironment(
+      v8::Handle<v8::Context> context,
+      node::MultiIsolatePlatform* platform = nullptr);
 
   // Load node.js in the environment.
   void LoadEnvironment(node::Environment* env);
diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
@@ -25,6 +25,7 @@
 
 #include "atom/common/node_includes.h"
 #include "atom_natives.h"  // NOLINT: This file is generated with js2c
+#include "vendor/node/src/tracing/trace_event.h"
 
 namespace atom {
 
@@ -95,6 +96,11 @@ void AtomRendererClient::DidCreateScriptContext(
     node_bindings_->PrepareMessageLoop();
   }
 
+  // Setup node tracing controller.
+  if (!node::tracing::TraceEventHelper::GetTracingController())
+    node::tracing::TraceEventHelper::SetTracingController(
+        new v8::TracingController());
+
   // Setup node environment for each window.
   node::Environment* env = node_bindings_->CreateEnvironment(context);
 
diff --git a/atom/renderer/atom_sandboxed_renderer_client.cc b/atom/renderer/atom_sandboxed_renderer_client.cc
@@ -11,6 +11,7 @@
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/native_mate_converters/v8_value_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_bindings.h"
 #include "atom/common/options_switches.h"
 #include "atom/renderer/api/atom_api_renderer_ipc.h"
 #include "atom/renderer/atom_render_view_observer.h"
@@ -136,6 +137,8 @@ class AtomSandboxedRenderViewObserver : public AtomRenderViewObserver {
 
 
 AtomSandboxedRendererClient::AtomSandboxedRendererClient() {
+  // Explicitly register electron's builtin modules.
+  NodeBindings::RegisterBuiltinModules();
 }
 
 AtomSandboxedRendererClient::~AtomSandboxedRendererClient() {
diff --git a/vendor/node b/vendor/node
@@ -1 +1 @@
-Subproject commit 58925be1434661fbac3a8659c5ff139cd411831d
+Subproject commit 7fe5e2f60f6f40363ec0d77fd17b241208663534
