Added compression

This commit is contained in:
cxxpxr 2021-04-03 22:49:38 -04:00 committed by GitHub
parent 51cd792089
commit c5d2220b76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 167 additions and 95 deletions

View file

@ -0,0 +1,60 @@
using System;
using System.IO;
using System.IO.Compression;
using System.Text;
namespace LightReflectiveMirror.Compression
{
internal static class StringCompressor
{
/// <summary>
/// Compresses the string.
/// </summary>
/// <param name="text">The text.</param>
/// <returns></returns>
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);
}
/// <summary>
/// Decompresses the string.
/// </summary>
/// <param name="compressedText">The compressed text.</param>
/// <returns></returns>
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);
}
}
}
}

View file

@ -1,9 +1,11 @@
using Grapevine; using Grapevine;
using LightReflectiveMirror.Compression;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace LightReflectiveMirror.Endpoints namespace LightReflectiveMirror.Endpoints
@ -20,18 +22,20 @@ namespace LightReflectiveMirror.Endpoints
[RestResource] [RestResource]
public class Endpoint public class Endpoint
{ {
private List<Room> _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")] [RestRoute("Get", "/api/stats")]
public async Task Stats(IHttpContext context) public async Task Stats(IHttpContext context)
{ {
RelayStats stats = new RelayStats string json = JsonConvert.SerializeObject(_stats, Formatting.Indented);
{
ConnectedClients = Program.instance.GetConnections(),
RoomCount = Program.instance.GetRooms().Count,
PublicRoomCount = Program.instance.GetPublicRoomCount(),
Uptime = Program.instance.GetUptime()
};
string json = JsonConvert.SerializeObject(stats, Formatting.Indented);
await context.Response.SendResponseAsync(json); await context.Response.SendResponseAsync(json);
} }
@ -40,13 +44,23 @@ namespace LightReflectiveMirror.Endpoints
{ {
if (Program.conf.EndpointServerList) if (Program.conf.EndpointServerList)
{ {
string json = JsonConvert.SerializeObject(Program.instance.GetRooms(), Formatting.Indented); string json = JsonConvert.SerializeObject(_rooms, Formatting.Indented);
await context.Response.SendResponseAsync(json); await context.Response.SendResponseAsync(json);
} }
else else
await context.Response.SendResponseAsync(HttpStatusCode.Forbidden);
}
[RestRoute("Get", "/api/compressed/servers")]
public async Task ServerListCompressed(IHttpContext context)
{
if (Program.conf.EndpointServerList)
{ {
await context.Response.SendResponseAsync("Access Denied"); string json = JsonConvert.SerializeObject(_rooms);
await context.Response.SendResponseAsync(json.Compress());
} }
else
await context.Response.SendResponseAsync(HttpStatusCode.Forbidden);
} }
} }
@ -61,20 +75,17 @@ namespace LightReflectiveMirror.Endpoints
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
.Build(); .Build();
Action<IServiceCollection> configServices = (services) => var server = new RestServerBuilder(new ServiceCollection(), config,
(services) =>
{ {
services.AddLogging(configure => configure.AddConsole()); services.AddLogging(configure => configure.AddConsole());
services.Configure<LoggerFilterOptions>(options => options.MinLevel = LogLevel.None); services.Configure<LoggerFilterOptions>(options => options.MinLevel = LogLevel.None);
}; }, (server) =>
Action<IRestServer> configServer = (server) =>
{ {
server.Prefixes.Add($"http://*:{port}/"); server.Prefixes.Add($"http://*:{port}/");
}; }).Build();
var server = new RestServerBuilder(new ServiceCollection(), config, configServices, configServer).Build();
server.Router.Options.SendExceptionMessages = false; server.Router.Options.SendExceptionMessages = false;
server.Start(); server.Start();
return true; return true;

View file

@ -163,15 +163,16 @@ namespace LightReflectiveMirror
try try
{ {
natThread.Start(); natThread.Start();
}catch(Exception err) }
catch(Exception e)
{ {
WriteLogMessage("FAILED\n" + err, ConsoleColor.DarkRed); WriteLogMessage("FAILED\n" + e, ConsoleColor.DarkRed);
} }
} }
catch(Exception error) catch(Exception e)
{ {
WriteLogMessage("FAILED\nCheck if port is in use.", ConsoleColor.DarkRed, true); WriteLogMessage("FAILED\nCheck if port is in use.", ConsoleColor.DarkRed, true);
Console.WriteLine(error); Console.WriteLine(e);
} }
} }
} }
@ -285,7 +286,7 @@ namespace LightReflectiveMirror
string load = $"Chimp Event Listener Initializing... OK" + string load = $"Chimp Event Listener Initializing... OK" +
"\nHarambe Memorial Initializing... OK" + "\nHarambe Memorial Initializing... OK" +
"\nBananas initializing... OK\n"; "\nBananas Initializing... OK\n";
WriteLogMessage(t, ConsoleColor.Green); WriteLogMessage(t, ConsoleColor.Green);
WriteLogMessage(load, ConsoleColor.Cyan); WriteLogMessage(load, ConsoleColor.Cyan);