✨ added new method for RagonBuffer

.dockerignore

@@ -0,0 +1,25 @@
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/.idea
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 .idea
 .vs
+.vscode
 obj
 bin
 *.user

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="Images/ragon-logo.png" width="200" >
+  <img src="Images/logo.png">
 </p>
 
 ## Ragon Server

Ragon.Client/Ragon.Client.csproj

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

Ragon.Client/Sources/Entity/RagonEntity.cs

@@ -19,20 +19,49 @@ using Ragon.Protocol;
 
 namespace Ragon.Client
 {
-  public sealed class RagonEntity: IDisposable
+  public sealed class RagonEntity : IDisposable
   {
+    private class EventSubscription : IDisposable
+    {
+      private List<Action<RagonPlayer, IRagonEvent>> _callbacks;
+      private List<Action<RagonPlayer, IRagonEvent>> _localCallbacks;
+      private Action<RagonPlayer, IRagonEvent> _callback;
+
+      public EventSubscription(
+        List<Action<RagonPlayer, IRagonEvent>> callbacks,
+        List<Action<RagonPlayer, IRagonEvent>> localCallbacks,
+        Action<RagonPlayer, IRagonEvent> callback)
+      {
+        _callbacks = callbacks;
+        _localCallbacks = localCallbacks;
+        _callback = callback;
+      }
+
+      public void Dispose()
+      {
+        _callbacks?.Remove(_callback);
+        _localCallbacks?.Remove(_callback);
+
+        _callbacks = null!;
+        _localCallbacks = null!;
+        _callback = null!;
+      }
+    }
+
     private delegate void OnEventDelegate(RagonPlayer player, RagonBuffer serializer);
 
     private RagonClient _client;
 
     public ushort Id { get; private set; }
     public ushort Type { get; private set; }
-    public bool Replication { get; private set; }
+    
 
     public RagonAuthority Authority { get; private set; }
     public RagonPlayer Owner { get; private set; }
     public RagonEntityState State { get; private set; }
 
+    public bool IsStatic => SceneId > 0;  
+    public bool IsReplicated { get; private set; }
     public bool IsAttached { get; private set; }
     public bool HasAuthority { get; private set; }
 
@@ -53,33 +82,27 @@ namespace Ragon.Client
     private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _localListeners = new Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>>();
     private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _listeners = new Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>>();
 
-    public RagonEntity(ushort type = 0, ushort sceneId = 0)
+    public RagonEntity(ushort type = 0, ushort sceneId = 0, bool replicated = true)
     {
       State = new RagonEntityState(this);
       Type = type;
+      IsReplicated = replicated;
       
       _spawnPayload = new RagonPayload(0);
       _destroyPayload = new RagonPayload(0);
       _sceneId = sceneId;
     }
 
-    internal void Attach(RagonClient client, ushort entityId, ushort entityType, bool hasAuthority, RagonPlayer owner)
+    internal void Attach()
     {
-      Type = entityType;
-      Id = entityId;
-      Owner = owner;
       IsAttached = true;
-      Replication = true;
-      HasAuthority = hasAuthority;
-
-      _client = client;
      
       Attached?.Invoke(this);
     }
 
-    internal void SetReplication(bool enabled)
+    public void SetReplication(bool enabled)
     {
-      Replication = enabled;
+      IsReplicated = enabled;
     }
 
     internal void Detach(RagonPayload payload)
@@ -103,9 +126,16 @@ namespace Ragon.Client
       return payload;
     }
 
-    public void AttachPayload(RagonPayload payload)
+    public void Prepare(RagonClient client, ushort entityId, ushort entityType, bool hasAuthority, RagonPlayer player, RagonPayload payload)
     {
+      Type = entityType;
+      Id = entityId;
+      HasAuthority = hasAuthority;
+
+      _client = client;
       _spawnPayload = payload;
+      
+      Owner = player;
     }
 
     public T GetAttachPayload<T>() where T : IRagonPayload, new()
@@ -166,6 +196,7 @@ namespace Ragon.Client
             listener.Invoke(_client.Room.Local, evnt);
           return;
         }
+
         if (replicationMode == RagonReplicationMode.LocalAndServer)
         {
           var localListeners = _localListeners[eventCode];
@@ -189,11 +220,10 @@ namespace Ragon.Client
       _client.Reliable.Send(sendData);
     }
 
-    public Action<RagonPlayer, IRagonEvent> OnEvent<TEvent>(Action<RagonPlayer, TEvent> callback) where TEvent : IRagonEvent, new()
+    public IDisposable OnEvent<TEvent>(Action<RagonPlayer, TEvent> callback) where TEvent : IRagonEvent, new()
     {
       var t = new TEvent();
       var eventCode = _client.Event.GetEventCode(t);
-      
       var action = (RagonPlayer player, IRagonEvent eventData) => callback.Invoke(player, (TEvent)eventData);
 
       if (!_listeners.TryGetValue(eventCode, out var callbacks))
@@ -222,19 +252,7 @@ namespace Ragon.Client
         });
       }
 
-      return action;
-    }
-
-    public void OffEvent<TEvent>(Action<RagonPlayer, IRagonEvent> callback) where TEvent : IRagonEvent, new()
-    {
-      var t = new TEvent();
-      var eventCode = _client.Event.GetEventCode(t);
-      
-      if (_listeners.TryGetValue(eventCode, out var callbacks))
-        callbacks.Remove(callback);
-      
-      if (_localListeners.TryGetValue(eventCode, out var localCallbacks))
-        localCallbacks.Remove(callback);
+      return new EventSubscription(callbacks, localCallbacks, action);
     }
 
     internal void Write(RagonBuffer buffer)
@@ -246,7 +264,6 @@ namespace Ragon.Client
       _propertiesChanged = false;
     }
     
-
     internal void Read(RagonBuffer buffer)
     {
       State.ReadState(buffer);
@@ -254,6 +271,8 @@ namespace Ragon.Client
 
     internal void Event(ushort eventCode, RagonPlayer caller, RagonBuffer buffer)
     {
+      if (!IsReplicated) return;
+      
       if (_events.TryGetValue(eventCode, out var evnt))
         evnt?.Invoke(caller, buffer);
       else

Ragon.Client/Sources/Entity/RagonPayload.cs

@@ -21,6 +21,8 @@ namespace Ragon.Client;
 
 public class RagonPayload
 {
+  public static RagonPayload Empty = new RagonPayload(0);
+  
   private readonly uint[] _data = new uint[128];
   private readonly int _size = 0;
 

Ragon.Client/Sources/Entity/RagonProperty.cs

@@ -63,7 +63,7 @@ namespace Ragon.Client
 
     protected void InvokeChanged()
     {
-      if (!InvokeLocal)
+      if (_entity.HasAuthority)
         return;
 
       Changed?.Invoke();
@@ -71,7 +71,8 @@ namespace Ragon.Client
 
     protected void MarkAsChanged()
     {
-      InvokeChanged();
+      if (InvokeLocal)
+        Changed?.Invoke();
       
       if (_dirty || _entity == null)
         return;
@@ -106,15 +107,15 @@ namespace Ragon.Client
       {
         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)

Ragon.Client/Sources/Handler/EntityCreateHandler.cs

@@ -51,17 +51,19 @@ internal class EntityCreateHandler : IHandler
     if (player == null)
     {
       RagonLog.Warn($"Owner {ownerId}|{player.Name} not found in players");
+      
+      _playerCache.Dump();
       return;
     }
     
     var hasAuthority = _playerCache.Local.Id == player.Id;
     var entity = _entityCache.TryGetEntity(attachId, entityType, 0, entityId, hasAuthority, out var hasCreated);
     
-    entity.AttachPayload(payload);
+    entity.Prepare(_client, entityId, entityType, hasAuthority, player, payload);
 
     if (hasCreated)
       _entityListener.OnEntityCreated(entity);
     
-    entity.Attach(_client, entityId, entityType, hasAuthority, player);
+    entity.Attach();
   }
 }

Ragon.Client/Sources/Handler/EntityEventHandler.cs

@@ -42,7 +42,9 @@ internal class EntityEventHandler : IHandler
     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;
     }
 

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,7 +19,7 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal class OwnershipRoomHandler: IHandler
+internal class OwnershipRoomHandler : IHandler
 {
   private readonly RagonListenerList _listenerList;
   private readonly RagonPlayerCache _playerCache;
@@ -39,6 +39,13 @@ internal class OwnershipRoomHandler: IHandler
   {
     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,7 +18,7 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-public class RoomEventHandler: IHandler
+public class RoomEventHandler : IHandler
 {
   private readonly RagonClient _client;
   private readonly RagonPlayerCache _playerCache;
@@ -41,7 +41,9 @@ public class RoomEventHandler: IHandler
     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;
     }
 

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,25 +71,28 @@ 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;
       }
 
       var hasAuthority = _playerCache.Local.Id == player.Id;
       var entity = _entityCache.TryGetEntity(0, entityType, 0, entityId, hasAuthority, out _);
-      
+      var payload = RagonPayload.Empty;
       if (payloadSize > 0)
       {
-        var payload = new RagonPayload(payloadSize);
+        payload = new RagonPayload(payloadSize);
         payload.Read(buffer);
-       
-        entity.AttachPayload(payload);
       }
       
+      entity.Prepare(_client, entityId, entityType, hasAuthority, player, payload);
+      
       _entityListener.OnEntityCreated(entity);
       
       entity.Read(buffer);
-      entity.Attach(_client, entityId, entityType, hasAuthority, player);
+      
+      entities.Add(entity);
     }
 
     var staticEntities = buffer.ReadUShort();
@@ -104,15 +108,19 @@ 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;
       }
 
       var hasAuthority = _playerCache.Local.Id == player.Id;
       var entity = _entityCache.TryGetEntity(0, entityType, staticId, entityId, hasAuthority, out _);
       
+      entity.Prepare(_client, entityId, entityType, hasAuthority, player, RagonPayload.Empty);
       entity.Read(buffer);
-      entity.Attach(_client, entityId, entityType, hasAuthority, player);
+      
+      entities.Add(entity);
     }
 
     if (_client.Status == RagonStatus.LOBBY)
@@ -121,6 +129,9 @@ internal class SnapshotHandler : IHandler
       _listenerList.OnJoined();
     }
 
+    foreach (var entity in entities)
+      entity.Attach();
+
     _listenerList.OnSceneLoaded();
   }
 }

Ragon.Client/Sources/RagonClient.cs

@@ -48,7 +48,6 @@ namespace Ragon.Client
     public NetworkStatistics Statistics => _stats;
     public RagonRoom Room => _room;
     
-
     internal RagonBuffer Buffer => _writeBuffer;
     internal INetworkChannel Reliable => _connection.Reliable;
     internal INetworkChannel Unreliable => _connection.Unreliable;

Ragon.Client/Sources/RagonEntityCache.cs

@@ -116,7 +116,7 @@ public sealed class RagonEntityCache
     foreach (var ent in _entityList)
     {
       if (!ent.IsAttached ||
-          !ent.Replication ||
+          !ent.IsReplicated ||
           !ent.PropertiesChanged) continue;
 
       ent.Write(buffer);
@@ -186,12 +186,10 @@ public sealed class RagonEntityCache
       }
     }
 
-    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);
 
       hasCreated = false;
@@ -199,7 +197,6 @@ public sealed class RagonEntityCache
       return pendingEntity;
     }
 
-
     var entity = new RagonEntity(entityType, sceneId);
 
     _entityMap.Add(entityId, 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

@@ -27,8 +27,21 @@ public sealed class RagonPlayerCache
   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/Ragon.Protocol.csproj

@@ -6,7 +6,6 @@
         <LangVersion>8</LangVersion>
         <RootNamespace>Ragon.Common</RootNamespace>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>1.2.4-rc</Version>
         <Title>Ragon.Protocol</Title>
         <Copyright>Eduard Kargin</Copyright>
         <PackageProjectUrl>https://ragon-server.com</PackageProjectUrl>

Ragon.Protocol/Sources/RagonBuffer.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
+ * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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)
     {
@@ -121,6 +121,21 @@ namespace Ragon.Protocol
       return (RagonOperation)Read(8);
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void WriteFloat(float value)
+    {
+      var bytes = BitConverter.GetBytes(value);
+      WriteBytes(bytes);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public float ReadFloat()
+    {
+      var bytes = ReadBytes(4);
+      var value = BitConverter.ToSingle(bytes, 0);
+      return value;
+    }
+    
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void WriteFloat(float value, float min, float max, float precision)
     {
@@ -147,6 +162,23 @@ namespace Ragon.Protocol
       return adjusted;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void WriteInt(int value)
+    {
+      var bytes = BitConverter.GetBytes(value);
+      
+      WriteBytes(bytes);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int ReadInt()
+    {
+      var bytes = ReadBytes(4);
+      var value = BitConverter.ToInt32(bytes, 0);
+
+      return value;
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void WriteInt(int value, int min, int max)
     {
@@ -236,9 +268,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;
@@ -284,10 +313,10 @@ namespace Ragon.Protocol
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     [Obsolete("Do not use this method, will be removed")]
-    public byte[] ReadBytes(int lenght)
+    public byte[] ReadBytes(int len)
     {
-      var data = new byte[lenght];
-      for (int i = 0; i < lenght; i++)
+      var data = new byte[len];
+      for (int i = 0; i < len; i++)
         data[i] = (byte)Read(8);
 
       return data;
@@ -357,7 +386,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);
     }
@@ -434,7 +463,7 @@ namespace Ragon.Protocol
 
     public void ToArray(byte[] outData)
     {
-      Debug.Assert(outData.Length >= Length);
+      Write(1, 1);
 
       var bucketsCount = (_write >> 5) + 1;
       var length = Length;

Ragon.Protocol/Sources/RagonStream.cs

@@ -0,0 +1,309 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Ragon.Protocol
+{
+  [StructLayout(LayoutKind.Explicit)]
+  internal struct ValueConverter
+  {
+    [FieldOffset(0)] public int Int;
+    [FieldOffset(0)] public float Float;
+    [FieldOffset(0)] public long Long;
+    [FieldOffset(0)] public byte Byte0;
+    [FieldOffset(1)] public byte Byte1;
+    [FieldOffset(2)] public byte Byte2;
+    [FieldOffset(3)] public byte Byte3;
+    [FieldOffset(4)] public byte Byte4;
+    [FieldOffset(5)] public byte Byte5;
+    [FieldOffset(6)] public byte Byte6;
+    [FieldOffset(7)] public byte Byte7;
+  }
+
+  public class RagonStream
+  {
+    private byte[] _data;
+    private int _offset;
+    private int _size;
+
+    public int Lenght => _offset;
+    public int Size => _size - _offset;
+
+    public RagonStream(int capacity = 256)
+    {
+      _data = new byte[capacity];
+      _offset = 0;
+      _size = 0;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void Reset()
+    {
+      _size = _offset;
+      _offset = 0;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void AddOffset(int offset)
+    {
+      _offset += offset;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteByte(byte value)
+    {
+      ResizeIfNeed(1);
+      _data[_offset] = value;
+      _offset += 1;
+      return 1;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public byte ReadByte()
+    {
+      var value = _data[_offset];
+      _offset += 1;
+      return value;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteBool(bool value)
+    {
+      ResizeIfNeed(1);
+      _data[_offset] = value ? (byte)1 : (byte)0;
+      _offset += 1;
+      return 1;
+    }
+
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool ReadBool()
+    {
+      var value = _data[_offset];
+      _offset += 1;
+      return value == 1;
+    }
+
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteInt(int value)
+    {
+      ResizeIfNeed(4);
+      var converter = new ValueConverter() { Int = value };
+      _data[_offset] = converter.Byte0;
+      _data[_offset + 1] = converter.Byte1;
+      _data[_offset + 2] = converter.Byte2;
+      _data[_offset + 3] = converter.Byte3;
+      _offset += 4;
+      return 4;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteInt(int value, int offset)
+    {
+      ResizeIfNeed(4);
+      var converter = new ValueConverter() { Int = value };
+      _data[offset] = converter.Byte0;
+      _data[offset + 1] = converter.Byte1;
+      _data[offset + 2] = converter.Byte2;
+      _data[offset + 3] = converter.Byte3;
+      return 4;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int ReadInt()
+    {
+      var converter = new ValueConverter
+        { Byte0 = _data[_offset], Byte1 = _data[_offset + 1], Byte2 = _data[_offset + 2], Byte3 = _data[_offset + 3] };
+      _offset += 4;
+      return converter.Int;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void WriteLong(long value)
+    {
+      ResizeIfNeed(8);
+      WriteLong(value, _offset);
+      _offset += 8;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteLong(long value, int offset)
+    {
+      var converter = new ValueConverter() { Long = value };
+      _data[offset] = converter.Byte0;
+      _data[offset + 1] = converter.Byte1;
+      _data[offset + 2] = converter.Byte2;
+      _data[offset + 3] = converter.Byte3;
+      _data[offset + 4] = converter.Byte4;
+      _data[offset + 5] = converter.Byte5;
+      _data[offset + 6] = converter.Byte6;
+      _data[offset + 7] = converter.Byte7;
+      return 8;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public long ReadLong()
+    {
+      var converter = new ValueConverter
+      {
+        Byte0 = _data[_offset],
+        Byte1 = _data[_offset + 1],
+        Byte2 = _data[_offset + 2],
+        Byte3 = _data[_offset + 3],
+        Byte4 = _data[_offset + 4],
+        Byte5 = _data[_offset + 5],
+        Byte6 = _data[_offset + 6],
+        Byte7 = _data[_offset + 7],
+      };
+      _offset += 8;
+      return converter.Long;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteFloat(float value)
+    {
+      var converter = new ValueConverter() { Float = value };
+      WriteInt(converter.Int);
+      return 4;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public float ReadFloat()
+    {
+      var rawValue = ReadInt();
+      var converter = new ValueConverter() { Int = rawValue };
+      var value = converter.Float;
+      return value;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteString(string value)
+    {
+      var rawData = Encoding.UTF8.GetBytes(value);
+      var len = rawData.Length;
+      ResizeIfNeed(2 + len);
+      WriteUShort((ushort)len);
+
+      Buffer.BlockCopy(rawData, 0, _data, _offset, len);
+      
+      _offset += len;
+
+      return len + 2;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public string ReadString()
+    {
+      var len = ReadUShort();
+      var rawData = new byte[len];
+
+      Buffer.BlockCopy(_data, _offset, rawData, 0, len);
+
+      var str = Encoding.UTF8.GetString(rawData);
+      _offset += len;
+      return str;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public byte[] ReadBinary(int len)
+    {
+      if (len >= _data.Length)
+        return Array.Empty<byte>();
+
+      var payload = new byte[len];
+      Buffer.BlockCopy(_data, _offset, payload, 0, len);
+
+      _offset += len;
+
+      return payload;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void WriteBinary(byte[] payload)
+    {
+      ResizeIfNeed(payload.Length);
+
+      Array.Copy(payload, 0, _data, _offset, payload.Length);
+
+      _offset += payload.Length;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void WriteOperation(RagonOperation operation)
+    {
+      ResizeIfNeed(1);
+
+      _data[_offset] = (byte)operation;
+      _offset += 1;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RagonOperation ReadOperation()
+    {
+      var op = (RagonOperation)_data[_offset];
+      _offset += 1;
+      return op;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void WriteUShort(ushort value)
+    {
+      ResizeIfNeed(2);
+
+      _data[_offset] = (byte)(value & 0x00FF);
+      _data[_offset + 1] = (byte)((value & 0xFF00) >> 8);
+      _offset += 2;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void WriteUShort(ushort value, int offset)
+    {
+      ResizeIfNeed(2);
+      _data[offset] = (byte)(value & 0x00FF);
+      _data[offset + 1] = (byte)((value & 0xFF00) >> 8);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ushort ReadUShort()
+    {
+      var value = (ushort)(_data[_offset] + (_data[_offset + 1] << 8));
+      _offset += 2;
+      return value;
+    }
+
+    public void Clear()
+    {
+      _offset = 0;
+      _size = 0;
+    }
+
+
+    public void FromArray(byte[] data)
+    {
+      Clear();
+      ResizeIfNeed(data.Length);
+      Buffer.BlockCopy(data, 0, _data, 0, data.Length);
+      _size = data.Length;
+    }
+
+
+    public byte[] ToArray()
+    {
+      var bytes = new byte[_offset];
+      Buffer.BlockCopy(_data, 0, bytes, 0, _offset);
+      return bytes;
+    }
+
+    private void ResizeIfNeed(int lenght)
+    {
+      if (_offset + lenght < _data.Length)
+        return;
+
+      var newData = new byte[_data.Length * 4 + lenght];
+      Buffer.BlockCopy(_data, 0, newData, 0, _data.Length);
+      _data = newData;
+    }
+  }
+}

Ragon.Relay/Ragon.Relay.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <RootNamespace>Ragon.Relay</RootNamespace>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

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.WebSocketServer/Sources/WebSocketServer.cs

@@ -46,6 +46,9 @@ public class WebSocketServer : INetworkServer
   public async void StartAccept(CancellationToken cancellationToken)
   {
     while (!cancellationToken.IsCancellationRequested)
+    {
+      WebSocketConnection connection = null!;
+      try
       {
         var context = await _httpListener.GetContextAsync();
         if (!context.Request.IsWebSocketRequest)
@@ -58,11 +61,18 @@ public class WebSocketServer : INetworkServer
         
         var webSocketContext = await context.AcceptWebSocketAsync(null);
         var webSocket = webSocketContext.WebSocket;
-
         var peerId = _sequencer.Pop();
-      var connection = new WebSocketConnection(webSocket, peerId);
         
-      _connections[peerId] = connection;
+        connection = new WebSocketConnection(webSocket, peerId);  
+      }
+      catch (Exception ex)
+      {
+          _logger.Warn(ex);
+          continue;
+      }
+      
+      _connections[connection.Id] = connection;
+      
       StartListen(connection, cancellationToken);
     }
   }
@@ -75,6 +85,7 @@ public class WebSocketServer : INetworkServer
     var webSocket = connection.Socket;
     var bytes = new byte[2048];
     var buffer = new Memory<byte>(bytes);
+    
     while (
       webSocket.State == WebSocketState.Open ||
       !cancellationToken.IsCancellationRequested)
@@ -84,7 +95,7 @@ public class WebSocketServer : INetworkServer
         var result = await webSocket.ReceiveAsync(buffer, cancellationToken);
         if (result.Count > 0)
         {
-          var payload = buffer.Slice(0, buffer.Length);
+          var payload = buffer.Slice(0, result.Count);
           _networkListener.OnData(connection, NetworkChannel.RELIABLE, payload.ToArray());
         }
       }
@@ -96,6 +107,7 @@ public class WebSocketServer : INetworkServer
 
     _sequencer.Push(connection.Id);
     _activeConnections.Remove(connection);
+    
     _networkListener.OnDisconnected(connection);
   }
 

Ragon.Server/Ragon.Server.csproj

@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <RootNamespace>Ragon.Core</RootNamespace>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>1.2.4-rc</Version>
+        <Version>1.3.1</Version>
         <Title>Ragon.Server</Title>
         <Copyright>Eduard Kargin</Copyright>
         <PackageProjectUrl>https://ragon-server.com</PackageProjectUrl>

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,13 +39,13 @@ public class RagonEvent
   
   public void Read(RagonBuffer buffer)
   {
-    _size = buffer.Capacity - 1;
+    _size = buffer.Capacity;
     buffer.ReadArray(_data, _size);
   }
 
   public void Write(RagonBuffer buffer)
   {
-    if (_size == 0) return;
+    if (_size <= 0) return;
     buffer.WriteArray(_data, _size);
   }
 }

Ragon.Server/Sources/Handler/RoomDataOperation.cs

@@ -32,18 +32,17 @@ public sealed class RoomDataOperation : BaseOperation
     var room = context.Room;
 
     var data = Reader.RawData;
-    
-    Writer.Clear();
-    Writer.WriteOperation(RagonOperation.REPLICATE_RAW_DATA);
-    Writer.WriteUShort(player.Connection.Id);
-    
-    var playerData = Writer.ToArray();
-    var payloadData = data;
-    var size = playerData.Length + payloadData.Length;
+    var dataSize = data.Length - 1;
+    var headerSize = 3;
+    var size = headerSize + dataSize;
     var sendData = new byte[size];
+    var peerId = player.Connection.Id;
 
-    Array.Copy(playerData, 0, sendData, 0, playerData.Length);
-    Array.Copy(payloadData, 1, sendData, playerData.Length, payloadData.Length - 1);
+    sendData[0] = (byte)RagonOperation.REPLICATE_RAW_DATA;
+    sendData[1] = (byte)peerId;
+    sendData[2] = (byte)(peerId >> 8);
+
+    Array.Copy(data, 1, sendData, headerSize, dataSize);
 
     room.Broadcast(sendData, channel);
   }

Ragon.Server/Sources/IRagonServer.cs

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+using Ragon.Protocol;
+using Ragon.Server.Handler;
 using Ragon.Server.IO;
 using Ragon.Server.Lobby;
 
@@ -21,6 +23,7 @@ namespace Ragon.Server;
 
 public interface IRagonServer
 {
+  BaseOperation ResolveHandler(RagonOperation operation);
   RagonLobbyPlayer? GetPlayerByConnection(INetworkConnection connection);
   RagonLobbyPlayer? GetPlayerById(string id);
 }

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/Plugin/Web/RagonWebHookPlugin.cs

@@ -28,10 +28,10 @@ public class RagonWebHookPlugin
 {
   private Dictionary<string, string> _webHooks;
 
-  private RagonServer _server;
+  private IRagonServer _server;
   private HttpClient _httpClient;
 
-  public RagonWebHookPlugin(RagonServer server, RagonServerConfiguration configuration)
+  public RagonWebHookPlugin(IRagonServer server, RagonServerConfiguration configuration)
   {
     _webHooks = new Dictionary<string, string>(configuration.WebHooks);
     _httpClient = new HttpClient();
@@ -46,7 +46,7 @@ public class RagonWebHookPlugin
       var executor = context.Executor;
       executor.Run(async () =>
       {
-        var authorizationOperation = (AuthorizationOperation) _server.ResolveOperation(RagonOperation.AUTHORIZE);
+        var authorizationOperation = (AuthorizationOperation) _server.ResolveHandler(RagonOperation.AUTHORIZE);
         var response = await _httpClient.PostAsync(new Uri(value), httpContent);
         if (response.StatusCode != HttpStatusCode.OK)
         {

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)
@@ -223,7 +228,7 @@ public class RagonServer : IRagonServer, INetworkListener
     _server.Broadcast(sendData, NetworkChannel.UNRELIABLE);
   }
 
-  public BaseOperation ResolveOperation(RagonOperation operation)
+  public BaseOperation ResolveHandler(RagonOperation operation)
   {
     return _handlers[(byte)operation];
   }

Ragon.Server/Sources/RagonServerConfiguration.cs

@@ -25,11 +25,6 @@ public enum ServerType
   WEBSOCKET,
 }
 
-public class WebHook
-{
-  
-}
-
 [Serializable]
 public struct RagonServerConfiguration
 {
@@ -47,7 +42,7 @@ public struct RagonServerConfiguration
   public Dictionary<string, string> WebHooks;
 
   private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
-  private static readonly string ServerVersion = "1.2.9-rc";
+  private static readonly string ServerVersion = "1.3.2";
   private static Dictionary<string, ServerType> _serverTypes = new Dictionary<string, ServerType>()
   {
     {"enet", Server.ServerType.ENET},

Ragon.Simulation/Sources/Client/IO/RagonENetConnection.cs

@@ -127,5 +127,10 @@ namespace Ragon.Client
       if (_libraryLoaded)
         Library.Deinitialize();
     }
+
+    public void Close()
+    {
+      
+    }
   }
 }

Ragon.Simulation/Sources/Client/IO/RagonNullConnection.cs

@@ -128,5 +128,10 @@ namespace Ragon.Client
       if (_libraryLoaded)
         Library.Deinitialize();
     }
+
+    public void Close()
+    {
+      
+    }
   }
 }

Ragon.Simulation/Sources/Game.cs

@@ -1,5 +1,4 @@
-
-
+using Ragon.Client.Property;
 using Ragon.Protocol;
 
 namespace Ragon.Client.Simulation;

global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "7.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": false
+  }
+}