e42db220ee
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
86 lines
2.5 KiB
C++
86 lines
2.5 KiB
C++
/*
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#ifdef FB_SONARKIT_ENABLED
|
|
|
|
#pragma once
|
|
|
|
#include <Flipper/FlipperScheduler.h>
|
|
#include <Flipper/FlipperSocket.h>
|
|
#include <Flipper/FlipperSocketProvider.h>
|
|
#include <Flipper/FlipperTransportTypes.h>
|
|
#include <folly/dynamic.h>
|
|
#include <future>
|
|
#include <memory>
|
|
#include <mutex>
|
|
#include "BaseClient.h"
|
|
|
|
namespace facebook {
|
|
namespace flipper {
|
|
|
|
class FlipperConnectionManager;
|
|
class ConnectionContextStore;
|
|
class FlipperWebSocket : public FlipperSocket {
|
|
public:
|
|
FlipperWebSocket(
|
|
FlipperConnectionEndpoint endpoint,
|
|
std::unique_ptr<FlipperSocketBasePayload> payload,
|
|
Scheduler* scheduler);
|
|
FlipperWebSocket(
|
|
FlipperConnectionEndpoint endpoint,
|
|
std::unique_ptr<FlipperSocketBasePayload> payload,
|
|
Scheduler* scheduler,
|
|
ConnectionContextStore* connectionContextStore);
|
|
|
|
virtual ~FlipperWebSocket();
|
|
|
|
virtual void setEventHandler(SocketEventHandler eventHandler) override;
|
|
virtual void setMessageHandler(SocketMessageHandler messageHandler) override;
|
|
|
|
virtual void connect(FlipperConnectionManager* manager) override;
|
|
virtual void disconnect() override;
|
|
|
|
virtual void send(const folly::dynamic& message, SocketSendHandler completion)
|
|
override;
|
|
virtual void send(const std::string& message, SocketSendHandler completion)
|
|
override;
|
|
virtual void sendExpectResponse(
|
|
const std::string& message,
|
|
SocketSendExpectResponseHandler completion) override;
|
|
|
|
private:
|
|
std::unique_ptr<BaseClient> socket_;
|
|
};
|
|
|
|
class FlipperWebSocketProvider : public FlipperSocketProvider {
|
|
public:
|
|
FlipperWebSocketProvider() {}
|
|
virtual std::unique_ptr<FlipperSocket> create(
|
|
FlipperConnectionEndpoint endpoint,
|
|
std::unique_ptr<FlipperSocketBasePayload> payload,
|
|
Scheduler* scheduler) override {
|
|
return std::make_unique<FlipperWebSocket>(
|
|
std::move(endpoint), std::move(payload), scheduler);
|
|
}
|
|
virtual std::unique_ptr<FlipperSocket> create(
|
|
FlipperConnectionEndpoint endpoint,
|
|
std::unique_ptr<FlipperSocketBasePayload> payload,
|
|
Scheduler* scheduler,
|
|
ConnectionContextStore* connectionContextStore) override {
|
|
return std::make_unique<FlipperWebSocket>(
|
|
std::move(endpoint),
|
|
std::move(payload),
|
|
scheduler,
|
|
connectionContextStore);
|
|
}
|
|
};
|
|
|
|
} // namespace flipper
|
|
} // namespace facebook
|
|
|
|
#endif
|