dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibWeb: Surface websocket startup failures to JS

Browse source 
If establish_web_socket_connection() fails before a Requests::WebSocket
object exists, the DOM WebSocket used to ignore that error and remain
silently stuck with no message, error, or close events.

Dispatch error and close in that setup-failure path so callers see a
terminal websocket state instead of hanging until the harness timeout.
This commit is contained in:
Sam Atkins 2026-04-17 16:32:00 +01:00 committed by Shannon Booth
parent c880a34541
commit 94a98f5191
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibWeb/WebSockets/WebSocket.cpp
View file

@ -106,8 +106,13 @@ WebIDL::ExceptionOr<GC::Ref<WebSocket>> WebSocket::construct_impl(JS::Realm& rea
Platform::EventLoopPlugin::the().deferred_invoke(GC::create_function(vm.heap(), [web_socket, url_record, protocols_sequence = move(protocols_sequence)]() {
auto& client = HTML::relevant_settings_object(*web_socket);
// 1. Establish a WebSocket connection given urlRecord, protocols, and client. [FETCH]
(void)web_socket->establish_web_socket_connection(*url_record, protocols_sequence, client);
// 1. Establish a WebSocket connection given urlRecord, protocols, and client. [FETCH]
// AD-HOC: We don't yet implement this method to spec, so it's possible for the connection to fail before we
// make a Requests::WebSocket. If so, we need to manually error and close it.
if (web_socket->establish_web_socket_connection(*url_record, protocols_sequence, client).is_error()) {
web_socket->on_error();
web_socket->on_close(to_underlying(::WebSocket::CloseStatusCode::AbnormalClosure), String {}, false);
}
}));
return web_socket;
@ -194,6 +199,7 @@ bool WebSocket::must_survive_garbage_collection() const
ErrorOr<void> WebSocket::establish_web_socket_connection(URL::URL const& url_record, Vector<String> const& protocols, HTML::EnvironmentSettingsObject& client)
{
// FIXME: Integrate properly with FETCH as per https://fetch.spec.whatwg.org/#websocket-opening-handshake
// That means following https://websockets.spec.whatwg.org/#concept-websocket-establish
auto& window_or_worker = as<HTML::WindowOrWorkerGlobalScopeMixin>(client.global_object());
auto origin_string = window_or_worker.origin().to_byte_string();