major ass overhaul

Author: Jadit19

example/main.cpp

@@ -1,15 +1,21 @@
-#include <mochios/client.h>
+#include <mochios/client/client.h>
 
 int main(int argc, char **argv) {
-  mochios::Client client("api.nasa.gov", 443);
-  mochios::Request request;
-  request.path = "/planetary/apod";
-  request.queries["api_key"] = "DEMO_KEY";
+  mochios::client::Connection connection;
+  connection.host = "expresso.aditjain.me";
+  connection.port = 80;
 
-  mochios::Response response;
-  client.get(request, response);
+  mochios::Client client(connection);
+  mochios::message::Response response;
 
-  std::cout << response.body.dumps(2) << std::endl;
+  mochios::message::Request healthRequest("/health");
+  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));
 
   return EXIT_SUCCESS;
 }

include/mochios/client.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <cstring>
+#include <netdb.h>
+
+#include <brewtils/sys.h>
+#include <logger/log.h>
+
+#include <mochios/client/options.h>
+#include <mochios/enums/method.h>
+#include <mochios/message/request.h>
+#include <mochios/message/response.h>
+
+namespace mochios {
+
+class Client {
+private:
+  int socket;
+  struct addrinfo *server;
+
+  mochios::client::Connection connection;
+
+  void connect();
+  mochios::message::Response sendHelper(mochios::message::Request &request,
+                                        const mochios::enums::method &method);
+
+public:
+  Client(const mochios::client::Connection &connection);
+  ~Client();
+
+  mochios::message::Response get(mochios::message::Request &request);
+  mochios::message::Response post(mochios::message::Request &request);
+  mochios::message::Response put(mochios::message::Request &request);
+  mochios::message::Response patch(mochios::message::Request &request);
+  mochios::message::Response del(mochios::message::Request &request);
+  mochios::message::Response options(mochios::message::Request &request);
+  mochios::message::Response head(mochios::message::Request &request);
+};
+
+} // namespace mochios

include/mochios/client/client.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <string>
+
+namespace mochios {
+
+namespace client {
+
+typedef struct {
+  std::string host;
+  unsigned short port;
+} Connection;
+
+} // namespace client
+
+} // namespace mochios

include/mochios/client/options.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <set>
+#include <sstream>
+#include <string>
+#include <unordered_map>
+
+namespace mochios {
+
+namespace enums {
+
+enum class method { GET, POST, PUT, PATCH, DELETE, OPTIONS, HEAD };
+
+extern const std::set<std::string> methods;
+
+} // namespace enums
+
+} // namespace mochios
+
+bool operator==(const mochios::enums::method &m, const std::string &str);
+bool operator!=(const mochios::enums::method &m, const std::string &str);
+
+std::ostream &operator<<(std::ostream &os, const mochios::enums::method &m);
+
+std::string operator+(const mochios::enums::method &m, const std::string &str);
+std::string operator+(const std::string &str, const mochios::enums::method &m);

include/mochios/cookie.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <cstring>
+#include <sstream>
+
+#include <brewtils/sys.h>
+#include <brewtils/url.h>
+
+#include <mochios/enums/method.h>
+#include <mochios/message/request.h>
+#include <mochios/message/response.h>
+
+namespace mochios {
+
+namespace helpers {
+
+std::pair<std::string, std::string>
+buildRequest(mochios::message::Request &request,
+             const mochios::enums::method &method);
+
+void buildResponse(mochios::message::Response &res,
+                   std::stringstream &response);
+
+mochios::message::Response send(mochios::message::Request &request,
+                                const mochios::enums::method &method,
+                                const int &socket);
+
+} // namespace helpers
+
+} // namespace mochios

include/mochios/enums/method.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <brewtils/string.h>
+#include <json/parse.h>
+
+namespace mochios {
+
+namespace message {
+
+class Message {
+private:
+protected:
+public:
+  Message();
+  ~Message();
+
+  // Don't use headers directly! Use them using the get and set
+  // methods
+  std::map<std::string, std::string> headers;
+  std::map<std::string, std::string> params;
+  std::map<std::string, std::string> queries;
+  json::object body;
+
+  void set(const std::string &key, const std::string &value);
+  const std::string get(const std::string &key) const;
+
+  virtual void print() = 0;
+};
+
+} // namespace message
+
+} // namespace mochios

include/mochios/helpers/client.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <mochios/message/message.h>
+
+namespace mochios {
+
+namespace message {
+
+class Request : public Message {
+private:
+public:
+  Request(const std::string &path);
+  ~Request();
+
+  std::string path;
+
+  void print() override;
+};
+
+} // namespace message
+
+} // namespace mochios