Messagepack (#12)

* add messagepack attributes

* fix isnullorempty

* bump api version

---------

Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>

MareSynchronosAPI/Data/CharacterData.cs

@@ -1,7 +1,9 @@
 using MareSynchronos.API.Data.Enum;
+using MessagePack;
 
 namespace MareSynchronos.API.Data;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public class CharacterData : HashableDataBase
 {
     public Dictionary<ObjectKind, List<FileReplacementData>> FileReplacements { get; set; } = new();

MareSynchronosAPI/Data/FileReplacementData.cs

@@ -1,5 +1,8 @@
-namespace MareSynchronos.API.Data;
+using MessagePack;
 
+namespace MareSynchronos.API.Data;
+
+[MessagePackObject(keyAsPropertyName: true)]
 public class FileReplacementData : HashableDataBase
 {
     public string[] GamePaths { get; set; } = Array.Empty<string>();

MareSynchronosAPI/Data/GroupData.cs

@@ -1,6 +1,10 @@
-namespace MareSynchronos.API.Data;
+using MessagePack;
 
+namespace MareSynchronos.API.Data;
+
+[MessagePackObject(keyAsPropertyName: true)]
 public record GroupData(string GID, string? Alias = null)
 {
-    public string AliasOrGID => Alias ?? GID;
+    [IgnoreMember]
+    public string AliasOrGID => string.IsNullOrWhiteSpace(Alias) ? GID : Alias;
 }

MareSynchronosAPI/Data/HashableDataBase.cs

@@ -1,5 +1,6 @@
 using System.Security.Cryptography;
 using System.Text;
+using MessagePack;
 using Newtonsoft.Json;
 
 namespace MareSynchronos.API.Data;

MareSynchronosAPI/Data/UserData.cs

@@ -1,6 +1,10 @@
-namespace MareSynchronos.API.Data;
+using MessagePack;
 
+namespace MareSynchronos.API.Data;
+
+[MessagePackObject(keyAsPropertyName: true)]
 public record UserData(string UID, string? Alias = null)
 {
-    public string AliasOrUID => Alias ?? UID;
+    [IgnoreMember]
+    public string AliasOrUID => string.IsNullOrWhiteSpace(Alias) ? UID : Alias;
 }

MareSynchronosAPI/Dto/ConnectionDto.cs

@@ -1,7 +1,9 @@
 using MareSynchronos.API.Data;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record ConnectionDto(UserData User)
 {
     public int ServerVersion { get; set; }
@@ -10,6 +12,7 @@ public record ConnectionDto(UserData User)
     public ServerInfo ServerInfo { get; set; } = new();
 }
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record ServerInfo
 {
     public string ShardName { get; set; } = string.Empty;

MareSynchronosAPI/Dto/Files/DownloadFileDto.cs

@@ -1,5 +1,8 @@
-namespace MareSynchronos.API.Dto.Files;
+using MessagePack;
 
+namespace MareSynchronos.API.Dto.Files;
+
+[MessagePackObject(keyAsPropertyName: true)]
 public record DownloadFileDto : ITransferFileDto
 {
     public bool FileExists { get; set; } = true;

MareSynchronosAPI/Dto/Files/ForbiddenUploadsDto.cs

@@ -1,5 +1,8 @@
-namespace MareSynchronos.API.Dto.Files;
+using MessagePack;
 
+namespace MareSynchronos.API.Dto.Files;
+
+[MessagePackObject(keyAsPropertyName: true)]
 public record ForbiddenFileDto
 {
     public string Hash { get; set; } = string.Empty;

MareSynchronosAPI/Dto/Files/UploadFileDto.cs

@@ -1,5 +1,8 @@
-namespace MareSynchronos.API.Dto.Files;
+using MessagePack;
 
+namespace MareSynchronos.API.Dto.Files;
+
+[MessagePackObject(keyAsPropertyName: true)]
 public record UploadFileDto : ITransferFileDto
 {
     public string Hash { get; set; } = string.Empty;

MareSynchronosAPI/Dto/Group/BannedGroupUserDto.cs

@@ -1,7 +1,9 @@
 using MareSynchronos.API.Data;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.Group;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record BannedGroupUserDto : GroupPairDto
 {
     public BannedGroupUserDto(GroupData group, UserData user, string reason, DateTime bannedOn, string bannedBy) : base(group, user)

MareSynchronosAPI/Dto/Group/GroupDto.cs

@@ -1,7 +1,9 @@
 using MareSynchronos.API.Data;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.Group;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record GroupDto(GroupData Group)
 {
     public GroupData Group { get; set; } = Group;

MareSynchronosAPI/Dto/Group/GroupFullInfoDto.cs

@@ -1,8 +1,10 @@
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.Group;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record GroupFullInfoDto(GroupData Group, UserData Owner, GroupPermissions GroupPermissions, GroupUserPermissions GroupUserPermissions, GroupUserInfo GroupUserInfo) : GroupInfoDto(Group, Owner, GroupPermissions)
 {
     public GroupUserPermissions GroupUserPermissions { get; set; } = GroupUserPermissions;

MareSynchronosAPI/Dto/Group/GroupInfoDto.cs

@@ -1,8 +1,10 @@
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.Group;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record GroupInfoDto(GroupData Group, UserData Owner, GroupPermissions GroupPermissions) : GroupDto(Group)
 {
     public GroupPermissions GroupPermissions { get; set; } = GroupPermissions;

MareSynchronosAPI/Dto/Group/GroupPairDto.cs

@@ -1,7 +1,9 @@
 using MareSynchronos.API.Data;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.Group;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record GroupPairDto(GroupData Group, UserData User) : GroupDto(Group)
 {
     public string UID => User.UID;

MareSynchronosAPI/Dto/Group/GroupPairFullInfoDto.cs

@@ -1,8 +1,10 @@
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.Group;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record GroupPairFullInfoDto(GroupData Group, UserData User, GroupUserInfo GroupPairStatusInfo, GroupUserPermissions GroupUserPermissions) : GroupPairDto(Group, User)
 {
     public GroupUserInfo GroupPairStatusInfo { get; set; } = GroupPairStatusInfo;

MareSynchronosAPI/Dto/Group/GroupPairUserInfoDto.cs

@@ -1,6 +1,8 @@
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.Group;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record GroupPairUserInfoDto(GroupData Group, UserData User, GroupUserInfo GroupUserInfo) : GroupPairDto(Group, User);

MareSynchronosAPI/Dto/Group/GroupPairUserPermissionDto.cs

@@ -1,6 +1,8 @@
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.Group;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record GroupPairUserPermissionDto(GroupData Group, UserData User, GroupUserPermissions GroupPairPermissions) : GroupPairDto(Group, User);

MareSynchronosAPI/Dto/Group/GroupPasswordDto.cs

@@ -1,5 +1,7 @@
 using MareSynchronos.API.Data;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.Group;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record GroupPasswordDto(GroupData Group, string Password) : GroupDto(Group);

MareSynchronosAPI/Dto/Group/GroupPermissionDto.cs

@@ -1,6 +1,8 @@
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.Group;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record GroupPermissionDto(GroupData Group, GroupPermissions Permissions) : GroupDto(Group);

MareSynchronosAPI/Dto/SystemInfoDto.cs

@@ -1,5 +1,8 @@
-namespace MareSynchronos.API.Dto;
+using MessagePack;
 
+namespace MareSynchronos.API.Dto;
+
+[MessagePackObject(keyAsPropertyName: true)]
 public record SystemInfoDto
 {
     public int OnlineUsers { get; set; }

MareSynchronosAPI/Dto/User/OnlineUserCharaDataDto.cs

@@ -1,5 +1,7 @@
 using MareSynchronos.API.Data;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.User;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record OnlineUserCharaDataDto(UserData User, CharacterData CharaData) : UserDto(User);

MareSynchronosAPI/Dto/User/OnlineUserIdentDto.cs

@@ -1,5 +1,7 @@
 using MareSynchronos.API.Data;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.User;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record OnlineUserIdentDto(UserData User, string Ident) : UserDto(User);

MareSynchronosAPI/Dto/User/UserCharaDataMessageDto.cs

@@ -1,5 +1,7 @@
 using MareSynchronos.API.Data;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.User;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record UserCharaDataMessageDto(List<UserData> Recipients, CharacterData CharaData);

MareSynchronosAPI/Dto/User/UserDto.cs

@@ -1,5 +1,7 @@
 using MareSynchronos.API.Data;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.User;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record UserDto(UserData User);

MareSynchronosAPI/Dto/User/UserPairDto.cs

@@ -1,8 +1,10 @@
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.User;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record UserPairDto(UserData User, UserPermissions OwnPermissions, UserPermissions OtherPermissions) : UserDto(User)
 {
     public UserPermissions OwnPermissions { get; set; } = OwnPermissions;

MareSynchronosAPI/Dto/User/UserPermissionsDto.cs

@@ -1,6 +1,8 @@
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
+using MessagePack;
 
 namespace MareSynchronos.API.Dto.User;
 
+[MessagePackObject(keyAsPropertyName: true)]
 public record UserPermissionsDto(UserData User, UserPermissions Permissions) : UserDto(User);

MareSynchronosAPI/MareSynchronos.API.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="MessagePack.Annotations" Version="2.1.90" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 

MareSynchronosAPI/SignalR/IMareHub.cs

@@ -8,7 +8,7 @@ namespace MareSynchronos.API.SignalR;
 
 public interface IMareHub
 {
-    const int ApiVersion = 21;
+    const int ApiVersion = 22;
     const string Path = "/mare";
 
     Task<ConnectionDto> GetConnectionDto();