patch: Patch/ygo set 25th (#13)

core/src/infra/CprHttpClient.cpp

@@ -26,16 +26,15 @@ CprHttpClient::CprHttpClient(std::chrono::milliseconds timeout)
                                         /*follow=*/true,
                                         /*cont_send_cred=*/false,
                                         cpr::PostRedirectFlags::POST_ALL});
-    executor_ = [this](std::string_view url) -> Result<std::string> {
+    rawExecutor_ = [this](std::string_view url) -> RawResponse {
         session_->SetUrl(cpr::Url{std::string(url)});
         cpr::Response r = session_->Get();
-
-        if (r.error) {
-            return mapHttpGetResponse(true, r.error.message, r.status_code, {},
-                                      url);
-        }
-        return mapHttpGetResponse(false, {}, r.status_code, std::move(r.text),
-                                  url);
+        return RawResponse{
+            .transportError = static_cast<bool>(r.error),
+            .transportMessage = r.error.message,
+            .statusCode = static_cast<int>(r.status_code),
+            .body = std::move(r.text),
+        };
     };
 }
 
@@ -45,6 +44,12 @@ CprHttpClient::CprHttpClient(GetExecutor executor,
       session_(nullptr),
       executor_(std::move(executor)) {}
 
+CprHttpClient::CprHttpClient(RawGetExecutor rawExecutor,
+                             std::chrono::milliseconds timeout)
+    : timeout_(timeout),
+      session_(nullptr),
+      rawExecutor_(std::move(rawExecutor)) {}
+
 CprHttpClient::~CprHttpClient() = default;
 
 Result<std::string> CprHttpClient::get(std::string_view url) {
@@ -53,10 +58,18 @@ Result<std::string> CprHttpClient::get(std::string_view url) {
     // (one fetch per BaseSelectedCardPanel selection change), so contention
     // is negligible.
     std::lock_guard<std::mutex> lock(sessionMutex_);
-    if (!executor_) {
-        return Result<std::string>::err("HTTP error: no executor configured");
+    if (executor_) {
+        return executor_(url);
     }
-    return executor_(url);
+    if (rawExecutor_) {
+        RawResponse raw = rawExecutor_(url);
+        return mapHttpGetResponse(raw.transportError,
+                                  raw.transportMessage,
+                                  raw.statusCode,
+                                  std::move(raw.body),
+                                  url);
+    }
+    return Result<std::string>::err("HTTP error: no executor configured");
 }
 
 }  // namespace ccm