From 3045e1a8e49d3755fa6e8bafb9f755e7a42a2bb7 Mon Sep 17 00:00:00 2001
From: sha512sum <linuxnyasha@tutanota.com>
Date: Mon, 25 Mar 2024 10:58:02 +0000
Subject: [PATCH] Fix GetDependencies for 2 dependencies

---
 include/cserver/clients/http/component.hpp | 14 +++-----------
 include/cserver/clients/http/response.hpp  |  4 +---
 include/cserver/engine/components.hpp      |  2 +-
 include/cserver/server/server/server.hpp   | 17 ++++++++++-------
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/include/cserver/clients/http/component.hpp b/include/cserver/clients/http/component.hpp
index 40b3d7f..32b7195 100644
--- a/include/cserver/clients/http/component.hpp
+++ b/include/cserver/clients/http/component.hpp
@@ -59,12 +59,8 @@ private:
   };
   template <typename Socket>
   inline auto ReadHeaders(Socket&& socket, auto&&...) const -> cserver::Task<server::http::HTTPResponse> {
-    boost::system::error_code ec;
     std::string serverResponse;
-    co_await boost::asio::async_read_until(socket, boost::asio::dynamic_buffer(serverResponse), "\r\n\r\n", boost::asio::redirect_error(boost::asio::use_awaitable, ec));
-    if(ec) {
-      throw BoostErrorWrapper{ec};
-    };
+    co_await boost::asio::async_read_until(socket, boost::asio::dynamic_buffer(serverResponse), "\r\n\r\n", boost::asio::use_awaitable);
     server::http::HTTPResponse response;
     std::istringstream responseStream(std::move(serverResponse));
     std::string httpVersion;
@@ -80,11 +76,7 @@ private:
   inline auto ReadBody(Socket&& socket, std::size_t length, auto&&...) const -> cserver::Task<std::string> {
     std::string response;
     response.reserve(length);
-    boost::system::error_code ec;
-    co_await boost::asio::async_read(socket, boost::asio::dynamic_buffer(response), boost::asio::transfer_at_least(length), boost::asio::redirect_error(boost::asio::use_awaitable, ec));
-    if(ec) {
-      throw BoostErrorWrapper{ec};
-    };
+    co_await boost::asio::async_read(socket, boost::asio::dynamic_buffer(response), boost::asio::transfer_at_least(length), boost::asio::use_awaitable);
     co_return response;
   };
   template <typename Socket>
@@ -96,7 +88,7 @@ private:
         break;
       };
       if(ec) {
-        throw BoostErrorWrapper{ec};
+        throw boost::system::error_code{ec};
       };
     };
     co_return response;
diff --git a/include/cserver/clients/http/response.hpp b/include/cserver/clients/http/response.hpp
index da9f324..fecefec 100644
--- a/include/cserver/clients/http/response.hpp
+++ b/include/cserver/clients/http/response.hpp
@@ -1,7 +1,6 @@
 #pragma once
 #include <cserver/server/http/http_response.hpp>
 #include <cserver/engine/coroutine.hpp>
-#include <cserver/utils/boost_error_wrapper.hpp>
 #include <boost/asio/ssl.hpp>
 
 namespace cserver::clients::http {
@@ -19,9 +18,8 @@ public:
       co_return false;
     };
     if(ec) {
-      throw BoostErrorWrapper{ec};
+      throw boost::system::error_code(ec);
     };
-
     this->body.resize(n);
     co_return true;
   };
diff --git a/include/cserver/engine/components.hpp b/include/cserver/engine/components.hpp
index 30742c6..26a4a51 100644
--- a/include/cserver/engine/components.hpp
+++ b/include/cserver/engine/components.hpp
@@ -208,7 +208,7 @@ public:
       return utempl::Tuple{};
     } else {
       if constexpr(requires{GetDependencies<I + 1, names...>();}) {
-        return GetDependencies<I + 1, names..., typename decltype(Magic(loopholes::Getter<DependencyInfoKey<Current, I>{}>{}))::Type>();
+        return GetDependencies<I + 1, names..., Magic(loopholes::Getter<DependencyInfoKey<Current, I>{}>{})>();
       } else {
         return utempl::Tuple{names..., Magic(loopholes::Getter<DependencyInfoKey<Current, I>{}>{})};
       };
diff --git a/include/cserver/server/server/server.hpp b/include/cserver/server/server/server.hpp
index f864ca5..cb59df2 100644
--- a/include/cserver/server/server/server.hpp
+++ b/include/cserver/server/server/server.hpp
@@ -33,15 +33,18 @@ struct Server {
         return {};
       });
   };
-  template <utempl::ConstexprString name, typename T>
-  inline constexpr Server(utempl::Wrapper<name>, T& context) :
+  template <
+    utempl::ConstexprString name,
+    typename T,
+    std::size_t... Is>
+  inline constexpr Server(std::index_sequence<Is...>, utempl::Wrapper<name>, T& context) :
       taskProcessor(context.template FindComponent<TPName>()),
-      handlers{
-        [&]<auto... Is>(std::index_sequence<Is...>) -> utempl::Tuple<impl::GetTypeFromComponentConfig<Ts>&...> {
-          return {context.template FindComponent<Get<Is>(kNames)>()...};
-        }(std::index_sequence_for<Ts...>())
-      },
+      handlers{context.template FindComponent<Get<Is>(kNames)>()...},
       port(T::kConfig.template Get<name>().template Get<"port">()) {
+    
+  };
+  inline constexpr Server(auto name, auto& context) : 
+    Server(std::index_sequence_for<Ts...>{}, name, context) {
   };
   template<auto I, typename Socket>
   auto ProcessHandler(Socket&& socket, http::HTTPRequest request) -> Task<void> {