RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 03:37:43 +00:00
Code Issues Activity Actions

LibWeb: Add timeout functionality to ResourceLoader

Browse source 
Add timeout functionality to ResourceLoader and use it from
XMLHttpRequest.
This commit is contained in:
Kenneth Myhra 2022-04-27 21:28:59 +02:00 • committed by Linus Groh
parent 8b42c05648
commit c805987329
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
View file

@ -137,10 +137,17 @@ static void emit_signpost(String const& message, int id)
static size_t resource_id = 0; static size_t resource_id = 0;
void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback) void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback, Optional<u32> timeout)
{ {
auto& url = request.url(); auto& url = request.url();
request.start_timer(); request.start_timer();
RefPtr<ResourceLoaderConnectorRequest> protocol_request;
if (timeout.has_value() && timeout.value() > 0) {
m_timer = Core::Timer::create_single_shot(timeout.value(), [&protocol_request] {
protocol_request->stop();
});
m_timer->start();
}
auto id = resource_id++; auto id = resource_id++;
auto url_for_logging = sanitized_url_for_logging(url); auto url_for_logging = sanitized_url_for_logging(url);
@ -241,7 +248,7 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, Has
headers.set(it.key, it.value); headers.set(it.key, it.value);
} }
auto protocol_request = m_connector->start_request(request.method(), url, headers, request.body(), proxy); protocol_request = m_connector->start_request(request.method(), url, headers, request.body(), proxy);
if (!protocol_request) { if (!protocol_request) {
auto start_request_failure_msg = "Failed to initiate load"sv; auto start_request_failure_msg = "Failed to initiate load"sv;
log_failure(request, start_request_failure_msg); log_failure(request, start_request_failure_msg);
@ -250,6 +257,7 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, Has
return; return;
} }
m_active_requests.set(*protocol_request); m_active_requests.set(*protocol_request);
protocol_request->on_buffered_request_finish = [this, success_callback = move(success_callback), error_callback = move(error_callback), log_success, log_failure, request, &protocol_request = *protocol_request](bool success, auto, auto& response_headers, auto status_code, ReadonlyBytes payload) { protocol_request->on_buffered_request_finish = [this, success_callback = move(success_callback), error_callback = move(error_callback), log_success, log_failure, request, &protocol_request = *protocol_request](bool success, auto, auto& response_headers, auto status_code, ReadonlyBytes payload) {
--m_pending_loads; --m_pending_loads;
if (on_load_counter_change) if (on_load_counter_change)
@ -287,11 +295,11 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, Has
error_callback(not_implemented_error, {}); error_callback(not_implemented_error, {});
} }
void ResourceLoader::load(const AK::URL& url, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback) void ResourceLoader::load(const AK::URL& url, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback, Optional<u32> timeout)
{ {
LoadRequest request; LoadRequest request;
request.set_url(url); request.set_url(url);
load(request, move(success_callback), move(error_callback)); load(request, move(success_callback), move(error_callback), timeout);
} }
bool ResourceLoader::is_port_blocked(int port) bool ResourceLoader::is_port_blocked(int port)

6
Userland/Libraries/LibWeb/Loader/ResourceLoader.h
View file

@ -13,6 +13,7 @@
#include <AK/URL.h> #include <AK/URL.h>
#include <LibCore/Object.h> #include <LibCore/Object.h>
#include <LibCore/Proxy.h> #include <LibCore/Proxy.h>
#include <LibCore/Timer.h>
#include <LibWeb/Loader/Resource.h> #include <LibWeb/Loader/Resource.h>
namespace Web { namespace Web {
@ -69,8 +70,8 @@ public:
RefPtr<Resource> load_resource(Resource::Type, LoadRequest&); RefPtr<Resource> load_resource(Resource::Type, LoadRequest&);
void load(LoadRequest&, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback = nullptr); void load(LoadRequest&, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback = nullptr, Optional<u32> timeout = {});
void load(const AK::URL&, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback = nullptr); void load(const AK::URL&, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback = nullptr, Optional<u32> timeout = {});
ResourceLoaderConnector& connector() { return *m_connector; } ResourceLoaderConnector& connector() { return *m_connector; }
@ -98,6 +99,7 @@ private:
HashTable<NonnullRefPtr<ResourceLoaderConnectorRequest>> m_active_requests; HashTable<NonnullRefPtr<ResourceLoaderConnectorRequest>> m_active_requests;
NonnullRefPtr<ResourceLoaderConnector> m_connector; NonnullRefPtr<ResourceLoaderConnector> m_connector;
String m_user_agent; String m_user_agent;
RefPtr<Core::Timer> m_timer;
}; };
} }

3
Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp
View file

@ -637,7 +637,8 @@ DOM::ExceptionOr<void> XMLHttpRequest::send(String body)
xhr.set_ready_state(ReadyState::Done); xhr.set_ready_state(ReadyState::Done);
xhr.set_status(status_code.value_or(0)); xhr.set_status(status_code.value_or(0));
xhr.dispatch_event(DOM::Event::create(HTML::EventNames::error)); xhr.dispatch_event(DOM::Event::create(HTML::EventNames::error));
}); },
m_timeout);
} else { } else {
TODO(); TODO();
} }