TOSAsync

Src/Server/RemoteClient.hpp

@@ -3,12 +3,18 @@
 #include <TOSLib.hpp>
 #include <Common/Lockable.hpp>
 #include <Common/Net.hpp>
+#include <Common/Async.hpp>
 #include "Abstract.hpp"
 #include "Common/Packets.hpp"
 #include "Server/ContentEventController.hpp"
+#include "TOSAsync.hpp"
+#include "boost/asio/detached.hpp"
+#include "boost/asio/io_context.hpp"
+#include "boost/asio/use_awaitable.hpp"
 #include <Common/Abstract.hpp>
 #include <bitset>
 #include <initializer_list>
+#include <memory>
 #include <set>
 #include <type_traits>
 #include <unordered_map>
@@ -173,16 +179,16 @@ using EntityKey = std::tuple<WorldId_c, Pos::GlobalRegion>;
 
 
 
-
+class RemoteClient;
+using RemoteClient_ptr = std::unique_ptr<RemoteClient, std::function<void(RemoteClient*)>>;
 
 /*
     Обработчик сокета клиента.
     Подписывает клиента на отслеживание необходимых ресурсов
     на основе передаваемых клиенту данных
 */
-class RemoteClient {
+class RemoteClient : public TOS::IAsyncDestructible {
     TOS::Logger LOG;
-    DestroyLock UseLock;
     Net::AsyncSocket Socket;
     bool IsConnected = true, IsGoingShutdown = false;
 
@@ -264,20 +270,32 @@ class RemoteClient {
     ResourceRequest NextRequest;
     std::vector<Net::Packet> SimplePackets;
 
+    TOS::WaitableCoro RunCoro;
+
 public:
     const std::string Username;
     Pos::Object CameraPos = {0, 0, 0};
     ToServer::PacketQuat CameraQuat = {0};
 
-public:
+private:
+
     RemoteClient(asio::io_context &ioc, tcp::socket socket, const std::string username)
-        : LOG("RemoteClient " + username), Socket(ioc, std::move(socket)), Username(username)
+        : IAsyncDestructible(ioc), LOG("RemoteClient " + username), Socket(ioc, std::move(socket)), 
+            Username(username), RunCoro(ioc)
     {
+        RunCoro.co_spawn(run());
     }
 
-    ~RemoteClient();
-
+    virtual coro<> asyncDestructor() override;
     coro<> run();
+
+public:
+    static RemoteClient_ptr Create(asio::io_context &ioc, tcp::socket socket, const std::string username) {
+        return createUnique<>(ioc, new RemoteClient(ioc, std::move(socket), username));
+    }
+
+    virtual ~RemoteClient();
+
     void shutdown(EnumDisconnect type, const std::string reason);
     bool isConnected() { return IsConnected; }