Skip to content

[0.81] Prevent partially initialized TurboModules during shutdown #16369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Khalef Hosany (Khalef1) wants to merge 1 commit into
base: 0.81-stable
Choose a base branch
from
+37 −13
Open

[0.81] Prevent partially initialized TurboModules during shutdown #16369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/react-native-windows-c5366f79-8343-45d0-9916-3f13b872c4d8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Prevent lazy TurboModules from being created without a runtime during shutdown",
"packageName": "react-native-windows",
"email": "khosany@microsoft.com",
"dependentChangeType": "patch"
}
43 changes: 30 additions & 13 deletions vnext/Microsoft.ReactNative/TurboModulesProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,16 @@ struct TurboModuleMethodInfo {
};

struct TurboModuleBuilder : winrt::implements<TurboModuleBuilder, IReactModuleBuilder> {
TurboModuleBuilder(const IReactContext &reactContext) noexcept : m_reactContext(reactContext) {}
TurboModuleBuilder(const IReactContext &reactContext, IInspectable runtimeHandle) noexcept
: m_reactContext(reactContext), m_runtimeHandle(std::move(runtimeHandle)) {}
Comment on lines +39 to +40

public: // IReactModuleBuilder
void AddInitializer(InitializerDelegate const &initializer) noexcept {
initializer(m_reactContext);
}

void AddJsiInitializer(JsiInitializerDelegate const &initializer) noexcept {
initializer(
m_reactContext,
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactContext>(m_reactContext)
->GetInner()
.JsiRuntime());
initializer(m_reactContext, m_runtimeHandle);
}

void AddConstantProvider(ConstantProviderDelegate const &constantProvider) noexcept {
Expand Down Expand Up @@ -91,6 +88,10 @@ struct TurboModuleBuilder : winrt::implements<TurboModuleBuilder, IReactModuleBu
return m_eventEmitters;
}

void CompleteRegistration() noexcept {
m_runtimeHandle = nullptr;
}

private:
void EnsureMemberNotSet(const std::string &key, bool checkingMethod) noexcept {
VerifyElseCrash(m_methods.find(key) == m_methods.end());
Expand All @@ -103,6 +104,7 @@ struct TurboModuleBuilder : winrt::implements<TurboModuleBuilder, IReactModuleBu

private:
IReactContext m_reactContext;
IInspectable m_runtimeHandle;
std::unordered_map<std::string, EventEmitterInitializerDelegate> m_eventEmitters;
std::unordered_map<std::string, TurboModuleMethodInfo> m_methods;
std::unordered_map<std::string, SyncMethodDelegate> m_syncMethods;
Expand All @@ -121,17 +123,16 @@ class TurboModuleImpl : public facebook::react::TurboModule {
const std::string &name,
const std::shared_ptr<facebook::react::CallInvoker> &jsInvoker,
std::weak_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection,
IInspectable runtimeHandle,
const ReactModuleProvider &reactModuleProvider)
: facebook::react::TurboModule(name, jsInvoker),
m_reactContext(reactContext),
m_longLivedObjectCollection(std::move(longLivedObjectCollection)),
m_moduleBuilder(winrt::make_self<TurboModuleBuilder>(reactContext)),
m_providedModule(reactModuleProvider(m_moduleBuilder.as<IReactModuleBuilder>())) {
m_moduleBuilder(winrt::make_self<TurboModuleBuilder>(reactContext, std::move(runtimeHandle))) {
m_providedModule = reactModuleProvider(m_moduleBuilder.as<IReactModuleBuilder>());
m_moduleBuilder->CompleteRegistration();

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);
}
}
Expand Down Expand Up @@ -488,8 +489,24 @@ std::shared_ptr<facebook::react::TurboModule> TurboModulesProvider::getModule(
return nullptr;
}

if (!m_reactContext) {
return nullptr;
}

auto runtimeHandle = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactContext>(m_reactContext)
->GetInner()
.JsiRuntime();
if (!runtimeHandle) {
return nullptr;
}

auto tm = std::make_shared<TurboModuleImpl>(
m_reactContext, moduleName, callInvoker, m_longLivedObjectCollection, /*reactModuleProvider*/ it->second);
m_reactContext,
moduleName,
callInvoker,
m_longLivedObjectCollection,
std::move(runtimeHandle),
/*reactModuleProvider*/ it->second);
return tm;
}

Expand Down
Loading