starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed Lazy implementation.

Browse Source
This commit is contained in:
Greenback
2020-11-28 00:25:20 +00:00
parent a59aeb12e0
commit 5cd5a7d4ce
12 changed files with 95 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Emby.Server.Implementations/HttpServer/WebSocketManager.cs
View File

@@ -4,7 +4,9 @@ using System;
using System.Collections.Generic;
using System.Net.WebSockets;
using System.Threading.Tasks;
using Jellyfin.Data.Events;
using Emby.Server.Implementations.Session;
using Jellyfin.Api.WebSocketListeners;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Net;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
@@ -13,24 +15,21 @@ namespace Emby.Server.Implementations.HttpServer
{
public class WebSocketManager : IWebSocketManager
{
private readonly Lazy<IEnumerable<IWebSocketListener>> _webSocketListeners;
private readonly IServerApplicationHost _appHost;
private readonly ILogger<WebSocketManager> _logger;
private readonly ILoggerFactory _loggerFactory;
private bool _disposed = false;
public WebSocketManager(
Lazy<IEnumerable<IWebSocketListener>> webSocketListeners,
IServerApplicationHost appHost,
ILogger<WebSocketManager> logger,
ILoggerFactory loggerFactory)
{
_webSocketListeners = webSocketListeners;
_appHost = appHost;
_logger = logger;
_loggerFactory = loggerFactory;
}
public event EventHandler<GenericEventArgs<IWebSocketConnection>> WebSocketConnected;
/// <inheritdoc />
public async Task WebSocketRequestHandler(HttpContext context)
{
@@ -39,6 +38,8 @@ namespace Emby.Server.Implementations.HttpServer
return;
}
var listener = _appHost.Resolve<ISessionWebSocketListener>();
try
{
_logger.LogInformation("WS {IP} request", context.Connection.RemoteIpAddress);
@@ -54,7 +55,7 @@ namespace Emby.Server.Implementations.HttpServer
OnReceive = ProcessWebSocketMessageReceived
};
WebSocketConnected?.Invoke(this, new GenericEventArgs<IWebSocketConnection>(connection));
listener?.ProcessWebSocketConnected(connection);
await connection.ProcessAsync().ConfigureAwait(false);
_logger.LogInformation("WS {IP} closed", context.Connection.RemoteIpAddress);
@@ -80,16 +81,12 @@ namespace Emby.Server.Implementations.HttpServer
return Task.CompletedTask;
}
IEnumerable<Task> GetTasks()
{
var listeners = _webSocketListeners.Value;
foreach (var x in listeners)
{
yield return x.ProcessMessageAsync(result);
}
}
Parallel.Invoke(
() => _appHost.Resolve<IActivityLogWebSocketListener>(),
() => _appHost.Resolve<IScheduledTasksWebSocketListener>(),
() => _appHost.Resolve<ISessionInfoWebSocketListener>());
return Task.WhenAll(GetTasks());
return Task.CompletedTask;
}
}
}