Fix network

Kaioru · Apr 15, 2024 · 472e833 · 472e833
1 parent bc0345e
commit 472e833
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 28 deletions.
diff --git a/src/SourceLink.Github.props b/src/SourceLink.Github.props
diff --git a/src/app/Edelstein.Application.Server/ProgramHandler.cs b/src/app/Edelstein.Application.Server/ProgramHandler.cs
@@ -19,7 +19,7 @@ internal static class ProgramHandler
     public async static Task ExecuteRoot(FileInfo file)
     {
         var builder = Host.CreateApplicationBuilder();
-
+        
         builder.Services.AddSerilog((_, configuration) => configuration.ReadFrom.Configuration(builder.Configuration));
 
         builder.Services.AddEdelsteinCommonUtilities();

diff --git a/src/common/Edelstein.Common.Network.DotNetty/Transports/NettyTransportAcceptorState.cs b/src/common/Edelstein.Common.Network.DotNetty/Transports/NettyTransportAcceptorState.cs
@@ -9,42 +9,37 @@
 
 namespace Edelstein.Common.Network.DotNetty.Transports;
 
-public class NettyTransportAcceptorState : ITransportContext
+public class NettyTransportAcceptorState(
+    IChannel channel, 
+    IEventLoopGroup group0, 
+    IEventLoopGroup group1, 
+    TransportVersion version, 
+    IReadOnlyRepository<string, ISocket> sockets
+)
+    : ITransportContext
 {
-    private readonly IChannel _channel;
-    private readonly IEventLoopGroup _group0;
-    private readonly IEventLoopGroup _group1;
 
-    public NettyTransportAcceptorState(IChannel channel, IEventLoopGroup group0, IEventLoopGroup group1, TransportVersion version, IReadOnlyRepository<string, ISocket> sockets)
-    {
-        _channel = channel;
-        _group0 = group0;
-        _group1 = group1;
-        Version = version;
-        Sockets = sockets;
-    }
-
-    public TransportState State => _channel.Active ? TransportState.Opened : TransportState.Closed;
-    public TransportVersion Version { get; }
+    public TransportState State => channel.Active ? TransportState.Opened : TransportState.Closed;
+    public TransportVersion Version { get; } = version;
 
-    public IReadOnlyRepository<string, ISocket> Sockets { get; }
+    public IReadOnlyRepository<string, ISocket> Sockets { get; } = sockets;
 
     public async Task Dispatch(IPacket packet)
         => await Task.WhenAll((await Sockets.RetrieveAll()).Select(s => s.Dispatch(packet)));
 
     public async Task Close()
     {
         await Task.WhenAll((await Sockets.RetrieveAll()).Select(s => s.Close()));
-        await _channel.CloseAsync();
+        await channel.CloseAsync();
 
 #if (DEBUG)
-        var t0 = _group0.ShutdownGracefullyAsync(TimeSpan.Zero, TimeSpan.Zero);
-        var t1 = _group1.ShutdownGracefullyAsync(TimeSpan.Zero, TimeSpan.Zero);
+        var t0 = group0.ShutdownGracefullyAsync(TimeSpan.Zero, TimeSpan.Zero);
+        var t1 = group1.ShutdownGracefullyAsync(TimeSpan.Zero, TimeSpan.Zero);
 
         await Task.WhenAll(t0, t1);
 #else
-        var t0 = _group0.ShutdownGracefullyAsync(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10));
-        var t1 = _group1.ShutdownGracefullyAsync(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10));
+        var t0 = group0.ShutdownGracefullyAsync(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10));
+        var t1 = group1.ShutdownGracefullyAsync(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10));
 
         await Task.WhenAll(t0, t1);
 #endif

diff --git a/src/common/Edelstein.Common.Network.DotNetty/Transports/NettyTransportConnectorState.cs b/src/common/Edelstein.Common.Network.DotNetty/Transports/NettyTransportConnectorState.cs
@@ -34,7 +34,7 @@ public async Task Close()
 #if (DEBUG)
         await group0.ShutdownGracefullyAsync(TimeSpan.Zero, TimeSpan.Zero);
 #else
-        await _group0.ShutdownGracefullyAsync(TimeSpan.FromSeconds(3), TimeSpan.FromSeconds(5));
+        await group0.ShutdownGracefullyAsync(TimeSpan.FromSeconds(3), TimeSpan.FromSeconds(5));
 #endif
     }
 }