Merge branch 'Corona-Studio:main' into main

Author: natsurainko

ConnectX.Client/ServerLinkHolder.cs

@@ -42,21 +42,6 @@ public ServerLinkHolder(
 
     public event Action? OnServerLinkDisconnected;
 
-    public override async Task StartAsync(CancellationToken cancellationToken)
-    {
-        _logger.LogStartingServerLinkHolder();
-
-        await ConnectAsync(cancellationToken);
-        await TaskHelper.WaitUntilAsync(() => IsConnected, cancellationToken);
-        await base.StartAsync(cancellationToken);
-    }
-
-    public override Task StopAsync(CancellationToken cancellationToken)
-    {
-        _logger.LogStoppingServerLinkHolder();
-        return base.StopAsync(cancellationToken);
-    }
-
     private async Task CheckServerLivenessAsync(CancellationToken cancellationToken)
     {
         var endPoint = new IPEndPoint(_settingProvider.ServerAddress, _settingProvider.ServerPort);
@@ -205,12 +190,6 @@ internal static partial class ServerLinkHolderLoggers
     [LoggerMessage(LogLevel.Information, "[CLIENT] Successfully logged into server, assigned id: {id}")]
     public static partial void LogSuccessfullyLoggedIn(this ILogger logger, Guid id);
 
-    [LoggerMessage(LogLevel.Information, "[CLIENT] Starting server link holder...")]
-    public static partial void LogStartingServerLinkHolder(this ILogger logger);
-
-    [LoggerMessage(LogLevel.Information, "[CLIENT] Stopping server link holder...")]
-    public static partial void LogStoppingServerLinkHolder(this ILogger logger);
-
     [LoggerMessage(LogLevel.Information, "[CLIENT] Connecting to server...")]
     public static partial void LogConnectingToServer(this ILogger logger);
 

ConnectX.ClientConsole/ConsoleService.cs

@@ -1,7 +1,9 @@
 using Microsoft.Extensions.Hosting;
 using System.CommandLine;
 using System.CommandLine.Invocation;
+using ConnectX.Client.Interfaces;
 using ConnectX.ClientConsole.Helpers;
+using ConnectX.Shared.Helpers;
 using ConnectX.Shared.Messages.Group;
 using Microsoft.Extensions.Logging;
 
@@ -50,12 +52,20 @@ public static class Kick
 }
 
 public class ConsoleService(
+    IServerLinkHolder serverLinkHolder,
     Client.Client client,
     ILogger<ConsoleService> logger)
     : BackgroundService
 {
     private GroupInfo? _lastGroupInfo;
 
+    public override async Task StartAsync(CancellationToken cancellationToken)
+    {
+        await serverLinkHolder.ConnectAsync(cancellationToken);
+        await TaskHelper.WaitUntilAsync(() => serverLinkHolder.IsConnected, cancellationToken);
+        await base.StartAsync(cancellationToken);
+    }
+
     private static string[] ParseArguments(string commandLine)
     {
         var paraChars = commandLine.ToCharArray();

ConnectX.Server/InterconnectServerLinkHolder.cs

@@ -125,6 +125,9 @@ private async Task EstablishLinkAsync(CancellationToken stoppingToken)
                 {
                     _logger.LogFailedToConnectToRemoteServer(endPoint);
                     _pendingEstablishInterconnectServerLinks.Enqueue(endPoint);
+
+                    await Task.Delay(5000, stoppingToken);
+
                     continue;
                 }
 

ConnectX.Server/JsonConverters/IPEndPointJsonConverter.cs

@@ -13,18 +13,9 @@ public class IPEndPointJsonConverter : JsonConverter<IPEndPoint>
             return null;
 
         // Try parse IP:Port format
-        var parts = endpointString.Split(':');
-        if (parts.Length < 2)
-            throw new JsonException($"Invalid IPEndPoint format: {endpointString}");
-
-        if (!int.TryParse(parts[^1], out var port))
-            throw new JsonException($"Invalid port number: {parts[^1]}");
-
-        var ipPart = string.Join(":", parts[..^1]);
-        if (!IPAddress.TryParse(ipPart, out var ip))
-            throw new JsonException($"Invalid IP address: {ipPart}");
-
-        return new IPEndPoint(ip, port);
+        if (IPEndPoint.TryParse(endpointString, out var endpoint))
+            return endpoint;
+        else throw new JsonException($"Invalid IPEndPoint format: {endpointString}");
     }
 
     public override void Write(Utf8JsonWriter writer, IPEndPoint value, JsonSerializerOptions options)