diff --git a/Libraries/LibRequests/CMakeLists.txt b/Libraries/LibRequests/CMakeLists.txt index 65f71ca4230..8af8e17eb0f 100644 --- a/Libraries/LibRequests/CMakeLists.txt +++ b/Libraries/LibRequests/CMakeLists.txt @@ -1,5 +1,5 @@ set(SOURCES - NetworkErrorEnum.h + NetworkError.h Request.cpp RequestClient.cpp WebSocket.cpp diff --git a/Libraries/LibRequests/NetworkError.h b/Libraries/LibRequests/NetworkError.h new file mode 100644 index 00000000000..fe972b152f4 --- /dev/null +++ b/Libraries/LibRequests/NetworkError.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2024, the Ladybird developers. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace Requests { + +enum class NetworkError { + UnableToResolveProxy, + UnableToResolveHost, + UnableToConnect, + TimeoutReached, + TooManyRedirects, + SSLHandshakeFailed, + SSLVerificationFailed, + MalformedUrl, + Unknown +}; + +constexpr StringView network_error_to_string(NetworkError network_error) +{ + switch (network_error) { + case NetworkError::UnableToResolveProxy: + return "Unable to resolve proxy"sv; + case NetworkError::UnableToResolveHost: + return "Unable to resolve host"sv; + case NetworkError::UnableToConnect: + return "Unable to connect"sv; + case NetworkError::TimeoutReached: + return "Timeout reached"sv; + case NetworkError::TooManyRedirects: + return "Too many redirects"sv; + case NetworkError::SSLHandshakeFailed: + return "SSL handshake failed"sv; + case NetworkError::SSLVerificationFailed: + return "SSL verification failed"sv; + case NetworkError::MalformedUrl: + return "The URL is not formatted properly"sv; + case NetworkError::Unknown: + return "An unexpected network error occurred"sv; + } + + VERIFY_NOT_REACHED(); +} + +} diff --git a/Libraries/LibRequests/NetworkErrorEnum.h b/Libraries/LibRequests/NetworkErrorEnum.h deleted file mode 100644 index 745c9655638..00000000000 --- a/Libraries/LibRequests/NetworkErrorEnum.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2024, the Ladybird developers. - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -namespace Requests { - -enum class NetworkError { - UnableToResolveProxy, - UnableToResolveHost, - UnableToConnect, - TimeoutReached, - TooManyRedirects, - SSLHandshakeFailed, - SSLVerificationFailed, - MalformedUrl, - Unknown -}; - -} diff --git a/Libraries/LibRequests/Request.h b/Libraries/LibRequests/Request.h index 8e0808049cc..934bc993aec 100644 --- a/Libraries/LibRequests/Request.h +++ b/Libraries/LibRequests/Request.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include namespace Requests { diff --git a/Libraries/LibWeb/Loader/ResourceLoader.cpp b/Libraries/LibWeb/Loader/ResourceLoader.cpp index 32067e2b057..08fd211fb67 100644 --- a/Libraries/LibWeb/Loader/ResourceLoader.cpp +++ b/Libraries/LibWeb/Loader/ResourceLoader.cpp @@ -182,30 +182,6 @@ static void log_filtered_request(LoadRequest const& request) dbgln("ResourceLoader: Filtered request to: \"{}\"", url_for_logging); } -static StringView network_error_to_string_view(Requests::NetworkError const& network_error) -{ - switch (network_error) { - case Requests::NetworkError::UnableToResolveProxy: - return "Unable to resolve proxy"sv; - case Requests::NetworkError::UnableToResolveHost: - return "Unable to resolve host"sv; - case Requests::NetworkError::UnableToConnect: - return "Unable to connect"sv; - case Requests::NetworkError::TimeoutReached: - return "Timeout reached"sv; - case Requests::NetworkError::TooManyRedirects: - return "Too many redirects"sv; - case Requests::NetworkError::SSLHandshakeFailed: - return "SSL handshake failed"sv; - case Requests::NetworkError::SSLVerificationFailed: - return "SSL verification failed"sv; - case Requests::NetworkError::MalformedUrl: - return "The URL is not formatted properly"sv; - default: - return "An unexpected network error occurred"sv; - } -} - static bool should_block_request(LoadRequest const& request) { auto const& url = request.url(); @@ -462,7 +438,7 @@ void ResourceLoader::load(LoadRequest& request, GC::Root succes if (network_error.has_value() || (status_code.has_value() && *status_code >= 400 && *status_code <= 599 && (payload.is_empty() || !request.is_main_resource()))) { StringBuilder error_builder; if (network_error.has_value()) - error_builder.appendff("{}", network_error_to_string_view(*network_error)); + error_builder.appendff("{}", Requests::network_error_to_string(*network_error)); else error_builder.append("Load failed"sv); diff --git a/Services/RequestServer/ConnectionFromClient.cpp b/Services/RequestServer/ConnectionFromClient.cpp index 235c83b3c7a..5525f970bd5 100644 --- a/Services/RequestServer/ConnectionFromClient.cpp +++ b/Services/RequestServer/ConnectionFromClient.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Services/RequestServer/RequestClient.ipc b/Services/RequestServer/RequestClient.ipc index a214cbecebc..12d39bd0551 100644 --- a/Services/RequestServer/RequestClient.ipc +++ b/Services/RequestServer/RequestClient.ipc @@ -1,5 +1,5 @@ #include -#include +#include #include #include