From 587f8b25dbd324bd1fb44a5da5822f291d4906ab Mon Sep 17 00:00:00 2001
From: sha512sum <linuxnyasha@tutanota.com>
Date: Tue, 19 Mar 2024 16:04:26 +0000
Subject: [PATCH] Add options to component system

---
 include/cserver/clients/http/component.hpp    |  4 +-
 .../cserver/engine/basic/task_processor.hpp   |  4 +-
 include/cserver/engine/components.hpp         | 58 +++++++++++++------
 .../server/handlers/http_handler_base.hpp     |  6 +-
 include/cserver/server/server/server.hpp      | 15 +----
 5 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/include/cserver/clients/http/component.hpp b/include/cserver/clients/http/component.hpp
index 10d4b6e..0e0d32c 100644
--- a/include/cserver/clients/http/component.hpp
+++ b/include/cserver/clients/http/component.hpp
@@ -34,11 +34,11 @@ struct HttpClient {
     ctx(boost::asio::ssl::context::method::sslv23_client),
     resolver(this->taskProcessor.ioContext) {}
   
-  template <utempl::ConstexprString name, typename T>
+  template <utempl::ConstexprString name, Options Options, typename T>
   static consteval auto Adder(const T& context) { 
     using Type = std::remove_cvref_t<decltype(context.template FindComponent<"basicTaskProcessor">())>;
     return context.TransformComponents(
-      [&](const ComponentConfig<name, HttpClient<>>&) -> ComponentConfig<name, HttpClient<Type>> {
+      [&](const ComponentConfig<name, HttpClient<>, Options>&) -> ComponentConfig<name, HttpClient<Type>, Options> {
         return {};
       });
   };
diff --git a/include/cserver/engine/basic/task_processor.hpp b/include/cserver/engine/basic/task_processor.hpp
index f223e89..fa979c6 100644
--- a/include/cserver/engine/basic/task_processor.hpp
+++ b/include/cserver/engine/basic/task_processor.hpp
@@ -15,11 +15,11 @@ struct TaskProcessor {
       pool{} {
   };
 
-  template <utempl::ConstexprString name, typename T>
+  template <utempl::ConstexprString name, Options Options, typename T>
   static consteval auto Adder(const T& context) { 
     constexpr std::size_t Count = T::kConfig.template Get<name>().template Get<"threadPoolSize">();
     return context.TransformComponents(
-      [&](const ComponentConfig<name, TaskProcessor<>>&) -> ComponentConfig<name, TaskProcessor<Count>> {
+      [&](const ComponentConfig<name, TaskProcessor<>, Options>&) -> ComponentConfig<name, TaskProcessor<Count>, Options> {
         return {};
       });
   };
diff --git a/include/cserver/engine/components.hpp b/include/cserver/engine/components.hpp
index 46f5774..e7e62b3 100644
--- a/include/cserver/engine/components.hpp
+++ b/include/cserver/engine/components.hpp
@@ -3,14 +3,30 @@
 #include <thread>
 
 namespace cserver {
+struct SeparatedComponent {};
+template <typename... Ts>
+using Options = utempl::TypeList<Ts...>;
+
+template <utempl::ConstexprString name, typename T, Options Options>
+struct ComponentConfig {};
+
+namespace impl {
 
 template <utempl::ConstexprString name, typename T>
 struct NamedValue {
   T value;
 };
 
-template <utempl::ConstexprString name, typename T>
-struct ComponentConfig {};
+template <typename T>
+using GetTypeFromComponentConfig = decltype(
+  []<utempl::ConstexprString name, typename TT, Options Options>(const ComponentConfig<name, TT, Options>&) -> TT {
+  }(std::declval<T>()));
+
+template <typename T>
+inline constexpr utempl::ConstexprString kNameFromComponentConfig = 
+  decltype([]<utempl::ConstexprString name, typename TT, Options Options>(const ComponentConfig<name, TT, Options>&) {
+    return utempl::Wrapper<name>{};
+  }(std::declval<T>()))::kValue;
 
 template <typename T>
 inline constexpr auto TransformIfOk(T&& value, auto&& f) {
@@ -22,12 +38,14 @@ inline constexpr auto TransformIfOk(T&& value, auto&& f) {
 };
 
 
+} // namespace impl
+
 template <typename... Ts>
 struct ConstexprConfig {
   utempl::Tuple<Ts...> data;
   template <utempl::ConstexprString Key>
   inline constexpr auto Get() const -> auto {
-    return [&]<typename... TTs, utempl::ConstexprString... names>(const ConstexprConfig<NamedValue<names, TTs>...>&){
+    return [&]<typename... TTs, utempl::ConstexprString... names>(const ConstexprConfig<impl::NamedValue<names, TTs>...>&){
       constexpr auto list = utempl::TypeList<utempl::Wrapper<names>...>{};
       constexpr std::size_t I = Find<utempl::Wrapper<Key>>(list);
       if constexpr(I < sizeof...(Ts)) {
@@ -36,22 +54,23 @@ struct ConstexprConfig {
     }(*this);
   };
   template <utempl::ConstexprString Key, typename T>
-  inline constexpr auto Append(T&& value) const -> ConstexprConfig<Ts..., NamedValue<Key, std::remove_cvref_t<T>>> {
-    return {.data = TupleCat(this->data, utempl::MakeTuple(NamedValue<Key, std::remove_cvref_t<T>>{std::forward<T>(value)}))};
+  inline constexpr auto Append(T&& value) const -> ConstexprConfig<Ts..., impl::NamedValue<Key, std::remove_cvref_t<T>>> {
+    return {.data = TupleCat(this->data, utempl::MakeTuple(impl::NamedValue<Key, std::remove_cvref_t<T>>{std::forward<T>(value)}))};
   };
 };
 
-template <ConstexprConfig config, auto names, typename... Ts>
+template <ConstexprConfig config, auto names, auto Options, typename... Ts>
 struct ServiceContext {
-  utempl::Tuple<Ts...> storage;
   static constexpr auto kConfig = config;
   static constexpr auto kList = utempl::TypeList<Ts...>{};
+  static constexpr auto kThreadsCount = config.template Get<"threads">();
+  utempl::Tuple<Ts...> storage;
   inline constexpr ServiceContext() :
       storage{
         [&]<auto... Is>(std::index_sequence<Is...>) -> utempl::Tuple<Ts...> {
           return {[&]<auto I>(utempl::Wrapper<I>) {
             return [&]() -> std::remove_cvref_t<decltype(Get<I>(storage))> {
-              return {decltype(Get<I>(names)){}, *this};
+              return {utempl::Wrapper<Get<I>(names)>{}, *this};
             };
           }(utempl::Wrapper<Is>{})...};
         }(std::index_sequence_for<Ts...>())
@@ -67,7 +86,7 @@ struct ServiceContext {
   };
   template <utempl::ConstexprString name>
   inline constexpr auto FindComponent() -> auto& {
-    constexpr auto I = utempl::Find<utempl::Wrapper<name>>(names);
+    constexpr auto I = utempl::Find(names, name);
     return Get<I>(this->storage);
   };
   template <typename T>
@@ -84,14 +103,14 @@ template <ConstexprConfig config = {}, typename... Ts>
 struct ServiceContextBuilder {
   static constexpr auto kList = utempl::kTypeList<Ts...>;
   static constexpr auto kConfig = config;
-  template <typename T, utempl::ConstexprString name = T::kName>
-  static consteval auto Append() -> decltype(T::template Adder<name>(ServiceContextBuilder<config, Ts..., ComponentConfig<name, T>>{})) {
+  template <typename T, utempl::ConstexprString name = T::kName, typename... Os>
+  static consteval auto Append(Options<Os...> = {}) -> decltype(T::template Adder<name, Options<Os...>{}>(ServiceContextBuilder<config, Ts..., ComponentConfig<name, T, Options<Os...>{}>>{})) {
     return {};
   };
 
-  template <typename T, utempl::ConstexprString name = T::kName>
-  static consteval auto Append() -> ServiceContextBuilder<config, Ts..., ComponentConfig<name, T>> 
-        requires (!requires(ServiceContextBuilder<config, Ts..., ComponentConfig<name, T>> builder) {T::template Adder<name>(builder);}) {
+  template <typename T, utempl::ConstexprString name = T::kName, typename... Os>
+  static consteval auto Append(Options<Os...> = {}) -> ServiceContextBuilder<config, Ts..., ComponentConfig<name, T, Options<Os...>{}>> 
+        requires (!requires(ServiceContextBuilder<config, Ts..., ComponentConfig<name, T, Options<Os...>{}>> builder) {T::template Adder<name, Options<Os...>{}>(builder);}) {
     return {};
   };
 
@@ -102,13 +121,13 @@ struct ServiceContextBuilder {
   };
 
   template <typename F>
-  static consteval auto TransformComponents(F&& f) -> ServiceContextBuilder<config, decltype(TransformIfOk(Ts{}, f))...> {
+  static consteval auto TransformComponents(F&& f) -> ServiceContextBuilder<config, decltype(impl::TransformIfOk(Ts{}, f))...> {
     return {};
   };
   template <utempl::ConstexprString name>
   static consteval auto FindComponent() {
-    return []<typename... TTs, utempl::ConstexprString... names>
-    (const ServiceContextBuilder<config,ComponentConfig<names, TTs>...>&) 
+    return []<typename... TTs, utempl::ConstexprString... names, Options... Options>
+    (const ServiceContextBuilder<config, ComponentConfig<names, TTs, Options>...>&) 
         -> decltype(utempl::Get<Find<utempl::Wrapper<name>>(utempl::TypeList<utempl::Wrapper<names>...>{})>(utempl::TypeList<TTs...>{})) {
       std::unreachable();
     }(ServiceContextBuilder<config, Ts...>{});
@@ -119,8 +138,9 @@ struct ServiceContextBuilder {
   };
 
   static constexpr auto Run() -> void {
-    []<utempl::ConstexprString... names, typename... TTs>(utempl::TypeList<ComponentConfig<names, TTs>...>) {
-      ServiceContext<config, utempl::kTypeList<utempl::Wrapper<names>...>, TTs...> context;
+    []<utempl::ConstexprString... names, typename... TTs, Options... Options>
+    (utempl::TypeList<ComponentConfig<names, TTs, Options>...>) {
+      ServiceContext<config, utempl::Tuple{names...}, utempl::Tuple{Options...}, TTs...> context;
       context.Run();
       for(;;) {
         std::this_thread::sleep_for(std::chrono::minutes(1));
diff --git a/include/cserver/server/handlers/http_handler_base.hpp b/include/cserver/server/handlers/http_handler_base.hpp
index a3eaa98..12a199c 100644
--- a/include/cserver/server/handlers/http_handler_base.hpp
+++ b/include/cserver/server/handlers/http_handler_base.hpp
@@ -8,10 +8,10 @@
 namespace cserver::server::handlers {
 
 struct HTTPHandlerBase {
-  template <typename T, utempl::ConstexprString name>
+  template <typename T, utempl::ConstexprString name, Options Options>
   static consteval auto Adder(const auto& context) {
-    return context.TransformComponents([]<typename TT>(const ComponentConfig<T::kHandlerManagerName, TT>) {
-      return ComponentConfig<T::kHandlerManagerName, typename TT::template AddHandler<ComponentConfig<name, T>>>{};
+    return context.TransformComponents([]<typename TT>(const ComponentConfig<T::kHandlerManagerName, TT, Options>) {
+      return ComponentConfig<T::kHandlerManagerName, typename TT::template AddHandler<ComponentConfig<name, T, Options>>, Options>{};
     });
   };
   template <typename Self>
diff --git a/include/cserver/server/server/server.hpp b/include/cserver/server/server/server.hpp
index 13cfe25..f864ca5 100644
--- a/include/cserver/server/server/server.hpp
+++ b/include/cserver/server/server/server.hpp
@@ -8,16 +8,7 @@
 
 
 namespace cserver::server::server {
-namespace impl {
-template <typename T>
-using GetTypeFromComponentConfig = decltype([]<utempl::ConstexprString name, typename TT>(const ComponentConfig<name, TT>&) -> TT {}(std::declval<T>()));
 
-template <typename T>
-inline constexpr utempl::ConstexprString kNameFromComponentConfig = 
-  decltype([]<utempl::ConstexprString name, typename TT>(const ComponentConfig<name, TT>&) {
-    return utempl::Wrapper<name>{};
-  } (std::declval<T>()))::kValue;
-} // namespace impl
 
 template <utempl::ConstexprString TPName = "basicTaskProcessor", typename TaskProcessor = int, typename... Ts>
 struct Server {
@@ -27,7 +18,7 @@ struct Server {
   unsigned short port;
   static constexpr utempl::Tuple kNames = {impl::kNameFromComponentConfig<Ts>...};
   static constexpr utempl::Tuple kPaths = {impl::GetTypeFromComponentConfig<Ts>::kPath...};
-  template <utempl::ConstexprString name, typename T>
+  template <utempl::ConstexprString name, Options Options, typename T>
   static consteval auto Adder(const T& context) {
     constexpr utempl::ConstexprString tpName = [&]{
       if constexpr(requires{T::kConfig.template Get<name>().template Get<"taskProcessor">();}) {
@@ -38,7 +29,7 @@ struct Server {
     }();
     using TP = decltype(context.template FindComponent<tpName>());
     return context.TransformComponents(
-      [&](const ComponentConfig<name, Server<TPName, int, Ts...>>&) -> ComponentConfig<name, Server<tpName, TP, Ts...>> {
+      [&](const ComponentConfig<name, Server<TPName, int, Ts...>, Options>&) -> ComponentConfig<name, Server<tpName, TP, Ts...>, Options> {
         return {};
       });
   };
@@ -88,7 +79,7 @@ struct Server {
       co_await boost::asio::async_write(socket, boost::asio::buffer(error404.data(), error404.size()), boost::asio::use_awaitable);
     };
   };
-  auto Task() -> cserver::Task<void> {
+  auto Task() -> Task<void> {
     auto executor = co_await boost::asio::this_coro::executor;
     boost::asio::ip::tcp::acceptor acceptor{executor, {boost::asio::ip::tcp::v6(), this->port}};
     for(;;) {