Allow custom factories for HTTP and WebSocket clients for DevTools

Differential Revision: D79806934

Author: rubennorte

packages/react-native/ReactCxxPlatform/react/http/IHttpClient.cpp

@@ -10,4 +10,7 @@ namespace facebook::react {
 // NOLINTNEXTLINE(modernize-avoid-c-arrays)
 extern const char HttpClientFactoryKey[] = "HttpClientFactory";
 
+// NOLINTNEXTLINE(modernize-avoid-c-arrays)
+extern const char DevToolsHttpClientFactoryKey[] = "DevToolsHttpClientFactory";
+
 } // namespace facebook::react

packages/react-native/ReactCxxPlatform/react/http/IHttpClient.h

@@ -82,6 +82,8 @@ struct IHttpClient {
 
 extern const char HttpClientFactoryKey[];
 
+extern const char DevToolsHttpClientFactoryKey[];
+
 using HttpClientFactory = std::function<std::unique_ptr<IHttpClient>()>;
 
 HttpClientFactory getHttpClientFactory();

packages/react-native/ReactCxxPlatform/react/http/IWebSocketClient.cpp

@@ -10,4 +10,8 @@ namespace facebook::react {
 // NOLINTNEXTLINE(modernize-avoid-c-arrays)
 extern const char WebSocketClientFactoryKey[] = "WebSocketClientFactory";
 
+// NOLINTNEXTLINE(modernize-avoid-c-arrays)
+extern const char DevToolsWebSocketClientFactoryKey[] =
+    "DevToolsWebSocketClientFactory";
+
 } // namespace facebook::react

packages/react-native/ReactCxxPlatform/react/http/IWebSocketClient.h

@@ -38,6 +38,8 @@ class IWebSocketClient {
 
 extern const char WebSocketClientFactoryKey[];
 
+extern const char DevToolsWebSocketClientFactoryKey[];
+
 using WebSocketClientFactory =
     std::function<std::unique_ptr<IWebSocketClient>()>;
 

packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.cpp

@@ -136,6 +136,16 @@ void ReactHost::createReactInstance() {
       reactInstanceData_->contextContainer->at<WebSocketClientFactory>(
           WebSocketClientFactoryKey);
 
+  auto devToolsHttpClientFactory =
+      reactInstanceData_->contextContainer
+          ->find<HttpClientFactory>(DevToolsHttpClientFactoryKey)
+          .value_or(httpClientFactory);
+
+  auto devToolsWebSocketClientFactory =
+      reactInstanceData_->contextContainer
+          ->find<WebSocketClientFactory>(DevToolsWebSocketClientFactoryKey)
+          .value_or(webSocketClientFactory);
+
   // Create devServerHelper
   if (!devServerHelper_ &&
       (reactInstanceConfig_.enableInspector ||
@@ -145,7 +155,7 @@ void ReactHost::createReactInstance() {
         reactInstanceConfig_.deviceName,
         reactInstanceConfig_.devServerHost,
         reactInstanceConfig_.devServerPort,
-        httpClientFactory,
+        devToolsHttpClientFactory,
         [this](
             const std::string& moduleName,
             const std::string& methodName,
@@ -159,8 +169,8 @@ void ReactHost::createReactInstance() {
     inspector_ = std::make_shared<Inspector>(
         reactInstanceConfig_.appId,
         reactInstanceConfig_.deviceName,
-        webSocketClientFactory,
-        httpClientFactory);
+        devToolsWebSocketClientFactory,
+        devToolsHttpClientFactory);
     inspector_->ensureHostTarget(
         [this]() { reloadReactInstance(); },
         [weakDevUIDelegate =
@@ -179,7 +189,7 @@ void ReactHost::createReactInstance() {
 
   if (!packagerConnection_ && reactInstanceConfig_.enableDevMode) {
     packagerConnection_ = std::make_unique<PackagerConnection>(
-        webSocketClientFactory,
+        devToolsWebSocketClientFactory,
         devServerHelper_->getPackagerConnectionUrl(),
         [this]() { reloadReactInstance(); },
         []() {});