[Network/HttpClient] Added proper support for chunked responses

Razakhel · Razakhel · commit 9925d384d2ef · 2026-02-22T22:26:17.000+01:00
diff --git a/include/RaZ/Network/HttpClient.hpp b/include/RaZ/Network/HttpClient.hpp
@@ -23,6 +23,8 @@ class HttpClient {
   void disconnect() { m_tcpClient.disconnect(); }
 
 private:
+  std::string receiveChunked();
+
   std::string m_host;
   TcpClient m_tcpClient;
 };
diff --git a/src/RaZ/Network/HttpClient.cpp b/src/RaZ/Network/HttpClient.cpp
@@ -58,11 +58,39 @@ std::string HttpClient::get(std::string_view resource) {
   if (contentLength > 0)
     return m_tcpClient.receiveExactly(contentLength);
 
-  if (isChunked) // TODO: properly handle chunked data
-    return m_tcpClient.receiveUntil("\r\n\r\n");
+  if (isChunked)
+    return receiveChunked();
 
   Logger::error("[HttpClient] Failed to get resource '{}': unsupported response method", resource);
   return {};
 }
 
+std::string HttpClient::receiveChunked() {
+  const auto receiveCrlf = [this] () {
+    if (const std::string chunkEnd = m_tcpClient.receiveExactly(2); chunkEnd != "\r\n")
+      throw std::runtime_error(std::format("[HttpClient] Ill-formed end of chunk: expected CRLF ('\\r\\n'), got '{}'", chunkEnd));
+  };
+
+  std::string data;
+
+  while (true) {
+    const std::string chunkSizeStr = m_tcpClient.receiveUntil("\r\n");
+
+    if (chunkSizeStr == "0\r\n") {
+      receiveCrlf();
+      break;
+    }
+
+    std::size_t chunkSize {};
+
+    if (std::from_chars(chunkSizeStr.data(), chunkSizeStr.data() + chunkSizeStr.size() - 2, chunkSize, 16).ec != std::errc())
+      throw std::runtime_error(std::format("[HttpClient] Failed to parse chunk size: '{}'", chunkSizeStr));
+
+    data.append(m_tcpClient.receiveExactly(chunkSize));
+    receiveCrlf();
+  }
+
+  return data;
+}
+
 }
diff --git a/tests/src/RaZ/Network/HttpClient.cpp b/tests/src/RaZ/Network/HttpClient.cpp
@@ -16,3 +16,18 @@ TEST_CASE("HttpClient connection", "[network]") {
   CHECK_NOTHROW(client.connect("localhost")); // Local TCP server listening on port 80 (HTTP)
   CHECK_NOTHROW(client.disconnect());
 }
+
+TEST_CASE("HttpClient get", "[network][!mayfail]") {
+  Raz::HttpClient client;
+
+  REQUIRE_NOTHROW(client.connect("example.com"));
+
+  std::string result;
+  REQUIRE_NOTHROW(result = client.get("/"));
+
+  CHECK(result.size() == 528);
+  CHECK(result.starts_with("<!doctype html>"));
+  CHECK(result.ends_with("</html>\n"));
+
+  CHECK_NOTHROW(client.disconnect());
+}
