feat: add shorter path functions to send message / disconnect

Author: insthync

SimpleNetworkManager.NET/Network/BaseNetworkClient.cs

@@ -1,4 +1,5 @@
 using Cysharp.Threading.Tasks;
+using Insthync.SimpleNetworkManager.NET.Messages;
 using Insthync.SimpleNetworkManager.NET.Services;
 using Microsoft.Extensions.Logging;
 using System;
@@ -10,17 +11,36 @@ public abstract class BaseNetworkClient
     {
         protected readonly ILoggerFactory _loggerFactory;
         protected readonly ILogger<BaseNetworkClient> _logger;
-        protected readonly MessageRouter _messageRouter;
+        protected readonly MessageRouterService _messageRouter;
 
-        public MessageRouter MessageRouter => _messageRouter;
+        public MessageRouterService MessageRouter => _messageRouter;
         public abstract BaseClientConnection? ClientConnection { get; }
         public bool IsConnected => ClientConnection?.IsConnected ?? false;
 
         public BaseNetworkClient(ILoggerFactory loggerFactory)
         {
             _loggerFactory = loggerFactory;
             _logger = _loggerFactory.CreateLogger<BaseNetworkClient>();
-            _messageRouter = new MessageRouter(_loggerFactory.CreateLogger<MessageRouter>());
+            _messageRouter = new MessageRouterService(_loggerFactory.CreateLogger<MessageRouterService>());
+        }
+
+        public async UniTask SendMessageAsync<T>(T message)
+            where T : BaseMessage
+        {
+            if (ClientConnection == null)
+                return;
+            await ClientConnection.SendMessageAsync(message);
+        }
+
+        public async UniTask DisconnectAsync()
+        {
+            if (ClientConnection == null || !ClientConnection.IsConnected)
+            {
+                _logger.LogWarning("Client is not connecting");
+                return;
+            }
+            await ClientConnection.DisconnectAsync();
+            ClientConnection?.Dispose();
         }
 
         protected virtual void SetupConnection()
@@ -73,6 +93,5 @@ protected virtual async void OnClientMessageReceived(BaseClientConnection client
         }
 
         public abstract UniTask ConnectAsync(string hostname, int port, CancellationToken cancellationToken);
-        public abstract UniTask DisconnectAsync();
     }
 }

SimpleNetworkManager.NET/Network/BaseNetworkServer.cs

@@ -1,4 +1,5 @@
 using Cysharp.Threading.Tasks;
+using Insthync.SimpleNetworkManager.NET.Messages;
 using Insthync.SimpleNetworkManager.NET.Services;
 using Microsoft.Extensions.Logging;
 using System;
@@ -11,11 +12,11 @@ public abstract class BaseNetworkServer
         protected readonly ILoggerFactory _loggerFactory;
         protected readonly ILogger<BaseNetworkServer> _logger;
         protected readonly ConnectionManager _connectionManager;
-        protected readonly MessageRouter _messageRouter;
+        protected readonly MessageRouterService _messageRouter;
         public int MaxConnections = 1;
 
         public ConnectionManager ConnectionManager => _connectionManager;
-        public MessageRouter MessageRouter => _messageRouter;
+        public MessageRouterService MessageRouter => _messageRouter;
 
         /// <summary>
         /// Indicates whether the server is currently running
@@ -27,7 +28,26 @@ public BaseNetworkServer(ILoggerFactory loggerFactory)
             _loggerFactory = loggerFactory;
             _logger = _loggerFactory.CreateLogger<BaseNetworkServer>();
             _connectionManager = new ConnectionManager(_loggerFactory.CreateLogger<ConnectionManager>());
-            _messageRouter = new MessageRouter(_loggerFactory.CreateLogger<MessageRouter>());
+            _messageRouter = new MessageRouterService(_loggerFactory.CreateLogger<MessageRouterService>());
+        }
+
+        public async UniTask SendMessageAsync<T>(uint connectionId, T message)
+            where T : BaseMessage
+        {
+            if (!_connectionManager.TryGetConnection(connectionId, out var clientConnection))
+                return;
+            if (clientConnection == null || !clientConnection.IsConnected)
+                return;
+            await clientConnection.SendMessageAsync(message);
+        }
+
+        public async UniTask DisconnectAsync(uint connectionId)
+        {
+            if (!_connectionManager.TryGetConnection(connectionId, out var clientConnection))
+                return;
+            if (clientConnection == null || !clientConnection.IsConnected)
+                return;
+            await clientConnection.DisconnectAsync();
         }
 
         protected virtual void AddConnection(BaseClientConnection clientConnection)

SimpleNetworkManager.NET/Network/TcpTransport/TcpNetworkClient.cs

@@ -77,17 +77,6 @@ public override async UniTask ConnectAsync(string hostname, int port, Cancellati
             }
         }
 
-        public override async UniTask DisconnectAsync()
-        {
-            if (_clientConnection == null || !_clientConnection.IsConnected)
-            {
-                _logger.LogWarning("Client is not connecting");
-                return;
-            }
-            await _clientConnection.DisconnectAsync();
-            _clientConnection?.Dispose();
-        }
-
         public void Dispose()
         {
             if (_disposed)