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

Mare 0.8 (#13)

Browse Source 
* get rid of file handling through grpc and signalr

* make non empty uri for serialization

* adjust api DataHash calc into their respective classes

* Revert "adapt api extensions"

This reverts commit 5fb78ba367.

* Revert "adapt userpermissions"

This reverts commit 28dd123ca6.

* Revert "Revert "adapt api extensions""

This reverts commit 12c9bc3c53566532e2984ace0b3d2e0a8b7facc0.

* Revert "Revert "adapt userpermissions""

This reverts commit 4193ac008cccf2f5b42e9cdf50b2a084877cbf9a.

* update flags

* add upload status to server

---------

Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>
This commit is contained in:
rootdarkarchon
2023-03-14 19:49:44 +01:00
committed by GitHub
parent 85bedb49e3
commit ecaadc8ead
11 changed files with 181 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
MareSynchronosAPI/SignalR/IMareHub.cs
View File

@@ -2,70 +2,101 @@
using MareSynchronos.API.Dto;
using MareSynchronos.API.Dto.Group;
using MareSynchronos.API.Dto.User;
using MareSynchronos.API.Dto.Files;
namespace MareSynchronos.API.SignalR;
public interface IMareHub
{
const int ApiVersion = 22;
const int ApiVersion = 23;
const string Path = "/mare";
Task<ConnectionDto> GetConnectionDto();
Task<bool> CheckClientHealth();
Task<List<DownloadFileDto>> FilesGetSizes(List<string> hashes);
Task FilesAbortUpload();
Task FilesDeleteAll();
Task<bool> FilesIsUploadFinished();
Task<List<UploadFileDto>> FilesSend(List<string> fileListHashes);
Task FilesUploadStreamAsync(string hash, IAsyncEnumerable<byte[]> fileContent);
Task Client_DownloadReady(Guid requestId);
Task Client_GroupChangePermissions(GroupPermissionDto groupPermission);
Task Client_GroupDelete(GroupDto groupDto);
Task Client_GroupPairChangePermissions(GroupPairUserPermissionDto permissionDto);
Task Client_GroupPairChangeUserInfo(GroupPairUserInfoDto userInfo);
Task Client_GroupPairJoined(GroupPairFullInfoDto groupPairInfoDto);
Task Client_GroupPairLeft(GroupPairDto groupPairDto);
Task Client_GroupSendFullInfo(GroupFullInfoDto groupInfo);
Task Client_GroupSendInfo(GroupInfoDto groupInfo);
Task Client_ReceiveServerMessage(MessageSeverity messageSeverity, string message);
Task Client_UpdateSystemInfo(SystemInfoDto systemInfo);
Task Client_UserAddClientPair(UserPairDto dto);
Task Client_UserReceiveCharacterData(OnlineUserCharaDataDto dataDto);
Task Client_UserReceiveUploadStatus(UserDto dto);
Task Client_UserRemoveClientPair(UserDto dto);
Task Client_UserSendOffline(UserDto dto);
Task Client_UserSendOnline(OnlineUserIdentDto dto);
Task Client_UserUpdateOtherPairPermissions(UserPermissionsDto dto);
Task Client_UserUpdateSelfPairPermissions(UserPermissionsDto dto);
Task<ConnectionDto> GetConnectionDto();
Task GroupBanUser(GroupPairDto dto, string reason);
Task GroupChangeGroupPermissionState(GroupPermissionDto dto);
Task GroupChangeIndividualPermissionState(GroupPairUserPermissionDto dto);
Task GroupChangeOwnership(GroupPairDto groupPair);
Task<bool> GroupChangePassword(GroupPasswordDto groupPassword);
Task GroupClear(GroupDto group);
Task<GroupPasswordDto> GroupCreate();
Task<List<string>> GroupCreateTempInvite(GroupDto group, int amount);
Task GroupDelete(GroupDto group);
Task<List<BannedGroupUserDto>> GroupGetBannedUsers(GroupDto group);
Task<bool> GroupJoin(GroupPasswordDto passwordedGroup);
Task GroupLeave(GroupDto group);
Task GroupRemoveUser(GroupPairDto groupPair);
Task GroupSetUserInfo(GroupPairUserInfoDto groupPair);
Task<List<GroupFullInfoDto>> GroupsGetAll();
Task<List<GroupPairFullInfoDto>> GroupsGetUsersInGroup(GroupDto group);
Task GroupUnbanUser(GroupPairDto groupPair);
Task<List<UserPairDto>> UserGetPairedClients();
Task UserAddPair(UserDto user);
Task UserRemovePair(UserDto userDto);
Task UserSetPairPermissions(UserPermissionsDto userPermissions);
Task<List<OnlineUserIdentDto>> UserGetOnlinePairs();
Task UserPushData(UserCharaDataMessageDto dto);
Task UserDelete();
Task<List<BannedGroupUserDto>> GroupGetBannedUsers(GroupDto group);
Task GroupClear(GroupDto group);
Task GroupChangeOwnership(GroupPairDto groupPair);
Task<bool> GroupChangePassword(GroupPasswordDto groupPassword);
Task<GroupPasswordDto> GroupCreate();
Task<List<GroupFullInfoDto>> GroupsGetAll();
Task<List<GroupPairFullInfoDto>> GroupsGetUsersInGroup(GroupDto group);
Task GroupBanUser(GroupPairDto dto, string reason);
Task GroupChangeGroupPermissionState(GroupPermissionDto dto);
Task GroupChangeIndividualPermissionState(GroupPairUserPermissionDto dto);
Task GroupDelete(GroupDto group);
Task<bool> GroupJoin(GroupPasswordDto passwordedGroup);
Task GroupLeave(GroupDto group);
Task GroupRemoveUser(GroupPairDto groupPair);
Task GroupUnbanUser(GroupPairDto groupPair);
Task GroupSetUserInfo(GroupPairUserInfoDto groupPair);
Task<List<string>> GroupCreateTempInvite(GroupDto group, int amount);
Task<List<OnlineUserIdentDto>> UserGetOnlinePairs();
Task Client_UpdateSystemInfo(SystemInfoDto systemInfo);
Task Client_ReceiveServerMessage(MessageSeverity messageSeverity, string message);
Task Client_DownloadReady(Guid requestId);
Task<List<UserPairDto>> UserGetPairedClients();
Task Client_UserSendOnline(OnlineUserIdentDto dto);
Task Client_UserSendOffline(UserDto dto);
Task Client_UserAddClientPair(UserPairDto dto);
Task Client_UserRemoveClientPair(UserDto dto);
Task Client_UserUpdateSelfPairPermissions(UserPermissionsDto dto);
Task Client_UserUpdateOtherPairPermissions(UserPermissionsDto dto);
Task Client_UserReceiveCharacterData(OnlineUserCharaDataDto dataDto);
Task UserPushData(UserCharaDataMessageDto dto);
Task Client_GroupSendFullInfo(GroupFullInfoDto groupInfo);
Task Client_GroupSendInfo(GroupInfoDto groupInfo);
Task Client_GroupDelete(GroupDto groupDto);
Task Client_GroupPairJoined(GroupPairFullInfoDto groupPairInfoDto);
Task Client_GroupPairLeft(GroupPairDto groupPairDto);
Task Client_GroupChangePermissions(GroupPermissionDto groupPermission);
Task Client_GroupPairChangePermissions(GroupPairUserPermissionDto permissionDto);
Task Client_GroupPairChangeUserInfo(GroupPairUserInfoDto userInfo);
Task UserRemovePair(UserDto userDto);
Task UserSetPairPermissions(UserPermissionsDto userPermissions);
}

48
MareSynchronosAPI/SignalR/IMareHubClient.cs
View File

@@ -1,6 +1,5 @@
using MareSynchronos.API.Data.Enum;
using MareSynchronos.API.Dto;
using MareSynchronos.API.Dto.Files;
using MareSynchronos.API.Dto.Group;
using MareSynchronos.API.Dto.User;
@@ -8,24 +7,41 @@ namespace MareSynchronos.API.SignalR;
public interface IMareHubClient : IMareHub
{
void OnUpdateSystemInfo(Action<SystemInfoDto> act);
void OnReceiveServerMessage(Action<MessageSeverity, string> act);
void OnDownloadReady(Action<Guid> act);
void OnUserSendOnline(Action<OnlineUserIdentDto> act);
void OnUserSendOffline(Action<UserDto> act);
void OnUserAddClientPair(Action<UserPairDto> act);
void OnUserRemoveClientPair(Action<UserDto> act);
void OnUserUpdateSelfPairPermissions(Action<UserPermissionsDto> act);
void OnUserUpdateOtherPairPermissions(Action<UserPermissionsDto> act);
void OnUserReceiveCharacterData(Action<OnlineUserCharaDataDto> act);
void OnGroupChangePermissions(Action<GroupPermissionDto> act);
void OnGroupDelete(Action<GroupDto> act);
void OnGroupPairChangePermissions(Action<GroupPairUserPermissionDto> act);
void OnGroupPairChangeUserInfo(Action<GroupPairUserInfoDto> act);
void OnGroupPairJoined(Action<GroupPairFullInfoDto> act);
void OnGroupPairLeft(Action<GroupPairDto> act);
void OnGroupSendFullInfo(Action<GroupFullInfoDto> act);
void OnGroupSendInfo(Action<GroupInfoDto> act);
void OnGroupDelete(Action<GroupDto> act);
void OnGroupPairJoined(Action<GroupPairFullInfoDto> act);
void OnGroupPairLeft(Action<GroupPairDto> act);
void OnGroupChangePermissions(Action<GroupPermissionDto> act);
void OnGroupPairChangePermissions(Action<GroupPairUserPermissionDto> act);
void OnGroupPairChangeUserInfo(Action<GroupPairUserInfoDto> act);
void OnReceiveServerMessage(Action<MessageSeverity, string> act);
void OnUpdateSystemInfo(Action<SystemInfoDto> act);
void OnUserAddClientPair(Action<UserPairDto> act);
void OnUserReceiveCharacterData(Action<OnlineUserCharaDataDto> act);
void OnUserReceiveUploadStatus(Action<UserDto> act);
void OnUserRemoveClientPair(Action<UserDto> act);
void OnUserSendOffline(Action<UserDto> act);
void OnUserSendOnline(Action<OnlineUserIdentDto> act);
void OnUserUpdateOtherPairPermissions(Action<UserPermissionsDto> act);
void OnUserUpdateSelfPairPermissions(Action<UserPermissionsDto> act);
}