qol: make Online Services Connect more reliable

2025-01-23 15:14:30 +11:00
parent dee54bb6d7
commit 408e1c4c14
10 changed files with 393 additions and 229 deletions
@@ -2,6 +2,7 @@
 using Disco.Services.Logging;
 using Microsoft.AspNetCore.SignalR.Client;
 using System;
+using System.Threading;
 using System.Threading.Tasks;

 namespace Disco.Services.Interop.DiscoServices
@@ -11,7 +12,23 @@ namespace Disco.Services.Interop.DiscoServices

        private static readonly HubConnection connection;

-        public static string State => connection.State.ToString();
+        public static ConnectionState State
+        {
+            get
+            {
+                switch (connection.State)
+                {
+                    case HubConnectionState.Connected:
+                        return ConnectionState.Connected;
+                    case HubConnectionState.Connecting:
+                        return ConnectionState.Connecting;
+                    case HubConnectionState.Reconnecting:
+                        return ConnectionState.Reconnecting;
+                    default:
+                        return ConnectionState.Disconnected;
+                }
+            }
+        }

        static OnlineServicesConnect()
        {
@@ -23,13 +40,30 @@ namespace Disco.Services.Interop.DiscoServices
                .WithAutomaticReconnect()
                .WithStatefulReconnect()
                .Build();
+
+            connection.Closed += ex =>
+            {
+                SystemLog.LogException("Online Services: Connection Closed", ex);
+                return Task.CompletedTask;
+            };
+            connection.Reconnected += connectionId =>
+            {
+                SystemLog.LogInformation("Online Services: Connection Reconnected");
+                return Task.CompletedTask;
+            };
+            connection.Reconnecting += ex =>
+            {
+                SystemLog.LogInformation("Online Services: Connection Reconnecting");
+                return Task.CompletedTask;
+            };
        }

        public static async Task StartAsync()
        {
            try
            {
-                await connection.StartAsync();
+                if (connection.State == HubConnectionState.Disconnected)
+                    await connection.StartAsync();
            }
            catch (Exception ex)
            {
@@ -37,6 +71,12 @@ namespace Disco.Services.Interop.DiscoServices
            }
        }

+        public static void QueueStart()
+        {
+            if (connection.State == HubConnectionState.Disconnected)
+                ThreadPool.QueueUserWorkItem(async _ => await StartAsync());
+        }
+
        public static async Task StopAsync()
        {
            await connection.StopAsync();
@@ -88,5 +128,12 @@ namespace Disco.Services.Interop.DiscoServices
            public string Content { get; set; }
        }

+        public enum ConnectionState
+        {
+            Disconnected,
+            Connected,
+            Connecting,
+            Reconnecting
+        }
    }
 }