react-native 0.83.0-nightly-20250907-02e3a999e → 0.83.0-nightly-20250909-e7ce4ff0b

package/Libraries/AppDelegate/RCTAppDelegate.h

@@ -5,8 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTBridgeDelegate.h>
-#import <React/RCTConvert.h>
 #import <UIKit/UIKit.h>
 #import "RCTDefaultReactNativeFactoryDelegate.h"
 #import "RCTReactNativeFactory.h"

package/Libraries/AppDelegate/RCTAppDelegate.mm

@@ -6,6 +6,7 @@
  */
 
 #import "RCTAppDelegate.h"
+#import <React/RCTBridgeDelegate.h>
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 #import <React/RCTSurfacePresenterBridgeAdapter.h>

package/Libraries/BatchedBridge/BatchedBridge.js

@@ -6,6 +6,7 @@
  *
  * @flow strict
  * @format
+ * @deprecated
  */
 
 'use strict';

package/Libraries/BatchedBridge/MessageQueue.js

@@ -6,6 +6,7 @@
  *
  * @flow strict
  * @format
+ * @deprecated
  */
 
 'use strict';

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 83;
   static patch: number = 0;
-  static prerelease: string | null = 'nightly-20250907-02e3a999e';
+  static prerelease: string | null = 'nightly-20250909-e7ce4ff0b';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/Libraries/Core/Timers/JSTimers.js

@@ -6,6 +6,7 @@
  *
  * @flow
  * @format
+ * @deprecated
  */
 
 import NativeTiming from './NativeTiming';

package/Libraries/Core/Timers/NativeTiming.js

@@ -6,6 +6,7 @@
  *
  * @flow strict
  * @format
+ * @deprecated
  */
 
 export * from '../../../src/private/specs_DEPRECATED/modules/NativeTiming';

package/Libraries/Core/Timers/immediateShim.js

@@ -6,6 +6,7 @@
  *
  * @flow
  * @format
+ * @deprecated
  */
 
 'use strict';

package/Libraries/Network/RCTInspectorNetworkReporter.mm

@@ -10,9 +10,9 @@
 #import "RCTNetworkConversions.h"
 
 #import <React/RCTLog.h>
-#import <jsinspector-modern/network/NetworkReporter.h>
+#import <react/networking/NetworkReporter.h>
 
-using namespace facebook::react::jsinspector_modern;
+using namespace facebook::react;
 
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
 namespace {

package/Libraries/Renderer/shims/ReactNativeTypes.js

@@ -7,7 +7,7 @@
  * @noformat
  * @nolint
  * @flow strict
- * @generated SignedSource<<deb7924d11c790f99448a1c2f0edddb9>>
+ * @generated SignedSource<<c0e57723772ea5f1aa8c3c897ac3c216>>
  */
 
 import type {
@@ -135,6 +135,7 @@ export type RenderRootOptions = {
     error: mixed,
     errorInfo: {+componentStack?: ?string},
   ) => void,
+  onDefaultTransitionIndicator?: () => void | (() => void),
 };
 
 /**

package/README.md

@@ -17,10 +17,13 @@
     <img src="https://img.shields.io/npm/v/react-native?color=brightgreen&label=npm%20package" alt="Current npm package version." />
   </a>
   <a href="https://reactnative.dev/docs/contributing">
-    <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs welcome!" />
+    <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs are welcome!" />
   </a>
   <a href="https://twitter.com/intent/follow?screen_name=reactnative">
-    <img src="https://img.shields.io/twitter/follow/reactnative.svg?label=Follow%20@reactnative" alt="Follow @reactnative" />
+    <img src="https://img.shields.io/twitter/follow/reactnative.svg?label=Follow%20@reactnative" alt="Follow @reactnative on X" />
+  </a>
+  <a href="https://bsky.app/profile/reactnative.dev">
+    <img src="https://img.shields.io/badge/Bluesky-0285FF?logo=bluesky&logoColor=fff" alt="Follow @reactnative.dev on Bluesky" />
   </a>
 </p>
 

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(83),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"nightly-20250907-02e3a999e",
+                  RCTVersionPrerelease: @"nightly-20250909-e7ce4ff0b",
                   };
   });
   return __rnVersion;

package/React/React-RCTFabric.podspec

@@ -91,9 +91,9 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-RCTAnimation", :framework_name => 'RCTAnimation')
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
   add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
-  add_dependency(s, "React-jsinspectornetwork", :framework_name => 'jsinspector_modernnetwork')
   add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
   add_dependency(s, "React-performancecdpmetrics", :framework_name => 'React_performancecdpmetrics')
+  add_dependency(s, "React-networking", :framework_name => 'React_networking')
   add_dependency(s, "React-renderercss")
   add_dependency(s, "React-RCTFBReactNativeSpec")
 

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.83.0-nightly-20250907-02e3a999e
+VERSION_NAME=0.83.0-nightly-20250909-e7ce4ff0b
 HERMES_VERSION_NAME=1000.0.0
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes

package/ReactAndroid/hermes-engine/build.gradle.kts

@@ -88,7 +88,7 @@ val hermesVersionProvider: Provider<String> =
       val hermesVersionFile =
           File(
               reactNativeRootDir,
-              if (hermesV1Enabled) "sdks/.hermesv1version" else "\"sdks/.hermesversion\"",
+              if (hermesV1Enabled) "sdks/.hermesv1version" else "sdks/.hermesversion",
           )
 
       if (hermesVersionFile.exists()) {

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 83,
     "patch" to 0,
-    "prerelease" to "nightly-20250907-02e3a999e"
+    "prerelease" to "nightly-20250909-e7ce4ff0b"
   )
 }

package/ReactAndroid/src/main/jni/CMakeLists.txt

@@ -124,6 +124,7 @@ add_react_common_subdir(react/nativemodule/dom)
 add_react_common_subdir(react/nativemodule/featureflags)
 add_react_common_subdir(react/nativemodule/microtasks)
 add_react_common_subdir(react/nativemodule/idlecallbacks)
+add_react_common_subdir(react/networking)
 add_react_common_subdir(jserrorhandler)
 add_react_common_subdir(react/runtime)
 add_react_common_subdir(react/runtime/hermes)
@@ -190,6 +191,7 @@ add_library(reactnative
           $<TARGET_OBJECTS:react_nativemodule_featureflags>
           $<TARGET_OBJECTS:react_nativemodule_idlecallbacks>
           $<TARGET_OBJECTS:react_nativemodule_microtasks>
+          $<TARGET_OBJECTS:react_networking>
           $<TARGET_OBJECTS:react_newarchdefaults>
           $<TARGET_OBJECTS:react_performance_cdpmetrics>
           $<TARGET_OBJECTS:react_performance_timeline>
@@ -279,6 +281,7 @@ target_include_directories(reactnative
         $<TARGET_PROPERTY:react_nativemodule_featureflags,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_nativemodule_idlecallbacks,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_nativemodule_microtasks,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_networking,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_newarchdefaults,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_performance_cdpmetrics,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_performance_timeline,INTERFACE_INCLUDE_DIRECTORIES>

package/ReactAndroid/src/main/jni/react/devsupport/CMakeLists.txt

@@ -20,6 +20,6 @@ target_include_directories(react_devsupportjni PUBLIC .)
 target_link_libraries(react_devsupportjni
         fbjni
         jsinspector
-        jsinspector_network)
+        react_networking)
 
 target_compile_reactnative_options(react_devsupportjni PRIVATE)

package/ReactAndroid/src/main/jni/react/devsupport/JInspectorNetworkReporter.cpp

@@ -7,7 +7,7 @@
 
 #include "JInspectorNetworkReporter.h"
 
-#include <jsinspector-modern/network/NetworkReporter.h>
+#include <react/networking/NetworkReporter.h>
 
 #include <cstddef>
 #include <string>

package/ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt

@@ -28,7 +28,7 @@ target_compile_reactnative_options(hermes_executor PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
   target_compile_options(hermes_executor PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
 
-  if (DEFINED HERMES_V1_ENABLED)
+  if (HERMES_V1_ENABLED)
         target_compile_options(hermes_executor PRIVATE -DHERMES_V1_ENABLED=1)
   endif()
 endif()

package/ReactAndroid/src/main/jni/react/runtime/hermes/jni/CMakeLists.txt

@@ -30,7 +30,7 @@ target_compile_reactnative_options(hermesinstancejni PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
   target_compile_options(hermesinstancejni PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
 
-  if (DEFINED HERMES_V1_ENABLED)
+  if (HERMES_V1_ENABLED)
         target_compile_options(hermesinstancejni PRIVATE -DHERMES_V1_ENABLED=1)
   endif()
 endif ()

package/ReactAndroid/src/main/jni/react/runtime/jni/CMakeLists.txt

@@ -20,7 +20,7 @@ target_compile_reactnative_options(rninstance PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
   target_compile_options(rninstance PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
 
-  if (DEFINED HERMES_V1_ENABLED)
+  if (HERMES_V1_ENABLED)
         target_compile_options(rninstance PRIVATE -DHERMES_V1_ENABLED=1)
   endif()
 endif ()

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 83;
   int32_t Patch = 0;
-  std::string_view Prerelease = "nightly-20250907-02e3a999e";
+  std::string_view Prerelease = "nightly-20250909-e7ce4ff0b";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/hermes/executor/CMakeLists.txt

@@ -33,7 +33,7 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
                 -DHERMES_ENABLE_DEBUGGER=1
         )
 
-        if (DEFINED HERMES_V1_ENABLED)
+        if (HERMES_V1_ENABLED)
                 target_compile_options(hermes_executor_common PRIVATE -DHERMES_V1_ENABLED=1)
         endif()
 else()

package/ReactCommon/hermes/inspector-modern/CMakeLists.txt

@@ -24,7 +24,7 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
                 -DHERMES_ENABLE_DEBUGGER=1
         )
 
-        if (DEFINED HERMES_V1_ENABLED)
+        if (HERMES_V1_ENABLED)
                 target_compile_options(hermes_inspector_modern PRIVATE -DHERMES_V1_ENABLED=1)
         endif()
 endif()

package/ReactCommon/jsinspector-modern/NetworkIOAgent.cpp

@@ -11,7 +11,7 @@
 #include "Base64.h"
 #include "Utf8.h"
 
-#include <jsinspector-modern/network/NetworkReporter.h>
+#include <jsinspector-modern/network/NetworkHandler.h>
 
 #include <sstream>
 #include <tuple>
@@ -272,19 +272,19 @@ bool NetworkIOAgent::handleRequest(
   }
 
   if (InspectorFlags::getInstance().getNetworkInspectionEnabled()) {
-    auto& networkReporter = NetworkReporter::getInstance();
+    auto& networkHandler = NetworkHandler::getInstance();
 
     // @cdp Network.enable support is experimental.
     if (req.method == "Network.enable") {
-      networkReporter.setFrontendChannel(frontendChannel_);
-      networkReporter.enableDebugging();
+      networkHandler.setFrontendChannel(frontendChannel_);
+      networkHandler.enable();
       frontendChannel_(cdp::jsonResult(req.id));
       return true;
     }
 
     // @cdp Network.disable support is experimental.
     if (req.method == "Network.disable") {
-      networkReporter.disableDebugging();
+      networkHandler.disable();
       frontendChannel_(cdp::jsonResult(req.id));
       return true;
     }
@@ -497,9 +497,9 @@ void NetworkIOAgent::handleGetResponseBody(const cdp::PreparsedRequest& req) {
     return;
   }
 
-  auto& networkReporter = NetworkReporter::getInstance();
+  auto& networkHandler = NetworkHandler::getInstance();
 
-  if (!networkReporter.isDebuggingEnabled()) {
+  if (!networkHandler.isEnabled()) {
     frontendChannel_(cdp::jsonError(
         requestId,
         cdp::ErrorCode::InvalidRequest,
@@ -508,7 +508,7 @@ void NetworkIOAgent::handleGetResponseBody(const cdp::PreparsedRequest& req) {
   }
 
   auto storedResponse =
-      networkReporter.getResponseBody(req.params.at("requestId").asString());
+      networkHandler.getResponseBody(req.params.at("requestId").asString());
 
   if (!storedResponse) {
     frontendChannel_(cdp::jsonError(

package/ReactCommon/jsinspector-modern/network/CMakeLists.txt

@@ -24,6 +24,4 @@ target_include_directories(jsinspector_network PUBLIC ${REACT_COMMON_DIR})
 target_link_libraries(jsinspector_network
         folly_runtime
         glog
-        jsinspector_cdp
-        react_performance_timeline
-        react_timing)
+        jsinspector_cdp)

package/ReactCommon/jsinspector-modern/network/CdpNetwork.cpp

@@ -27,15 +27,6 @@ folly::dynamic headersToDynamic(const std::optional<Headers>& headers) {
 
 } // namespace
 
-/* static */ Request Request::fromInputParams(const RequestInfo& requestInfo) {
-  return {
-      .url = requestInfo.url,
-      .method = requestInfo.httpMethod,
-      .headers = requestInfo.headers,
-      .postData = requestInfo.httpBody,
-  };
-}
-
 folly::dynamic Request::toDynamic() const {
   folly::dynamic result = folly::dynamic::object;
 
@@ -48,16 +39,16 @@ folly::dynamic Request::toDynamic() const {
 }
 
 /* static */ Response Response::fromInputParams(
-    const ResponseInfo& responseInfo,
+    const std::string& url,
+    uint16_t status,
+    const std::optional<Headers>& headers,
     int encodedDataLength) {
-  auto headers = responseInfo.headers.value_or(Headers());
-
   return {
-      .url = responseInfo.url,
-      .status = responseInfo.statusCode,
-      .statusText = httpReasonPhrase(responseInfo.statusCode),
+      .url = url,
+      .status = status,
+      .statusText = httpReasonPhrase(status),
       .headers = headers,
-      .mimeType = mimeTypeFromHeaders(headers),
+      .mimeType = mimeTypeFromHeaders(headers.value_or(Headers())),
       .encodedDataLength = encodedDataLength,
   };
 }

package/ReactCommon/jsinspector-modern/network/CdpNetwork.h

@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "NetworkTypes.h"
-
 #include <folly/dynamic.h>
 
 #include <string>
@@ -18,6 +16,8 @@
 
 namespace facebook::react::jsinspector_modern::cdp::network {
 
+using Headers = std::map<std::string, std::string>;
+
 /**
  * https://chromedevtools.github.io/devtools-protocol/tot/Network/#type-Request
  */
@@ -27,12 +27,6 @@ struct Request {
   std::optional<Headers> headers;
   std::optional<std::string> postData;
 
-  /**
-   * Convenience function to construct a `Request` from the generic
-   * `RequestInfo` input object.
-   */
-  static Request fromInputParams(const RequestInfo& requestInfo);
-
   folly::dynamic toDynamic() const;
 };
 
@@ -52,7 +46,9 @@ struct Response {
    * `ResponseInfo` input object.
    */
   static Response fromInputParams(
-      const ResponseInfo& responseInfo,
+      const std::string& url,
+      uint16_t status,
+      const std::optional<Headers>& headers,
       int encodedDataLength);
 
   folly::dynamic toDynamic() const;

package/ReactCommon/jsinspector-modern/network/HttpUtils.cpp

@@ -146,7 +146,8 @@ std::string httpReasonPhrase(uint16_t status) {
   return "<Unknown>";
 }
 
-std::string mimeTypeFromHeaders(const Headers& headers) {
+std::string mimeTypeFromHeaders(
+    const std::map<std::string, std::string>& headers) {
   std::string mimeType = "application/octet-stream";
 
   for (const auto& [name, value] : headers) {

package/ReactCommon/jsinspector-modern/network/HttpUtils.h

@@ -7,8 +7,7 @@
 
 #pragma once
 
-#include "NetworkTypes.h"
-
+#include <map>
 #include <string>
 
 namespace facebook::react::jsinspector_modern {
@@ -22,6 +21,7 @@ std::string httpReasonPhrase(uint16_t status);
  * Get the MIME type for a response based on the 'Content-Type' header. If
  * the header is not present, returns 'application/octet-stream'.
  */
-std::string mimeTypeFromHeaders(const Headers& headers);
+std::string mimeTypeFromHeaders(
+    const std::map<std::string, std::string>& headers);
 
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/network/NetworkHandler.cpp

@@ -0,0 +1,209 @@
+/*
+ * 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 "NetworkHandler.h"
+
+#include <jsinspector-modern/cdp/CdpJson.h>
+
+#include <glog/logging.h>
+#include <chrono>
+
+namespace facebook::react::jsinspector_modern {
+
+namespace {
+
+/**
+ * Get the current Unix timestamp in seconds (µs precision, CDP format).
+ */
+double getCurrentUnixTimestampSeconds() {
+  auto now = std::chrono::system_clock::now().time_since_epoch();
+  auto seconds = std::chrono::duration_cast<std::chrono::seconds>(now).count();
+  auto micros =
+      std::chrono::duration_cast<std::chrono::microseconds>(now).count() %
+      1000000;
+
+  return static_cast<double>(seconds) +
+      (static_cast<double>(micros) / 1000000.0);
+}
+
+} // namespace
+
+NetworkHandler& NetworkHandler::getInstance() {
+  static NetworkHandler instance;
+  return instance;
+}
+
+void NetworkHandler::setFrontendChannel(FrontendChannel frontendChannel) {
+  frontendChannel_ = std::move(frontendChannel);
+}
+
+bool NetworkHandler::enable() {
+  if (enabled_.load(std::memory_order_acquire)) {
+    return false;
+  }
+
+  enabled_.store(true, std::memory_order_release);
+  return true;
+}
+
+bool NetworkHandler::disable() {
+  if (!enabled_.load(std::memory_order_acquire)) {
+    return false;
+  }
+
+  enabled_.store(false, std::memory_order_release);
+  requestBodyBuffer_.clear();
+  return true;
+}
+
+void NetworkHandler::onRequestWillBeSent(
+    const std::string& requestId,
+    const cdp::network::Request& request,
+    const std::optional<cdp::network::Response>& redirectResponse) {
+  if (!isEnabledNoSync()) {
+    return;
+  }
+
+  double timestamp = getCurrentUnixTimestampSeconds();
+  auto params = cdp::network::RequestWillBeSentParams{
+      .requestId = requestId,
+      .loaderId = "",
+      .documentURL = "mobile",
+      .request = request,
+      // NOTE: Both timestamp and wallTime use the same unit, however wallTime
+      // is relative to an "arbitrary epoch". In our implementation, use the
+      // Unix epoch for both.
+      .timestamp = timestamp,
+      .wallTime = timestamp,
+      .initiator = folly::dynamic::object("type", "script"),
+      .redirectHasExtraInfo = redirectResponse.has_value(),
+      .redirectResponse = redirectResponse,
+  };
+
+  frontendChannel_(
+      cdp::jsonNotification("Network.requestWillBeSent", params.toDynamic()));
+}
+
+void NetworkHandler::onRequestWillBeSentExtraInfo(
+    const std::string& requestId,
+    const Headers& headers) {
+  if (!isEnabledNoSync()) {
+    return;
+  }
+
+  auto params = cdp::network::RequestWillBeSentExtraInfoParams{
+      .requestId = requestId,
+      .headers = headers,
+      .connectTiming = {.requestTime = getCurrentUnixTimestampSeconds()},
+  };
+
+  frontendChannel_(cdp::jsonNotification(
+      "Network.requestWillBeSentExtraInfo", params.toDynamic()));
+}
+
+void NetworkHandler::onResponseReceived(
+    const std::string& requestId,
+    const cdp::network::Response& response) {
+  if (!isEnabledNoSync()) {
+    return;
+  }
+
+  auto resourceType = cdp::network::resourceTypeFromMimeType(response.mimeType);
+  resourceTypeMap_.emplace(requestId, resourceType);
+
+  auto params = cdp::network::ResponseReceivedParams{
+      .requestId = requestId,
+      .loaderId = "",
+      .timestamp = getCurrentUnixTimestampSeconds(),
+      .type = resourceType,
+      .response = response,
+      .hasExtraInfo = false,
+  };
+
+  frontendChannel_(
+      cdp::jsonNotification("Network.responseReceived", params.toDynamic()));
+}
+
+void NetworkHandler::onDataReceived(
+    const std::string& requestId,
+    int dataLength,
+    int encodedDataLength) {
+  if (!isEnabledNoSync()) {
+    return;
+  }
+
+  auto params = cdp::network::DataReceivedParams{
+      .requestId = requestId,
+      .timestamp = getCurrentUnixTimestampSeconds(),
+      .dataLength = dataLength,
+      .encodedDataLength = encodedDataLength,
+  };
+
+  frontendChannel_(
+      cdp::jsonNotification("Network.dataReceived", params.toDynamic()));
+}
+
+void NetworkHandler::onLoadingFinished(
+    const std::string& requestId,
+    int encodedDataLength) {
+  if (!isEnabledNoSync()) {
+    return;
+  }
+
+  auto params = cdp::network::LoadingFinishedParams{
+      .requestId = requestId,
+      .timestamp = getCurrentUnixTimestampSeconds(),
+      .encodedDataLength = encodedDataLength,
+  };
+
+  frontendChannel_(
+      cdp::jsonNotification("Network.loadingFinished", params.toDynamic()));
+}
+
+void NetworkHandler::onLoadingFailed(
+    const std::string& requestId,
+    bool cancelled) const {
+  if (!isEnabledNoSync()) {
+    return;
+  }
+
+  auto params = cdp::network::LoadingFailedParams{
+      .requestId = requestId,
+      .timestamp = getCurrentUnixTimestampSeconds(),
+      .type = resourceTypeMap_.find(requestId) != resourceTypeMap_.end()
+          ? resourceTypeMap_.at(requestId)
+          : "Other",
+      .errorText = cancelled ? "net::ERR_ABORTED" : "net::ERR_FAILED",
+      .canceled = cancelled,
+  };
+
+  frontendChannel_(
+      cdp::jsonNotification("Network.loadingFailed", params.toDynamic()));
+}
+
+void NetworkHandler::storeResponseBody(
+    const std::string& requestId,
+    std::string_view body,
+    bool base64Encoded) {
+  std::lock_guard<std::mutex> lock(requestBodyMutex_);
+  requestBodyBuffer_.put(requestId, body, base64Encoded);
+}
+
+std::optional<std::tuple<std::string, bool>> NetworkHandler::getResponseBody(
+    const std::string& requestId) {
+  std::lock_guard<std::mutex> lock(requestBodyMutex_);
+  auto responseBody = requestBodyBuffer_.get(requestId);
+
+  if (responseBody == nullptr) {
+    return std::nullopt;
+  }
+
+  return std::make_optional<std::tuple<std::string, bool>>(
+      responseBody->data, responseBody->base64Encoded);
+}
+
+} // namespace facebook::react::jsinspector_modern