Fix Cxx WebSocket write queue state (#58201)

Summary:
The Cxx WebSocket client can write before its handshake, drop queued pre-connect and empty frames, allow concurrent Beast writes through a check-then-set race, and retain writer ownership after errors. Gate draining on a successful connection, atomically claim the single writer, preserve empty frames, and release state on every completion.

Fixes https://github.com/react/react-native/issues/58200.

## Changelog:

[GENERAL] [FIXED] - Preserve buffered and empty Cxx WebSocket frames and serialize writes.

Pull Request resolved: https://github.com/react/react-native/pull/58201

Test Plan:
- Exact temporary localhost Boost server harness on untouched main: `Operation canceled`, both expected frames missing, exit 1.
- Fixed source harness: received the pre-connect buffered payload and empty frame, exit 0.
- Actual source and harness compiled under C++20 with `-Wall -Werror`; only a local third-party Boost/Clang deprecation was demoted.
- Repository clang-format and `git diff --check` passed.
- Temporary harness/build wiring was removed; this PR contains one runtime file only.

No UI change; screenshots are not applicable.

Reviewed By: cortinico

Differential Revision: D118266757

Pulled By: javache

fbshipit-source-id: 2881893bdcb4c6873087e5cd821a82af76e8bbb8
This commit is contained in:
Oskar Eichler authored and meta-codesync[bot] committed 2026-09-02 03:37:01 -07:00
1 parent 619c8aed24
commit 92cd588a5c
1 file changed
+14 -15
@@ -53,6 +53,7 @@ struct WebSocketClient::Impl final : public std::enable_shared_from_this<Impl> {
std::mutex mutexOut_;
std::queue<std::string> messagesOut_;
std::atomic<bool> isWriting_{false};
std::atomic<bool> isConnected_{false};
std::atomic<bool> isClosing_{false};
};
@@ -215,6 +216,7 @@ void WebSocketClient::Impl::onHandshakeCompleted(boost::system::error_code ec) {
return;
}
isConnected_ = true;
onConnectCallback(true, "Connected");
// Listen for any messages from the server
@@ -252,26 +254,22 @@ void WebSocketClient::Impl::listen() {
}
void WebSocketClient::Impl::write() {
if (isClosing_) {
if (isClosing_ || !isConnected_) {
return;
}
if (isWriting_) {
if (isWriting_.exchange(true)) {
return;
}
isWriting_ = true;
std::shared_ptr<std::string> message;
{
std::lock_guard<std::mutex> lock(mutexOut_);
if (!messagesOut_.empty()) {
message = std::make_shared<std::string>(messagesOut_.front());
messagesOut_.pop();
if (messagesOut_.empty()) {
isWriting_ = false;
return;
}
}
if (!message || message->empty()) {
isWriting_ = false;
return;
message = std::make_shared<std::string>(messagesOut_.front());
messagesOut_.pop();
}
auto ws = ws_.wlock();
@@ -281,16 +279,17 @@ void WebSocketClient::Impl::write() {
boost::beast::error_code ec,
std::size_t /*bytes_transferred*/) mutable {
auto impl = weakImpl.lock();
if (!impl || impl->isClosing_) {
if (!impl) {
return;
}
impl->isWriting_ = false;
if (impl->isClosing_) {
return;
}
if (ec) {
LOG(ERROR) << "Error writing to websocket: " << ec.message();
return;
}
impl->isWriting_ = false;
impl->write();
message.reset(); // Release the message after it's been sent
});
}