move includes from aether.h and use forward declarations

Author: BartolomeyKant

aether/ae_actions/telemetry.cpp

@@ -21,6 +21,7 @@
 #  include "aether/aether.h"
 #  include "aether/format/format.h"
 #  include "aether/tele/traps/statistics_trap.h"
+#  include "aether/tele/traps/tele_statistics.h"
 
 #  include "aether/mstream.h"
 #  include "aether/mstream_buffers.h"
@@ -111,7 +112,9 @@ std::optional<Telemetric> Telemetry::CollectTelemetry(
     return std::nullopt;
   }
   auto& statistics_storage =
-      aether_ptr->tele_statistics->trap()->statistics_store;
+      tele::TeleStatistics::ptr{aether_ptr->tele_statistics}
+          ->trap()
+          ->statistics_store;
   auto& env_storage = statistics_storage.env_store();
   Telemetric res{};
   res.cpp.utm_id = env_storage.utm_id;

aether/aether.cpp

@@ -18,23 +18,38 @@
 
 #include <utility>
 
-#include "aether/global_ids.h"
 #include "aether/obj/obj_ptr.h"
+#include "aether/ae_actions/time_sync.h"
+#include "aether/actions/action_processor.h"
+
+#include "aether/client.h"
+#include "aether/server.h"
+#include "aether/registration_cloud.h"
 
 #include "aether/work_cloud.h"
+#include "aether/registration/registration.h"
 
 #include "aether/aether_tele.h"
 
 namespace ae {
 
-Aether::Aether(ObjProp prop) : Obj{prop} { AE_TELE_DEBUG(AetherCreated); }
+Aether::Aether() : action_processor{make_unique<ActionProcessor>()} {}
+
+Aether::Aether(ObjProp prop)
+    : Obj{prop}, action_processor{make_unique<ActionProcessor>()} {
+  AE_TELE_DEBUG(AetherCreated);
+}
 
 Aether::~Aether() { AE_TELE_DEBUG(AetherDestroyed); }
 
 void Aether::Update(TimePoint current_time) {
   update_time = action_processor->Update(current_time);
 }
 
+Aether::operator ActionContext() const {
+  return ActionContext{*action_processor};
+}
+
 Client::ptr Aether::CreateClient(ClientConfig const& config,
                                  std::string const& client_id) {
   auto client = FindClient(client_id);

aether/aether.h

@@ -25,27 +25,33 @@
 #include "aether/obj/obj.h"
 #include "aether/actions/action_ptr.h"
 #include "aether/types/client_config.h"
-#include "aether/ae_actions/time_sync.h"
+
 #include "aether/actions/action_context.h"
-#include "aether/actions/action_processor.h"
 #include "aether/ae_actions/select_client.h"
-#include "aether/tele/traps/tele_statistics.h"
-#include "aether/registration/registration.h"  // IWYU pragma: keep
 
-#include "aether/client.h"
-#include "aether/crypto.h"
-#include "aether/server.h"
 #include "aether/uap/uap.h"
-#include "aether/poller/poller.h"
-#include "aether/dns/dns_resolve.h"
-#include "aether/adapter_registry.h"
-#include "aether/registration_cloud.h"
 
 namespace ae {
+class Server;
+class Client;
+class Crypto;
+class IPoller;
+class DnsResolver;
+class Registration;
+class TimeSyncAction;
+class AdapterRegistry;
+class ActionProcessor;
+class RegistrationCloud;
+class RegistrationCloud;
+
+namespace tele {
+class TeleStatistics;
+}
+
 class Aether : public Obj {
   AE_OBJECT(Aether, Obj, 0)
 
-  Aether() = default;
+  Aether();
 
  public:
   // Internal.
@@ -75,40 +81,39 @@ class Aether : public Obj {
   void Update(TimePoint current_time) override;
 
   // User-facing API.
-  operator ActionContext() const { return ActionContext{*action_processor}; }
+  operator ActionContext() const;
 
-  Client::ptr CreateClient(ClientConfig const& config,
-                           std::string const& client_id);
+  ObjPtr<Client> CreateClient(ClientConfig const& config,
+                              std::string const& client_id);
   ActionPtr<SelectClientAction> SelectClient(Uid parent_uid,
                                              std::string const& client_id);
 
   void StoreServer(Server::ptr s);
   Server::ptr GetServer(ServerId server_id);
 
-  Client::ptr client_prefab;
-  RegistrationCloud::ptr registration_cloud;
+  Obj::ptr client_prefab;
+  Obj::ptr registration_cloud;
 
-  Crypto::ptr crypto;
-  IPoller::ptr poller;
-  DnsResolver::ptr dns_resolver;
+  Obj::ptr crypto;
+  Obj::ptr poller;
+  Obj::ptr dns_resolver;
 
-  AdapterRegistry::ptr adapter_registry;
+  Obj::ptr adapter_registry;
   Uap::ptr uap;
 
-  tele::TeleStatistics::ptr tele_statistics;
+  Obj::ptr tele_statistics;
 
-  std::unique_ptr<ActionProcessor> action_processor =
-      make_unique<ActionProcessor>();
+  std::unique_ptr<ActionProcessor> action_processor;
 
  private:
-  Client::ptr FindClient(std::string const& client_id);
-  void StoreClient(Client::ptr client);
+  ObjPtr<Client> FindClient(std::string const& client_id);
+  void StoreClient(ObjPtr<Client> client);
 
   ActionPtr<SelectClientAction> FindSelectClientAction(
       std::string const& client_id);
   ActionPtr<SelectClientAction> MakeSelectClient() const;
   ActionPtr<SelectClientAction> MakeSelectClient(
-      Client::ptr const& client) const;
+      ObjPtr<Client> const& client) const;
 #if AE_SUPPORT_REGISTRATION
   ActionPtr<SelectClientAction> MakeSelectClient(
       ActionPtr<Registration> registration, std::string const& client_id);
@@ -119,10 +124,10 @@ class Aether : public Obj {
  private:
 #endif
 
-  void MakeTimeSyncAction(Client::ptr const& client);
+  void MakeTimeSyncAction(ObjPtr<Client> const& client);
 
-  std::map<std::string, Client::ptr> clients_;
-  std::map<ServerId, Server::ptr> servers_;
+  std::map<std::string, Obj::ptr> clients_;
+  std::map<ServerId, Obj::ptr> servers_;
 
   std::map<std::string, ActionPtr<SelectClientAction>> select_client_actions_;
 #if AE_TIME_SYNC_ENABLED

aether/aether_app.cpp

@@ -24,6 +24,7 @@
 #include "aether/crypto/key.h"
 #include "aether/global_ids.h"
 #include "aether/adapters/ethernet.h"
+#include "aether/registration_cloud.h"
 #include "aether/adapters/wifi_adapter.h"
 #include "aether/poller/win_poller.h"
 #include "aether/poller/epoll_poller.h"
@@ -82,7 +83,8 @@ static Aether::ptr AetherFactory(AetherAppContext const& context) {
 
 static tele::TeleStatistics::ptr TeleStatisticsFactory(
     AetherAppContext const& context) {
-  auto tele_statistics = context.aether()->tele_statistics;
+  auto tele_statistics =
+      tele::TeleStatistics::ptr{context.aether()->tele_statistics};
   if (tele_statistics.is_valid()) {
     return tele_statistics;
   }
@@ -98,7 +100,7 @@ static tele::TeleStatistics::ptr TeleStatisticsFactory(
 #if AE_DISTILLATION
 static AdapterRegistry::ptr AdapterRegistryFactory(
     AetherAppContext const& context) {
-  auto ap = context.aether()->adapter_registry;
+  auto ap = AdapterRegistry::ptr{context.aether()->adapter_registry};
   if (ap.is_valid()) {
     return ap;
   }
@@ -126,11 +128,11 @@ static Adapter::ptr DefaultAdapterFactory(AetherAppContext const& context) {
 
 #  if AE_SUPPORT_REGISTRATION
 static Cloud::ptr RegistrationCloudFactory(AetherAppContext const& context) {
-  auto reg_c = context.aether()->registration_cloud;
-  if (reg_c.is_valid()) {
-    return reg_c;
+  auto cloud = Cloud::ptr{context.aether()->registration_cloud};
+  if (cloud.is_valid()) {
+    return cloud;
   }
-  reg_c = RegistrationCloud::ptr::Create(
+  auto reg_c = RegistrationCloud::ptr::Create(
       CreateWith{context.domain()}
           .with_id(GlobalId::kRegistrationCloud)
           .with_flags(ObjFlags::kUnloadedByDefault),
@@ -151,7 +153,7 @@ static Cloud::ptr RegistrationCloudFactory(AetherAppContext const& context) {
 #  endif  // AE_SUPPORT_REGISTRATION
 
 static Crypto::ptr CryptoFactory(AetherAppContext const& context) {
-  auto crypto = context.aether()->crypto;
+  auto crypto = Crypto::ptr{context.aether()->crypto};
   if (crypto.is_valid()) {
     return crypto;
   }
@@ -172,7 +174,7 @@ static Crypto::ptr CryptoFactory(AetherAppContext const& context) {
 }
 
 static IPoller::ptr PollerFactory(AetherAppContext const& context) {
-  auto poller = context.aether()->poller;
+  auto poller = IPoller::ptr{context.aether()->poller};
   if (poller.is_valid()) {
     return poller;
   }
@@ -202,7 +204,7 @@ static IPoller::ptr PollerFactory(AetherAppContext const& context) {
 }
 
 static DnsResolver::ptr DnsResolverFactory(AetherAppContext const& context) {
-  auto dns_resolver = context.aether()->dns_resolver;
+  auto dns_resolver = DnsResolver::ptr{context.aether()->dns_resolver};
   if (dns_resolver.is_valid()) {
     return dns_resolver;
   }
@@ -219,7 +221,7 @@ static DnsResolver::ptr DnsResolverFactory(AetherAppContext const& context) {
           .with_id(GlobalId::kDnsResolver)
           .with_flags(ObjFlags::kUnloadedByDefault),
       context.aether());
-  #else
+#    else
   return {};
 #    endif
 #  else

aether/aether_app.h

@@ -42,6 +42,7 @@
 #include "aether/poller/poller.h"
 #include "aether/dns/dns_resolve.h"
 #include "aether/adapter_registry.h"
+#include "aether/tele/traps/tele_statistics.h"
 #include "aether/obj/component_factory.h"
 
 #include "aether/domain_storage/domain_storage_factory.h"

aether/config.h

@@ -111,7 +111,7 @@
  * Also choose one of the supported modem implementations.
  */
 #ifndef AE_SUPPORT_MODEMS
-#  define AE_SUPPORT_MODEMS 1
+#  define AE_SUPPORT_MODEMS 0
 #endif
 
 // Thingy91x modem implementation is enabled.

aether/registration/registration.cpp

@@ -21,6 +21,7 @@
 #  include <utility>
 
 #  include "aether/aether.h"
+#  include "aether/crypto.h"
 #  include "aether/crypto/sign.h"
 #  include "aether/api_protocol/api_context.h"
 #  include "aether/crypto/crypto_definitions.h"
@@ -50,7 +51,7 @@ Registration::Registration(ActionContext action_context, Aether& aether,
       state_{State::kInitConnection},
       // TODO: add configuration
       response_timeout_{std::chrono::seconds(20)},
-      sign_pk_{aether.crypto->signs_pk_[kDefaultSignatureMethod]} {
+      sign_pk_{Crypto::ptr{aether.crypto}->signs_pk_[kDefaultSignatureMethod]} {
   AE_TELE_INFO(RegisterStarted);
 
   // parent uid must not be empty

aether/transport/system_sockets/sockets/win_udp_socket.h

@@ -20,7 +20,7 @@
 #include "aether/config.h"
 #include "aether/transport/system_sockets/sockets/win_socket.h"  // IWYU pragma: keep
 
-#if AE_SUPPORT_UDP && defined WIN_SOCKET_ENABLED
+#if AE_SUPPORT_UDP && WIN_SOCKET_ENABLED
 
 namespace ae {
 class WinUdpSocket final : public WinSocket {

tools/registrator/registrator_action.cpp

@@ -16,6 +16,8 @@
 
 #include "registrator/registrator_action.h"
 
+#include "aether/registration/registration.h"
+
 namespace ae::reg {
 RegistratorAction::RegistratorAction(
     ActionContext action_context, RcPtr<AetherApp> const& aether_app,