Skip to content

Auto-reconnect PackagerConnection to Metro dev server #56625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
javache wants to merge 1 commit into
base: main
Choose a base branch
from
+67 −12
Open

Auto-reconnect PackagerConnection to Metro dev server #56625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 55 additions & 10 deletions packages/react-native/ReactCxxPlatform/react/devsupport/PackagerConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,40 @@

#include <glog/logging.h>
#include <nlohmann/json.hpp>
#include <utility>

namespace facebook::react {

PackagerConnection::PackagerConnection(
const WebSocketClientFactory& webSocketClientFactory,
const std::string& packagerConnectionUrl,
WebSocketClientFactory webSocketClientFactory,
std::string packagerConnectionUrl,
LiveReloadCallback&& liveReloadCallback,
ShowDevMenuCallback&& showDevMenuCallback)
: liveReloadCallback_(std::move(liveReloadCallback)),
: webSocketClientFactory_(std::move(webSocketClientFactory)),
packagerConnectionUrl_(std::move(packagerConnectionUrl)),
liveReloadCallback_(std::move(liveReloadCallback)),
showDevMenuCallback_(std::move(showDevMenuCallback)) {
websocket_ = webSocketClientFactory();
attemptConnection();
}

PackagerConnection::~PackagerConnection() noexcept {
reconnectThread_.quit();
if (websocket_) {
websocket_->setOnClosedCallback(nullptr);
websocket_->setOnMessageCallback(nullptr);
websocket_->close("PackagerConnection destroyed");
}
}

void PackagerConnection::attemptConnection() {
if (websocket_) {
websocket_->setOnClosedCallback(nullptr);
websocket_->close("reconnecting");
}
websocket_ = webSocketClientFactory_();
websocket_->setOnMessageCallback([this](const std::string& message) {
LOG(INFO) << "Received message from packager: " << message;
auto json = nlohmann::json::parse(message);
if (json.is_null() || json["version"] != 2) {
auto json = nlohmann::json::parse(message, nullptr, false);
if (json.is_discarded() || json.is_null() || json["version"] != 2) {
return;
}
auto method = json["method"];
Expand All @@ -34,11 +52,38 @@ PackagerConnection::PackagerConnection(
showDevMenuCallback_();
}
});
websocket_->connect(packagerConnectionUrl);
websocket_->setOnClosedCallback([this](const std::string& reason) {
LOG(INFO) << "PackagerConnection closed: " << reason;
scheduleReconnect();
});
websocket_->connect(
packagerConnectionUrl_,
[this](bool success, const std::string& /*error*/) {
if (success) {
if (!isInitialConnection_) {
LOG(INFO)
<< "PackagerConnection connected to Metro - triggering live reload";
liveReloadCallback_();
} else {
LOG(INFO) << "PackagerConnection connected to Metro";
}
isInitialConnection_ = false;
} else {
scheduleReconnect();
}
});
}

PackagerConnection::~PackagerConnection() noexcept {
websocket_->close("PackagerConnection destroyed");
void PackagerConnection::scheduleReconnect() {
if (reconnectPending_.exchange(true)) {
return;
}
reconnectThread_.runAsync(
[this]() {
reconnectPending_ = false;
attemptConnection();
},
std::chrono::milliseconds(5000));
}

} // namespace facebook::react
14 changes: 12 additions & 2 deletions packages/react-native/ReactCxxPlatform/react/devsupport/PackagerConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#pragma once

#include <react/http/IWebSocketClient.h>
#include <react/threading/TaskDispatchThread.h>
#include <atomic>
#include <functional>
#include <memory>
#include <string>
Expand All @@ -20,8 +22,8 @@ class PackagerConnection {

public:
PackagerConnection(
const WebSocketClientFactory &webSocketClientFactory,
const std::string &packagerConnectionUrl,
WebSocketClientFactory webSocketClientFactory,
std::string packagerConnectionUrl,
LiveReloadCallback &&liveReloadCallback,
ShowDevMenuCallback &&showDevMenuCallback);
~PackagerConnection() noexcept;
Expand All @@ -31,9 +33,17 @@ class PackagerConnection {
PackagerConnection &operator=(PackagerConnection &&other) = delete;

private:
void attemptConnection();
void scheduleReconnect();

const WebSocketClientFactory webSocketClientFactory_;
const std::string packagerConnectionUrl_;
const LiveReloadCallback liveReloadCallback_;
const ShowDevMenuCallback showDevMenuCallback_;
std::unique_ptr<IWebSocketClient> websocket_;
std::atomic<bool> isInitialConnection_{true};
std::atomic<bool> reconnectPending_{false};
TaskDispatchThread reconnectThread_{"PackagerReconnect"};
};

} // namespace facebook::react
Loading