🐛 wrong condition in lobby in memory on finding room by id

Ragon.Client/Ragon.Client.csproj

@@ -12,7 +12,7 @@
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <DebugType>none</DebugType>
-      <OutputPath>/Users/edmand46/RagonProjects/ragon-oss-examples/Assets/Ragon/Runtime/Plugins</OutputPath>
+      <OutputPath>/Users/edmand46/UnityProjects/itd-client/Assets/Ragon/Runtime/Plugins/</OutputPath>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

Ragon.Client/Sources/Entity/RagonEntity.cs

@@ -39,8 +39,8 @@ namespace Ragon.Client
 
       public void Dispose()
       {
-        _callbacks.Remove(_callback);
-        _localCallbacks.Remove(_callback);
+        _callbacks?.Remove(_callback);
+        _localCallbacks?.Remove(_callback);
 
         _callbacks = null!;
         _localCallbacks = null!;

Ragon.Client/Sources/Entity/RagonProperty.cs

@@ -30,7 +30,7 @@ namespace Ragon.Client
     public int Size => _size;
 
     private RagonBuffer _propertyBuffer;
-    private RagonEntity _entity;    
+    private RagonEntity _entity;
     private bool _dirty;
     private int _size;
     private int _ticks;
@@ -46,7 +46,7 @@ namespace Ragon.Client
       _priority = priority;
       _fixed = false;
       _propertyBuffer = new RagonBuffer();
-      
+
       InvokeLocal = invokeLocal;
     }
 
@@ -63,7 +63,7 @@ namespace Ragon.Client
 
     protected void InvokeChanged()
     {
-      if (!InvokeLocal)
+      if (_entity.HasAuthority)
         return;
 
       Changed?.Invoke();
@@ -71,8 +71,9 @@ namespace Ragon.Client
 
     protected void MarkAsChanged()
     {
-      InvokeChanged();
-
+      if (InvokeLocal)
+        Changed?.Invoke();
+      
       if (_dirty || _entity == null)
         return;
 
@@ -101,34 +102,34 @@ namespace Ragon.Client
     internal void Write(RagonBuffer buffer)
     {
       _propertyBuffer.Clear();
-      
+
       if (_fixed)
       {
         Serialize(_propertyBuffer);
-        
-        buffer.FromBuffer(_propertyBuffer, _size);
+
+        buffer.CopyFrom(_propertyBuffer, _size);
         return;
       }
 
       Serialize(_propertyBuffer);
 
-      var propertySize = (ushort) _propertyBuffer.WriteOffset;
-      buffer.WriteUShort(propertySize);;
-      buffer.FromBuffer(_propertyBuffer, propertySize);
+      var propertySize = (ushort)_propertyBuffer.WriteOffset;
+      buffer.WriteUShort(propertySize);
+      buffer.CopyFrom(_propertyBuffer, propertySize);
     }
 
     internal void Read(RagonBuffer buffer)
     {
       _propertyBuffer.Clear();
-      
+
       if (_fixed)
       {
         buffer.ToBuffer(_propertyBuffer, _size);
-        
+
         Deserialize(_propertyBuffer);
         return;
       }
-      
+
       var propSize = buffer.ReadUShort();
       buffer.ToBuffer(_propertyBuffer, propSize);
       Deserialize(_propertyBuffer);

Ragon.Client/Sources/Handler/EntityCreateHandler.cs

@@ -51,6 +51,8 @@ internal class EntityCreateHandler : IHandler
     if (player == null)
     {
       RagonLog.Warn($"Owner {ownerId}|{player.Name} not found in players");
+      
+      _playerCache.Dump();
       return;
     }
     

Ragon.Client/Sources/Handler/EntityEventHandler.cs

@@ -20,35 +20,37 @@ namespace Ragon.Client;
 
 internal class EntityEventHandler : IHandler
 {
-    private readonly RagonPlayerCache _playerCache;
-    private readonly RagonEntityCache _entityCache;
+  private readonly RagonPlayerCache _playerCache;
+  private readonly RagonEntityCache _entityCache;
 
-    public EntityEventHandler(
-        RagonPlayerCache playerCache,
-        RagonEntityCache entityCache
-    )
+  public EntityEventHandler(
+    RagonPlayerCache playerCache,
+    RagonEntityCache entityCache
+  )
+  {
+    _playerCache = playerCache;
+    _entityCache = entityCache;
+  }
+
+  public void Handle(RagonBuffer reader)
+  {
+    var eventCode = reader.ReadUShort();
+    var peerId = reader.ReadUShort();
+    var executionMode = (RagonReplicationMode)reader.ReadByte();
+    var entityId = reader.ReadUShort();
+
+    var player = _playerCache.GetPlayerByPeer(peerId);
+    if (player == null)
     {
-        _playerCache = playerCache;
-        _entityCache = entityCache;
+      RagonLog.Error($"Player with peerId:{peerId} not found as owner of event with code:{eventCode}");
+      
+      _playerCache.Dump();
+      return;
     }
-    
-    public void Handle(RagonBuffer reader)
-    {
-        var eventCode = reader.ReadUShort();
-        var peerId = reader.ReadUShort();
-        var executionMode = (RagonReplicationMode)reader.ReadByte();
-        var entityId = reader.ReadUShort();
 
-        var player = _playerCache.GetPlayerByPeer(peerId);
-        if (player == null)
-        {
-            RagonLog.Warn($"Player not found for event {eventCode}");
-            return;
-        }
+    if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
+      return;
 
-        if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
-            return;
-
-        _entityCache.OnEvent(player, entityId, eventCode, reader);
-    }
+    _entityCache.OnEvent(player, entityId, eventCode, reader);
+  }
 }

Ragon.Client/Sources/Handler/EntityOwnershipHandler.cs

@@ -41,6 +41,14 @@ internal class EntityOwnershipHandler: IHandler
     var entities = reader.ReadUShort();
     
     var player = _playerCache.GetPlayerByPeer(newOwnerId);
+    if (player == null)
+    {
+      RagonLog.Error($"Player with Id:{newOwnerId} not found in cache");
+      
+      _playerCache.Dump();
+      return;
+    }
+    
     for (var i = 0; i < entities; i++)
     {
       var entityId = reader.ReadUShort();

Ragon.Client/Sources/Handler/OwnershipRoomHandler.cs

@@ -19,12 +19,12 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal class OwnershipRoomHandler: IHandler
+internal class OwnershipRoomHandler : IHandler
 {
   private readonly RagonListenerList _listenerList;
   private readonly RagonPlayerCache _playerCache;
   private readonly RagonEntityCache _entityCache;
-  
+
   public OwnershipRoomHandler(
     RagonListenerList listenerList,
     RagonPlayerCache playerCache,
@@ -34,11 +34,18 @@ internal class OwnershipRoomHandler: IHandler
     _playerCache = playerCache;
     _entityCache = entityCache;
   }
-  
+
   public void Handle(RagonBuffer reader)
   {
     var newOwnerId = reader.ReadUShort();
     var player = _playerCache.GetPlayerByPeer(newOwnerId);
+    if (player == null)
+    {
+      RagonLog.Warn($"Player with peerId:{newOwnerId} not found in cache");
+      
+      _playerCache.Dump();
+      return;
+    }
 
     _playerCache.OnOwnershipChanged(newOwnerId);
     _listenerList.OnOwnershipChanged(player);

Ragon.Client/Sources/Handler/PlayerJoinHandler.cs

@@ -45,6 +45,6 @@ internal class PlayerJoinHandler : IHandler
     if (player != null)
       _listenerList.OnPlayerJoined(player);
     else
-      RagonLog.Trace($"[Joined] {playerId}");
+      RagonLog.Warn($"Player with Id:{playerId} not found in cache");
   }
 }

Ragon.Client/Sources/Handler/PlayerLeftHandler.cs

@@ -57,5 +57,9 @@ internal class PlayerLeftHandler : IHandler
       foreach (var id in toDeleteIds)
         _entityCache.OnDestroy(id, emptyPayload);
     }
+    else
+    {
+      RagonLog.Warn($"Player with Id:{playerId} not found in cache");
+    }
   }
 }

Ragon.Client/Sources/Handler/RoomDataHandler.cs

@@ -37,6 +37,15 @@ internal class RoomDataHandler: IHandler
     var rawData = reader.RawData;
     var peerId = (ushort)(rawData[1] + (rawData[2] << 8));
     var player = _playerCache.GetPlayerByPeer(peerId);
+    
+    if (player == null)
+    {
+      RagonLog.Error($"Player with peerId:{peerId} not found");
+      
+      _playerCache.Dump();
+      return;
+    }
+    
     var headerSize = 3;
     var payload = new byte[rawData.Length - headerSize];
     

Ragon.Client/Sources/Handler/RoomEventHandler.cs

@@ -18,11 +18,11 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-public class RoomEventHandler: IHandler
+public class RoomEventHandler : IHandler
 {
   private readonly RagonClient _client;
   private readonly RagonPlayerCache _playerCache;
-  
+
   public RoomEventHandler(
     RagonClient client,
     RagonPlayerCache playerCache
@@ -31,23 +31,25 @@ public class RoomEventHandler: IHandler
     _client = client;
     _playerCache = playerCache;
   }
-  
+
   public void Handle(RagonBuffer buffer)
   {
     var eventCode = buffer.ReadUShort();
     var peerId = buffer.ReadUShort();
     var executionMode = (RagonReplicationMode)buffer.ReadByte();
-    
+
     var player = _playerCache.GetPlayerByPeer(peerId);
     if (player == null)
     {
-      RagonLog.Warn($"Player not found for event {eventCode}");
+      RagonLog.Error($"Player with peerId:{peerId} not found as owner of event with code:{eventCode}");
+      
+      _playerCache.Dump();
       return;
     }
 
     if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
       return;
 
-    _client.Room.Event(eventCode, player, buffer); 
+    _client.Room.Event(eventCode, player, buffer);
   }
 }

Ragon.Client/Sources/Handler/SnapshotHandler.cs

@@ -45,6 +45,7 @@ internal class SnapshotHandler : IHandler
 
   public void Handle(RagonBuffer buffer)
   {
+    var entities = new List<RagonEntity>();
     var playersCount = buffer.ReadUShort();
     RagonLog.Trace("Players: " + playersCount);
     for (var i = 0; i < playersCount; i++)
@@ -70,7 +71,9 @@ internal class SnapshotHandler : IHandler
       var player = _playerCache.GetPlayerByPeer(ownerPeerId);
       if (player == null)
       {
-        RagonLog.Error($"Player not found with peerId: ${ownerPeerId}");
+        RagonLog.Error($"Player not found with peerId: {ownerPeerId}");
+
+        _playerCache.Dump();
         return;
       }
 
@@ -88,7 +91,8 @@ internal class SnapshotHandler : IHandler
       _entityListener.OnEntityCreated(entity);
       
       entity.Read(buffer);
-      entity.Attach();
+      
+      entities.Add(entity);
     }
 
     var staticEntities = buffer.ReadUShort();
@@ -104,7 +108,9 @@ internal class SnapshotHandler : IHandler
       var player = _playerCache.GetPlayerByPeer(ownerPeerId);
       if (player == null)
       {
-        RagonLog.Error($"Player not found with peerId: ${ownerPeerId}");
+        RagonLog.Error($"Player not found with peerId: {ownerPeerId}");
+        
+        _playerCache.Dump();
         return;
       }
 
@@ -112,9 +118,9 @@ internal class SnapshotHandler : IHandler
       var entity = _entityCache.TryGetEntity(0, entityType, staticId, entityId, hasAuthority, out _);
       
       entity.Prepare(_client, entityId, entityType, hasAuthority, player, RagonPayload.Empty);
-      
       entity.Read(buffer);
-      entity.Attach();
+      
+      entities.Add(entity);
     }
 
     if (_client.Status == RagonStatus.LOBBY)
@@ -123,6 +129,9 @@ internal class SnapshotHandler : IHandler
       _listenerList.OnJoined();
     }
 
+    foreach (var entity in entities)
+      entity.Attach();
+
     _listenerList.OnSceneLoaded();
   }
 }

Ragon.Client/Sources/RagonEntityCache.cs

@@ -88,9 +88,9 @@ public sealed class RagonEntityCache
       RagonLog.Warn("Can't destroy object");
       return;
     }
-    
+
     entity.SetReplication(false);
-    
+
     var buffer = _client.Buffer;
 
     buffer.Clear();
@@ -168,7 +168,7 @@ public sealed class RagonEntityCache
     _entityMap.Clear();
     _entityList.Clear();
   }
-  
+
   internal RagonEntity TryGetEntity(ushort attachId, ushort entityType, ushort sceneId, ushort entityId, bool hasAuthority, out bool hasCreated)
   {
     if (sceneId > 0)
@@ -179,36 +179,33 @@ public sealed class RagonEntityCache
 
         if (hasAuthority)
           _entityList.Add(sceneEntity);
-        
+
         hasCreated = false;
-        
+
         return sceneEntity;
       }
     }
 
-    if (_pendingEntities.TryGetValue(attachId, out var pendingEntity))
+    if (_pendingEntities.TryGetValue(attachId, out var pendingEntity) && hasAuthority)
     {
       _pendingEntities.Remove(attachId);
       _entityMap.Add(entityId, pendingEntity);
-
-      if (hasAuthority)
-        _entityList.Add(pendingEntity);
+      _entityList.Add(pendingEntity);
 
       hasCreated = false;
 
       return pendingEntity;
     }
 
-
     var entity = new RagonEntity(entityType, sceneId);
-    
+
     _entityMap.Add(entityId, entity);
-    
+
     if (hasAuthority)
       _entityList.Add(entity);
 
     hasCreated = true;
-    
+
     return entity;
   }
 
@@ -217,7 +214,6 @@ public sealed class RagonEntityCache
   {
     if (_entityMap.TryGetValue(entityId, out var entity))
     {
-      
       _entityMap.Remove(entityId);
       _entityList.Remove(entity);
 

Ragon.Client/Sources/RagonPlayerCache.cs

@@ -26,9 +26,22 @@ public sealed class RagonPlayerCache
   public RagonPlayer Owner { get; private set; }
   public RagonPlayer Local { get; private set; }
   public bool IsRoomOwner => _ownerId == _localId;
-  
-  public RagonPlayer? GetPlayerById(string playerId) => _playersById[playerId];
-  public RagonPlayer? GetPlayerByPeer(ushort peerId) => _playersByConnection[peerId];
+
+  public RagonPlayer? GetPlayerById(string playerId)
+  {
+    if (_playersById.TryGetValue(playerId, out var player))
+      return player;
+
+    return null;
+  }
+
+  public RagonPlayer? GetPlayerByPeer(ushort peerId)
+  {
+    if (_playersByConnection.TryGetValue(peerId, out var player))
+      return player;
+
+    return null;
+  }
 
   private string _ownerId;
   private string _localId;
@@ -91,4 +104,14 @@ public sealed class RagonPlayerCache
     _playersByConnection.Clear();
     _playersById.Clear();
   }
+
+  public void Dump()
+  {
+    RagonLog.Trace("Players: ");
+    RagonLog.Trace("[Connection] [ID] [Name]");
+    foreach (var player in _players)
+    {
+      RagonLog.Trace($"[{player.PeerId}] {player.Id} {player.Name}");
+    }
+  }
 }

Ragon.Client/Sources/RagonSession.cs

@@ -51,9 +51,9 @@ namespace Ragon.Client
       Create(null, new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers});
     }
 
-    public void Create(string roomId, string sceneNa, int minPlayers, int maxPlayers)
+    public void Create(string roomId, string sceneName, int minPlayers, int maxPlayers)
     {
-      Create(roomId, new RagonRoomParameters() {Scene = sceneNa, Min = minPlayers, Max = maxPlayers});
+      Create(roomId, new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers});
     }
     
     public  void Create(string roomId, RagonRoomParameters parameters)

Ragon.Protocol/Sources/RagonBuffer.cs

@@ -75,7 +75,7 @@ namespace Ragon.Protocol
     public int ReadOffset => _read;
     public int WriteOffset => _write;
     public int Length => ((_write - 1) >> 3) + 1;
-    public int Capacity => _write - _read;
+    public int Capacity => _write - _read - 1;
 
     public RagonBuffer(int capacity = 128)
     {
@@ -236,9 +236,6 @@ namespace Ragon.Protocol
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void Write(uint value, int numBits = 16)
     {
-      Debug.Assert(!(numBits < 0));
-      Debug.Assert(!(numBits > 32));
-
       var currentBucketIndex = _write >> 5;
       var used = _write & 0x0000001F;
       var mask = (1UL << used) - 1;
@@ -357,7 +354,7 @@ namespace Ragon.Protocol
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void FromBuffer(RagonBuffer buffer, int size)
+    public void CopyFrom(RagonBuffer buffer, int size)
     {
       WriteArray(buffer._buckets, size);
     }
@@ -406,7 +403,7 @@ namespace Ragon.Protocol
     public byte[] ToArray()
     {
       Write(1, 1);
-      
+
       var data = new byte[Length];
       int bucketsCount = (_write >> 5) + 1;
       int length = data.Length;
@@ -431,11 +428,11 @@ namespace Ragon.Protocol
 
       return data;
     }
-    
+
     public void ToArray(byte[] outData)
     {
-      Debug.Assert(outData.Length >= Length);
-      
+      Write(1, 1);
+
       var bucketsCount = (_write >> 5) + 1;
       var length = Length;
 

Ragon.Relay/Sources/RelayServerPlugin.cs

@@ -1,5 +1,6 @@
 using System;
 using Newtonsoft.Json;
+using Ragon.Server;
 using Ragon.Server.Plugin;
 
 namespace Ragon.Relay;
@@ -21,4 +22,9 @@ public class RelayServerPlugin: BaseServerPlugin
     
     return true;
   }
+
+  public override IRoomPlugin CreateRoomPlugin(RoomInformation information)
+  {
+    return new RelayRoomPlugin();
+  }
 }

Ragon.Server/Sources/Entity/RagonEntityState.cs

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 using Ragon.Protocol;
 
 namespace Ragon.Server.Entity;

Ragon.Server/Sources/Entity/RagonProperty.cs

@@ -54,6 +54,13 @@ public class RagonProperty : RagonPayload
 
   public void Write(RagonBuffer buffer)
   {
+    if (IsFixed)
+    {
+      buffer.WriteArray(_data, Size);
+      return;
+    }
+    
+    buffer.Write((ushort) Size);
     buffer.WriteArray(_data, Size);
   }
 

Ragon.Server/Sources/Event/RagonEvent.cs

@@ -39,7 +39,7 @@ public class RagonEvent
   
   public void Read(RagonBuffer buffer)
   {
-    _size = buffer.Capacity - 1;
+    _size = buffer.Capacity;
     buffer.ReadArray(_data, _size);
   }
 

Ragon.Server/Sources/Lobby/RagonLobbyInMemory.cs

@@ -25,12 +25,20 @@ public class LobbyInMemory : IRagonLobby
   private readonly List<RagonRoom> _rooms = new();
   private readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
-  public bool FindRoomById(string RagonRoomId, [MaybeNullWhen(false)] out RagonRoom room)
+  public bool FindRoomById(string roomId, [MaybeNullWhen(false)] out RagonRoom room)
   {
     foreach (var existRagonRoom in _rooms)
     {
-      if (existRagonRoom.Id == RagonRoomId && existRagonRoom.PlayerMin < existRagonRoom.PlayerMax)
+      if (existRagonRoom.Id == roomId)
       {
+        if (existRagonRoom.PlayerCount >= existRagonRoom.PlayerMax)
+        {
+          _logger.Warn($"Room with id {roomId} fulfilled");
+          
+          room = default;
+          return false;
+        }
+        
         room = existRagonRoom;
         return true;
       }
@@ -44,8 +52,16 @@ public class LobbyInMemory : IRagonLobby
   {
     foreach (var existsRoom in _rooms)
     {
-      if (existsRoom.Scene == sceneName && existsRoom.PlayerCount < existsRoom.PlayerMax)
+      if (existsRoom.Scene == sceneName)
       {
+        if (existsRoom.PlayerCount >= existsRoom.PlayerMax)
+        {
+          _logger.Warn($"Room with scene {sceneName} fulfilled");
+          
+          room = default;
+          return false;          
+        }
+        
         room = existsRoom;
         return true;
       }

Ragon.Server/Sources/Logging/IRagonLogger.cs

@@ -0,0 +1,9 @@
+namespace Ragon.Server.Logging;
+
+public interface IRagonLogger
+{
+  public void Warning(string tag, string message);
+  public void Info(string tag, string message);
+  public void Error(string tag, string message);
+  public void Trace(string tag, string message);
+}

Ragon.Server/Sources/Plugin/BaseServerPlugin.cs

@@ -49,7 +49,7 @@ public class BaseServerPlugin: IServerPlugin
     return true;
   }
 
-  public IRoomPlugin CreateRoomPlugin(RoomInformation information)
+  public virtual IRoomPlugin CreateRoomPlugin(RoomInformation information)
   {
     return new BaseRoomPlugin();
   }

Ragon.Server/Sources/RagonServer.cs

@@ -99,6 +99,11 @@ public class RagonServer : IRagonServer, INetworkListener
     _timer.Start();
     while (true)
     {
+      if (_timer.ElapsedMilliseconds > _tickRate * 2)
+      {
+        _logger.Warn($"Slow perfomance: {_timer.ElapsedMilliseconds}");
+      }
+
       if (_timer.ElapsedMilliseconds > _tickRate)
       {
         _timer.Restart();
@@ -197,7 +202,7 @@ public class RagonServer : IRagonServer, INetworkListener
         _reader.FromArray(data);
         
         var operation = _reader.ReadByte();
-        _handlers[operation].Handle(context, channel);
+        _handlers[operation]?.Handle(context, channel);
       }
     }
     catch (Exception ex)

Ragon.Server/Sources/RagonServerConfiguration.cs

@@ -42,7 +42,7 @@ public struct RagonServerConfiguration
   public Dictionary<string, string> WebHooks;
 
   private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
-  private static readonly string ServerVersion = "1.3.1";
+  private static readonly string ServerVersion = "1.3.2";
   private static Dictionary<string, ServerType> _serverTypes = new Dictionary<string, ServerType>()
   {
     {"enet", Server.ServerType.ENET},