Merge pull request #117 from coding-cpp/fix/110

Fix/110

Author: Jadit19

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "lib/zippuccino"]
 	path = lib/zippuccino
 	url = git@github.com:coding-cpp/zippuccino.git
+[submodule "lib/mochios"]
+	path = lib/mochios
+	url = git@github.com:coding-cpp/mochios

CMakeLists.txt

@@ -40,4 +40,6 @@ target_include_directories(server
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/brewtils/include>
     $<INSTALL_INTERFACE:lib/zippuccino/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/zippuccino/include>
+    $<INSTALL_INTERFACE:lib/mochios/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/mochios/include>
 )

assets/github/build.png

@@ -57,6 +57,13 @@ void about(Request &req, Response &res) {
   response["submodules"][4]["location"] = "lib/zippuccino";
   response["submodules"][4]["name"] = "Zippuccino";
 
+  json::object mochios;
+  mochios["repository"] = "https://github.com/coding-cpp/mochios";
+  mochios["work"] = "HTTP request library for C++";
+  mochios["location"] = "lib/mochios";
+  mochios["name"] = "Mochios";
+  response["submodules"].push_back(mochios);
+
   res.status(STATUS_CODE::OK).json(response).end();
   return;
 }

assets/github/start.png

@@ -37,8 +37,8 @@ class Router {
                          expresso::messages::Response &response);
   std::map<std::string, void (*)(expresso::messages::Request &request,
                                  expresso::messages::Response &response)> &
-  fetchMapFromMethod(expresso::enums::method method);
-  void addRoute(expresso::enums::method method, std::string path,
+  fetchMapFromMethod(mochios::enums::method method);
+  void addRoute(mochios::enums::method method, std::string path,
                 void (*handler)(expresso::messages::Request &request,
                                 expresso::messages::Response &response));
 

example/main.cpp

@@ -1,31 +1,16 @@
 #pragma once
 
-#include <string>
-
-#include <brewtils/url.h>
+#include <mochios/messages/cookie.h>
 
 namespace expresso {
 
 namespace messages {
 
-class Cookie {
+class Cookie : public mochios::messages::Cookie {
 public:
-  bool secure;
-  bool httpOnly;
-  bool partitioned;
-
-  std::string name;
-  std::string value;
-  std::string domain;
-  std::string path;
-  std::string expires;
-  std::string maxAge;
-  std::string sameSite;
-
   Cookie();
+  Cookie(const std::string &data);
   ~Cookie();
-
-  std::string serialize();
 };
 
 } // namespace messages

include/expresso/core/router.h

@@ -1,39 +1,34 @@
 #pragma once
 
+#include <mochios/messages/request.h>
+
 #include <expresso/messages/response.h>
 
 namespace expresso {
 
 namespace messages {
 
-class Request {
+class Request : public mochios::messages::Request {
 private:
 public:
-  Request();
+  Request(const std::string &path);
   ~Request();
 
   bool xhr;
   int contentLength;
 
   std::string host;
   std::string hostname;
-  expresso::enums::method method;
-  std::string path;
   std::string httpVersion;
 
   // tempPath used internally for referencing. DO NOT USE IT! Use `path`
   // instead.
   std::string tempPath;
-
-  json::object body;
-  std::vector<Cookie *> cookies;
-  std::map<std::string, std::string> headers;
-  std::map<std::string, std::string> params;
-  std::map<std::string, std::string> queries;
+  std::vector<expresso::messages::Cookie *> cookies;
 
   expresso::messages::Response *res;
 
-  void print();
+  void print() override;
 };
 
 } // namespace messages

include/expresso/enums/method.h

@@ -7,26 +7,25 @@
 #include <brewtils/string.h>
 #include <brewtils/sys.h>
 #include <json/object.h>
+#include <mochios/enums/method.h>
+#include <mochios/messages/response.h>
 #include <zippuccino/zipper.h>
 
-#include <expresso/enums/method.h>
 #include <expresso/enums/status_code.h>
 #include <expresso/messages/cookie.h>
 
 namespace expresso {
 
 namespace messages {
 
-class Response {
+class Response : public mochios::messages::Response {
 private:
   bool hasEnded;
 
   int socket;
-  expresso::enums::STATUS_CODE statusCode;
 
   std::string message;
   std::vector<Cookie *> cookies;
-  std::map<std::string, std::string> headers;
 
   void sendToClient();
   void sendHeaders();
@@ -51,7 +50,7 @@ class Response {
   void sendInvalidRange();
 
   void end();
-  void print();
+  void print() override;
 };
 
 } // namespace messages