cleanup queue configs for some native modules (#50832)

Summary:
Pull Request resolved: #50832

Changelog: [iOS][Breaking]

these experiences did not end up shipping, so cleaning them up.

Reviewed By: fkgozali

Differential Revision: D73343958

fbshipit-source-id: ff0dc1394748c897aed9c66513b250dfc2192e0d

Author: philIip

packages/react-native/Libraries/Blob/RCTBlobCollector.mm

@@ -21,7 +21,7 @@
 {
   RCTBlobManager *blobManager = blobManager_;
   NSString *blobId = [NSString stringWithUTF8String:blobId_.c_str()];
-  dispatch_async([blobManager_ executionQueue], ^{
+  dispatch_async(blobManager_.methodQueue, ^{
     [blobManager remove:blobId];
   });
 }

packages/react-native/Libraries/Blob/RCTBlobManager.h

@@ -10,8 +10,6 @@
 #import <React/RCTInitializing.h>
 #import <React/RCTURLRequestHandler.h>
 
-RCT_EXTERN void RCTEnableBlobManagerProcessingQueue(BOOL enabled);
-
 @interface RCTBlobManager : NSObject <RCTBridgeModule, RCTURLRequestHandler, RCTInitializing>
 
 - (NSString *)store:(NSData *)data;
@@ -30,6 +28,4 @@ RCT_EXTERN void RCTEnableBlobManagerProcessingQueue(BOOL enabled);
 
 - (void)createFromParts:(NSArray<NSDictionary<NSString *, id> *> *)parts withId:(NSString *)blobId;
 
-- (dispatch_queue_t)executionQueue;
-
 @end

packages/react-native/Libraries/Blob/RCTBlobManager.mm

@@ -22,13 +22,6 @@
 RCT_MOCK_DEF(RCTBlobManager, dispatch_async);
 #define dispatch_async RCT_MOCK_USE(RCTBlobManager, dispatch_async)
 
-static BOOL gBlobManagerProcessingQueueEnabled = NO;
-
-RCT_EXTERN void RCTEnableBlobManagerProcessingQueue(BOOL enabled)
-{
-  gBlobManagerProcessingQueueEnabled = enabled;
-}
-
 static NSString *const kBlobURIScheme = @"blob";
 
 @interface RCTBlobManager () <
@@ -59,11 +52,6 @@ - (void)initialize
 {
   std::lock_guard<std::mutex> lock(_blobsMutex);
   _blobs = [NSMutableDictionary new];
-
-  if (gBlobManagerProcessingQueueEnabled) {
-    _processingQueue = dispatch_queue_create("com.facebook.react.blobmanager.processing", DISPATCH_QUEUE_SERIAL);
-  }
-
   facebook::react::RCTBlobCollector::install(self);
 }
 
@@ -165,11 +153,11 @@ - (void)remove:(NSString *)blobId
 
   // TODO(T63516227): Why can methodQueue be nil here?
   // We don't want to do anything when methodQueue is nil.
-  if (![networking requestQueue]) {
+  if (!networking.methodQueue) {
     return;
   }
 
-  dispatch_async([networking requestQueue], ^{
+  dispatch_async(networking.methodQueue, ^{
     [networking addRequestHandler:self];
     [networking addResponseHandler:self];
   });
@@ -217,23 +205,18 @@ - (void)remove:(NSString *)blobId
     }
   }
 
-  dispatch_async([self executionQueue], ^{
+  dispatch_async(_methodQueue, ^{
     [self store:data withId:blobId];
   });
 }
 
 RCT_EXPORT_METHOD(release : (NSString *)blobId)
 {
-  dispatch_async([self executionQueue], ^{
+  dispatch_async(_methodQueue, ^{
     [self remove:blobId];
   });
 }
 
-- (dispatch_queue_t)executionQueue
-{
-  return gBlobManagerProcessingQueueEnabled ? _processingQueue : _methodQueue;
-}
-
 #pragma mark - RCTURLRequestHandler methods
 
 - (BOOL)canHandleRequest:(NSURLRequest *)request

packages/react-native/Libraries/Blob/RCTFileReaderModule.mm

@@ -31,7 +31,7 @@ @implementation RCTFileReaderModule
                   : (RCTPromiseRejectBlock)reject)
 {
   RCTBlobManager *blobManager = [_moduleRegistry moduleForName:"BlobModule"];
-  dispatch_async([blobManager executionQueue], ^{
+  dispatch_async(blobManager.methodQueue, ^{
     NSData *data = [blobManager resolve:blob];
 
     if (data == nil) {
@@ -62,7 +62,7 @@ @implementation RCTFileReaderModule
                   : (RCTPromiseRejectBlock)reject)
 {
   RCTBlobManager *blobManager = [_moduleRegistry moduleForName:"BlobModule"];
-  dispatch_async([blobManager executionQueue], ^{
+  dispatch_async(blobManager.methodQueue, ^{
     NSData *data = [blobManager resolve:blob];
 
     if (data == nil) {

packages/react-native/Libraries/Network/RCTHTTPRequestHandler.mm

@@ -78,8 +78,7 @@ - (NSURLSessionDataTask *)sendRequest:(NSURLRequest *)request withDelegate:(id<R
 
     NSOperationQueue *callbackQueue = [NSOperationQueue new];
     callbackQueue.maxConcurrentOperationCount = 1;
-    RCTNetworking *networking = [_moduleRegistry moduleForName:"Networking"];
-    callbackQueue.underlyingQueue = [networking requestQueue];
+    callbackQueue.underlyingQueue = [[_moduleRegistry moduleForName:"Networking"] methodQueue];
     NSURLSessionConfiguration *configuration;
     if (urlSessionConfigurationProvider) {
       configuration = urlSessionConfigurationProvider();

packages/react-native/Libraries/Network/RCTNetworking.h

@@ -10,8 +10,6 @@
 #import <React/RCTNetworkTask.h>
 #import <React/RCTURLRequestHandler.h>
 
-RCT_EXTERN void RCTEnableNetworkingRequestQueue(BOOL enabled);
-
 @protocol RCTNetworkingRequestHandler <NSObject>
 
 // @lint-ignore FBOBJCUNTYPEDCOLLECTION1
@@ -58,8 +56,6 @@ RCT_EXTERN void RCTEnableNetworkingRequestQueue(BOOL enabled);
 
 - (void)removeResponseHandler:(id<RCTNetworkingResponseHandler>)handler;
 
-- (dispatch_queue_t)requestQueue;
-
 @end
 
 @interface RCTBridge (RCTNetworking)

packages/react-native/Libraries/Network/RCTNetworking.mm

@@ -20,13 +20,6 @@
 #import "RCTInspectorNetworkReporter.h"
 #import "RCTNetworkPlugins.h"
 
-static BOOL gEnableNetworkingRequestQueue = NO;
-
-RCT_EXTERN void RCTEnableNetworkingRequestQueue(BOOL enabled)
-{
-  gEnableNetworkingRequestQueue = enabled;
-}
-
 typedef RCTURLRequestCancellationBlock (^RCTHTTPQueryResult)(NSError *error, NSDictionary<NSString *, id> *result);
 
 NSString *const RCTNetworkingPHUploadHackScheme = @"ph-upload";
@@ -77,7 +70,7 @@ @implementation RCTHTTPFormDataHelper {
 
 - (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData callback:(RCTHTTPQueryResult)callback
 {
-  RCTAssertThread([_networker requestQueue], @"process: must be called on request queue");
+  RCTAssertThread(_networker.methodQueue, @"process: must be called on request queue");
 
   if (formData.count == 0) {
     return callback(nil, nil);
@@ -106,7 +99,7 @@ - (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData ca
 
 - (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result error:(NSError *)error
 {
-  RCTAssertThread([_networker requestQueue], @"handleResult: must be called on request queue");
+  RCTAssertThread(_networker.methodQueue, @"handleResult: must be called on request queue");
 
   if (error) {
     return _callback(error, nil);
@@ -173,12 +166,7 @@ + (BOOL)requiresMainQueueSetup
 
 - (instancetype)init
 {
-  if (self = [super initWithDisabledObservation]) {
-    if (gEnableNetworkingRequestQueue) {
-      _requestQueue = dispatch_queue_create("com.facebook.react.network.request", DISPATCH_QUEUE_SERIAL);
-    }
-  }
-  return self;
+  return [super initWithDisabledObservation];
 }
 
 - (instancetype)initWithHandlersProvider:
@@ -313,7 +301,7 @@ - (void)invalidate
 - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary<NSString *, id> *)query
                                completionBlock:(void (^)(NSURLRequest *request))block
 {
-  RCTAssertThread([self requestQueue], @"buildRequest: must be called on request queue");
+  RCTAssertThread(_methodQueue, @"buildRequest: must be called on request queue");
 
   NSURL *URL = [RCTConvert NSURL:query[@"url"]]; // this is marked as nullable in JS, but should not be null
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
@@ -372,7 +360,7 @@ - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary<NSString *, id> *)q
                                   request.cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
                                 }
 
-                                dispatch_async([self requestQueue], ^{
+                                dispatch_async(self->_methodQueue, ^{
                                   block(request);
                                 });
 
@@ -410,7 +398,7 @@ - (BOOL)canHandleRequest:(NSURLRequest *)request
                    callback:(RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary<NSString *, id> *result))
                                 callback
 {
-  RCTAssertThread([self requestQueue], @"processDataForHTTPQuery: must be called on request queue");
+  RCTAssertThread(_methodQueue, @"processDataForHTTPQuery: must be called on request queue");
 
   if (!query) {
     return callback(nil, nil);
@@ -439,7 +427,7 @@ - (BOOL)canHandleRequest:(NSURLRequest *)request
     RCTNetworkTask *task =
         [self networkTaskWithRequest:request
                      completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
-                       dispatch_async([self requestQueue], ^{
+                       dispatch_async(self->_methodQueue, ^{
                          cancellationBlock = callback(
                              error, data ? @{@"body" : data, @"contentType" : RCTNullIfNil(response.MIMEType)} : nil);
                        });
@@ -539,7 +527,7 @@ - (void)sendData:(NSData *)data
         response:(NSURLResponse *)response
          forTask:(RCTNetworkTask *)task
 {
-  RCTAssertThread([self requestQueue], @"sendData: must be called on request queue");
+  RCTAssertThread(_methodQueue, @"sendData: must be called on request queue");
 
   id responseData = nil;
   for (id<RCTNetworkingResponseHandler> handler in _responseHandlers) {
@@ -577,7 +565,7 @@ - (void)sendRequest:(NSURLRequest *)request
     incrementalUpdates:(BOOL)incrementalUpdates
         responseSender:(RCTResponseSenderBlock)responseSender
 {
-  RCTAssertThread([self requestQueue], @"sendRequest: must be called on request queue");
+  RCTAssertThread(_methodQueue, @"sendRequest: must be called on request queue");
   __weak __typeof(self) weakSelf = self;
   __block RCTNetworkTask *task;
   RCTURLRequestProgressBlock uploadProgressBlock = ^(int64_t progress, int64_t total) {
@@ -724,9 +712,7 @@ - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request
     return nil;
   }
 
-  RCTNetworkTask *task = [[RCTNetworkTask alloc] initWithRequest:request
-                                                         handler:handler
-                                                   callbackQueue:[self requestQueue]];
+  RCTNetworkTask *task = [[RCTNetworkTask alloc] initWithRequest:request handler:handler callbackQueue:_methodQueue];
   task.completionBlock = completionBlock;
   return task;
 }
@@ -746,7 +732,7 @@ - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request
   double timeout = query.timeout();
   bool withCredentials = query.withCredentials();
 
-  dispatch_async([self requestQueue], ^{
+  dispatch_async(_methodQueue, ^{
     NSDictionary *queryDict = @{
       @"method" : method,
       @"url" : url,
@@ -775,15 +761,15 @@ - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request
 
 RCT_EXPORT_METHOD(abortRequest : (double)requestID)
 {
-  dispatch_async([self requestQueue], ^{
+  dispatch_async(_methodQueue, ^{
     [self->_tasksByRequestID[[NSNumber numberWithDouble:requestID]] cancel];
     [self->_tasksByRequestID removeObjectForKey:[NSNumber numberWithDouble:requestID]];
   });
 }
 
 RCT_EXPORT_METHOD(clearCookies : (RCTResponseSenderBlock)responseSender)
 {
-  dispatch_async([self requestQueue], ^{
+  dispatch_async(_methodQueue, ^{
     NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
     if (!storage.cookies.count) {
       responseSender(@[ @NO ]);
@@ -797,11 +783,6 @@ - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request
   });
 }
 
-- (dispatch_queue_t)requestQueue
-{
-  return gEnableNetworkingRequestQueue ? _requestQueue : _methodQueue;
-}
-
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {

packages/rn-tester/RNTesterUnitTests/RCTBlobManagerTests.m

@@ -8,15 +8,6 @@
 #import <XCTest/XCTest.h>
 
 #import <React/RCTBlobManager.h>
-#import <React/RCTMockDef.h>
-
-RCT_MOCK_REF(RCTBlobManager, dispatch_async);
-
-static void _mock_dispatch_async(dispatch_queue_t queue, dispatch_block_t block)
-{
-  XCTAssertNotNil(queue);
-  block();
-}
 
 @interface RCTBlobManagerTests : XCTestCase
 
@@ -32,12 +23,8 @@ - (void)setUp
 {
   [super setUp];
 
-  RCT_MOCK_SET(RCTBlobManager, dispatch_async, _mock_dispatch_async);
-
   _module = [RCTBlobManager new];
-  dispatch_queue_t methodQueue = dispatch_queue_create("test.queue", DISPATCH_QUEUE_SERIAL);
   [_module setValue:nil forKey:@"bridge"];
-  [_module setValue:methodQueue forKey:@"methodQueue"];
   [_module initialize];
   NSInteger size = 120;
   _data = [NSMutableData dataWithCapacity:size];
@@ -49,13 +36,6 @@ - (void)setUp
   [_module store:_data withId:_blobId];
 }
 
-- (void)tearDown
-{
-  [super tearDown];
-
-  RCT_MOCK_RESET(RCTBlobManager, dispatch_async);
-}
-
 - (void)testResolve
 {
   XCTAssertTrue([_data isEqualToData:[_module resolve:_blobId offset:0 size:_data.length]]);
@@ -118,37 +98,4 @@ - (void)testCreateFromParts
   XCTAssertTrue([expectedData isEqualToData:result]);
 }
 
-- (void)testCreateFromPartsProcessingQueue
-{
-  RCTEnableBlobManagerProcessingQueue(YES);
-  [self setUp];
-
-  NSDictionary<NSString *, id> *blobData = @{
-    @"blobId" : _blobId,
-    @"offset" : @0,
-    @"size" : @(_data.length),
-  };
-  NSDictionary<NSString *, id> *blob = @{
-    @"data" : blobData,
-    @"type" : @"blob",
-  };
-  NSString *stringData = @"i \u2665 dogs";
-  NSDictionary<NSString *, id> *string = @{
-    @"data" : stringData,
-    @"type" : @"string",
-  };
-  NSString *resultId = [NSUUID UUID].UUIDString;
-  NSArray<id> *parts = @[ blob, string ];
-
-  [_module createFromParts:parts withId:resultId];
-
-  NSMutableData *expectedData = [NSMutableData new];
-  [expectedData appendData:_data];
-  [expectedData appendData:[stringData dataUsingEncoding:NSUTF8StringEncoding]];
-
-  NSData *result = [_module resolve:resultId offset:0 size:expectedData.length];
-
-  XCTAssertTrue([expectedData isEqualToData:result]);
-}
-
 @end