Add server startup orchestrator to control init and listener order

FallenDev · FallenDev · commit 21b4e545a8fc · 2025-12-15T00:03:56.000-05:00
- ServerSetup triggered explicitly before sockets bind
- Lobby/Login/World servers started sequentially
(Easier to add new servers in the future)
diff --git a/Zolian.GameServer/App.xaml.cs b/Zolian.GameServer/App.xaml.cs
@@ -37,7 +37,7 @@ public partial class App
 {
     private CancellationTokenSource ServerCtx { get; set; }
 
-    protected override void OnStartup(StartupEventArgs e)
+    protected override async void OnStartup(StartupEventArgs e)
     {
         DispatcherUnhandledException += App_DispatcherUnhandledException;
         AppDomain.CurrentDomain.UnhandledException += GlobalUnhandledException;
@@ -100,49 +100,28 @@ protected override void OnStartup(StartupEventArgs e)
             serviceCollection.AddSingleton<IClientRegistry<ILobbyClient>, ClientRegistry<ILobbyClient>>();
             serviceCollection.AddSingleton<LobbyServer>();
             serviceCollection.AddSingleton<ILobbyServer<ILobbyClient>>(sp => sp.GetRequiredService<LobbyServer>());
-            serviceCollection.AddSingleton<IHostedService>(sp => sp.GetRequiredService<LobbyServer>());
 
             // Login
             serviceCollection.AddSingleton<IClientFactory<LoginClient>, ClientFactory<LoginClient>>();
             serviceCollection.AddSingleton<IClientRegistry<ILoginClient>, ClientRegistry<ILoginClient>>();
             serviceCollection.AddSingleton<LoginServer>();
             serviceCollection.AddSingleton<ILoginServer<ILoginClient>>(sp => sp.GetRequiredService<LoginServer>());
-            serviceCollection.AddSingleton<IHostedService>(sp => sp.GetRequiredService<LoginServer>());
 
             // World
             serviceCollection.AddSingleton<IClientFactory<WorldClient>, ClientFactory<WorldClient>>();
             serviceCollection.AddSingleton<IClientRegistry<IWorldClient>, ClientRegistry<IWorldClient>>();
             serviceCollection.AddSingleton<WorldServer>();
             serviceCollection.AddSingleton<IWorldServer<IWorldClient>>(sp => sp.GetRequiredService<WorldServer>());
-            serviceCollection.AddSingleton<IHostedService>(sp => sp.GetRequiredService<WorldServer>());
+
+            // Hosted Services
+            serviceCollection.AddSingleton<IHostedService, ServerOrchestrator>();
 
             var serviceProvider = serviceCollection.BuildServiceProvider();
             serviceProvider.GetService<IServer>();
             var hostedServices = serviceProvider.GetServices<IHostedService>().ToArray();
 
-            // Start the hosted services in a dedicated long-running task
-            _ = Task.Run(async () =>
-            {
-                try
-                {
-                    // Start all hosted services
-                    await Task.WhenAll(hostedServices.Select(svc => svc.StartAsync(ServerCtx.Token)));
-
-                    // Then wait until the token is cancelled
-                    try
-                    {
-                        await Task.Delay(Timeout.Infinite, ServerCtx.Token);
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        // Expected when the token is canceled
-                    }
-                }
-                catch (Exception exception)
-                {
-                    SentrySdk.CaptureException(exception);
-                }
-            }, ServerCtx.Token);
+            foreach (var svc in hostedServices)
+                await svc.StartAsync(ServerCtx.Token);
         }
         catch (Exception exception)
         {
diff --git a/Zolian.GameServer/ServerOrchestrator.cs b/Zolian.GameServer/ServerOrchestrator.cs
@@ -0,0 +1,58 @@
+﻿using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Darkages.Network.Server;
+
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace Zolian.GameServer;
+
+public sealed class ServerOrchestrator : BackgroundService
+{
+    private readonly IServiceProvider _services;
+
+    public ServerOrchestrator(IServiceProvider services) => _services = services;
+
+    /// <summary>
+    ///     ServerOrchestrator is registered as an IHostedService; when the host starts,
+    ///     StartAsync() is called, which in turn runs ExecuteAsync() on a background task
+    ///     that performs server initialization and startup until shutdown is requested.
+    /// </summary>
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        // Runs bootstrap/init deterministically
+        // Triggers ServerSetup.Start() via Server class
+        _ = _services.GetRequiredService<IServer>();
+
+        // Start listeners in order
+        var lobby = _services.GetRequiredService<LobbyServer>();
+        await lobby.StartAsync(stoppingToken).ConfigureAwait(false);
+
+        var login = _services.GetRequiredService<LoginServer>();
+        await login.StartAsync(stoppingToken).ConfigureAwait(false);
+
+        var world = _services.GetRequiredService<WorldServer>();
+        await world.StartAsync(stoppingToken).ConfigureAwait(false);
+
+        // Keep running until stopped
+        await Task.Delay(Timeout.Infinite, stoppingToken).ConfigureAwait(false);
+    }
+
+    public override async Task StopAsync(CancellationToken cancellationToken)
+    {
+        // Stop in reverse order if they were started
+        // Use GetService so stop doesn’t throw if something never started
+        var world = _services.GetService<WorldServer>();
+        if (world is not null) await world.StopAsync(cancellationToken).ConfigureAwait(false);
+
+        var login = _services.GetService<LoginServer>();
+        if (login is not null) await login.StopAsync(cancellationToken).ConfigureAwait(false);
+
+        var lobby = _services.GetService<LobbyServer>();
+        if (lobby is not null) await lobby.StopAsync(cancellationToken).ConfigureAwait(false);
+
+        await base.StopAsync(cancellationToken).ConfigureAwait(false);
+    }
+}
diff --git a/Zolian.GameServer/Zolian.GameServer.csproj b/Zolian.GameServer/Zolian.GameServer.csproj
@@ -41,7 +41,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Chaos-Networking" Version="2.8.1" />
+		<PackageReference Include="Chaos-Networking" Version="2.8.4" />
 		<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.0-preview2.25289.6" />
 		<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1">
diff --git a/Zolian.Server.Base/CommandSystem/Commander.cs b/Zolian.Server.Base/CommandSystem/Commander.cs
@@ -171,7 +171,7 @@ private static void Chaos(Argument[] args, object arg)
             Task.Delay(60000).ContinueWith(ct =>
             {
                 if (!client.Aisling.GameMasterChaosCancel)
-                    connected.Client.Disconnect();
+                    connected.Client.CloseTransport();
 
                 connected.Client.SendServerMessage(ServerMessageType.GroupChat, "{=qDeath{=g: {=bChaos has been cancelled.");
             });
diff --git a/Zolian.Server.Base/GameScripts/Mundanes/Arena/ArenaHost.cs b/Zolian.Server.Base/GameScripts/Mundanes/Arena/ArenaHost.cs
@@ -42,7 +42,7 @@ public override void OnResponse(WorldClient client, ushort responseID, string ar
 
         if (client.Aisling.Map.ID != 5232)
         {
-            client.Disconnect();
+            client.CloseTransport();
             return;
         }
 
diff --git a/Zolian.Server.Base/GameScripts/Mundanes/Generic/TempleOfLight.cs b/Zolian.Server.Base/GameScripts/Mundanes/Generic/TempleOfLight.cs
@@ -43,7 +43,7 @@ public override void OnResponse(WorldClient client, ushort responseID, string ar
 
         if (client.Aisling.Map.ID != 500)
         {
-            client.Disconnect();
+            client.CloseTransport();
             return;
         }
 
diff --git a/Zolian.Server.Base/GameScripts/Mundanes/Generic/TempleOfVoid.cs b/Zolian.Server.Base/GameScripts/Mundanes/Generic/TempleOfVoid.cs
@@ -43,7 +43,7 @@ public override void OnResponse(WorldClient client, ushort responseID, string ar
 
         if (client.Aisling.Map.ID != 500)
         {
-            client.Disconnect();
+            client.CloseTransport();
             return;
         }
 
diff --git a/Zolian.Server.Base/GameScripts/Mundanes/TempleOfVoid/VoidSphereWarp.cs b/Zolian.Server.Base/GameScripts/Mundanes/TempleOfVoid/VoidSphereWarp.cs
@@ -32,7 +32,7 @@ public override void OnResponse(WorldClient client, ushort responseID, string ar
     {
         if (client.Aisling.Map.ID != 1500)
         {
-            client.Disconnect();
+            client.CloseTransport();
             return;
         }
 
diff --git a/Zolian.Server.Base/Network/Client/Abstractions/IClientFactory.cs b/Zolian.Server.Base/Network/Client/Abstractions/IClientFactory.cs
@@ -3,7 +3,7 @@
 
 namespace Darkages.Network.Client.Abstractions
 {
-    public interface IClientFactory<out T> where T : SocketClientBase
+    public interface IClientFactory<out T> where T : SocketTransportBase
     {
         T CreateClient(Socket socket);
     }
diff --git a/Zolian.Server.Base/Network/Client/LobbyClient.cs b/Zolian.Server.Base/Network/Client/LobbyClient.cs
@@ -20,7 +20,7 @@ public class LobbyClient([NotNull] ILobbyServer<ILobbyClient> server, [NotNull]
         [NotNull] ILogger<LobbyClient> logger)
     : LobbyClientBase(socket, crypto, packetSerializer, logger), ILobbyClient
 {
-    protected override ValueTask HandlePacketAsync(Span<byte> span)
+    protected override ValueTask OnPacketAsync(Span<byte> span)
     {
         var opCode = span[3];
         var packet = new Packet(ref span, Crypto.IsClientEncrypted(opCode));
diff --git a/Zolian.Server.Base/Network/Client/LoginClient.cs b/Zolian.Server.Base/Network/Client/LoginClient.cs
@@ -22,7 +22,7 @@ public class LoginClient([NotNull] ILoginServer<ILoginClient> server, [NotNull]
         [NotNull] ILogger<LoginClient> logger)
     : LoginClientBase(socket, crypto, packetSerializer, logger), ILoginClient
 {
-    protected override ValueTask HandlePacketAsync(Span<byte> span)
+    protected override ValueTask OnPacketAsync(Span<byte> span)
     {
         var opCode = span[3];
         var packet = new Packet(ref span, Crypto.IsClientEncrypted(opCode));
diff --git a/Zolian.Server.Base/Network/Client/WorldClient.cs b/Zolian.Server.Base/Network/Client/WorldClient.cs
@@ -616,7 +616,7 @@ public async Task<WorldClient> Load()
             ServerSetup.EventsLogger(ex.StackTrace, LogLevel.Error);
             SentrySdk.CaptureException(ex);
 
-            Disconnect();
+            CloseTransport();
             return null;
         }
         finally
@@ -797,7 +797,7 @@ public WorldClient LoadInventory(SqlConnection sConn)
 
                         if (routineCheck <= 4) continue;
                         ServerSetup.EventsLogger($"{Aisling.Username} has somehow exceeded their inventory, and have hanging items.");
-                        Disconnect();
+                        CloseTransport();
                         break;
                     }
                 }
@@ -1325,7 +1325,7 @@ private void EquipGearAndAttachScripts()
 
     #region Handlers
 
-    protected override ValueTask HandlePacketAsync(Span<byte> span)
+    protected override ValueTask OnPacketAsync(Span<byte> span)
     {
         var opCode = span[3];
         var packet = new Packet(ref span, Crypto.IsClientEncrypted(opCode));
diff --git a/Zolian.Server.Base/Network/Server/ClientFactory.cs b/Zolian.Server.Base/Network/Server/ClientFactory.cs
@@ -7,7 +7,7 @@
 namespace Darkages.Network.Server
 {
     public class ClientFactory<T>(IServiceProvider service) : IClientFactory<T>
-        where T : SocketClientBase
+        where T : SocketTransportBase
     {
         public T CreateClient(Socket socket)
         {
diff --git a/Zolian.Server.Base/Network/Server/LobbyServer.cs b/Zolian.Server.Base/Network/Server/LobbyServer.cs
@@ -26,7 +26,7 @@ namespace Darkages.Network.Server;
 ///     -> OnServerTableRequest (Sends server table)
 /// </summary>
 [UsedImplicitly]
-public sealed class LobbyServer : ServerBase<ILobbyClient>, ILobbyServer<ILobbyClient>
+public sealed class LobbyServer : TcpListenerBase<ILobbyClient>, ILobbyServer<ILobbyClient>
 {
     private readonly IClientFactory<LobbyClient> _clientProvider;
     private readonly MServerTable _serverTable;
@@ -60,7 +60,7 @@ ValueTask InnerOnVersion(ILobbyClient localClient, VersionArgs localArgs)
             if (localArgs.Version != ServerSetup.Instance.Config.ClientVersion)
             {
                 localClient.SendLoginMessage(LoginMessageType.Confirm, "You're not using an authorized client. Please visit https://www.TheBuckNetwork.com/Zolian for the latest client.");
-                localClient.Disconnect();
+                localClient.CloseTransport();
                 return default;
             }
 
@@ -96,7 +96,7 @@ ValueTask InnerOnServerTableRequest(ILobbyClient localClient, ServerTableRequest
                     break;
                 default:
                     localClient.SendLoginMessage(LoginMessageType.Confirm, "You're not authorized.");
-                    localClient.Disconnect();
+                    localClient.CloseTransport();
                     break;
             }
 
@@ -180,7 +180,7 @@ protected override void OnConnected(Socket clientSocket)
             try
             {
                 ServerSetup.ConnectionLogger($"Banned connection attempt on Lobby Server from {ip}");
-                client.Disconnect();
+                client.CloseTransport();
             }
             catch { }
 
@@ -201,7 +201,7 @@ protected override void OnConnected(Socket clientSocket)
                 try
                 {
                     ServerSetup.ConnectionLogger($"Disconnected Bad Actor from {ip}");
-                    client.Disconnect();
+                    client.CloseTransport();
                 }
                 catch { }
 
@@ -215,7 +215,7 @@ protected override void OnConnected(Socket clientSocket)
             try
             {
                 ServerSetup.ConnectionLogger("ID Collision - Lobby Server");
-                client.Disconnect();
+                client.CloseTransport();
             }
             catch { }
 
@@ -224,7 +224,7 @@ protected override void OnConnected(Socket clientSocket)
 
         // Add to passed checks cache for Lobby Server
         ServerSetup.Instance.GlobalLobbyConnection.TryAdd(ipAddress, ipAddress);
-        client.BeginReceive();
+        client.StartReceiveLoop();
         // 0x7E - Handshake
         client.SendAcceptConnection("CONNECTED SERVER");
     }
diff --git a/Zolian.Server.Base/Network/Server/LoginServer.cs b/Zolian.Server.Base/Network/Server/LoginServer.cs
@@ -30,7 +30,7 @@
 namespace Darkages.Network.Server;
 
 [UsedImplicitly]
-public sealed partial class LoginServer : ServerBase<ILoginClient>, ILoginServer<ILoginClient>
+public sealed partial class LoginServer : TcpListenerBase<ILoginClient>, ILoginServer<ILoginClient>
 {
     private readonly IClientFactory<LoginClient> _clientProvider;
     private readonly Notification _notification;
@@ -86,7 +86,7 @@ ValueTask InnerOnClientRedirect(ILoginClient localClient, ClientRedirectedArgs l
             {
                 ServerSetup.ConnectionLogger($"Attempt to redirect with invalid redirect details, {localClient.RemoteIp}");
                 SentrySdk.CaptureMessage($"Attempt to redirect with invalid redirect details, {localClient.RemoteIp}");
-                localClient.Disconnect();
+                localClient.CloseTransport();
             }
 
             return default;
@@ -491,7 +491,7 @@ protected override void OnConnected(Socket clientSocket)
             try
             {
                 ServerSetup.ConnectionLogger($"Banned connection attempt on Login Server from {ip}");
-                client.Disconnect();
+                client.CloseTransport();
             }
             catch { }
 
@@ -504,7 +504,7 @@ protected override void OnConnected(Socket clientSocket)
             try
             {
                 ServerSetup.ConnectionLogger("ID Collision - Login Server");
-                client.Disconnect();
+                client.CloseTransport();
             }
             catch { }
 
@@ -518,7 +518,7 @@ protected override void OnConnected(Socket clientSocket)
         {
             try
             {
-                client.Disconnect();
+                client.CloseTransport();
                 ServerSetup.ConnectionLogger("---------Login-Server---------");
                 var comment = $"{ipAddress} has been blocked for violating security protocols through improper port access.";
                 ServerSetup.ConnectionLogger(comment, LogLevel.Warning);
@@ -531,7 +531,7 @@ protected override void OnConnected(Socket clientSocket)
 
         // Add to passed checks cache for Login Server
         ServerSetup.Instance.GlobalLoginConnection.TryAdd(ipAddress, ipAddress);
-        client.BeginReceive();
+        client.StartReceiveLoop();
         // 0x7E - Handshake
         client.SendAcceptConnection("CONNECTED SERVER");
     }
diff --git a/Zolian.Server.Base/Network/Server/ServerSetup.cs b/Zolian.Server.Base/Network/Server/ServerSetup.cs
@@ -266,6 +266,7 @@ public void DatabaseSaveConnection()
         {
             Console.ForegroundColor = ConsoleColor.Blue;
             Console.WriteLine("Player Save-State Connected");
+            Console.WriteLine();
         }
         else
         {
diff --git a/Zolian.Server.Base/Network/Server/WorldServer.cs b/Zolian.Server.Base/Network/Server/WorldServer.cs
diff --git a/Zolian.Server.Base/ScriptingBase/MundaneScript.cs b/Zolian.Server.Base/ScriptingBase/MundaneScript.cs
diff --git a/Zolian.Server.Base/Zolian.Server.Base.csproj b/Zolian.Server.Base/Zolian.Server.Base.csproj
diff --git a/ZolianTest/ZolianTest.csproj b/ZolianTest/ZolianTest.csproj

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ private static void Chaos(Argument[] args, object arg)`
`171`	`171`	`Task.Delay(60000).ContinueWith(ct =>`
`172`	`172`	`{`
`173`	`173`	`if (!client.Aisling.GameMasterChaosCancel)`
`174`		`- connected.Client.Disconnect();`
	`174`	`+ connected.Client.CloseTransport();`
`175`	`175`
`176`	`176`	`connected.Client.SendServerMessage(ServerMessageType.GroupChat, "{=qDeath{=g: {=bChaos has been cancelled.");`
`177`	`177`	`});`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public override void OnResponse(WorldClient client, ushort responseID, string ar`
`42`	`42`
`43`	`43`	`if (client.Aisling.Map.ID != 5232)`
`44`	`44`	`{`
`45`		`- client.Disconnect();`
	`45`	`+ client.CloseTransport();`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public override void OnResponse(WorldClient client, ushort responseID, string ar`
`43`	`43`
`44`	`44`	`if (client.Aisling.Map.ID != 500)`
`45`	`45`	`{`
`46`		`- client.Disconnect();`
	`46`	`+ client.CloseTransport();`
`47`	`47`	`return;`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public override void OnResponse(WorldClient client, ushort responseID, string ar`
`32`	`32`	`{`
`33`	`33`	`if (client.Aisling.Map.ID != 1500)`
`34`	`34`	`{`
`35`		`- client.Disconnect();`
	`35`	`+ client.CloseTransport();`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Darkages.Network.Client.Abstractions`
`5`	`5`	`{`
`6`		`- public interface IClientFactory<out T> where T : SocketClientBase`
	`6`	`+ public interface IClientFactory<out T> where T : SocketTransportBase`
`7`	`7`	`{`
`8`	`8`	`T CreateClient(Socket socket);`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class LobbyClient([NotNull] ILobbyServer<ILobbyClient> server, [NotNull]`
`20`	`20`	`[NotNull] ILogger<LobbyClient> logger)`
`21`	`21`	`: LobbyClientBase(socket, crypto, packetSerializer, logger), ILobbyClient`
`22`	`22`	`{`
`23`		`- protected override ValueTask HandlePacketAsync(Span<byte> span)`
	`23`	`+ protected override ValueTask OnPacketAsync(Span<byte> span)`
`24`	`24`	`{`
`25`	`25`	`var opCode = span[3];`
`26`	`26`	`var packet = new Packet(ref span, Crypto.IsClientEncrypted(opCode));`