fix(workers): invalidate cached isolates on dispose (#1704)

Co-authored-by: Igor Randjelovic <[email protected]>

Author: edusperoni

test-app/runtime/CMakeLists.txt

@@ -147,6 +147,7 @@ add_library(
     src/main/cpp/DirectBuffer.cpp
     src/main/cpp/FieldAccessor.cpp
     src/main/cpp/File.cpp
+    src/main/cpp/IsolateDisposer.cpp
     src/main/cpp/JEnv.cpp
     src/main/cpp/DesugaredInterfaceCompanionClassNameResolver.cpp
     src/main/cpp/JType.cpp

test-app/runtime/src/main/cpp/ArgConverter.cpp

@@ -293,4 +293,12 @@ Local<String> ArgConverter::ConvertToV8UTF16String(Isolate* isolate, const u16st
     return String::NewFromTwoByte(isolate, ((const uint16_t*) utf16string.data())).ToLocalChecked();
 }
 
+void ArgConverter::onDisposeIsolate(Isolate* isolate) {
+    auto itFound = s_type_long_operations_cache.find(isolate);
+    if (itFound != s_type_long_operations_cache.end()) {
+        delete itFound->second;
+        s_type_long_operations_cache.erase(itFound);
+    }
+}
+
 std::map<Isolate*, ArgConverter::TypeLongOperationsCache*> ArgConverter::s_type_long_operations_cache;

test-app/runtime/src/main/cpp/ArgConverter.h

@@ -43,6 +43,8 @@ class ArgConverter {
 
         static v8::Local<v8::String> ConvertToV8UTF16String(v8::Isolate* isolate, const std::u16string& utf16string);
 
+        static void onDisposeIsolate(v8::Isolate* isolate);
+
     private:
 
         // TODO: plamen5kov: rewrite logic for java long number operations in javascript (java long -> javascript number operations check)

test-app/runtime/src/main/cpp/IsolateDisposer.cpp

@@ -0,0 +1,19 @@
+//
+// Created by Eduardo Speroni on 3/4/22.
+//
+
+#include "IsolateDisposer.h"
+#include "ArgConverter.h"
+#include "MetadataNode.h"
+#include "V8GlobalHelpers.h"
+#include <console/Console.h>
+
+
+namespace tns {
+    void disposeIsolate(v8::Isolate *isolate) {
+        tns::ArgConverter::onDisposeIsolate(isolate);
+        tns::MetadataNode::onDisposeIsolate(isolate);
+        tns::V8GlobalHelpers::onDisposeIsolate(isolate);
+        tns::Console::onDisposeIsolate(isolate);
+    }
+}

test-app/runtime/src/main/cpp/IsolateDisposer.h

@@ -0,0 +1,13 @@
+//
+// Created by Eduardo Speroni on 3/4/22.
+//
+
+#ifndef TEST_APP_ISOLATEDISPOSER_H
+#define TEST_APP_ISOLATEDISPOSER_H
+#include "v8.h"
+
+namespace tns {
+    void disposeIsolate(v8::Isolate* isolate);
+}
+
+#endif //TEST_APP_ISOLATEDISPOSER_H

test-app/runtime/src/main/cpp/MetadataNode.cpp

@@ -2176,6 +2176,32 @@ std::string MetadataNode::GetJniClassName(MetadataEntry entry) {
     return fullClassName;
 }
 
+void MetadataNode::onDisposeIsolate(Isolate* isolate) {
+    {
+        auto it = s_metadata_node_cache.find(isolate);
+        if (it != s_metadata_node_cache.end()) {
+            delete it->second;
+            s_metadata_node_cache.erase(it);
+        }
+    }
+    {
+        auto it = s_arrayObjectTemplates.find(isolate);
+        if (it != s_arrayObjectTemplates.end()) {
+            delete it->second;
+            s_arrayObjectTemplates.erase(it);
+        }
+    }
+    {
+        for (auto it = s_treeNode2NodeCache.begin(); it != s_treeNode2NodeCache.end(); it++) {
+            auto it2 = it->second->m_poCtorCachePerIsolate.find(isolate);
+            if(it2 != it->second->m_poCtorCachePerIsolate.end()) {
+                delete it2->second;
+                it->second->m_poCtorCachePerIsolate.erase(it2);
+            }
+        }
+    }
+}
+
 string MetadataNode::TNS_PREFIX = "com/tns/gen/";
 MetadataReader MetadataNode::s_metadataReader;
 std::map<std::string, MetadataNode*> MetadataNode::s_name2NodeCache;

test-app/runtime/src/main/cpp/MetadataNode.h

@@ -58,6 +58,8 @@ class MetadataNode {
         static MetadataNode* GetOrCreate(const std::string& className);
 
         static std::string GetTypeMetadataName(v8::Isolate* isolate, v8::Local<v8::Value>& value);
+
+        static void onDisposeIsolate(v8::Isolate* isolate);
     private:
         struct MethodCallbackData;
 

test-app/runtime/src/main/cpp/Runtime.cpp

@@ -29,6 +29,7 @@
 #include "sys/system_properties.h"
 #include "ManualInstrumentation.h"
 #include <snapshot_blob.h>
+#include "IsolateDisposer.h"
 
 #ifdef APPLICATION_IN_DEBUG
 #include "JsV8InspectorClient.h"
@@ -810,6 +811,7 @@ bool Runtime::RunExtraCode(Isolate* isolate, Local<Context> context, const char*
 void Runtime::DestroyRuntime() {
     s_id2RuntimeCache.erase(m_id);
     s_isolate2RuntimesCache.erase(m_isolate);
+    tns::disposeIsolate(m_isolate);
 }
 
 Local<Context> Runtime::GetContext() {

test-app/runtime/src/main/cpp/V8GlobalHelpers.cpp

@@ -141,3 +141,7 @@ bool tns::V8SetPrivateValue(Isolate* isolate, const Local<Object>& obj, const Lo
 
     return res.FromMaybe(false);
 }
+
+void tns::V8GlobalHelpers::onDisposeIsolate(Isolate* isolate) {
+    isolateToPersistentSmartJSONStringify.erase(isolate);
+}

test-app/runtime/src/main/cpp/V8GlobalHelpers.h

@@ -13,6 +13,10 @@ v8::Local<v8::String> JsonStringifyObject(v8::Isolate* isolate, v8::Handle<v8::V
 bool V8GetPrivateValue(v8::Isolate* isolate, const v8::Local<v8::Object>& obj, const v8::Local<v8::String>& propName, v8::Local<v8::Value>& out);
 
 bool V8SetPrivateValue(v8::Isolate* isolate, const v8::Local<v8::Object>& obj, const v8::Local<v8::String>& propName, const v8::Local<v8::Value>& value);
+
+namespace V8GlobalHelpers {
+    void onDisposeIsolate(v8::Isolate* isolate);
+}
 }
 
 #endif /* V8GLOBALHELPERS_H_ */