upgrade interceptors and stuff..

Author: Jadit19

example/main.cpp

@@ -6,7 +6,7 @@ int main(int argc, char **argv) {
   connection.port = 80;
 
   mochios::Client client(connection);
-  client.interceptors.request.push_back([](mochios::message::Request &request) {
+  client.interceptors.request.use([](mochios::message::Request &request) {
     logger::info("Intercepting request!");
     request.print();
   });
@@ -16,10 +16,9 @@ int main(int argc, char **argv) {
   response = client.get(healthRequest);
   logger::success(response.body);
 
-  json::parser parser;
   mochios::message::Request request("/about");
   response = client.get(request);
-  logger::success(parser.loads(response.body).dumps(2));
+  logger::success(response.body.dumps(2));
 
   return EXIT_SUCCESS;
 }

include/mochios/client/client.h

@@ -8,7 +8,8 @@
 
 #include <mochios/client/options.h>
 #include <mochios/interceptors/interceptor.h>
-#include <mochios/interceptors/user_agent.h>
+#include <mochios/interceptors/request/user_agent.h>
+#include <mochios/interceptors/response/json.h>
 
 namespace mochios {
 

include/mochios/interceptors/interceptor.h

@@ -7,11 +7,31 @@
 
 namespace mochios {
 
+class Client;
+
 namespace interceptor {
 
+template <typename T> class Manager {
+private:
+  std::vector<std::function<void(T &)>> interceptors;
+
+public:
+  Manager() { return; }
+  ~Manager() {
+    this->interceptors.clear();
+    return;
+  }
+
+  void use(std::function<void(T &)> interceptor) {
+    interceptors.push_back(interceptor);
+  }
+
+  friend class mochios::Client;
+};
+
 typedef struct {
-  std::vector<std::function<void(mochios::message::Request &)>> request;
-  std::vector<std::function<void(mochios::message::Response &)>> response;
+  mochios::interceptor::Manager<mochios::message::Request> request;
+  mochios::interceptor::Manager<mochios::message::Response> response;
 } Interceptors;
 
 } // namespace interceptor

include/mochios/interceptors/user_agent.h renamed to include/mochios/interceptors/request/user_agent.h

@@ -7,8 +7,12 @@ namespace mochios {
 
 namespace interceptor {
 
+namespace request {
+
 void userAgent(mochios::message::Request &request);
 
+} // namespace request
+
 } // namespace interceptor
 
 } // namespace mochios

include/mochios/interceptors/response/json.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <json/parse.h>
+
+#include <mochios/message/response.h>
+
+namespace mochios {
+
+namespace interceptor {
+
+namespace response {
+
+void json(mochios::message::Response &response);
+
+} // namespace response
+
+} // namespace interceptor
+
+} // namespace mochios

src/client/client.cpp

@@ -18,7 +18,8 @@ mochios::Client::Client(const mochios::client::Connection &connection)
   this->connect();
   close(this->socket);
 
-  this->interceptors.request.push_back(mochios::interceptor::userAgent);
+  this->interceptors.request.use(mochios::interceptor::request::userAgent);
+  this->interceptors.response.use(mochios::interceptor::response::json);
   return;
 }
 
@@ -97,14 +98,14 @@ mochios::Client::sendHelper(mochios::message::Request &request) {
   request.set("Accept", "*/*");
   request.set("Connection", "close");
   for (const std::function<void(mochios::message::Request &)>
-           &requestIntercptor : this->interceptors.request) {
-    requestIntercptor(request);
+           &requestInterceptor : this->interceptors.request.interceptors) {
+    requestInterceptor(request);
   }
   this->connect();
   mochios::message::Response res =
       mochios::helpers::send(request, this->socket);
   for (const std::function<void(mochios::message::Response &)>
-           &responseInterceptor : this->interceptors.response) {
+           &responseInterceptor : this->interceptors.response.interceptors) {
     responseInterceptor(res);
   }
   return res;

src/helpers/client.cpp

@@ -56,6 +56,7 @@ void mochios::helpers::buildResponse(mochios::message::Response &res,
   while (std::getline(response, line) && line != "\r") {
     body << line;
   }
+
   res.body = body.str();
   return;
 }

src/interceptors/request/user_agent.cpp

@@ -0,0 +1,8 @@
+#include <mochios/interceptors/request/user_agent.h>
+
+const std::string mochiosUserAgent = "mochios/" + mochios::version;
+
+void mochios::interceptor::request::userAgent(
+    mochios::message::Request &request) {
+  request.set("User-Agent", mochiosUserAgent);
+}

src/interceptors/response/json.cpp

@@ -0,0 +1,11 @@
+#include <mochios/interceptors/response/json.h>
+
+void mochios::interceptor::response::json(
+    mochios::message::Response &response) {
+  if (response.get("content-type") != "application/json") {
+    return;
+  }
+
+  json::parser parser;
+  response.body = parser.loads(static_cast<std::string>(response.body));
+}