fix: guarantee stability even if script file is deleted on reloading script

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

Author: hs0225

include/lwnode/lwnode-loader.h

@@ -21,6 +21,8 @@
 #include <functional>
 #include <memory>
 #include <string>
+#include <unordered_map>
+
 #include "gc-descriptor.h"
 
 namespace Escargot {
@@ -55,13 +57,28 @@ class SourceReaderInterface {
   virtual FileData read(std::string filename, const Encoding encodingHint) = 0;
 };
 
+class FileScope {
+ public:
+  FileScope(const char* path, const char* mode);
+  ~FileScope();
+  std::FILE* file() { return file_; }
+
+ private:
+  std::FILE* file_{nullptr};
+};
+
 class SourceReader : public SourceReaderInterface {
  public:
   static SourceReader* getInstance();
   FileData read(std::string filename, const Encoding encodingHint) override;
 
+  FileScope* getFileScope(const std::string& filename);
+
+  void dispose();
+
  private:
   SourceReader() = default;
+  std::unordered_map<std::string, FileScope*> file_scopes_;
 };
 
 class Loader {

src/api/engine.cc

@@ -21,6 +21,7 @@
 
 #include "api/global.h"
 #include "handle.h"
+#include "lwnode/lwnode-loader.h"
 #include "utils/misc.h"
 #include "utils/string-util.h"
 
@@ -411,6 +412,8 @@ void Engine::dispose() {
 
   disposeExternalStrings();
 
+  LWNode::SourceReader::getInstance()->dispose();
+
   MemoryUtil::gcFull();
   Globals::finalize();
   LWNODE_CALL_TRACE_GC_END();

src/lwnode/lwnode-loader.cc

@@ -78,21 +78,15 @@ bool convertUTF8ToUTF16le(char** buffer,
   return true;
 }
 
-class FileScope {
- public:
-  FileScope(const char* path, const char* mode) {
-    file_ = std::fopen(path, mode);
-  }
-  ~FileScope() {
-    if (file_) {
-      std::fclose(file_);
-    }
-  }
-  std::FILE* file() { return file_; }
+FileScope::FileScope(const char* path, const char* mode) {
+  file_ = std::fopen(path, mode);
+}
 
- private:
-  std::FILE* file_{nullptr};
-};
+FileScope::~FileScope() {
+  if (file_) {
+    std::fclose(file_);
+  }
+}
 
 static void tryConvertUTF8ToLatin1(
     std::basic_string<uint8_t, std::char_traits<uint8_t>>& latin1String,
@@ -196,9 +190,13 @@ SourceReader* SourceReader::getInstance() {
 }
 
 FileData SourceReader::read(std::string filename, const Encoding encodingHint) {
-  FileScope fileScope(filename.c_str(), "rb");
+  FileScope* fileScope = getFileScope(filename);
+
+  if (fileScope == nullptr) {
+    return FileData();
+  }
 
-  std::FILE* file = fileScope.file();
+  std::FILE* file = fileScope->file();
 
   if (file == nullptr) {
     return FileData();
@@ -230,6 +228,23 @@ FileData SourceReader::read(std::string filename, const Encoding encodingHint) {
       filename, std::move(bufferHolder), bufferSize, encodingHint);
 }
 
+FileScope* SourceReader::getFileScope(const std::string& filename) {
+  auto iter = file_scopes_.find(filename);
+  if (iter == file_scopes_.end()) {
+    FileScope* file_scope = new FileScope(filename.c_str(), "rb");
+    file_scopes_[filename] = file_scope;
+    return file_scope;
+  }
+  return iter->second;
+}
+
+void SourceReader::dispose() {
+  for (auto& file_scope : file_scopes_) {
+    delete file_scope.second;
+  }
+  file_scopes_.clear();
+}
+
 Loader::ReloadableSourceData* Loader::ReloadableSourceData::create(
     const FileData fileData, SourceReaderInterface* sourceReader) {
   // NOTE: data and data->path should be managed by gc

test/cctest/test-internal.cc

@@ -1055,9 +1055,8 @@ TEST(ReloadableString16) {
                 .ToLocalChecked())
       .Check();
 
-  std::string filename = "./tmp.test-reloadable-string.js";
-
   {
+    std::string filename = "./tmp.test-reloadable-string1.js";
     const bool isOneByteString = false;
     ReloadableContentScope scope(filename, isOneByteString);
 
@@ -1095,6 +1094,7 @@ TEST(ReloadableString16) {
   }
 
   {
+    std::string filename = "./tmp.test-reloadable-string2.js";
     g_reload_count = 0;
     const bool isOneByteString = false;
     ReloadableContentScope scope(filename, isOneByteString);