mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
f21fa4ecb7
Summary: In https://github.com/facebook/react-native/issues/25427, radex added initial support for running React Native projects on macOS via Catalyst. However, `RCTWebSocket` was disabled for that target because of some compilation issues. This meant that running projects via a connection to the packager wasn't possible: no live reload, and projects must be run in "Release" mode. It also meant making manual changes to Xcode projects deploying to macOS and scattering a number of conditional checks throughout the codebase. In this change, I've implemented support for `RCTWebSocket` on the macOS target and re-enabled the affected features. Live reload and the inspector now work for macOS targets. Manual modifications of Xcode build settings are no longer necessary for react-native projects running on macOS.  ### Limitations There's no binding which displays the developer menu (since there's no shake event on macOS). We'll probably want to add one, perhaps to the menu bar. I've chosen not to commit the modifications to RNTester which enable macOS support, since that would imply more "official" support for this target than I suspect you all would like to convey. I'm happy to add those chunks if it would be helpful. ## Changelog [iOS] [Added] - Added web socket support for macOS (Catalyst), enabling debug builds and live reload Pull Request resolved: https://github.com/facebook/react-native/pull/27469 Test Plan: * Open RNTester/RNTester.xcodeproj with Xcode 11.2.1, run it like a normal iOS app -- make sure it compiles and runs correctly (no regression) * Select "My Mac" as device target, and run. You may need to configure a valid development team to make signing work. * RNTester should run fine with no additional configuration. Modify a file in RNTester, note that live reload is now working. * Test the developer inspector. To display the developer menu, you'll need to manually show it; here's an example diff which does that: ``` diff --git a/RNTester/js/RNTesterApp.ios.js b/RNTester/js/RNTesterApp.ios.js index 8245a68d12..a447ad3b1b 100644 --- a/RNTester/js/RNTesterApp.ios.js +++ b/RNTester/js/RNTesterApp.ios.js @@ -19,6 +19,8 @@ const React = require('react'); const SnapshotViewIOS = require('./examples/Snapshot/SnapshotViewIOS.ios'); const URIActionMap = require('./utils/URIActionMap'); +import NativeDevMenu from '../../Libraries/NativeModules/specs/NativeDevMenu'; + const { AppRegistry, AsyncStorage, @@ -143,6 +145,7 @@ class RNTesterApp extends React.Component<Props, RNTesterNavigationState> { UNSAFE_componentWillMount() { BackHandler.addEventListener('hardwareBackPress', this._handleBack); + NativeDevMenu.show(); } componentDidMount() { ``` Reviewed By: sammy-SC Differential Revision: D18945861 Pulled By: hramos fbshipit-source-id: edcf02c5803742c89a845a3e5d72bc7dacae839f
286 lines
9.3 KiB
Plaintext
286 lines
9.3 KiB
Plaintext
/*
|
|
* 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/RCTPackagerConnection.h>
|
|
|
|
#import <algorithm>
|
|
#import <objc/runtime.h>
|
|
#import <vector>
|
|
|
|
#import <React/RCTAssert.h>
|
|
#import <React/RCTBridge.h>
|
|
#import <React/RCTBundleURLProvider.h>
|
|
#import <React/RCTConvert.h>
|
|
#import <React/RCTDefines.h>
|
|
#import <React/RCTLog.h>
|
|
#import <React/RCTPackagerClient.h>
|
|
#import <React/RCTReconnectingWebSocket.h>
|
|
#import <React/RCTUtils.h>
|
|
|
|
#if RCT_DEV
|
|
|
|
#import <React/RCTSRWebSocket.h>
|
|
|
|
@interface RCTPackagerConnection () <RCTReconnectingWebSocketDelegate>
|
|
@end
|
|
|
|
template <typename Handler>
|
|
struct Registration {
|
|
NSString *method;
|
|
Handler handler;
|
|
dispatch_queue_t queue;
|
|
uint32_t token;
|
|
};
|
|
|
|
@implementation RCTPackagerConnection {
|
|
std::mutex _mutex; // protects all ivars
|
|
RCTReconnectingWebSocket *_socket;
|
|
BOOL _socketConnected;
|
|
NSString *_jsLocationForSocket;
|
|
id _bundleURLChangeObserver;
|
|
uint32_t _nextToken;
|
|
std::vector<Registration<RCTNotificationHandler>> _notificationRegistrations;
|
|
std::vector<Registration<RCTRequestHandler>> _requestRegistrations;
|
|
std::vector<Registration<RCTConnectedHandler>> _connectedRegistrations;
|
|
}
|
|
|
|
+ (instancetype)sharedPackagerConnection
|
|
{
|
|
static RCTPackagerConnection *connection;
|
|
static dispatch_once_t onceToken;
|
|
dispatch_once(&onceToken, ^{
|
|
connection = [RCTPackagerConnection new];
|
|
});
|
|
return connection;
|
|
}
|
|
|
|
- (instancetype)init
|
|
{
|
|
if (self = [super init]) {
|
|
_nextToken = 1; // Prevent randomly erasing a handler if you pass a bogus 0 token
|
|
_jsLocationForSocket = [RCTBundleURLProvider sharedSettings].jsLocation;
|
|
_socket = socketForLocation(_jsLocationForSocket);
|
|
_socket.delegate = self;
|
|
[_socket start];
|
|
|
|
RCTPackagerConnection *const __weak weakSelf = self;
|
|
_bundleURLChangeObserver =
|
|
[[NSNotificationCenter defaultCenter]
|
|
addObserverForName:RCTBundleURLProviderUpdatedNotification
|
|
object:nil
|
|
queue:[NSOperationQueue mainQueue]
|
|
usingBlock:^(NSNotification *_Nonnull __unused note) {
|
|
[weakSelf bundleURLSettingsChanged];
|
|
}];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
static RCTReconnectingWebSocket *socketForLocation(NSString *const jsLocation)
|
|
{
|
|
NSURLComponents *const components = [NSURLComponents new];
|
|
components.host = jsLocation ?: @"localhost";
|
|
components.scheme = @"http";
|
|
components.port = @(kRCTBundleURLProviderDefaultPort);
|
|
components.path = @"/message";
|
|
components.queryItems = @[[NSURLQueryItem queryItemWithName:@"role" value:@"ios"]];
|
|
static dispatch_queue_t queue;
|
|
static dispatch_once_t onceToken;
|
|
dispatch_once(&onceToken, ^{
|
|
queue = dispatch_queue_create("com.facebook.RCTPackagerConnectionQueue", DISPATCH_QUEUE_SERIAL);
|
|
});
|
|
return [[RCTReconnectingWebSocket alloc] initWithURL:components.URL queue:queue];
|
|
}
|
|
|
|
- (void)stop
|
|
{
|
|
std::lock_guard<std::mutex> l(_mutex);
|
|
if (_socket == nil) {
|
|
// Already stopped
|
|
return;
|
|
}
|
|
[[NSNotificationCenter defaultCenter] removeObserver:_bundleURLChangeObserver];
|
|
_bundleURLChangeObserver = nil;
|
|
_socketConnected = NO;
|
|
[_socket stop];
|
|
_socket = nil;
|
|
_notificationRegistrations.clear();
|
|
_requestRegistrations.clear();
|
|
}
|
|
|
|
- (void)bundleURLSettingsChanged
|
|
{
|
|
std::lock_guard<std::mutex> l(_mutex);
|
|
if (_socket == nil) {
|
|
return; // already stopped
|
|
}
|
|
|
|
NSString *const jsLocation = [RCTBundleURLProvider sharedSettings].jsLocation;
|
|
if ([jsLocation isEqual:_jsLocationForSocket]) {
|
|
return; // unchanged
|
|
}
|
|
|
|
_socket.delegate = nil;
|
|
[_socket stop];
|
|
_jsLocationForSocket = jsLocation;
|
|
_socket = socketForLocation(jsLocation);
|
|
_socket.delegate = self;
|
|
[_socket start];
|
|
}
|
|
|
|
- (RCTHandlerToken)addNotificationHandler:(RCTNotificationHandler)handler queue:(dispatch_queue_t)queue forMethod:(NSString *)method
|
|
{
|
|
std::lock_guard<std::mutex> l(_mutex);
|
|
const auto token = _nextToken++;
|
|
_notificationRegistrations.push_back({method, handler, queue, token});
|
|
return token;
|
|
}
|
|
|
|
- (RCTHandlerToken)addRequestHandler:(RCTRequestHandler)handler queue:(dispatch_queue_t)queue forMethod:(NSString *)method
|
|
{
|
|
std::lock_guard<std::mutex> l(_mutex);
|
|
const auto token = _nextToken++;
|
|
_requestRegistrations.push_back({method, handler, queue, token});
|
|
return token;
|
|
}
|
|
|
|
- (RCTHandlerToken)addConnectedHandler:(RCTConnectedHandler)handler queue:(dispatch_queue_t)queue
|
|
{
|
|
std::lock_guard<std::mutex> l(_mutex);
|
|
if (_socketConnected) {
|
|
dispatch_async(queue, ^{
|
|
handler();
|
|
});
|
|
return 0; // _nextToken starts at 1, so 0 is a no-op token
|
|
} else {
|
|
const auto token = _nextToken++;
|
|
_connectedRegistrations.push_back({nil, handler, queue, token});
|
|
return token;
|
|
}
|
|
}
|
|
|
|
- (void)removeHandler:(RCTHandlerToken)token
|
|
{
|
|
std::lock_guard<std::mutex> l(_mutex);
|
|
eraseRegistrationsWithToken(_notificationRegistrations, token);
|
|
eraseRegistrationsWithToken(_requestRegistrations, token);
|
|
eraseRegistrationsWithToken(_connectedRegistrations, token);
|
|
}
|
|
|
|
template <typename Handler>
|
|
static void eraseRegistrationsWithToken(std::vector<Registration<Handler>> ®istrations, RCTHandlerToken token)
|
|
{
|
|
registrations.erase(std::remove_if(registrations.begin(), registrations.end(),
|
|
[&token](const auto ®) { return reg.token == token; }),
|
|
registrations.end());
|
|
}
|
|
|
|
- (void)addHandler:(id<RCTPackagerClientMethod>)handler forMethod:(NSString *)method
|
|
{
|
|
dispatch_queue_t queue = [handler respondsToSelector:@selector(methodQueue)]
|
|
? [handler methodQueue] : dispatch_get_main_queue();
|
|
|
|
[self addNotificationHandler:^(NSDictionary<NSString *, id> *notification) {
|
|
[handler handleNotification:notification];
|
|
} queue:queue forMethod:method];
|
|
[self addRequestHandler:^(NSDictionary<NSString *, id> *request, RCTPackagerClientResponder *responder) {
|
|
[handler handleRequest:request withResponder:responder];
|
|
} queue:queue forMethod:method];
|
|
}
|
|
|
|
static BOOL isSupportedVersion(NSNumber *version)
|
|
{
|
|
NSArray<NSNumber *> *const kSupportedVersions = @[ @(RCT_PACKAGER_CLIENT_PROTOCOL_VERSION) ];
|
|
return [kSupportedVersions containsObject:version];
|
|
}
|
|
|
|
#pragma mark - RCTReconnectingWebSocketDelegate
|
|
|
|
- (void)reconnectingWebSocketDidOpen:(__unused RCTReconnectingWebSocket *)webSocket
|
|
{
|
|
std::vector<Registration<RCTConnectedHandler>> registrations;
|
|
{
|
|
std::lock_guard<std::mutex> l(_mutex);
|
|
_socketConnected = YES;
|
|
registrations = _connectedRegistrations;
|
|
_connectedRegistrations.clear();
|
|
}
|
|
for (const auto ®istration : registrations) {
|
|
// Beware: don't capture the reference to handler in a dispatched block!
|
|
RCTConnectedHandler handler = registration.handler;
|
|
dispatch_async(registration.queue, ^{ handler(); });
|
|
}
|
|
}
|
|
|
|
- (void)reconnectingWebSocket:(RCTReconnectingWebSocket *)webSocket didReceiveMessage:(id)message
|
|
{
|
|
NSError *error = nil;
|
|
NSDictionary<NSString *, id> *msg = RCTJSONParse(message, &error);
|
|
|
|
if (error) {
|
|
RCTLogError(@"%@ failed to parse message with error %@\n<message>\n%@\n</message>", [self class], error, msg);
|
|
return;
|
|
}
|
|
|
|
if (!isSupportedVersion(msg[@"version"])) {
|
|
RCTLogError(@"%@ received message with not supported version %@", [self class], msg[@"version"]);
|
|
return;
|
|
}
|
|
|
|
NSString *const method = msg[@"method"];
|
|
NSDictionary<NSString *, id> *const params = msg[@"params"];
|
|
id messageId = msg[@"id"];
|
|
|
|
if (messageId) { // Request
|
|
const std::vector<Registration<RCTRequestHandler>> registrations(registrationsWithMethod(_mutex, _requestRegistrations, method));
|
|
if (registrations.empty()) {
|
|
RCTLogError(@"No handler found for packager method %@", msg[@"method"]);
|
|
[[[RCTPackagerClientResponder alloc] initWithId:messageId
|
|
socket:webSocket]
|
|
respondWithError:
|
|
[NSString stringWithFormat:@"No handler found for packager method %@", msg[@"method"]]];
|
|
} else {
|
|
// If there are multiple matching request registrations, only one can win;
|
|
// otherwise the packager would get multiple responses. Choose the last one.
|
|
RCTRequestHandler handler = registrations.back().handler;
|
|
dispatch_async(registrations.back().queue, ^{
|
|
handler(params, [[RCTPackagerClientResponder alloc] initWithId:messageId socket:webSocket]);
|
|
});
|
|
}
|
|
} else { // Notification
|
|
const std::vector<Registration<RCTNotificationHandler>> registrations(registrationsWithMethod(_mutex, _notificationRegistrations, method));
|
|
for (const auto ®istration : registrations) {
|
|
// Beware: don't capture the reference to handler in a dispatched block!
|
|
RCTNotificationHandler handler = registration.handler;
|
|
dispatch_async(registration.queue, ^{ handler(params); });
|
|
}
|
|
}
|
|
}
|
|
|
|
- (void)reconnectingWebSocketDidClose:(__unused RCTReconnectingWebSocket *)webSocket
|
|
{
|
|
std::lock_guard<std::mutex> l(_mutex);
|
|
_socketConnected = NO;
|
|
}
|
|
|
|
template <typename Handler>
|
|
static std::vector<Registration<Handler>> registrationsWithMethod(std::mutex &mutex, const std::vector<Registration<Handler>> ®istrations, NSString *method)
|
|
{
|
|
std::lock_guard<std::mutex> l(mutex); // Scope lock acquisition to prevent deadlock when calling out
|
|
std::vector<Registration<Handler>> matches;
|
|
for (const auto ® : registrations) {
|
|
if ([reg.method isEqual:method]) {
|
|
matches.push_back(reg);
|
|
}
|
|
}
|
|
return matches;
|
|
}
|
|
|
|
@end
|
|
|
|
#endif
|