friendlynamazu/client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix multiple PushCharacterData calls

Browse Source
This commit is contained in:
Stanley Dimant
2025-03-06 17:21:02 +01:00
parent c8d5b14aba
commit 4c268befdc
1 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
MareSynchronos/PlayerData/Pairs/VisibleUserDataDistributor.cs
View File

@@ -4,7 +4,6 @@ using MareSynchronos.Services.Mediator;
using MareSynchronos.Utils; using MareSynchronos.Utils;
using MareSynchronos.WebAPI; using MareSynchronos.WebAPI;
using MareSynchronos.WebAPI.Files; using MareSynchronos.WebAPI.Files;
using MessagePack.Formatters;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace MareSynchronos.PlayerData.Pairs; namespace MareSynchronos.PlayerData.Pairs;
@@ -16,9 +15,13 @@ public class VisibleUserDataDistributor : DisposableMediatorSubscriberBase
private readonly FileUploadManager _fileTransferManager; private readonly FileUploadManager _fileTransferManager;
private readonly PairManager _pairManager; private readonly PairManager _pairManager;
private CharacterData? _lastCreatedData; private CharacterData? _lastCreatedData;
private CharacterData? _uploadingCharacterData = null;
private readonly List<UserData> _previouslyVisiblePlayers = []; private readonly List<UserData> _previouslyVisiblePlayers = [];
private Task<CharacterData>? _fileUploadTask = null; private Task<CharacterData>? _fileUploadTask = null;
private readonly HashSet<UserData> _usersToPushDataTo = []; private readonly HashSet<UserData> _usersToPushDataTo = [];
private readonly SemaphoreSlim _pushDataSemaphore = new(1, 1);
private readonly CancellationTokenSource _runtimeCts = new();
public VisibleUserDataDistributor(ILogger<VisibleUserDataDistributor> logger, ApiController apiController, DalamudUtilService dalamudUtil, public VisibleUserDataDistributor(ILogger<VisibleUserDataDistributor> logger, ApiController apiController, DalamudUtilService dalamudUtil,
PairManager pairManager, MareMediator mediator, FileUploadManager fileTransferManager) : base(logger, mediator) PairManager pairManager, MareMediator mediator, FileUploadManager fileTransferManager) : base(logger, mediator)
@@ -47,6 +50,17 @@ public class VisibleUserDataDistributor : DisposableMediatorSubscriberBase
Mediator.Subscribe<DisconnectedMessage>(this, (_) => _previouslyVisiblePlayers.Clear()); Mediator.Subscribe<DisconnectedMessage>(this, (_) => _previouslyVisiblePlayers.Clear());
} }
protected override void Dispose(bool disposing)
{
if (disposing)
{
_runtimeCts.Cancel();
_runtimeCts.Dispose();
}
base.Dispose(disposing);
}
private void PushToAllVisibleUsers(bool forced = false) private void PushToAllVisibleUsers(bool forced = false)
{ {
foreach (var user in _pairManager.GetVisibleUsers()) foreach (var user in _pairManager.GetVisibleUsers())
@@ -80,17 +94,32 @@ public class VisibleUserDataDistributor : DisposableMediatorSubscriberBase
_ = Task.Run(async () => _ = Task.Run(async () =>
{ {
forced |= _uploadingCharacterData?.DataHash != _lastCreatedData.DataHash;
if (_fileUploadTask == null || (_fileUploadTask?.IsCompleted ?? false) || forced) if (_fileUploadTask == null || (_fileUploadTask?.IsCompleted ?? false) || forced)
{ {
_fileUploadTask = _fileTransferManager.UploadFiles(_lastCreatedData.DeepClone(), [.. _usersToPushDataTo]); _uploadingCharacterData = _lastCreatedData.DeepClone();
Logger.LogDebug("Starting UploadTask for {hash}, Reason: TaskIsNull: {task}, TaskIsCompleted: {taskCpl}, Forced: {frc}",
_lastCreatedData.DataHash, _fileUploadTask == null, _fileUploadTask?.IsCompleted ?? false, false);
_fileUploadTask = _fileTransferManager.UploadFiles(_uploadingCharacterData, [.. _usersToPushDataTo]);
} }
if (_fileUploadTask != null) if (_fileUploadTask != null)
{ {
var dataToSend = await _fileUploadTask.ConfigureAwait(false); var dataToSend = await _fileUploadTask.ConfigureAwait(false);
await _pushDataSemaphore.WaitAsync(_runtimeCts.Token).ConfigureAwait(false);
try
{
if (!_usersToPushDataTo.Any()) return;
Logger.LogDebug("Pushing {data} to {users}", dataToSend.DataHash, string.Join(", ", _usersToPushDataTo.Select(k => k.AliasOrUID)));
await _apiController.PushCharacterData(dataToSend, [.. _usersToPushDataTo]).ConfigureAwait(false); await _apiController.PushCharacterData(dataToSend, [.. _usersToPushDataTo]).ConfigureAwait(false);
_usersToPushDataTo.Clear(); _usersToPushDataTo.Clear();
} }
finally
{
_pushDataSemaphore.Release();
}
}
}); });
} }
} }