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

add the whole API stuff first iteration

Browse Source
This commit is contained in:
Stanley Dimant
2022-06-19 01:57:37 +02:00
parent 176eb2a344
commit 1312086a8d
10 changed files with 692 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
MareSynchronos/Managers/CharacterManager.cs
View File

@@ -17,48 +17,58 @@ using Penumbra.PlayerWatch;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using Dalamud.Configuration;
using Dalamud.Game.ClientState.Objects.SubKinds;
using MareSynchronos.API;
using MareSynchronos.FileCacheDB;
namespace MareSynchronos.Managers
{
public class CharacterManager : IDisposable
{
private readonly ClientState clientState;
private readonly Framework framework;
private readonly Framework _framework;
private readonly ApiController apiController;
private readonly ObjectTable objectTable;
private readonly IpcManager ipcManager;
private readonly FileReplacementFactory factory;
private readonly Configuration _pluginConfiguration;
private readonly IPlayerWatcher watcher;
private Task? playerChangedTask = null;
public CharacterManager(ClientState clientState, Framework framework, ApiController apiController, ObjectTable objectTable, IpcManager ipcManager, FileReplacementFactory factory)
public CharacterManager(ClientState clientState, Framework framework, ApiController apiController, ObjectTable objectTable, IpcManager ipcManager, FileReplacementFactory factory,
Configuration pluginConfiguration)
{
this.clientState = clientState;
this.framework = framework;
this._framework = framework;
this.apiController = apiController;
this.objectTable = objectTable;
this.ipcManager = ipcManager;
this.factory = factory;
_pluginConfiguration = pluginConfiguration;
watcher = PlayerWatchFactory.Create(framework, clientState, objectTable);
clientState.TerritoryChanged += ClientState_TerritoryChanged;
framework.Update += Framework_Update;
ipcManager.PenumbraRedrawEvent += IpcManager_PenumbraRedrawEvent;
}
private void IpcManager_PenumbraRedrawEvent(object? sender, EventArgs e)
private void IpcManager_PenumbraRedrawEvent(object? objectTableIndex, EventArgs e)
{
var actorName = ((string)sender!);
PluginLog.Debug("Penumbra redraw " + actorName);
if (actorName == GetPlayerName())
var objTableObj = objectTable[(int)objectTableIndex!];
if (objTableObj!.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player)
{
PlayerChanged(actorName);
if (objTableObj.Name.ToString() == GetPlayerName())
{
PluginLog.Debug("Penumbra Redraw Event");
PlayerChanged(GetPlayerName());
}
}
}
private readonly Dictionary<(string, int), CharacterCacheDto> _characterCache = new();
Dictionary<string, string> localPlayers = new();
private DateTime lastCheck = DateTime.Now;
@@ -71,13 +81,15 @@ namespace MareSynchronos.Managers
if (DateTime.Now < lastCheck.AddSeconds(5)) return;
List<string> localPlayersList = new();
List<string> newPlayers = new();
foreach (var obj in objectTable)
{
if (obj.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player) continue;
string playerName = obj.Name.ToString();
if (playerName == clientState.LocalPlayer.Name.ToString()) continue;
var hashedName = Crypto.GetHash(playerName);
if (playerName == GetPlayerName()) continue;
var pObj = (PlayerCharacter)obj;
var hashedName = Crypto.GetHash256(pObj.Name.ToString() + pObj.HomeWorld.Id.ToString());
localPlayersList.Add(hashedName);
localPlayers[hashedName] = pObj.Name.ToString();
}
foreach (var item in localPlayers.ToList())
@@ -88,8 +100,6 @@ namespace MareSynchronos.Managers
}
}
if (newPlayers.Any())
PluginLog.Debug("New players: " + string.Join(",", newPlayers.Select(p => p + ":" + localPlayers[p])));
lastCheck = DateTime.Now;
}
catch (Exception ex)
@@ -128,7 +138,7 @@ namespace MareSynchronos.Managers
PluginLog.Debug("Waiting for charater to be drawn");
while ((obj->RenderFlags & 0b100000000000) == 0b100000000000) // 0b100000000000 is "still rendering" or something
{
PluginLog.Debug("Waiting for character to finish drawing");
//PluginLog.Debug("Waiting for character to finish drawing");
Thread.Sleep(10);
}
PluginLog.Debug("Character finished drawing");
@@ -142,14 +152,34 @@ namespace MareSynchronos.Managers
Thread.Sleep(50);
}
_ = apiController.SendCharacterData(cache.Result);
_ = apiController.SendCharacterData(cache.Result.ToCharacterCacheDto(), GetLocalPlayers().Select(d => d.Key).ToList());
});
}
private Dictionary<string, PlayerCharacter> GetLocalPlayers()
{
Dictionary<string, PlayerCharacter> allLocalPlayers = new();
foreach (var obj in objectTable)
{
if (obj.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player) continue;
string playerName = obj.Name.ToString();
if (playerName == GetPlayerName()) continue;
var playerObject = (PlayerCharacter)obj;
allLocalPlayers.Add(Crypto.GetHash256(playerObject.Name.ToString() + playerObject.HomeWorld.Id.ToString()), playerObject);
}
return allLocalPlayers;
}
public unsafe CharacterCache BuildCharacterCache()
{
var cache = new CharacterCache();
while (clientState.LocalPlayer == null)
{
PluginLog.Debug("Character is null but it shouldn't be, waiting");
Thread.Sleep(50);
}
var model = (CharacterBase*)((Character*)clientState.LocalPlayer!.Address)->GameObject.GetDrawObject();
for (var idx = 0; idx < model->SlotCount; ++idx)
{
@@ -213,21 +243,193 @@ namespace MareSynchronos.Managers
private void ClientState_TerritoryChanged(object? sender, ushort e)
{
localPlayers.Clear();
_ = Task.Run(async () =>
{
while (clientState.LocalPlayer == null)
{
await Task.Delay(250);
}
await AssignLocalPlayersData();
});
}
private async Task AssignLocalPlayersData()
{
PluginLog.Debug("Temp assigning local players from cache");
var currentLocalPlayers = GetLocalPlayers();
foreach (var player in _characterCache)
{
if (currentLocalPlayers.ContainsKey(player.Key.Item1))
{
await Task.Run(() => ApiControllerOnCharacterReceived(null, new CharacterReceivedEventArgs
{
CharacterNameHash = player.Key.Item1,
CharacterData = player.Value
}));
}
}
PluginLog.Debug("Updating local players from service");
await apiController.GetCharacterData(currentLocalPlayers
.ToDictionary(
k => k.Key,
k => (int)k.Value.ClassJob.Id));
}
public void Dispose()
{
framework.Update -= Framework_Update;
ipcManager.PenumbraRedrawEvent -= IpcManager_PenumbraRedrawEvent;
_framework.Update -= Framework_Update;
clientState.TerritoryChanged -= ClientState_TerritoryChanged;
apiController.Connected -= ApiController_Connected;
apiController.Disconnected -= ApiController_Disconnected;
apiController.CharacterReceived -= ApiControllerOnCharacterReceived;
apiController.RemovedFromWhitelist -= ApiControllerOnRemovedFromWhitelist;
apiController.AddedToWhitelist -= ApiControllerOnAddedToWhitelist;
watcher.Disable();
watcher.PlayerChanged -= Watcher_PlayerChanged;
watcher?.Dispose();
}
internal void StartWatchingPlayer()
{
watcher.AddPlayerToWatch(clientState.LocalPlayer!.Name.ToString());
watcher.AddPlayerToWatch(GetPlayerName());
watcher.PlayerChanged += Watcher_PlayerChanged;
watcher.Enable();
apiController.Connected += ApiController_Connected;
apiController.Disconnected += ApiController_Disconnected;
apiController.CharacterReceived += ApiControllerOnCharacterReceived;
apiController.RemovedFromWhitelist += ApiControllerOnRemovedFromWhitelist;
apiController.AddedToWhitelist += ApiControllerOnAddedToWhitelist;
PluginLog.Debug("Watching Player, ApiController is Connected: " + apiController.IsConnected);
if (apiController.IsConnected)
{
ApiController_Connected(null, EventArgs.Empty);
}
}
private void ApiControllerOnRemovedFromWhitelist(object? sender, EventArgs e)
{
var characterHash = (string?)sender;
if (string.IsNullOrEmpty(characterHash)) return;
var players = GetLocalPlayers();
foreach (var entry in _characterCache.Where(c => c.Key.Item1 == characterHash))
{
_characterCache.Remove(entry.Key);
}
var playerName = players.SingleOrDefault(p => p.Key == characterHash).Value.Name.ToString() ?? null;
if (playerName != null)
{
PluginLog.Debug("You got removed from whitelist, restoring glamourer state for " + playerName);
ipcManager.GlamourerRevertCharacterCustomization(playerName);
}
}
private void ApiControllerOnAddedToWhitelist(object? sender, EventArgs e)
{
var characterHash = (string?)sender;
if (string.IsNullOrEmpty(characterHash)) return;
var players = GetLocalPlayers();
if (players.ContainsKey(characterHash))
{
PluginLog.Debug("You got added to a whitelist, restoring data for " + characterHash);
_ = apiController.GetCharacterData(new Dictionary<string, int> { { characterHash, (int)players[characterHash].ClassJob.Id } });
}
}
private void ApiControllerOnCharacterReceived(object? sender, CharacterReceivedEventArgs e)
{
PlayerCharacter? playerObject = null;
PluginLog.Debug("Received hash for " + e.CharacterNameHash);
foreach (var obj in objectTable)
{
if (obj.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player) continue;
string playerName = obj.Name.ToString();
if (playerName == GetPlayerName()) continue;
playerObject = (PlayerCharacter)obj;
var hashedName = Crypto.GetHash256(playerObject.Name.ToString() + playerObject.HomeWorld.Id.ToString());
if (e.CharacterNameHash == hashedName)
{
break;
}
playerObject = null;
}
if (playerObject == null)
{
PluginLog.Debug("Found no suitable hash for " + e.CharacterNameHash);
return;
}
else
{
PluginLog.Debug("Found suitable player for hash: " + playerObject.Name.ToString());
}
_characterCache[(e.CharacterNameHash, e.CharacterData.JobId)] = e.CharacterData;
foreach (var file in e.CharacterData.FileReplacements)
{
var hash = file.Hash;
bool hasLocalFile;
using (var db = new FileCacheContext())
{
hasLocalFile = db.FileCaches.Any(f => f.Hash == hash);
}
if (hasLocalFile) continue;
PluginLog.Debug("Downloading file for " + hash);
var task = apiController.DownloadData(hash);
while (!task.IsCompleted)
{
Thread.Sleep(TimeSpan.FromSeconds(0.5));
}
PluginLog.Debug("Download finished: " + hash);
var extractedFile = LZ4.LZ4Codec.Unwrap(task.Result);
var ext = file.GamePaths.First().Split(".", StringSplitOptions.None).Last();
var filePath = Path.Combine(_pluginConfiguration.CacheFolder, file.Hash + "." + ext);
File.WriteAllBytes(filePath, extractedFile);
PluginLog.Debug("File written to : " + filePath);
using (var db = new FileCacheContext())
{
db.Add(new FileCache
{
Filepath = filePath.ToLower(),
Hash = file.Hash,
LastModifiedDate = DateTime.Now.Ticks.ToString(),
});
db.SaveChanges();
}
PluginLog.Debug("Added hash to db: " + hash);
}
PluginLog.Debug("Assigned hash to visible player: " + playerObject.Name.ToString());
ipcManager.GlamourerApplyCharacterCustomization(e.CharacterData.GlamourerData, playerObject.Name.ToString());
}
private void ApiController_Disconnected(object? sender, EventArgs args)
{
PluginLog.Debug(nameof(ApiController_Disconnected));
_framework.Update -= Framework_Update;
ipcManager.PenumbraRedrawEvent -= IpcManager_PenumbraRedrawEvent;
clientState.TerritoryChanged -= ClientState_TerritoryChanged;
}
private void ApiController_Connected(object? sender, EventArgs args)
{
PluginLog.Debug(nameof(ApiController_Connected));
PluginLog.Debug("MyHashedName:" + Crypto.GetHash256(GetPlayerName() + clientState.LocalPlayer!.HomeWorld.Id));
var apiTask = apiController.SendCharacterName(Crypto.GetHash256(GetPlayerName() + clientState.LocalPlayer!.HomeWorld.Id));
var assignTask = AssignLocalPlayersData();
Task.WaitAll(apiTask, assignTask);
_framework.Update += Framework_Update;
ipcManager.PenumbraRedrawEvent += IpcManager_PenumbraRedrawEvent;
clientState.TerritoryChanged += ClientState_TerritoryChanged;
}
public void StopWatchPlayer(string name)

16
MareSynchronos/Managers/IpcManager.cs
View File

@@ -15,9 +15,10 @@ namespace MareSynchronos.Managers
private ICallGateSubscriber<string, string, object>? glamourerApplyCharacterCustomization;
private ICallGateSubscriber<int> penumbraApiVersion;
private ICallGateSubscriber<int> glamourerApiVersion;
private ICallGateSubscriber<string, string> penumbraObjectIsRedrawn;
private ICallGateSubscriber<IntPtr, int, object?> penumbraObjectIsRedrawn;
private ICallGateSubscriber<string, int, object>? penumbraRedraw;
private ICallGateSubscriber<string, string, string[]>? penumbraReverseResolvePath;
private ICallGateSubscriber<string, object> glamourerRevertCustomization;
public bool Initialized { get; private set; } = false;
@@ -36,7 +37,8 @@ namespace MareSynchronos.Managers
penumbraReverseResolvePath = pluginInterface.GetIpcSubscriber<string, string, string[]>("Penumbra.ReverseResolvePath");
penumbraApiVersion = pluginInterface.GetIpcSubscriber<int>("Penumbra.ApiVersion");
glamourerApiVersion = pluginInterface.GetIpcSubscriber<int>("Glamourer.ApiVersion");
penumbraObjectIsRedrawn = pluginInterface.GetIpcSubscriber<string, string>("Penumbra.ObjectIsRedrawn");
glamourerRevertCustomization = pluginInterface.GetIpcSubscriber<string, object>("Glamourer.RevertCharacterCustomization");
penumbraObjectIsRedrawn = pluginInterface.GetIpcSubscriber<IntPtr, int, object?>("Penumbra.GameObjectRedrawn");
penumbraObjectIsRedrawn.Subscribe(RedrawEvent);
penumbraInit.Subscribe(RedrawSelf);
@@ -67,9 +69,9 @@ namespace MareSynchronos.Managers
}
}
private void RedrawEvent(string actorName)
private void RedrawEvent(IntPtr objectAddress, int objectTableIndex)
{
PenumbraRedrawEvent?.Invoke(actorName, EventArgs.Empty);
PenumbraRedrawEvent?.Invoke(objectTableIndex, EventArgs.Empty);
}
private void RedrawSelf()
@@ -120,6 +122,12 @@ namespace MareSynchronos.Managers
glamourerApplyCharacterCustomization!.InvokeAction(customization, characterName);
}
public void GlamourerRevertCharacterCustomization(string characterName)
{
if (!CheckGlamourerAPI()) return;
glamourerRevertCustomization!.InvokeAction(characterName);
}
public void PenumbraRedraw(string actorName)
{
if (!CheckPenumbraAPI()) return;