From 77cd0ca4eb096090e87536e1ca5e09d6862304a3 Mon Sep 17 00:00:00 2001 From: Derek S <44935661+Derek-R-S@users.noreply.github.com> Date: Mon, 5 Apr 2021 11:11:38 -0500 Subject: [PATCH] LRM VS Solution --- ServerProject-DONT-IMPORT-INTO-UNITY/LRM.sln | 25 +++ .../{ => LRM}/BiDictionary.cs | 0 .../{ => LRM}/Compression.cs | 120 +++++------ .../{ => LRM}/Config.cs | 0 .../{ => LRM}/DataHandler.cs | 0 .../{ => LRM}/Endpoint.cs | 202 +++++++++--------- .../LRM/FodyWeavers.xml | 3 + .../LRM/LRM.csproj | 25 +++ .../{ => LRM}/Program.cs | 0 .../{ => LRM}/RelayHandler.cs | 0 .../{ => LRM}/Room.cs | 0 .../{ => LRM}/Transport.cs | 0 12 files changed, 214 insertions(+), 161 deletions(-) create mode 100644 ServerProject-DONT-IMPORT-INTO-UNITY/LRM.sln rename ServerProject-DONT-IMPORT-INTO-UNITY/{ => LRM}/BiDictionary.cs (100%) rename ServerProject-DONT-IMPORT-INTO-UNITY/{ => LRM}/Compression.cs (97%) rename ServerProject-DONT-IMPORT-INTO-UNITY/{ => LRM}/Config.cs (100%) rename ServerProject-DONT-IMPORT-INTO-UNITY/{ => LRM}/DataHandler.cs (100%) rename ServerProject-DONT-IMPORT-INTO-UNITY/{ => LRM}/Endpoint.cs (96%) create mode 100644 ServerProject-DONT-IMPORT-INTO-UNITY/LRM/FodyWeavers.xml create mode 100644 ServerProject-DONT-IMPORT-INTO-UNITY/LRM/LRM.csproj rename ServerProject-DONT-IMPORT-INTO-UNITY/{ => LRM}/Program.cs (100%) rename ServerProject-DONT-IMPORT-INTO-UNITY/{ => LRM}/RelayHandler.cs (100%) rename ServerProject-DONT-IMPORT-INTO-UNITY/{ => LRM}/Room.cs (100%) rename ServerProject-DONT-IMPORT-INTO-UNITY/{ => LRM}/Transport.cs (100%) diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM.sln b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM.sln new file mode 100644 index 0000000..377e7f0 --- /dev/null +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31129.286 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LRM", "LRM\LRM.csproj", "{BA0E55C8-6B24-4690-AC55-1DDDB4F7C05F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BA0E55C8-6B24-4690-AC55-1DDDB4F7C05F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA0E55C8-6B24-4690-AC55-1DDDB4F7C05F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA0E55C8-6B24-4690-AC55-1DDDB4F7C05F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA0E55C8-6B24-4690-AC55-1DDDB4F7C05F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3B4C70D2-0DA3-4638-9D5E-03F35729DC2B} + EndGlobalSection +EndGlobal diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/BiDictionary.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/BiDictionary.cs similarity index 100% rename from ServerProject-DONT-IMPORT-INTO-UNITY/BiDictionary.cs rename to ServerProject-DONT-IMPORT-INTO-UNITY/LRM/BiDictionary.cs diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/Compression.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Compression.cs similarity index 97% rename from ServerProject-DONT-IMPORT-INTO-UNITY/Compression.cs rename to ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Compression.cs index ce43d6b..5eac1a5 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/Compression.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Compression.cs @@ -1,60 +1,60 @@ -using System; -using System.IO; -using System.IO.Compression; -using System.Text; - -namespace LightReflectiveMirror.Compression -{ - internal static class StringCompressor - { - /// - /// Compresses the string. - /// - /// The text. - /// - public static string Compress(this string text) - { - byte[] buffer = Encoding.UTF8.GetBytes(text); - var memoryStream = new MemoryStream(); - using (var gZipStream = new GZipStream(memoryStream, CompressionMode.Compress, true)) - { - gZipStream.Write(buffer, 0, buffer.Length); - } - - memoryStream.Position = 0; - - var compressedData = new byte[memoryStream.Length]; - memoryStream.Read(compressedData, 0, compressedData.Length); - - var gZipBuffer = new byte[compressedData.Length + 4]; - Buffer.BlockCopy(compressedData, 0, gZipBuffer, 4, compressedData.Length); - Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, gZipBuffer, 0, 4); - return Convert.ToBase64String(gZipBuffer); - } - - /// - /// Decompresses the string. - /// - /// The compressed text. - /// - public static string Decompress(this string compressedText) - { - byte[] gZipBuffer = Convert.FromBase64String(compressedText); - using (var memoryStream = new MemoryStream()) - { - int dataLength = BitConverter.ToInt32(gZipBuffer, 0); - memoryStream.Write(gZipBuffer, 4, gZipBuffer.Length - 4); - - var buffer = new byte[dataLength]; - - memoryStream.Position = 0; - using (var gZipStream = new GZipStream(memoryStream, CompressionMode.Decompress)) - { - gZipStream.Read(buffer, 0, buffer.Length); - } - - return Encoding.UTF8.GetString(buffer); - } - } - } -} +using System; +using System.IO; +using System.IO.Compression; +using System.Text; + +namespace LightReflectiveMirror.Compression +{ + internal static class StringCompressor + { + /// + /// Compresses the string. + /// + /// The text. + /// + public static string Compress(this string text) + { + byte[] buffer = Encoding.UTF8.GetBytes(text); + var memoryStream = new MemoryStream(); + using (var gZipStream = new GZipStream(memoryStream, CompressionMode.Compress, true)) + { + gZipStream.Write(buffer, 0, buffer.Length); + } + + memoryStream.Position = 0; + + var compressedData = new byte[memoryStream.Length]; + memoryStream.Read(compressedData, 0, compressedData.Length); + + var gZipBuffer = new byte[compressedData.Length + 4]; + Buffer.BlockCopy(compressedData, 0, gZipBuffer, 4, compressedData.Length); + Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, gZipBuffer, 0, 4); + return Convert.ToBase64String(gZipBuffer); + } + + /// + /// Decompresses the string. + /// + /// The compressed text. + /// + public static string Decompress(this string compressedText) + { + byte[] gZipBuffer = Convert.FromBase64String(compressedText); + using (var memoryStream = new MemoryStream()) + { + int dataLength = BitConverter.ToInt32(gZipBuffer, 0); + memoryStream.Write(gZipBuffer, 4, gZipBuffer.Length - 4); + + var buffer = new byte[dataLength]; + + memoryStream.Position = 0; + using (var gZipStream = new GZipStream(memoryStream, CompressionMode.Decompress)) + { + gZipStream.Read(buffer, 0, buffer.Length); + } + + return Encoding.UTF8.GetString(buffer); + } + } + } +} diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/Config.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Config.cs similarity index 100% rename from ServerProject-DONT-IMPORT-INTO-UNITY/Config.cs rename to ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Config.cs diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/DataHandler.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/DataHandler.cs similarity index 100% rename from ServerProject-DONT-IMPORT-INTO-UNITY/DataHandler.cs rename to ServerProject-DONT-IMPORT-INTO-UNITY/LRM/DataHandler.cs diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/Endpoint.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Endpoint.cs similarity index 96% rename from ServerProject-DONT-IMPORT-INTO-UNITY/Endpoint.cs rename to ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Endpoint.cs index e434d53..86af7ac 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/Endpoint.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Endpoint.cs @@ -1,101 +1,101 @@ -using Grapevine; -using LightReflectiveMirror.Compression; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace LightReflectiveMirror.Endpoints -{ - [Serializable] - struct RelayStats - { - public int ConnectedClients; - public int RoomCount; - public int PublicRoomCount; - public TimeSpan Uptime; - } - - [RestResource] - public class Endpoint - { - private List _rooms { get => Program.instance.GetRooms(); } - - private RelayStats _stats { get => new RelayStats - { - ConnectedClients = Program.instance.GetConnections(), - RoomCount = Program.instance.GetRooms().Count, - PublicRoomCount = Program.instance.GetPublicRoomCount(), - Uptime = Program.instance.GetUptime() - }; } - - [RestRoute("Get", "/api/stats")] - public async Task Stats(IHttpContext context) - { - string json = JsonConvert.SerializeObject(_stats, Formatting.Indented); - await context.Response.SendResponseAsync(json); - } - - [RestRoute("Get", "/api/servers")] - public async Task ServerList(IHttpContext context) - { - if (Program.conf.EndpointServerList) - { - string json = JsonConvert.SerializeObject(_rooms, Formatting.Indented); - await context.Response.SendResponseAsync(json); - } - else - await context.Response.SendResponseAsync(HttpStatusCode.Forbidden); - } - - [RestRoute("Get", "/api/compressed/servers")] - public async Task ServerListCompressed(IHttpContext context) - { - if (Program.conf.EndpointServerList) - { - string json = JsonConvert.SerializeObject(_rooms); - await context.Response.SendResponseAsync(json.Compress()); - } - else - await context.Response.SendResponseAsync(HttpStatusCode.Forbidden); - } - } - - public class EndpointServer - { - public bool Start(ushort port = 8080) - { - try - { - var config = new ConfigurationBuilder() - .SetBasePath(System.IO.Directory.GetCurrentDirectory()) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .Build(); - - var server = new RestServerBuilder(new ServiceCollection(), config, - (services) => - { - services.AddLogging(configure => configure.AddConsole()); - services.Configure(options => options.MinLevel = LogLevel.None); - }, (server) => - { - server.Prefixes.Add($"http://*:{port}/"); - }).Build(); - - server.Router.Options.SendExceptionMessages = false; - server.Start(); - - return true; - } - catch - { - return false; - } - - } - } -} - +using Grapevine; +using LightReflectiveMirror.Compression; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace LightReflectiveMirror.Endpoints +{ + [Serializable] + struct RelayStats + { + public int ConnectedClients; + public int RoomCount; + public int PublicRoomCount; + public TimeSpan Uptime; + } + + [RestResource] + public class Endpoint + { + private List _rooms { get => Program.instance.GetRooms(); } + + private RelayStats _stats { get => new RelayStats + { + ConnectedClients = Program.instance.GetConnections(), + RoomCount = Program.instance.GetRooms().Count, + PublicRoomCount = Program.instance.GetPublicRoomCount(), + Uptime = Program.instance.GetUptime() + }; } + + [RestRoute("Get", "/api/stats")] + public async Task Stats(IHttpContext context) + { + string json = JsonConvert.SerializeObject(_stats, Formatting.Indented); + await context.Response.SendResponseAsync(json); + } + + [RestRoute("Get", "/api/servers")] + public async Task ServerList(IHttpContext context) + { + if (Program.conf.EndpointServerList) + { + string json = JsonConvert.SerializeObject(_rooms, Formatting.Indented); + await context.Response.SendResponseAsync(json); + } + else + await context.Response.SendResponseAsync(HttpStatusCode.Forbidden); + } + + [RestRoute("Get", "/api/compressed/servers")] + public async Task ServerListCompressed(IHttpContext context) + { + if (Program.conf.EndpointServerList) + { + string json = JsonConvert.SerializeObject(_rooms); + await context.Response.SendResponseAsync(json.Compress()); + } + else + await context.Response.SendResponseAsync(HttpStatusCode.Forbidden); + } + } + + public class EndpointServer + { + public bool Start(ushort port = 8080) + { + try + { + var config = new ConfigurationBuilder() + .SetBasePath(System.IO.Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) + .Build(); + + var server = new RestServerBuilder(new ServiceCollection(), config, + (services) => + { + services.AddLogging(configure => configure.AddConsole()); + services.Configure(options => options.MinLevel = LogLevel.None); + }, (server) => + { + server.Prefixes.Add($"http://*:{port}/"); + }).Build(); + + server.Router.Options.SendExceptionMessages = false; + server.Start(); + + return true; + } + catch + { + return false; + } + + } + } +} + diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/FodyWeavers.xml b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/FodyWeavers.xml new file mode 100644 index 0000000..5029e70 --- /dev/null +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/LRM.csproj b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/LRM.csproj new file mode 100644 index 0000000..8ddfbee --- /dev/null +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/LRM.csproj @@ -0,0 +1,25 @@ + + + + Exe + net5.0 + + + + true + + + + true + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/Program.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Program.cs similarity index 100% rename from ServerProject-DONT-IMPORT-INTO-UNITY/Program.cs rename to ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Program.cs diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/RelayHandler.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler.cs similarity index 100% rename from ServerProject-DONT-IMPORT-INTO-UNITY/RelayHandler.cs rename to ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler.cs diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/Room.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Room.cs similarity index 100% rename from ServerProject-DONT-IMPORT-INTO-UNITY/Room.cs rename to ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Room.cs diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/Transport.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Transport.cs similarity index 100% rename from ServerProject-DONT-IMPORT-INTO-UNITY/Transport.cs rename to ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Transport.cs