feat: add curl / cpr (c++ curl wrapper) http backend

Author: Totto16

src/lobby/client.cpp

@@ -5,7 +5,13 @@
 
 #if defined(_OOPETRIS_ONLINE_USE_CURL)
 #include "./curl_client.hpp"
-#error "TODO"
+
+
+std::string oopetris::http::status_message([[maybe_unused]] int status) {
+    return "Not Available";
+}
+
+
 #else
 
 #include "./httplib_client.hpp"

src/lobby/curl_client.cpp

@@ -1,2 +1,132 @@
 
 #include "./curl_client.hpp"
+
+
+#define TRANSFORM_RESULT(result) std::make_unique<ActualResult>((result))
+
+
+oopetris::http::implementation::ActualResult::ActualResult(cpr::Response&& result) : m_result{ std::move(result) } { }
+
+oopetris::http::implementation::ActualResult::~ActualResult() = default;
+
+[[nodiscard]] std::optional<std::string> oopetris::http::implementation::ActualResult::get_header(const std::string& key
+) const {
+
+    if (not m_result.header.contains(key)) {
+        return std::nullopt;
+    }
+
+    return m_result.header.at(key);
+}
+
+[[nodiscard]] std::string oopetris::http::implementation::ActualResult::body() const {
+    return m_result.text;
+}
+
+[[nodiscard]] int oopetris::http::implementation::ActualResult::status() const {
+    return m_result.status_code;
+}
+
+[[nodiscard]] std::optional<std::string> oopetris::http::implementation::ActualResult::get_error() const {
+
+    if (static_cast<bool>(m_result.error) || m_result.status_code == 0) {
+        return m_result.error.message;
+    }
+
+    return std::nullopt;
+}
+
+
+namespace {
+    std::string normalize_url(const std::string& value) {
+        if (value.ends_with("/")) {
+            value.substr(0, value.size() - 1);
+        }
+
+        return value;
+    }
+} // namespace
+
+oopetris::http::implementation::ActualClient::ActualClient(ActualClient&& other) noexcept
+    : m_session{ std::move(other.m_session) } { }
+
+oopetris::http::implementation::ActualClient::~ActualClient() = default;
+
+oopetris::http::implementation::ActualClient::ActualClient(const std::string& api_url)
+    : m_session{},
+      m_base_url{ normalize_url(api_url) } {
+
+    m_session.SetUrl(cpr::Url{ api_url });
+    m_session.SetAcceptEncoding(cpr::AcceptEncoding{
+            { cpr::AcceptEncodingMethods::deflate, cpr::AcceptEncodingMethods::gzip,
+             cpr::AcceptEncodingMethods::zlib }
+    });
+    m_session.SetHeader(cpr::Header{
+            { "Accept", ::http::constants::json_content_type }
+    });
+}
+
+
+void oopetris::http::implementation::ActualClient::set_url(const std::string& url) {
+    m_session.SetUrl(cpr::Url{ m_base_url, url });
+}
+
+
+[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Get(
+        const std::string& url
+) {
+    set_url(url);
+    return TRANSFORM_RESULT(m_session.Get());
+}
+
+[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Delete(
+        const std::string& url
+) {
+    set_url(url);
+    return TRANSFORM_RESULT(m_session.Delete());
+}
+
+[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Post(
+        const std::string& url,
+        const std::optional<std::pair<std::string, std::string>>& payload
+) {
+
+    set_url(url);
+
+    if (not payload.has_value()) {
+        return TRANSFORM_RESULT(m_session.Post());
+    }
+
+    auto [content, content_type] = payload.value();
+
+    m_session.SetBody(cpr::Body{ content });
+
+    return TRANSFORM_RESULT(m_session.Post());
+}
+
+[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Put(
+        const std::string& url,
+        const std::optional<std::pair<std::string, std::string>>& payload
+) {
+    set_url(url);
+
+    if (not payload.has_value()) {
+        return TRANSFORM_RESULT(m_session.Put());
+    }
+
+    auto [content, content_type] = payload.value();
+
+    m_session.SetBody(cpr::Body{ content });
+
+    return TRANSFORM_RESULT(m_session.Put());
+}
+
+void oopetris::http::implementation::ActualClient::SetBearerAuth(const std::string& token) {
+
+
+#if CPR_LIBCURL_VERSION_NUM >= 0x073D00
+    m_session.SetBearer(token);
+#else
+    m_session.SetHeader(cpr::Header{ "Authorization", fmt::format("Bearer {}", token) });
+#endif
+}

src/lobby/curl_client.hpp

@@ -1,2 +1,68 @@
 
 #pragma once
+
+
+#include "./client.hpp"
+
+#include <cpr/cpr.h>
+
+namespace oopetris::http::implementation {
+
+    struct ActualResult : ::oopetris::http::Result {
+    private:
+        cpr::Response m_result;
+
+
+    public:
+        OOPETRIS_GRAPHICS_EXPORTED ActualResult(cpr::Response&& result);
+
+        OOPETRIS_GRAPHICS_EXPORTED ~ActualResult() override;
+
+        OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::optional<std::string> get_header(const std::string& key
+        ) const override;
+
+        OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::string body() const override;
+
+        OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] int status() const override;
+
+        OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::optional<std::string> get_error() const override;
+    };
+
+
+    struct ActualClient : ::oopetris::http::Client {
+    private:
+        cpr::Session m_session;
+        std::string m_base_url;
+
+        void set_url(const std::string& url);
+
+    public:
+        OOPETRIS_GRAPHICS_EXPORTED ActualClient(ActualClient&& other) noexcept;
+        OOPETRIS_GRAPHICS_EXPORTED ActualClient& operator=(ActualClient&& other) noexcept = delete;
+
+        OOPETRIS_GRAPHICS_EXPORTED ActualClient(const ActualClient& other) = delete;
+        OOPETRIS_GRAPHICS_EXPORTED ActualClient& operator=(const ActualClient& other) = delete;
+
+        OOPETRIS_GRAPHICS_EXPORTED ~ActualClient() override;
+
+        OOPETRIS_GRAPHICS_EXPORTED explicit ActualClient(const std::string& api_url);
+
+        OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::unique_ptr<Result> Get(const std::string& url) override;
+
+        OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::unique_ptr<Result> Delete(const std::string& url) override;
+
+        OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::unique_ptr<Result> Post(
+                const std::string& url,
+                const std::optional<std::pair<std::string, std::string>>& payload = std::nullopt
+        ) override;
+
+        OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::unique_ptr<Result> Put(
+                const std::string& url,
+                const std::optional<std::pair<std::string, std::string>>& payload = std::nullopt
+        ) override;
+
+        OOPETRIS_GRAPHICS_EXPORTED void SetBearerAuth(const std::string& token) override;
+    };
+
+
+} // namespace oopetris::http::implementation

src/lobby/httplib_client.hpp

@@ -20,10 +20,8 @@
 #pragma warning(default : 4100)
 #endif
 
-
 #include "./client.hpp"
 
-
 namespace oopetris::http::implementation {
 
     struct ActualResult : ::oopetris::http::Result {