RequestServer+LibWebSocket: Drain underlying socket and resulting frames

`curl_easy_recv` must be called in a loop until it returns EAGAIN,
because it may cache data, but only activate the read notifier once.

Additionally, the data received can contain multiple WebSocket frames
and only activate the notifier once, so we have to keep reading frames
until there isn't enough data.

We also have to do this immediately after connecting a WebSocket,
since the server may immediately send data when the WebSocket opens
and before we create the read notifier.

This makes Discord login faster and more reliable, and makes Discord
activities start loading.
This commit is contained in:
Luke Wilde 2025-07-22 11:53:21 +01:00 committed by Jelle Raaijmakers
commit 9c5dff5be0
Notes: github-actions[bot] 2025-07-22 11:57:12 +00:00
4 changed files with 63 additions and 29 deletions

View file

@ -151,7 +151,10 @@ void WebSocket::drain_read()
}
auto bytes = result.release_value();
m_buffered_data.append(bytes.data(), bytes.size());
read_frame();
do {
if (auto maybe_error = read_frame(); maybe_error.is_error())
break;
} while (!m_buffered_data.is_empty());
} break;
case InternalState::Closed:
case InternalState::Errored: {
@ -388,7 +391,7 @@ void WebSocket::read_server_handshake()
// If needed, we will keep reading the header on the next drain_read call
}
void WebSocket::read_frame()
ErrorOr<void> WebSocket::read_frame()
{
VERIFY(m_impl);
VERIFY(m_state == WebSocket::InternalState::Open || m_state == WebSocket::InternalState::Closing);
@ -408,7 +411,7 @@ void WebSocket::read_frame()
set_state(WebSocket::InternalState::Closed);
notify_close(m_last_close_code, m_last_close_message, true);
discard_connection();
return;
return AK::Error::from_errno(ECONNABORTED);
}
auto op_code = (WebSocket::OpCode)(head_bytes[0] & 0x0f);
@ -422,7 +425,7 @@ void WebSocket::read_frame()
// A code of 127 means that the next 8 bytes contains the payload length
auto actual_bytes = get_buffered_bytes(8);
if (actual_bytes.is_null())
return;
return AK::Error::from_errno(EAGAIN);
u64 full_payload_length = (u64)((u64)(actual_bytes[0] & 0xff) << 56)
| (u64)((u64)(actual_bytes[1] & 0xff) << 48)
| (u64)((u64)(actual_bytes[2] & 0xff) << 40)
@ -437,7 +440,7 @@ void WebSocket::read_frame()
// A code of 126 means that the next 2 bytes contains the payload length
auto actual_bytes = get_buffered_bytes(2);
if (actual_bytes.is_null())
return;
return AK::Error::from_errno(EAGAIN);
payload_length = (size_t)((size_t)(actual_bytes[0] & 0xff) << 8)
| (size_t)((size_t)(actual_bytes[1] & 0xff) << 0);
} else {
@ -454,7 +457,7 @@ void WebSocket::read_frame()
if (is_masked) {
auto masking_key_data = get_buffered_bytes(4);
if (masking_key_data.is_null())
return;
return AK::Error::from_errno(EAGAIN);
masking_key[0] = masking_key_data[0];
masking_key[1] = masking_key_data[1];
masking_key[2] = masking_key_data[2];
@ -466,7 +469,7 @@ void WebSocket::read_frame()
while (read_length < payload_length) {
auto payload_part = get_buffered_bytes(payload_length - read_length);
if (payload_part.is_null())
return;
return AK::Error::from_errno(EAGAIN);
// We read at most "actual_length - read" bytes, so this is safe to do.
payload.overwrite(read_length, payload_part.data(), payload_part.size());
read_length += payload_part.size();
@ -496,16 +499,16 @@ void WebSocket::read_frame()
m_last_close_message = {};
}
close(m_last_close_code, m_last_close_message);
return;
return {};
}
if (op_code == WebSocket::OpCode::Ping) {
// Immediately send a pong frame as a reply, with the given payload.
send_frame(WebSocket::OpCode::Pong, payload, true);
return;
return {};
}
if (op_code == WebSocket::OpCode::Pong) {
// We can safely ignore the pong
return;
return {};
}
if (!is_final_frame) {
if (op_code != WebSocket::OpCode::Continuation) {
@ -514,7 +517,7 @@ void WebSocket::read_frame()
}
// First and next fragmented message
m_fragmented_data_buffer.append(payload.data(), payload_length);
return;
return {};
}
if (is_final_frame && op_code == WebSocket::OpCode::Continuation) {
// Last fragmented message
@ -526,13 +529,14 @@ void WebSocket::read_frame()
}
if (op_code == WebSocket::OpCode::Text) {
notify_message(Message(move(payload), true));
return;
return {};
}
if (op_code == WebSocket::OpCode::Binary) {
notify_message(Message(move(payload), false));
return;
return {};
}
dbgln("Websocket: Found unknown opcode {}", (u8)op_code);
return {};
}
void WebSocket::send_frame(WebSocket::OpCode op_code, ReadonlyBytes payload, bool is_final)