alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-02 23:06:31 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix sending websocket messages (#9948)

Browse Source
This commit is contained in:
Cody Robibero
2023-07-02 16:14:44 -06:00
committed by GitHub
parent ba8f4757fd
commit 52252fcd55
8 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
View File

@@ -171,7 +171,6 @@ namespace MediaBrowser.Controller.Net
await connection.SendAsync(
new OutboundWebSocketMessage<TReturnDataType>
{
MessageId = Guid.NewGuid(),
MessageType = Type,
Data = data
},

12
MediaBrowser.Controller/Net/IWebSocketConnection.cs
View File

@@ -5,6 +5,7 @@ using System.Net;
using System.Net.WebSockets;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Controller.Net.WebSocketMessages;
namespace MediaBrowser.Controller.Net
{
@@ -45,6 +46,15 @@ namespace MediaBrowser.Controller.Net
/// <value>The remote end point.</value>
IPAddress? RemoteEndPoint { get; }
/// <summary>
/// Sends a message asynchronously.
/// </summary>
/// <param name="message">The message.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
/// <exception cref="ArgumentNullException">The message is null.</exception>
Task SendAsync(OutboundWebSocketMessage message, CancellationToken cancellationToken);
/// <summary>
/// Sends a message asynchronously.
/// </summary>
@@ -53,7 +63,7 @@ namespace MediaBrowser.Controller.Net
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
/// <exception cref="ArgumentNullException">The message is null.</exception>
Task SendAsync<T>(WebSocketMessage<T> message, CancellationToken cancellationToken);
Task SendAsync<T>(OutboundWebSocketMessage<T> message, CancellationToken cancellationToken);
Task ProcessAsync(CancellationToken cancellationToken = default);
}

4
MediaBrowser.Controller/Net/WebSocketMessageInfo.cs
View File

@@ -1,11 +1,13 @@
#nullable disable
using MediaBrowser.Controller.Net.WebSocketMessages;
namespace MediaBrowser.Controller.Net
{
/// <summary>
/// Class WebSocketMessageInfo.
/// </summary>
public class WebSocketMessageInfo : WebSocketMessage<string>
public class WebSocketMessageInfo : InboundWebSocketMessage<string>
{
/// <summary>
/// Gets or sets the connection.

5
MediaBrowser.Controller/Net/WebSocketMessageOfT.cs
View File

@@ -6,13 +6,12 @@ namespace MediaBrowser.Controller.Net;
/// Class WebSocketMessage.
/// </summary>
/// <typeparam name="T">The type of the data.</typeparam>
// TODO make this abstract, remove empty ctor.
public class WebSocketMessage<T> : WebSocketMessage
public abstract class WebSocketMessage<T> : WebSocketMessage
{
/// <summary>
/// Initializes a new instance of the <see cref="WebSocketMessage{T}"/> class.
/// </summary>
public WebSocketMessage()
protected WebSocketMessage()
{
}

2
MediaBrowser.Controller/Net/WebSocketMessages/OutboundWebSocketMessage.cs
View File

@@ -10,5 +10,5 @@ public class OutboundWebSocketMessage : WebSocketMessage, IOutboundWebSocketMess
/// <summary>
/// Gets or sets the message id.
/// </summary>
public Guid MessageId { get; set; }
public Guid MessageId { get; set; } = Guid.NewGuid();
}

2
MediaBrowser.Controller/Net/WebSocketMessages/OutboundWebSocketMessageOfT.cs
View File

@@ -29,5 +29,5 @@ public class OutboundWebSocketMessage<T> : WebSocketMessage<T>, IOutboundWebSock
/// <summary>
/// Gets or sets the message id.
/// </summary>
public Guid MessageId { get; set; }
public Guid MessageId { get; set; } = Guid.NewGuid();
}