react-native-windows 0.78.4 → 0.78.6

package/Microsoft.ReactNative/SchedulerSettings.cpp

@@ -49,17 +49,17 @@ facebook::react::RuntimeExecutor &GetRuntimeExecutor(
 }
 
 winrt::Microsoft::ReactNative::ReactPropertyId<
-    winrt::Microsoft::ReactNative::ReactNonAbiValue<std::shared_ptr<facebook::react::RuntimeScheduler>>>
+    winrt::Microsoft::ReactNative::ReactNonAbiValue<std::weak_ptr<facebook::react::RuntimeScheduler>>>
 RuntimeSchedulerProperty() noexcept {
   winrt::Microsoft::ReactNative::ReactPropertyId<
-      winrt::Microsoft::ReactNative::ReactNonAbiValue<std::shared_ptr<facebook::react::RuntimeScheduler>>>
+      winrt::Microsoft::ReactNative::ReactNonAbiValue<std::weak_ptr<facebook::react::RuntimeScheduler>>>
       propId{L"ReactNative", L"RuntimeScheduler"};
   return propId;
 }
 
 void SetRuntimeScheduler(
     winrt::Microsoft::ReactNative::ReactPropertyBag properties,
-    const std::shared_ptr<facebook::react::RuntimeScheduler> &runtimeScheduler) noexcept {
+    const std::weak_ptr<facebook::react::RuntimeScheduler> &runtimeScheduler) noexcept {
   properties.Set(RuntimeSchedulerProperty(), runtimeScheduler);
 }
 
@@ -68,7 +68,7 @@ std::shared_ptr<facebook::react::RuntimeScheduler> RuntimeSchedulerFromPropertie
   auto runtimeScheduler = properties.Get(RuntimeSchedulerProperty());
   if (!runtimeScheduler)
     return nullptr;
-  return runtimeScheduler.Value();
+  return runtimeScheduler.Value().lock();
 }
 
 } // namespace Microsoft::ReactNative::SchedulerSettings

package/Microsoft.ReactNative/SchedulerSettings.h

@@ -27,7 +27,7 @@ facebook::react::RuntimeExecutor &GetRuntimeExecutor(
 
 void SetRuntimeScheduler(
     winrt::Microsoft::ReactNative::ReactPropertyBag properties,
-    const std::shared_ptr<facebook::react::RuntimeScheduler> &runtimeScheduler) noexcept;
+    const std::weak_ptr<facebook::react::RuntimeScheduler> &runtimeScheduler) noexcept;
 
 std::shared_ptr<facebook::react::RuntimeScheduler> RuntimeSchedulerFromProperties(
     winrt::Microsoft::ReactNative::ReactPropertyBag properties) noexcept;

package/Microsoft.ReactNative/TurboModulesProvider.cpp

@@ -7,9 +7,10 @@
 
 #include "pch.h"
 #include "TurboModulesProvider.h"
+#include <IReactContext.h>
 #include <ReactCommon/TurboModuleUtils.h>
 #include <react/bridging/EventEmitter.h>
-#include "JSDispatcherWriter.h"
+#include "CallInvokerWriter.h"
 #include "JSValueWriter.h"
 #include "JsiApi.h"
 #include "JsiReader.h"
@@ -42,6 +43,14 @@ struct TurboModuleBuilder : winrt::implements<TurboModuleBuilder, IReactModuleBu
     initializer(m_reactContext);
   }
 
+  void AddJsiInitializer(JsiInitializerDelegate const &initializer) noexcept {
+    initializer(
+        m_reactContext,
+        winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactContext>(m_reactContext)
+            ->GetInner()
+            .JsiRuntime());
+  }
+
   void AddConstantProvider(ConstantProviderDelegate const &constantProvider) noexcept {
     EnsureMemberNotSet("getConstants", false);
     m_constantProviders.push_back(constantProvider);
@@ -119,6 +128,10 @@ class TurboModuleImpl : public facebook::react::TurboModule {
         m_moduleBuilder(winrt::make_self<TurboModuleBuilder>(reactContext)),
         m_providedModule(reactModuleProvider(m_moduleBuilder.as<IReactModuleBuilder>())) {
     if (auto hostObject = m_providedModule.try_as<IJsiHostObject>()) {
+      // Force ABI runtime creation if it hasn't already been created
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactContext>(m_reactContext)
+          ->GetInner()
+          .JsiRuntime();
       m_hostObjectWrapper = std::make_shared<implementation::HostObjectWrapper>(hostObject);
     }
   }
@@ -202,7 +215,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                 runtime,
                 propName,
                 0,
-                [jsDispatcher = m_reactContext.JSDispatcher(),
+                [jsInvoker = jsInvoker_,
                  method = methodInfo.Method,
                  longLivedObjectCollection = m_longLivedObjectCollection](
                     facebook::jsi::Runtime &rt,
@@ -212,11 +225,13 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                   VerifyElseCrash(argCount > 0);
                   if (auto strongLongLivedObjectCollection = longLivedObjectCollection.lock()) {
                     auto jsiRuntimeHolder = LongLivedJsiRuntime::CreateWeak(strongLongLivedObjectCollection, rt);
+                    auto writer = winrt::make<CallInvokerWriter>(jsInvoker, jsiRuntimeHolder);
                     method(
                         winrt::make<JsiReader>(rt, args, argCount - 1),
-                        winrt::make<JSDispatcherWriter>(jsDispatcher, jsiRuntimeHolder),
+                        writer,
                         MakeCallback(rt, strongLongLivedObjectCollection, args[argCount - 1]),
                         nullptr);
+                    winrt::get_self<CallInvokerWriter>(writer)->ExitCurrentCallInvokeScope();
                   }
                   return facebook::jsi::Value::undefined();
                 });
@@ -225,7 +240,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                 runtime,
                 propName,
                 0,
-                [jsDispatcher = m_reactContext.JSDispatcher(),
+                [jsInvoker = jsInvoker_,
                  method = methodInfo.Method,
                  longLivedObjectCollection = m_longLivedObjectCollection](
                     facebook::jsi::Runtime &rt,
@@ -240,11 +255,12 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                     auto weakCallback2 = LongLivedJsiFunction::CreateWeak(
                         strongLongLivedObjectCollection, rt, args[argCount - 1].getObject(rt).getFunction(rt));
 
+                    auto writer = winrt::make<CallInvokerWriter>(jsInvoker, jsiRuntimeHolder);
                     method(
                         winrt::make<JsiReader>(rt, args, argCount - 2),
-                        winrt::make<JSDispatcherWriter>(jsDispatcher, jsiRuntimeHolder),
+                        writer,
                         [weakCallback1, weakCallback2, jsiRuntimeHolder](const IJSValueWriter &writer) noexcept {
-                          writer.as<JSDispatcherWriter>()->WithResultArgs(
+                          writer.as<CallInvokerWriter>()->WithResultArgs(
                               [weakCallback1, weakCallback2, jsiRuntimeHolder](
                                   facebook::jsi::Runtime &rt, facebook::jsi::Value const *args, size_t count) {
                                 if (auto callback1 = weakCallback1.lock()) {
@@ -260,7 +276,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                               });
                         },
                         [weakCallback1, weakCallback2, jsiRuntimeHolder](const IJSValueWriter &writer) noexcept {
-                          writer.as<JSDispatcherWriter>()->WithResultArgs(
+                          writer.as<CallInvokerWriter>()->WithResultArgs(
                               [weakCallback1, weakCallback2, jsiRuntimeHolder](
                                   facebook::jsi::Runtime &rt, facebook::jsi::Value const *args, size_t count) {
                                 if (auto callback2 = weakCallback2.lock()) {
@@ -275,6 +291,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                                 }
                               });
                         });
+                    winrt::get_self<CallInvokerWriter>(writer)->ExitCurrentCallInvokeScope();
                   }
                   return facebook::jsi::Value::undefined();
                 });
@@ -283,7 +300,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                 runtime,
                 propName,
                 0,
-                [jsDispatcher = m_reactContext.JSDispatcher(),
+                [jsInvoker = jsInvoker_,
                  method = methodInfo.Method,
                  longLivedObjectCollection = m_longLivedObjectCollection](
                     facebook::jsi::Runtime &rt,
@@ -293,7 +310,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                   if (auto strongLongLivedObjectCollection = longLivedObjectCollection.lock()) {
                     auto jsiRuntimeHolder = LongLivedJsiRuntime::CreateWeak(strongLongLivedObjectCollection, rt);
                     auto argReader = winrt::make<JsiReader>(rt, args, count);
-                    auto argWriter = winrt::make<JSDispatcherWriter>(jsDispatcher, jsiRuntimeHolder);
+                    auto argWriter = winrt::make<CallInvokerWriter>(jsInvoker, jsiRuntimeHolder);
                     return facebook::react::createPromiseAsJSIValue(
                         rt,
                         [method, argReader, argWriter, strongLongLivedObjectCollection, jsiRuntimeHolder](
@@ -306,7 +323,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                               argReader,
                               argWriter,
                               [weakResolve, weakReject, jsiRuntimeHolder](const IJSValueWriter &writer) {
-                                writer.as<JSDispatcherWriter>()->WithResultArgs(
+                                writer.as<CallInvokerWriter>()->WithResultArgs(
                                     [weakResolve, weakReject, jsiRuntimeHolder](
                                         facebook::jsi::Runtime &runtime,
                                         facebook::jsi::Value const *args,
@@ -325,7 +342,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                                     });
                               },
                               [weakResolve, weakReject, jsiRuntimeHolder](const IJSValueWriter &writer) {
-                                writer.as<JSDispatcherWriter>()->WithResultArgs(
+                                writer.as<CallInvokerWriter>()->WithResultArgs(
                                     [weakResolve, weakReject, jsiRuntimeHolder](
                                         facebook::jsi::Runtime &runtime,
                                         facebook::jsi::Value const *args,
@@ -356,6 +373,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
                                       }
                                     });
                               });
+                          winrt::get_self<CallInvokerWriter>(argWriter)->ExitCurrentCallInvokeScope();
                         });
                   }
                   return facebook::jsi::Value::undefined();
@@ -438,7 +456,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
     auto weakCallback =
         LongLivedJsiFunction::CreateWeak(longLivedObjectCollection, rt, callback.getObject(rt).getFunction(rt));
     return [weakCallback = std::move(weakCallback)](const IJSValueWriter &writer) noexcept {
-      writer.as<JSDispatcherWriter>()->WithResultArgs(
+      writer.as<CallInvokerWriter>()->WithResultArgs(
           [weakCallback](facebook::jsi::Runtime &rt, facebook::jsi::Value const *args, size_t count) {
             if (auto callback = weakCallback.lock()) {
               callback->Value().call(rt, args, count);

package/Microsoft.ReactNative/Utils/ImageUtils.h

@@ -15,6 +15,7 @@ struct ReactImageSource {
   std::string uri;
   std::string method;
   std::vector<std::pair<std::string, std::string>> headers;
+  std::string body;
   double width = 0;
   double height = 0;
   double scale = 1.0;

package/Microsoft.ReactNative/Utils/LocalBundleReader.cpp

@@ -54,38 +54,44 @@ std::string GetBundleFromEmbeddedResource(const winrt::Windows::Foundation::Uri
 }
 
 std::future<std::string> LocalBundleReader::LoadBundleAsync(const std::wstring bundleUri) {
-  co_await winrt::resume_background();
-
-  winrt::Windows::Storage::StorageFile file{nullptr};
-
-  // Supports "ms-appx://" or "ms-appdata://"
-  if (bundleUri.starts_with(L"ms-app")) {
-    winrt::Windows::Foundation::Uri uri(bundleUri);
-    file = co_await winrt::Windows::Storage::StorageFile::GetFileFromApplicationUriAsync(uri);
-  } else if (bundleUri.starts_with(L"resource://")) {
-    winrt::Windows::Foundation::Uri uri(bundleUri);
-    co_return GetBundleFromEmbeddedResource(uri);
-  } else {
-    file = co_await winrt::Windows::Storage::StorageFile::GetFileFromPathAsync(bundleUri);
+  try {
+    co_await winrt::resume_background();
+
+    winrt::Windows::Storage::StorageFile file{nullptr};
+
+    // Supports "ms-appx://" or "ms-appdata://"
+    if (bundleUri.starts_with(L"ms-app")) {
+      winrt::Windows::Foundation::Uri uri(bundleUri);
+      file = co_await winrt::Windows::Storage::StorageFile::GetFileFromApplicationUriAsync(uri);
+    } else if (bundleUri.starts_with(L"resource://")) {
+      winrt::Windows::Foundation::Uri uri(bundleUri);
+      co_return GetBundleFromEmbeddedResource(uri);
+    } else {
+      file = co_await winrt::Windows::Storage::StorageFile::GetFileFromPathAsync(bundleUri);
+    }
+
+    // Read the buffer manually to avoid a Utf8 -> Utf16 -> Utf8 encoding
+    // roundtrip.
+    auto fileBuffer{co_await winrt::Windows::Storage::FileIO::ReadBufferAsync(file)};
+    auto dataReader{winrt::Windows::Storage::Streams::DataReader::FromBuffer(fileBuffer)};
+
+    // No need to use length + 1, STL guarantees that string storage is null-terminated.
+    std::string script(fileBuffer.Length(), '\0');
+
+    // Construct the array_view to slice into the first fileBuffer.Length bytes.
+    // DataReader.ReadBytes will read as many bytes as are present in the
+    // array_view. The backing string has fileBuffer.Length() + 1 bytes, without
+    // an explicit end it will read 1 byte to many and throw.
+    dataReader.ReadBytes(winrt::array_view<uint8_t>{
+        reinterpret_cast<uint8_t *>(&script[0]), reinterpret_cast<uint8_t *>(&script[script.length()])});
+    dataReader.Close();
+
+    co_return script;
+  }
+  // RuntimeScheduler only handles std::exception or jsi::JSError
+  catch (winrt::hresult_error const &e) {
+    throw std::exception(winrt::to_string(e.message()).c_str());
   }
-
-  // Read the buffer manually to avoid a Utf8 -> Utf16 -> Utf8 encoding
-  // roundtrip.
-  auto fileBuffer{co_await winrt::Windows::Storage::FileIO::ReadBufferAsync(file)};
-  auto dataReader{winrt::Windows::Storage::Streams::DataReader::FromBuffer(fileBuffer)};
-
-  // No need to use length + 1, STL guarantees that string storage is null-terminated.
-  std::string script(fileBuffer.Length(), '\0');
-
-  // Construct the array_view to slice into the first fileBuffer.Length bytes.
-  // DataReader.ReadBytes will read as many bytes as are present in the
-  // array_view. The backing string has fileBuffer.Length() + 1 bytes, without
-  // an explicit end it will read 1 byte to many and throw.
-  dataReader.ReadBytes(winrt::array_view<uint8_t>{
-      reinterpret_cast<uint8_t *>(&script[0]), reinterpret_cast<uint8_t *>(&script[script.length()])});
-  dataReader.Close();
-
-  co_return script;
 }
 
 std::string LocalBundleReader::LoadBundle(const std::wstring &bundlePath) {

package/Microsoft.ReactNative.Cxx/ApiLoaders/JSRuntimeApi.cpp

@@ -9,6 +9,7 @@ EXTERN_C_START
 extern napi_status NAPI_CDECL default_jsr_open_napi_env_scope(napi_env env, jsr_napi_env_scope *scope);
 extern napi_status NAPI_CDECL default_jsr_close_napi_env_scope(napi_env env, jsr_napi_env_scope scope);
 extern napi_status NAPI_CDECL default_jsr_get_description(napi_env env, const char **result);
+extern napi_status NAPI_CDECL default_jsr_queue_microtask(napi_env env, napi_value callback);
 extern napi_status NAPI_CDECL default_jsr_drain_microtasks(napi_env env, int32_t max_count_hint, bool *result);
 extern napi_status NAPI_CDECL default_jsr_is_inspectable(napi_env env, bool *result);
 

package/Microsoft.ReactNative.Cxx/ApiLoaders/JSRuntimeApi.inc

@@ -17,6 +17,7 @@
 JSR_FUNC(jsr_collect_garbage)
 JSR_FUNC(jsr_config_enable_gc_api)
 JSR_FUNC(jsr_config_enable_inspector)
+JSR_FUNC(jsr_config_set_explicit_microtasks)
 JSR_FUNC(jsr_config_set_inspector_break_on_start)
 JSR_FUNC(jsr_config_set_inspector_port)
 JSR_FUNC(jsr_config_set_inspector_runtime_name)
@@ -33,6 +34,7 @@ JSR_FUNC(jsr_runtime_get_node_api_env)
 
 // The JS runtime functions needed for JSI.
 JSR_JSI_FUNC(jsr_close_napi_env_scope)
+JSR_JSI_FUNC(jsr_queue_microtask)
 JSR_JSI_FUNC(jsr_drain_microtasks)
 JSR_JSI_FUNC(jsr_get_description)
 JSR_JSI_FUNC(jsr_is_inspectable)

package/Microsoft.ReactNative.Cxx/ApiLoaders/NodeApi_posix.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "LibLoader.h"
+#include "NodeApi.h"
 
 namespace Microsoft::NodeApiJsi {
 

package/Microsoft.ReactNative.Cxx/JSI/JsiAbiApi.cpp

@@ -4,6 +4,7 @@
 #include "pch.h"
 #include "JsiAbiApi.h"
 #include <utility>
+#include "ReactContext.h"
 #include "ReactNonAbiValue.h"
 #include "winrt/Windows.Foundation.Collections.h"
 
@@ -14,6 +15,16 @@ using namespace facebook::jsi;
 
 namespace winrt::Microsoft::ReactNative {
 
+namespace Details {
+// Try to get JSI Runtime for the ReactContext
+// If it is not found, then create it based on context JSI runtime and store it in the context.Properties().
+// The function returns nullptr if the current context does not have JSI runtime.
+// It makes sure that the JSI runtime holder is removed when the instance is unloaded.
+JsiAbiRuntime *TryGetOrCreateContextRuntime(
+    winrt::Microsoft::ReactNative::ReactContext const &context,
+    JsiRuntime const &runtimeHandle) noexcept;
+} // namespace Details
+
 // The macro to simplify recording JSI exceptions.
 // It looks strange to keep the normal structure of the try/catch in code.
 #define JSI_RUNTIME_SET_ERROR(runtime)                               \
@@ -132,6 +143,52 @@ std::shared_ptr<facebook::jsi::HostObject> const &JsiHostObjectWrapper::HostObje
   return m_hostObject;
 }
 
+//===========================================================================
+// JsiHostObjectGetOrCreateWrapper implementation
+//===========================================================================
+
+JsiHostObjectGetOrCreateWrapper::JsiHostObjectGetOrCreateWrapper(
+    const winrt::Microsoft::ReactNative::IReactContext &context,
+    std::shared_ptr<HostObject> &&hostObject) noexcept
+    : m_hostObject(std::move(hostObject)), m_context(context) {}
+
+JsiValueRef JsiHostObjectGetOrCreateWrapper::GetProperty(JsiRuntime const &runtime, JsiPropertyIdRef const &name) try {
+  JsiAbiRuntime *rt{Details::TryGetOrCreateContextRuntime(m_context, runtime)};
+  JsiAbiRuntime::PropNameIDRef nameRef{name};
+  return JsiAbiRuntime::DetachJsiValueRef(m_hostObject->get(*rt, nameRef));
+} catch (JSI_RUNTIME_SET_ERROR(runtime)) {
+  throw;
+}
+
+void JsiHostObjectGetOrCreateWrapper::SetProperty(
+    JsiRuntime const &runtime,
+    JsiPropertyIdRef const &name,
+    JsiValueRef const &value) try {
+  JsiAbiRuntime *rt{Details::TryGetOrCreateContextRuntime(m_context, runtime)};
+  m_hostObject->set(*rt, JsiAbiRuntime::PropNameIDRef{name}, JsiAbiRuntime::ValueRef(value));
+} catch (JSI_RUNTIME_SET_ERROR(runtime)) {
+  throw;
+}
+
+winrt::Windows::Foundation::Collections::IVector<JsiPropertyIdRef> JsiHostObjectGetOrCreateWrapper::GetPropertyIds(
+    JsiRuntime const &runtime) try {
+  JsiAbiRuntime *rt{Details::TryGetOrCreateContextRuntime(m_context, runtime)};
+  auto names = m_hostObject->getPropertyNames(*rt);
+  std::vector<JsiPropertyIdRef> result;
+  result.reserve(names.size());
+  for (auto &name : names) {
+    result.push_back(JsiAbiRuntime::DetachJsiPropertyIdRef(std::move(name)));
+  }
+
+  return winrt::single_threaded_vector<JsiPropertyIdRef>(std::move(result));
+} catch (JSI_RUNTIME_SET_ERROR(runtime)) {
+  throw;
+}
+
+std::shared_ptr<facebook::jsi::HostObject> const &JsiHostObjectGetOrCreateWrapper::HostObjectSharedPtr() noexcept {
+  return m_hostObject;
+}
+
 //===========================================================================
 // JsiHostFunctionWrapper implementation
 //===========================================================================
@@ -162,38 +219,41 @@ JsiValueRef JsiHostFunctionWrapper::operator()(
 // JsiAbiRuntime implementation
 //===========================================================================
 
-// The tls_jsiAbiRuntimeMap map allows us to associate JsiAbiRuntime with JsiRuntime.
-// The association is thread-specific and DLL-specific.
-// It is thread specific because we want to have the safe access only in JS thread.
-// It is DLL-specific because JsiAbiRuntime is not ABI-safe and each module DLL will
-// have their own JsiAbiRuntime instance.
-static thread_local std::map<void *, JsiAbiRuntime *> *tls_jsiAbiRuntimeMap{nullptr};
+// The s_jsiAbiRuntimeMap map allows us to associate JsiAbiRuntime with JsiRuntime.
+// The association is DLL-specific because JsiAbiRuntime is not ABI-safe and each module DLL will have their own
+// JsiAbiRuntime instance.
+static std::map<void *, JsiAbiRuntime *> *s_jsiAbiRuntimeMap{nullptr};
+static std::recursive_mutex s_jsiRuntimeMapMutex;
 
 JsiAbiRuntime::JsiAbiRuntime(JsiRuntime const &runtime) noexcept : m_runtime{runtime} {
   VerifyElseCrashSz(runtime, "JSI runtime is null");
-  VerifyElseCrashSz(
-      GetFromJsiRuntime(runtime) == nullptr,
-      "We can have only one instance of JsiAbiRuntime for JsiRuntime in the thread.");
-  if (!tls_jsiAbiRuntimeMap) {
-    tls_jsiAbiRuntimeMap = new std::map<void *, JsiAbiRuntime *>();
+
+  {
+    std::lock_guard<std::recursive_mutex> guard(s_jsiRuntimeMapMutex);
+    VerifyElseCrashSz(
+        GetFromJsiRuntime(runtime) == nullptr, "We can have only one instance of JsiAbiRuntime for a JsiRuntime.");
+
+    if (!s_jsiAbiRuntimeMap) {
+      s_jsiAbiRuntimeMap = new std::map<void *, JsiAbiRuntime *>();
+    }
+    s_jsiAbiRuntimeMap->try_emplace(get_abi(runtime), this);
   }
-  tls_jsiAbiRuntimeMap->try_emplace(get_abi(runtime), this);
 }
 
 JsiAbiRuntime::~JsiAbiRuntime() {
-  VerifyElseCrashSz(
-      GetFromJsiRuntime(m_runtime) != nullptr, "JsiAbiRuntime must be called in the same thread where it was created.");
-  tls_jsiAbiRuntimeMap->erase(get_abi(m_runtime));
-  if (tls_jsiAbiRuntimeMap->empty()) {
-    delete tls_jsiAbiRuntimeMap;
-    tls_jsiAbiRuntimeMap = nullptr;
+  std::lock_guard<std::recursive_mutex> guard(s_jsiRuntimeMapMutex);
+  s_jsiAbiRuntimeMap->erase(get_abi(m_runtime));
+  if (s_jsiAbiRuntimeMap->empty()) {
+    delete s_jsiAbiRuntimeMap;
+    s_jsiAbiRuntimeMap = nullptr;
   }
 }
 
 /*static*/ JsiAbiRuntime *JsiAbiRuntime::GetFromJsiRuntime(JsiRuntime const &runtime) noexcept {
-  if (tls_jsiAbiRuntimeMap && runtime) {
-    auto it = tls_jsiAbiRuntimeMap->find(get_abi(runtime));
-    if (it != tls_jsiAbiRuntimeMap->end()) {
+  std::lock_guard<std::recursive_mutex> guard(s_jsiRuntimeMapMutex);
+  if (s_jsiAbiRuntimeMap && runtime) {
+    auto it = s_jsiAbiRuntimeMap->find(get_abi(runtime));
+    if (it != s_jsiAbiRuntimeMap->end()) {
       return it->second;
     }
   }
@@ -233,6 +293,13 @@ bool JsiAbiRuntime::drainMicrotasks(int maxMicrotasksHint) try {
   throw;
 }
 
+void JsiAbiRuntime::queueMicrotask(const facebook::jsi::Function &callback) try {
+  return m_runtime.QueueMicrotask(AsJsiObjectRef(callback));
+} catch (hresult_error const &) {
+  RethrowJsiError();
+  throw;
+}
+
 Object JsiAbiRuntime::global() try { return MakeObject(m_runtime.Global()); } catch (hresult_error const &) {
   RethrowJsiError();
   throw;
@@ -956,7 +1023,7 @@ JsiAbiRuntime::DataPointerValue::DataPointerValue(winrt::weak_ref<JsiRuntime> &&
 
 JsiAbiRuntime::DataPointerValue::DataPointerValue(uint64_t data) noexcept : m_data{data} {}
 
-void JsiAbiRuntime::DataPointerValue::invalidate() {}
+void JsiAbiRuntime::DataPointerValue::invalidate() noexcept {}
 
 //===========================================================================
 // JsiAbiRuntime::SymbolPointerValue implementation
@@ -967,7 +1034,7 @@ JsiAbiRuntime::SymbolPointerValue::SymbolPointerValue(
     JsiSymbolRef &&symbol) noexcept
     : DataPointerValue{std::move(weakRuntime), std::exchange(symbol.Data, 0)} {}
 
-void JsiAbiRuntime::SymbolPointerValue::invalidate() {
+void JsiAbiRuntime::SymbolPointerValue::invalidate() noexcept {
   if (m_data) {
     if (auto runtime = m_weakRuntime.get()) {
       m_weakRuntime = nullptr;
@@ -993,7 +1060,7 @@ JsiAbiRuntime::BigIntPointerValue::BigIntPointerValue(
     JsiBigIntRef &&bigInt) noexcept
     : DataPointerValue{std::move(weakRuntime), std::exchange(bigInt.Data, 0)} {}
 
-void JsiAbiRuntime::BigIntPointerValue::invalidate() {
+void JsiAbiRuntime::BigIntPointerValue::invalidate() noexcept {
   if (m_data) {
     if (auto runtime = m_weakRuntime.get()) {
       m_weakRuntime = nullptr;
@@ -1019,7 +1086,7 @@ JsiAbiRuntime::StringPointerValue::StringPointerValue(
     JsiStringRef &&str) noexcept
     : DataPointerValue{std::move(weakRuntime), std::exchange(str.Data, 0)} {}
 
-void JsiAbiRuntime::StringPointerValue::invalidate() {
+void JsiAbiRuntime::StringPointerValue::invalidate() noexcept {
   if (m_data) {
     if (auto runtime = m_weakRuntime.get()) {
       m_weakRuntime = nullptr;
@@ -1047,7 +1114,7 @@ JsiAbiRuntime::ObjectPointerValue::ObjectPointerValue(
     JsiObjectRef &&obj) noexcept
     : DataPointerValue{std::move(weakRuntime), std::exchange(obj.Data, 0)} {}
 
-void JsiAbiRuntime::ObjectPointerValue::invalidate() {
+void JsiAbiRuntime::ObjectPointerValue::invalidate() noexcept {
   if (m_data) {
     if (auto runtime = m_weakRuntime.get()) {
       m_weakRuntime = nullptr;
@@ -1075,7 +1142,7 @@ JsiAbiRuntime::PropNameIDPointerValue::PropNameIDPointerValue(
     JsiPropertyIdRef &&propertyId) noexcept
     : DataPointerValue{std::move(weakRuntime), std::exchange(propertyId.Data, 0)} {}
 
-void JsiAbiRuntime::PropNameIDPointerValue::invalidate() {
+void JsiAbiRuntime::PropNameIDPointerValue::invalidate() noexcept {
   if (m_data) {
     if (auto runtime = m_weakRuntime.get()) {
       m_weakRuntime = nullptr;

package/Microsoft.ReactNative.Cxx/JSI/JsiAbiApi.h

@@ -54,6 +54,25 @@ struct JsiHostObjectWrapper : implements<JsiHostObjectWrapper, IJsiHostObject> {
   std::shared_ptr<facebook::jsi::HostObject> m_hostObject;
 };
 
+// An ABI-safe wrapper for facebook::jsi::HostObject, similar to JsiHostObjectWrapper,
+// but uses GetOrCreate for the AbiRuntime to ensure its created on first use
+// This is important for use with TurboModules, which may not go through the ReactContext.CallInvoker
+struct JsiHostObjectGetOrCreateWrapper : implements<JsiHostObjectGetOrCreateWrapper, IJsiHostObject> {
+  JsiHostObjectGetOrCreateWrapper(
+      const winrt::Microsoft::ReactNative::IReactContext &context,
+      std::shared_ptr<facebook::jsi::HostObject> &&hostObject) noexcept;
+
+  JsiValueRef GetProperty(JsiRuntime const &runtime, JsiPropertyIdRef const &name);
+  void SetProperty(JsiRuntime const &runtime, JsiPropertyIdRef const &name, JsiValueRef const &value);
+  winrt::Windows::Foundation::Collections::IVector<JsiPropertyIdRef> GetPropertyIds(JsiRuntime const &runtime);
+
+  std::shared_ptr<facebook::jsi::HostObject> const &HostObjectSharedPtr() noexcept;
+
+ private:
+  std::shared_ptr<facebook::jsi::HostObject> m_hostObject;
+  winrt::Microsoft::ReactNative::IReactContext m_context;
+};
+
 // The function object that wraps up the facebook::jsi::HostFunctionType
 struct JsiHostFunctionWrapper {
   // We only support new and move constructors.
@@ -85,6 +104,7 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
   facebook::jsi::Value evaluatePreparedJavaScript(
       const std::shared_ptr<const facebook::jsi::PreparedJavaScript> &js) override;
   bool drainMicrotasks(int maxMicrotasksHint = -1) override;
+  void queueMicrotask(const facebook::jsi::Function &callback) override;
   facebook::jsi::Object global() override;
   std::string description() override;
   bool isInspectable() override;
@@ -225,6 +245,7 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
   // Allow access to the helper function
   friend struct JsiByteBufferWrapper;
   friend struct JsiHostObjectWrapper;
+  friend struct JsiHostObjectGetOrCreateWrapper;
   friend struct JsiHostFunctionWrapper;
   friend struct AbiJSError;
   friend struct AbiJSINativeException;
@@ -233,7 +254,7 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
   struct DataPointerValue : PointerValue {
     DataPointerValue(winrt::weak_ref<JsiRuntime> &&weakRuntime, uint64_t data) noexcept;
     DataPointerValue(uint64_t data) noexcept;
-    void invalidate() override;
+    void invalidate() noexcept override;
 
     uint64_t m_data;
     winrt::weak_ref<JsiRuntime> m_weakRuntime;
@@ -241,35 +262,35 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
 
   struct SymbolPointerValue : DataPointerValue {
     SymbolPointerValue(winrt::weak_ref<JsiRuntime> &&weakRuntime, JsiSymbolRef &&symbol) noexcept;
-    void invalidate() override;
+    void invalidate() noexcept override;
     static JsiSymbolRef const &GetData(PointerValue const *pv) noexcept;
     static JsiSymbolRef Detach(PointerValue const *pv) noexcept;
   };
 
   struct BigIntPointerValue : DataPointerValue {
     BigIntPointerValue(winrt::weak_ref<JsiRuntime> &&weakRuntime, JsiBigIntRef &&bigInt) noexcept;
-    void invalidate() override;
+    void invalidate() noexcept override;
     static JsiBigIntRef const &GetData(PointerValue const *pv) noexcept;
     static JsiBigIntRef Detach(PointerValue const *pv) noexcept;
   };
 
   struct StringPointerValue : DataPointerValue {
     StringPointerValue(winrt::weak_ref<JsiRuntime> &&weakRuntime, JsiStringRef &&str) noexcept;
-    void invalidate() override;
+    void invalidate() noexcept override;
     static JsiStringRef const &GetData(PointerValue const *pv) noexcept;
     static JsiStringRef Detach(PointerValue const *pv) noexcept;
   };
 
   struct ObjectPointerValue : DataPointerValue {
     ObjectPointerValue(winrt::weak_ref<JsiRuntime> &&weakRuntime, JsiObjectRef &&obj) noexcept;
-    void invalidate() override;
+    void invalidate() noexcept override;
     static JsiObjectRef const &GetData(PointerValue const *pv) noexcept;
     static JsiObjectRef Detach(PointerValue const *pv) noexcept;
   };
 
   struct PropNameIDPointerValue : DataPointerValue {
     PropNameIDPointerValue(winrt::weak_ref<JsiRuntime> &&weakRuntime, JsiPropertyIdRef &&propertyId) noexcept;
-    void invalidate() override;
+    void invalidate() noexcept override;
     static JsiPropertyIdRef const &GetData(PointerValue const *pv) noexcept;
     static JsiPropertyIdRef Detach(PointerValue const *pv) noexcept;
   };