fix(runtime): preserve native engine lane boundaries

Author: DjDeveloperr

NativeScript/jsi/jsc/JSCRuntime.h

@@ -483,14 +483,6 @@ class Runtime {
   const void* identity() const { return state_.get(); }
   void detachState() { state_.reset(); }
 
-  // A stable, per-runtime identity.
-  //
-  // engine::Runtime is a value wrapper around shared engine state, and the
-  // host-function trampolines construct a fresh one on the stack for every
-  // callback. So `&runtime` is NOT stable and must never be used as a map key;
-  // this is. The pointer is opaque and only ever compared or hashed.
-  const void* identity() const { return state_.get(); }
-
   // See RuntimeState::nativeStateKey. Created on first use.
   JSStringRef nativeStateKey() const {
     if (state_->nativeStateKey == nullptr) {

NativeScript/jsi/v8/V8HostObjects.cpp

@@ -487,8 +487,6 @@ Function Function::createFromHostConstructor(Runtime& runtime, const PropNameID&
               info.GetReturnValue().Set(result.local(runtime));
             } catch (const JSError& error) {
               v8engine::throwV8Exception(info.GetIsolate(), error);
-            } catch (const JSError& error) {
-              v8engine::throwV8Exception(info.GetIsolate(), error);
             } catch (const std::exception& exception) {
               v8engine::throwV8Exception(info.GetIsolate(), exception);
             }

NativeScript/jsi/v8/V8Runtime.h

@@ -533,7 +533,6 @@ class Runtime {
     return state_->nativeStateKey.Get(state_->isolate);
   }
   std::shared_ptr<v8engine::RuntimeState> state() const { return state_; }
-  const void* identity() const { return state_.get(); }
 
   Object global();
 

NativeScript/napi/common/native_api_util.h

@@ -66,10 +66,6 @@ struct char_traits<unsigned short> {
 #include <android/log.h>
 #endif
 
-#ifndef NAPI_PREAMBLE
-#define NAPI_PREAMBLE napi_status status;
-#endif
-
 #ifndef NS_NAPI_PREAMBLE
 #define NS_NAPI_PREAMBLE napi_status status;
 #endif

NativeScript/napi/quickjs/jsr.cpp

@@ -55,7 +55,11 @@ napi_status js_unlock_env(napi_env env) {
 
 napi_status js_free_napi_env(napi_env env) {
   JSR* jsr = JSR::env_to_jsr_cache.Get(env);
+#ifndef __ANDROID__
+  // Implemented by the Apple thread-safe-function layer; Android does not
+  // provide environment cleanup hooks for this backend.
   js_run_env_cleanup_hooks(env);
+#endif
   JSR::env_to_jsr_cache.Remove(env);
   delete jsr;
   return qjs_free_napi_env(env);

NativeScript/runtime/modules/url/URLPattern.cpp

@@ -496,7 +496,7 @@ napi_value URLPattern::Exec(napi_env env, napi_callback_info info) {
 }
 
 void URLPattern::Init(napi_env env, napi_value global) {
-    NAPI_PREAMBLE
+    NS_NAPI_PREAMBLE
     napi_value ctor;
     static const int instance_prop_count = 11;
     napi_property_descriptor properties[instance_prop_count] = {

platforms/android/test-app/runtime/CMakeLists.txt

@@ -216,11 +216,14 @@ if (QUICKJS OR QUICKJS_NG)
             ${QJS_SOURCE_DIR}/libunicode.c
             ${QJS_SOURCE_DIR}/quickjs.c
             ${QJS_SOURCE_DIR}/dtoa.c
-            # napi
-            ${VENDOR_DIR}/quickjs/quickjs-api.c
-            ${NS_NAPI_DIR}/quickjs/jsr.cpp
     )
 
+    if (NS_BINDING STREQUAL "napi")
+        set(SOURCES ${SOURCES}
+                ${VENDOR_DIR}/quickjs/quickjs-api.c
+                ${NS_NAPI_DIR}/quickjs/jsr.cpp)
+    endif ()
+
     include_directories(
             ${NS_NAPI_DIR}/quickjs
             ${NS_NAPI_DIR}/common
@@ -269,9 +272,9 @@ if (HERMES OR SHERMES)
             ${NS_NAPI_DIR}/hermes
             ${NS_NAPI_DIR}/common
     )
-    set(SOURCES ${SOURCES}
-            ${NS_NAPI_DIR}/hermes/jsr.cpp
-    )
+    if (NS_BINDING STREQUAL "napi")
+        set(SOURCES ${SOURCES} ${NS_NAPI_DIR}/hermes/jsr.cpp)
+    endif ()
 endif ()
 
 if (JSC)
@@ -284,10 +287,11 @@ if (JSC)
             # framework, whose JSC is a different build with a different ABI.
             ${VENDOR_DIR}/jsc/include
     )
-    set(SOURCES ${SOURCES}
-            ${VENDOR_DIR}/jsc/jsc-api.cpp
-            ${NS_NAPI_DIR}/jsc/jsr.cpp
-    )
+    if (NS_BINDING STREQUAL "napi")
+        set(SOURCES ${SOURCES}
+                ${VENDOR_DIR}/jsc/jsc-api.cpp
+                ${NS_NAPI_DIR}/jsc/jsr.cpp)
+    endif ()
 endif ()
 
 if (V8)
@@ -329,11 +333,12 @@ if (V8)
         endif ()
     endif ()
 
-    set(SOURCES ${SOURCES}
-            ${VENDOR_DIR}/v8/v8-api.cpp
-            ${NS_NAPI_DIR}/v8/jsr.cpp
-            ${VENDOR_DIR}/v8/SimpleAllocator.cpp
-    )
+    if (NS_BINDING STREQUAL "napi")
+        set(SOURCES ${SOURCES}
+                ${VENDOR_DIR}/v8/v8-api.cpp
+                ${NS_NAPI_DIR}/v8/jsr.cpp
+                ${VENDOR_DIR}/v8/SimpleAllocator.cpp)
+    endif ()
 
 
     set(COMMON_CMAKE_ARGUMENTS "${COMMON_CMAKE_ARGUMENTS} -DV8_ENABLE_REGEXP_INTERPRETER_THREADED_DISPATCH -DV8_EMBEDDED_BUILTINS")

vendor/jsc/jsc-api.cpp

@@ -59,9 +59,8 @@ class JSString {
 
   JSString(const JSChar* string, size_t length = NAPI_AUTO_LENGTH)
       : _string{JSStringCreateWithCharacters(
-            string, length == NAPI_AUTO_LENGTH
-                        ? std::char_traits<JSChar>::length(string)
-                        : length)} {}
+            string, length == NAPI_AUTO_LENGTH ? NullTerminatedLength(string)
+                                               : length)} {}
 
   ~JSString() {
     if (_string != nullptr) {
@@ -118,6 +117,13 @@ class JSString {
   }
 
  private:
+  static size_t NullTerminatedLength(const JSChar* string) {
+    if (string == nullptr) return 0;
+    const JSChar* end = string;
+    while (*end != 0) ++end;
+    return static_cast<size_t>(end - string);
+  }
+
   static JSStringRef CreateUTF8(const char* string, size_t length) {
     if (length == NAPI_AUTO_LENGTH) {
       return JSStringCreateWithUTF8CString(string);
@@ -3178,4 +3184,4 @@ napi_status napi_get_instance_data(napi_env env, void** data) {
   return napi_ok;
 }
 
-#endif  // USE_HOST_OBJECT
+#endif  // USE_HOST_OBJECT