Merge branch 'Corona-Studio:main' into main

Author: natsurainko

ConnectX.Client/Proxy/FakeServerMultiCaster.cs

@@ -199,11 +199,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error receiving multicast message");
-            }
-            finally
-            {
-                multicastSocket.Close();
+                _logger.LogFailedToReceiveMulticastMessage(ex);
             }
 
             await Task.Delay(3000, stoppingToken);
@@ -236,4 +232,7 @@ public static partial void LogSendLanServerToPartner(this ILogger logger, string
 
     [LoggerMessage(LogLevel.Information, "Start listening LAN multicast")]
     public static partial void LogStartListeningLanMulticast(this ILogger logger);
+    
+    [LoggerMessage(LogLevel.Error, "Failed to receive multicast message.")]
+    public static partial void LogFailedToReceiveMulticastMessage(this ILogger logger, Exception exception);
 }

ConnectX.Server/Managers/GroupManager.cs

@@ -303,9 +303,9 @@ private void OnCreateGroupReceived(MessageContext<CreateGroup> ctx)
         CreateRoomAsync(userId, ctx).Forget();
     }
 
-    private IPEndPoint? TryAssignRelayServerAddress<T>(Guid userId, MessageContext<T> ctx)
+    private IPEndPoint? TryAssignRelayServerAddress<T>(Guid userId, int roomSeed, MessageContext<T> ctx)
     {
-        var relayServerAddress = _relayServerManager.GetRandomRelayServerAddress();
+        var relayServerAddress = _relayServerManager.GetRandomRelayServerAddress(roomSeed);
 
         if (relayServerAddress == null)
         {
@@ -388,15 +388,19 @@ private async Task CreateRoomAsync(Guid userId, MessageContext<CreateGroup> ctx)
 
         var message = ctx.Message;
         var owner = _userMapping[userId];
-        var assignedRelayServerAddress = ctx.Message.UseRelayServer ? TryAssignRelayServerAddress(userId, ctx) : null;
+        var roomSeed = Random.Shared.Next(0, 114514);
+        var assignedRelayServerAddress = ctx.Message.UseRelayServer
+            ? TryAssignRelayServerAddress(userId, roomSeed, ctx)
+            : null;
         var ownerSession = new UserSessionInfo(owner, assignedRelayServerAddress);
 
         var group = new Group(message.RoomName, message.RoomPassword, ownerSession, [ownerSession])
         {
             IsPrivate = message.IsPrivate,
             MaxUserCount = message.MaxUserCount <= 0 ? 10 : message.MaxUserCount,
             RoomDescription = message.RoomDescription,
-            NetworkId = Convert.ToUInt64(networkDetail.Id, 16)
+            NetworkId = Convert.ToUInt64(networkDetail.Id, 16),
+            RelayServerSeed = roomSeed
         };
 
         if (assignedRelayServerAddress != null &&
@@ -482,7 +486,7 @@ private void OnJoinGroupReceived(MessageContext<JoinGroup> ctx)
 
         var user = _userMapping[userId];
         var assignedRelayServerAddress =
-            ctx.Message.UseRelayServer ? TryAssignRelayServerAddress(userId, ctx) : null;
+            ctx.Message.UseRelayServer ? TryAssignRelayServerAddress(userId, group.RelayServerSeed, ctx) : null;
         var info = new UserSessionInfo(user, assignedRelayServerAddress);
 
         group.Users.Add(info);

ConnectX.Server/Managers/RelayServerManager.cs

@@ -48,11 +48,13 @@ private bool IsSessionAttached(ISession session)
         return true;
     }
 
-    public IPEndPoint? GetRandomRelayServerAddress()
+    public IPEndPoint? GetRandomRelayServerAddress(int roomSeed)
     {
         if (_serverAddressMapping.IsEmpty) return null;
 
-        return Random.Shared.GetItems(_serverAddressMapping.Values.ToArray(), 1)[0];
+        var servers = _serverAddressMapping.Values.ToArray();
+
+        return servers[roomSeed % servers.Length];
     }
 
     public bool TryGetRelayServerSession(IPEndPoint endPoint, [NotNullWhen(true)] out ISession? session)

ConnectX.Server/Models/Group.cs

@@ -10,6 +10,7 @@ public class Group(
     List<UserSessionInfo> users)
 {
     public Guid RoomId { get; } = Guid.CreateVersion7();
+    public required int RelayServerSeed { get; init; }
     public UserSessionInfo RoomOwner { get; } = roomOwner;
     public string RoomShortId { get; } = RandomHelper.GetRandomString();
     public required ulong NetworkId { get; set; }

ConnectX.Server/Services/PeerInfoService.cs

@@ -43,6 +43,16 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                 var status = await zeroTierApiService.GetNetworkPeersAsync(stoppingToken);
                 peers = status?.ToImmutableList();
             }
+            catch (TaskCanceledException e)
+            {
+                if (stoppingToken.IsCancellationRequested)
+                    throw;
+
+                _logger.LogFailedToGetNetworkPeers(e);
+
+                await Task.Delay(1000, stoppingToken);
+                continue;
+            }
             catch (HttpRequestException e)
             {
                 _logger.LogFailedToGetNetworkPeers(e);