Skip to content

Extract TurboModuleManager from ReactHost #54651

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

Closed
javache wants to merge 1 commit into from
Closed

Extract TurboModuleManager from ReactHost #54651

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
4 changes: 2 additions & 2 deletions packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class BridgelessNativeModuleProxy;
/**
* Represents the JavaScript binding for the TurboModule system.
*/
class TurboModuleBinding {
class TurboModuleBinding final {
public:
/*
* Installs TurboModuleBinding into JavaScript runtime.
Expand All @@ -38,7 +38,7 @@ class TurboModuleBinding {
TurboModuleProviderFunctionType &&moduleProvider,
std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection);

virtual ~TurboModuleBinding();
~TurboModuleBinding();

private:
friend BridgelessNativeModuleProxy;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCxxPlatform/react/devsupport/DevSettingsModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class DevSettingsModule : public NativeDevSettingsCxxSpec<DevSettingsModule> {
DevSettingsModule(
std::shared_ptr<CallInvoker> jsInvoker,
std::weak_ptr<DevServerHelper> devServerHelper,
LiveReloadCallback &&liveReloadCallback)
LiveReloadCallback liveReloadCallback)
: NativeDevSettingsCxxSpec(jsInvoker),
devServerHelper_(std::move(devServerHelper)),
liveReloadCallback_(std::move(liveReloadCallback))
Expand Down
125 changes: 18 additions & 107 deletions packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,15 @@
#include <glog/logging.h>
#include <jserrorhandler/JsErrorHandler.h>
#include <jsinspector-modern/InspectorFlags.h>
#include <react/coremodules/AppStateModule.h>
#include <react/coremodules/DeviceInfoModule.h>
#include <react/coremodules/PlatformConstantsModule.h>
#include <react/debug/react_native_assert.h>
#include <react/devsupport/DevLoadingViewModule.h>
#include <react/devsupport/DevServerHelper.h>
#include <react/devsupport/DevSettingsModule.h>
#include <react/devsupport/IDevUIDelegate.h>
#include <react/devsupport/LogBoxModule.h>
#include <react/devsupport/PackagerConnection.h>
#include <react/devsupport/SourceCodeModule.h>
#include <react/devsupport/inspector/Inspector.h>
#include <react/http/IHttpClient.h>
#include <react/http/IWebSocketClient.h>
#include <react/io/ImageLoaderModule.h>
#include <react/io/NetworkingModule.h>
#include <react/io/ResourceLoader.h>
#include <react/io/WebSocketModule.h>
#include <react/logging/LogOnce.h>
#include <react/logging/NativeExceptionsManager.h>
#include <react/nativemodule/defaults/DefaultTurboModules.h>
#include <react/nativemodule/intersectionobserver/NativeIntersectionObserver.h>
#include <react/nativemodule/mutationobserver/NativeMutationObserver.h>
#include <react/nativemodule/webperformance/NativePerformance.h>
#include <react/renderer/animated/AnimatedModule.h>
#include <react/renderer/componentregistry/native/NativeComponentRegistryBinding.h>
#include <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
#include <react/renderer/scheduler/SchedulerDelegate.h>
Expand All @@ -50,6 +34,8 @@
#include <react/runtime/hermes/HermesInstance.h>
#include <react/threading/MessageQueueThreadImpl.h>

#include "TurboModuleManager.h"

namespace facebook::react {

struct ReactInstanceData {
Expand Down Expand Up @@ -257,6 +243,18 @@ void ReactHost::createReactInstance() {
}

auto liveReloadCallback = [this]() { reloadReactInstance(); };
TurboModuleManager turboModuleManager(
reactInstanceData_->turboModuleProviders,
jsInvoker,
reactInstanceData_->onJsError,
reactInstanceData_->animatedNodesManagerProvider,
reactInstanceConfig_.enableDevMode ? devServerHelper_ : nullptr,
reactInstanceData_->devUIDelegate,
reactInstanceData_->logBoxSurfaceDelegate,
httpClientFactory,
webSocketClientFactory,
std::move(liveReloadCallback));

reactInstance_->initializeRuntime(
{
#if defined(WITH_PERFETTO) || defined(RNCXX_WITH_PROFILING_PROVIDER)
Expand All @@ -268,20 +266,9 @@ void ReactHost::createReactInstance() {
[weakMountingManager =
std::weak_ptr<IMountingManager>(reactInstanceData_->mountingManager),
logger = reactInstanceData_->logger,
devUIDelegate = reactInstanceData_->devUIDelegate,
turboModuleProviders = reactInstanceData_->turboModuleProviders,
jsInvoker = std::move(jsInvoker),
logBoxSurfaceDelegate = reactInstanceData_->logBoxSurfaceDelegate,
devServerHelper =
reactInstanceConfig_.enableDevMode ? devServerHelper_ : nullptr,
animatedNodesManagerProvider =
reactInstanceData_->animatedNodesManagerProvider,
onJsError = reactInstanceData_->onJsError,
bindingsInstallFunc = reactInstanceData_->bindingsInstallFunc,
httpClientFactory = std::move(httpClientFactory),
webSocketClientFactory = std::move(webSocketClientFactory),
liveReloadCallback =
std::move(liveReloadCallback)](jsi::Runtime& runtime) {
turboModuleManager =
std::move(turboModuleManager)](jsi::Runtime& runtime) mutable {
if (logger) {
bindNativeLogger(runtime, logger);
}
Expand All @@ -295,85 +282,9 @@ void ReactHost::createReactInstance() {
return false;
});

auto turboModuleProvider =
[turboModuleProviders,
jsInvoker,
logBoxSurfaceDelegate,
devServerHelper,
devUIDelegate,
animatedNodesManagerProvider,
onJsError,
httpClientFactory = httpClientFactory,
webSocketClientFactory = webSocketClientFactory,
liveReloadCallback = liveReloadCallback](
const std::string& name) -> std::shared_ptr<TurboModule> {
react_native_assert(
!name.empty() && "TurboModule name must not be empty");

for (const auto& turboModuleProvider : turboModuleProviders) {
if (turboModuleProvider) {
if (auto turboModule = turboModuleProvider(name, jsInvoker)) {
return turboModule;
}
}
}

if (auto turboModule =
DefaultTurboModules::getTurboModule(name, jsInvoker)) {
return turboModule;
}

if (name == AnimatedModule::kModuleName) {
return std::make_shared<AnimatedModule>(
jsInvoker, animatedNodesManagerProvider);
} else if (name == AppStateModule::kModuleName) {
return std::make_shared<AppStateModule>(jsInvoker);
} else if (name == DeviceInfoModule::kModuleName) {
return std::make_shared<DeviceInfoModule>(jsInvoker);
} else if (
devUIDelegate != nullptr &&
name == DevLoadingViewModule::kModuleName) {
return std::make_shared<DevLoadingViewModule>(
jsInvoker, devUIDelegate);
} else if (
devServerHelper && name == DevSettingsModule::kModuleName) {
return std::make_shared<DevSettingsModule>(
jsInvoker, devServerHelper, liveReloadCallback);
} else if (name == PlatformConstantsModule::kModuleName) {
return std::make_shared<PlatformConstantsModule>(jsInvoker);
} else if (name == ImageLoaderModule::kModuleName) {
return std::make_shared<ImageLoaderModule>(jsInvoker);
} else if (name == SourceCodeModule::kModuleName) {
return std::make_shared<SourceCodeModule>(
jsInvoker, devServerHelper);
} else if (name == WebSocketModule::kModuleName) {
return std::make_shared<WebSocketModule>(
jsInvoker, webSocketClientFactory);
} else if (name == NativeExceptionsManager::kModuleName) {
return std::make_shared<NativeExceptionsManager>(
onJsError, jsInvoker);
} else if (name == NativePerformance::kModuleName) {
return std::make_shared<NativePerformance>(jsInvoker);
} else if (name == NativeIntersectionObserver::kModuleName) {
return std::make_shared<NativeIntersectionObserver>(jsInvoker);
} else if (name == NativeMutationObserver::kModuleName) {
return std::make_shared<NativeMutationObserver>(jsInvoker);
} else if (name == NetworkingModule::kModuleName) {
return std::make_shared<NetworkingModule>(
jsInvoker, httpClientFactory);
} else if (name == LogBoxModule::kModuleName) {
if (logBoxSurfaceDelegate) {
return std::make_shared<LogBoxModule>(
jsInvoker, logBoxSurfaceDelegate);
}
}

LOG_WARNING_ONCE << "Failed to load TurboModule: " << name;
return nullptr;
};

// Set up TurboModules
TurboModuleBinding::install(runtime, turboModuleProvider);
TurboModuleBinding::install(runtime, std::move(turboModuleManager));

if (bindingsInstallFunc) {
bindingsInstallFunc(runtime);
}
Expand Down
110 changes: 110 additions & 0 deletions packages/react-native/ReactCxxPlatform/react/runtime/TurboModuleManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#include "TurboModuleManager.h"

#include <react/coremodules/AppStateModule.h>
#include <react/coremodules/DeviceInfoModule.h>
#include <react/coremodules/PlatformConstantsModule.h>
#include <react/debug/react_native_assert.h>
#include <react/devsupport/DevLoadingViewModule.h>
#include <react/devsupport/DevSettingsModule.h>
#include <react/devsupport/LogBoxModule.h>
#include <react/devsupport/SourceCodeModule.h>
#include <react/io/ImageLoaderModule.h>
#include <react/io/NetworkingModule.h>
#include <react/io/WebSocketModule.h>
#include <react/logging/NativeExceptionsManager.h>
#include <react/nativemodule/defaults/DefaultTurboModules.h>
#include <react/nativemodule/intersectionobserver/NativeIntersectionObserver.h>
#include <react/nativemodule/mutationobserver/NativeMutationObserver.h>
#include <react/nativemodule/webperformance/NativePerformance.h>
#include <react/renderer/animated/AnimatedModule.h>

using namespace facebook::react;

TurboModuleManager::TurboModuleManager(
TurboModuleProviders turboModuleProviders,
std::shared_ptr<CallInvoker> jsInvoker,
JsErrorHandler::OnJsError onJsError,
std::shared_ptr<NativeAnimatedNodesManagerProvider>
animatedNodesManagerProvider,
std::shared_ptr<DevServerHelper> devServerHelper,
std::shared_ptr<IDevUIDelegate> devUIDelegate,
std::shared_ptr<SurfaceDelegate> logBoxSurfaceDelegate,
HttpClientFactory httpClientFactory,
WebSocketClientFactory webSocketClientFactory,
std::function<void()> liveReloadCallback)
: turboModuleProviders_(std::move(turboModuleProviders)),
jsInvoker_(std::move(jsInvoker)),
onJsError_(std::move(onJsError)),
animatedNodesManagerProvider_(std::move(animatedNodesManagerProvider)),
devServerHelper_(std::move(devServerHelper)),
devUIDelegate_(std::move(devUIDelegate)),
logBoxSurfaceDelegate_(std::move(logBoxSurfaceDelegate)),
httpClientFactory_(std::move(httpClientFactory)),
webSocketClientFactory_(std::move(webSocketClientFactory)),
liveReloadCallback_(std::move(liveReloadCallback)) {}

std::shared_ptr<TurboModule> TurboModuleManager::operator()(
const std::string& name) const {
react_native_assert(!name.empty() && "TurboModule name must not be empty");

for (const auto& turboModuleProvider : turboModuleProviders_) {
if (turboModuleProvider) {
if (auto turboModule = turboModuleProvider(name, jsInvoker_)) {
return turboModule;
}
}
}

if (auto turboModule =
DefaultTurboModules::getTurboModule(name, jsInvoker_)) {
return turboModule;
}

if (name == AnimatedModule::kModuleName) {
return std::make_shared<AnimatedModule>(
jsInvoker_, animatedNodesManagerProvider_);
} else if (name == AppStateModule::kModuleName) {
return std::make_shared<AppStateModule>(jsInvoker_);
} else if (name == DeviceInfoModule::kModuleName) {
return std::make_shared<DeviceInfoModule>(jsInvoker_);
} else if (
devUIDelegate_ != nullptr && name == DevLoadingViewModule::kModuleName) {
return std::make_shared<DevLoadingViewModule>(jsInvoker_, devUIDelegate_);
} else if (devServerHelper_ && name == DevSettingsModule::kModuleName) {
return std::make_shared<DevSettingsModule>(
jsInvoker_, devServerHelper_, liveReloadCallback_);
} else if (name == PlatformConstantsModule::kModuleName) {
return std::make_shared<PlatformConstantsModule>(jsInvoker_);
} else if (name == ImageLoaderModule::kModuleName) {
return std::make_shared<ImageLoaderModule>(jsInvoker_);
} else if (name == SourceCodeModule::kModuleName) {
return std::make_shared<SourceCodeModule>(jsInvoker_, devServerHelper_);
} else if (name == WebSocketModule::kModuleName) {
return std::make_shared<WebSocketModule>(
jsInvoker_, webSocketClientFactory_);
} else if (name == NativeExceptionsManager::kModuleName) {
return std::make_shared<NativeExceptionsManager>(onJsError_, jsInvoker_);
} else if (name == NativePerformance::kModuleName) {
return std::make_shared<NativePerformance>(jsInvoker_);
} else if (name == NativeIntersectionObserver::kModuleName) {
return std::make_shared<NativeIntersectionObserver>(jsInvoker_);
} else if (name == NativeMutationObserver::kModuleName) {
return std::make_shared<NativeMutationObserver>(jsInvoker_);
} else if (name == NetworkingModule::kModuleName) {
return std::make_shared<NetworkingModule>(jsInvoker_, httpClientFactory_);
} else if (name == LogBoxModule::kModuleName) {
if (logBoxSurfaceDelegate_) {
return std::make_shared<LogBoxModule>(jsInvoker_, logBoxSurfaceDelegate_);
}
}

LOG(WARNING) << "Failed to load TurboModule: " << name;
return nullptr;
}
53 changes: 53 additions & 0 deletions packages/react-native/ReactCxxPlatform/react/runtime/TurboModuleManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

#include <jserrorhandler/JsErrorHandler.h>
#include <react/http/IHttpClient.h>
#include <react/http/IWebSocketClient.h>
#include <react/nativemodule/TurboModuleProvider.h>
#include <react/renderer/scheduler/SurfaceDelegate.h>

namespace facebook::react {

class CallInvoker;
class DevServerHelper;
class NativeAnimatedNodesManagerProvider;
class SurfaceDelegate;
struct IDevUIDelegate;

class TurboModuleManager final {
public:
TurboModuleManager(
TurboModuleProviders turboModuleProviders,
std::shared_ptr<CallInvoker> jsInvoker,
JsErrorHandler::OnJsError onJsError,
std::shared_ptr<NativeAnimatedNodesManagerProvider> animatedNodesManagerProvider = nullptr,
std::shared_ptr<DevServerHelper> devServerHelper = nullptr,
std::shared_ptr<IDevUIDelegate> devUIDelegate = nullptr,
std::shared_ptr<SurfaceDelegate> logBoxSurfaceDelegate = nullptr,
HttpClientFactory httpClientFactory = nullptr,
WebSocketClientFactory webSocketClientFactory = nullptr,
std::function<void()> liveReloadCallback = nullptr);

std::shared_ptr<TurboModule> operator()(const std::string &name) const;

private:
TurboModuleProviders turboModuleProviders_;
std::shared_ptr<CallInvoker> jsInvoker_;
JsErrorHandler::OnJsError onJsError_;
std::shared_ptr<NativeAnimatedNodesManagerProvider> animatedNodesManagerProvider_;
std::shared_ptr<DevServerHelper> devServerHelper_;
std::shared_ptr<IDevUIDelegate> devUIDelegate_;
std::shared_ptr<SurfaceDelegate> logBoxSurfaceDelegate_;
HttpClientFactory httpClientFactory_;
WebSocketClientFactory webSocketClientFactory_;
std::function<void()> liveReloadCallback_;
};

} // namespace facebook::react