Socket connect no longer synchronous and blocking

Summary:
Never really liked this code. Before this change, calls to connect were blocking.

Because of this, we had to make use of promises and a bit of really not that good-looking code.

So, this change makes connect non-blocking meaning that we make full use of our event handler.

These changes contain:
- CSR is not getting generated after each failed attempt.
- Connect is no longer blocking.
- Do not report events via the handler when explicitly disconnecting.

Reviewed By: jknoxville

Differential Revision: D46853228

fbshipit-source-id: 00e6a9c7c039a756175fe14982959e078d92bacb

react-native/react-native-flipper/windows/ReactNativeFlipper/FlipperReactBaseSocket.h

@@ -65,7 +65,7 @@ class FlipperReactBaseSocket {
     messageHandler_ = std::move(messageHandler);
   }
 
-  virtual bool connect(FlipperConnectionManager* manager) = 0;
+  virtual void connect(FlipperConnectionManager* manager) = 0;
   virtual void disconnect() = 0;
 
   virtual void send(

react-native/react-native-flipper/windows/ReactNativeFlipper/FlipperReactSocket.cpp

@@ -55,8 +55,8 @@ void FlipperReactSocket::setMessageHandler(
   socket_->setMessageHandler(messageHandler);
 }
 
-bool FlipperReactSocket::connect(FlipperConnectionManager* manager) {
-  return socket_->connect(manager);
+void FlipperReactSocket::connect(FlipperConnectionManager* manager) {
+  socket_->connect(manager);
 }
 
 void FlipperReactSocket::disconnect() {

react-native/react-native-flipper/windows/ReactNativeFlipper/FlipperReactSocket.h

@@ -37,7 +37,7 @@ class FlipperReactSocket : public FlipperSocket {
   virtual void setEventHandler(SocketEventHandler eventHandler) override;
   virtual void setMessageHandler(SocketMessageHandler messageHandler) override;
 
-  virtual bool connect(FlipperConnectionManager* manager) override;
+  virtual void connect(FlipperConnectionManager* manager) override;
   virtual void disconnect() override;
 
   virtual void send(const folly::dynamic& message, SocketSendHandler completion)

react-native/react-native-flipper/windows/ReactNativeFlipper/FlipperReactSocketClient.cpp

@@ -134,9 +134,9 @@ FlipperReactSocketClient::getClientCertificate() {
   return installClientCertificate();
 }
 
-bool FlipperReactSocketClient::connect(FlipperConnectionManager* manager) {
+void FlipperReactSocketClient::connect(FlipperConnectionManager* manager) {
   if (status_ != Status::Unconnected) {
-    return false;
+    return;
   }
 
   status_ = Status::Connecting;
@@ -176,30 +176,34 @@ bool FlipperReactSocketClient::connect(FlipperConnectionManager* manager) {
       socket_.Closed({this, &FlipperReactSocketClient::OnWebSocketClosed});
 
   try {
-    this->socket_.ConnectAsync(winrt::Windows::Foundation::Uri(uri))
-        .wait_for(std::chrono::seconds(10));
-
     status_ = Status::Initializing;
-    scheduler_->schedule(
-        [eventHandler = eventHandler_]() { eventHandler(SocketEvent::OPEN); });
 
-    return true;
+    Windows::Foundation::IAsyncAction ^ connectAction;
+    connectAction =
+        this->socket_.ConnectAsync(winrt::Windows::Foundation::Uri(uri));
+    connectAction->Completed = ref new AsyncActionCompletedHandler(
+        [eventHandler = eventHandler_](
+            Windows::Foundation::IAsyncAction ^ asyncAction,
+            Windows::Foundation::AsyncStatus asyncStatus) {
+          if (asyncStatus == Windows::Foundation::AsyncStatus::Completed) {
+            eventHandler(SocketEvent::OPEN);
+          } else {
+            eventHandler(SocketEvent::ERROR);
+          }
+        });
+
   } catch (winrt::hresult_error const& ex) {
     winrt::Windows::Web::WebErrorStatus webErrorStatus{
         winrt::Windows::Networking::Sockets::WebSocketError::GetStatus(
             ex.to_abi())};
+    socket_ = nullptr;
+    status_ = Status::Unconnected;
+    eventHandler(SocketEvent::ERROR);
   }
-
-  disconnect();
-
-  return false;
 }
 
 void FlipperReactSocketClient::disconnect() {
   status_ = Status::Closed;
-  scheduler_->schedule(
-      [eventHandler = eventHandler_]() { eventHandler(SocketEvent::CLOSE); });
-  // socket_.Close();
   socket_ = nullptr;
 }
 
@@ -269,14 +273,10 @@ void FlipperReactSocketClient::OnWebSocketMessageReceived(
     const std::string payload = winrt::to_string(message);
 
     if (overrideHandler_ != nullptr) {
-      scheduler_->schedule([payload, messageHandler = *overrideHandler_]() {
-        messageHandler(payload, false);
-      });
+      messageHandler(payload, false);
       overrideHandler_ = nullptr;
     } else if (messageHandler_) {
-      scheduler_->schedule([payload, messageHandler = messageHandler_]() {
-        messageHandler(payload);
-      });
+      messageHandler(payload);
     }
   } catch (winrt::hresult_error const& ex) {
     // winrt::Windows::Web::WebErrorStatus webErrorStatus{
@@ -291,8 +291,7 @@ void FlipperReactSocketClient::OnWebSocketClosed(
     return;
   }
   status_ = Status::Closed;
-  scheduler_->schedule(
-      [eventHandler = eventHandler_]() { eventHandler(SocketEvent::CLOSE); });
+  eventHandler(SocketEvent::CLOSE);
 }
 
 } // namespace flipper

react-native/react-native-flipper/windows/ReactNativeFlipper/FlipperReactSocketClient.h

@@ -40,7 +40,7 @@ class FlipperReactSocketClient : public FlipperReactBaseSocket {
 
   virtual ~FlipperReactSocketClient();
 
-  virtual bool connect(FlipperConnectionManager* manager) override;
+  virtual void connect(FlipperConnectionManager* manager) override;
   virtual void disconnect() override;
 
   virtual void send(const folly::dynamic& message, SocketSendHandler completion)
@@ -61,7 +61,6 @@ class FlipperReactSocketClient : public FlipperReactBaseSocket {
           args);
 
  private:
-  std::promise<bool> connected_;
   winrt::Windows::Networking::Sockets::MessageWebSocket socket_;
   winrt::event_token messageReceivedEventToken_;
   winrt::event_token closedEventToken_;