react-native 0.83.0-nightly-20251007-854268275 → 0.83.0-nightly-20251009-24d0d4414

package/Libraries/Animated/nodes/AnimatedColor.js

@@ -110,6 +110,27 @@ function isRgbaAnimatedValue(value: any): boolean {
   );
 }
 
+export function getRgbaValueAndNativeColor(
+  value: RgbaValue | ColorValue,
+): $ReadOnly<{
+  rgbaValue: RgbaValue,
+  nativeColor?: NativeColorValue,
+}> {
+  const processedColor: RgbaValue | NativeColorValue =
+    // $FlowFixMe[incompatible-type] - Type is verified above
+    processColor((value: ColorValue | RgbaValue)) ?? defaultColor;
+  if (isRgbaValue(processedColor)) {
+    // $FlowFixMe[incompatible-type] - Type is verified above
+    return {rgbaValue: (processedColor: RgbaValue)};
+  } else {
+    return {
+      // $FlowFixMe[incompatible-type] - Type is verified above
+      nativeColor: (processedColor: NativeColorValue),
+      rgbaValue: defaultColor,
+    };
+  }
+}
+
 export default class AnimatedColor extends AnimatedWithChildren {
   r: AnimatedValue;
   g: AnimatedValue;
@@ -132,18 +153,13 @@ export default class AnimatedColor extends AnimatedWithChildren {
       this.b = rgbaAnimatedValue.b;
       this.a = rgbaAnimatedValue.a;
     } else {
-      const processedColor: RgbaValue | NativeColorValue =
-        // $FlowFixMe[incompatible-type] - Type is verified above
-        processColor((value: ColorValue | RgbaValue)) ?? defaultColor;
-      let initColor: RgbaValue = defaultColor;
-      if (isRgbaValue(processedColor)) {
+      const {rgbaValue: initColor, nativeColor} = getRgbaValueAndNativeColor(
         // $FlowFixMe[incompatible-type] - Type is verified above
-        initColor = (processedColor: RgbaValue);
-      } else {
-        // $FlowFixMe[incompatible-type] - Type is verified above
-        this.nativeColor = (processedColor: NativeColorValue);
+        (value: ColorValue | RgbaValue),
+      );
+      if (nativeColor) {
+        this.nativeColor = nativeColor;
       }
-
       this.r = new AnimatedValue(initColor.r);
       this.g = new AnimatedValue(initColor.g);
       this.b = new AnimatedValue(initColor.b);

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-20251007-854268275';
+  static prerelease: string | null = 'nightly-20251009-24d0d4414';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/Libraries/Network/RCTInspectorNetworkReporter.h

@@ -27,7 +27,7 @@
  * - Corresponds to `PerformanceResourceTiming.requestStart` (specifically,
  *   marking when the native request was initiated).
  */
-+ (void)reportRequestStart:(NSNumber *)requestId
++ (void)reportRequestStart:(NSString *)requestId
                    request:(NSURLRequest *)request
          encodedDataLength:(int)encodedDataLength;
 
@@ -40,7 +40,7 @@
  *   `PerformanceResourceTiming.connectStart`. Defined as "immediately before
  *   the browser starts to establish the connection to the server".
  */
-+ (void)reportConnectionTiming:(NSNumber *)requestId request:(NSURLRequest *)request;
++ (void)reportConnectionTiming:(NSString *)requestId request:(NSURLRequest *)request;
 
 /**
  * Report when HTTP response headers have been received, corresponding to
@@ -49,7 +49,7 @@
  * - Corresponds to `Network.responseReceived` in CDP.
  * - Corresponds to `PerformanceResourceTiming.responseStart`.
  */
-+ (void)reportResponseStart:(NSNumber *)requestId
++ (void)reportResponseStart:(NSString *)requestId
                    response:(NSURLResponse *)response
                  statusCode:(int)statusCode
                     headers:(NSDictionary<NSString *, NSString *> *)headers;
@@ -59,7 +59,7 @@
  *
  * Corresponds to `Network.dataReceived` in CDP.
  */
-+ (void)reportDataReceived:(NSNumber *)requestId data:(NSData *)data;
++ (void)reportDataReceived:(NSString *)requestId data:(NSData *)data;
 
 /**
  * Report when a network request is complete and we are no longer receiving
@@ -68,20 +68,20 @@
  * - Corresponds to `Network.loadingFinished` in CDP.
  * - Corresponds to `PerformanceResourceTiming.responseEnd`.
  */
-+ (void)reportResponseEnd:(NSNumber *)requestId encodedDataLength:(int)encodedDataLength;
++ (void)reportResponseEnd:(NSString *)requestId encodedDataLength:(int)encodedDataLength;
 
 /**
  * Report when a network request has failed.
  *
  * - Corresponds to `Network.loadingFailed` in CDP.
  */
-+ (void)reportRequestFailed:(NSNumber *)requestId cancelled:(BOOL)cancelled;
++ (void)reportRequestFailed:(NSString *)requestId cancelled:(BOOL)cancelled;
 
 /**
  * Store response body preview. This is an optional reporting method, and is a
  * no-op if CDP debugging is disabled.
  */
-+ (void)maybeStoreResponseBody:(NSNumber *)requestId data:(NSData *)data base64Encoded:(bool)base64Encoded;
++ (void)maybeStoreResponseBody:(NSString *)requestId data:(NSData *)data base64Encoded:(bool)base64Encoded;
 
 /**
  * Incrementally store a response body preview, when a string response is
@@ -91,6 +91,6 @@
  * As with `maybeStoreResponseBody`, calling this method is optional and a
  * no-op if CDP debugging is disabled.
  */
-+ (void)maybeStoreResponseBodyIncremental:(NSNumber *)requestId data:(NSString *)data;
++ (void)maybeStoreResponseBodyIncremental:(NSString *)requestId data:(NSString *)data;
 
 @end

package/Libraries/Network/RCTInspectorNetworkReporter.mm

@@ -48,14 +48,14 @@ std::string convertRequestBodyToStringTruncated(NSURLRequest *request)
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
 
 // Dictionary to buffer incremental response bodies (CDP debugging active only)
-static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers = nil;
+static const NSMutableDictionary<NSString *, NSMutableString *> *responseBuffers = nil;
 
 #endif
 
 @implementation RCTInspectorNetworkReporter {
 }
 
-+ (void)reportRequestStart:(NSNumber *)requestId
++ (void)reportRequestStart:(NSString *)requestId
                    request:(NSURLRequest *)request
          encodedDataLength:(int)encodedDataLength
 {
@@ -68,11 +68,10 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
   requestInfo.httpBody = convertRequestBodyToStringTruncated(request);
 #endif
 
-  NetworkReporter::getInstance().reportRequestStart(
-      requestId.stringValue.UTF8String, requestInfo, encodedDataLength, std::nullopt);
+  NetworkReporter::getInstance().reportRequestStart(requestId.UTF8String, requestInfo, encodedDataLength, std::nullopt);
 }
 
-+ (void)reportConnectionTiming:(NSNumber *)requestId request:(NSURLRequest *)request
++ (void)reportConnectionTiming:(NSString *)requestId request:(NSURLRequest *)request
 {
   Headers headersMap;
 
@@ -81,10 +80,10 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
   headersMap = convertNSDictionaryToHeaders(request.allHTTPHeaderFields);
 #endif
 
-  NetworkReporter::getInstance().reportConnectionTiming(requestId.stringValue.UTF8String, headersMap);
+  NetworkReporter::getInstance().reportConnectionTiming(requestId.UTF8String, headersMap);
 }
 
-+ (void)reportResponseStart:(NSNumber *)requestId
++ (void)reportResponseStart:(NSString *)requestId
                    response:(NSURLResponse *)response
                  statusCode:(int)statusCode
                     headers:(NSDictionary<NSString *, NSString *> *)headers
@@ -99,17 +98,17 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
 #endif
 
   NetworkReporter::getInstance().reportResponseStart(
-      requestId.stringValue.UTF8String, responseInfo, response.expectedContentLength);
+      requestId.UTF8String, responseInfo, response.expectedContentLength);
 }
 
-+ (void)reportDataReceived:(NSNumber *)requestId data:(NSData *)data
++ (void)reportDataReceived:(NSString *)requestId data:(NSData *)data
 {
-  NetworkReporter::getInstance().reportDataReceived(requestId.stringValue.UTF8String, (int)data.length, std::nullopt);
+  NetworkReporter::getInstance().reportDataReceived(requestId.UTF8String, (int)data.length, std::nullopt);
 }
 
-+ (void)reportResponseEnd:(NSNumber *)requestId encodedDataLength:(int)encodedDataLength
++ (void)reportResponseEnd:(NSString *)requestId encodedDataLength:(int)encodedDataLength
 {
-  NetworkReporter::getInstance().reportResponseEnd(requestId.stringValue.UTF8String, encodedDataLength);
+  NetworkReporter::getInstance().reportResponseEnd(requestId.UTF8String, encodedDataLength);
 
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
   // Debug build: Check for buffered response body and flush to NetworkReporter
@@ -118,7 +117,7 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
     if (buffer != nullptr) {
       if (buffer.length > 0) {
         NetworkReporter::getInstance().storeResponseBody(
-            requestId.stringValue.UTF8String, RCTStringViewFromNSString(buffer), false);
+            requestId.UTF8String, RCTStringViewFromNSString(buffer), false);
       }
       [responseBuffers removeObjectForKey:requestId];
     }
@@ -126,9 +125,9 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
 #endif
 }
 
-+ (void)reportRequestFailed:(NSNumber *)requestId cancelled:(bool)cancelled
++ (void)reportRequestFailed:(NSString *)requestId cancelled:(bool)cancelled
 {
-  NetworkReporter::getInstance().reportRequestFailed(requestId.stringValue.UTF8String, cancelled);
+  NetworkReporter::getInstance().reportRequestFailed(requestId.UTF8String, cancelled);
 
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
   // Debug build: Clear buffer for request
@@ -138,7 +137,7 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
 #endif
 }
 
-+ (void)maybeStoreResponseBody:(NSNumber *)requestId data:(id)data base64Encoded:(bool)base64Encoded
++ (void)maybeStoreResponseBody:(NSString *)requestId data:(id)data base64Encoded:(bool)base64Encoded
 {
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
   // Debug build: Process response body and report to NetworkReporter
@@ -152,7 +151,7 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
       NSString *encodedString = [(NSData *)data base64EncodedStringWithOptions:0];
       if (encodedString != nullptr) {
         networkReporter.storeResponseBody(
-            requestId.stringValue.UTF8String, RCTStringViewFromNSString(encodedString), base64Encoded);
+            requestId.UTF8String, RCTStringViewFromNSString(encodedString), base64Encoded);
       } else {
         RCTLogWarn(@"Failed to encode response data for request %@", requestId);
       }
@@ -160,13 +159,12 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
       RCTLogWarn(@"Exception while encoding response data: %@", exception.reason);
     }
   } else if ([data isKindOfClass:[NSString class]] && [(NSString *)data length] > 0) {
-    networkReporter.storeResponseBody(
-        requestId.stringValue.UTF8String, RCTStringViewFromNSString((NSString *)data), base64Encoded);
+    networkReporter.storeResponseBody(requestId.UTF8String, RCTStringViewFromNSString((NSString *)data), base64Encoded);
   }
 #endif
 }
 
-+ (void)maybeStoreResponseBodyIncremental:(NSNumber *)requestId data:(NSString *)data
++ (void)maybeStoreResponseBodyIncremental:(NSString *)requestId data:(NSString *)data
 {
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
   // Debug build: Buffer incremental response body contents

package/Libraries/Network/RCTNetworkTask.h

@@ -28,6 +28,7 @@ typedef NS_ENUM(NSInteger, RCTNetworkTaskStatus) {
 @property (nonatomic, readonly) NSNumber *requestID;
 @property (nonatomic, readonly, weak) id requestToken;
 @property (nonatomic, readonly) NSURLResponse *response;
+@property (nonatomic, readonly) NSString *devToolsRequestId;
 
 @property (nonatomic, copy) RCTURLRequestCompletionBlock completionBlock;
 @property (nonatomic, copy) RCTURLRequestProgressBlock downloadProgressBlock;
@@ -40,7 +41,10 @@ typedef NS_ENUM(NSInteger, RCTNetworkTaskStatus) {
 - (instancetype)initWithRequest:(NSURLRequest *)request
                         handler:(id<RCTURLRequestHandler>)handler
                   callbackQueue:(dispatch_queue_t)callbackQueue NS_DESIGNATED_INITIALIZER;
-
+- (instancetype)initWithDevToolsRequestId:(NSString *)devToolsRequestId
+                                  request:(NSURLRequest *)request
+                                  handler:(id<RCTURLRequestHandler>)handler
+                            callbackQueue:(dispatch_queue_t)callbackQueue;
 - (void)start;
 - (void)cancel;
 

package/Libraries/Network/RCTNetworkTask.mm

@@ -26,6 +26,15 @@ static auto currentRequestId = std::atomic<NSUInteger>(0);
 - (instancetype)initWithRequest:(NSURLRequest *)request
                         handler:(id<RCTURLRequestHandler>)handler
                   callbackQueue:(dispatch_queue_t)callbackQueue
+{
+  self = [self initWithDevToolsRequestId:nil request:request handler:handler callbackQueue:callbackQueue];
+  return self;
+}
+
+- (instancetype)initWithDevToolsRequestId:(NSString *)devToolsRequestId
+                                  request:(NSURLRequest *)request
+                                  handler:(id<RCTURLRequestHandler>)handler
+                            callbackQueue:(dispatch_queue_t)callbackQueue
 {
   RCTAssertParam(request);
   RCTAssertParam(handler);
@@ -33,6 +42,10 @@ static auto currentRequestId = std::atomic<NSUInteger>(0);
 
   if ((self = [super init])) {
     _requestID = @(currentRequestId++);
+    _devToolsRequestId = devToolsRequestId;
+    if (_devToolsRequestId == nil) {
+      _devToolsRequestId = [[NSUUID UUID] UUIDString];
+    }
     _request = request;
     _handler = handler;
     _callbackQueue = callbackQueue;

package/Libraries/Network/RCTNetworking+Internal.h

@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+#import "RCTNetworking.h"
+
+@protocol RCTNetworkingTextResponseHandler <NSObject>
+
+- (BOOL)canHandleNetworkingTextResponseForRequest:(NSURLRequest *)request;
+- (void)handleNetworkingResponseText:(NSString *)responseText request:(NSURLRequest *)request;
+
+@end
+
+@interface RCTNetworking (Internal)
+
+- (void)addTextResponseHandler:(id<RCTNetworkingTextResponseHandler>)handler;
+
+@end

package/Libraries/Network/RCTNetworking.h

@@ -47,6 +47,9 @@
  */
 - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request
                            completionBlock:(RCTURLRequestCompletionBlock)completionBlock;
+- (RCTNetworkTask *)networkTaskWithDevToolsRequestId:(NSString *)devToolsRequestId
+                                             request:(NSURLRequest *)request
+                                     completionBlock:(RCTURLRequestCompletionBlock)completionBlock;
 
 - (void)addRequestHandler:(id<RCTNetworkingRequestHandler>)handler;
 

package/Libraries/Network/RCTNetworking.ios.js

@@ -40,6 +40,8 @@ const RCTNetworking = {
     withCredentials: boolean,
   ) {
     const body = convertRequestBody(data);
+    const devToolsRequestId =
+      global.__NETWORK_REPORTER__?.createDevToolsRequestId();
     NativeNetworkingIOS.sendRequest(
       {
         method,
@@ -50,6 +52,7 @@ const RCTNetworking = {
         incrementalUpdates,
         timeout,
         withCredentials,
+        unstable_devToolsRequestId: devToolsRequestId,
       },
       callback,
     );

package/Libraries/Network/RCTNetworking.mm

@@ -12,7 +12,6 @@
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
 #import <React/RCTNetworkTask.h>
-#import <React/RCTNetworking.h>
 #import <React/RCTUtils.h>
 
 #import <React/RCTHTTPRequestHandler.h>
@@ -20,6 +19,8 @@
 
 #import "RCTInspectorNetworkReporter.h"
 #import "RCTNetworkPlugins.h"
+#import "RCTNetworking+Internal.h"
+#import "RCTNetworking.h"
 
 typedef RCTURLRequestCancellationBlock (^RCTHTTPQueryResult)(NSError *error, NSDictionary<NSString *, id> *result);
 
@@ -28,6 +29,7 @@ NSString *const RCTNetworkingPHUploadHackScheme = @"ph-upload";
 @interface RCTNetworking () <NativeNetworkingIOSSpec>
 
 - (RCTURLRequestCancellationBlock)processDataForHTTPQuery:(NSDictionary<NSString *, id> *)data
+                                        devToolsRequestId:(NSString *)devToolsRequestId
                                                  callback:(RCTHTTPQueryResult)callback;
 @end
 
@@ -69,7 +71,9 @@ static NSString *RCTGenerateFormBoundary()
                                   freeWhenDone:YES];
 }
 
-- (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData callback:(RCTHTTPQueryResult)callback
+- (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData
+                        devToolsRequestId:(NSString *)devToolsRequestId
+                                 callback:(RCTHTTPQueryResult)callback
 {
   RCTAssertThread(_networker.methodQueue, @"process: must be called on request queue");
 
@@ -93,12 +97,15 @@ static NSString *RCTGenerateFormBoundary()
   }
 
   return [_networker processDataForHTTPQuery:_parts[0]
+                           devToolsRequestId:devToolsRequestId
                                     callback:^(NSError *error, NSDictionary<NSString *, id> *result) {
-                                      return [self handleResult:result error:error];
+                                      return [self handleResult:result error:error devToolsRequestId:devToolsRequestId];
                                     }];
 }
 
-- (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result error:(NSError *)error
+- (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result
+                                         error:(NSError *)error
+                             devToolsRequestId:(NSString *)devToolsRequestId
 {
   RCTAssertThread(_networker.methodQueue, @"handleResult: must be called on request queue");
 
@@ -129,8 +136,9 @@ static NSString *RCTGenerateFormBoundary()
   [_parts removeObjectAtIndex:0];
   if (_parts.count) {
     return [_networker processDataForHTTPQuery:_parts[0]
+                             devToolsRequestId:devToolsRequestId
                                       callback:^(NSError *err, NSDictionary<NSString *, id> *res) {
-                                        return [self handleResult:res error:err];
+                                        return [self handleResult:res error:err devToolsRequestId:devToolsRequestId];
                                       }];
   }
 
@@ -153,6 +161,7 @@ static NSString *RCTGenerateFormBoundary()
   NSArray<id<RCTURLRequestHandler>> * (^_handlersProvider)(RCTModuleRegistry *);
   NSMutableArray<id<RCTNetworkingRequestHandler>> *_requestHandlers;
   NSMutableArray<id<RCTNetworkingResponseHandler>> *_responseHandlers;
+  NSMutableArray<id<RCTNetworkingTextResponseHandler>> *_textResponseHandlers;
   dispatch_queue_t _requestQueue;
 }
 
@@ -300,6 +309,7 @@ RCT_EXPORT_MODULE()
 }
 
 - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary<NSString *, id> *)query
+                             devToolsRequestId:(NSString *)devToolsRequestId
                                completionBlock:(void (^)(NSURLRequest *request))block
 {
   RCTAssertThread(_methodQueue, @"buildRequest: must be called on request queue");
@@ -330,6 +340,7 @@ RCT_EXPORT_MODULE()
     [NSURLProtocol setProperty:trackingName forKey:@"trackingName" inRequest:request];
   }
   return [self processDataForHTTPQuery:data
+                     devToolsRequestId:devToolsRequestId
                               callback:^(NSError *error, NSDictionary<NSString *, id> *result) {
                                 if (error) {
                                   RCTLogError(@"Error processing request body: %@", error);
@@ -396,6 +407,7 @@ RCT_EXPORT_MODULE()
  */
 - (RCTURLRequestCancellationBlock)
     processDataForHTTPQuery:(nullable NSDictionary<NSString *, id> *)query
+          devToolsRequestId:(NSString *)devToolsRequestId
                    callback:(RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary<NSString *, id> *result))
                                 callback
 {
@@ -425,23 +437,24 @@ RCT_EXPORT_MODULE()
   NSURLRequest *request = [RCTConvert NSURLRequest:query[@"uri"]];
   if (request) {
     __block RCTURLRequestCancellationBlock cancellationBlock = nil;
-    RCTNetworkTask *task =
-        [self networkTaskWithRequest:request
-                     completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
-                       dispatch_async(self->_methodQueue, ^{
-                         cancellationBlock = callback(
-                             error, data ? @{@"body" : data, @"contentType" : RCTNullIfNil(response.MIMEType)} : nil);
-                       });
-                     }];
+    RCTNetworkTask *task = [self
+        networkTaskWithDevToolsRequestId:devToolsRequestId
+                                 request:request
+                         completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
+                           dispatch_async(self->_methodQueue, ^{
+                             cancellationBlock = callback(
+                                 error,
+                                 data ? @{@"body" : data, @"contentType" : RCTNullIfNil(response.MIMEType)} : nil);
+                           });
+                         }];
 
     [task start];
 
     __weak RCTNetworkTask *weakTask = task;
-    NSNumber *requestId = [task.requestID copy];
     return ^{
       [weakTask cancel];
       if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-        [RCTInspectorNetworkReporter reportRequestFailed:requestId cancelled:YES];
+        [RCTInspectorNetworkReporter reportRequestFailed:devToolsRequestId cancelled:YES];
       }
       if (cancellationBlock) {
         cancellationBlock();
@@ -452,7 +465,7 @@ RCT_EXPORT_MODULE()
   if (formData) {
     RCTHTTPFormDataHelper *formDataHelper = [RCTHTTPFormDataHelper new];
     formDataHelper.networker = self;
-    return [formDataHelper process:formData callback:callback];
+    return [formDataHelper process:formData devToolsRequestId:devToolsRequestId callback:callback];
   }
   // Nothing in the data payload, at least nothing we could understand anyway.
   // Ignore and treat it as if it were null.
@@ -571,7 +584,7 @@ RCT_EXPORT_MODULE()
     }
     bool base64Encoded = [responseType isEqualToString:@"base64"] || [responseType isEqualToString:@"blob"];
 
-    [RCTInspectorNetworkReporter maybeStoreResponseBody:task.requestID
+    [RCTInspectorNetworkReporter maybeStoreResponseBody:task.devToolsRequestId
                                                    data:responseDataForPreview
                                           base64Encoded:base64Encoded];
   }
@@ -583,6 +596,7 @@ RCT_EXPORT_MODULE()
           responseType:(NSString *)responseType
     incrementalUpdates:(BOOL)incrementalUpdates
         responseSender:(RCTResponseSenderBlock)responseSender
+     devToolsRequestId:(NSString *)devToolsRequestId
 {
   RCTAssertThread(_methodQueue, @"sendRequest: must be called on request queue");
   __weak __typeof(self) weakSelf = self;
@@ -608,7 +622,7 @@ RCT_EXPORT_MODULE()
     NSArray<id> *responseJSON = @[ task.requestID, @(status), headers, responseURL ];
 
     if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-      [RCTInspectorNetworkReporter reportResponseStart:task.requestID
+      [RCTInspectorNetworkReporter reportResponseStart:task.devToolsRequestId
                                               response:response
                                             statusCode:status
                                                headers:headers];
@@ -648,8 +662,8 @@ RCT_EXPORT_MODULE()
         ];
 
         if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-          [RCTInspectorNetworkReporter reportDataReceived:task.requestID data:data];
-          [RCTInspectorNetworkReporter maybeStoreResponseBodyIncremental:task.requestID data:responseString];
+          [RCTInspectorNetworkReporter reportDataReceived:task.devToolsRequestId data:data];
+          [RCTInspectorNetworkReporter maybeStoreResponseBodyIncremental:task.devToolsRequestId data:responseString];
         }
         [weakSelf sendEventWithName:@"didReceiveNetworkIncrementalData" body:responseJSON];
       };
@@ -672,21 +686,33 @@ RCT_EXPORT_MODULE()
     if (!(incrementalUpdates && [responseType isEqualToString:@"text"])) {
       [strongSelf sendData:data responseType:responseType response:response forTask:task];
     }
+
+    if ([responseType isEqualToString:@"text"]) {
+      for (id<RCTNetworkingTextResponseHandler> handler in strongSelf->_textResponseHandlers) {
+        if ([handler canHandleNetworkingTextResponseForRequest:task.request]) {
+          NSString *responseString = [RCTNetworking decodeTextData:data
+                                                      fromResponse:task.response
+                                                     withCarryData:[NSMutableData new]];
+          [handler handleNetworkingResponseText:responseString request:task.request];
+        }
+      }
+    }
+
     NSArray *responseJSON =
         @[ task.requestID, RCTNullIfNil(error.localizedDescription), error.code == kCFURLErrorTimedOut ? @YES : @NO ];
 
     if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
       if (error != nullptr) {
-        [RCTInspectorNetworkReporter reportRequestFailed:task.requestID cancelled:NO];
+        [RCTInspectorNetworkReporter reportRequestFailed:task.devToolsRequestId cancelled:NO];
       } else {
-        [RCTInspectorNetworkReporter reportResponseEnd:task.requestID encodedDataLength:data.length];
+        [RCTInspectorNetworkReporter reportResponseEnd:task.devToolsRequestId encodedDataLength:data.length];
       }
     }
     [strongSelf sendEventWithName:@"didCompleteNetworkResponse" body:responseJSON];
     [strongSelf->_tasksByRequestID removeObjectForKey:task.requestID];
   };
 
-  task = [self networkTaskWithRequest:request completionBlock:completionBlock];
+  task = [self networkTaskWithDevToolsRequestId:devToolsRequestId request:request completionBlock:completionBlock];
   task.downloadProgressBlock = downloadProgressBlock;
   task.incrementalDataBlock = incrementalDataBlock;
   task.responseBlock = responseBlock;
@@ -699,10 +725,10 @@ RCT_EXPORT_MODULE()
     _tasksByRequestID[task.requestID] = task;
     responseSender(@[ task.requestID ]);
     if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-      [RCTInspectorNetworkReporter reportRequestStart:task.requestID
+      [RCTInspectorNetworkReporter reportRequestStart:task.devToolsRequestId
                                               request:request
                                     encodedDataLength:task.response.expectedContentLength];
-      [RCTInspectorNetworkReporter reportConnectionTiming:task.requestID request:task.request];
+      [RCTInspectorNetworkReporter reportConnectionTiming:task.devToolsRequestId request:task.request];
     }
   }
 
@@ -727,6 +753,14 @@ RCT_EXPORT_MODULE()
   [_responseHandlers addObject:handler];
 }
 
+- (void)addTextResponseHandler:(id<RCTNetworkingTextResponseHandler>)handler
+{
+  if (!_textResponseHandlers) {
+    _textResponseHandlers = [NSMutableArray new];
+  }
+  [_textResponseHandlers addObject:handler];
+}
+
 - (void)removeRequestHandler:(id<RCTNetworkingRequestHandler>)handler
 {
   [_requestHandlers removeObject:handler];
@@ -739,6 +773,13 @@ RCT_EXPORT_MODULE()
 
 - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request
                            completionBlock:(RCTURLRequestCompletionBlock)completionBlock
+{
+  return [self networkTaskWithDevToolsRequestId:nil request:request completionBlock:completionBlock];
+}
+
+- (RCTNetworkTask *)networkTaskWithDevToolsRequestId:(NSString *)devToolsRequestId
+                                             request:(NSURLRequest *)request
+                                     completionBlock:(RCTURLRequestCompletionBlock)completionBlock
 {
   id<RCTURLRequestHandler> handler = [self handlerForRequest:request];
   if (!handler) {
@@ -746,7 +787,10 @@ RCT_EXPORT_MODULE()
     return nil;
   }
 
-  RCTNetworkTask *task = [[RCTNetworkTask alloc] initWithRequest:request handler:handler callbackQueue:_methodQueue];
+  RCTNetworkTask *task = [[RCTNetworkTask alloc] initWithDevToolsRequestId:devToolsRequestId
+                                                                   request:request
+                                                                   handler:handler
+                                                             callbackQueue:_methodQueue];
   task.completionBlock = completionBlock;
   return task;
 }
@@ -765,6 +809,7 @@ RCT_EXPORT_METHOD(sendRequest
   bool queryIncrementalUpdates = query.incrementalUpdates();
   double timeout = query.timeout();
   bool withCredentials = query.withCredentials();
+  NSString *devToolsRequestId = query.unstable_devToolsRequestId();
 
   dispatch_async(_methodQueue, ^{
     NSDictionary *queryDict = @{
@@ -782,14 +827,16 @@ RCT_EXPORT_METHOD(sendRequest
     // no way to invoke it, if, for example the request is cancelled while
     // loading a large file to build the request body
     [self buildRequest:queryDict
-        completionBlock:^(NSURLRequest *request) {
-          NSString *responseType = [RCTConvert NSString:queryDict[@"responseType"]];
-          BOOL incrementalUpdates = [RCTConvert BOOL:queryDict[@"incrementalUpdates"]];
-          [self sendRequest:request
-                    responseType:responseType
-              incrementalUpdates:incrementalUpdates
-                  responseSender:responseSender];
-        }];
+        devToolsRequestId:devToolsRequestId
+          completionBlock:^(NSURLRequest *request) {
+            NSString *responseType = [RCTConvert NSString:queryDict[@"responseType"]];
+            BOOL incrementalUpdates = [RCTConvert BOOL:queryDict[@"incrementalUpdates"]];
+            [self sendRequest:request
+                      responseType:responseType
+                incrementalUpdates:incrementalUpdates
+                    responseSender:responseSender
+                 devToolsRequestId:devToolsRequestId];
+          }];
   });
 }
 

package/React/Base/RCTBridgeModule.h

@@ -69,7 +69,7 @@ RCT_EXTERN_C_END
  * will be used as the JS module name. If omitted, the JS module name will
  * match the Objective-C class name.
  */
-#ifndef RCT_REMOVE_LEGACY_ARCH
+#ifndef RCT_DISABLE_STATIC_MODULE_REGISTRATION
 #define RCT_EXPORT_MODULE(js_name)          \
   RCT_EXTERN void RCTRegisterModule(Class); \
   +(NSString *)moduleName                   \
@@ -90,7 +90,7 @@ RCT_EXTERN_C_END
     return @ #js_name;                      \
   }
 
-#endif // RCT_REMOVE_LEGACY_ARCH
+#endif // RCT_DISABLE_STATIC_MODULE_REGISTRATION
 
 /**
  * Same as RCT_EXPORT_MODULE, but uses __attribute__((constructor)) for module