Allow players to join mid game and fix away players from being pulled into a race

Bombd/Core/BombdConfig.cs

@@ -66,6 +66,11 @@ static BombdConfig()
     ///     How many times each service performs an update in a second.
     /// </summary>
     public int TickRate { get; set; } = 15;
+
+    /// <summary>
+    ///     The maximum log level to log messages from.
+    /// </summary>
+    public string MaxLogLevel { get; set; } = Enum.GetName(LogLevel.Info);
 
     /// <summary>
     ///     Whether or not connections from LittleBigPlanet Karting are allowed.

Bombd/Core/RoomManager.cs

@@ -110,7 +110,8 @@ public GameRoom CreateRoom(CreateGameRequest request)
         request.Attributes["__JOIN_MODE"] = "OPEN";
         request.Attributes["__MM_MODE_G"] = "OPEN";
         request.Attributes["__MM_MODE_P"] = "OPEN";
-
+        request.Attributes["IS_LOCKED"] = "0";
+
         // Set default server type if none was provided, although this
         // generally shouldn't happen
         request.Attributes.TryAdd("SERVER_TYPE", "kartPark");
@@ -253,10 +254,6 @@ public List<GameBrowserGame> SearchRooms(GameAttributes attributes, Platform id,
                 // before advertising the session.
                 if (!room.Simulation.HasRaceSettings)
                     return false;
-
-                // If the race is already in progress, don't advertise the session
-                if (room.Simulation.RaceState >= RaceState.LoadingIntoRace || !room.Simulation.CanJoinAsRacer())
-                    return false;
             }
 
             foreach (KeyValuePair<string, string> attribute in attributes)
@@ -285,7 +282,8 @@ public void UpdateRoom(GameRoom room, EventSettings settings)
             attr["__MM_MODE_G"] = visibility;
             attr["__MM_MODE_P"] = visibility;
             attr["__JOIN_MODE"] = visibility;
-
+            attr["IS_LOCKED"] = (room.Simulation.RaceState >= RaceState.LoadingIntoRace || !room.Simulation.CanJoinAsRacer()) ? "1" : "0";
+
             attr["__MAX_PLAYERS"] = settings.MaxHumans.ToString();
 
             // TODO: Adjust player counts on Karting?

Bombd/Core/SimServer.cs

@@ -1,3 +1,4 @@
+using System.Numerics;
 using Bombd.Extensions;
 using Bombd.Globals;
 using Bombd.Helpers;
@@ -125,7 +126,7 @@ public bool IsRoomReady()
 
     private void SwitchAllToRacers()
     {
-        foreach (GamePlayer player in _players)
+        foreach (GamePlayer player in _players.Where(x => x.State.Away == 0))
             player.IsSpectator = false;
         foreach (PlayerInfo info in _playerInfos)
             info.Operation = PlayerJoinStatus.RacerPending;
@@ -152,6 +153,22 @@ private void SwitchToSpectator(GamePlayer player)
             UpdateRaceSetup();
     }
 
+    private void SwitchToRacer(GamePlayer player)
+    {
+        if (!player.IsSpectator) return;
+
+        player.IsSpectator = false;
+        if (IsKarting) BroadcastSessionInfo();
+        else
+        {
+            Broadcast(new NetMessageSessionInfo(PlayerSessionOperation.SwitchSpectatorToRacer, player.UserId),
+                NetMessageType.PlayerSessionInfo);
+        }
+
+        if (RaceState == RaceState.GameroomCountdown)
+            UpdateRaceSetup();
+    }
+
     private void BroadcastSessionInfo()
     {
         // In ModNation, the session messages seem to only be switches and joins rather than their actual states,
@@ -255,8 +272,9 @@ public void OnPlayerLeft(GamePlayer player, bool disconnected)
         if (player.UserId == Owner)
         {
             var random = new Random();
-            int index = random.Next(0, _players.Count);
-            var randomPlayer = _players[index];
+            var availablePlayers = _players.Where(x => x.State.Away == 0).ToArray();
+            int index = random.Next(0, availablePlayers.Length);
+            var randomPlayer = availablePlayers[index];
 
             Owner = randomPlayer.UserId;
             if (_raceSettings != null)
@@ -420,13 +438,17 @@ private void SetCurrentGameroomState(RoomState state)
             { 
                 BroadcastPlayerState();
                 SwitchAllToRacers();
+                if (_raceSettings != null)
+                    Room.UpdateAttributes(_raceSettings.Value);
                 break;
             }
             case RoomState.RaceInProgress:
             {
                 StartEvent();
                 BroadcastSessionInfo();
                 BroadcastPlayerState();
+                if (_raceSettings != null)
+                    Room.UpdateAttributes(_raceSettings.Value);
                 break;
             }
             case RoomState.Ready:
@@ -1437,6 +1459,12 @@ public void OnNetworkMessage(GamePlayer player, uint senderNameUid, NetMessageTy
 
                 // Patch our existing player state with the new message
                 player.State.Update(state);
+
+                // Check if player is away, if they are switch them to spectator so they do not join the race
+                if (player.State.Away != 0)
+                    SwitchToSpectator(player);
+                else
+                    SwitchToRacer(player);
 
                 // If we're not in a gameroom, there's no GameroomReady event, so wait until we've received
                 // the player config and the second player state update to finish our "connecting" process.
@@ -1694,7 +1722,7 @@ private void SimUpdate()
         if (_raceSettings != null && room.State < RoomState.RaceInProgress)
         {
             int numReadyPlayers =
-                _players.Count(x => (x.State.Flags & PlayerStateFlags.GameRoomReady) != 0);
+                _players.Count(x => (x.State.Flags & PlayerStateFlags.GameRoomReady) != 0 && x.State.Away == 0);
             bool hasMinPlayers = numReadyPlayers >= _raceSettings.Value.MinHumans;
 
             // Karting, series races, and ranked races don't allow the "owner" to start the race

Bombd/Data/Matchmaking/ModNation.xml

@@ -36,4 +36,6 @@
 <SimpleFilter name="SERVER_TYPE">
     <PossibleValue>kartPark</PossibleValue>
     <PossibleValue>competitive</PossibleValue>
-</SimpleFilter>
+</SimpleFilter>
+
+<NumberPreference name="IS_LOCKED" range="1.0" weight="1.0" default="0.0"></NumberPreference>

Bombd/Logging/Logger.cs

@@ -6,13 +6,8 @@ namespace Bombd.Logging;
 
 public class Logger
 {
-#if DEBUG
-    private const LogLevel MaxLevel = LogLevel.Trace;
-#else
-    private const LogLevel MaxLevel = LogLevel.Info;
-#endif
-
     private static readonly ConcurrentQueue<LogEntry> LogQueue = new();
+    private static LogLevel MaxLevel = LogLevel.Info;
 
     static Logger()
     {
@@ -48,14 +43,14 @@ private static ConsoleColor GetLogColor(LogLevel level)
         };
     }
 
+    public static void SetLogMaxLevel(LogLevel level) => MaxLevel = level;
+
     public static void LogError<T>(string message) => Log<T>(LogLevel.Error, message);
     public static void LogWarning<T>(string message) => Log<T>(LogLevel.Warning, message);
     public static void LogInfo<T>(string message) => Log<T>(LogLevel.Info, message);
 
-    [Conditional("DEBUG")]
     public static void LogDebug<T>(string message) => Log<T>(LogLevel.Debug, message);
 
-    [Conditional("DEBUG")]
     public static void LogTrace<T>(string message) => Log<T>(LogLevel.Trace, message);
 
     public static void Log<T>(LogLevel level, string message)
@@ -67,10 +62,8 @@ public static void Log<T>(LogLevel level, string message)
     public static void LogWarning(Type type, string message) => Log(type, LogLevel.Warning, message);
     public static void LogInfo(Type type, string message) => Log(type, LogLevel.Info, message);
 
-    [Conditional("DEBUG")]
     public static void LogDebug(Type type, string message) => Log(type, LogLevel.Debug, message);
 
-    [Conditional("DEBUG")]
     public static void LogTrace(Type type, string message) => Log(type, LogLevel.Trace, message);
 
     public static void Log(Type type, LogLevel level, string message)

Bombd/Program.cs

@@ -3,6 +3,8 @@
 using Bombd.Services;
 using Directory = Bombd.Services.Directory;
 
+Logger.SetLogMaxLevel(Enum.Parse<LogLevel>(BombdConfig.Instance.MaxLogLevel));
+
 string certificate = BombdConfig.Instance.PfxCertificate;
 if (string.IsNullOrEmpty(certificate))
 {

Bombd/Properties/launchSettings.json

@@ -1,10 +1,17 @@
 {
-  "profiles": {
-    "Bombd": {
-      "commandName": "Project"
-    },
-    "Docker": {
-      "commandName": "Docker"
+    "profiles": {
+        "Bombd": {
+            "commandName": "Project"
+        },
+        "Docker": {
+            "commandName": "Docker"
+        },
+        "WSL": {
+            "commandName": "WSL2",
+            "environmentVariables": {
+                "LD_LIBRARY_PATH": "/usr/local/lib64:/usr/local/lib:/usr/lib",
+                "OPENSSL_CONF": "/etc/ssl/openssl.cnf"
+            }
+        }
     }
-  }
 }

Bombd/Protocols/ConnectionBase.cs

@@ -11,7 +11,7 @@ public abstract class ConnectionBase
     public readonly IServer Server;
 
     public readonly BombdService Service;
-    protected ConnectionState State = ConnectionState.Disconnected;
+    public ConnectionState State = ConnectionState.Disconnected;
 
     protected ConnectionBase(BombdService service, IServer server)
     {

Bombd/Protocols/TCP/SslConnection.cs

@@ -14,7 +14,9 @@ public class SslConnection : ConnectionBase
 {
     private const int MaxMessageSize = 8192;
     private const int KeepAliveFrequency = 3000;
-
+    private const int ReadTimeout = 10_000;
+    private const int WriteTimeout = 10_000;
+
     // u32 MsgLength
     // char Md5Digest[16]
     // char Protocol
@@ -48,12 +50,12 @@ public async void Connect(Socket socket)
         try
         {
             _sslStream = new SslStream(new NetworkStream(_socket, false), false);
-            
+
             // Prevent lingering connections, the game should periodically send keep alive packets
             // in response to our own.
-            _sslStream.ReadTimeout = 10_000;
-            _sslStream.WriteTimeout = 10_000;
-            
+            _sslStream.ReadTimeout = ReadTimeout;
+            _sslStream.WriteTimeout = WriteTimeout;
+
             await _sslStream.AuthenticateAsServerAsync(_server.Certificate, false, SslProtocols.Ssl3, false);
 
             _keepAliveTimer = new Timer(KeepAliveFrequency);
@@ -67,7 +69,7 @@ public async void Connect(Socket socket)
             return;
         }
 
-        DoBlockAndReceive();
+        DoBlockAndReceive(ReadTimeout);
     }
 
     public override void Disconnect()
@@ -151,36 +153,40 @@ public override void Send(ArraySegment<byte> data, PacketType type)
                     offset += size;
                 } while (offset < messageSize);
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 Logger.LogError<SslConnection>("An error occurred during send. Closing connection.");
+                Logger.LogDebug<SslConnection>(e.ToString());
                 Disconnect();
             }
         }
     }
 
-    private async void DoBlockAndReceive()
+    private async void DoBlockAndReceive(int readTimeout)
     {
         while (State != ConnectionState.Disconnected)
         {
             int payloadSize;
             PacketType type;
             try
             {
-                int len = await _sslStream.ReadAsync(_recv.AsMemory(0, MessageHeaderSize));
-
-                // Socket has been shutdown on the other side
-                if (len == 0)
-                {
-                    Disconnect();
-                    return;
-                }
-
-                if (len != MessageHeaderSize)
+                using (var cTokenSrc = CreateCancellationTokenTimeout(readTimeout))
                 {
-                    Logger.LogError<SslConnection>("Received message with invalid header. Closing connection.");
-                    Disconnect();
-                    return;
+                    int len = await _sslStream.ReadAsync(_recv.AsMemory(0, MessageHeaderSize), cTokenSrc.Token);
+
+                    // Socket has been shutdown on the other side
+                    if (len == 0)
+                    {
+                        Disconnect();
+                        return;
+                    }
+
+                    if (len != MessageHeaderSize)
+                    {
+                        Logger.LogError<SslConnection>("Received message with invalid header. Closing connection.");
+                        Disconnect();
+                        return;
+                    }
                 }
 
                 payloadSize = ((_recv[0] << 24) | (_recv[1] << 16) | (_recv[2] << 8) | _recv[3]) -
@@ -198,20 +204,25 @@ private async void DoBlockAndReceive()
                     int offset = 0;
                     do
                     {
-                        len = await _sslStream.ReadAsync(_recv.AsMemory(offset, payloadSize - offset));
-                        if (len == 0)
+                        using (var cTokenSrc = CreateCancellationTokenTimeout(readTimeout))
                         {
-                            Disconnect();
-                            return;
-                        }
+                            int len = await _sslStream.ReadAsync(_recv.AsMemory(offset, payloadSize - offset), cTokenSrc.Token);
 
-                        offset += len;
+                            if (len == 0)
+                            {
+                                Disconnect();
+                                return;
+                            }
+
+                            offset += len;
+                        }
                     } while (offset < payloadSize);
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 Logger.LogError<SslConnection>("An error occurred while reading from socket. Closing connection.");
+                Logger.LogDebug<SslConnection>(e.ToString());
                 Disconnect();
                 return;
             }
@@ -226,4 +237,11 @@ private async void DoBlockAndReceive()
             }   
         }
     }
+
+    private CancellationTokenSource CreateCancellationTokenTimeout(int timeout)
+    {
+        var cTokenSrc = new CancellationTokenSource();
+        cTokenSrc.CancelAfter(timeout);
+        return cTokenSrc;
+    }
 }