jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Socket provider

Browse Source 
Summary:
Abstract the socket creation from FlipperConnectionManagerImpl. Instead, use FlipperSocketProvider.

There's a default provider which will always return RSocket sockets. This provider can be changed and thus can return other implementations.

Reviewed By: fabiomassimo

Differential Revision: D30396322

fbshipit-source-id: 0583865376809260b0240e5bd653d73f2fa514b1
This commit is contained in:
Lorenzo Blasa
2021-08-23 03:16:25 -07:00
committed by Facebook GitHub Bot
parent 823a90fa61
commit ef831f346d
4 changed files with 168 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
xplat/Flipper/FlipperConnectionManagerImpl.cpp
View File

@@ -15,8 +15,8 @@
#include <thread>
#include "ConnectionContextStore.h"
#include "FireAndForgetBasedFlipperResponder.h"
#include "FlipperRSocket.h"
#include "FlipperResponderImpl.h"
#include "FlipperSocketProvider.h"
#include "FlipperStep.h"
#include "Log.h"
#include "yarpl/Single.h"
@@ -205,7 +205,7 @@ bool FlipperConnectionManagerImpl::connectAndExchangeCertificate() {
payload->sdk_version = sdkVersion;
payload->medium = medium;
auto newClient = std::make_unique<FlipperRSocket>(
auto newClient = FlipperSocketProvider::socketCreate(
endpoint, std::move(payload), connectionEventBase_);
newClient->setEventHandler(ConnectionEvents(implWrapper_));
@@ -251,9 +251,26 @@ bool FlipperConnectionManagerImpl::connectSecurely() {
payload->csr = contextStore_->getCertificateSigningRequest().c_str();
payload->csr_path = contextStore_->getCertificateDirectoryPath().c_str();
auto newClient = std::make_unique<FlipperRSocket>(
auto newClient = FlipperSocketProvider::socketCreate(
endpoint, std::move(payload), connectionEventBase_, contextStore_.get());
newClient->setEventHandler(ConnectionEvents(implWrapper_));
/**
Message handler is only ever used for WebSocket connections. RSocket uses a
different approach whereas a responder is used instead.
*/
newClient->setMessageHandler([this](const std::string& msg) {
std::unique_ptr<FireAndForgetBasedFlipperResponder> responder;
auto message = folly::parseJson(msg);
auto idItr = message.find("id");
if (idItr == message.items().end()) {
responder = std::make_unique<FireAndForgetBasedFlipperResponder>(this);
} else {
responder = std::make_unique<FireAndForgetBasedFlipperResponder>(
this, idItr->second.getInt());
}
this->onMessageReceived(folly::parseJson(msg), std::move(responder));
});
auto connectingSecurely = flipperState_->start("Connect securely");
connectionIsTrusted_ = true;