Rename socket to connectionContext

Obsidian/Client.cs

@@ -11,7 +11,6 @@
 using Obsidian.Net.Packets.Login;
 using Obsidian.Net.Packets.Play;
 using Obsidian.Net.Packets.Play.Clientbound;
-using Obsidian.Net.Packets.Play.Serverbound;
 using Obsidian.Net.Packets.Status;
 using Obsidian.Registries;
 using Obsidian.Utilities.Mojang;
@@ -112,9 +111,9 @@ public sealed class Client : IDisposable
     private readonly PacketCryptography packetCryptography;
 
     /// <summary>
-    /// The socket associated with the <see cref="networkStream"/>.
+    /// The connection context associated with the <see cref="networkStream"/>.
     /// </summary>
-    private readonly ConnectionContext socket;
+    private readonly ConnectionContext connectionContext;
 
     /// <summary>
     /// The current server configuration.
@@ -139,7 +138,7 @@ public sealed class Client : IDisposable
     /// <summary>
     /// The client's ip and port used to establish this connection.
     /// </summary>
-    public EndPoint? RemoteEndPoint => socket.RemoteEndPoint;
+    public EndPoint? RemoteEndPoint => connectionContext.RemoteEndPoint;
 
     /// <summary>
     /// Executed when the client disconnects.
@@ -166,25 +165,25 @@ public sealed class Client : IDisposable
     /// </summary>
     public string? Brand { get; set; }
 
-    public Client(ConnectionContext socket, ServerConfiguration config, int playerId, Server originServer)
+    public Client(ConnectionContext connectionContext, ServerConfiguration config, int playerId, Server originServer)
     {
-        this.socket = socket;
+        this.connectionContext = connectionContext;
         this.config = config;
         id = playerId;
         Server = originServer;
 
         LoadedChunks = new();
         packetCryptography = new();
         handler = new(config);
-        networkStream = new(socket.Transport);
+        networkStream = new(connectionContext.Transport);
         minecraftStream = new(networkStream);
 
         missedKeepAlives = new List<long>();
         var linkOptions = new DataflowLinkOptions { PropagateCompletion = true };
         var blockOptions = new ExecutionDataflowBlockOptions { CancellationToken = cancellationSource.Token, EnsureOrdered = true };
         var sendPacketBlock = new ActionBlock<IClientboundPacket>(packet =>
         {
-            if (socket.IsConnected())
+            if (connectionContext.IsConnected())
                 SendPacket(packet);
         }, blockOptions);
 
@@ -228,7 +227,7 @@ public Client(ConnectionContext socket, ServerConfiguration config, int playerId
 
     public async Task StartConnectionAsync()
     {
-        while (!cancellationSource.IsCancellationRequested && socket.IsConnected())
+        while (!cancellationSource.IsCancellationRequested && connectionContext.IsConnected())
         {
             (var id, var data) = await GetNextPacketAsync();
 
@@ -266,7 +265,7 @@ public async Task StartConnectionAsync()
                         {
                             if (this.Server.Config.CanThrottle)
                             {
-                                string ip = ((IPEndPoint)socket.RemoteEndPoint!).Address.ToString();
+                                string ip = ((IPEndPoint)connectionContext.RemoteEndPoint!).Address.ToString();
 
                                 if (Server.throttler.TryGetValue(ip, out var timeLeft))
                                 {
@@ -713,7 +712,7 @@ internal void SendPacket(IClientboundPacket packet)
         catch (SocketException)
         {
             // Clients can disconnect at any point, causing exception to be raised
-            if (!socket.IsConnected())
+            if (!connectionContext.IsConnected())
             {
                 Disconnect();
             }
@@ -779,7 +778,7 @@ public void Dispose()
         disposed = true;
 
         minecraftStream.Dispose();
-        socket.Abort();
+        connectionContext.Abort();
         cancellationSource?.Dispose();
 
         GC.SuppressFinalize(this);