Merge branch 'master' into patch-2

1 files changed, 35 insertions, 26 deletions

diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index 916dea58b..0813a8e7d 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -1,4 +1,6 @@
-#pragma warning disable CS1591
+#nullable disable
+
+#pragma warning disable CS1591, SA1306, SA1401
 
 using System;
 using System.Collections.Generic;
@@ -8,6 +10,7 @@ using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Controller.Net
@@ -28,18 +31,6 @@ namespace MediaBrowser.Controller.Net
             new List<Tuple<IWebSocketConnection, CancellationTokenSource, TStateType>>();
 
         /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        protected abstract string Name { get; }
-
-        /// <summary>
-        /// Gets the data to send.
-        /// </summary>
-        /// <returns>Task{`1}.</returns>
-        protected abstract Task<TReturnDataType> GetDataToSend();
-
-        /// <summary>
         /// The logger.
         /// </summary>
         protected ILogger<BasePeriodicWebSocketListener<TReturnDataType, TStateType>> Logger;
@@ -55,6 +46,30 @@ namespace MediaBrowser.Controller.Net
         }
 
         /// <summary>
+        /// Gets the type used for the messages sent to the client.
+        /// </summary>
+        /// <value>The type.</value>
+        protected abstract SessionMessageType Type { get; }
+
+        /// <summary>
+        /// Gets the message type received from the client to start sending messages.
+        /// </summary>
+        /// <value>The type.</value>
+        protected abstract SessionMessageType StartType { get; }
+
+        /// <summary>
+        /// Gets the message type received from the client to stop sending messages.
+        /// </summary>
+        /// <value>The type.</value>
+        protected abstract SessionMessageType StopType { get; }
+
+        /// <summary>
+        /// Gets the data to send.
+        /// </summary>
+        /// <returns>Task{`1}.</returns>
+        protected abstract Task<TReturnDataType> GetDataToSend();
+
+        /// <summary>
         /// Processes the message.
         /// </summary>
         /// <param name="message">The message.</param>
@@ -66,12 +81,12 @@ namespace MediaBrowser.Controller.Net
                 throw new ArgumentNullException(nameof(message));
             }
 
-            if (string.Equals(message.MessageType, Name + "Start", StringComparison.OrdinalIgnoreCase))
+            if (message.MessageType == StartType)
             {
                 Start(message);
             }
 
-            if (string.Equals(message.MessageType, Name + "Stop", StringComparison.OrdinalIgnoreCase))
+            if (message.MessageType == StopType)
             {
                 Stop(message);
             }
@@ -79,6 +94,9 @@ namespace MediaBrowser.Controller.Net
             return Task.CompletedTask;
         }
 
+        /// <inheritdoc />
+        public Task ProcessWebSocketConnectedAsync(IWebSocketConnection connection) => Task.CompletedTask;
+
         /// <summary>
         /// Starts sending messages over a web socket.
         /// </summary>
@@ -159,7 +177,7 @@ namespace MediaBrowser.Controller.Net
                         new WebSocketMessage<TReturnDataType>
                         {
                             MessageId = Guid.NewGuid(),
-                            MessageType = Name,
+                            MessageType = Type,
                             Data = data
                         },
                         cancellationToken).ConfigureAwait(false);
@@ -176,7 +194,7 @@ namespace MediaBrowser.Controller.Net
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex, "Error sending web socket message {Name}", Name);
+                Logger.LogError(ex, "Error sending web socket message {Name}", Type);
                 DisposeConnection(tuple);
             }
         }
@@ -252,13 +270,4 @@ namespace MediaBrowser.Controller.Net
             GC.SuppressFinalize(this);
         }
     }
-
-    public class WebSocketListenerState
-    {
-        public DateTime DateLastSendUtc { get; set; }
-
-        public long InitialDelayMs { get; set; }
-
-        public long IntervalMs { get; set; }
-    }
 }