diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..938d8ea --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "MareAPI"] + path = MareAPI + url = https://github.com/Penumbra-Sync/api.git diff --git a/MareAPI b/MareAPI new file mode 160000 index 0000000..af8516d --- /dev/null +++ b/MareAPI @@ -0,0 +1 @@ +Subproject commit af8516d44a99d3a46e2a0de36c848732937f9c6a diff --git a/MareSynchronosServer/MareSynchronos.API/API.cs b/MareSynchronosServer/MareSynchronos.API/API.cs deleted file mode 100644 index e10aa58..0000000 --- a/MareSynchronosServer/MareSynchronos.API/API.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MareSynchronos.API -{ - public class Api - { - public const int Version = 5; - public const string Path = "/mare"; - - public const string SendFileAbortUpload = "AbortUpload"; - public const string InvokeFileSendFiles = "SendFiles"; - public const string InvokeFileIsUploadFinished = "IsUploadFinished"; - public const string SendFileUploadFileStreamAsync = "UploadFileStreamAsync"; - public const string InvokeFileGetFileSize = "GetFileSize"; - public const string StreamFileDownloadFileAsync = "StreamDownloadFileAsync"; - public const string SendFileDeleteAllFiles = "DeleteAllFiles"; - - public const string InvokeHeartbeat = "Heartbeat"; - public const string InvokeGetSystemInfo = "GetSystemInfo"; - public const string OnUpdateSystemInfo = "OnUpdateSystemInfo"; - - public const string InvokeAdminGetOnlineUsers = "AdminGetOnlineUsers"; - public const string InvokeAdminGetBannedUsers = "GetBannedUsers"; - public const string SendAdminUpdateOrAddBannedUser = "UpdateOrAddBannedUser"; - public const string SendAdminDeleteBannedUser = "DeleteBannedUser"; - public const string InvokeAdminGetForbiddenFiles = "GetForbiddenFiles"; - public const string SendAdminUpdateOrAddForbiddenFile = "UpdateOrAddForbiddenFile"; - public const string SendAdminDeleteForbiddenFile = "DeleteForbiddenFile"; - public const string SendAdminChangeModeratorStatus = "ChangeModeratorStatus"; - - public const string OnAdminForcedReconnect = "OnForcedReconnect"; - public const string OnAdminUpdateOrAddBannedUser = "OnUpdateOrAddBannedUser"; - public const string OnAdminDeleteBannedUser = "OnDeleteBannedUser"; - public const string OnAdminUpdateOrAddForbiddenFile = "OnUpdateOrAddForbiddenFile"; - public const string OnAdminDeleteForbiddenFile = "OnDeleteForbiddenFile"; - - public const string InvokeUserGetOnlineUsers = "GetOnlineUsers"; - public const string InvokeUserRegister = "Register"; - public const string InvokeUserPushCharacterDataToVisibleClients = "PushCharacterDataToVisibleClients"; - public const string InvokeUserGetOnlineCharacters = "GetOnlineCharacters"; - public const string SendUserPairedClientAddition = "SendPairedClientAddition"; - public const string SendUserPairedClientRemoval = "SendPairedClientRemoval"; - public const string SendUserPairedClientPauseChange = "SendPairedClientPauseChange"; - public const string InvokeUserGetPairedClients = "GetPairedClients"; - public const string SendUserDeleteAccount = "DeleteAccount"; - - public const string OnUserUpdateClientPairs = "UpdateClientPairs"; - public const string OnUserReceiveCharacterData = "ReceiveCharacterData"; - public const string OnUserRemoveOnlinePairedPlayer = "RemoveOnlinePairedPlayer"; - public const string OnUserAddOnlinePairedPlayer = "AddOnlinePairedPlayer"; - } -} diff --git a/MareSynchronosServer/MareSynchronos.API/BannedUserDto.cs b/MareSynchronosServer/MareSynchronos.API/BannedUserDto.cs deleted file mode 100644 index 0f58c5c..0000000 --- a/MareSynchronosServer/MareSynchronos.API/BannedUserDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MareSynchronos.API -{ - public record BannedUserDto - { - public string CharacterHash { get; set; } - public string Reason { get; set; } - } -} diff --git a/MareSynchronosServer/MareSynchronos.API/CharacterCacheDto.cs b/MareSynchronosServer/MareSynchronos.API/CharacterCacheDto.cs deleted file mode 100644 index ce13618..0000000 --- a/MareSynchronosServer/MareSynchronos.API/CharacterCacheDto.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections.Generic; - -namespace MareSynchronos.API -{ - public record CharacterCacheDto - { - public List FileReplacements { get; set; } = new(); - public string GlamourerData { get; set; } - public string ManipulationData { get; set; } - public string Hash { get; set; } - } -} diff --git a/MareSynchronosServer/MareSynchronos.API/ClientPairDto.cs b/MareSynchronosServer/MareSynchronos.API/ClientPairDto.cs deleted file mode 100644 index 598727f..0000000 --- a/MareSynchronosServer/MareSynchronos.API/ClientPairDto.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace MareSynchronos.API -{ - public record ClientPairDto - { - public string OtherUID { get; set; } - public bool IsPaused { get; set; } - public bool IsSynced { get; set; } - public bool IsPausedFromOthers { get; set; } - public bool IsRemoved { get; set; } - public bool AllowReceiveMessages { get; set; } - } -} \ No newline at end of file diff --git a/MareSynchronosServer/MareSynchronos.API/ConnectionDto.cs b/MareSynchronosServer/MareSynchronos.API/ConnectionDto.cs deleted file mode 100644 index 0c8b15c..0000000 --- a/MareSynchronosServer/MareSynchronos.API/ConnectionDto.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace MareSynchronos.API -{ - public record ConnectionDto - { - public int ServerVersion { get; set; } - public bool IsAdmin { get; set; } - public bool IsModerator { get; set; } - public string UID { get; set; } - } -} diff --git a/MareSynchronosServer/MareSynchronos.API/DownloadFileDto.cs b/MareSynchronosServer/MareSynchronos.API/DownloadFileDto.cs deleted file mode 100644 index 483c2cc..0000000 --- a/MareSynchronosServer/MareSynchronos.API/DownloadFileDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace MareSynchronos.API -{ - public record DownloadFileDto : ITransferFileDto - { - public bool FileExists { get; set; } = true; - public string Hash { get; set; } = string.Empty; - public long Size { get; set; } = 0; - public bool IsForbidden { get; set; } = false; - public string ForbiddenBy { get; set; } = string.Empty; - } -} diff --git a/MareSynchronosServer/MareSynchronos.API/FileReplacementDto.cs b/MareSynchronosServer/MareSynchronos.API/FileReplacementDto.cs deleted file mode 100644 index 57aa2cb..0000000 --- a/MareSynchronosServer/MareSynchronos.API/FileReplacementDto.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; - -namespace MareSynchronos.API -{ - public record FileReplacementDto - { - public string[] GamePaths { get; set; } = Array.Empty(); - public string Hash { get; set; } - } -} \ No newline at end of file diff --git a/MareSynchronosServer/MareSynchronos.API/ForbiddenUploadsDto.cs b/MareSynchronosServer/MareSynchronos.API/ForbiddenUploadsDto.cs deleted file mode 100644 index d5bfa5c..0000000 --- a/MareSynchronosServer/MareSynchronos.API/ForbiddenUploadsDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MareSynchronos.API -{ - public record ForbiddenFileDto - { - public string Hash { get; set; } - public string ForbiddenBy { get; set; } - } -} diff --git a/MareSynchronosServer/MareSynchronos.API/ITransferFileDto.cs b/MareSynchronosServer/MareSynchronos.API/ITransferFileDto.cs deleted file mode 100644 index 4ff8561..0000000 --- a/MareSynchronosServer/MareSynchronos.API/ITransferFileDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MareSynchronos.API -{ - public interface ITransferFileDto - { - string Hash { get; set; } - bool IsForbidden { get; set; } - string ForbiddenBy { get; set; } - } -} \ No newline at end of file diff --git a/MareSynchronosServer/MareSynchronos.API/MareSynchronos.API.csproj b/MareSynchronosServer/MareSynchronos.API/MareSynchronos.API.csproj deleted file mode 100644 index 47c5a70..0000000 --- a/MareSynchronosServer/MareSynchronos.API/MareSynchronos.API.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - net5.0 - - - - - - - diff --git a/MareSynchronosServer/MareSynchronos.API/OnlineUserDto.cs b/MareSynchronosServer/MareSynchronos.API/OnlineUserDto.cs deleted file mode 100644 index 78da994..0000000 --- a/MareSynchronosServer/MareSynchronos.API/OnlineUserDto.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace MareSynchronos.API -{ - public record OnlineUserDto - { - public string UID { get; set; } - public string CharacterNameHash { get; set; } - public bool IsModerator { get; set; } - public bool IsAdmin { get; set; } - } -} diff --git a/MareSynchronosServer/MareSynchronos.API/SystemInfoDto.cs b/MareSynchronosServer/MareSynchronos.API/SystemInfoDto.cs deleted file mode 100644 index 2688193..0000000 --- a/MareSynchronosServer/MareSynchronos.API/SystemInfoDto.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MareSynchronos.API -{ - public record SystemInfoDto - { - public double CpuUsage { get; set; } - public long CacheUsage { get; set; } - public int UploadedFiles { get; set; } - public double NetworkIn { get; set; } - public double NetworkOut { get; set; } - public int OnlineUsers { get; set; } - public long RAMUsage { get; set; } - } -} diff --git a/MareSynchronosServer/MareSynchronos.API/UploadFileDto.cs b/MareSynchronosServer/MareSynchronos.API/UploadFileDto.cs deleted file mode 100644 index 07ad783..0000000 --- a/MareSynchronosServer/MareSynchronos.API/UploadFileDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MareSynchronos.API -{ - public record UploadFileDto : ITransferFileDto - { - public string Hash { get; set; } = string.Empty; - public bool IsForbidden { get; set; } = false; - public string ForbiddenBy { get; set; } = string.Empty; - } -} diff --git a/MareSynchronosServer/MareSynchronosServer.sln b/MareSynchronosServer/MareSynchronosServer.sln index c345141..9801f30 100644 --- a/MareSynchronosServer/MareSynchronosServer.sln +++ b/MareSynchronosServer/MareSynchronosServer.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.2.32602.215 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronosServer", "MareSynchronosServer\MareSynchronosServer.csproj", "{029CA97F-E0BA-4172-A191-EA21FB61AD0F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MareSynchronos.API", "MareSynchronos.API\MareSynchronos.API.csproj", "{E1D8937E-26D0-46FF-8EDA-F35BF8AEFF1D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos.API", "..\MareAPI\MareSynchronosAPI\MareSynchronos.API.csproj", "{326BFB1B-5571-47A6-8513-1FFDB32D53B0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,10 +17,10 @@ Global {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|Any CPU.Build.0 = Debug|Any CPU {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|Any CPU.ActiveCfg = Release|Any CPU {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|Any CPU.Build.0 = Release|Any CPU - {E1D8937E-26D0-46FF-8EDA-F35BF8AEFF1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1D8937E-26D0-46FF-8EDA-F35BF8AEFF1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1D8937E-26D0-46FF-8EDA-F35BF8AEFF1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1D8937E-26D0-46FF-8EDA-F35BF8AEFF1D}.Release|Any CPU.Build.0 = Release|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MareSynchronosServer/MareSynchronosServer/Startup.cs b/MareSynchronosServer/MareSynchronosServer/Startup.cs index f4e42bd..f5bcf59 100644 --- a/MareSynchronosServer/MareSynchronosServer/Startup.cs +++ b/MareSynchronosServer/MareSynchronosServer/Startup.cs @@ -77,7 +77,6 @@ namespace MareSynchronosServer app.UseHsts(); } - app.UseHttpsRedirection(); app.UseStaticFiles(); app.UseRouting();