# Conflicts: # Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/Devices/DeviceManager.cs # Jellyfin.Server/Jellyfin.Server.csproj # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Controller/Devices/IDeviceManager.cspull/3423/head
Patrick Barron
4 years ago
commit
aca7e221d8
@ -1,39 +0,0 @@
|
|||||||
#pragma warning disable CS1591
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Emby.Server.Implementations.Net;
|
|
||||||
using MediaBrowser.Model.Services;
|
|
||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.HttpServer
|
|
||||||
{
|
|
||||||
public interface IHttpListener : IDisposable
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the error handler.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The error handler.</value>
|
|
||||||
Func<Exception, IRequest, bool, bool, Task> ErrorHandler { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the request handler.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The request handler.</value>
|
|
||||||
Func<IHttpRequest, string, string, string, CancellationToken, Task> RequestHandler { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the web socket handler.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The web socket handler.</value>
|
|
||||||
Action<WebSocketConnectEventArgs> WebSocketConnected { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Stops this instance.
|
|
||||||
/// </summary>
|
|
||||||
Task Stop();
|
|
||||||
|
|
||||||
Task ProcessWebSocketRequest(HttpContext ctx);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using WebSocketManager = Emby.Server.Implementations.WebSockets.WebSocketManager;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.Middleware
|
|
||||||
{
|
|
||||||
public class WebSocketMiddleware
|
|
||||||
{
|
|
||||||
private readonly RequestDelegate _next;
|
|
||||||
private readonly ILogger<WebSocketMiddleware> _logger;
|
|
||||||
private readonly WebSocketManager _webSocketManager;
|
|
||||||
|
|
||||||
public WebSocketMiddleware(RequestDelegate next, ILogger<WebSocketMiddleware> logger, WebSocketManager webSocketManager)
|
|
||||||
{
|
|
||||||
_next = next;
|
|
||||||
_logger = logger;
|
|
||||||
_webSocketManager = webSocketManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task Invoke(HttpContext httpContext)
|
|
||||||
{
|
|
||||||
_logger.LogInformation("Handling request: " + httpContext.Request.Path);
|
|
||||||
|
|
||||||
if (httpContext.WebSockets.IsWebSocketRequest)
|
|
||||||
{
|
|
||||||
var webSocketContext = await httpContext.WebSockets.AcceptWebSocketAsync(null).ConfigureAwait(false);
|
|
||||||
if (webSocketContext != null)
|
|
||||||
{
|
|
||||||
await _webSocketManager.OnWebSocketConnected(webSocketContext).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
await _next.Invoke(httpContext).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Net.WebSockets;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.Net
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interface IWebSocket
|
|
||||||
/// </summary>
|
|
||||||
public interface IWebSocket : IDisposable
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Occurs when [closed].
|
|
||||||
/// </summary>
|
|
||||||
event EventHandler<EventArgs> Closed;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the state.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The state.</value>
|
|
||||||
WebSocketState State { get; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the receive action.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The receive action.</value>
|
|
||||||
Action<byte[]> OnReceiveBytes { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Sends the async.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="bytes">The bytes.</param>
|
|
||||||
/// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
|
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
|
||||||
/// <returns>Task.</returns>
|
|
||||||
Task SendAsync(byte[] bytes, bool endOfMessage, CancellationToken cancellationToken);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Sends the asynchronous.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="text">The text.</param>
|
|
||||||
/// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
|
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
|
||||||
/// <returns>Task.</returns>
|
|
||||||
Task SendAsync(string text, bool endOfMessage, CancellationToken cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.Net
|
|
||||||
{
|
|
||||||
public class WebSocketConnectEventArgs : EventArgs
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the URL.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The URL.</value>
|
|
||||||
public string Url { get; set; }
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the query string.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The query string.</value>
|
|
||||||
public IQueryCollection QueryString { get; set; }
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the web socket.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The web socket.</value>
|
|
||||||
public IWebSocket WebSocket { get; set; }
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the endpoint.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The endpoint.</value>
|
|
||||||
public string Endpoint { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,191 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Net;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using MediaBrowser.Common.Net;
|
|
||||||
using MediaBrowser.Controller.Session;
|
|
||||||
using MediaBrowser.Model.Serialization;
|
|
||||||
using MediaBrowser.Model.Session;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.Session
|
|
||||||
{
|
|
||||||
public class HttpSessionController : ISessionController
|
|
||||||
{
|
|
||||||
private readonly IHttpClient _httpClient;
|
|
||||||
private readonly IJsonSerializer _json;
|
|
||||||
private readonly ISessionManager _sessionManager;
|
|
||||||
|
|
||||||
public SessionInfo Session { get; private set; }
|
|
||||||
|
|
||||||
private readonly string _postUrl;
|
|
||||||
|
|
||||||
public HttpSessionController(IHttpClient httpClient,
|
|
||||||
IJsonSerializer json,
|
|
||||||
SessionInfo session,
|
|
||||||
string postUrl, ISessionManager sessionManager)
|
|
||||||
{
|
|
||||||
_httpClient = httpClient;
|
|
||||||
_json = json;
|
|
||||||
Session = session;
|
|
||||||
_postUrl = postUrl;
|
|
||||||
_sessionManager = sessionManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
private string PostUrl => string.Format("http://{0}{1}", Session.RemoteEndPoint, _postUrl);
|
|
||||||
|
|
||||||
public bool IsSessionActive => (DateTime.UtcNow - Session.LastActivityDate).TotalMinutes <= 5;
|
|
||||||
|
|
||||||
public bool SupportsMediaControl => true;
|
|
||||||
|
|
||||||
private Task SendMessage(string name, string messageId, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
return SendMessage(name, messageId, new Dictionary<string, string>(), cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Task SendMessage(string name, string messageId, Dictionary<string, string> args, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
args["messageId"] = messageId;
|
|
||||||
var url = PostUrl + "/" + name + ToQueryString(args);
|
|
||||||
|
|
||||||
return SendRequest(new HttpRequestOptions
|
|
||||||
{
|
|
||||||
Url = url,
|
|
||||||
CancellationToken = cancellationToken,
|
|
||||||
BufferContent = false
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private Task SendPlayCommand(PlayRequest command, string messageId, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var dict = new Dictionary<string, string>();
|
|
||||||
|
|
||||||
dict["ItemIds"] = string.Join(",", command.ItemIds.Select(i => i.ToString("N", CultureInfo.InvariantCulture)).ToArray());
|
|
||||||
|
|
||||||
if (command.StartPositionTicks.HasValue)
|
|
||||||
{
|
|
||||||
dict["StartPositionTicks"] = command.StartPositionTicks.Value.ToString(CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
if (command.AudioStreamIndex.HasValue)
|
|
||||||
{
|
|
||||||
dict["AudioStreamIndex"] = command.AudioStreamIndex.Value.ToString(CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
if (command.SubtitleStreamIndex.HasValue)
|
|
||||||
{
|
|
||||||
dict["SubtitleStreamIndex"] = command.SubtitleStreamIndex.Value.ToString(CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
if (command.StartIndex.HasValue)
|
|
||||||
{
|
|
||||||
dict["StartIndex"] = command.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
if (!string.IsNullOrEmpty(command.MediaSourceId))
|
|
||||||
{
|
|
||||||
dict["MediaSourceId"] = command.MediaSourceId;
|
|
||||||
}
|
|
||||||
|
|
||||||
return SendMessage(command.PlayCommand.ToString(), messageId, dict, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Task SendPlaystateCommand(PlaystateRequest command, string messageId, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var args = new Dictionary<string, string>();
|
|
||||||
|
|
||||||
if (command.Command == PlaystateCommand.Seek)
|
|
||||||
{
|
|
||||||
if (!command.SeekPositionTicks.HasValue)
|
|
||||||
{
|
|
||||||
throw new ArgumentException("SeekPositionTicks cannot be null");
|
|
||||||
}
|
|
||||||
|
|
||||||
args["SeekPositionTicks"] = command.SeekPositionTicks.Value.ToString(CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
|
|
||||||
return SendMessage(command.Command.ToString(), messageId, args, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
private string[] _supportedMessages = Array.Empty<string>();
|
|
||||||
public Task SendMessage<T>(string name, string messageId, T data, ISessionController[] allControllers, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
if (!IsSessionActive)
|
|
||||||
{
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (string.Equals(name, "Play", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return SendPlayCommand(data as PlayRequest, messageId, cancellationToken);
|
|
||||||
}
|
|
||||||
if (string.Equals(name, "PlayState", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return SendPlaystateCommand(data as PlaystateRequest, messageId, cancellationToken);
|
|
||||||
}
|
|
||||||
if (string.Equals(name, "GeneralCommand", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
var command = data as GeneralCommand;
|
|
||||||
return SendMessage(command.Name, messageId, command.Arguments, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!_supportedMessages.Contains(name, StringComparer.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
|
|
||||||
var url = PostUrl + "/" + name;
|
|
||||||
|
|
||||||
url += "?messageId=" + messageId;
|
|
||||||
|
|
||||||
var options = new HttpRequestOptions
|
|
||||||
{
|
|
||||||
Url = url,
|
|
||||||
CancellationToken = cancellationToken,
|
|
||||||
BufferContent = false
|
|
||||||
};
|
|
||||||
|
|
||||||
if (data != null)
|
|
||||||
{
|
|
||||||
if (typeof(T) == typeof(string))
|
|
||||||
{
|
|
||||||
var str = data as string;
|
|
||||||
if (!string.IsNullOrEmpty(str))
|
|
||||||
{
|
|
||||||
options.RequestContent = str;
|
|
||||||
options.RequestContentType = "application/json";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
options.RequestContent = _json.SerializeToString(data);
|
|
||||||
options.RequestContentType = "application/json";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return SendRequest(options);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task SendRequest(HttpRequestOptions options)
|
|
||||||
{
|
|
||||||
using (var response = await _httpClient.Post(options).ConfigureAwait(false))
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string ToQueryString(Dictionary<string, string> nvc)
|
|
||||||
{
|
|
||||||
var array = (from item in nvc
|
|
||||||
select string.Format("{0}={1}", WebUtility.UrlEncode(item.Key), WebUtility.UrlEncode(item.Value)))
|
|
||||||
.ToArray();
|
|
||||||
|
|
||||||
var args = string.Join("&", array);
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(args))
|
|
||||||
{
|
|
||||||
return args;
|
|
||||||
}
|
|
||||||
|
|
||||||
return "?" + args;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,105 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Net.WebSockets;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Emby.Server.Implementations.Net;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.SocketSharp
|
|
||||||
{
|
|
||||||
public class SharpWebSocket : IWebSocket
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// The logger
|
|
||||||
/// </summary>
|
|
||||||
private readonly ILogger _logger;
|
|
||||||
|
|
||||||
public event EventHandler<EventArgs> Closed;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the web socket.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The web socket.</value>
|
|
||||||
private readonly WebSocket _webSocket;
|
|
||||||
|
|
||||||
private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
|
|
||||||
private bool _disposed;
|
|
||||||
|
|
||||||
public SharpWebSocket(WebSocket socket, ILogger logger)
|
|
||||||
{
|
|
||||||
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
|
|
||||||
_webSocket = socket ?? throw new ArgumentNullException(nameof(socket));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the state.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The state.</value>
|
|
||||||
public WebSocketState State => _webSocket.State;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Sends the async.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="bytes">The bytes.</param>
|
|
||||||
/// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
|
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
|
||||||
/// <returns>Task.</returns>
|
|
||||||
public Task SendAsync(byte[] bytes, bool endOfMessage, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
return _webSocket.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Binary, endOfMessage, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Sends the asynchronous.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="text">The text.</param>
|
|
||||||
/// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
|
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
|
||||||
/// <returns>Task.</returns>
|
|
||||||
public Task SendAsync(string text, bool endOfMessage, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
return _webSocket.SendAsync(new ArraySegment<byte>(Encoding.UTF8.GetBytes(text)), WebSocketMessageType.Text, endOfMessage, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
|
|
||||||
/// </summary>
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
Dispose(true);
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Releases unmanaged and - optionally - managed resources.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
|
|
||||||
protected virtual void Dispose(bool dispose)
|
|
||||||
{
|
|
||||||
if (_disposed)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dispose)
|
|
||||||
{
|
|
||||||
_cancellationTokenSource.Cancel();
|
|
||||||
if (_webSocket.State == WebSocketState.Open)
|
|
||||||
{
|
|
||||||
_webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Closed by client",
|
|
||||||
CancellationToken.None);
|
|
||||||
}
|
|
||||||
Closed?.Invoke(this, EventArgs.Empty);
|
|
||||||
}
|
|
||||||
|
|
||||||
_disposed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the receive action.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The receive action.</value>
|
|
||||||
public Action<byte[]> OnReceiveBytes { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,135 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Net.WebSockets;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Emby.Server.Implementations.HttpServer;
|
|
||||||
using Emby.Server.Implementations.Net;
|
|
||||||
using MediaBrowser.Model.Services;
|
|
||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
using Microsoft.AspNetCore.Http.Extensions;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Microsoft.Net.Http.Headers;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.SocketSharp
|
|
||||||
{
|
|
||||||
public class WebSocketSharpListener : IHttpListener
|
|
||||||
{
|
|
||||||
private readonly ILogger _logger;
|
|
||||||
|
|
||||||
private CancellationTokenSource _disposeCancellationTokenSource = new CancellationTokenSource();
|
|
||||||
private CancellationToken _disposeCancellationToken;
|
|
||||||
|
|
||||||
public WebSocketSharpListener(ILogger<WebSocketSharpListener> logger)
|
|
||||||
{
|
|
||||||
_logger = logger;
|
|
||||||
_disposeCancellationToken = _disposeCancellationTokenSource.Token;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Func<Exception, IRequest, bool, bool, Task> ErrorHandler { get; set; }
|
|
||||||
|
|
||||||
public Func<IHttpRequest, string, string, string, CancellationToken, Task> RequestHandler { get; set; }
|
|
||||||
|
|
||||||
public Action<WebSocketConnectEventArgs> WebSocketConnected { get; set; }
|
|
||||||
|
|
||||||
private static void LogRequest(ILogger logger, HttpRequest request)
|
|
||||||
{
|
|
||||||
var url = request.GetDisplayUrl();
|
|
||||||
|
|
||||||
logger.LogInformation("WS {Url}. UserAgent: {UserAgent}", url, request.Headers[HeaderNames.UserAgent].ToString());
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task ProcessWebSocketRequest(HttpContext ctx)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
LogRequest(_logger, ctx.Request);
|
|
||||||
var endpoint = ctx.Connection.RemoteIpAddress.ToString();
|
|
||||||
var url = ctx.Request.GetDisplayUrl();
|
|
||||||
|
|
||||||
var webSocketContext = await ctx.WebSockets.AcceptWebSocketAsync(null).ConfigureAwait(false);
|
|
||||||
var socket = new SharpWebSocket(webSocketContext, _logger);
|
|
||||||
|
|
||||||
WebSocketConnected(new WebSocketConnectEventArgs
|
|
||||||
{
|
|
||||||
Url = url,
|
|
||||||
QueryString = ctx.Request.Query,
|
|
||||||
WebSocket = socket,
|
|
||||||
Endpoint = endpoint
|
|
||||||
});
|
|
||||||
|
|
||||||
WebSocketReceiveResult result;
|
|
||||||
var message = new List<byte>();
|
|
||||||
|
|
||||||
do
|
|
||||||
{
|
|
||||||
var buffer = WebSocket.CreateServerBuffer(4096);
|
|
||||||
result = await webSocketContext.ReceiveAsync(buffer, _disposeCancellationToken);
|
|
||||||
message.AddRange(buffer.Array.Take(result.Count));
|
|
||||||
|
|
||||||
if (result.EndOfMessage)
|
|
||||||
{
|
|
||||||
socket.OnReceiveBytes(message.ToArray());
|
|
||||||
message.Clear();
|
|
||||||
}
|
|
||||||
} while (socket.State == WebSocketState.Open && result.MessageType != WebSocketMessageType.Close);
|
|
||||||
|
|
||||||
|
|
||||||
if (webSocketContext.State == WebSocketState.Open)
|
|
||||||
{
|
|
||||||
await webSocketContext.CloseAsync(
|
|
||||||
result.CloseStatus ?? WebSocketCloseStatus.NormalClosure,
|
|
||||||
result.CloseStatusDescription,
|
|
||||||
_disposeCancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
socket.Dispose();
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "AcceptWebSocketAsync error");
|
|
||||||
if (!ctx.Response.HasStarted)
|
|
||||||
{
|
|
||||||
ctx.Response.StatusCode = 500;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task Stop()
|
|
||||||
{
|
|
||||||
_disposeCancellationTokenSource.Cancel();
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Releases the unmanaged resources and disposes of the managed resources used.
|
|
||||||
/// </summary>
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
Dispose(true);
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool _disposed;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Releases the unmanaged resources and disposes of the managed resources used.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="disposing">Whether or not the managed resources should be disposed.</param>
|
|
||||||
protected virtual void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
if (_disposed)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disposing)
|
|
||||||
{
|
|
||||||
Stop().GetAwaiter().GetResult();
|
|
||||||
}
|
|
||||||
|
|
||||||
_disposed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
using System.Threading.Tasks;
|
|
||||||
using MediaBrowser.Model.Net;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.WebSockets
|
|
||||||
{
|
|
||||||
public interface IWebSocketHandler
|
|
||||||
{
|
|
||||||
Task ProcessMessage(WebSocketMessage<object> message, TaskCompletionSource<bool> taskCompletionSource);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,102 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Net.WebSockets;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using MediaBrowser.Model.Net;
|
|
||||||
using MediaBrowser.Model.Serialization;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using UtfUnknown;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.WebSockets
|
|
||||||
{
|
|
||||||
public class WebSocketManager
|
|
||||||
{
|
|
||||||
private readonly IWebSocketHandler[] _webSocketHandlers;
|
|
||||||
private readonly IJsonSerializer _jsonSerializer;
|
|
||||||
private readonly ILogger<WebSocketManager> _logger;
|
|
||||||
private const int BufferSize = 4096;
|
|
||||||
|
|
||||||
public WebSocketManager(IWebSocketHandler[] webSocketHandlers, IJsonSerializer jsonSerializer, ILogger<WebSocketManager> logger)
|
|
||||||
{
|
|
||||||
_webSocketHandlers = webSocketHandlers;
|
|
||||||
_jsonSerializer = jsonSerializer;
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task OnWebSocketConnected(WebSocket webSocket)
|
|
||||||
{
|
|
||||||
var taskCompletionSource = new TaskCompletionSource<bool>();
|
|
||||||
var cancellationToken = new CancellationTokenSource().Token;
|
|
||||||
WebSocketReceiveResult result;
|
|
||||||
var message = new List<byte>();
|
|
||||||
|
|
||||||
// Keep listening for incoming messages, otherwise the socket closes automatically
|
|
||||||
do
|
|
||||||
{
|
|
||||||
var buffer = WebSocket.CreateServerBuffer(BufferSize);
|
|
||||||
result = await webSocket.ReceiveAsync(buffer, cancellationToken).ConfigureAwait(false);
|
|
||||||
message.AddRange(buffer.Array.Take(result.Count));
|
|
||||||
|
|
||||||
if (result.EndOfMessage)
|
|
||||||
{
|
|
||||||
await ProcessMessage(message.ToArray(), taskCompletionSource).ConfigureAwait(false);
|
|
||||||
message.Clear();
|
|
||||||
}
|
|
||||||
} while (!taskCompletionSource.Task.IsCompleted &&
|
|
||||||
webSocket.State == WebSocketState.Open &&
|
|
||||||
result.MessageType != WebSocketMessageType.Close);
|
|
||||||
|
|
||||||
if (webSocket.State == WebSocketState.Open)
|
|
||||||
{
|
|
||||||
await webSocket.CloseAsync(
|
|
||||||
result.CloseStatus ?? WebSocketCloseStatus.NormalClosure,
|
|
||||||
result.CloseStatusDescription,
|
|
||||||
cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task ProcessMessage(byte[] messageBytes, TaskCompletionSource<bool> taskCompletionSource)
|
|
||||||
{
|
|
||||||
var charset = CharsetDetector.DetectFromBytes(messageBytes).Detected?.EncodingName;
|
|
||||||
var message = string.Equals(charset, "utf-8", StringComparison.OrdinalIgnoreCase)
|
|
||||||
? Encoding.UTF8.GetString(messageBytes, 0, messageBytes.Length)
|
|
||||||
: Encoding.ASCII.GetString(messageBytes, 0, messageBytes.Length);
|
|
||||||
|
|
||||||
// All messages are expected to be valid JSON objects
|
|
||||||
if (!message.StartsWith("{", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
_logger.LogDebug("Received web socket message that is not a json structure: {Message}", message);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var info = _jsonSerializer.DeserializeFromString<WebSocketMessage<object>>(message);
|
|
||||||
|
|
||||||
_logger.LogDebug("Websocket message received: {0}", info.MessageType);
|
|
||||||
|
|
||||||
var tasks = _webSocketHandlers.Select(handler => Task.Run(() =>
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
handler.ProcessMessage(info, taskCompletionSource).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "{HandlerType} failed processing WebSocket message {MessageType}",
|
|
||||||
handler.GetType().Name, info.MessageType ?? string.Empty);
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
|
|
||||||
await Task.WhenAll(tasks);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Error processing web socket message");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,79 @@
|
|||||||
|
using System;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
|
using MediaBrowser.Controller;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using SQLitePCL.pretty;
|
||||||
|
|
||||||
|
namespace Jellyfin.Server.Migrations.Routines
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Remove duplicate entries which were caused by a bug where a file was considered to be an "Extra" to itself.
|
||||||
|
/// </summary>
|
||||||
|
internal class RemoveDuplicateExtras : IMigrationRoutine
|
||||||
|
{
|
||||||
|
private const string DbFilename = "library.db";
|
||||||
|
private readonly ILogger _logger;
|
||||||
|
private readonly IServerApplicationPaths _paths;
|
||||||
|
|
||||||
|
public RemoveDuplicateExtras(ILogger<RemoveDuplicateExtras> logger, IServerApplicationPaths paths)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_paths = paths;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public Guid Id => Guid.Parse("{ACBE17B7-8435-4A83-8B64-6FCF162CB9BD}");
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public string Name => "RemoveDuplicateExtras";
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public void Perform()
|
||||||
|
{
|
||||||
|
var dataPath = _paths.DataPath;
|
||||||
|
var dbPath = Path.Combine(dataPath, DbFilename);
|
||||||
|
using (var connection = SQLite3.Open(
|
||||||
|
dbPath,
|
||||||
|
ConnectionFlags.ReadWrite,
|
||||||
|
null))
|
||||||
|
{
|
||||||
|
// Query the database for the ids of duplicate extras
|
||||||
|
var queryResult = connection.Query("SELECT t1.Path FROM TypedBaseItems AS t1, TypedBaseItems AS t2 WHERE t1.Path=t2.Path AND t1.Type!=t2.Type AND t1.Type='MediaBrowser.Controller.Entities.Video'");
|
||||||
|
var bads = string.Join(", ", queryResult.SelectScalarString());
|
||||||
|
|
||||||
|
// Do nothing if no duplicate extras were detected
|
||||||
|
if (bads.Length == 0)
|
||||||
|
{
|
||||||
|
_logger.LogInformation("No duplicate extras detected, skipping migration.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Back up the database before deleting any entries
|
||||||
|
for (int i = 1; ; i++)
|
||||||
|
{
|
||||||
|
var bakPath = string.Format(CultureInfo.InvariantCulture, "{0}.bak{1}", dbPath, i);
|
||||||
|
if (!File.Exists(bakPath))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
File.Copy(dbPath, bakPath);
|
||||||
|
_logger.LogInformation("Library database backed up to {BackupPath}", bakPath);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Cannot make a backup of {Library} at path {BackupPath}", DbFilename, bakPath);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete all duplicate extras
|
||||||
|
_logger.LogInformation("Removing found duplicated extras for the following items: {DuplicateExtras}", bads);
|
||||||
|
connection.Execute("DELETE FROM TypedBaseItems WHERE rowid IN (SELECT t1.rowid FROM TypedBaseItems AS t1, TypedBaseItems AS t2 WHERE t1.Path=t2.Path AND t1.Type!=t2.Type AND t1.Type='MediaBrowser.Controller.Entities.Video')");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
#pragma warning disable CS1591
|
||||||
|
|
||||||
|
namespace MediaBrowser.Model.Devices
|
||||||
|
{
|
||||||
|
public class DeviceOptions
|
||||||
|
{
|
||||||
|
public string CustomName { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,23 +0,0 @@
|
|||||||
#pragma warning disable CS1591
|
|
||||||
|
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Model.Devices
|
|
||||||
{
|
|
||||||
public class DevicesOptions
|
|
||||||
{
|
|
||||||
public string[] EnabledCameraUploadDevices { get; set; }
|
|
||||||
public string CameraUploadPath { get; set; }
|
|
||||||
public bool EnableCameraUploadSubfolders { get; set; }
|
|
||||||
|
|
||||||
public DevicesOptions()
|
|
||||||
{
|
|
||||||
EnabledCameraUploadDevices = Array.Empty<string>();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class DeviceOptions
|
|
||||||
{
|
|
||||||
public string CustomName { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in new issue