[Redis] Reorder some code to make it less spaghetti (#1081)
This commit is contained in:
BrennanConroy
GitHub
parent
13757936ad
commit
9371e7b50a
|
|
@ -88,108 +88,66 @@ namespace Microsoft.AspNetCore.SignalR.Redis
|
||||||
}
|
}
|
||||||
_bus = _redisServerConnection.GetSubscriber();
|
_bus = _redisServerConnection.GetSubscriber();
|
||||||
|
|
||||||
var channelName = _channelNamePrefix;
|
SubscribeToHub();
|
||||||
_logger.Subscribing(channelName);
|
SubscribeToAllExcept();
|
||||||
_bus.Subscribe(channelName, async (c, data) =>
|
SubscribeToInternalGroup();
|
||||||
|
SubscribeToInternalServerName();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Task OnConnectedAsync(HubConnectionContext connection)
|
||||||
|
{
|
||||||
|
var feature = new RedisFeature();
|
||||||
|
connection.Features.Set<IRedisFeature>(feature);
|
||||||
|
|
||||||
|
var redisSubscriptions = feature.Subscriptions;
|
||||||
|
var connectionTask = Task.CompletedTask;
|
||||||
|
var userTask = Task.CompletedTask;
|
||||||
|
|
||||||
|
_connections.Add(connection);
|
||||||
|
|
||||||
|
connectionTask = SubscribeToConnection(connection, redisSubscriptions);
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(connection.UserIdentifier))
|
||||||
{
|
{
|
||||||
try
|
userTask = SubscribeToUser(connection, redisSubscriptions);
|
||||||
{
|
}
|
||||||
_logger.ReceivedFromChannel(channelName);
|
|
||||||
|
|
||||||
var message = DeserializeMessage<HubMessage>(data);
|
return Task.WhenAll(connectionTask, userTask);
|
||||||
|
}
|
||||||
|
|
||||||
var tasks = new List<Task>(_connections.Count);
|
public override Task OnDisconnectedAsync(HubConnectionContext connection)
|
||||||
|
{
|
||||||
|
_connections.Remove(connection);
|
||||||
|
|
||||||
foreach (var connection in _connections)
|
var tasks = new List<Task>();
|
||||||
{
|
|
||||||
tasks.Add(WriteAsync(connection, message));
|
|
||||||
}
|
|
||||||
|
|
||||||
await Task.WhenAll(tasks);
|
var feature = connection.Features.Get<IRedisFeature>();
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.FailedWritingMessage(ex);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
channelName = _channelNamePrefix + ".AllExcept";
|
var redisSubscriptions = feature.Subscriptions;
|
||||||
_logger.Subscribing(channelName);
|
if (redisSubscriptions != null)
|
||||||
_bus.Subscribe(channelName, async (c, data) =>
|
|
||||||
{
|
{
|
||||||
try
|
foreach (var subscription in redisSubscriptions)
|
||||||
{
|
{
|
||||||
_logger.ReceivedFromChannel(channelName);
|
_logger.Unsubscribe(subscription);
|
||||||
|
tasks.Add(_bus.UnsubscribeAsync(subscription));
|
||||||
var message = DeserializeMessage<RedisExcludeClientsMessage>(data);
|
|
||||||
var excludedIds = message.ExcludedIds;
|
|
||||||
|
|
||||||
var tasks = new List<Task>(_connections.Count);
|
|
||||||
|
|
||||||
foreach (var connection in _connections)
|
|
||||||
{
|
|
||||||
if (!excludedIds.Contains(connection.ConnectionId))
|
|
||||||
{
|
|
||||||
tasks.Add(WriteAsync(connection, message));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await Task.WhenAll(tasks);
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
}
|
||||||
{
|
|
||||||
_logger.FailedWritingMessage(ex);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
channelName = _channelNamePrefix + ".internal.group";
|
var groupNames = feature.Groups;
|
||||||
_bus.Subscribe(channelName, async (c, data) =>
|
|
||||||
|
if (groupNames != null)
|
||||||
{
|
{
|
||||||
try
|
// Copy the groups to an array here because they get removed from this collection
|
||||||
|
// in RemoveGroupAsync
|
||||||
|
foreach (var group in groupNames.ToArray())
|
||||||
{
|
{
|
||||||
var groupMessage = DeserializeMessage<GroupMessage>(data);
|
// Use RemoveGroupAsyncCore because the connection is local and we don't want to
|
||||||
|
// accidentally go to other servers with our remove request.
|
||||||
var connection = _connections[groupMessage.ConnectionId];
|
tasks.Add(RemoveGroupAsyncCore(connection, group));
|
||||||
if (connection == null)
|
|
||||||
{
|
|
||||||
// user not on this server
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (groupMessage.Action == GroupAction.Remove)
|
|
||||||
{
|
|
||||||
await RemoveGroupAsyncCore(connection, groupMessage.Group);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (groupMessage.Action == GroupAction.Add)
|
|
||||||
{
|
|
||||||
await AddGroupAsyncCore(connection, groupMessage.Group);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sending ack to server that sent the original add/remove
|
|
||||||
await PublishAsync($"{_channelNamePrefix}.internal.{groupMessage.Server}", new GroupMessage
|
|
||||||
{
|
|
||||||
Action = GroupAction.Ack,
|
|
||||||
Id = groupMessage.Id
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
}
|
||||||
{
|
|
||||||
_logger.InternalMessageFailed(ex);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Create server specific channel in order to send an ack to a single server
|
return Task.WhenAll(tasks);
|
||||||
var serverChannel = $"{_channelNamePrefix}.internal.{_serverName}";
|
|
||||||
_bus.Subscribe(serverChannel, (c, data) =>
|
|
||||||
{
|
|
||||||
var groupMessage = DeserializeMessage<GroupMessage>(data);
|
|
||||||
|
|
||||||
if (groupMessage.Action == GroupAction.Ack)
|
|
||||||
{
|
|
||||||
_ackHandler.TriggerAck(groupMessage.Id);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Task InvokeAllAsync(string methodName, object[] args)
|
public override Task InvokeAllAsync(string methodName, object[] args)
|
||||||
|
|
@ -259,94 +217,6 @@ namespace Microsoft.AspNetCore.SignalR.Redis
|
||||||
await _bus.PublishAsync(channel, payload);
|
await _bus.PublishAsync(channel, payload);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Task OnConnectedAsync(HubConnectionContext connection)
|
|
||||||
{
|
|
||||||
var feature = new RedisFeature();
|
|
||||||
connection.Features.Set<IRedisFeature>(feature);
|
|
||||||
|
|
||||||
var redisSubscriptions = feature.Subscriptions;
|
|
||||||
var connectionTask = Task.CompletedTask;
|
|
||||||
var userTask = Task.CompletedTask;
|
|
||||||
|
|
||||||
_connections.Add(connection);
|
|
||||||
|
|
||||||
var connectionChannel = _channelNamePrefix + "." + connection.ConnectionId;
|
|
||||||
redisSubscriptions.Add(connectionChannel);
|
|
||||||
|
|
||||||
_logger.Subscribing(connectionChannel);
|
|
||||||
connectionTask = _bus.SubscribeAsync(connectionChannel, async (c, data) =>
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var message = DeserializeMessage<HubMessage>(data);
|
|
||||||
|
|
||||||
await WriteAsync(connection, message);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.FailedWritingMessage(ex);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(connection.UserIdentifier))
|
|
||||||
{
|
|
||||||
var userChannel = _channelNamePrefix + ".user." + connection.UserIdentifier;
|
|
||||||
redisSubscriptions.Add(userChannel);
|
|
||||||
|
|
||||||
// TODO: Look at optimizing (looping over connections checking for Name)
|
|
||||||
userTask = _bus.SubscribeAsync(userChannel, async (c, data) =>
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var message = DeserializeMessage<HubMessage>(data);
|
|
||||||
|
|
||||||
await WriteAsync(connection, message);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.FailedWritingMessage(ex);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return Task.WhenAll(connectionTask, userTask);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Task OnDisconnectedAsync(HubConnectionContext connection)
|
|
||||||
{
|
|
||||||
_connections.Remove(connection);
|
|
||||||
|
|
||||||
var tasks = new List<Task>();
|
|
||||||
|
|
||||||
var feature = connection.Features.Get<IRedisFeature>();
|
|
||||||
|
|
||||||
var redisSubscriptions = feature.Subscriptions;
|
|
||||||
if (redisSubscriptions != null)
|
|
||||||
{
|
|
||||||
foreach (var subscription in redisSubscriptions)
|
|
||||||
{
|
|
||||||
_logger.Unsubscribe(subscription);
|
|
||||||
tasks.Add(_bus.UnsubscribeAsync(subscription));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var groupNames = feature.Groups;
|
|
||||||
|
|
||||||
if (groupNames != null)
|
|
||||||
{
|
|
||||||
// Copy the groups to an array here because they get removed from this collection
|
|
||||||
// in RemoveGroupAsync
|
|
||||||
foreach (var group in groupNames.ToArray())
|
|
||||||
{
|
|
||||||
// Use RemoveGroupAsyncCore because the connection is local and we don't want to
|
|
||||||
// accidentally go to other servers with our remove request.
|
|
||||||
tasks.Add(RemoveGroupAsyncCore(connection, group));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Task.WhenAll(tasks);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override async Task AddGroupAsync(string connectionId, string groupName)
|
public override async Task AddGroupAsync(string connectionId, string groupName)
|
||||||
{
|
{
|
||||||
if (connectionId == null)
|
if (connectionId == null)
|
||||||
|
|
@ -398,26 +268,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_logger.Subscribing(groupChannel);
|
await SubscribeToGroup(groupChannel, group);
|
||||||
await _bus.SubscribeAsync(groupChannel, async (c, data) =>
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var message = DeserializeMessage<HubMessage>(data);
|
|
||||||
|
|
||||||
var tasks = new List<Task>(group.Connections.Count);
|
|
||||||
foreach (var groupConnection in group.Connections)
|
|
||||||
{
|
|
||||||
tasks.Add(WriteAsync(groupConnection, message));
|
|
||||||
}
|
|
||||||
|
|
||||||
await Task.WhenAll(tasks);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.FailedWritingMessage(ex);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
|
@ -519,7 +370,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis
|
||||||
_ackHandler.Dispose();
|
_ackHandler.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task WriteAsync(HubConnectionContext connection, HubMessage hubMessage)
|
private static async Task WriteAsync(HubConnectionContext connection, HubMessage hubMessage)
|
||||||
{
|
{
|
||||||
while (await connection.Output.WaitToWriteAsync())
|
while (await connection.Output.WaitToWriteAsync())
|
||||||
{
|
{
|
||||||
|
|
@ -544,6 +395,186 @@ namespace Microsoft.AspNetCore.SignalR.Redis
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SubscribeToHub()
|
||||||
|
{
|
||||||
|
_logger.Subscribing(_channelNamePrefix);
|
||||||
|
_bus.Subscribe(_channelNamePrefix, async (c, data) =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_logger.ReceivedFromChannel(_channelNamePrefix);
|
||||||
|
|
||||||
|
var message = DeserializeMessage<HubMessage>(data);
|
||||||
|
|
||||||
|
var tasks = new List<Task>(_connections.Count);
|
||||||
|
|
||||||
|
foreach (var connection in _connections)
|
||||||
|
{
|
||||||
|
tasks.Add(WriteAsync(connection, message));
|
||||||
|
}
|
||||||
|
|
||||||
|
await Task.WhenAll(tasks);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.FailedWritingMessage(ex);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SubscribeToAllExcept()
|
||||||
|
{
|
||||||
|
var channelName = _channelNamePrefix + ".AllExcept";
|
||||||
|
_logger.Subscribing(channelName);
|
||||||
|
_bus.Subscribe(channelName, async (c, data) =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_logger.ReceivedFromChannel(channelName);
|
||||||
|
|
||||||
|
var message = DeserializeMessage<RedisExcludeClientsMessage>(data);
|
||||||
|
var excludedIds = message.ExcludedIds;
|
||||||
|
|
||||||
|
var tasks = new List<Task>(_connections.Count);
|
||||||
|
|
||||||
|
foreach (var connection in _connections)
|
||||||
|
{
|
||||||
|
if (!excludedIds.Contains(connection.ConnectionId))
|
||||||
|
{
|
||||||
|
tasks.Add(WriteAsync(connection, message));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await Task.WhenAll(tasks);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.FailedWritingMessage(ex);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SubscribeToInternalGroup()
|
||||||
|
{
|
||||||
|
var channelName = _channelNamePrefix + ".internal.group";
|
||||||
|
_bus.Subscribe(channelName, async (c, data) =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var groupMessage = DeserializeMessage<GroupMessage>(data);
|
||||||
|
|
||||||
|
var connection = _connections[groupMessage.ConnectionId];
|
||||||
|
if (connection == null)
|
||||||
|
{
|
||||||
|
// user not on this server
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (groupMessage.Action == GroupAction.Remove)
|
||||||
|
{
|
||||||
|
await RemoveGroupAsyncCore(connection, groupMessage.Group);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (groupMessage.Action == GroupAction.Add)
|
||||||
|
{
|
||||||
|
await AddGroupAsyncCore(connection, groupMessage.Group);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sending ack to server that sent the original add/remove
|
||||||
|
await PublishAsync($"{_channelNamePrefix}.internal.{groupMessage.Server}", new GroupMessage
|
||||||
|
{
|
||||||
|
Action = GroupAction.Ack,
|
||||||
|
Id = groupMessage.Id
|
||||||
|
});
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.InternalMessageFailed(ex);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SubscribeToInternalServerName()
|
||||||
|
{
|
||||||
|
// Create server specific channel in order to send an ack to a single server
|
||||||
|
var serverChannel = $"{_channelNamePrefix}.internal.{_serverName}";
|
||||||
|
_bus.Subscribe(serverChannel, (c, data) =>
|
||||||
|
{
|
||||||
|
var groupMessage = DeserializeMessage<GroupMessage>(data);
|
||||||
|
|
||||||
|
if (groupMessage.Action == GroupAction.Ack)
|
||||||
|
{
|
||||||
|
_ackHandler.TriggerAck(groupMessage.Id);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private Task SubscribeToConnection(HubConnectionContext connection, HashSet<string> redisSubscriptions)
|
||||||
|
{
|
||||||
|
var connectionChannel = _channelNamePrefix + "." + connection.ConnectionId;
|
||||||
|
redisSubscriptions.Add(connectionChannel);
|
||||||
|
|
||||||
|
_logger.Subscribing(connectionChannel);
|
||||||
|
return _bus.SubscribeAsync(connectionChannel, async (c, data) =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var message = DeserializeMessage<HubMessage>(data);
|
||||||
|
|
||||||
|
await WriteAsync(connection, message);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.FailedWritingMessage(ex);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private Task SubscribeToUser(HubConnectionContext connection, HashSet<string> redisSubscriptions)
|
||||||
|
{
|
||||||
|
var userChannel = _channelNamePrefix + ".user." + connection.UserIdentifier;
|
||||||
|
redisSubscriptions.Add(userChannel);
|
||||||
|
|
||||||
|
// TODO: Look at optimizing (looping over connections checking for Name)
|
||||||
|
return _bus.SubscribeAsync(userChannel, async (c, data) =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var message = DeserializeMessage<HubMessage>(data);
|
||||||
|
|
||||||
|
await WriteAsync(connection, message);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.FailedWritingMessage(ex);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private Task SubscribeToGroup(string groupChannel, GroupData group)
|
||||||
|
{
|
||||||
|
_logger.Subscribing(groupChannel);
|
||||||
|
return _bus.SubscribeAsync(groupChannel, async (c, data) =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var message = DeserializeMessage<HubMessage>(data);
|
||||||
|
|
||||||
|
var tasks = new List<Task>(group.Connections.Count);
|
||||||
|
foreach (var groupConnection in group.Connections)
|
||||||
|
{
|
||||||
|
tasks.Add(WriteAsync(groupConnection, message));
|
||||||
|
}
|
||||||
|
|
||||||
|
await Task.WhenAll(tasks);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.FailedWritingMessage(ex);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private class LoggerTextWriter : TextWriter
|
private class LoggerTextWriter : TextWriter
|
||||||
{
|
{
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue