hook up roku session controller + web client layout fixes

3 files changed, 30 insertions, 158 deletions

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<string>
-            {
-                MessageType = "SystemCommand",
-                Data = command.ToString()
-
-            }, cancellationToken);
-        }
-
-        public Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken)
-        {
-            return SendCommand(new WebSocketMessage<MessageCommand>
-            {
-                MessageType = "MessageCommand",
-                Data = command
-
-            }, cancellationToken);
-        }
-
-        public Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken)
-        {
-            return SendCommand(new WebSocketMessage<PlayRequest>
-            {
-                MessageType = "Play",
-                Data = command
-
-            }, cancellationToken);
-        }
-
-        public Task SendBrowseCommand(BrowseRequest command, CancellationToken cancellationToken)
-        {
-            return SendCommand(new WebSocketMessage<BrowseRequest>
-            {
-                MessageType = "Browse",
-                Data = command
-
-            }, cancellationToken);
-        }
-
-        public Task SendPlaystateCommand(PlaystateRequest command, CancellationToken cancellationToken)
-        {
-            return SendCommand(new WebSocketMessage<PlaystateRequest>
-            {
-                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<SystemInfo>
-            {
-                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<string>
-            {
-                MessageType = "ServerShuttingDown",
-                Data = string.Empty
-
-            }, cancellationToken);
-        }
-
-        public Task SendServerRestartNotification(CancellationToken cancellationToken)
-        {
-            return SendCommand(new WebSocketMessage<string>
-            {
-                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;
-        
+
         /// <summary>
         /// Gets or sets the configuration manager.
         /// </summary>
@@ -65,6 +65,8 @@ namespace MediaBrowser.Server.Implementations.Session
         /// </summary>
         public event EventHandler<PlaybackProgressEventArgs> PlaybackStopped;
 
+        private IEnumerable<ISessionControllerFactory> _sessionFactories = new List<ISessionControllerFactory>();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SessionManager" /> class.
         /// </summary>
@@ -83,6 +85,15 @@ namespace MediaBrowser.Server.Implementations.Session
         }
 
         /// <summary>
+        /// Adds the parts.
+        /// </summary>
+        /// <param name="sessionFactories">The session factories.</param>
+        public void AddParts(IEnumerable<ISessionControllerFactory> sessionFactories)
+        {
+            _sessionFactories = sessionFactories.ToList();
+        }
+
+        /// <summary>
         /// Gets all connections.
         /// </summary>
         /// <value>All connections.</value>
@@ -98,11 +109,12 @@ namespace MediaBrowser.Server.Implementations.Session
         /// <param name="appVersion">The app version.</param>
         /// <param name="deviceId">The device id.</param>
         /// <param name="deviceName">Name of the device.</param>
+        /// <param name="remoteEndPoint">The remote end point.</param>
         /// <param name="user">The user.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.UnauthorizedAccessException"></exception>
         /// <exception cref="System.ArgumentNullException">user</exception>
-        public async Task<SessionInfo> LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, User user)
+        /// <exception cref="System.UnauthorizedAccessException"></exception>
+        public async Task<SessionInfo> 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
         /// <param name="appVersion">The app version.</param>
         /// <param name="deviceId">The device id.</param>
         /// <param name="deviceName">Name of the device.</param>
+        /// <param name="remoteEndPoint">The remote end point.</param>
         /// <param name="user">The user.</param>
         /// <returns>SessionInfo.</returns>
-        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) &&