From bf67345b3bd30de5917c27be1ff2b3ba9f7f11b0 Mon Sep 17 00:00:00 2001 From: Sebastian Lund Date: Tue, 29 Aug 2017 07:59:40 -0700 Subject: [PATCH] Expose webSocketDidOpen in RCTReconnectingWebSocket Summary: Expose webSocketDidOpen in RCTReconnectingWebSocket in order to get notified when the reconnecting websocket is opened to the endpoint. Reviewed By: emilsjolander Differential Revision: D5725547 fbshipit-source-id: e904c5a84d670ecf936993ec1739614f99fce09c --- Libraries/WebSocket/RCTReconnectingWebSocket.h | 2 ++ Libraries/WebSocket/RCTReconnectingWebSocket.m | 5 +++++ Libraries/WebSocket/RCTWebSocketObserver.m | 4 ++++ React/DevSupport/RCTPackagerConnection.m | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.h b/Libraries/WebSocket/RCTReconnectingWebSocket.h index 7466d73d927..559fa635095 100644 --- a/Libraries/WebSocket/RCTReconnectingWebSocket.h +++ b/Libraries/WebSocket/RCTReconnectingWebSocket.h @@ -15,6 +15,8 @@ @protocol RCTWebSocketProtocolDelegate +- (void)webSocketDidOpen:(RCTSRWebSocket *)webSocket; + - (void)webSocket:(RCTSRWebSocket *)webSocket didReceiveMessage:(id)message; - (void)webSocket:(RCTSRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean; diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.m b/Libraries/WebSocket/RCTReconnectingWebSocket.m index f928c980432..53aa4368d87 100644 --- a/Libraries/WebSocket/RCTReconnectingWebSocket.m +++ b/Libraries/WebSocket/RCTReconnectingWebSocket.m @@ -101,6 +101,11 @@ static void my_nwlog_legacy_v(int level, char *format, va_list args) { }); } +- (void)webSocketDidOpen:(RCTSRWebSocket *)webSocket +{ + [self.delegate webSocketDidOpen:webSocket]; +} + - (void)webSocket:(RCTSRWebSocket *)webSocket didFailWithError:(NSError *)error { [self reconnect]; diff --git a/Libraries/WebSocket/RCTWebSocketObserver.m b/Libraries/WebSocket/RCTWebSocketObserver.m index af2f16c058f..d446d5d88f6 100644 --- a/Libraries/WebSocket/RCTWebSocketObserver.m +++ b/Libraries/WebSocket/RCTWebSocketObserver.m @@ -66,6 +66,10 @@ } } +- (void)webSocketDidOpen:(RCTSRWebSocket *)webSocket +{ +} + - (void)webSocket:(RCTSRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean { } diff --git a/React/DevSupport/RCTPackagerConnection.m b/React/DevSupport/RCTPackagerConnection.m index 32a54d5b7d8..8cb79b6c68d 100644 --- a/React/DevSupport/RCTPackagerConnection.m +++ b/React/DevSupport/RCTPackagerConnection.m @@ -132,6 +132,10 @@ static BOOL isSupportedVersion(NSNumber *version) } } +- (void)webSocketDidOpen:(RCTSRWebSocket *)webSocket +{ +} + - (void)webSocket:(RCTSRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean { }