From 62bac80f90cf5a4ab216488b4ede441f0e3f86ba Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Wed, 17 Apr 2019 13:32:39 -0700 Subject: [PATCH] Fix metro websocket reconnect logic Summary: This diff fixes the reconnect logic with the metro websockets which is causing the app to not re-connect when metro crashes. To demonstrate the issue, consider the following video: {F156029086} On the left we have metro, on the right is the xcode console with some logging to show the reconnecting phase. When we kill the metro server you can see the app tries to reconnect once and that's it - when metro is started back up, you can see the notification that there are no apps running and can also see that cmd+opt+r doesn't work anymore I updated the logic to optimistically start the connection and if it's still unavailable to retry again after the timeout [iOS][Fixed] - Metro websocket reconnect logic Reviewed By: shergin Differential Revision: D14961433 fbshipit-source-id: 0569aa169dc9f538a7e4a8d04e99de39f2e9b3f9 --- Libraries/WebSocket/RCTReconnectingWebSocket.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.m b/Libraries/WebSocket/RCTReconnectingWebSocket.m index 57e9071b652de9..caaf891d7bbeaa 100644 --- a/Libraries/WebSocket/RCTReconnectingWebSocket.m +++ b/Libraries/WebSocket/RCTReconnectingWebSocket.m @@ -148,9 +148,9 @@ - (void)reconnect { __weak RCTSRWebSocket *socket = _socket; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - // Only reconnect if the observer wasn't stoppped while we were waiting - if (socket) { - [self start]; + [self start]; + if (!socket) { + [self reconnect]; } }); }