fix: hold lwnode.dat file handle when the runtime start

Signed-off-by: Hosung Kim [email protected]

Author: hs0225

deps/node/src/lwnode/lwnode-public.cc

@@ -26,6 +26,12 @@
 #include "trace.h"
 #include "v8.h"
 
+namespace node {
+namespace native_module {
+extern bool initializeLWNodeBuiltinFile();
+}
+}  // namespace node
+
 using namespace node;
 
 namespace lwnode {
@@ -47,10 +53,29 @@ class Runtime::Internal {
     kReleased
   };
 
+  enum ExitCode {
+    kSuccess = 0,
+    kFailure = 1,
+    kNoBuiltinFile = 100,
+  };
+
+  Internal() {
+    LWNODE_DEV_LOG("[Runtime::Internal::Internal] new");
+
+    // Ensure that builtin file is loaded before initializing node.
+    native_module::initializeLWNodeBuiltinFile();
+  }
+
   std::pair<bool, int> Init(int argc, char** argv) {
     if (state_ != State::kNotInitialized) {
       LWNODE_DEV_LOG("[Runtime::Internal::Init] already initialized");
-      return std::make_pair(false, -1);
+      return std::make_pair(true, ExitCode::kFailure);
+    }
+
+    if (!native_module::initializeLWNodeBuiltinFile()) {
+      LWNODE_DEV_LOG(
+          "[Runtime::Internal::Init] failed to initialize builtin file");
+      return std::make_pair(true, ExitCode::kNoBuiltinFile);
     }
 
     LWNODE_DEV_LOG("[Runtime::Internal::Init]");

deps/node/src/node_main_lw_runner-inl.h

@@ -214,6 +214,7 @@ class LWNodeMainRunner {
 
     v8::V8::ShutdownPlatform();
 
+    environment_ = nullptr;
     return exit_code;
   }
 

deps/node/src/node_native_module_lwnode-inl.h

@@ -86,6 +86,30 @@ std::string getSelfProcPath() {
   return std::string(path);
 }
 
+static std::string getExternalBuiltinsPath() {
+  static std::string s_externalBuiltinsPath;
+  if (s_externalBuiltinsPath.empty()) {
+    std::string executablePath = getSelfProcPath();
+    executablePath = executablePath.substr(0, executablePath.rfind('/') + 1);
+    s_externalBuiltinsPath = executablePath + LWNODE_EXTERNAL_BUILTINS_FILENAME;
+  }
+  return s_externalBuiltinsPath;
+}
+
+bool initializeLWNodeBuiltinFile() {
+#ifdef LWNODE_EXTERNAL_BUILTINS_FILENAME
+  std::string externalBuiltinsPath = getExternalBuiltinsPath();
+
+  if (s_archiveFileScope.isFileOpened() == false) {
+    s_archiveFileScope.open(externalBuiltinsPath.c_str());
+  }
+
+  return s_archiveFileScope.isFileOpened();
+#else
+  return true;
+#endif
+}
+
 void setError(ReaderError error) {
   s_lastError = error;
   ERROR_AND_ABORT(s_lastError);
@@ -197,16 +221,8 @@ FileData readFileFromArchive(std::string filename,
   size_t bufferSize = 0;
   char* buffer = nullptr;
 
-  static std::string s_externalBuiltinsPath;
-
-  if (s_externalBuiltinsPath.empty()) {
-    std::string executablePath = getSelfProcPath();
-    executablePath = executablePath.substr(0, executablePath.rfind('/') + 1);
-    s_externalBuiltinsPath = executablePath + LWNODE_EXTERNAL_BUILTINS_FILENAME;
-  }
-
   if (readFileFromArchive(
-          s_externalBuiltinsPath, filename, &buffer, &bufferSize) == false) {
+          getExternalBuiltinsPath(), filename, &buffer, &bufferSize) == false) {
     setError(ReaderError::READ_FILE_FROMARCHIVE);
     return FileData();
   }

include/lwnode/lwnode-version.h

@@ -18,5 +18,5 @@
 
  #define LWNODE_VERSION_MAJOR 1
  #define LWNODE_VERSION_MINOR 0
- #define LWNODE_VERSION_PATCH 10
- #define LWNODE_VERSION_TAG "v1.0.10"
+ #define LWNODE_VERSION_PATCH 11
+ #define LWNODE_VERSION_TAG "v1.0.11"