Begin moving http to a helper class.

little-bear-labs · Jan 31, 2024 · 33700c6 · 33700c6
1 parent bd479a7
commit 33700c6
Show file tree

Hide file tree

Showing 17 changed files with 398 additions and 1,194 deletions.
diff --git a/cmake/setup.cmake b/cmake/setup.cmake
@@ -102,6 +102,7 @@ function(with_vocab target)
         target_link_libraries(${target}
             PUBLIC
                 OpenSSL::Crypto
+                OpenSSL::SSL
         )
     endif()
     find_package(nlohmann_json)

diff --git a/component/block_http_request.h b/component/block_http_request.h
@@ -3,7 +3,7 @@
 
 #include <ipfs_client/gw/gateway_request.h>
 
-#include <ipfs_client/context_api.h>
+#include <ipfs_client/ctx/http_api.h>
 #include <vocab/raw_ptr.h>
 
 namespace network {
@@ -23,7 +23,7 @@ class BlockHttpRequest : public std::enable_shared_from_this<BlockHttpRequest> {
   std::unique_ptr<network::SimpleURLLoader> loader_;
 
  public:
-  using HttpCompleteCallback = ipfs::ContextApi::HttpCompleteCallback;
+  using HttpCompleteCallback = ctx::HttpApi::HttpCompleteCallback;
   BlockHttpRequest(ipfs::HttpRequestDescription, HttpCompleteCallback);
   ~BlockHttpRequest() noexcept;
 
@@ -33,7 +33,7 @@ class BlockHttpRequest : public std::enable_shared_from_this<BlockHttpRequest> {
   ipfs::HttpRequestDescription const inf_;
   HttpCompleteCallback callback_;
   std::string status_line_;
-  ContextApi::HeaderAccess header_accessor_ = [](auto) {
+  ctx::HttpApi::HeaderAccess header_accessor_ = [](auto) {
     return std::string{};
   };
 

diff --git a/component/chromium_http.cc b/component/chromium_http.cc
@@ -0,0 +1,14 @@
+#include "chromium_http.h"
+
+#include "block_http_request.h"
+
+using Self = ipfs::ChromiumHttp;
+
+Self::ChromiumHttp(network::mojom::URLLoaderFactory& lf)
+    : loader_factory_{&lf} {}
+
+void Self::SendHttpRequest(ipfs::ctx::HttpApi::HttpRequestDescription desc,
+                           ipfs::ctx::HttpApi::HttpCompleteCallback cb) const {
+  auto ptr = std::make_shared<BlockHttpRequest>(desc, cb);
+  ptr->send(loader_factory_);
+}
diff --git a/component/chromium_http.h b/component/chromium_http.h
@@ -0,0 +1,23 @@
+#ifndef IPFS_CHROMIUM_CHROMIUM_HTTP_H
+#define IPFS_CHROMIUM_CHROMIUM_HTTP_H
+
+#include <ipfs_client/ctx/http_api.h>
+
+#include <vocab/raw_ptr.h>
+
+namespace network::mojom {
+class URLLoaderFactory;
+}  // namespace network::mojom
+
+namespace ipfs {
+class ChromiumHttp : public ctx::HttpApi {
+  raw_ptr<network::mojom::URLLoaderFactory> loader_factory_ = nullptr;
+
+ public:
+  void SendHttpRequest(HttpRequestDescription,
+                       HttpCompleteCallback cb) const override;
+  ChromiumHttp(network::mojom::URLLoaderFactory&);
+};
+}  // namespace ipfs
+
+#endif  // IPFS_CHROMIUM_CHROMIUM_HTTP_H
diff --git a/component/chromium_ipfs_context.cc b/component/chromium_ipfs_context.cc
@@ -2,9 +2,9 @@
 
 #include "block_http_request.h"
 #include "chromium_cbor_adapter.h"
+#include "chromium_http.h"
 #include "chromium_json_adapter.h"
 #include "inter_request_state.h"
-#include "ipfs_client/crypto_api.h"
 #include "preferences.h"
 
 #include <components/cbor/reader.h>
@@ -27,8 +27,8 @@
 
 using Self = ipfs::ChromiumIpfsContext;
 
-void Self::SetLoaderFactory(network::mojom::URLLoaderFactory& lf) {
-  loader_factory_ = &lf;
+void Self::SetupHttp(network::mojom::URLLoaderFactory& lf) {
+  http_api_ = std::make_unique<ChromiumHttp>(lf);
 }
 
 std::string Self::MimeType(std::string extension,
@@ -72,12 +72,6 @@ void Self::SendDnsTextRequest(std::string host,
   auto* nc = state_->network_context();
   dns_reqs_[host] = std::make_unique<DnsTxtRequest>(host, res, don_wrap, nc);
 }
-void Self::SendHttpRequest(HttpRequestDescription req_inf,
-                           HttpCompleteCallback cb) const {
-  DCHECK(loader_factory_);
-  auto ptr = std::make_shared<BlockHttpRequest>(req_inf, cb);
-  ptr->send(loader_factory_);
-}
 auto Self::ParseCbor(ipfs::ContextApi::ByteView bytes) const
     -> std::unique_ptr<DagCborValue> {
   cbor::Reader::Config cfg;

diff --git a/component/chromium_ipfs_context.h b/component/chromium_ipfs_context.h
@@ -29,7 +29,6 @@ class IpfsRequest;
 class NetworkRequestor;
 
 class ChromiumIpfsContext final : public ContextApi {
-  raw_ptr<network::mojom::URLLoaderFactory> loader_factory_ = nullptr;
   raw_ref<InterRequestState> state_;
   std::map<std::string, std::unique_ptr<DnsTxtRequest>> dns_reqs_;
   GatewayRates rates_;
@@ -41,8 +40,6 @@ class ChromiumIpfsContext final : public ContextApi {
   void SendDnsTextRequest(std::string,
                           DnsTextResultsCallback,
                           DnsTextCompleteCallback) override;
-  void SendHttpRequest(HttpRequestDescription req_inf,
-                       HttpCompleteCallback cb) const override;
 
   std::unique_ptr<DagCborValue> ParseCbor(ByteView) const override;
   std::unique_ptr<DagJsonValue> ParseJson(std::string_view) const override;
@@ -55,7 +52,7 @@ class ChromiumIpfsContext final : public ContextApi {
  public:
   ChromiumIpfsContext(InterRequestState&, PrefService* prefs);
   ~ChromiumIpfsContext() noexcept override;
-  void SetLoaderFactory(network::mojom::URLLoaderFactory&);
+  void SetupHttp(network::mojom::URLLoaderFactory&);
 };
 
 }  // namespace ipfs

diff --git a/component/ipfs_url_loader.cc b/component/ipfs_url_loader.cc
@@ -74,7 +74,7 @@ void ipfs::IpfsUrlLoader::StartRequest(
     auto path = resource_request.url.path();
     auto abs_path = "/" + ns + "/" + cid_str + path;
     me->root_ = cid_str;
-    me->api_->SetLoaderFactory(*(me->lower_loader_factory_));
+    me->api_->SetupHttp(*(me->lower_loader_factory_));
     auto whendone = [me](IpfsRequest const& req, ipfs::Response const& res) {
       VLOG(2) << "whendone(" << req.path().to_string() << ',' << res.status_
               << ',' << res.body_.size() << "B mime=" << res.mime_ << ')';