Define our own Node entry

Chromium's V8 is using external startup snapshot file while Node does
not, so we have to use Chromium's gin for V8 initialization.

atom.gyp

@@ -65,6 +65,8 @@
       'atom/app/atom_main_delegate.cc',
       'atom/app/atom_main_delegate.h',
       'atom/app/atom_main_delegate_mac.mm',
+      'atom/app/node_main.cc',
+      'atom/app/node_main.h',
       'atom/browser/api/atom_api_app.cc',
       'atom/browser/api/atom_api_app.h',
       'atom/browser/api/atom_api_auto_updater.cc',
@@ -548,6 +550,8 @@
         'SK_SUPPORT_LEGACY_GETTOPDEVICE',
         # Disable warnings for g_settings_list_schemas.
         'GLIB_DISABLE_DEPRECATION_WARNINGS',
+        # Defined in V8.
+        'V8_USE_EXTERNAL_STARTUP_DATA',
       ],
       'sources': [
         '<@(lib_sources)',

atom/app/atom_library_main.h

@@ -13,7 +13,7 @@ __attribute__((visibility("default")))
 int AtomMain(int argc, const char* argv[]);
 
 __attribute__((visibility("default")))
-void AtomInitializeICU();
+int AtomInitializeICUandStartNode(int argc, char *argv[]);
 }
 #endif  // OS_MACOSX
 

atom/app/atom_library_main.mm

@@ -5,6 +5,7 @@
 #include "atom/app/atom_library_main.h"
 
 #include "atom/app/atom_main_delegate.h"
+#include "atom/app/node_main.h"
 #include "base/i18n/icu_util.h"
 #include "base/mac/bundle_locations.h"
 #include "brightray/common/mac/main_application_bundle.h"
@@ -19,12 +20,13 @@ int AtomMain(int argc, const char* argv[]) {
   return content::ContentMain(params);
 }
 
-void AtomInitializeICU() {
+int AtomInitializeICUandStartNode(int argc, char *argv[]) {
   base::mac::SetOverrideFrameworkBundlePath(
       brightray::MainApplicationBundlePath()
           .Append("Contents")
           .Append("Frameworks")
           .Append(PRODUCT_NAME " Framework.framework"));
   base::i18n::InitializeICU();
+  return atom::NodeMain(argc, argv);
 }
 #endif  // OS_MACOSX

atom/app/atom_main.cc

@@ -31,13 +31,9 @@
 #include "atom/app/atom_library_main.h"
 #endif  // defined(OS_MACOSX)
 
+#include "atom/app/node_main.h"
 #include "base/i18n/icu_util.h"
 
-// Declaration of node::Start.
-namespace node {
-int Start(int argc, char *argv[]);
-}
-
 #if defined(OS_WIN)
 
 namespace {
@@ -137,7 +133,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
     }
     // Now that conversion is done, we can finally start.
     base::i18n::InitializeICU();
-    return node::Start(argc, argv);
+    return atom::NodeMain(argc, argv);
   } else if (env->GetVar("ATOM_SHELL_INTERNAL_CRASH_SERVICE",
                          &crash_service_indicator) &&
       crash_service_indicator == "1") {
@@ -166,7 +162,7 @@ int main(int argc, const char* argv[]) {
   char* node_indicator = getenv("ATOM_SHELL_INTERNAL_RUN_AS_NODE");
   if (node_indicator != NULL && strcmp(node_indicator, "1") == 0) {
     base::i18n::InitializeICU();
-    return node::Start(argc, const_cast<char**>(argv));
+    return atom::NodeMain(argc, const_cast<char**>(argv));
   }
 
   atom::AtomMainDelegate delegate;
@@ -181,8 +177,7 @@ int main(int argc, const char* argv[]) {
 int main(int argc, const char* argv[]) {
   char* node_indicator = getenv("ATOM_SHELL_INTERNAL_RUN_AS_NODE");
   if (node_indicator != NULL && strcmp(node_indicator, "1") == 0) {
-    AtomInitializeICU();
-    return node::Start(argc, const_cast<char**>(argv));
+    return AtomInitializeICUandStartNode(argc, const_cast<char**>(argv));
   }
 
   return AtomMain(argc, argv);

atom/app/node_main.cc

@@ -0,0 +1,56 @@
+// Copyright (c) 2015 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/app/node_main.h"
+
+#include "atom/browser/javascript_environment.h"
+#include "atom/common/node_includes.h"
+#include "gin/array_buffer.h"
+#include "gin/public/isolate_holder.h"
+
+namespace atom {
+
+int NodeMain(int argc, char *argv[]) {
+  argv = uv_setup_args(argc, argv);
+  int exec_argc;
+  const char** exec_argv;
+  node::Init(&argc, const_cast<const char**>(argv), &exec_argc, &exec_argv);
+
+  int exit_code = 1;
+  {
+    gin::IsolateHolder::LoadV8Snapshot();
+    gin::IsolateHolder::Initialize(
+        gin::IsolateHolder::kNonStrictMode,
+        gin::ArrayBufferAllocator::SharedInstance());
+
+    JavascriptEnvironment gin_env;
+    node::Environment* env = node::CreateEnvironment(
+        gin_env.isolate(), gin_env.context(), argc, argv, exec_argc, exec_argv);
+
+    bool more;
+    do {
+      more = uv_run(env->event_loop(), UV_RUN_ONCE);
+      if (more == false) {
+        node::EmitBeforeExit(env);
+
+        // Emit `beforeExit` if the loop became alive either after emitting
+        // event, or after running some callbacks.
+        more = uv_loop_alive(env->event_loop());
+        if (uv_run(env->event_loop(), UV_RUN_NOWAIT) != 0)
+          more = true;
+      }
+    } while (more == true);
+
+    exit_code = node::EmitExit(env);
+    node::RunAtExit(env);
+
+    env->Dispose();
+  }
+
+  v8::V8::Dispose();
+
+  return exit_code;
+}
+
+}  // namespace atom

atom/app/node_main.h

@@ -0,0 +1,14 @@
+// Copyright (c) 2015 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_APP_NODE_MAIN_H_
+#define ATOM_APP_NODE_MAIN_H_
+
+namespace atom {
+
+int NodeMain(int argc, char *argv[]);
+
+}  // namespace atom
+
+#endif  // ATOM_APP_NODE_MAIN_H_

vendor/node

@@ -1 +1 @@
-Subproject commit 6cbab75f83748df8e3a68bbad3b5f7c44ae17805
+Subproject commit 9140160f9d3792dfd0f1de13a9781e28a9dc4d3c