Working on Networking.
This commit is contained in:
+38
-28
@@ -1,19 +1,43 @@
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using Server.Networking;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Server.Data;
|
||||
using Server.Networking;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// ---- Build connection string from env (K8s secrets env vars) ----
|
||||
string mysqlConnectionString = ConnectionStringFactory.BuildMySqlFromEnv();
|
||||
|
||||
// ---- Service registrations (MUST be before Build) ----
|
||||
builder.Services.AddSingleton<MessageRouter>();
|
||||
builder.Services.AddSingleton<NetworkManager>();
|
||||
var app = builder.Build();
|
||||
var cs = builder.Configuration.GetConnectionString("PrimaryMySql")
|
||||
?? builder.Configuration.GetSection("Database")["ConnectionString"];
|
||||
var mysqlConnectionString = ConnectionStringFactory.BuildMySqlFromEnv();
|
||||
builder.Services.AddDbContext<GameDbContext>(options =>
|
||||
options.UseMySql(cs, ServerVersion.AutoDetect(cs)));
|
||||
|
||||
// EF Core (single registration)
|
||||
builder.Services.AddDbContext<GameDbContext>(options =>
|
||||
options.UseMySql(mysqlConnectionString, ServerVersion.AutoDetect(mysqlConnectionString)));
|
||||
|
||||
// DatabaseOptions (used by DatabaseManager if you wired it)
|
||||
builder.Services.AddOptions<DatabaseOptions>()
|
||||
.Configure(o =>
|
||||
{
|
||||
o.ConnectionString = mysqlConnectionString;
|
||||
o.CommandTimeoutSeconds = int.TryParse(Environment.GetEnvironmentVariable("DB_COMMAND_TIMEOUT_S"), out var t) ? t : 30;
|
||||
o.MaxRetryCount = int.TryParse(Environment.GetEnvironmentVariable("DB_MAX_RETRY"), out var r) ? r : 3;
|
||||
o.RetryBaseDelayMs = int.TryParse(Environment.GetEnvironmentVariable("DB_RETRY_BASE_MS"), out var d) ? d : 100;
|
||||
})
|
||||
.Validate(o => !string.IsNullOrWhiteSpace(o.ConnectionString), "DB connection string required")
|
||||
.ValidateOnStart();
|
||||
|
||||
// (Optional) health checks / metrics can be added here too.
|
||||
|
||||
// ---- Build the app AFTER all service registrations ----
|
||||
var app = builder.Build();
|
||||
// ---- WebSockets endpoint ----
|
||||
app.UseWebSockets(new WebSocketOptions
|
||||
{
|
||||
KeepAliveInterval = TimeSpan.FromSeconds(20),
|
||||
@@ -31,31 +55,17 @@ app.Map("/ws", async (HttpContext httpContext, NetworkManager networkManager) =>
|
||||
var acceptedWebSocket = await httpContext.WebSockets.AcceptWebSocketAsync();
|
||||
await networkManager.AcceptWebSocketAsync(httpContext, acceptedWebSocket);
|
||||
});
|
||||
// EF Core
|
||||
builder.Services.AddDbContext<GameDbContext>(options =>
|
||||
options.UseMySql(mysqlConnectionString, ServerVersion.AutoDetect(mysqlConnectionString)));
|
||||
|
||||
builder.Services.AddOptions<DatabaseOptions>()
|
||||
.Configure(o =>
|
||||
{
|
||||
o.ConnectionString = mysqlConnectionString;
|
||||
o.CommandTimeoutSeconds = int.TryParse(Environment.GetEnvironmentVariable("DB_COMMAND_TIMEOUT_S"), out var t) ? t : 30;
|
||||
o.MaxRetryCount = int.TryParse(Environment.GetEnvironmentVariable("DB_MAX_RETRY"), out var r) ? r : 3;
|
||||
o.RetryBaseDelayMs = int.TryParse(Environment.GetEnvironmentVariable("DB_RETRY_BASE_MS"), out var d) ? d : 100;
|
||||
})
|
||||
.Validate(o => !string.IsNullOrWhiteSpace(o.ConnectionString), "DB connection string required")
|
||||
.ValidateOnStart();
|
||||
|
||||
// Start TCP listener
|
||||
// ---- Start TCP listener (after Build) ----
|
||||
int tcpPort = int.TryParse(Environment.GetEnvironmentVariable("TCP_PORT"), out var parsed) ? parsed : 40000;
|
||||
var tcpListener = new TcpListener(IPAddress.Any, tcpPort);
|
||||
tcpListener.Start();
|
||||
app.Logger.LogInformation("TCP listening on {Port}", tcpPort);
|
||||
|
||||
var networkManagerInstance = app.Services.GetRequiredService<NetworkManager>();
|
||||
_ = networkManagerInstance.AcceptTcpLoopAsync(tcpListener, app.Lifetime.ApplicationStopping);
|
||||
var networkManager = app.Services.GetRequiredService<NetworkManager>();
|
||||
_ = networkManager.AcceptTcpLoopAsync(tcpListener, app.Lifetime.ApplicationStopping);
|
||||
|
||||
// Tick loop
|
||||
_ = networkManagerInstance.RunTickLoopAsync(app.Lifetime.ApplicationStopping);
|
||||
// ---- Tick loop ----
|
||||
_ = networkManager.RunTickLoopAsync(app.Lifetime.ApplicationStopping);
|
||||
|
||||
await app.RunAsync();
|
||||
// ---- Run ----
|
||||
await app.RunAsync();
|
||||
|
||||
Reference in New Issue
Block a user