michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix storing outdated sessions in SyncPlay

Browse Source
This commit is contained in:
Ionut Andrei Oanca 2021-03-28 13:25:40 +02:00
parent 9fe3ca7a92
commit 9eb740ba57
5 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Server.Implementations/Session/SessionManager.cs
View File

@ -1197,16 +1197,18 @@ namespace Emby.Server.Implementations.Session
} }
/// <inheritdoc /> /// <inheritdoc />
public async Task SendSyncPlayCommand(SessionInfo session, SendCommand command, CancellationToken cancellationToken) public async Task SendSyncPlayCommand(string sessionId, SendCommand command, CancellationToken cancellationToken)
{ {
CheckDisposed(); CheckDisposed();
var session = GetSession(sessionId);
await SendMessageToSession(session, SessionMessageType.SyncPlayCommand, command, cancellationToken).ConfigureAwait(false); await SendMessageToSession(session, SessionMessageType.SyncPlayCommand, command, cancellationToken).ConfigureAwait(false);
} }
/// <inheritdoc /> /// <inheritdoc />
public async Task SendSyncPlayGroupUpdate<T>(SessionInfo session, GroupUpdate<T> command, CancellationToken cancellationToken) public async Task SendSyncPlayGroupUpdate<T>(string sessionId, GroupUpdate<T> command, CancellationToken cancellationToken)
{ {
CheckDisposed(); CheckDisposed();
var session = GetSession(sessionId);
await SendMessageToSession(session, SessionMessageType.SyncPlayGroupUpdate, command, cancellationToken).ConfigureAwait(false); await SendMessageToSession(session, SessionMessageType.SyncPlayGroupUpdate, command, cancellationToken).ConfigureAwait(false);
} }

30
Emby.Server.Implementations/SyncPlay/Group.cs
View File

@ -162,26 +162,26 @@ namespace Emby.Server.Implementations.SyncPlay
/// <summary> /// <summary>
/// Filters sessions of this group. /// Filters sessions of this group.
/// </summary> /// </summary>
/// <param name="from">The current session.</param> /// <param name="fromId">The current session identifier.</param>
/// <param name="type">The filtering type.</param> /// <param name="type">The filtering type.</param>
/// <returns>The list of sessions matching the filter.</returns> /// <returns>The list of sessions matching the filter.</returns>
private IEnumerable<SessionInfo> FilterSessions(SessionInfo from, SyncPlayBroadcastType type) private IEnumerable<string> FilterSessions(string fromId, SyncPlayBroadcastType type)
{ {
return type switch return type switch
{ {
SyncPlayBroadcastType.CurrentSession => new SessionInfo[] { from }, SyncPlayBroadcastType.CurrentSession => new string[] { fromId },
SyncPlayBroadcastType.AllGroup => _participants SyncPlayBroadcastType.AllGroup => _participants
.Values .Values
.Select(session => session.Session), .Select(member => member.SessionId),
SyncPlayBroadcastType.AllExceptCurrentSession => _participants SyncPlayBroadcastType.AllExceptCurrentSession => _participants
.Values .Values
.Select(session => session.Session) .Select(member => member.SessionId)
.Where(session => !session.Id.Equals(from.Id, StringComparison.OrdinalIgnoreCase)), .Where(sessionId => !sessionId.Equals(fromId, StringComparison.OrdinalIgnoreCase)),
SyncPlayBroadcastType.AllReady => _participants SyncPlayBroadcastType.AllReady => _participants
.Values .Values
.Where(session => !session.IsBuffering) .Where(member => !member.IsBuffering)
.Select(session => session.Session), .Select(member => member.SessionId),
_ => Enumerable.Empty<SessionInfo>() _ => Enumerable.Empty<string>()
}; };
} }
@ -223,7 +223,7 @@ namespace Emby.Server.Implementations.SyncPlay
// Get list of users. // Get list of users.
var users = _participants var users = _participants
.Values .Values
.Select(participant => _userManager.GetUserById(participant.Session.UserId)); .Select(participant => _userManager.GetUserById(participant.UserId));
// Find problematic users. // Find problematic users.
var usersWithNoAccess = users.Where(user => !HasAccessToQueue(user, queue)); var usersWithNoAccess = users.Where(user => !HasAccessToQueue(user, queue));
@ -351,7 +351,7 @@ namespace Emby.Server.Implementations.SyncPlay
/// <returns>The group info for the clients.</returns> /// <returns>The group info for the clients.</returns>
public GroupInfoDto GetInfo() public GroupInfoDto GetInfo()
{ {
var participants = _participants.Values.Select(session => session.Session.UserName).Distinct().ToList(); var participants = _participants.Values.Select(session => session.UserName).Distinct().ToList();
return new GroupInfoDto(GroupId, GroupName, _state.Type, participants, DateTime.UtcNow); return new GroupInfoDto(GroupId, GroupName, _state.Type, participants, DateTime.UtcNow);
} }
@ -387,9 +387,9 @@ namespace Emby.Server.Implementations.SyncPlay
{ {
IEnumerable<Task> GetTasks() IEnumerable<Task> GetTasks()
{ {
foreach (var session in FilterSessions(from, type)) foreach (var sessionId in FilterSessions(from.Id, type))
{ {
yield return _sessionManager.SendSyncPlayGroupUpdate(session, message, cancellationToken); yield return _sessionManager.SendSyncPlayGroupUpdate(sessionId, message, cancellationToken);
} }
} }
@ -401,9 +401,9 @@ namespace Emby.Server.Implementations.SyncPlay
{ {
IEnumerable<Task> GetTasks() IEnumerable<Task> GetTasks()
{ {
foreach (var session in FilterSessions(from, type)) foreach (var sessionId in FilterSessions(from.Id, type))
{ {
yield return _sessionManager.SendSyncPlayCommand(session, message, cancellationToken); yield return _sessionManager.SendSyncPlayCommand(sessionId, message, cancellationToken);
} }
} }

8
Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
View File

@ -158,7 +158,7 @@ namespace Emby.Server.Implementations.SyncPlay
_logger.LogWarning("Session {SessionId} tried to join group {GroupId} that does not exist.", session.Id, request.GroupId); _logger.LogWarning("Session {SessionId} tried to join group {GroupId} that does not exist.", session.Id, request.GroupId);
var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.GroupDoesNotExist, string.Empty); var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.GroupDoesNotExist, string.Empty);
_sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None); _sessionManager.SendSyncPlayGroupUpdate(session.Id, error, CancellationToken.None);
return; return;
} }
@ -170,7 +170,7 @@ namespace Emby.Server.Implementations.SyncPlay
_logger.LogWarning("Session {SessionId} tried to join group {GroupId} but does not have access to some content of the playing queue.", session.Id, group.GroupId.ToString()); _logger.LogWarning("Session {SessionId} tried to join group {GroupId} but does not have access to some content of the playing queue.", session.Id, group.GroupId.ToString());
var error = new GroupUpdate<string>(group.GroupId, GroupUpdateType.LibraryAccessDenied, string.Empty); var error = new GroupUpdate<string>(group.GroupId, GroupUpdateType.LibraryAccessDenied, string.Empty);
_sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None); _sessionManager.SendSyncPlayGroupUpdate(session.Id, error, CancellationToken.None);
return; return;
} }
@ -247,7 +247,7 @@ namespace Emby.Server.Implementations.SyncPlay
_logger.LogWarning("Session {SessionId} does not belong to any group.", session.Id); _logger.LogWarning("Session {SessionId} does not belong to any group.", session.Id);
var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.NotInGroup, string.Empty); var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.NotInGroup, string.Empty);
_sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None); _sessionManager.SendSyncPlayGroupUpdate(session.Id, error, CancellationToken.None);
return; return;
} }
} }
@ -324,7 +324,7 @@ namespace Emby.Server.Implementations.SyncPlay
_logger.LogWarning("Session {SessionId} does not belong to any group.", session.Id); _logger.LogWarning("Session {SessionId} does not belong to any group.", session.Id);
var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.NotInGroup, string.Empty); var error = new GroupUpdate<string>(Guid.Empty, GroupUpdateType.NotInGroup, string.Empty);
_sessionManager.SendSyncPlayGroupUpdate(session, error, CancellationToken.None); _sessionManager.SendSyncPlayGroupUpdate(session.Id, error, CancellationToken.None);
} }
} }

8
MediaBrowser.Controller/Session/ISessionManager.cs
View File

@ -156,20 +156,20 @@ namespace MediaBrowser.Controller.Session
/// <summary> /// <summary>
/// Sends a SyncPlayCommand to a session. /// Sends a SyncPlayCommand to a session.
/// </summary> /// </summary>
/// <param name="session">The session.</param> /// <param name="sessionId">The identifier of the session.</param>
/// <param name="command">The command.</param> /// <param name="command">The command.</param>
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
Task SendSyncPlayCommand(SessionInfo session, SendCommand command, CancellationToken cancellationToken); Task SendSyncPlayCommand(string sessionId, SendCommand command, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Sends a SyncPlayGroupUpdate to a session. /// Sends a SyncPlayGroupUpdate to a session.
/// </summary> /// </summary>
/// <param name="session">The session.</param> /// <param name="sessionId">The identifier of the session.</param>
/// <param name="command">The group update.</param> /// <param name="command">The group update.</param>
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
Task SendSyncPlayGroupUpdate<T>(SessionInfo session, GroupUpdate<T> command, CancellationToken cancellationToken); Task SendSyncPlayGroupUpdate<T>(string sessionId, GroupUpdate<T> command, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Sends the browse command. /// Sends the browse command.

23
MediaBrowser.Controller/SyncPlay/GroupMember.cs
View File

@ -1,3 +1,4 @@
using System;
using MediaBrowser.Controller.Session; using MediaBrowser.Controller.Session;
namespace MediaBrowser.Controller.SyncPlay namespace MediaBrowser.Controller.SyncPlay
@ -13,14 +14,28 @@ namespace MediaBrowser.Controller.SyncPlay
/// <param name="session">The session.</param> /// <param name="session">The session.</param>
public GroupMember(SessionInfo session) public GroupMember(SessionInfo session)
{ {
Session = session; SessionId = session.Id;
UserId = session.UserId;
UserName = session.UserName;
} }
/// <summary> /// <summary>
/// Gets the session. /// Gets the identifier of the session.
/// </summary> /// </summary>
/// <value>The session.</value> /// <value>The session identifier.</value>
public SessionInfo Session { get; } public string SessionId { get; }
/// <summary>
/// Gets the identifier of the user.
/// </summary>
/// <value>The user identifier.</value>
public Guid UserId { get; }
/// <summary>
/// Gets the username.
/// </summary>
/// <value>The username.</value>
public string UserName { get; }
/// <summary> /// <summary>
/// Gets or sets the ping, in milliseconds. /// Gets or sets the ping, in milliseconds.