Revert "Make RCTFileReaderModule and RCTBlobManager TurboModule-compa…

…tible" This reverts commit 3908702.
facebook · Oct 29, 2019 · 0d54b1c · 0d54b1c
1 parent df262c3
commit 0d54b1c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 89 deletions.
diff --git a/Libraries/Blob/NativeBlobModule.js b/Libraries/Blob/NativeBlobModule.js
@@ -18,8 +18,8 @@ export interface Spec extends TurboModule {
   +addNetworkingHandler: () => void;
   +addWebSocketHandler: (id: number) => void;
   +removeWebSocketHandler: (id: number) => void;
-  +sendOverSocket: (blob: Object, socketID: number) => void;
-  +createFromParts: (parts: Array<Object>, withId: string) => void;
+  +sendOverSocket: (blob: Object, id: number) => void;
+  +createFromParts: (parts: Array<Object>, blobId: string) => void;
   +release: (blobId: string) => void;
 }
 

diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm
@@ -9,18 +9,15 @@
 
 #import <mutex>
 
-#import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTConvert.h>
 #import <React/RCTNetworking.h>
 #import <React/RCTUtils.h>
 #import <React/RCTWebSocketModule.h>
-
-#import "RCTBlobPlugins.h"
 #import "RCTBlobCollector.h"
 
 static NSString *const kBlobURIScheme = @"blob";
 
-@interface RCTBlobManager () <RCTNetworkingRequestHandler, RCTNetworkingResponseHandler, RCTWebSocketContentHandler, NativeBlobModuleSpec>
+@interface RCTBlobManager () <RCTNetworkingRequestHandler, RCTNetworkingResponseHandler, RCTWebSocketContentHandler>
 
 @end
 
@@ -145,25 +142,25 @@ - (void)remove:(NSString *)blobId
   });
 }
 
-RCT_EXPORT_METHOD(addWebSocketHandler:(double)socketID)
+RCT_EXPORT_METHOD(addWebSocketHandler:(nonnull NSNumber *)socketID)
 {
   dispatch_async(_bridge.webSocketModule.methodQueue, ^{
-    [self->_bridge.webSocketModule setContentHandler:self forSocketID:[NSNumber numberWithDouble:socketID]];
+    [self->_bridge.webSocketModule setContentHandler:self forSocketID:socketID];
   });
 }
 
-RCT_EXPORT_METHOD(removeWebSocketHandler:(double)socketID)
+RCT_EXPORT_METHOD(removeWebSocketHandler:(nonnull NSNumber *)socketID)
 {
   dispatch_async(_bridge.webSocketModule.methodQueue, ^{
-    [self->_bridge.webSocketModule setContentHandler:nil forSocketID:[NSNumber numberWithDouble:socketID]];
+    [self->_bridge.webSocketModule setContentHandler:nil forSocketID:socketID];
   });
 }
 
 // @lint-ignore FBOBJCUNTYPEDCOLLECTION1
-RCT_EXPORT_METHOD(sendOverSocket:(NSDictionary *)blob socketID:(double)socketID)
+RCT_EXPORT_METHOD(sendOverSocket:(NSDictionary *)blob socketID:(nonnull NSNumber *)socketID)
 {
   dispatch_async(_bridge.webSocketModule.methodQueue, ^{
-    [self->_bridge.webSocketModule sendData:[self resolve:blob] forSocketID:[NSNumber numberWithDouble:socketID]];
+    [self->_bridge.webSocketModule sendData:[self resolve:blob] forSocketID:socketID];
   });
 }
 
@@ -301,13 +298,4 @@ - (id)processWebsocketMessage:(id)message
   };
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModuleWithJsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
-{
-  return std::make_shared<facebook::react::NativeBlobModuleSpecJSI>(self, jsInvoker);
-}
-
 @end
-
-Class RCTBlobManagerCls(void) {
-  return RCTBlobManager.class;
-}
diff --git a/Libraries/Blob/RCTBlobPlugins.mm b/Libraries/Blob/RCTBlobPlugins.mm
diff --git a/Libraries/Blob/RCTFileReaderModule.mm → Libraries/Blob/RCTFileReaderModule.m b/Libraries/Blob/RCTFileReaderModule.mm → Libraries/Blob/RCTFileReaderModule.m
@@ -8,16 +8,11 @@
 
 #import <React/RCTFileReaderModule.h>
 
-#import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
 
 #import <React/RCTBlobManager.h>
 
-#import "RCTBlobPlugins.h"
-
-@interface RCTFileReaderModule() <NativeFileReaderModuleSpec>
-@end
 
 @implementation RCTFileReaderModule
 
@@ -71,15 +66,4 @@ @implementation RCTFileReaderModule
   }
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModuleWithJsInvoker:
-  (std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
-{
-  return std::make_shared<facebook::react::NativeFileReaderModuleSpecJSI>(self, jsInvoker);
-}
-
 @end
-
-Class RCTFileReaderModuleCls(void)
-{
-  return RCTFileReaderModule.class;
-}
diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec
@@ -17,9 +17,6 @@ else
   source[:tag] = "v#{version}"
 end
 
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2018.10.22.00'
-
 Pod::Spec.new do |s|
   s.name                   = "React-RCTBlob"
   s.version                = version
@@ -28,19 +25,12 @@ Pod::Spec.new do |s|
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :ios => "9.0", :tvos => "9.2" }
-  s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
-  s.source_files           = "*.{m,mm}"
+  # RCTBlobCollector.h is not included in the React module as it has C++ code
+  s.source_files           = "*.{m,mm}", "RCTBlobCollector.h"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTBlob"
-  s.pod_target_xcconfig    = {
-                               "USE_HEADERMAP" => "YES",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Folly\""
-                             }
 
-  s.dependency "Folly", folly_version
-  s.dependency "FBReactNativeSpec", version
   s.dependency "React-Core/RCTBlobHeaders", version
   s.dependency "React-Core/RCTWebSocket", version
   s.dependency "React-RCTNetwork", version

diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm
@@ -624,11 +624,11 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
     }
 
     static facebook::jsi::Value __hostFunction_NativeBlobModuleSpecJSI_sendOverSocket(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "sendOverSocket", @selector(sendOverSocket:socketID:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "sendOverSocket", @selector(sendOverSocket:id:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeBlobModuleSpecJSI_createFromParts(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "createFromParts", @selector(createFromParts:withId:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "createFromParts", @selector(createFromParts:blobId:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeBlobModuleSpecJSI_release(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {

diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h
@@ -633,9 +633,9 @@ namespace JS {
 - (void)addWebSocketHandler:(double)id;
 - (void)removeWebSocketHandler:(double)id;
 - (void)sendOverSocket:(NSDictionary *)blob
-              socketID:(double)socketID;
+                    id:(double)id;
 - (void)createFromParts:(NSArray *)parts
-                 withId:(NSString *)withId;
+                 blobId:(NSString *)blobId;
 - (void)release:(NSString *)blobId;
 - (facebook::react::ModuleConstants<JS::NativeBlobModule::Constants::Builder>)constantsToExport;
 - (facebook::react::ModuleConstants<JS::NativeBlobModule::Constants::Builder>)getConstants;

diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock
@@ -205,8 +205,6 @@ PODS:
   - React-RCTAnimation (1000.0.0):
     - React-Core/RCTAnimationHeaders (= 1000.0.0)
   - React-RCTBlob (1000.0.0):
-    - FBReactNativeSpec (= 1000.0.0)
-    - Folly (= 2018.10.22.00)
     - React-Core/RCTBlobHeaders (= 1000.0.0)
     - React-Core/RCTWebSocket (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -371,7 +369,7 @@ SPEC CHECKSUMS:
   React-jsinspector: ea0a218071a11c3687cef2480580180caa6a64c0
   React-RCTActionSheet: 090e7bd7c5774d919c47c4eeff78223a7fd8c19c
   React-RCTAnimation: 73d536fff417a101724d9529189c95a94263710c
-  React-RCTBlob: acd519b1d6ec5d66f98b7cf8e70d0cd76642426f
+  React-RCTBlob: 86017e0ba937b94445c5f680fef27ab831700fe7
   React-RCTImage: 7f5c9bff34905f1bc216be512ba0ae68f872208a
   React-RCTLinking: d7d7f792e63a8d57380cecbb9b7a3b31f92d1bb6
   React-RCTNetwork: c8f9d40297f35ea3792ea81866f33e8b45c25935