http: Decode<HttpRequest>(reader)

uchenily · Jun 5, 2024 · cecba91 · cecba91
1 parent 7c00744
commit cecba91
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/examples/coro_curl.cpp b/examples/coro_curl.cpp
@@ -12,7 +12,8 @@ using namespace uvio::net::http;
 auto client() -> Task<> {
     HttpRequest req = {
         .method = "GET",
-        .url = "http://httpbin.org/json",
+        // TODO(x)
+        .uri = "http://httpbin.org/json",
     };
     auto ret = co_await HttpClient::request(req);
     if (!ret) {

diff --git a/uvio/net/http/http_client.hpp b/uvio/net/http/http_client.hpp
@@ -51,7 +51,7 @@ class HttpClient {
                                   CURLMOPT_TIMERDATA,
                                   this);
 
-                http_request(req.url);
+                http_request(req.uri);
             }
 
             void http_request(std::string_view url) {

diff --git a/uvio/net/http/http_frame.hpp b/uvio/net/http/http_frame.hpp
@@ -21,7 +21,7 @@ using BufferedWriter = TcpWriter;
 class HttpCodec : public Codec<HttpCodec> {
 public:
     template <typename Reader>
-    auto decode(Reader &reader) -> Task<Result<std::string>> {
+    auto decode(Reader &reader) -> Task<Result<HttpRequest>> {
         HttpRequest req;
         std::string request_line;
         if (auto ret = co_await reader.read_until(request_line, "\r\n"); !ret) {
@@ -37,6 +37,8 @@ class HttpCodec : public Codec<HttpCodec> {
         LOG_DEBUG("method: {}", method);
         LOG_DEBUG("uri: {}", uri);
         LOG_DEBUG("version: {}", version);
+        req.method = method;
+        req.uri = uri;
 
         std::string request_headers;
         if (auto ret = co_await reader.read_until(request_headers, "\r\n\r\n");
@@ -47,6 +49,7 @@ class HttpCodec : public Codec<HttpCodec> {
         // Host: xxx
         // Content-Type: application/html
         auto headers = parse_headers(request_headers);
+        req.headers = headers;
 
         std::string body;
 
@@ -58,9 +61,10 @@ class HttpCodec : public Codec<HttpCodec> {
                 co_return unexpected{ret.error()};
             }
             LOG_DEBUG("body: `{}`", body);
+            req.body = body;
         }
 
-        co_return body;
+        co_return req;
     }
 
     template <typename Writer>
@@ -188,9 +192,7 @@ class HttpFramed {
 
     [[REMEMBER_CO_AWAIT]]
     auto read_request() -> Task<Result<HttpRequest>> {
-        auto result = co_await codec_.Decode<std::string>(buffered_reader_);
-        // FIXME: Decode() -> HttpRequest?
-        co_return HttpRequest{.url = "/", .body = result.value()};
+        co_return co_await codec_.Decode<HttpRequest>(buffered_reader_);
     }
 
 private:

diff --git a/uvio/net/http/http_protocol.hpp b/uvio/net/http/http_protocol.hpp
@@ -1,12 +1,14 @@
 #pragma once
 
+#include "uvio/net/http/http_util.hpp"
 #include <string>
 
 namespace uvio::net::http {
 
 struct HttpRequest {
-    std::string method{"GET"};
-    std::string url;
+    std::string method;
+    std::string uri;
+    HttpHeader  headers;
     std::string body;
 };
 

diff --git a/uvio/net/http/http_server.hpp b/uvio/net/http/http_server.hpp
@@ -20,8 +20,8 @@ class HttpServer {
         , port_{port} {}
 
 public:
-    auto set_handler(std::string_view url, HandlerFunc &&func) {
-        map_handles_[url] = std::move(func);
+    auto set_handler(std::string_view uri, HandlerFunc &&func) {
+        map_handles_[uri] = std::move(func);
     }
 
     auto run() {
@@ -47,10 +47,10 @@ class HttpServer {
         }
 
         auto request = std::move(req.value());
-        LOG_DEBUG("request url: {} body: {}", request.url, request.body);
+        LOG_DEBUG("request uri: {} body: {}", request.uri, request.body);
 
         HttpResponse resp;
-        if (auto it = map_handles_.find(request.url);
+        if (auto it = map_handles_.find(request.uri);
             it != map_handles_.end()) {
             it->second(request, resp);
             resp.http_code = 200;