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

Revert "Removed Lazy implementation."

Browse Source
This commit is contained in:
cvium
2020-11-28 09:50:16 +01:00
parent 5cd5a7d4ce
commit 1a0d8aef80
12 changed files with 64 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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