feat: add lwnode_data_path config

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

Author: hs0225

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

@@ -28,7 +28,7 @@
 
 namespace node {
 namespace native_module {
-extern bool initializeLWNodeBuiltinFile();
+extern bool initializeLWNodeBuiltinFile(const std::string path = "");
 }
 }  // namespace node
 
@@ -39,6 +39,7 @@ namespace lwnode {
 struct Runtime::Configuration::Internal {
   Runtime::SendMessageSyncCallback send_message_sync_callback{nullptr};
   void* send_message_sync_callback_data{nullptr};
+  std::string lwnode_data_path;
 };
 
 class Runtime::Internal {
@@ -59,20 +60,16 @@ class Runtime::Internal {
     kNoBuiltinFile = 100,
   };
 
-  Internal() {
-    LWNODE_DEV_LOG("[Runtime::Internal::Internal] new");
-
-    // Ensure that builtin file is loaded before initializing node.
-    native_module::initializeLWNodeBuiltinFile();
-  }
+  Internal() { LWNODE_DEV_LOG("[Runtime::Internal::Internal] new"); }
 
   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(true, ExitCode::kFailure);
     }
 
-    if (!native_module::initializeLWNodeBuiltinFile()) {
+    if (!native_module::initializeLWNodeBuiltinFile(
+            config_.internal_->lwnode_data_path)) {
       LWNODE_DEV_LOG(
           "[Runtime::Internal::Init] failed to initialize builtin file");
       return std::make_pair(true, ExitCode::kNoBuiltinFile);
@@ -224,8 +221,15 @@ void Runtime::Configuration::OnSendMessageSync(
   internal_->send_message_sync_callback_data = user_data;
 }
 
-bool Runtime::Configuration::Set(const std::string& key,
-                                 const std::string& value) {
+bool Runtime::Configuration::Set(const std::string& key, const char* value) {
+  std::string value_string = value ? value : "";
+
+  if (key == "lwnode_data_path") {
+    LWNODE_DEV_LOGF("[Runtime::Configuration::Set] data path set to %s",
+                    value_string.c_str());
+    internal_->lwnode_data_path = value_string;
+    return true;
+  }
   return false;
 }
 

deps/node/src/node_native_module_lwnode-inl.h

@@ -27,6 +27,23 @@
 
 using namespace LWNode;
 
+std::string getSelfProcPath() {
+  char path[PATH_MAX + 1];
+  ssize_t length = readlink("/proc/self/exe", path, PATH_MAX);
+  if (length < 0) {
+    ERROR_AND_ABORT("readlink fails");
+  }
+  path[length] = '\0';
+  return std::string(path);
+}
+
+std::string getExternalBuiltinsPath() {
+  std::string executablePath = getSelfProcPath();
+  executablePath = executablePath.substr(0, executablePath.rfind('/') + 1);
+
+  return executablePath + LWNODE_EXTERNAL_BUILTINS_FILENAME;
+}
+
 namespace node {
 namespace native_module {
 using v8::Isolate;
@@ -76,29 +93,14 @@ static thread_local std::map<std::string, UnzFileCachedInfo>
     s_unzFileInfoDictionary;
 static thread_local ReaderError s_lastError = ReaderError::NO_ERROR;
 
-std::string getSelfProcPath() {
-  char path[PATH_MAX + 1];
-  ssize_t length = readlink("/proc/self/exe", path, PATH_MAX);
-  if (length < 0) {
-    ERROR_AND_ABORT("readlink fails");
-  }
-  path[length] = '\0';
-  return std::string(path);
-}
+bool initializeLWNodeBuiltinFile(const std::string path = "") {
+#ifdef LWNODE_EXTERNAL_BUILTINS_FILENAME
 
-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;
-}
+  std::string externalBuiltinsPath = path;
 
-bool initializeLWNodeBuiltinFile() {
-#ifdef LWNODE_EXTERNAL_BUILTINS_FILENAME
-  std::string externalBuiltinsPath = getExternalBuiltinsPath();
+  if (path.empty()) {
+    externalBuiltinsPath = getExternalBuiltinsPath();
+  }
 
   if (s_archiveFileScope.isFileOpened() == false) {
     s_archiveFileScope.open(externalBuiltinsPath.c_str());

include/lwnode/lwnode-public.h

@@ -65,7 +65,7 @@ class LWNODE_EXPORT Runtime {
 
     void OnSendMessageSync(SendMessageSyncCallback callback, void* user_data);
 
-    bool Set(const std::string& key, const std::string& value);
+    bool Set(const std::string& key, const char* value);
     bool Set(const std::string& key, int value);
     bool Set(const std::string& key, bool value);
 
@@ -93,8 +93,8 @@ class LWNODE_EXPORT Runtime {
   int Start(int argc, char** argv, std::promise<void>&& promise);
 
   /**
-   * Stop the runtime. You can use this function to stop the runtime from another
-   * thread.
+   * Stop the runtime. You can use this function to stop the runtime from
+   * another thread.
    **/
   void Stop();