🐞 fix: Add locker for inspector

caoccao · Feb 27, 2024 · 0b42d1e · 0b42d1e
1 parent 8bc0ae9
commit 0b42d1e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/cpp/jni/javet_jni_core_v8.cpp b/cpp/jni/javet_jni_core_v8.cpp
@@ -420,7 +420,12 @@ JNIEXPORT void JNICALL Java_com_caoccao_javet_interop_V8Native_unregisterGCProlo
 
 JNIEXPORT void JNICALL Java_com_caoccao_javet_interop_V8Native_v8InspectorSend
 (JNIEnv* jniEnv, jobject caller, jlong v8RuntimeHandle, jstring mMessage) {
-    RUNTIME_HANDLES_TO_OBJECTS_WITH_SCOPE(v8RuntimeHandle);
+    auto v8Runtime = Javet::V8Runtime::FromHandle(v8RuntimeHandle);
+    auto v8LockerForInspector = v8Runtime->GetSharedV8LockerForInspector();
+    auto v8IsolateScope = v8Runtime->GetV8IsolateScope();
+    V8HandleScope v8HandleScope(v8Runtime->v8Isolate);
+    auto v8Context = v8Runtime->GetV8LocalContext();
+    auto v8ContextScope = v8Runtime->GetV8ContextScope(v8Context);
     char const* umMessage = jniEnv->GetStringUTFChars(mMessage, nullptr);
     std::string message(umMessage, jniEnv->GetStringUTFLength(mMessage));
     v8Runtime->v8Inspector->send(message);

diff --git a/cpp/jni/javet_v8_runtime.h b/cpp/jni/javet_v8_runtime.h
@@ -104,6 +104,10 @@ namespace Javet {
             return v8Locker ? v8Locker : std::make_shared<v8::Locker>(v8Isolate);
         }
 
+        inline auto GetSharedV8LockerForInspector() const noexcept {
+            return v8LockerForInspector ? v8LockerForInspector : std::make_shared<v8::Locker>(v8Isolate);
+        }
+
         /*
          * Unique V8 locker is for explicit mode.
          * Application manages the lock.
@@ -181,6 +185,7 @@ namespace Javet {
         std::unique_ptr<v8::SnapshotCreator> v8SnapshotCreator;
         std::unique_ptr<v8::StartupData, std::function<void(v8::StartupData*)>> v8StartupData;
         std::shared_ptr<v8::Locker> v8Locker;
+        std::shared_ptr<v8::Locker> v8LockerForInspector;
         V8PersistentContext v8PersistentContext;
     };
 }

diff --git a/docs/release_notes/index.rst b/docs/release_notes/index.rst
@@ -19,8 +19,9 @@ v0          Maintenance   v14       v8.9-v9.4
 .. toctree::
     :maxdepth: 1
 
-    release_notes_3_0
+    release_notes_3_1
 
+* :doc:`release_notes_3_0`
 * :doc:`release_notes_2_2`
 * :doc:`release_notes_2_1`
 * :doc:`release_notes_2_0`

diff --git a/docs/release_notes/release_notes_3_1.rst b/docs/release_notes/release_notes_3_1.rst
@@ -0,0 +1,9 @@
+===================
+Release Notes 3.1.x
+===================
+
+3.1.0 V8 v12.3
+--------------
+
+* Added support for Android Node.js mode
+* Fixed inspector locking issue