adjust to send only one packet for all changes at once
This commit is contained in:
Stanley Dimant
@@ -1,15 +1,12 @@
|
||||
using MareSynchronos.Factories;
|
||||
using MareSynchronos.Utils;
|
||||
using MareSynchronos.WebAPI;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using MareSynchronos.API;
|
||||
using Penumbra.GameData.Structs;
|
||||
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
|
||||
using FFXIVClientStructs.FFXIV.Client.Game.Character;
|
||||
using Penumbra.GameData.ByteString;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using MareSynchronos.Models;
|
||||
@@ -17,7 +14,7 @@ using MareSynchronos.Interop;
|
||||
|
||||
namespace MareSynchronos.Managers
|
||||
{
|
||||
public delegate void PlayerHasChanged(CharacterCacheDto characterCache, ObjectKind objectKind);
|
||||
public delegate void PlayerHasChanged(CharacterCacheDto characterCache);
|
||||
|
||||
public class PlayerManager : IDisposable
|
||||
{
|
||||
@@ -26,17 +23,15 @@ namespace MareSynchronos.Managers
|
||||
private readonly DalamudUtil _dalamudUtil;
|
||||
private readonly IpcManager _ipcManager;
|
||||
public event PlayerHasChanged? PlayerHasChanged;
|
||||
public bool SendingData { get; private set; }
|
||||
public Dictionary<ObjectKind, CharacterCacheDto?> LastSentCharacterData { get; private set; } = new();
|
||||
public CharacterCacheDto? LastCreatedCharacterData { get; private set; }
|
||||
public CharacterData PermanentDataCache { get; private set; } = new();
|
||||
private readonly Dictionary<ObjectKind, Func<bool>> objectKindsToUpdate = new();
|
||||
|
||||
private Dictionary<ObjectKind, CancellationTokenSource?> _playerChangedCts = new();
|
||||
private CancellationTokenSource? _playerChangedCts = new();
|
||||
private DateTime _lastPlayerObjectCheck;
|
||||
private Dictionary<ObjectKind, CharacterEquipment?> _currentCharacterEquipment = new();
|
||||
private CharacterEquipment? _currentCharacterEquipment = new();
|
||||
|
||||
private PlayerAttachedObject Minion;
|
||||
private PlayerAttachedObject Pet;
|
||||
private PlayerAttachedObject Companion;
|
||||
private PlayerAttachedObject Mount;
|
||||
private List<PlayerOrRelatedObject> playerAttachedObjects = new List<PlayerOrRelatedObject>();
|
||||
|
||||
public unsafe PlayerManager(ApiController apiController, IpcManager ipcManager,
|
||||
CharacterDataFactory characterDataFactory, DalamudUtil dalamudUtil)
|
||||
@@ -50,6 +45,7 @@ namespace MareSynchronos.Managers
|
||||
|
||||
_apiController.Connected += ApiControllerOnConnected;
|
||||
_apiController.Disconnected += ApiController_Disconnected;
|
||||
_dalamudUtil.FrameworkUpdate += DalamudUtilOnFrameworkUpdate;
|
||||
|
||||
Logger.Debug("Watching Player, ApiController is Connected: " + _apiController.IsConnected);
|
||||
if (_apiController.IsConnected)
|
||||
@@ -57,10 +53,14 @@ namespace MareSynchronos.Managers
|
||||
ApiControllerOnConnected();
|
||||
}
|
||||
|
||||
Minion = new PlayerAttachedObject(ObjectKind.Minion, IntPtr.Zero, IntPtr.Zero, () => (IntPtr)((Character*)_dalamudUtil.PlayerPointer)->CompanionObject);
|
||||
Pet = new PlayerAttachedObject(ObjectKind.Pet, IntPtr.Zero, IntPtr.Zero, () => _dalamudUtil.GetPet());
|
||||
Companion = new PlayerAttachedObject(ObjectKind.Companion, IntPtr.Zero, IntPtr.Zero, () => _dalamudUtil.GetCompanion());
|
||||
Mount = new PlayerAttachedObject(ObjectKind.Mount, IntPtr.Zero, IntPtr.Zero, () => (IntPtr)((CharaExt*)_dalamudUtil.PlayerPointer)->Mount);
|
||||
playerAttachedObjects = new List<PlayerOrRelatedObject>()
|
||||
{
|
||||
new PlayerOrRelatedObject(ObjectKind.Player, IntPtr.Zero, IntPtr.Zero, () => _dalamudUtil.PlayerPointer),
|
||||
new PlayerOrRelatedObject(ObjectKind.Minion, IntPtr.Zero, IntPtr.Zero, () => (IntPtr)((Character*)_dalamudUtil.PlayerPointer)->CompanionObject),
|
||||
new PlayerOrRelatedObject(ObjectKind.Pet, IntPtr.Zero, IntPtr.Zero, () => _dalamudUtil.GetPet()),
|
||||
new PlayerOrRelatedObject(ObjectKind.Companion, IntPtr.Zero, IntPtr.Zero, () => _dalamudUtil.GetCompanion()),
|
||||
new PlayerOrRelatedObject(ObjectKind.Mount, IntPtr.Zero, IntPtr.Zero, () => (IntPtr)((CharaExt*)_dalamudUtil.PlayerPointer)->Mount),
|
||||
};
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
@@ -74,49 +74,18 @@ namespace MareSynchronos.Managers
|
||||
_dalamudUtil.FrameworkUpdate -= DalamudUtilOnFrameworkUpdate;
|
||||
}
|
||||
|
||||
private unsafe void CheckAndUpdateObject(PlayerAttachedObject attachedObject)
|
||||
{
|
||||
var curPtr = attachedObject.CurrentAddress;
|
||||
if (curPtr != IntPtr.Zero)
|
||||
{
|
||||
var chara = (Character*)curPtr;
|
||||
if (attachedObject.Address == IntPtr.Zero || attachedObject.Address != curPtr
|
||||
|| attachedObject.CompareAndUpdateEquipment(chara->EquipSlotData, chara->CustomizeData)
|
||||
|| (chara->GameObject.DrawObject != null && (IntPtr)chara->GameObject.DrawObject != attachedObject.DrawObjectAddress))
|
||||
{
|
||||
Logger.Verbose(attachedObject.ObjectKind + " Changed " + curPtr);
|
||||
|
||||
attachedObject.Address = curPtr;
|
||||
attachedObject.DrawObjectAddress = (IntPtr)chara->GameObject.DrawObject;
|
||||
attachedObject.CompareAndUpdateEquipment(chara->EquipSlotData, chara->CustomizeData);
|
||||
OnPlayerChanged(attachedObject.ObjectKind);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
attachedObject.Address = IntPtr.Zero;
|
||||
LastSentCharacterData[attachedObject.ObjectKind] = null;
|
||||
}
|
||||
}
|
||||
|
||||
private unsafe void DalamudUtilOnFrameworkUpdate()
|
||||
{
|
||||
if (!_dalamudUtil.IsPlayerPresent || !_ipcManager.Initialized || !_apiController.IsConnected) return;
|
||||
//_dalamudUtil.DebugPrintRenderFlags(_dalamudUtil.PlayerPointer);
|
||||
if (!_dalamudUtil.IsPlayerPresent || !_ipcManager.Initialized) return;
|
||||
|
||||
if (DateTime.Now < _lastPlayerObjectCheck.AddSeconds(0.25)) return;
|
||||
|
||||
|
||||
if (_dalamudUtil.IsPlayerPresent && !_currentCharacterEquipment[ObjectKind.Player]!.CompareAndUpdate(_dalamudUtil.PlayerCharacter))
|
||||
playerAttachedObjects.ForEach(k => k.CheckAndUpdateObject());
|
||||
if (playerAttachedObjects.Any(c => c.HasUnprocessedUpdate && !c.IsProcessing))
|
||||
{
|
||||
OnPlayerChanged(ObjectKind.Player);
|
||||
OnPlayerOrAttachedObjectsChanged();
|
||||
}
|
||||
|
||||
CheckAndUpdateObject(Minion);
|
||||
CheckAndUpdateObject(Pet);
|
||||
CheckAndUpdateObject(Companion);
|
||||
CheckAndUpdateObject(Mount);
|
||||
|
||||
_lastPlayerObjectCheck = DateTime.Now;
|
||||
}
|
||||
|
||||
@@ -125,10 +94,6 @@ namespace MareSynchronos.Managers
|
||||
Logger.Debug("ApiController Connected");
|
||||
|
||||
_ipcManager.PenumbraRedrawEvent += IpcManager_PenumbraRedrawEvent;
|
||||
_dalamudUtil.FrameworkUpdate += DalamudUtilOnFrameworkUpdate;
|
||||
|
||||
_currentCharacterEquipment[ObjectKind.Player] = new CharacterEquipment(_dalamudUtil.PlayerCharacter);
|
||||
PlayerChanged(ObjectKind.Player);
|
||||
}
|
||||
|
||||
private void ApiController_Disconnected()
|
||||
@@ -136,82 +101,63 @@ namespace MareSynchronos.Managers
|
||||
Logger.Debug(nameof(ApiController_Disconnected));
|
||||
|
||||
_ipcManager.PenumbraRedrawEvent -= IpcManager_PenumbraRedrawEvent;
|
||||
_dalamudUtil.FrameworkUpdate -= DalamudUtilOnFrameworkUpdate;
|
||||
LastSentCharacterData.Clear();
|
||||
}
|
||||
|
||||
private async Task<CharacterCacheDto?> CreateFullCharacterCache(CancellationToken token, ObjectKind objectKind)
|
||||
private async Task<CharacterCacheDto?> CreateFullCharacterCacheDto(CancellationToken token)
|
||||
{
|
||||
IntPtr pointer = objectKind switch
|
||||
foreach (var unprocessedObject in playerAttachedObjects.Where(c => c.HasUnprocessedUpdate).ToList())
|
||||
{
|
||||
ObjectKind.Player => _dalamudUtil.PlayerPointer,
|
||||
ObjectKind.Minion => Minion.Address,
|
||||
ObjectKind.Pet => Pet.Address,
|
||||
ObjectKind.Companion => Companion.Address,
|
||||
ObjectKind.Mount => Mount.Address,
|
||||
_ => throw new NotImplementedException()
|
||||
};
|
||||
Logger.Verbose("Building Cache for " + unprocessedObject.ObjectKind);
|
||||
PermanentDataCache = _characterDataFactory.BuildCharacterData(PermanentDataCache, unprocessedObject.ObjectKind, unprocessedObject.Address);
|
||||
unprocessedObject.HasUnprocessedUpdate = false;
|
||||
unprocessedObject.IsProcessing = false;
|
||||
token.ThrowIfCancellationRequested();
|
||||
}
|
||||
|
||||
var cache = _characterDataFactory.BuildCharacterData(pointer);
|
||||
if (cache == null) return null;
|
||||
CharacterCacheDto? cacheDto = null;
|
||||
|
||||
await Task.Run(async () =>
|
||||
while (!PermanentDataCache.IsReady && !token.IsCancellationRequested)
|
||||
{
|
||||
while (!cache.IsReady && !token.IsCancellationRequested)
|
||||
{
|
||||
await Task.Delay(50, token);
|
||||
}
|
||||
await Task.Delay(50, token);
|
||||
}
|
||||
|
||||
if (token.IsCancellationRequested) return;
|
||||
cache.Kind = objectKind;
|
||||
cacheDto = cache.ToCharacterCacheDto();
|
||||
var json = JsonConvert.SerializeObject(cacheDto);
|
||||
if (token.IsCancellationRequested) return null;
|
||||
|
||||
cacheDto.Hash = Crypto.GetHash(json);
|
||||
}, token);
|
||||
Logger.Verbose("Cache creation complete");
|
||||
|
||||
return cacheDto;
|
||||
return PermanentDataCache.ToCharacterCacheDto();
|
||||
}
|
||||
|
||||
private void IpcManager_PenumbraRedrawEvent(IntPtr address, int idx)
|
||||
{
|
||||
Logger.Verbose("RedrawEvent for addr " + address);
|
||||
|
||||
if (address == _dalamudUtil.PlayerPointer)
|
||||
foreach (var item in playerAttachedObjects)
|
||||
{
|
||||
Logger.Debug("Penumbra Redraw Event for " + _dalamudUtil.PlayerName);
|
||||
PlayerChanged(ObjectKind.Player);
|
||||
if (address == item.Address)
|
||||
{
|
||||
Logger.Debug("Penumbra redraw Event for " + item.ObjectKind);
|
||||
item.HasUnprocessedUpdate = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (address == Minion.Address)
|
||||
if (playerAttachedObjects.Any(c => c.HasUnprocessedUpdate))
|
||||
{
|
||||
Logger.Debug("Penumbra Redraw Event for Minion");
|
||||
PlayerChanged(ObjectKind.Minion);
|
||||
}
|
||||
|
||||
if (address == Pet.Address)
|
||||
{
|
||||
Logger.Debug("Penumbra Redraw Event for Pet");
|
||||
PlayerChanged(ObjectKind.Pet);
|
||||
}
|
||||
|
||||
if (address == Companion.Address)
|
||||
{
|
||||
Logger.Debug("Penumbra Redraw Event for Companion");
|
||||
PlayerChanged(ObjectKind.Companion);
|
||||
OnPlayerOrAttachedObjectsChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private void PlayerChanged(ObjectKind objectKind)
|
||||
private void OnPlayerOrAttachedObjectsChanged()
|
||||
{
|
||||
if (_dalamudUtil.IsInGpose) return;
|
||||
|
||||
Logger.Debug("Object changed: " + objectKind.ToString());
|
||||
_playerChangedCts.TryGetValue(objectKind, out var cts);
|
||||
cts?.Cancel();
|
||||
_playerChangedCts[objectKind] = new CancellationTokenSource();
|
||||
var token = _playerChangedCts[objectKind]!.Token;
|
||||
var unprocessedObjects = playerAttachedObjects.Where(c => c.HasUnprocessedUpdate);
|
||||
foreach (var unprocessedObject in unprocessedObjects)
|
||||
{
|
||||
unprocessedObject.IsProcessing = true;
|
||||
}
|
||||
Logger.Debug("Object(s) changed: " + string.Join(", ", unprocessedObjects.Select(c => c.ObjectKind)));
|
||||
_playerChangedCts?.Cancel();
|
||||
_playerChangedCts = new CancellationTokenSource();
|
||||
var token = _playerChangedCts.Token;
|
||||
|
||||
// fix for redraw from anamnesis
|
||||
while ((!_dalamudUtil.IsPlayerPresent || _dalamudUtil.PlayerName == "--") && !token.IsCancellationRequested)
|
||||
@@ -234,45 +180,27 @@ namespace MareSynchronos.Managers
|
||||
|
||||
Task.Run(async () =>
|
||||
{
|
||||
SendingData = true;
|
||||
int attempts = 0;
|
||||
while (!_apiController.IsConnected && attempts < 10 && !token.IsCancellationRequested)
|
||||
{
|
||||
Logger.Warn("No connection to the API");
|
||||
await Task.Delay(TimeSpan.FromSeconds(1), token);
|
||||
attempts++;
|
||||
}
|
||||
|
||||
if (attempts == 10 || token.IsCancellationRequested) return;
|
||||
|
||||
_dalamudUtil.WaitWhileSelfIsDrawing(token);
|
||||
|
||||
var characterCache = (await CreateFullCharacterCache(token, objectKind));
|
||||
CharacterCacheDto? cacheDto = (await CreateFullCharacterCacheDto(token));
|
||||
if (cacheDto == null || token.IsCancellationRequested) return;
|
||||
|
||||
if (characterCache == null || token.IsCancellationRequested) return;
|
||||
|
||||
LastSentCharacterData.TryGetValue(objectKind, out var lastSentPlayerData);
|
||||
if (characterCache.Hash == (lastSentPlayerData?.Hash ?? string.Empty))
|
||||
if ((LastCreatedCharacterData?.GetHashCode() ?? 0) == cacheDto.GetHashCode())
|
||||
{
|
||||
Logger.Debug("Not sending data, already sent");
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
LastCreatedCharacterData = cacheDto;
|
||||
}
|
||||
|
||||
LastSentCharacterData[objectKind] = characterCache;
|
||||
PlayerHasChanged?.Invoke(characterCache, objectKind);
|
||||
SendingData = false;
|
||||
if (_apiController.IsConnected)
|
||||
{
|
||||
Logger.Verbose("Invoking PlayerHasChanged");
|
||||
PlayerHasChanged?.Invoke(cacheDto);
|
||||
}
|
||||
}, token);
|
||||
}
|
||||
|
||||
private void OnPlayerChanged(ObjectKind objectKind)
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
Logger.Debug("Watcher: PlayerChanged");
|
||||
PlayerChanged(objectKind);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user