-renamed http::ResponseView to http::ClientResponse;

-renamed http::RequestView to http::Request; -renamed http::Request to http::ClientRequest;
kamchatka-volcano · Jul 10, 2024 · 13ac1a6 · 13ac1a6
1 parent f37bfa0
commit 13ac1a6
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,8 +50,26 @@ SealLake_Bundle(
         TEXT_REPLACEMENTS
         "namespace http" "namespace asyncgi::http"
         "HOT_TEACUP_" "ASYNCGI_HOT_TEACUP_"
+        "Request::" "ClientRequest::"
+        "class Request {" "class ClientRequest {"
+        "Request(" "ClientRequest("
+        "REQUEST_H" "CLIENT_REQUEST_H"
+        "RequestView::" "Request::"
+        "class RequestView {" "class Request {"
+        "RequestView(" "Request("
+        "REQUEST_VIEW_H" "REQUEST_H"
+        "RequestView" "Request"
+        "ResponseView::" "ClientResponse::"
+        "class ResponseView {" "class ClientResponse {"
+        "ResponseView(" "ClientResponse("
+        "RESPONSE_VIEW_H" "CLIENT_RESPONSE_H"
+        "ResponseView" "ClientResponse"
 )
 
+file(RENAME include/asyncgi/http/request.h include/asyncgi/http/client_request.h)
+file(RENAME include/asyncgi/http/request_view.h include/asyncgi/http/request.h)
+file(RENAME include/asyncgi/http/response_view.h include/asyncgi/http/client_response.h)
+
 set(SRC
     src/asiodispatcher.cpp
     src/io.cpp

diff --git a/examples/example_client.cpp b/examples/example_client.cpp
@@ -14,8 +14,8 @@ int main()
             "127.0.0.1",
             9088,
 #endif
-            http::Request{http::RequestMethod::Get, "/"},
-            [&io](const std::optional<http::ResponseView>& response)
+            http::ClientRequest{http::RequestMethod::Get, "/"},
+            [&io](const std::optional<http::ClientResponse>& response)
             {
                 if (response)
                     std::cout << response->body() << std::endl;

diff --git a/examples/example_client_in_processor.cpp b/examples/example_client_in_processor.cpp
@@ -14,8 +14,8 @@ struct RequestPage{
                 "127.0.0.1",
                 9088,
 #endif
-                http::Request{http::RequestMethod::Get, "/"},
-                [responder](const std::optional<http::ResponseView>& reqResponse) mutable
+                http::ClientRequest{http::RequestMethod::Get, "/"},
+                [responder](const std::optional<http::ClientResponse>& reqResponse) mutable
                 {
                     if (reqResponse)
                         responder.send(std::string{reqResponse->body()});

diff --git a/include/asyncgi/client.h b/include/asyncgi/client.h
@@ -4,8 +4,8 @@
 #include "errors.h"
 #include "types.h"
 #include "detail/serviceholder.h"
-#include "http/request.h"
-#include "http/response_view.h"
+#include "http/client_request.h"
+#include "http/client_response.h"
 #include <filesystem>
 #include <functional>
 #include <memory>
@@ -32,8 +32,8 @@ class Client {
             std::chrono::milliseconds timeout = std::chrono::seconds{3});
     void makeRequest(
             const std::filesystem::path& socketPath,
-            const http::Request& request,
-            const std::function<void(std::optional<http::ResponseView>)>& responseHandler,
+            const http::ClientRequest& request,
+            const std::function<void(std::optional<http::ClientResponse>)>& responseHandler,
             std::chrono::milliseconds timeout = std::chrono::seconds{3});
 
     void makeRequest(
@@ -45,8 +45,8 @@ class Client {
     void makeRequest(
             std::string_view ipAddress,
             uint16_t port,
-            const http::Request& request,
-            const std::function<void(std::optional<http::ResponseView>)>& responseHandler,
+            const http::ClientRequest& request,
+            const std::function<void(std::optional<http::ClientResponse>)>& responseHandler,
             std::chrono::milliseconds timeout = std::chrono::seconds{3});
 
     void disconnect();

diff --git a/include/asyncgi/request.h b/include/asyncgi/request.h
@@ -5,7 +5,7 @@
 #include "detail/lazyinitialized.h"
 #include "http/cookie_view.h"
 #include "http/query_view.h"
-#include "http/request_view.h"
+#include "http/request.h"
 #include "http/types.h"
 #include <functional>
 #include <map>
@@ -58,11 +58,11 @@ class Request {
 
 private:
     const fcgi::Request& fcgiRequest() const;
-    const http::RequestView& httpRequest() const;
+    const http::Request& httpRequest() const;
 
 private:
     sfun::member<const fcgi::Request&> fcgiRequest_;
-    detail::LazyInitialized<http::RequestView> httpRequest_;
+    detail::LazyInitialized<http::Request> httpRequest_;
 };
 
 } // namespace asyncgi

diff --git a/src/client.cpp b/src/client.cpp
@@ -45,8 +45,8 @@ void Client::makeRequest(
 
 void Client::makeRequest(
         const std::filesystem::path& socketPath,
-        const http::Request& request,
-        const std::function<void(std::optional<http::ResponseView>)>& responseHandler,
+        const http::ClientRequest& request,
+        const std::function<void(std::optional<http::ClientResponse>)>& responseHandler,
         std::chrono::milliseconds timeout)
 {
     if (!clientService_.has_value())
@@ -71,8 +71,8 @@ void Client::makeRequest(
 void Client::makeRequest(
         std::string_view ipAddress,
         uint16_t port,
-        const http::Request& request,
-        const std::function<void(std::optional<http::ResponseView>)>& responseHandler,
+        const http::ClientRequest& request,
+        const std::function<void(std::optional<http::ClientResponse>)>& responseHandler,
         std::chrono::milliseconds timeout)
 {
     if (!clientService_.has_value())

diff --git a/src/clientservice.cpp b/src/clientservice.cpp
@@ -62,8 +62,8 @@ void ClientService::makeRequest(
 
 void ClientService::makeRequest(
         const fs::path& socketPath,
-        const http::Request& request,
-        const std::function<void(std::optional<http::ResponseView>)>& responseHandler,
+        const http::ClientRequest& request,
+        const std::function<void(std::optional<http::ClientResponse>)>& responseHandler,
         std::chrono::milliseconds timeout)
 {
     if (requestProcessorQueue_)
@@ -143,8 +143,8 @@ void ClientService::makeRequest(
 void ClientService::makeRequest(
         std::string_view ipAddress,
         uint16_t port,
-        const http::Request& request,
-        const std::function<void(std::optional<http::ResponseView>)>& responseHandler,
+        const http::ClientRequest& request,
+        const std::function<void(std::optional<http::ClientResponse>)>& responseHandler,
         std::chrono::milliseconds timeout)
 {
     if (requestProcessorQueue_)

diff --git a/src/clientservice.h b/src/clientservice.h
@@ -13,9 +13,9 @@
 #include <asyncgi/detail/external/sfun/member.h>
 #include <asyncgi/detail/external/sfun/optional_ref.h>
 #include <asyncgi/errors.h>
+#include <asyncgi/http/client_request.h>
+#include <asyncgi/http/client_response.h>
 #include <fcgi_responder/requester.h>
-#include <hot_teacup/request.h>
-#include <hot_teacup/response_view.h>
 #include <filesystem>
 #include <vector>
 
@@ -37,8 +37,8 @@ class ClientService {
             std::chrono::milliseconds timeout = std::chrono::seconds{3});
     void makeRequest(
             const std::filesystem::path& socketPath,
-            const http::Request& request,
-            const std::function<void(std::optional<http::ResponseView>)>& responseHandler,
+            const http::ClientRequest& request,
+            const std::function<void(std::optional<http::ClientResponse>)>& responseHandler,
             std::chrono::milliseconds timeout = std::chrono::seconds{3});
 
     void makeRequest(
@@ -50,8 +50,8 @@ class ClientService {
     void makeRequest(
             std::string_view ipAddress,
             uint16_t port,
-            const http::Request& request,
-            const std::function<void(std::optional<http::ResponseView>)>& responseHandler,
+            const http::ClientRequest& request,
+            const std::function<void(std::optional<http::ClientResponse>)>& responseHandler,
             std::chrono::milliseconds timeout = std::chrono::seconds{3});
 
     void disconnect();

diff --git a/src/request.cpp b/src/request.cpp
@@ -8,7 +8,7 @@ Request::Request(const fcgi::Request& request)
     : fcgiRequest_{request}
     , httpRequest_{[this]
                    {
-                       return http::RequestView{
+                       return http::Request{
                                fcgiRequest().hasParam("REQUEST_METHOD") ? fcgiRequest().param("REQUEST_METHOD")
                                                                         : std::string_view{},
                                fcgiRequest().hasParam("REMOTE_ADDR") ? fcgiRequest().param("REMOTE_ADDR")
@@ -33,7 +33,7 @@ const fcgi::Request& Request::fcgiRequest() const
     return fcgiRequest_;
 }
 
-const http::RequestView& Request::httpRequest() const
+const http::Request& Request::httpRequest() const
 {
     return httpRequest_;
 }