From a0a9eec20da65b8ad6e7cfa6ba9488152dddcd3b Mon Sep 17 00:00:00 2001
From: anulax1225 <anulax1225@icloud.com>
Date: Thu, 25 Apr 2024 13:17:36 +0200
Subject: [PATCH] modified http protocol to use DataStream

---
 bakanet/src/bakanet/http/http_packet.h   |  1 -
 bakanet/src/bakanet/http/http_server.cpp |  5 ++---
 bakanet/src/bakanet/http/http_server.h   | 11 +++++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/bakanet/src/bakanet/http/http_packet.h b/bakanet/src/bakanet/http/http_packet.h
index dbf147e..65409e5 100755
--- a/bakanet/src/bakanet/http/http_packet.h
+++ b/bakanet/src/bakanet/http/http_packet.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <bakanetpch.h>
-#include <bakatools.h>
 
 #define HTTP_RES_200 "200 OK"
 
diff --git a/bakanet/src/bakanet/http/http_server.cpp b/bakanet/src/bakanet/http/http_server.cpp
index fa80fcc..8b4bf08 100755
--- a/bakanet/src/bakanet/http/http_server.cpp
+++ b/bakanet/src/bakanet/http/http_server.cpp
@@ -2,7 +2,6 @@
 namespace Bk::Net {
     HttpServer::HttpServer(IpAddress ip, int port) 
     {
-        Bk::Log::init("BAKANET");
         BK_CORE_INFO("NEW SERVER");
         socket = Socket::create(ip, port, IpProtocol::TCP);
         radix = RadixTree();
@@ -32,7 +31,7 @@ namespace Bk::Net {
 
     HttpRequest HttpServer::recv_request(Socket& conn)
     {
-        Packet req;
+        Type::DataStream req;
         std::vector<char> data;
         do
         {
@@ -46,7 +45,7 @@ namespace Bk::Net {
 
     void HttpServer::send_reponse(Socket& conn, HttpReponse res)
     {
-        Packet res_packet;
+        Type::DataStream res_packet;
         std::string str_res = res.to_string();
         res_packet.push<char>(str_res.c_str(), str_res.length());
         conn.emit(res_packet.payload);
diff --git a/bakanet/src/bakanet/http/http_server.h b/bakanet/src/bakanet/http/http_server.h
index 6fa20d9..0319278 100755
--- a/bakanet/src/bakanet/http/http_server.h
+++ b/bakanet/src/bakanet/http/http_server.h
@@ -1,19 +1,18 @@
 #pragma once
 
 #include <bakanetpch.h>
-#include <bakatools.h>
 #include <bakanet/core/ip_address.h>
-#include <bakanet/core/packet.h>
 #include <bakanet/core/socket.h>
 #include "http_packet.h"
 
 namespace Bk::Net {
+    using RequestHandler = std::function<HttpReponse(HttpRequest& req)>;
+    using HttpMethodArray = std::unordered_map<std::string, RequestHandler>;
+    using RadixTree = Type::Trie<std::string, HttpMethodArray>;
+    using ThreadPool = std::vector<std::thread>;
+    
     class HttpServer 
     {
-        using RequestHandler = std::function<HttpReponse(HttpRequest& req)>;
-        using HttpMethodArray = std::unordered_map<std::string, RequestHandler>;
-        using RadixTree = DataType::Trie<std::string, HttpMethodArray>;
-        using ThreadPool = std::vector<std::thread>;
         public:
             HttpServer(IpAddress ip, int port);
             ~HttpServer() = default;