Hide libcurl internally instead of wrapping

include/powerloader/context.hpp

@@ -7,6 +7,7 @@
 #include <chrono>
 #include <map>
 #include <filesystem>
+#include <optional>
 
 #include <powerloader/export.hpp>
 #include <powerloader/mirrorid.hpp>

include/powerloader/curl.hpp

@@ -1,15 +1,9 @@
 #ifndef POWERLOADER_CURL_HPP
 #define POWERLOADER_CURL_HPP
 
-#include <filesystem>
-#include <functional>
 #include <map>
-#include <sstream>
-#include <string>
-#include <vector>
 #include <optional>
 
-#include <fmt/core.h>
 #include <nlohmann/json.hpp>
 #include <tl/expected.hpp>
 
@@ -18,15 +12,9 @@ extern "C"
 #include <curl/curl.h>
 }
 
-#include <powerloader/export.hpp>
-#include <powerloader/utils.hpp>
-#include <powerloader/enums.hpp>
-
 namespace powerloader
 {
-    class Context;
     class CURLHandle;
-    using proxy_map_type = std::map<std::string, std::string>;
 
     enum class ssl_backend_t
     {
@@ -46,22 +34,11 @@ namespace powerloader
         rustls = CURLSSLBACKEND_RUSTLS,
     };
 
-    class POWERLOADER_API curl_error : public std::runtime_error
-    {
-    public:
-        curl_error(const std::string& what = "download error", bool serious = false);
-        bool is_serious() const;
-
-    private:
-        bool m_serious;
-    };
-
+    // This is supposed to be used outside powerloader
     struct POWERLOADER_API Response
     {
         std::map<std::string, std::string> headers;
 
-        curl_off_t average_speed = -1;
-        curl_off_t downloaded_size = -1;
         long http_status = 0;
         std::string effective_url;
 
@@ -75,89 +52,12 @@ namespace powerloader
         // `h.perform() method)
         std::optional<std::string> content;
         nlohmann::json json() const;
-    };
-
-    // TODO: rename this, try to not expose it
-    POWERLOADER_API CURL* get_handle(const Context& ctx);
-
-    class POWERLOADER_API CURLHandle
-    {
-    public:
-        using end_callback_type = std::function<CbReturnCode(const Response&)>;
-        explicit CURLHandle(const Context& ctx);
-        CURLHandle(const Context& ctx, const std::string& url);
-        ~CURLHandle();
-
-        CURLHandle& url(const std::string& url, const proxy_map_type& proxies);
-        CURLHandle& accept_encoding();
-        CURLHandle& user_agent(const std::string& user_agent);
-
-        Response perform();
-        void finalize_transfer();
-        // TODO: should be private?
-        void finalize_transfer(Response& response);
-
-        template <class T>
-        tl::expected<T, CURLcode> getinfo(CURLINFO option);
-
-        // TODO: why do we need to expose these three methods
-        CURL* handle();
-        operator CURL*();  // TODO: consider making this `explicit` or remove it
-        CURL* ptr() const;
-
-        CURLHandle& add_header(const std::string& header);
-        CURLHandle& add_headers(const std::vector<std::string>& headers);
-        CURLHandle& reset_headers();
-
-        template <class T>
-        CURLHandle& setopt(CURLoption opt, const T& val);
-
-        void set_default_callbacks();
-        CURLHandle& set_end_callback(end_callback_type func);
-
-        CURLHandle& upload(std::ifstream& stream);
-        CURLHandle& upload(std::istringstream& stream);
-
-        CURLHandle(CURLHandle&& rhs);
-        CURLHandle& operator=(CURLHandle&& rhs);
 
     private:
-        void init_handle(const Context& ctx);
-
-        CURL* m_handle;
-        curl_slist* p_headers = nullptr;
-        char errorbuffer[CURL_ERROR_SIZE];
-
-        std::unique_ptr<Response> response;
-        end_callback_type end_callback;
+        curl_off_t average_speed = -1;
+        curl_off_t downloaded_size = -1;
     };
 
-    // TODO: restrict the possible implementations in the cpp file
-    template <class T>
-    CURLHandle& CURLHandle::setopt(CURLoption opt, const T& val)
-    {
-        CURLcode ok;
-        if constexpr (std::is_same<T, std::string>())
-        {
-            ok = curl_easy_setopt(m_handle, opt, val.c_str());
-        }
-        else if constexpr (std::is_same<T, bool>())
-        {
-            ok = curl_easy_setopt(m_handle, opt, val ? 1L : 0L);
-        }
-        else
-        {
-            ok = curl_easy_setopt(m_handle, opt, val);
-        }
-        if (ok != CURLE_OK)
-        {
-            throw curl_error(
-                fmt::format("curl: curl_easy_setopt failed {}", curl_easy_strerror(ok)));
-        }
-        return *this;
-    }
-
-    std::optional<std::string> proxy_match(const proxy_map_type& ctx, const std::string& url);
 }
 
 #endif

include/powerloader/download_target.hpp

@@ -6,14 +6,12 @@
 #include <powerloader/export.hpp>
 #include <powerloader/enums.hpp>
 #include <powerloader/url.hpp>
-#include <powerloader/curl.hpp>
 #include <powerloader/mirror.hpp>
 #include <powerloader/fileio.hpp>
 #include <powerloader/errors.hpp>
 
 namespace powerloader
 {
-
     struct zck_target;
 
     struct POWERLOADER_API CacheControl
@@ -80,8 +78,8 @@ namespace powerloader
             m_error = std::move(err);
         }
 
-        /// Returns a DownloadError if there was a falure at download or none if no error was set so
-        /// far.
+        /// Returns a DownloadError if there was a failure at download or none if no error was set
+        /// so far.
         std::optional<DownloaderError> get_error() const noexcept
         {
             return m_error;

include/powerloader/downloader.hpp

@@ -21,7 +21,6 @@ extern "C"
 
 #include <powerloader/export.hpp>
 #include <powerloader/context.hpp>
-#include <powerloader/curl.hpp>
 #include <powerloader/download_target.hpp>
 #include <powerloader/enums.hpp>
 #include <powerloader/mirror.hpp>

include/powerloader/mirror.hpp

@@ -7,7 +7,6 @@
 
 #include <powerloader/export.hpp>
 #include <powerloader/context.hpp>
-#include <powerloader/curl.hpp>
 #include <powerloader/enums.hpp>
 #include <powerloader/utils.hpp>
 #include <powerloader/mirrorid.hpp>
@@ -16,6 +15,7 @@ namespace powerloader
 {
     class Target;
     class Context;
+    class CURLHandle;
 
     enum class MirrorState
     {

include/powerloader/mirrors/oci.hpp

@@ -3,6 +3,7 @@
 
 #include <optional>
 #include <fmt/core.h>
+#include <nlohmann/json.hpp>
 
 #include <powerloader/export.hpp>
 #include <powerloader/mirror.hpp>

include/powerloader/mirrors/s3.hpp

@@ -9,7 +9,6 @@
 
 namespace powerloader
 {
-
     class Target;
 
     struct POWERLOADER_API S3CanonicalRequest

include/powerloader/url.hpp

@@ -19,27 +19,6 @@ extern "C"
 
 #include <powerloader/export.hpp>
 
-// typedef enum {
-//   CURLUE_OK,
-//   CURLUE_BAD_HANDLE,          /* 1 */
-//   CURLUE_BAD_PARTPOINTER,     /* 2 */
-//   CURLUE_MALFORMED_INPUT,     /* 3 */
-//   CURLUE_BAD_PORT_NUMBER,     /* 4 */
-//   CURLUE_UNSUPPORTED_SCHEME,  /* 5 */
-//   CURLUE_URLDECODE,           /* 6 */
-//   CURLUE_OUT_OF_MEMORY,       /* 7 */
-//   CURLUE_USER_NOT_ALLOWED,    /* 8 */
-//   CURLUE_UNKNOWN_PART,        /* 9 */
-//   CURLUE_NO_SCHEME,           /* 10 */
-//   CURLUE_NO_USER,             /* 11 */
-//   CURLUE_NO_PASSWORD,         /* 12 */
-//   CURLUE_NO_OPTIONS,          /* 13 */
-//   CURLUE_NO_HOST,             /* 14 */
-//   CURLUE_NO_PORT,             /* 15 */
-//   CURLUE_NO_QUERY,            /* 16 */
-//   CURLUE_NO_FRAGMENT          /* 17 */
-// } CURLUcode;
-
 namespace powerloader
 {
     POWERLOADER_API bool has_scheme(const std::string& url);
@@ -135,11 +114,6 @@ namespace powerloader
         }
     }  // namespace detail
 
-    inline std::string join_url()
-    {
-        return "";
-    }
-
     template <class S, class... Args>
     inline std::string join_url(const S& s, const Args&... args)
     {

src/curl.cpp

@@ -3,7 +3,6 @@
 #include <sstream>
 #include <spdlog/spdlog.h>
 
-#include <powerloader/curl.hpp>
 #include <powerloader/utils.hpp>
 #include <powerloader/context.hpp>
 #include <powerloader/url.hpp>
@@ -230,16 +229,6 @@ namespace powerloader
         return m_handle;
     }
 
-    CURLHandle::operator CURL*()
-    {
-        return handle();
-    }
-
-    CURL* CURLHandle::ptr() const
-    {
-        return m_handle;
-    }
-
     CURLHandle& CURLHandle::add_header(const std::string& header)
     {
         p_headers = curl_slist_append(p_headers, header.c_str());

src/curl_internal.hpp

@@ -1,10 +1,110 @@
 #ifndef POWERLOADER_SRC_CURL_INTERNAL_HPP
 #define POWERLOADER_SRC_CURL_INTERNAL_HPP
 
-#include <optional>
+#include <sstream>
+#include <string>
+#include <vector>
 
+#include <fmt/core.h>
+
+#include <powerloader/export.hpp>
+#include <powerloader/utils.hpp>
+#include <powerloader/enums.hpp>
 #include <powerloader/curl.hpp>
 
+namespace powerloader
+{
+    class Context;
+    using proxy_map_type = std::map<std::string, std::string>;
+
+    // If needed, this can be moved to curl.hpp
+    class POWERLOADER_API curl_error : public std::runtime_error
+    {
+    public:
+        curl_error(const std::string& what = "download error", bool serious = false);
+        bool is_serious() const;
+
+    private:
+        bool m_serious;
+    };
+
+    class POWERLOADER_API CURLHandle
+    {
+    public:
+        using end_callback_type = std::function<CbReturnCode(const Response&)>;
+        explicit CURLHandle(const Context& ctx);
+        CURLHandle(const Context& ctx, const std::string& url);
+        ~CURLHandle();
+
+        CURLHandle& url(const std::string& url, const proxy_map_type& proxies);
+        CURLHandle& accept_encoding();
+        CURLHandle& user_agent(const std::string& user_agent);
+
+        Response perform();
+        void finalize_transfer();
+
+        template <class T>
+        tl::expected<T, CURLcode> getinfo(CURLINFO option);
+
+        // This is made public because it is used internally in quite some files
+        CURL* handle();
+
+        CURLHandle& add_header(const std::string& header);
+        CURLHandle& add_headers(const std::vector<std::string>& headers);
+        CURLHandle& reset_headers();
+
+        template <class T>
+        CURLHandle& setopt(CURLoption opt, const T& val);
+
+        void set_default_callbacks();
+        CURLHandle& set_end_callback(end_callback_type func);
+
+        CURLHandle& upload(std::ifstream& stream);
+        CURLHandle& upload(std::istringstream& stream);
+
+        CURLHandle(CURLHandle&& rhs);
+        CURLHandle& operator=(CURLHandle&& rhs);
+
+    private:
+        void init_handle(const Context& ctx);
+        void finalize_transfer(Response& response);
+
+        CURL* m_handle;
+        curl_slist* p_headers = nullptr;
+        char errorbuffer[CURL_ERROR_SIZE];
+
+        std::unique_ptr<Response> response;
+        end_callback_type end_callback;
+    };
+
+    // TODO: restrict the possible implementations in the cpp file
+    template <class T>
+    CURLHandle& CURLHandle::setopt(CURLoption opt, const T& val)
+    {
+        CURLcode ok;
+        if constexpr (std::is_same<T, std::string>())
+        {
+            ok = curl_easy_setopt(m_handle, opt, val.c_str());
+        }
+        else if constexpr (std::is_same<T, bool>())
+        {
+            ok = curl_easy_setopt(m_handle, opt, val ? 1L : 0L);
+        }
+        else
+        {
+            ok = curl_easy_setopt(m_handle, opt, val);
+        }
+        if (ok != CURLE_OK)
+        {
+            throw curl_error(
+                fmt::format("curl: curl_easy_setopt failed {}", curl_easy_strerror(ok)));
+        }
+        return *this;
+    }
+
+    std::optional<std::string> proxy_match(const proxy_map_type& ctx, const std::string& url);
+}
+
 namespace powerloader::details
 {
     // Scoped initialization and termination of CURL.