mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
8131b7bb7b
Summary: This is my proposal for fixing `use_frameworks!` compatibility without breaking all `<React/*>` imports I outlined in https://github.com/facebook/react-native/pull/25393#issuecomment-508457700. If accepted, it will fix https://github.com/facebook/react-native/issues/25349. It builds on the changes I made in https://github.com/facebook/react-native/pull/25496 by ensuring each podspec has a unique value for `header_dir` so that framework imports do not conflict. Every podspec which should be included in the `<React/*>` namespace now includes it's headers from `React-Core.podspec`. The following pods can still be imported with `<React/*>` and so should not have breaking changes: `React-ART`,`React-DevSupport`, `React-CoreModules`, `React-RCTActionSheet`, `React-RCTAnimation`, `React-RCTBlob`, `React-RCTImage`, `React-RCTLinking`, `React-RCTNetwork`, `React-RCTPushNotification`, `React-RCTSettings`, `React-RCTText`, `React-RCTSettings`, `React-RCTVibration`, `React-RCTWebSocket` . There are still a few breaking changes which I hope will be acceptable: - `React-Core.podspec` has been moved to the root of the project. Any `Podfile` that references it will need to update the path. - ~~`React-turbomodule-core`'s headers now live under `<turbomodule/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-turbomodulesamples`'s headers now live under `<turbomodulesamples/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-TypeSaferty`'s headers now live under `<TypeSafety/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511040967. - ~~`React-jscallinvoker`'s headers now live under `<jscallinvoker/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - Each podspec now uses `s.static_framework = true`. This means that a minimum of CocoaPods 1.5 ([released in April 2018](http://blog.cocoapods.org/CocoaPods-1.5.0/)) is now required. This is needed so that the ` __has_include` conditions can still work when frameworks are enabled. Still to do: - ~~Including `React-turbomodule-core` with `use_frameworks!` enabled causes the C++ import failures we saw in https://github.com/facebook/react-native/issues/25349. I'm sure it will be possible to fix this but I need to dig deeper (perhaps a custom modulemap would be needed).~~ Addressed by https://github.com/facebook/react-native/pull/25619/commits/33573511f02f3502a28bad48e085e9a4b8608302. - I haven't got Fabric working yet. I wonder if it would be acceptable to move Fabric out of the `<React/*>` namespace since it is new? � ## Changelog [iOS] [Fixed] - Fixed compatibility with CocoaPods frameworks. Pull Request resolved: https://github.com/facebook/react-native/pull/25619 Test Plan: ### FB ``` buck build catalyst ``` ### Sample Project Everything should work exactly as before, where `use_frameworks!` is not in `Podfile`s. I have a branch on my [sample project](https://github.com/jtreanor/react-native-cocoapods-frameworks) here which has `use_frameworks!` in its `Podfile` to demonstrate this is fixed. You can see that it works with these steps: 1. `git clone git@github.com:jtreanor/react-native-cocoapods-frameworks.git` 2. `git checkout fix-frameworks-subspecs` 3. `cd ios && pod install` 4. `cd .. && react-native run-ios` The sample app will build and run successfully. To see that it still works without frameworks, remove `use_frameworks!` from the `Podfile` and do steps 3 and 4 again. ### RNTesterPods `RNTesterPodsPods` can now work with or without `use_frameworks!`. 1. Go to the `RNTester` directory and run `pod install`. 2. Run the tests in `RNTesterPods.xcworkspace` to see that everything still works fine. 3. Uncomment the `use_frameworks!` line at the top of `RNTester/Podfile` and run `pod install` again. 4. Run the tests again and see that it still works with frameworks enabled. Reviewed By: PeteTheHeat Differential Revision: D16465247 Pulled By: PeteTheHeat fbshipit-source-id: cad837e9cced06d30cc5b372af1c65c7780b9e7a
200 lines
5.3 KiB
Objective-C
200 lines
5.3 KiB
Objective-C
/**
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#import <React/RCTWebSocketModule.h>
|
|
|
|
#import <objc/runtime.h>
|
|
|
|
#import <React/RCTConvert.h>
|
|
#import <React/RCTUtils.h>
|
|
|
|
#import <React/RCTSRWebSocket.h>
|
|
|
|
@implementation RCTSRWebSocket (React)
|
|
|
|
- (NSNumber *)reactTag
|
|
{
|
|
return objc_getAssociatedObject(self, _cmd);
|
|
}
|
|
|
|
- (void)setReactTag:(NSNumber *)reactTag
|
|
{
|
|
objc_setAssociatedObject(self, @selector(reactTag), reactTag, OBJC_ASSOCIATION_COPY_NONATOMIC);
|
|
}
|
|
|
|
@end
|
|
|
|
@interface RCTWebSocketModule () <RCTSRWebSocketDelegate>
|
|
|
|
@end
|
|
|
|
@implementation RCTWebSocketModule
|
|
{
|
|
NSMutableDictionary<NSNumber *, RCTSRWebSocket *> *_sockets;
|
|
NSMutableDictionary<NSNumber *, id<RCTWebSocketContentHandler>> *_contentHandlers;
|
|
}
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
// Used by RCTBlobModule
|
|
@synthesize methodQueue = _methodQueue;
|
|
|
|
- (NSArray *)supportedEvents
|
|
{
|
|
return @[@"websocketMessage",
|
|
@"websocketOpen",
|
|
@"websocketFailed",
|
|
@"websocketClosed"];
|
|
}
|
|
|
|
- (void)invalidate
|
|
{
|
|
_contentHandlers = nil;
|
|
for (RCTSRWebSocket *socket in _sockets.allValues) {
|
|
socket.delegate = nil;
|
|
[socket close];
|
|
}
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(connect:(NSURL *)URL protocols:(NSArray *)protocols options:(NSDictionary *)options socketID:(nonnull NSNumber *)socketID)
|
|
{
|
|
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
|
|
|
|
// We load cookies from sharedHTTPCookieStorage (shared with XHR and
|
|
// fetch). To get secure cookies for wss URLs, replace wss with https
|
|
// in the URL.
|
|
NSURLComponents *components = [NSURLComponents componentsWithURL:URL resolvingAgainstBaseURL:true];
|
|
if ([components.scheme.lowercaseString isEqualToString:@"wss"]) {
|
|
components.scheme = @"https";
|
|
}
|
|
|
|
// Load and set the cookie header.
|
|
NSArray<NSHTTPCookie *> *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:components.URL];
|
|
request.allHTTPHeaderFields = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];
|
|
|
|
// Load supplied headers
|
|
[options[@"headers"] enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) {
|
|
[request addValue:[RCTConvert NSString:value] forHTTPHeaderField:key];
|
|
}];
|
|
|
|
RCTSRWebSocket *webSocket = [[RCTSRWebSocket alloc] initWithURLRequest:request protocols:protocols];
|
|
[webSocket setDelegateDispatchQueue:_methodQueue];
|
|
webSocket.delegate = self;
|
|
webSocket.reactTag = socketID;
|
|
if (!_sockets) {
|
|
_sockets = [NSMutableDictionary new];
|
|
}
|
|
_sockets[socketID] = webSocket;
|
|
[webSocket open];
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(send:(NSString *)message forSocketID:(nonnull NSNumber *)socketID)
|
|
{
|
|
[_sockets[socketID] send:message];
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(sendBinary:(NSString *)base64String forSocketID:(nonnull NSNumber *)socketID)
|
|
{
|
|
[self sendData:[[NSData alloc] initWithBase64EncodedString:base64String options:0] forSocketID:socketID];
|
|
}
|
|
|
|
- (void)sendData:(NSData *)data forSocketID:(nonnull NSNumber *)socketID
|
|
{
|
|
[_sockets[socketID] send:data];
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(ping:(nonnull NSNumber *)socketID)
|
|
{
|
|
[_sockets[socketID] sendPing:NULL];
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(close:(NSInteger)code reason:(NSString *)reason socketID:(nonnull NSNumber *)socketID)
|
|
{
|
|
[_sockets[socketID] closeWithCode:code reason:reason];
|
|
[_sockets removeObjectForKey:socketID];
|
|
}
|
|
|
|
- (void)setContentHandler:(id<RCTWebSocketContentHandler>)handler forSocketID:(NSString *)socketID
|
|
{
|
|
if (!_contentHandlers) {
|
|
_contentHandlers = [NSMutableDictionary new];
|
|
}
|
|
_contentHandlers[socketID] = handler;
|
|
}
|
|
|
|
#pragma mark - RCTSRWebSocketDelegate methods
|
|
|
|
- (void)webSocket:(RCTSRWebSocket *)webSocket didReceiveMessage:(id)message
|
|
{
|
|
NSString *type;
|
|
|
|
NSNumber *socketID = [webSocket reactTag];
|
|
id contentHandler = _contentHandlers[socketID];
|
|
if (contentHandler) {
|
|
message = [contentHandler processWebsocketMessage:message forSocketID:socketID withType:&type];
|
|
} else {
|
|
if ([message isKindOfClass:[NSData class]]) {
|
|
type = @"binary";
|
|
message = [message base64EncodedStringWithOptions:0];
|
|
} else {
|
|
type = @"text";
|
|
}
|
|
}
|
|
|
|
[self sendEventWithName:@"websocketMessage" body:@{
|
|
@"data": message,
|
|
@"type": type,
|
|
@"id": webSocket.reactTag
|
|
}];
|
|
}
|
|
|
|
- (void)webSocketDidOpen:(RCTSRWebSocket *)webSocket
|
|
{
|
|
[self sendEventWithName:@"websocketOpen" body:@{
|
|
@"id": webSocket.reactTag,
|
|
@"protocol": webSocket.protocol ? webSocket.protocol : @""
|
|
}];
|
|
}
|
|
|
|
- (void)webSocket:(RCTSRWebSocket *)webSocket didFailWithError:(NSError *)error
|
|
{
|
|
NSNumber *socketID = [webSocket reactTag];
|
|
_contentHandlers[socketID] = nil;
|
|
_sockets[socketID] = nil;
|
|
[self sendEventWithName:@"websocketFailed" body:@{
|
|
@"message": error.localizedDescription,
|
|
@"id": socketID
|
|
}];
|
|
}
|
|
|
|
- (void)webSocket:(RCTSRWebSocket *)webSocket
|
|
didCloseWithCode:(NSInteger)code
|
|
reason:(NSString *)reason
|
|
wasClean:(BOOL)wasClean
|
|
{
|
|
NSNumber *socketID = [webSocket reactTag];
|
|
_contentHandlers[socketID] = nil;
|
|
_sockets[socketID] = nil;
|
|
[self sendEventWithName:@"websocketClosed" body:@{
|
|
@"code": @(code),
|
|
@"reason": RCTNullIfNil(reason),
|
|
@"clean": @(wasClean),
|
|
@"id": socketID
|
|
}];
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation RCTBridge (RCTWebSocketModule)
|
|
|
|
- (RCTWebSocketModule *)webSocketModule
|
|
{
|
|
return [self moduleForClass:[RCTWebSocketModule class]];
|
|
}
|
|
|
|
@end
|