From 46d1713e28c1726c28d998bd89a9c481cb7a53ce Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 2 Nov 2022 11:43:22 +0900
Subject: [PATCH] Rename Socket* -> PersistentEndpoint*

---
 osu.Game/Online/HubClient.cs                              | 2 +-
 osu.Game/Online/HubClientConnector.cs                     | 6 +++---
 .../{SocketClient.cs => PersistentEndpointClient.cs}      | 2 +-
 ...tConnector.cs => PersistentEndpointClientConnector.cs} | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename osu.Game/Online/{SocketClient.cs => PersistentEndpointClient.cs} (90%)
 rename osu.Game/Online/{SocketClientConnector.cs => PersistentEndpointClientConnector.cs} (95%)

diff --git a/osu.Game/Online/HubClient.cs b/osu.Game/Online/HubClient.cs
index 262e298f34..07428f58b4 100644
--- a/osu.Game/Online/HubClient.cs
+++ b/osu.Game/Online/HubClient.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.SignalR.Client;
 
 namespace osu.Game.Online
 {
-    public class HubClient : SocketClient
+    public class HubClient : PersistentEndpointClient
     {
         public readonly HubConnection Connection;
 
diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 33e9f92817..6f246f6dd3 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -14,7 +14,7 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online
 {
-    public class HubClientConnector : SocketClientConnector, IHubClientConnector
+    public class HubClientConnector : PersistentEndpointClientConnector, IHubClientConnector
     {
         public const string SERVER_SHUTDOWN_MESSAGE = "Server is shutting down.";
 
@@ -51,7 +51,7 @@ namespace osu.Game.Online
             this.preferMessagePack = preferMessagePack;
         }
 
-        protected override Task<SocketClient> BuildConnectionAsync(CancellationToken cancellationToken)
+        protected override Task<PersistentEndpointClient> BuildConnectionAsync(CancellationToken cancellationToken)
         {
             var builder = new HubConnectionBuilder()
                 .WithUrl(endpoint, options =>
@@ -91,7 +91,7 @@ namespace osu.Game.Online
 
             ConfigureConnection?.Invoke(newConnection);
 
-            return Task.FromResult((SocketClient)new HubClient(newConnection));
+            return Task.FromResult((PersistentEndpointClient)new HubClient(newConnection));
         }
 
         protected override string ClientName { get; }
diff --git a/osu.Game/Online/SocketClient.cs b/osu.Game/Online/PersistentEndpointClient.cs
similarity index 90%
rename from osu.Game/Online/SocketClient.cs
rename to osu.Game/Online/PersistentEndpointClient.cs
index 3b4aa1b49b..d6ed2d8aec 100644
--- a/osu.Game/Online/SocketClient.cs
+++ b/osu.Game/Online/PersistentEndpointClient.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace osu.Game.Online
 {
-    public abstract class SocketClient : IAsyncDisposable
+    public abstract class PersistentEndpointClient : IAsyncDisposable
     {
         public event Func<Exception?, Task>? Closed;
 
diff --git a/osu.Game/Online/SocketClientConnector.cs b/osu.Game/Online/PersistentEndpointClientConnector.cs
similarity index 95%
rename from osu.Game/Online/SocketClientConnector.cs
rename to osu.Game/Online/PersistentEndpointClientConnector.cs
index 823e724ef9..fca7f2ed48 100644
--- a/osu.Game/Online/SocketClientConnector.cs
+++ b/osu.Game/Online/PersistentEndpointClientConnector.cs
@@ -12,7 +12,7 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online
 {
-    public abstract class SocketClientConnector : Component
+    public abstract class PersistentEndpointClientConnector : Component
     {
         /// <summary>
         /// Whether this is connected to the hub, use <see cref="CurrentConnection"/> to access the connection, if this is <c>true</c>.
@@ -22,7 +22,7 @@ namespace osu.Game.Online
         /// <summary>
         /// The current connection opened by this connector.
         /// </summary>
-        public SocketClient? CurrentConnection { get; private set; }
+        public PersistentEndpointClient? CurrentConnection { get; private set; }
 
         private readonly Bindable<bool> isConnected = new Bindable<bool>();
         private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
@@ -34,7 +34,7 @@ namespace osu.Game.Online
         /// Constructs a new <see cref="HubClientConnector"/>.
         /// </summary>
         /// <param name="api"> An API provider used to react to connection state changes.</param>
-        protected SocketClientConnector(IAPIProvider api)
+        protected PersistentEndpointClientConnector(IAPIProvider api)
         {
             apiState.BindTo(api.State);
             apiState.BindValueChanged(_ => Task.Run(connectIfPossible), true);
@@ -124,7 +124,7 @@ namespace osu.Game.Online
             await Task.Delay(5000, cancellationToken).ConfigureAwait(false);
         }
 
-        protected abstract Task<SocketClient> BuildConnectionAsync(CancellationToken cancellationToken);
+        protected abstract Task<PersistentEndpointClient> BuildConnectionAsync(CancellationToken cancellationToken);
 
         private async Task onConnectionClosed(Exception? ex, CancellationToken cancellationToken)
         {