Add GPose Together (#82)

* add api glue

* most of gpose together impl

* more cleanup and impl

* more impl

* minor fixes and chara name abbreviations

---------

Co-authored-by: Stanley Dimant <root.darkarchon@outlook.com>
This commit is contained in:
rootdarkarchon
2025-01-19 16:19:06 +01:00
committed by Loporrit
parent c835854fb6
commit 93aff198f2
15 changed files with 1351 additions and 22 deletions

View File

@@ -1,12 +1,15 @@
using MareSynchronos.API.Data.Enum;
using MareSynchronos.API.Data;
using MareSynchronos.API.Data.Enum;
using MareSynchronos.API.Dto;
using MareSynchronos.API.Dto.Chat;
using MareSynchronos.API.Dto.CharaData;
using MareSynchronos.API.Dto.Group;
using MareSynchronos.API.Dto.User;
using MareSynchronos.MareConfiguration.Models;
using MareSynchronos.Services.Mediator;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Extensions.Logging;
using static FFXIVClientStructs.FFXIV.Client.Game.UI.MapMarkerData.Delegates;
namespace MareSynchronos.WebAPI;
@@ -191,6 +194,41 @@ public partial class ApiController
return Task.CompletedTask;
}
public Task Client_GposeLobbyJoin(UserData userData)
{
Logger.LogDebug("Client_GposeLobbyJoin: {dto}", userData);
ExecuteSafely(() => Mediator.Publish(new GposeLobbyUserJoin(userData)));
return Task.CompletedTask;
}
public Task Client_GposeLobbyLeave(UserData userData)
{
Logger.LogDebug("Client_GposeLobbyLeave: {dto}", userData);
ExecuteSafely(() => Mediator.Publish(new GPoseLobbyUserLeave(userData)));
return Task.CompletedTask;
}
public Task Client_GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto)
{
Logger.LogDebug("Client_GposeLobbyPushCharacterData: {dto}", charaDownloadDto.Uploader);
ExecuteSafely(() => Mediator.Publish(new GPoseLobbyReceiveCharaData(charaDownloadDto)));
return Task.CompletedTask;
}
public Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData)
{
Logger.LogDebug("Client_GposeLobbyPushPoseData: {dto}", userData);
ExecuteSafely(() => Mediator.Publish(new GPoseLobbyReceivePoseData(userData, poseData)));
return Task.CompletedTask;
}
public Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData)
{
//Logger.LogDebug("Client_GposeLobbyPushWorldData: {dto}", userData);
ExecuteSafely(() => Mediator.Publish(new GPoseLobbyReceiveWorldData(userData, worldData)));
return Task.CompletedTask;
}
public void OnDownloadReady(Action<Guid> act)
{
if (_initialized) return;
@@ -323,6 +361,36 @@ public partial class ApiController
_mareHub!.On(nameof(Client_UserUpdateSelfPairPermissions), act);
}
public void OnGposeLobbyJoin(Action<UserData> act)
{
if (_initialized) return;
_mareHub!.On(nameof(Client_GposeLobbyJoin), act);
}
public void OnGposeLobbyLeave(Action<UserData> act)
{
if (_initialized) return;
_mareHub!.On(nameof(Client_GposeLobbyLeave), act);
}
public void OnGposeLobbyPushCharacterData(Action<CharaDataDownloadDto> act)
{
if (_initialized) return;
_mareHub!.On(nameof(Client_GposeLobbyPushCharacterData), act);
}
public void OnGposeLobbyPushPoseData(Action<UserData, PoseData> act)
{
if (_initialized) return;
_mareHub!.On(nameof(Client_GposeLobbyPushPoseData), act);
}
public void OnGposeLobbyPushWorldData(Action<UserData, WorldData> act)
{
if (_initialized) return;
_mareHub!.On(nameof(Client_GposeLobbyPushWorldData), act);
}
private void ExecuteSafely(Action act)
{
try

View File

@@ -1,6 +1,5 @@
using MareSynchronos.API.Data;
using MareSynchronos.API.Dto.CharaData;
using MareSynchronos.Services.CharaData.Models;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Extensions.Logging;
@@ -134,4 +133,96 @@ public partial class ApiController
return null;
}
}
public async Task<string> GposeLobbyCreate()
{
if (!IsConnected) return string.Empty;
try
{
Logger.LogDebug("Creating GPose Lobby");
return await _mareHub!.InvokeAsync<string>(nameof(GposeLobbyCreate)).ConfigureAwait(false);
}
catch (Exception ex)
{
Logger.LogWarning(ex, "Failed to create GPose lobby");
return string.Empty;
}
}
public async Task<bool> GposeLobbyLeave()
{
if (!IsConnected) return true;
try
{
Logger.LogDebug("Leaving current GPose Lobby");
return await _mareHub!.InvokeAsync<bool>(nameof(GposeLobbyLeave)).ConfigureAwait(false);
}
catch (Exception ex)
{
Logger.LogWarning(ex, "Failed to leave GPose lobby");
return false;
}
}
public async Task<List<UserData>> GposeLobbyJoin(string lobbyId)
{
if (!IsConnected) return [];
try
{
Logger.LogDebug("Joining GPose Lobby {id}", lobbyId);
return await _mareHub!.InvokeAsync<List<UserData>>(nameof(GposeLobbyJoin), lobbyId).ConfigureAwait(false);
}
catch (Exception ex)
{
Logger.LogWarning(ex, "Failed to join GPose lobby {id}", lobbyId);
return [];
}
}
public async Task GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto)
{
if (!IsConnected) return;
try
{
Logger.LogDebug("Sending Chara Data to GPose Lobby");
await _mareHub!.InvokeAsync(nameof(GposeLobbyPushCharacterData), charaDownloadDto).ConfigureAwait(false);
}
catch (Exception ex)
{
Logger.LogWarning(ex, "Failed to send Chara Data to GPose lobby");
}
}
public async Task GposeLobbyPushPoseData(PoseData poseData)
{
if (!IsConnected) return;
try
{
Logger.LogDebug("Sending Pose Data to GPose Lobby");
await _mareHub!.InvokeAsync(nameof(GposeLobbyPushPoseData), poseData).ConfigureAwait(false);
}
catch (Exception ex)
{
Logger.LogWarning(ex, "Failed to send Pose Data to GPose lobby");
}
}
public async Task GposeLobbyPushWorldData(WorldData worldData)
{
if (!IsConnected) return;
try
{
await _mareHub!.InvokeAsync(nameof(GposeLobbyPushWorldData), worldData).ConfigureAwait(false);
}
catch (Exception ex)
{
Logger.LogWarning(ex, "Failed to send World Data to GPose lobby");
}
}
}

View File

@@ -364,6 +364,12 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM
OnUserChatMsg((dto) => _ = Client_UserChatMsg(dto));
OnGroupChatMsg((dto) => _ = Client_GroupChatMsg(dto));
OnGposeLobbyJoin((dto) => _ = Client_GposeLobbyJoin(dto));
OnGposeLobbyLeave((dto) => _ = Client_GposeLobbyLeave(dto));
OnGposeLobbyPushCharacterData((dto) => _ = Client_GposeLobbyPushCharacterData(dto));
OnGposeLobbyPushPoseData((dto, data) => _ = Client_GposeLobbyPushPoseData(dto, data));
OnGposeLobbyPushWorldData((dto, data) => _ = Client_GposeLobbyPushWorldData(dto, data));
_healthCheckTokenSource?.Cancel();
_healthCheckTokenSource?.Dispose();
_healthCheckTokenSource = new CancellationTokenSource();