Revert D36052198: Partially remove dependency on folly async

Differential Revision:
D36052198 (ade685c621)

Original commit changeset: 170d64a324a1

Original Phabricator Diff: D36052198 (ade685c621)

fbshipit-source-id: 69d2b18e70a6267667432d6ed9dc1c5bc545b417

xplat/FlipperWebSocket/BaseClient.h

@@ -9,11 +9,11 @@
 
 #pragma once
 
-#include <Flipper/FlipperScheduler.h>
 #include <Flipper/FlipperSocket.h>
 #include <Flipper/FlipperSocketProvider.h>
 #include <Flipper/FlipperTransportTypes.h>
 #include <folly/dynamic.h>
+#include <folly/io/async/EventBase.h>
 #include <future>
 #include <memory>
 #include <mutex>
@@ -37,18 +37,18 @@ class BaseClient {
   BaseClient(
       FlipperConnectionEndpoint endpoint,
       std::unique_ptr<FlipperSocketBasePayload> payload,
-      Scheduler* scheduler)
+      folly::EventBase* eventBase)
       : endpoint_(std::move(endpoint)),
         payload_(std::move(payload)),
-        scheduler_(scheduler) {}
+        eventBase_(eventBase) {}
   BaseClient(
       FlipperConnectionEndpoint endpoint,
       std::unique_ptr<FlipperSocketBasePayload> payload,
-      Scheduler* scheduler,
+      folly::EventBase* eventBase,
       ConnectionContextStore* connectionContextStore)
       : endpoint_(std::move(endpoint)),
         payload_(std::move(payload)),
-        scheduler_(scheduler),
+        eventBase_(eventBase),
         connectionContextStore_(connectionContextStore) {}
 
   BaseClient(const BaseClient&) = delete;
@@ -84,7 +84,7 @@ class BaseClient {
  protected:
   FlipperConnectionEndpoint endpoint_;
   std::unique_ptr<FlipperSocketBasePayload> payload_;
-  Scheduler* scheduler_;
+  folly::EventBase* eventBase_;
   ConnectionContextStore* connectionContextStore_;
 
   SocketEventHandler eventHandler_;

xplat/FlipperWebSocket/FlipperWebSocket.cpp

@@ -14,6 +14,8 @@
 #include <Flipper/Log.h>
 #include <folly/String.h>
 #include <folly/futures/Future.h>
+#include <folly/io/async/AsyncSocketException.h>
+#include <folly/io/async/SSLContext.h>
 #include <folly/json.h>
 #include <cctype>
 #include <iomanip>
@@ -30,24 +32,24 @@ namespace flipper {
 FlipperWebSocket::FlipperWebSocket(
     FlipperConnectionEndpoint endpoint,
     std::unique_ptr<FlipperSocketBasePayload> payload,
-    Scheduler* scheduler)
+    folly::EventBase* eventBase)
     : FlipperWebSocket(
           std::move(endpoint),
           std::move(payload),
-          scheduler,
+          eventBase,
           nullptr) {}
 
 FlipperWebSocket::FlipperWebSocket(
     FlipperConnectionEndpoint endpoint,
     std::unique_ptr<FlipperSocketBasePayload> payload,
-    Scheduler* scheduler,
+    folly::EventBase* eventBase,
     ConnectionContextStore* connectionContextStore) {
   if (endpoint.secure) {
     socket_ = std::make_unique<WebSocketTLSClient>(
-        endpoint, std::move(payload), scheduler, connectionContextStore);
+        endpoint, std::move(payload), eventBase, connectionContextStore);
   } else {
     socket_ = std::make_unique<WebSocketClient>(
-        endpoint, std::move(payload), scheduler, connectionContextStore);
+        endpoint, std::move(payload), eventBase, connectionContextStore);
   }
 }
 

xplat/FlipperWebSocket/FlipperWebSocket.h

@@ -9,11 +9,11 @@
 
 #pragma once
 
-#include <Flipper/FlipperScheduler.h>
 #include <Flipper/FlipperSocket.h>
 #include <Flipper/FlipperSocketProvider.h>
 #include <Flipper/FlipperTransportTypes.h>
 #include <folly/dynamic.h>
+#include <folly/io/async/EventBase.h>
 #include <future>
 #include <memory>
 #include <mutex>
@@ -29,11 +29,11 @@ class FlipperWebSocket : public FlipperSocket {
   FlipperWebSocket(
       FlipperConnectionEndpoint endpoint,
       std::unique_ptr<FlipperSocketBasePayload> payload,
-      Scheduler* scheduler);
+      folly::EventBase* eventBase);
   FlipperWebSocket(
       FlipperConnectionEndpoint endpoint,
       std::unique_ptr<FlipperSocketBasePayload> payload,
-      Scheduler* scheduler,
+      folly::EventBase* eventBase,
       ConnectionContextStore* connectionContextStore);
 
   virtual ~FlipperWebSocket();
@@ -62,19 +62,19 @@ class FlipperWebSocketProvider : public FlipperSocketProvider {
   virtual std::unique_ptr<FlipperSocket> create(
       FlipperConnectionEndpoint endpoint,
       std::unique_ptr<FlipperSocketBasePayload> payload,
-      Scheduler* scheduler) override {
+      folly::EventBase* eventBase) override {
     return std::make_unique<FlipperWebSocket>(
-        std::move(endpoint), std::move(payload), scheduler);
+        std::move(endpoint), std::move(payload), eventBase);
   }
   virtual std::unique_ptr<FlipperSocket> create(
       FlipperConnectionEndpoint endpoint,
       std::unique_ptr<FlipperSocketBasePayload> payload,
-      Scheduler* scheduler,
+      folly::EventBase* eventBase,
       ConnectionContextStore* connectionContextStore) override {
     return std::make_unique<FlipperWebSocket>(
         std::move(endpoint),
         std::move(payload),
-        scheduler,
+        eventBase,
         connectionContextStore);
   }
 };

xplat/FlipperWebSocket/WebSocketClient.cpp

@@ -14,6 +14,7 @@
 #include <Flipper/Log.h>
 #include <folly/String.h>
 #include <folly/futures/Future.h>
+#include <folly/io/async/SSLContext.h>
 #include <folly/json.h>
 #include <websocketpp/common/memory.hpp>
 #include <websocketpp/common/thread.hpp>
@@ -30,22 +31,22 @@ namespace flipper {
 WebSocketClient::WebSocketClient(
     FlipperConnectionEndpoint endpoint,
     std::unique_ptr<FlipperSocketBasePayload> payload,
-    Scheduler* scheduler)
+    folly::EventBase* eventBase)
     : WebSocketClient(
           std::move(endpoint),
           std::move(payload),
-          scheduler,
+          eventBase,
           nullptr) {}
 
 WebSocketClient::WebSocketClient(
     FlipperConnectionEndpoint endpoint,
     std::unique_ptr<FlipperSocketBasePayload> payload,
-    Scheduler* scheduler,
+    folly::EventBase* eventBase,
     ConnectionContextStore* connectionContextStore)
     : BaseClient(
           std::move(endpoint),
           std::move(payload),
-          scheduler,
+          eventBase,
           connectionContextStore) {
   status_ = Status::Unconnected;
 
@@ -147,7 +148,7 @@ void WebSocketClient::disconnect() {
     thread_->join();
   }
   thread_ = nullptr;
-  scheduler_->schedule(
+  eventBase_->add(
       [eventHandler = eventHandler_]() { eventHandler(SocketEvent::CLOSE); });
 }
 
@@ -179,12 +180,12 @@ void WebSocketClient::send(
 void WebSocketClient::sendExpectResponse(
     const std::string& message,
     SocketSendExpectResponseHandler completion) {
-  connection_->set_message_handler([completion, scheduler = scheduler_](
-                                       websocketpp::connection_hdl hdl,
-                                       SocketClient::message_ptr msg) {
-    const std::string& payload = msg->get_payload();
-    scheduler->schedule([completion, payload] { completion(payload, false); });
-  });
+  connection_->set_message_handler(
+      [completion, eventBase = eventBase_](
+          websocketpp::connection_hdl hdl, SocketClient::message_ptr msg) {
+        const std::string& payload = msg->get_payload();
+        eventBase->add([completion, payload] { completion(payload, false); });
+      });
   websocketpp::lib::error_code ec;
   socket_.send(
       handle_,
@@ -204,7 +205,7 @@ void WebSocketClient::onOpen(SocketClient* c, websocketpp::connection_hdl hdl) {
   }
 
   status_ = Status::Initializing;
-  scheduler_->schedule(
+  eventBase_->add(
       [eventHandler = eventHandler_]() { eventHandler(SocketEvent::OPEN); });
 }
 
@@ -214,7 +215,7 @@ void WebSocketClient::onMessage(
     SocketClient::message_ptr msg) {
   const std::string& payload = msg->get_payload();
   if (messageHandler_) {
-    scheduler_->schedule([payload, messageHandler = messageHandler_]() {
+    eventBase_->add([payload, messageHandler = messageHandler_]() {
       messageHandler(payload);
     });
   }
@@ -229,7 +230,7 @@ void WebSocketClient::onFail(SocketClient* c, websocketpp::connection_hdl hdl) {
     connected_.set_value(false);
   }
   status_ = Status::Failed;
-  scheduler_->schedule(
+  eventBase_->add(
       [eventHandler = eventHandler_]() { eventHandler(SocketEvent::ERROR); });
 }
 
@@ -237,7 +238,7 @@ void WebSocketClient::onClose(
     SocketClient* c,
     websocketpp::connection_hdl hdl) {
   status_ = Status::Closed;
-  scheduler_->schedule(
+  eventBase_->add(
       [eventHandler = eventHandler_]() { eventHandler(SocketEvent::CLOSE); });
 }
 

xplat/FlipperWebSocket/WebSocketClient.h

@@ -9,11 +9,11 @@
 
 #pragma once
 
-#include <Flipper/FlipperScheduler.h>
 #include <Flipper/FlipperSocket.h>
 #include <Flipper/FlipperSocketProvider.h>
 #include <Flipper/FlipperTransportTypes.h>
 #include <folly/dynamic.h>
+#include <folly/io/async/EventBase.h>
 #include <future>
 #include <memory>
 #include <mutex>
@@ -35,11 +35,11 @@ class WebSocketClient : public BaseClient {
   WebSocketClient(
       FlipperConnectionEndpoint endpoint,
       std::unique_ptr<FlipperSocketBasePayload> payload,
-      Scheduler* scheduler);
+      folly::EventBase* eventBase);
   WebSocketClient(
       FlipperConnectionEndpoint endpoint,
       std::unique_ptr<FlipperSocketBasePayload> payload,
-      Scheduler* scheduler,
+      folly::EventBase* eventBase,
       ConnectionContextStore* connectionContextStore);
 
   WebSocketClient(const WebSocketClient&) = delete;

xplat/FlipperWebSocket/WebSocketTLSClient.cpp

@@ -33,22 +33,22 @@ namespace flipper {
 WebSocketTLSClient::WebSocketTLSClient(
     FlipperConnectionEndpoint endpoint,
     std::unique_ptr<FlipperSocketBasePayload> payload,
-    Scheduler* scheduler)
+    folly::EventBase* eventBase)
     : WebSocketTLSClient(
           std::move(endpoint),
           std::move(payload),
-          scheduler,
+          eventBase,
           nullptr) {}
 
 WebSocketTLSClient::WebSocketTLSClient(
     FlipperConnectionEndpoint endpoint,
     std::unique_ptr<FlipperSocketBasePayload> payload,
-    Scheduler* scheduler,
+    folly::EventBase* eventBase,
     ConnectionContextStore* connectionContextStore)
     : BaseClient(
           std::move(endpoint),
           std::move(payload),
-          scheduler,
+          eventBase,
           connectionContextStore) {
   status_ = Status::Unconnected;
 
@@ -157,7 +157,7 @@ void WebSocketTLSClient::disconnect() {
   }
 
   thread_ = nullptr;
-  scheduler_->schedule(
+  eventBase_->add(
       [eventHandler = eventHandler_]() { eventHandler(SocketEvent::CLOSE); });
 }
 
@@ -189,12 +189,12 @@ void WebSocketTLSClient::send(
 void WebSocketTLSClient::sendExpectResponse(
     const std::string& message,
     SocketSendExpectResponseHandler completion) {
-  connection_->set_message_handler([completion, scheduler = scheduler_](
-                                       websocketpp::connection_hdl hdl,
-                                       SocketTLSClient::message_ptr msg) {
-    const std::string& payload = msg->get_payload();
-    scheduler->schedule([completion, payload] { completion(payload, false); });
-  });
+  connection_->set_message_handler(
+      [completion, eventBase = eventBase_](
+          websocketpp::connection_hdl hdl, SocketTLSClient::message_ptr msg) {
+        const std::string& payload = msg->get_payload();
+        eventBase->add([completion, payload] { completion(payload, false); });
+      });
   websocketpp::lib::error_code ec;
   socket_.send(
       handle_,
@@ -216,7 +216,7 @@ void WebSocketTLSClient::onOpen(
   }
 
   status_ = Status::Initializing;
-  scheduler_->schedule(
+  eventBase_->add(
       [eventHandler = eventHandler_]() { eventHandler(SocketEvent::OPEN); });
 }
 
@@ -226,7 +226,7 @@ void WebSocketTLSClient::onMessage(
     SocketTLSClient::message_ptr msg) {
   const std::string& payload = msg->get_payload();
   if (messageHandler_) {
-    scheduler_->schedule([payload, messageHandler = messageHandler_]() {
+    eventBase_->add([payload, messageHandler = messageHandler_]() {
       messageHandler(payload);
     });
   }
@@ -257,7 +257,7 @@ void WebSocketTLSClient::onFail(
     }
   }
   status_ = Status::Failed;
-  scheduler_->schedule([eventHandler = eventHandler_, sslError]() {
+  eventBase_->add([eventHandler = eventHandler_, sslError]() {
     if (sslError) {
       eventHandler(SocketEvent::SSL_ERROR);
     } else {
@@ -270,7 +270,7 @@ void WebSocketTLSClient::onClose(
     SocketTLSClient* c,
     websocketpp::connection_hdl hdl) {
   status_ = Status::Closed;
-  scheduler_->schedule(
+  eventBase_->add(
       [eventHandler = eventHandler_]() { eventHandler(SocketEvent::CLOSE); });
 }
 

xplat/FlipperWebSocket/WebSocketTLSClient.h

@@ -13,6 +13,7 @@
 #include <Flipper/FlipperSocketProvider.h>
 #include <Flipper/FlipperTransportTypes.h>
 #include <folly/dynamic.h>
+#include <folly/io/async/EventBase.h>
 #include <future>
 #include <memory>
 #include <mutex>
@@ -38,11 +39,11 @@ class WebSocketTLSClient : public BaseClient {
   WebSocketTLSClient(
       FlipperConnectionEndpoint endpoint,
       std::unique_ptr<FlipperSocketBasePayload> payload,
-      Scheduler* scheduler);
+      folly::EventBase* eventBase);
   WebSocketTLSClient(
       FlipperConnectionEndpoint endpoint,
       std::unique_ptr<FlipperSocketBasePayload> payload,
-      Scheduler* scheduler,
+      folly::EventBase* eventBase,
       ConnectionContextStore* connectionContextStore);
 
   WebSocketTLSClient(const WebSocketTLSClient&) = delete;