From bb5e6fdcad9e92b58b754075b8df2387590aeaaf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 25 Dec 2013 09:39:46 -0500 Subject: hook up roku session controller + web client layout fixes --- .../Dto/DtoService.cs | 3 +- .../MediaBrowser.Server.Implementations.csproj | 3 +- .../Roku/RokuControllerFactory.cs | 32 +++++ .../Roku/RokuSessionController.cs | 149 +++++++++++++++++++++ .../Session/RokuController.cs | 149 --------------------- .../Session/SessionManager.cs | 37 +++-- .../Session/SessionWebSocketListener.cs | 2 +- 7 files changed, 215 insertions(+), 160 deletions(-) create mode 100644 MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs create mode 100644 MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs delete mode 100644 MediaBrowser.Server.Implementations/Session/RokuController.cs (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 1060886a8..d5faa25bf 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -243,7 +243,8 @@ namespace MediaBrowser.Server.Implementations.Dto NowViewingItemType = session.NowViewingItemType, ApplicationVersion = session.ApplicationVersion, CanSeek = session.CanSeek, - QueueableMediaTypes = session.QueueableMediaTypes + QueueableMediaTypes = session.QueueableMediaTypes, + RemoteEndPoint = session.RemoteEndPoint }; if (session.NowPlayingItem != null) diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 29601b396..09a39c3eb 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -168,13 +168,14 @@ + - + Code diff --git a/MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs b/MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs new file mode 100644 index 000000000..71f70421a --- /dev/null +++ b/MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs @@ -0,0 +1,32 @@ +using MediaBrowser.Common.Net; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Session; +using MediaBrowser.Model.Serialization; +using System; + +namespace MediaBrowser.Server.Implementations.Roku +{ + public class RokuControllerFactory : ISessionControllerFactory + { + private readonly IHttpClient _httpClient; + private readonly IJsonSerializer _json; + private readonly IServerApplicationHost _appHost; + + public RokuControllerFactory(IHttpClient httpClient, IJsonSerializer json, IServerApplicationHost appHost) + { + _httpClient = httpClient; + _json = json; + _appHost = appHost; + } + + public ISessionController GetSessionController(SessionInfo session) + { + if (string.Equals(session.Client, "roku", StringComparison.OrdinalIgnoreCase)) + { + return new RokuSessionController(_httpClient, _json, _appHost, session); + } + + return null; + } + } +} diff --git a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs new file mode 100644 index 000000000..ffe33d763 --- /dev/null +++ b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs @@ -0,0 +1,149 @@ +using MediaBrowser.Common.Net; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Session; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Net; +using MediaBrowser.Model.Serialization; +using MediaBrowser.Model.Session; +using MediaBrowser.Model.System; +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Server.Implementations.Roku +{ + public class RokuSessionController : ISessionController + { + private readonly IHttpClient _httpClient; + private readonly IJsonSerializer _json; + private readonly IServerApplicationHost _appHost; + + public SessionInfo Session { get; private set; } + + public RokuSessionController(IHttpClient httpClient, IJsonSerializer json, IServerApplicationHost appHost, SessionInfo session) + { + _httpClient = httpClient; + _json = json; + _appHost = appHost; + Session = session; + } + + public bool SupportsMediaRemoteControl + { + get { return true; } + } + + public bool IsSessionActive + { + get + { + return (DateTime.UtcNow - Session.LastActivityDate).TotalMinutes <= 10; + } + } + + public Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken) + { + return SendCommand(new WebSocketMessage + { + MessageType = "SystemCommand", + Data = command.ToString() + + }, cancellationToken); + } + + public Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken) + { + return SendCommand(new WebSocketMessage + { + MessageType = "MessageCommand", + Data = command + + }, cancellationToken); + } + + public Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken) + { + return SendCommand(new WebSocketMessage + { + MessageType = "Play", + Data = command + + }, cancellationToken); + } + + public Task SendBrowseCommand(BrowseRequest command, CancellationToken cancellationToken) + { + return SendCommand(new WebSocketMessage + { + MessageType = "Browse", + Data = command + + }, cancellationToken); + } + + public Task SendPlaystateCommand(PlaystateRequest command, CancellationToken cancellationToken) + { + return SendCommand(new WebSocketMessage + { + MessageType = "Playstate", + Data = command + + }, cancellationToken); + } + + public Task SendLibraryUpdateInfo(LibraryUpdateInfo info, CancellationToken cancellationToken) + { + // Roku probably won't care about this + return Task.FromResult(true); + } + + public Task SendRestartRequiredNotification(CancellationToken cancellationToken) + { + return SendCommand(new WebSocketMessage + { + MessageType = "RestartRequired", + Data = _appHost.GetSystemInfo() + + }, cancellationToken); + } + + public Task SendUserDataChangeInfo(UserDataChangeInfo info, CancellationToken cancellationToken) + { + // Roku probably won't care about this + return Task.FromResult(true); + } + + public Task SendServerShutdownNotification(CancellationToken cancellationToken) + { + return SendCommand(new WebSocketMessage + { + MessageType = "ServerShuttingDown", + Data = string.Empty + + }, cancellationToken); + } + + public Task SendServerRestartNotification(CancellationToken cancellationToken) + { + return SendCommand(new WebSocketMessage + { + MessageType = "ServerRestarting", + Data = string.Empty + + }, cancellationToken); + } + + private Task SendCommand(object obj, CancellationToken cancellationToken) + { + var json = _json.SerializeToString(obj); + + return _httpClient.Post(new HttpRequestOptions + { + Url = "mb/remotecontrol", + CancellationToken = cancellationToken, + RequestContent = json, + RequestContentType = "application/json" + }); + } + } +} diff --git a/MediaBrowser.Server.Implementations/Session/RokuController.cs b/MediaBrowser.Server.Implementations/Session/RokuController.cs deleted file mode 100644 index f7ca43c9f..000000000 --- a/MediaBrowser.Server.Implementations/Session/RokuController.cs +++ /dev/null @@ -1,149 +0,0 @@ -using MediaBrowser.Common.Net; -using MediaBrowser.Controller; -using MediaBrowser.Controller.Session; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Net; -using MediaBrowser.Model.Serialization; -using MediaBrowser.Model.Session; -using MediaBrowser.Model.System; -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace MediaBrowser.Server.Implementations.Session -{ - public class RokuController : ISessionController - { - private readonly IHttpClient _httpClient; - private readonly IJsonSerializer _json; - private readonly IServerApplicationHost _appHost; - - public SessionInfo Session { get; private set; } - - public RokuController(IHttpClient httpClient, IJsonSerializer json, IServerApplicationHost appHost, SessionInfo session) - { - _httpClient = httpClient; - _json = json; - _appHost = appHost; - Session = session; - } - - public bool SupportsMediaRemoteControl - { - get { return true; } - } - - public bool IsSessionActive - { - get - { - return (DateTime.UtcNow - Session.LastActivityDate).TotalMinutes <= 10; - } - } - - public Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "SystemCommand", - Data = command.ToString() - - }, cancellationToken); - } - - public Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "MessageCommand", - Data = command - - }, cancellationToken); - } - - public Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "Play", - Data = command - - }, cancellationToken); - } - - public Task SendBrowseCommand(BrowseRequest command, CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "Browse", - Data = command - - }, cancellationToken); - } - - public Task SendPlaystateCommand(PlaystateRequest command, CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "Playstate", - Data = command - - }, cancellationToken); - } - - public Task SendLibraryUpdateInfo(LibraryUpdateInfo info, CancellationToken cancellationToken) - { - // Roku probably won't care about this - return Task.FromResult(true); - } - - public Task SendRestartRequiredNotification(CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "RestartRequired", - Data = _appHost.GetSystemInfo() - - }, cancellationToken); - } - - public Task SendUserDataChangeInfo(UserDataChangeInfo info, CancellationToken cancellationToken) - { - // Roku probably won't care about this - return Task.FromResult(true); - } - - public Task SendServerShutdownNotification(CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "ServerShuttingDown", - Data = string.Empty - - }, cancellationToken); - } - - public Task SendServerRestartNotification(CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "ServerRestarting", - Data = string.Empty - - }, cancellationToken); - } - - private Task SendCommand(object obj, CancellationToken cancellationToken) - { - var json = _json.SerializeToString(obj); - - return _httpClient.Post(new HttpRequestOptions - { - Url = "mb/remotecontrol", - CancellationToken = cancellationToken, - RequestContent = json, - RequestContentType = "application/json" - }); - } - } -} diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs index 3a07d33a6..1a94b9c79 100644 --- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs +++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs @@ -39,7 +39,7 @@ namespace MediaBrowser.Server.Implementations.Session private readonly ILogger _logger; private readonly ILibraryManager _libraryManager; - + /// /// Gets or sets the configuration manager. /// @@ -65,6 +65,8 @@ namespace MediaBrowser.Server.Implementations.Session /// public event EventHandler PlaybackStopped; + private IEnumerable _sessionFactories = new List(); + /// /// Initializes a new instance of the class. /// @@ -82,6 +84,15 @@ namespace MediaBrowser.Server.Implementations.Session _libraryManager = libraryManager; } + /// + /// Adds the parts. + /// + /// The session factories. + public void AddParts(IEnumerable sessionFactories) + { + _sessionFactories = sessionFactories.ToList(); + } + /// /// Gets all connections. /// @@ -98,11 +109,12 @@ namespace MediaBrowser.Server.Implementations.Session /// The app version. /// The device id. /// Name of the device. + /// The remote end point. /// The user. /// Task. - /// /// user - public async Task LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, User user) + /// + public async Task LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user) { if (string.IsNullOrEmpty(clientType)) { @@ -128,7 +140,7 @@ namespace MediaBrowser.Server.Implementations.Session var activityDate = DateTime.UtcNow; - var session = GetSessionInfo(clientType, appVersion, deviceId, deviceName, user); + var session = GetSessionInfo(clientType, appVersion, deviceId, deviceName, remoteEndPoint, user); session.LastActivityDate = activityDate; @@ -196,9 +208,10 @@ namespace MediaBrowser.Server.Implementations.Session /// The app version. /// The device id. /// Name of the device. + /// The remote end point. /// The user. /// SessionInfo. - private SessionInfo GetSessionInfo(string clientType, string appVersion, string deviceId, string deviceName, User user) + private SessionInfo GetSessionInfo(string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user) { var key = clientType + deviceId + appVersion; @@ -212,6 +225,14 @@ namespace MediaBrowser.Server.Implementations.Session connection.DeviceName = deviceName; connection.User = user; + connection.RemoteEndPoint = remoteEndPoint; + + if (connection.SessionController == null) + { + connection.SessionController = _sessionFactories + .Select(i => i.GetSessionController(connection)) + .FirstOrDefault(i => i != null); + } return connection; } @@ -335,7 +356,7 @@ namespace MediaBrowser.Server.Implementations.Session { throw new ArgumentException("PlaybackStopInfo.SessionId cannot be Guid.Empty"); } - + if (info.PositionTicks.HasValue && info.PositionTicks.Value < 0) { throw new ArgumentOutOfRangeException("positionTicks"); @@ -497,7 +518,7 @@ namespace MediaBrowser.Server.Implementations.Session { throw new ArgumentException("Virtual items are not playable."); } - + if (command.PlayCommand != PlayCommand.PlayNow) { if (items.Any(i => !session.QueueableMediaTypes.Contains(i.MediaType, StringComparer.OrdinalIgnoreCase))) @@ -505,7 +526,7 @@ namespace MediaBrowser.Server.Implementations.Session throw new ArgumentException(string.Format("Session {0} is unable to queue the requested media type.", session.Id)); } } - + return session.SessionController.SendPlayCommand(command, cancellationToken); } diff --git a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs index 41cb7eb6b..cc82156e8 100644 --- a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs +++ b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs @@ -104,7 +104,7 @@ namespace MediaBrowser.Server.Implementations.Session { _logger.Debug("Logging session activity"); - await _sessionManager.LogSessionActivity(client, version, deviceId, deviceName, null).ConfigureAwait(false); + await _sessionManager.LogSessionActivity(client, version, deviceId, deviceName, message.Connection.RemoteEndPoint, null).ConfigureAwait(false); session = _sessionManager.Sessions .FirstOrDefault(i => string.Equals(i.DeviceId, deviceId) && -- cgit v1.2.3