From 61151bef0ce03c47e183e6211cdfc3c03e78107f Mon Sep 17 00:00:00 2001 From: Tom Date: Tue, 29 Oct 2024 12:14:55 +0000 Subject: [PATCH] Changed line endings for Startup --- Startup.cs | 320 ++++++++++++++++++++++++++--------------------------- 1 file changed, 160 insertions(+), 160 deletions(-) diff --git a/Startup.cs b/Startup.cs index 29f342f..3cc7f1a 100644 --- a/Startup.cs +++ b/Startup.cs @@ -1,161 +1,161 @@ -using System.Net; -using System.Text.Json; -using HermesSocketLibrary; -using HermesSocketLibrary.db; -using HermesSocketLibrary.Requests; -using HermesSocketServer; -using HermesSocketServer.Requests; -using HermesSocketServer.Socket; -using HermesSocketServer.Socket.Handlers; -using Microsoft.AspNetCore.HttpOverrides; -using Serilog; -using Serilog.Events; -using YamlDotNet.Serialization; -using YamlDotNet.Serialization.NamingConventions; -using Microsoft.AspNetCore.Connections; -using HermesSocketServer.Validators; -using HermesSocketServer.Store; -using HermesSocketServer.Services; - - -var yamlDeserializer = new DeserializerBuilder() - .WithNamingConvention(HyphenatedNamingConvention.Instance) - .Build(); - -var configFileName = "server.config.yml"; -var environment = Environment.GetEnvironmentVariable("TTS_ENV")!.ToLower(); -if (File.Exists("server.config." + environment + ".yml")) - configFileName = "server.config." + environment + ".yml"; -var configContent = File.ReadAllText(configFileName); -var configuration = yamlDeserializer.Deserialize(configContent); - -if (configuration.Environment.ToUpper() != "QA" && configuration.Environment.ToUpper() != "PROD") - throw new Exception("Invalid environment set."); - -var builder = WebApplication.CreateBuilder(); -builder.Logging.ClearProviders(); - -builder.Services.Configure(options => -{ - options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto; -}); - -builder.WebHost.UseUrls($"http://{configuration.WebsocketServer.Host}:{configuration.WebsocketServer.Port}"); -var loggerConfiguration = new LoggerConfiguration(); -if (configuration.Environment.ToUpper() == "QA") - loggerConfiguration.MinimumLevel.Verbose(); -else - loggerConfiguration.MinimumLevel.Debug(); - -loggerConfiguration.Enrich.FromLogContext() - .WriteTo.File($"logs/{configuration.Environment.ToUpper()}/serverlog-.log", rollingInterval: RollingInterval.Day, retainedFileCountLimit: 7); -if (configuration.Environment.ToUpper() == "QA") - loggerConfiguration.WriteTo.Console(restrictedToMinimumLevel: LogEventLevel.Debug); -else - loggerConfiguration.WriteTo.Console(restrictedToMinimumLevel: LogEventLevel.Information); - -var logger = loggerConfiguration.CreateLogger(); - -builder.Host.UseSerilog(logger); -builder.Logging.AddSerilog(logger); -var s = builder.Services; - -s.AddSerilog(logger); - -s.AddSingleton(configuration); -s.AddSingleton(); - -// Socket message handlers -s.AddSingleton(logger); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); - -// Validators -s.AddSingleton(); -s.AddSingleton(); - -// Stores -s.AddSingleton(); -s.AddSingleton(); - -// Request handlers -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); - -// Managers -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(); -s.AddSingleton(new JsonSerializerOptions() -{ - PropertyNameCaseInsensitive = false, - PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower -}); -s.AddSingleton(); - -// Background services -s.AddHostedService(); - -var app = builder.Build(); -app.UseForwardedHeaders(); -app.UseSerilogRequestLogging(); - -var wsOptions = new WebSocketOptions() -{ - KeepAliveInterval = TimeSpan.FromSeconds(30) -}; -// wsOptions.AllowedOrigins.Add("wss://tomtospeech.com"); -//wsOptions.AllowedOrigins.Add("ws.tomtospeech.com"); -//wsOptions.AllowedOrigins.Add("hermes-ws.goblincaves.com"); -app.UseWebSockets(wsOptions); - -var options = app.Services.GetRequiredService(); -var server = app.Services.GetRequiredService(); - -app.Use(async (HttpContext context, RequestDelegate next) => -{ - if (context.Request.Path != "/") - { - context.Response.StatusCode = StatusCodes.Status401Unauthorized; - return; - } - - if (context.WebSockets.IsWebSocketRequest) - { - using var webSocket = await context.WebSockets.AcceptWebSocketAsync(); - await server.Handle(new WebSocketUser(webSocket, IPAddress.Parse(context.Request.Headers["X-Forwarded-For"].ToString()), options, logger), context); - } - else - { - context.Response.StatusCode = StatusCodes.Status400BadRequest; - } - await next(context); -}); - +using System.Net; +using System.Text.Json; +using HermesSocketLibrary; +using HermesSocketLibrary.db; +using HermesSocketLibrary.Requests; +using HermesSocketServer; +using HermesSocketServer.Requests; +using HermesSocketServer.Socket; +using HermesSocketServer.Socket.Handlers; +using Microsoft.AspNetCore.HttpOverrides; +using Serilog; +using Serilog.Events; +using YamlDotNet.Serialization; +using YamlDotNet.Serialization.NamingConventions; +using Microsoft.AspNetCore.Connections; +using HermesSocketServer.Validators; +using HermesSocketServer.Store; +using HermesSocketServer.Services; + + +var yamlDeserializer = new DeserializerBuilder() + .WithNamingConvention(HyphenatedNamingConvention.Instance) + .Build(); + +var configFileName = "server.config.yml"; +var environment = Environment.GetEnvironmentVariable("TTS_ENV")!.ToLower(); +if (File.Exists("server.config." + environment + ".yml")) + configFileName = "server.config." + environment + ".yml"; +var configContent = File.ReadAllText(configFileName); +var configuration = yamlDeserializer.Deserialize(configContent); + +if (configuration.Environment.ToUpper() != "QA" && configuration.Environment.ToUpper() != "PROD") + throw new Exception("Invalid environment set."); + +var builder = WebApplication.CreateBuilder(); +builder.Logging.ClearProviders(); + +builder.Services.Configure(options => +{ + options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto; +}); + +builder.WebHost.UseUrls($"http://{configuration.WebsocketServer.Host}:{configuration.WebsocketServer.Port}"); +var loggerConfiguration = new LoggerConfiguration(); +if (configuration.Environment.ToUpper() == "QA") + loggerConfiguration.MinimumLevel.Verbose(); +else + loggerConfiguration.MinimumLevel.Debug(); + +loggerConfiguration.Enrich.FromLogContext() + .WriteTo.File($"logs/{configuration.Environment.ToUpper()}/serverlog-.log", rollingInterval: RollingInterval.Day, retainedFileCountLimit: 7); +if (configuration.Environment.ToUpper() == "QA") + loggerConfiguration.WriteTo.Console(restrictedToMinimumLevel: LogEventLevel.Debug); +else + loggerConfiguration.WriteTo.Console(restrictedToMinimumLevel: LogEventLevel.Information); + +var logger = loggerConfiguration.CreateLogger(); + +builder.Host.UseSerilog(logger); +builder.Logging.AddSerilog(logger); +var s = builder.Services; + +s.AddSerilog(logger); + +s.AddSingleton(configuration); +s.AddSingleton(); + +// Socket message handlers +s.AddSingleton(logger); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); + +// Validators +s.AddSingleton(); +s.AddSingleton(); + +// Stores +s.AddSingleton(); +s.AddSingleton(); + +// Request handlers +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); + +// Managers +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(); +s.AddSingleton(new JsonSerializerOptions() +{ + PropertyNameCaseInsensitive = false, + PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower +}); +s.AddSingleton(); + +// Background services +s.AddHostedService(); + +var app = builder.Build(); +app.UseForwardedHeaders(); +app.UseSerilogRequestLogging(); + +var wsOptions = new WebSocketOptions() +{ + KeepAliveInterval = TimeSpan.FromSeconds(30) +}; +// wsOptions.AllowedOrigins.Add("wss://tomtospeech.com"); +//wsOptions.AllowedOrigins.Add("ws.tomtospeech.com"); +//wsOptions.AllowedOrigins.Add("hermes-ws.goblincaves.com"); +app.UseWebSockets(wsOptions); + +var options = app.Services.GetRequiredService(); +var server = app.Services.GetRequiredService(); + +app.Use(async (HttpContext context, RequestDelegate next) => +{ + if (context.Request.Path != "/") + { + context.Response.StatusCode = StatusCodes.Status401Unauthorized; + return; + } + + if (context.WebSockets.IsWebSocketRequest) + { + using var webSocket = await context.WebSockets.AcceptWebSocketAsync(); + await server.Handle(new WebSocketUser(webSocket, IPAddress.Parse(context.Request.Headers["X-Forwarded-For"].ToString()), options, logger), context); + } + else + { + context.Response.StatusCode = StatusCodes.Status400BadRequest; + } + await next(context); +}); + await app.RunAsync(); \ No newline at end of file