t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rework service disposal

Browse Source
This commit is contained in:
rootdarkarchon
2023-01-31 19:52:12 +01:00
parent ef5e77017f
commit 2ca3e639b4
24 changed files with 299 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MareSynchronos/Managers/CachedPlayer.cs
View File

@@ -12,13 +12,12 @@ using MareSynchronos.WebAPI;
namespace MareSynchronos.Managers;
public class CachedPlayer : IDisposable
public class CachedPlayer : MediatorSubscriberBase, IDisposable
{
private readonly ApiController _apiController;
private readonly DalamudUtil _dalamudUtil;
private readonly IpcManager _ipcManager;
private readonly FileCacheManager _fileDbManager;
private readonly MareMediator _mediator;
private API.Data.CharacterData _cachedData = new();
private PlayerRelatedObject? _currentCharacterEquipment;
private CancellationTokenSource? _downloadCancellationTokenSource = new();
@@ -30,14 +29,13 @@ public class CachedPlayer : IDisposable
private Task? _penumbraRedrawEventTask;
public CachedPlayer(OnlineUserIdentDto onlineUser, IpcManager ipcManager, ApiController apiController, DalamudUtil dalamudUtil, FileCacheManager fileDbManager, MareMediator mediator)
public CachedPlayer(OnlineUserIdentDto onlineUser, IpcManager ipcManager, ApiController apiController, DalamudUtil dalamudUtil, FileCacheManager fileDbManager, MareMediator mediator) : base(mediator)
{
OnlineUser = onlineUser;
_ipcManager = ipcManager;
_apiController = apiController;
_dalamudUtil = dalamudUtil;
_fileDbManager = fileDbManager;
_mediator = mediator;
}
public bool IsVisible
@@ -173,7 +171,7 @@ public class CachedPlayer : IDisposable
if (missingPluginsForData.Any())
{
_mediator.Publish(new NotificationMessage("Missing plugins for " + PlayerName,
Mediator.Publish(new NotificationMessage("Missing plugins for " + PlayerName,
$"Received data for {PlayerName} that contained information for plugins you have not installed. Install {string.Join(", ", missingPluginsForData)} to experience their character fully.",
NotificationType.Warning, 10000));
}
@@ -202,9 +200,12 @@ public class CachedPlayer : IDisposable
return true;
}
public void Dispose()
public override void Dispose()
{
if (string.IsNullOrEmpty(PlayerName)) return;
base.Dispose();
Logger.Debug("Disposing " + PlayerName + " (" + OnlineUser + ")");
try
{
@@ -227,7 +228,7 @@ public class CachedPlayer : IDisposable
}
finally
{
_mediator.UnsubscribeAll(this);
Mediator.UnsubscribeAll(this);
_cachedData = new();
var tempPlayerName = PlayerName;
PlayerName = string.Empty;
@@ -244,7 +245,7 @@ public class CachedPlayer : IDisposable
PlayerCharacter = character;
Logger.Debug("Initializing Player " + this);
_mediator.Subscribe<PenumbraRedrawMessage>(this, (msg) => IpcManagerOnPenumbraRedrawEvent(((PenumbraRedrawMessage)msg)));
Mediator.Subscribe<PenumbraRedrawMessage>(this, (msg) => IpcManagerOnPenumbraRedrawEvent(((PenumbraRedrawMessage)msg)));
_originalGlamourerData = _ipcManager.GlamourerGetCharacterCustomization(PlayerCharacter);
_currentCharacterEquipment = new PlayerRelatedObject(ObjectKind.Player, IntPtr.Zero, IntPtr.Zero,
() => _dalamudUtil.GetPlayerCharacterFromObjectTableByName(PlayerName)?.Address ?? IntPtr.Zero);

35
MareSynchronos/Managers/IpcManager.cs
View File

@@ -11,7 +11,7 @@ using MareSynchronos.Mediator;
namespace MareSynchronos.Managers;
public class IpcManager : IDisposable
public class IpcManager : MediatorSubscriberBase, IDisposable
{
private readonly ICallGateSubscriber<int> _glamourerApiVersion;
private readonly ICallGateSubscriber<string, GameObject?, object>? _glamourerApplyAll;
@@ -57,18 +57,15 @@ public class IpcManager : IDisposable
private readonly ICallGateSubscriber<Character, string, object> _palettePlusPaletteChanged;
private readonly DalamudUtil _dalamudUtil;
private readonly MareMediator _mediator;
private bool _inGposeQueueMode = false;
private ConcurrentQueue<Action> ActionQueue => _inGposeQueueMode ? _gposeActionQueue : _normalQueue;
private readonly ConcurrentQueue<Action> _normalQueue = new();
private readonly ConcurrentQueue<Action> _gposeActionQueue = new();
public IpcManager(DalamudPluginInterface pi, DalamudUtil dalamudUtil, MareMediator mediator)
public IpcManager(DalamudPluginInterface pi, DalamudUtil dalamudUtil, MareMediator mediator) : base(mediator)
{
Logger.Verbose("Creating " + nameof(IpcManager));
_mediator = mediator;
_penumbraInit = Penumbra.Api.Ipc.Initialized.Subscriber(pi, () => PenumbraInit());
_penumbraDispose = Penumbra.Api.Ipc.Disposed.Subscriber(pi, () => PenumbraDispose());
_penumbraResolvePlayer = Penumbra.Api.Ipc.ResolvePlayerPath.Subscriber(pi);
@@ -121,13 +118,13 @@ public class IpcManager : IDisposable
if (Initialized)
{
_mediator.Publish(new PenumbraInitializedMessage());
Mediator.Publish(new PenumbraInitializedMessage());
}
_dalamudUtil = dalamudUtil;
_mediator.Subscribe<FrameworkUpdateMessage>(this, (_) => HandleActionQueue());
_mediator.Subscribe<GposeFrameworkUpdateMessage>(this, (_) => HandleGposeActionQueue());
_mediator.Subscribe<ZoneSwitchEndMessage>(this, (_) => ClearActionQueue());
Mediator.Subscribe<FrameworkUpdateMessage>(this, (_) => HandleActionQueue());
Mediator.Subscribe<GposeFrameworkUpdateMessage>(this, (_) => HandleGposeActionQueue());
Mediator.Subscribe<ZoneSwitchEndMessage>(this, (_) => ClearActionQueue());
}
private void HandleGposeActionQueue()
@@ -147,7 +144,7 @@ public class IpcManager : IDisposable
private void PenumbraModSettingChangedHandler()
{
_mediator.Publish(new PenumbraModSettingChangedMessage());
Mediator.Publish(new PenumbraModSettingChangedMessage());
}
private void ClearActionQueue()
@@ -162,7 +159,7 @@ public class IpcManager : IDisposable
{
if (ptr != IntPtr.Zero && string.Compare(arg1, arg2, ignoreCase: true, System.Globalization.CultureInfo.InvariantCulture) != 0)
{
_mediator.Publish(new PenumbraResourceLoadMessage(ptr, arg1, arg2));
Mediator.Publish(new PenumbraResourceLoadMessage(ptr, arg1, arg2));
}
});
}
@@ -238,9 +235,9 @@ public class IpcManager : IDisposable
}
}
public void Dispose()
public override void Dispose()
{
Logger.Verbose("Disposing " + nameof(IpcManager));
base.Dispose();
int totalSleepTime = 0;
while (!ActionQueue.IsEmpty && totalSleepTime < 2000)
@@ -500,31 +497,31 @@ public class IpcManager : IDisposable
private void RedrawEvent(IntPtr objectAddress, int objectTableIndex)
{
_mediator.Publish(new PenumbraRedrawMessage(objectAddress, objectTableIndex));
Mediator.Publish(new PenumbraRedrawMessage(objectAddress, objectTableIndex));
}
private void PenumbraInit()
{
_mediator.Publish(new PenumbraInitializedMessage());
Mediator.Publish(new PenumbraInitializedMessage());
_penumbraRedraw!.Invoke("self", RedrawType.Redraw);
}
private void HeelsOffsetChange(float offset)
{
_mediator.Publish(new HeelsOffsetMessage(offset));
Mediator.Publish(new HeelsOffsetMessage(offset));
}
private void OnCustomizePlusScaleChange(string? scale)
{
if (scale != null) scale = Convert.ToBase64String(Encoding.UTF8.GetBytes(scale));
_mediator.Publish(new CustomizePlusMessage(scale));
Mediator.Publish(new CustomizePlusMessage(scale));
}
private void OnPalettePlusPaletteChange(Character character, string palette)
{
if (character.Address == 0 || character.Address != _dalamudUtil.PlayerPointer) return;
if (palette != null) palette = Convert.ToBase64String(Encoding.UTF8.GetBytes(palette));
_mediator.Publish(new PalettePlusMessage(palette));
Mediator.Publish(new PalettePlusMessage(palette));
}
public void PalettePlusSetPalette(IntPtr character, string palette)
@@ -575,7 +572,7 @@ public class IpcManager : IDisposable
private void PenumbraDispose()
{
_mediator.Publish(new PenumbraDisposedMessage());
Mediator.Publish(new PenumbraDisposedMessage());
ActionQueue.Clear();
}
}

4
MareSynchronos/Managers/NotificationService.cs
View File

@@ -7,13 +7,13 @@ using MareSynchronos.Mediator;
using MareSynchronos.Utils;
namespace MareSynchronos.Managers;
public class NotificationService
public class NotificationService : MediatorSubscriberBase
{
private readonly UiBuilder _uiBuilder;
private readonly ChatGui _chatGui;
private readonly ConfigurationService _configurationService;
public NotificationService(MareMediator mediator, UiBuilder uiBuilder, ChatGui chatGui, ConfigurationService configurationService)
public NotificationService(MareMediator mediator, UiBuilder uiBuilder, ChatGui chatGui, ConfigurationService configurationService) : base(mediator)
{
_uiBuilder = uiBuilder;
_chatGui = chatGui;

4
MareSynchronos/Managers/OnlinePlayerManager.cs
View File

@@ -15,7 +15,8 @@ public class OnlinePlayerManager : MediatorSubscriberBase, IDisposable
private readonly FileCacheManager _fileDbManager;
private readonly PairManager _pairManager;
public OnlinePlayerManager(ApiController apiController, DalamudUtil dalamudUtil, PlayerManager playerManager, FileCacheManager fileDbManager, PairManager pairManager, MareMediator mediator) : base(mediator)
public OnlinePlayerManager(ApiController apiController, DalamudUtil dalamudUtil, PlayerManager playerManager,
FileCacheManager fileDbManager, PairManager pairManager, MareMediator mediator) : base(mediator)
{
Logger.Verbose("Creating " + nameof(OnlinePlayerManager));
@@ -48,7 +49,6 @@ public class OnlinePlayerManager : MediatorSubscriberBase, IDisposable
public override void Dispose()
{
Logger.Verbose("Disposing " + nameof(OnlinePlayerManager));
base.Dispose();
}

18
MareSynchronos/Managers/PairManager.cs
View File

@@ -17,25 +17,22 @@ using System.Collections.Concurrent;
namespace MareSynchronos.Managers;
public class PairManager : IDisposable
public class PairManager : MediatorSubscriberBase, IDisposable
{
private readonly ConcurrentDictionary<UserData, Pair> _allClientPairs = new(UserDataComparer.Instance);
private readonly ConcurrentDictionary<GroupData, GroupFullInfoDto> _allGroups = new(GroupDataComparer.Instance);
private readonly CachedPlayerFactory _cachedPlayerFactory;
private readonly PairFactory _pairFactory;
private readonly UiBuilder _uiBuilder;
private readonly ConfigurationService _configurationService;
private readonly MareMediator _mediator;
public PairManager(CachedPlayerFactory cachedPlayerFactory, PairFactory pairFactory, UiBuilder uiBuilder, ConfigurationService configurationService, MareMediator mediator)
public PairManager(CachedPlayerFactory cachedPlayerFactory, PairFactory pairFactory,
ConfigurationService configurationService, MareMediator mediator) : base(mediator)
{
_cachedPlayerFactory = cachedPlayerFactory;
_pairFactory = pairFactory;
_uiBuilder = uiBuilder;
_configurationService = configurationService;
_mediator = mediator;
_mediator.Subscribe<ZoneSwitchStartMessage>(this, (_) => DalamudUtilOnZoneSwitched());
_mediator.Subscribe<DelayedFrameworkUpdateMessage>(this, (_) => DalamudUtilOnDelayedFrameworkUpdate());
Mediator.Subscribe<ZoneSwitchStartMessage>(this, (_) => DalamudUtilOnZoneSwitched());
Mediator.Subscribe<DelayedFrameworkUpdateMessage>(this, (_) => DalamudUtilOnDelayedFrameworkUpdate());
_directPairsInternal = DirectPairsLazy();
_groupPairsInternal = GroupPairsLazy();
}
@@ -137,8 +134,9 @@ public class PairManager : IDisposable
RecreateLazy();
}
public void Dispose()
public override void Dispose()
{
base.Dispose();
DisposePairs();
}
@@ -184,7 +182,7 @@ public class PairManager : IDisposable
var msg = !string.IsNullOrEmpty(note)
? $"{note} ({pair.UserData.AliasOrUID}) is now online"
: $"{pair.UserData.AliasOrUID} is now online";
_mediator.Publish(new NotificationMessage("User online", msg, NotificationType.Info, 5000));
Mediator.Publish(new NotificationMessage("User online", msg, NotificationType.Info, 5000));
}
pair.CachedPlayer?.Dispose();

3
MareSynchronos/Managers/PlayerManager.cs
View File

@@ -10,7 +10,6 @@ using MareSynchronos.Mediator;
namespace MareSynchronos.Managers;
public class PlayerManager : MediatorSubscriberBase, IDisposable
{
private readonly ApiController _apiController;
@@ -123,8 +122,6 @@ public class PlayerManager : MediatorSubscriberBase, IDisposable
public override void Dispose()
{
Logger.Verbose("Disposing " + nameof(PlayerManager));
base.Dispose();
_playerChangedCts?.Cancel();