fixes
This commit is contained in:
parent
899c44be17
commit
d55b232e00
|
|
@ -391,8 +391,6 @@
|
||||||
{
|
{
|
||||||
if (messageTag == SignalRTags.PostTransfersAsync)
|
if (messageTag == SignalRTags.PostTransfersAsync)
|
||||||
{
|
{
|
||||||
//InitializeDataSources(MessagePackSerializer.Deserialize<List<Transfer>>(message, ContractlessStandardResolver.Options));
|
|
||||||
|
|
||||||
var json = message?.MessagePackTo<string>(ContractlessStandardResolver.Options);
|
var json = message?.MessagePackTo<string>(ContractlessStandardResolver.Options);
|
||||||
|
|
||||||
InitializeDataSources(json?.JsonTo<List<Transfer>>() ?? []);
|
InitializeDataSources(json?.JsonTo<List<Transfer>>() ?? []);
|
||||||
|
|
@ -401,8 +399,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
await devAdminSignalClient.Send("", SignalRTags.GetTransfersAsync, null);
|
await devAdminSignalClient.Send("", SignalRTags.GetTransfersAsync, null);
|
||||||
|
|
||||||
//InitializeDataSources(await transferDataService.GetTransfersAsync());
|
//InitializeDataSources(await transferDataService.GetTransfersAsync());
|
||||||
|
|
||||||
base.OnInitialized();
|
base.OnInitialized();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,13 +15,15 @@ public class DevAdminSignalRHub(AdminDal adminDal, IEnumerable<IAcLogWriterBase>
|
||||||
// https://docs.microsoft.com/en-us/aspnet/core/signalr/hubs?view=aspnetcore-3.1#strongly-typed-hubs
|
// https://docs.microsoft.com/en-us/aspnet/core/signalr/hubs?view=aspnetcore-3.1#strongly-typed-hubs
|
||||||
public override async Task OnConnectedAsync()
|
public override async Task OnConnectedAsync()
|
||||||
{
|
{
|
||||||
|
_logger.Debug($"OnConnectedAsync; ConnectionId: {Context.ConnectionId}; UserIdentifier: {Context.UserIdentifier}");
|
||||||
|
|
||||||
//await Groups.AddToGroupAsync(Context.ConnectionId, "SignalR Users");
|
//await Groups.AddToGroupAsync(Context.ConnectionId, "SignalR Users");
|
||||||
await base.OnConnectedAsync();
|
await base.OnConnectedAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override async Task OnDisconnectedAsync(Exception? exception)
|
public override async Task OnDisconnectedAsync(Exception? exception)
|
||||||
{
|
{
|
||||||
_logger.Error($"OnDisconnectedAsync", exception);
|
_logger.Error($"OnDisconnectedAsync; ConnectionId: {Context.ConnectionId}; UserIdentifier: {Context.UserIdentifier}", exception);
|
||||||
|
|
||||||
//await Groups.RemoveFromGroupAsync(Context.ConnectionId, "SignalR Users");
|
//await Groups.RemoveFromGroupAsync(Context.ConnectionId, "SignalR Users");
|
||||||
await base.OnDisconnectedAsync(exception);
|
await base.OnDisconnectedAsync(exception);
|
||||||
|
|
@ -34,15 +36,14 @@ public class DevAdminSignalRHub(AdminDal adminDal, IEnumerable<IAcLogWriterBase>
|
||||||
|
|
||||||
public async Task Send(string user, int messageTag, object? message)
|
public async Task Send(string user, int messageTag, object? message)
|
||||||
{
|
{
|
||||||
_logger.Info($"{nameof(user)}: {user}; {nameof(messageTag)}: {messageTag}");
|
_logger.Info($"{nameof(user)}: {user}; {nameof(messageTag)}: {messageTag}; ConnectionId: {Context.ConnectionId}; UserIdentifier: {Context.UserIdentifier}");
|
||||||
|
|
||||||
//await Clients.Caller.MessageReceived("", messageTag, MessagePackSerializer.Serialize(message, ContractlessStandardResolver.Options));
|
|
||||||
await Clients.Caller.MessageReceived("", messageTag, message?.ToMessagePack(ContractlessStandardResolver.Options));
|
await Clients.Caller.MessageReceived("", messageTag, message?.ToMessagePack(ContractlessStandardResolver.Options));
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task MessageReceived(string user, int messageTag, byte[]? message)
|
public async Task MessageReceived(string user, int messageTag, byte[]? message)
|
||||||
{
|
{
|
||||||
_logger.Info($"{nameof(user)}: {user}; {nameof(messageTag)}: {messageTag}");
|
_logger.Info($"{nameof(user)}: {user}; {nameof(messageTag)}: {messageTag}; ConnectionId: {Context.ConnectionId}; UserIdentifier: {Context.UserIdentifier}");
|
||||||
|
|
||||||
if (messageTag == SignalRTags.GetTransfersAsync)
|
if (messageTag == SignalRTags.GetTransfersAsync)
|
||||||
await Send("", SignalRTags.PostTransfersAsync, await adminDal.GetTransfersJsonAsync());
|
await Send("", SignalRTags.PostTransfersAsync, await adminDal.GetTransfersJsonAsync());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue