mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 06:07:34 +00:00
LibWeb: Abstract the LibProtocol ResourceLoader connection
This is the final component that required LibProtocol as a dependency of LibWeb. With this, we can now remove the dependency, and LibWeb no longer requires IPC to work :^)
This commit is contained in:
parent
2a359695c6
commit
c00ae53b66
10 changed files with 245 additions and 37 deletions
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
||||
* Copyright (c) 2022, Dex♪ <dexes.ttp@gmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
@ -7,15 +8,13 @@
|
|||
#pragma once
|
||||
|
||||
#include <AK/Function.h>
|
||||
#include <AK/HashMap.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/URL.h>
|
||||
#include <LibCore/Object.h>
|
||||
#include <LibCore/Proxy.h>
|
||||
#include <LibWeb/Loader/Resource.h>
|
||||
|
||||
namespace Protocol {
|
||||
class RequestClient;
|
||||
class Request;
|
||||
}
|
||||
|
||||
namespace Web {
|
||||
|
||||
#if ARCH(I386)
|
||||
|
@ -26,9 +25,46 @@ namespace Web {
|
|||
|
||||
constexpr auto default_user_agent = "Mozilla/5.0 (SerenityOS; " CPU_STRING ") LibWeb+LibJS/1.0 Browser/1.0";
|
||||
|
||||
class ResourceLoaderConnectorRequest : public RefCounted<ResourceLoaderConnectorRequest> {
|
||||
public:
|
||||
virtual ~ResourceLoaderConnectorRequest();
|
||||
|
||||
struct CertificateAndKey {
|
||||
String certificate;
|
||||
String key;
|
||||
};
|
||||
|
||||
virtual void set_should_buffer_all_input(bool) = 0;
|
||||
virtual bool stop() = 0;
|
||||
|
||||
virtual void stream_into(Core::Stream::Stream&) = 0;
|
||||
|
||||
Function<void(bool success, u32 total_size, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> response_code, ReadonlyBytes payload)> on_buffered_request_finish;
|
||||
Function<void(bool success, u32 total_size)> on_finish;
|
||||
Function<void(Optional<u32> total_size, u32 downloaded_size)> on_progress;
|
||||
Function<CertificateAndKey()> on_certificate_requested;
|
||||
|
||||
protected:
|
||||
explicit ResourceLoaderConnectorRequest();
|
||||
};
|
||||
|
||||
class ResourceLoaderConnector : public RefCounted<ResourceLoaderConnector> {
|
||||
public:
|
||||
virtual ~ResourceLoaderConnector();
|
||||
|
||||
virtual void prefetch_dns(AK::URL const&) = 0;
|
||||
virtual void preconnect(AK::URL const&) = 0;
|
||||
|
||||
virtual RefPtr<ResourceLoaderConnectorRequest> start_request(String const& method, AK::URL const&, HashMap<String, String> const& request_headers = {}, ReadonlyBytes request_body = {}, Core::ProxyData const& = {}) = 0;
|
||||
|
||||
protected:
|
||||
explicit ResourceLoaderConnector();
|
||||
};
|
||||
|
||||
class ResourceLoader : public Core::Object {
|
||||
C_OBJECT_ABSTRACT(ResourceLoader)
|
||||
public:
|
||||
static void initialize(RefPtr<ResourceLoaderConnector>);
|
||||
static ResourceLoader& the();
|
||||
|
||||
RefPtr<Resource> load_resource(Resource::Type, LoadRequest&);
|
||||
|
@ -36,6 +72,8 @@ public:
|
|||
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(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);
|
||||
|
||||
ResourceLoaderConnector& connector() { return *m_connector; }
|
||||
|
||||
void prefetch_dns(AK::URL const&);
|
||||
void preconnect(AK::URL const&);
|
||||
|
||||
|
@ -43,8 +81,6 @@ public:
|
|||
|
||||
int pending_loads() const { return m_pending_loads; }
|
||||
|
||||
Protocol::RequestClient& protocol_client() { return *m_protocol_client; }
|
||||
|
||||
String const& user_agent() const { return m_user_agent; }
|
||||
void set_user_agent(String const& user_agent) { m_user_agent = user_agent; }
|
||||
|
||||
|
@ -52,15 +88,15 @@ public:
|
|||
void evict_from_cache(LoadRequest const&);
|
||||
|
||||
private:
|
||||
ResourceLoader(NonnullRefPtr<Protocol::RequestClient> protocol_client);
|
||||
static ErrorOr<NonnullRefPtr<ResourceLoader>> try_create();
|
||||
ResourceLoader(NonnullRefPtr<ResourceLoaderConnector>);
|
||||
static ErrorOr<NonnullRefPtr<ResourceLoader>> try_create(NonnullRefPtr<ResourceLoaderConnector>);
|
||||
|
||||
static bool is_port_blocked(int port);
|
||||
|
||||
int m_pending_loads { 0 };
|
||||
|
||||
HashTable<NonnullRefPtr<Protocol::Request>> m_active_requests;
|
||||
RefPtr<Protocol::RequestClient> m_protocol_client;
|
||||
HashTable<NonnullRefPtr<ResourceLoaderConnectorRequest>> m_active_requests;
|
||||
NonnullRefPtr<ResourceLoaderConnector> m_connector;
|
||||
String m_user_agent;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue