wip

fix: websocket server now can receive large messages
fix: buffer resize on read array

.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

.github/workflows/main.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: Build
         shell: bash
         run: |

.gitignore

@@ -1,6 +1,9 @@
 .DS_Store
 .idea
 .vs
+.vscode
 obj
 bin
-*.user
+*.user
+*.dylib
+*.dll

README.md

@@ -1,12 +1,12 @@
 <p align="center">
-  <img src="Images/ragon-logo.png" width="200" >
+  <img src="Images/logo.png">
 </p>
 
 ## Ragon Server
 
 Ragon is fully free, small and high perfomance room based game server with plugin based architecture.
 
-<a href="https://www.ragon-server.com/docs/installation">Documentation</a>
+  <a href="https://www.ragon-server.com/docs/overview">Documentation</a>
 
 ### Features:
 - Effective
@@ -26,9 +26,6 @@ Ragon is fully free, small and high perfomance room based game server with plugi
 ### Dependencies
 * ENet-Sharp [v2.4.8]
 
-### License
-MIT
-
 ### Tips
 \* Limited to 4095 CCU by library ENet-Sharp (1)
 \* Non finally (2)

Ragon.Client.Property/Ragon.Client.Property.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Ragon.Client\Ragon.Client.csproj" />
-    </ItemGroup>
-
-</Project>

Ragon.Client.Property/Sources/RagonBool.cs

@@ -1,60 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client.Simulation
-{
-  [Serializable]
-  public class RagonBool : RagonProperty
-  {
-    public bool Value
-    {
-      get => _value;
-      set
-      {
-        _value = value;
-        
-        MarkAsChanged();
-      }
-    }
-
-    private bool _value;
-
-    public RagonBool(
-      bool initialValue,
-      bool invokeLocal = true,
-      int priority = 0
-    ) : base(priority, invokeLocal)
-    {
-      _value = initialValue;
-      SetFixedSize(1);
-    }
-
-    public override void Serialize(RagonBuffer buffer)
-    {
-      buffer.WriteBool(_value);
-    }
-
-    public override void Deserialize(RagonBuffer buffer)
-    {
-      _value = buffer.ReadBool();
-
-      InvokeChanged();
-    }
-  }
-}

Ragon.Client.Property/Sources/RagonFloat.cs

@@ -1,104 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client
-{
-  [Serializable]
-  public class RagonFloat : RagonProperty
-  {
-    public float Value
-    {
-      get => _value;
-      set
-      {
-        _value = value;
-
-        if (_value < _min)
-          _value = _min;
-        else if (_value > _max)
-          _value = _max;
-
-        MarkAsChanged();
-      }
-    }
-
-    private float _value;
-    private float _min;
-    private float _max;
-    private int _requiredBits;
-    private float _precision;
-    private uint _mask;
-
-    public RagonFloat(
-      float initialValue,
-      bool invokeLocal = true,
-      int priority = 0
-    ) : base(priority, invokeLocal)
-    {
-      _value = initialValue;
-      _min = -1024.0f;
-      _max = 1024.0f;
-      _precision = 0.01f;
-
-      _requiredBits = DeBruijn.Log2((uint)((_max - _min) * (1.0f / _precision) + 0.5f)) + 1;
-      _mask = (uint)((1L << _requiredBits) - 1);
-
-      SetFixedSize(_requiredBits);
-    }
-
-    public RagonFloat(
-      float initialValue,
-      float min = -1024.0f,
-      float max = 1024.0f,
-      float precision = 0.01f,
-      bool invokeLocal = true,
-      int priority = 0
-    ) : base(priority, invokeLocal)
-    {
-      _value = initialValue;
-      _min = min;
-      _max = max;
-      _precision = precision;
-
-      _requiredBits = DeBruijn.Log2((uint)((_max - _min) * (1.0f / _precision) + 0.5f)) + 1;
-      _mask = (uint)((1L << _requiredBits) - 1);
-
-      SetFixedSize(_requiredBits);
-    }
-
-    public override void Serialize(RagonBuffer buffer)
-    {
-      var compressedValue = (uint)((_value - _min) * (1f / _precision) + 0.5f) & _mask;
-      buffer.Write(compressedValue, _requiredBits);
-    }
-
-    public override void Deserialize(RagonBuffer buffer)
-    {
-      var compressedValue = buffer.Read(_requiredBits);
-      _value = compressedValue * _precision + _min;
-
-      if (_value < _min)
-        _value = _min;
-      else if (_value > _max)
-        _value = _max;
-      
-      InvokeChanged();
-    }
-  }
-}

Ragon.Client.Property/Sources/RagonInt.cs

@@ -1,87 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client.Simulation
-{
-  [Serializable]
-  public class RagonInt : RagonProperty
-  {
-    public int Value
-    {
-      get => _value;
-      set
-      {
-        _value = value;
-        MarkAsChanged();
-      }
-    }
-
-    private int _min;
-    private int _max;
-    private int _requiredBits;
-    private int _value;
-
-    public RagonInt(
-      int initialValue,
-      bool invokeLocal = true,
-      int priority = 0
-    ) : base(priority, invokeLocal)
-    {
-      _value = initialValue;
-      _min = -1000;
-      _max = 1000;
-
-      _max = Math.Max(Math.Abs(_min), Math.Abs(_max));
-      _requiredBits = Bits.Compute(_max);
-
-      SetFixedSize(_requiredBits);
-    }
-
-    public RagonInt(
-      int initialValue,
-      int min = -1000,
-      int max = 1000,
-      bool invokeLocal = true,
-      int priority = 0
-    ) : base(priority, invokeLocal)
-    {
-      _value = initialValue;
-      _min = min;
-      _max = max;
-
-      _requiredBits = Bits.Compute(_max);
-
-      SetFixedSize(_requiredBits);
-    }
-
-    public override void Serialize(RagonBuffer buffer)
-    {
-      uint compressedValue = (uint)((_value << 1) ^ (_value >> 31));
-      buffer.Write(compressedValue, _requiredBits);
-    }
-
-    public override void Deserialize(RagonBuffer buffer)
-    {
-      var compressedValue = buffer.Read(_requiredBits);
-      _value = (int)((compressedValue >> 1) ^ -(int)(compressedValue & 1));
-
-      InvokeChanged();
-    }
-  }
-}

Ragon.Client.Property/Sources/RagonString.cs

@@ -1,68 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using System.Text;
-using Ragon.Protocol;
-
-namespace Ragon.Client.Simulation
-{
-  [Serializable]
-  public class RagonString : RagonProperty
-  {
-    public string Value
-    {
-      get => _value;
-      set
-      {
-        _value = value;
-        
-        MarkAsChanged();
-      }
-    }
-
-    private string _value;
-    private readonly UTF8Encoding _utf8Encoding = new UTF8Encoding(false, true);
-    
-    public RagonString(
-      string initialValue,
-      bool invokeLocal = true,
-      int priority = 0
-    ) : base(priority, invokeLocal)
-    {
-      _value = initialValue;
-    }
-
-    public override void Serialize(RagonBuffer buffer)
-    {
-      var data = _utf8Encoding.GetBytes(_value);
-      var len = (uint) data.Length;
-      
-      buffer.Write(len, 16);
-      buffer.WriteBytes(data);
-    }
-
-    public override void Deserialize(RagonBuffer buffer)
-    {
-      var len = (int) buffer.Read(16);
-      var data = buffer.ReadBytes(len);
-      
-      _value = _utf8Encoding.GetString(data);
-      
-      InvokeChanged();
-    }
-  }
-}

Ragon.Client.Simulation/Program.cs

@@ -1,21 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Client.Simulation;
-
-var simulation = new Simulation();
-simulation.Start();

Ragon.Client.Simulation/Ragon.Client.Simulation.csproj

@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Ragon.Client.Property\Ragon.Client.Property.csproj" />
-      <ProjectReference Include="..\Ragon.Client\Ragon.Client.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="ENet-CSharp" Version="2.4.8" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <None Update="libenet.dylib">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
-
-</Project>

Ragon.Client.Simulation/Sources/Game.cs

@@ -1,110 +0,0 @@
-
-
-namespace Ragon.Client.Simulation;
-
-public class Game : IRagonListener
-{
-    private RagonFloat _health;
-    private RagonInt _points;
-    private RagonString _name;
-    private RagonEntity _entity;
-    private RagonClient _client;
-
-    public Game(RagonClient client)
-    {
-        _client = client;
-    }
-
-    public void OnConnected(RagonClient client)
-    {
-        RagonLog.Trace("Connected");
-        _client.Session.AuthorizeWithKey("defaultkey", "Player Eduard", Array.Empty<byte>());
-    }
-
-    public void OnAuthorizationSuccess(RagonClient client, string playerId, string playerName)
-    {
-        RagonLog.Trace("Authorized");
-        client.Session.CreateOrJoin("Example", 1, 20);
-    }
-
-    public void OnAuthorizationFailed(RagonClient client, string message)
-    {
-        Console.WriteLine($"Authorization failed: {message}");
-    }
-
-    public void OnJoined(RagonClient client)
-    {
-        RagonLog.Trace("Joined");
-
-        _health = new RagonFloat(100.0f, false, 0);
-        _health.Changed += () => Console.WriteLine($"[Ragon Property] Health: {_health.Value}");
-
-        _points = new RagonInt(0, -1000, 1000, false, 0);
-        _points.Changed += () => Console.WriteLine($"[Ragon Property] Points: {_points.Value}");
-
-        _name = new RagonString("Edmand 000", false);
-        _name.Changed += () => Console.WriteLine($"[Ragon Property] Name: {_name.Value}");
-
-        _entity = new RagonEntity(12, 0);
-        _entity.State.AddProperty(_health);
-        _entity.State.AddProperty(_points);
-        _entity.State.AddProperty(_name);
-
-        client.Room.CreateEntity(_entity);
-    }
-
-    public void OnFailed(RagonClient client, string message)
-    {
-        RagonLog.Trace("Failed to join");
-    }
-
-    public void OnLeft(RagonClient client)
-    {
-        RagonLog.Trace("Left");
-    }
-
-    public void OnDisconnected(RagonClient client)
-    {
-        RagonLog.Trace("Disconnected");
-    }
-
-    public void OnPlayerJoined(RagonClient client, RagonPlayer player)
-    {
-        RagonLog.Trace("Player joined");
-    }
-
-    public void OnPlayerLeft(RagonClient client, RagonPlayer player)
-    {
-        RagonLog.Trace("Player left");
-    }
-
-    public void OnOwnershipChanged(RagonClient client, RagonPlayer player)
-    {
-        RagonLog.Trace("Owner ship changed");
-    }
-
-    public void OnLevel(RagonClient client, string sceneName)
-    {
-        RagonLog.Trace($"New level: {sceneName}");
-
-        client.Room.SceneLoaded();
-    }
-
-    private float _timer = 0;
-
-    public void Update()
-    {
-        if (_client.Status != RagonStatus.ROOM)
-            return;
-
-        _timer += 1 / 60.0f;
-        if (_timer > 1)
-        {
-            _health.Value += 20.0f;
-            _points.Value += 10;
-            _name.Value = $"Edmand 00{_client.Room.Local.PeerId}";
-            Console.WriteLine($"{_health.Value} {_points.Value} {_name.Value}");
-            _timer = 0;
-        }
-    }
-}

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

@@ -1,130 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using ENet;
-using Event = ENet.Event;
-using EventType = ENet.EventType;
-
-namespace Ragon.Client
-{
-  public class RagonENetConnection : INetworkConnection
-  {
-    public ushort Id { get; }
-    
-    public NetworkStatistics Statistics { get; private set; }
-    public INetworkChannel Reliable { get; private set; }
-    public INetworkChannel Unreliable { get; private set; }
-    
-    public Action<byte[]> OnData { get; set; }
-    public Action OnConnected { get; set; }
-    public Action<DisconnectReason> OnDisconnected { get; set; }
-    public ulong BytesSent { get; }
-    public ulong BytesReceived { get; }
-    public int Ping { get; }
-
-    private static bool _libraryLoaded = false;
-    private Host _host;
-    private Peer _peer;
-    private Event _netEvent;
-    
-    public RagonENetConnection()
-    {
-      _host = new Host();
-      _host.Create();
-    }
-
-
-    public void Prepare()
-    {
-      if (!_libraryLoaded)
-      {
-        Library.Initialize();
-        _libraryLoaded = true;
-      }
-    }
-
-    public void Disconnect()
-    {
-      if (_peer.IsSet)
-        _peer.DisconnectNow(0);
-    }
-
-    public void Connect(string server, ushort port, uint protocol)
-    {
-      Address address = new Address();
-      address.SetHost(server);
-      address.Port = port;
-
-      _peer = _host.Connect(address, 2, protocol);
-      _peer.Timeout(32, 5000, 5000);
-    }
-
-    public void Update()
-    {
-      bool polled = false;
-      while (!polled)
-      {
-        if (_host.CheckEvents(out _netEvent) <= 0)
-        {
-          if (_host.Service(0, out _netEvent) <= 0)
-            break;
-
-          polled = true;
-        }
-
-        switch (_netEvent.Type)
-        {
-          case EventType.None:
-            break;
-          case EventType.Connect:
-            Statistics = new NetworkStatistics();
-            Reliable = new ENetReliableChannel(_netEvent.Peer, 0);
-            Unreliable = new ENetUnreliableChannel(_netEvent.Peer, 1);
-            
-            OnConnected?.Invoke();
-            break;
-          case EventType.Disconnect:
-            OnDisconnected?.Invoke(DisconnectReason.MANUAL);
-            break;
-          case EventType.Timeout:
-            OnDisconnected?.Invoke(DisconnectReason.TIMEOUT);
-            break;
-          case EventType.Receive:
-            var data = new byte[_netEvent.Packet.Length];
-
-            _netEvent.Packet.CopyTo(data);
-            _netEvent.Packet.Dispose();
-
-            OnData?.Invoke(data);
-            break;
-        }
-      }
-    }
-
-    public void Dispose()
-    {
-      if (_host.IsSet)
-      {
-        _host?.Flush();
-        _host?.Dispose();
-      }
-
-      if (_libraryLoaded)
-        Library.Deinitialize();
-    }
-  }
-}

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

@@ -1,39 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using ENet;
-
-namespace Ragon.Client;
-
-public sealed class ENetUnreliableChannel : INetworkChannel
-{
-  private Peer _peer;
-  private byte _channelId;
-
-  public ENetUnreliableChannel(Peer peer, int channelId)
-  {
-    _peer = peer;
-    _channelId = (byte) channelId;
-  }
-
-  public void Send(byte[] data)
-  {
-    var newPacket = new Packet();
-    newPacket.Create(data, data.Length, PacketFlags.None);
-    
-    _peer.Send(_channelId, ref newPacket);
-  }
-}

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

@@ -1,131 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using ENet;
-using Event = ENet.Event;
-using EventType = ENet.EventType;
-
-namespace Ragon.Client
-{
-  public class RagonNullConnection : INetworkConnection
-  {
-    public ushort Id { get; }
-    
-    public NetworkStatistics Statistics { get; private set; }
-    public INetworkChannel Reliable { get; private set; }
-    public INetworkChannel Unreliable { get; private set; }
-    
-    public Action<byte[]> OnData { get; set; }
-    public Action OnConnected { get; set; }
-    public Action<DisconnectReason> OnDisconnected { get; set; }
-    public ulong BytesSent { get; }
-    public ulong BytesReceived { get; }
-    public int Ping { get; }
-
-    private static bool _libraryLoaded = false;
-    private Host _host;
-    private Peer _peer;
-    private Event _netEvent;
-    
-    public RagonNullConnection()
-    {
-      _host = new Host();
-      _host.Create();
-    }
-
-
-    public void Prepare()
-    {
-      if (!_libraryLoaded)
-      {
-        Library.Initialize();
-        _libraryLoaded = true;
-      }
-    }
-
-    public void Disconnect()
-    {
-      if (_peer.IsSet)
-        _peer.DisconnectNow(0);
-    }
-
-    public void Connect(string server, ushort port, uint protocol)
-    {
-      Address address = new Address();
-      address.SetHost(server);
-      address.Port = port;
-
-      _peer = _host.Connect(address, 2, protocol);
-      _peer.Timeout(32, 5000, 5000);
-      
-      Statistics = new NetworkStatistics();
-      Reliable = new NullReliableChannel(_netEvent.Peer, 0);
-      Unreliable = new NullUnreliableChannel(_netEvent.Peer, 1);
-    }
-
-    public void Update()
-    {
-      bool polled = false;
-      while (!polled)
-      {
-        if (_host.CheckEvents(out _netEvent) <= 0)
-        {
-          if (_host.Service(0, out _netEvent) <= 0)
-            break;
-
-          polled = true;
-        }
-
-        switch (_netEvent.Type)
-        {
-          case EventType.None:
-            break;
-          case EventType.Connect:
-
-            OnConnected?.Invoke();
-            break;
-          case EventType.Disconnect:
-            OnDisconnected?.Invoke(DisconnectReason.MANUAL);
-            break;
-          case EventType.Timeout:
-            OnDisconnected?.Invoke(DisconnectReason.TIMEOUT);
-            break;
-          case EventType.Receive:
-            var data = new byte[_netEvent.Packet.Length];
-
-            _netEvent.Packet.CopyTo(data);
-            _netEvent.Packet.Dispose();
-
-            OnData?.Invoke(data);
-            break;
-        }
-      }
-    }
-
-    public void Dispose()
-    {
-      if (_host.IsSet)
-      {
-        _host?.Flush();
-        _host?.Dispose();
-      }
-
-      if (_libraryLoaded)
-        Library.Deinitialize();
-    }
-  }
-}

Ragon.Client.Simulation/Sources/Simulation.cs

@@ -1,42 +0,0 @@
-namespace Ragon.Client.Simulation;
-
-public class EntityListener : IRagonEntityListener
-{
-  public void OnEntityCreated(RagonEntity entity)
-  {
-    var health = new RagonFloat(100.0f, false, 0);
-    health.Value = 50;
-    health.Changed += () => Console.WriteLine($"[Ragon Property] Another Health: {health.Value}");
-
-    var points = new RagonInt(0, -1000, 1000, false, 0);
-    points.Changed += () => Console.WriteLine($"[Ragon Property] Anther Points: {points.Value}");
-
-    var name = new RagonString("Eduard", false);
-    name.Changed += () => Console.WriteLine($"[Ragon Property] Another Name: {name.Value}");
-
-    entity.State.AddProperty(health);
-    entity.State.AddProperty(points);
-    entity.State.AddProperty(name);
-  }
-}
-
-public class Simulation
-{
-  public void Start()
-  {
-    // INetworkConnection protocol = debug ? new RagonNullConnection() : new RagonENetConnection();
-    // var network = new RagonClient(protocol, new EntityListener(), 30);
-    // var game = new Game(network);
-    // network.AddListener(game);
-    // network.Connect("127.0.0.1", 5001, "1.0.0");
-    //   var dt = 1000 / 60.0f;
-    //   while (true)
-    //   {
-    //     game.Update();
-    //     network.Update(dt);
-    //     Thread.Sleep((int) dt);
-    //   }
-    //   
-    //   network.Disconnect();
-  }
-}

Ragon.Client/Ragon.Client.csproj

@@ -1,22 +1,23 @@
+
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
         <RootNamespace>Ragon.Client.Simulation</RootNamespace>
-        <Authors>Eduard Kargin (Edmand46)</Authors>
+        <Authors>Eduard Kargin</Authors>
+        <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <DebugType>none</DebugType>
-      <OutputPath>/Users/edmand46/RagonProjects/ragon-unity-sdk/Assets/Ragon/Runtime/Plugins</OutputPath>
+      <OutputPath></OutputPath>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <OutputPath>/Users/edmand46/RagonProjects/ragon-unity-sdk/Assets/Ragon/Runtime/Plugins</OutputPath>
+      <OutputPath></OutputPath>
     </PropertyGroup>
 
     <ItemGroup>

Ragon.Client/Sources/Compressor/FloatCompressor.cs

@@ -1,57 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client.Compressor;
-
-public class FloatCompressor
-{
-  public float Min { get; private set; }
-  public float Max { get; private set; }
-  public float Precision { get; private set; }
-  public int RequiredBits { get; private set; }
-  
-  private uint _mask;
-
-  public FloatCompressor(float min = -1024.0f, float max = 1024.0f, float precision = 0.01f)
-  {
-    Min = min;
-    Max = max;
-    Precision = precision;
-    RequiredBits = DeBruijn.Log2((uint)((Max - Min) * (1f / Precision) + 0.5f)) + 1;
-    
-    _mask = (uint)((1L << RequiredBits) - 1);
-  }
-
-  public uint Compress(float value)
-  {
-    return (uint)((value - Min) * 1f / Precision + 0.5f) & _mask;
-  }
-
-  public float Decompress(uint value)
-  {
-    var result = value * Precision + Min;
-
-    if (result < Min)
-      result = Min;
-    else if (result > Max)
-      result = Max;
-
-    return result;
-  }
-}

Ragon.Client/Sources/Compressor/IntCompressor.cs

@@ -1,44 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client.Compressor;
-
-public class IntCompressor
-{
-  public int Min { get; private set; }
-  public int Max { get; private set; }
-  public int RequiredBits { get; private set; }
-
-  public IntCompressor(int min = -1000, int max = 1000)
-  {
-    Min = min;
-    Max = max;
-    RequiredBits = Bits.Compute(Max);
-  }
-
-  public uint Compress(int value)
-  {
-    return (uint)((value << 1) ^ (value >> 31));;
-  }
-
-  public int Decompress(uint value)
-  {
-    return (int)((value >> 1) ^ -(int)(value & 1));
-  }
-}

Ragon.Client/Sources/Entity/RagonEntity.cs

@@ -1,218 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client
-{
-  public sealed class RagonEntity
-  {
-    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 IsAttached { get; private set; }
-    public bool HasAuthority { get; private set; }
-
-    public event Action<RagonEntity> Attached;
-    public event Action Detached;
-    public event Action<RagonPlayer, RagonPlayer> OwnershipChanged;
-
-    internal bool PropertiesChanged => _propertiesChanged;
-    internal ushort SceneId => _sceneId;
-    
-    private ushort _sceneId;
-    private bool _propertiesChanged;
-
-    private RagonPayload _spawnPayload;
-    private RagonPayload _destroyPayload;
-
-    private Dictionary<int, OnEventDelegate> _events = new();
-    private Dictionary<int, Action<RagonPlayer, IRagonEvent>> _localEvents = new();
-
-    public RagonEntity(ushort type = 0, ushort sceneId = 0)
-    {
-      State = new RagonEntityState(this);
-      Type = type;
-      
-      _sceneId = sceneId;
-    }
-
-    internal void Attach(RagonClient client, ushort entityId, ushort entityType, bool hasAuthority, RagonPlayer owner, RagonPayload payload)
-    {
-      Type = entityType;
-      Id = entityId;
-      Owner = owner;
-      IsAttached = true;
-      Replication = true;
-      HasAuthority = hasAuthority;
-      
-      _client = client; 
-      _spawnPayload = payload;
-      
-      Attached?.Invoke(this);
-    }
-
-    internal void Detach(RagonPayload payload)
-    {
-      _destroyPayload = payload;
-      
-      Detached?.Invoke();
-    }
-
-    internal T GetPayload<T>(RagonPayload data) where T : IRagonPayload, new()
-    {
-      var buffer = new RagonBuffer();
-      data.Write(buffer);
-
-      var payload = new T();
-      payload.Deserialize(buffer);
-
-      return payload;
-    }
-
-    public T GetSpawnPayload<T>() where T : IRagonPayload, new()
-    {
-      return GetPayload<T>(_spawnPayload);
-    }
-
-    public T GetDestroyPayload<T>() where T : IRagonPayload, new()
-    {
-      return GetPayload<T>(_destroyPayload);
-    }
-
-    public void ReplicateEvent<TEvent>(TEvent evnt, RagonPlayer target, RagonReplicationMode replicationMode)
-      where TEvent : IRagonEvent, new()
-    {
-      var evntId = _client.Event.GetEventCode(evnt);
-      var buffer = _client.Buffer;
-
-      buffer.Clear();
-      buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
-      buffer.WriteUShort(Id);
-      buffer.WriteUShort(evntId);
-      buffer.WriteByte((byte) replicationMode);
-      buffer.WriteByte((byte) RagonTarget.Player);
-      buffer.WriteUShort((ushort) target.PeerId);
-
-      evnt.Serialize(buffer);
-      
-      var sendData = buffer.ToArray();
-      _client.Reliable.Send(sendData);
-    }
-
-    public void ReplicateEvent<TEvent>(
-      TEvent evnt,
-      RagonTarget target = RagonTarget.All,
-      RagonReplicationMode replicationMode = RagonReplicationMode.Server)
-      where TEvent : IRagonEvent, new()
-    {
-      if (target != RagonTarget.ExceptOwner)
-      {
-        if (replicationMode == RagonReplicationMode.Local)
-        {
-          var eventCode = _client.Event.GetEventCode(evnt);
-          _localEvents[eventCode].Invoke(_client.Room.Local, evnt);
-          return;
-        }
-
-        if (replicationMode == RagonReplicationMode.LocalAndServer)
-        {
-          var eventCode = _client.Event.GetEventCode(evnt);
-          _localEvents[eventCode].Invoke(_client.Room.Local, evnt);
-        }
-      }
-
-      var evntId = _client.Event.GetEventCode(evnt);
-      var buffer = _client.Buffer;
-
-      buffer.Clear();
-      buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
-      buffer.WriteUShort(Id);
-      buffer.WriteUShort(evntId);
-      buffer.WriteByte((byte) replicationMode);
-      buffer.WriteByte((byte) target);
-
-      evnt.Serialize(buffer);
-
-      var sendData = buffer.ToArray();
-      _client.Reliable.Send(sendData);
-    }
-
-    public void OnEvent<TEvent>(Action<RagonPlayer, TEvent> callback) where TEvent : IRagonEvent, new()
-    {
-      var t = new TEvent();
-      var eventCode = _client.Event.GetEventCode(t);
-
-      if (_events.ContainsKey(eventCode))
-      {
-        RagonLog.Warn($"Event already {eventCode} subscribed");
-        return;
-      }
-    
-      _localEvents.Add(eventCode, (player, eventData) => { callback.Invoke(player, (TEvent) eventData); });
-      _events.Add(eventCode, (player, serializer) =>
-      {
-        t.Deserialize(serializer);
-        callback.Invoke(player, t);
-      });
-    }
-
-    internal void Write(RagonBuffer buffer)
-    {
-      buffer.WriteUShort(Id);
-
-      State.WriteState(buffer);
-
-      _propertiesChanged = false;
-    }
-
-
-    internal void Read(RagonBuffer buffer)
-    {
-      State.ReadState(buffer);
-    }
-
-    internal void Event(ushort eventCode, RagonPlayer caller, RagonBuffer buffer)
-    {
-      if (_events.ContainsKey(eventCode))
-        _events[eventCode]?.Invoke(caller, buffer);
-    }
-
-    internal void TrackChangedProperty(RagonProperty property)
-    {
-      _propertiesChanged = true;
-    }
-
-    public void OnOwnershipChanged(RagonPlayer player)
-    {
-      var prevOwner = Owner;
-      
-      Owner = player;
-      HasAuthority = player.PeerId == _client.Room.Local.PeerId;
-      
-      OwnershipChanged?.Invoke(prevOwner, player);
-    }
-  }
-}

Ragon.Client/Sources/Entity/RagonEntityState.cs

@@ -1,77 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-public sealed class RagonEntityState
-{
-  private List<RagonProperty> _properties;
-  private RagonEntity _entity;
-  
-  public RagonEntityState(RagonEntity entity)
-  {
-    _entity = entity;
-    _properties = new List<RagonProperty>(6);
-  }
-  
-  public void AddProperty(RagonProperty property)
-  {
-    _properties.Add(property);
-    
-    property.AssignEntity(_entity);
-  }
-  
-  internal void WriteInfo(RagonBuffer buffer)
-  {
-    buffer.WriteUShort((ushort)_properties.Count);
-    foreach (var property in _properties)
-    {
-      buffer.WriteBool(property.IsFixed);
-      buffer.WriteUShort((ushort)property.Size);
-    }
-  }
-  
-  internal void ReadState(RagonBuffer buffer)
-  {
-    foreach (var property in _properties)
-    {
-      var changed = buffer.ReadBool();
-      if (changed)
-        property.Deserialize(buffer);
-    }
-  }
-
-  internal void WriteState(RagonBuffer buffer)
-  {
-    foreach (var prop in _properties)
-    {
-      if (prop.IsDirty)
-      {
-        buffer.WriteBool(true);
-        prop.Write(buffer);
-        prop.Flush();
-      }
-      else
-      {
-        prop.AddTick();
-        buffer.WriteBool(false);
-      }
-    }
-  }
-}

Ragon.Client/Sources/Entity/RagonPayload.cs

@@ -1,51 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-public struct RagonPayload
-{
-  private uint[] _data = new uint[128];
-  private int _size = 0;
-
-  public RagonPayload(int capacity)
-  {
-    _size = capacity;
-  }
-  public int Size => _size;
-
-  public void Read(RagonBuffer buffer)
-  {
-    var readOnlySpan = _data.AsSpan();
-
-    buffer.ReadSpan(ref readOnlySpan, _size);
-  }
-
-  public void Write(RagonBuffer buffer)
-  {
-    ReadOnlySpan<uint> readOnlySpan = _data.AsSpan();
-
-    buffer.WriteSpan(ref readOnlySpan, _size);
-  }
-
-  public override string ToString()
-  {
-    return $"Payload Size: {_size}";
-  }
-}

Ragon.Client/Sources/Entity/RagonProperty.cs

@@ -1,123 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client
-{
-  [Serializable]
-  public class RagonProperty
-  {
-    public string Name => _name;
-    public RagonEntity Entity => _entity;
-    
-    public event Action Changed;
-    public bool IsDirty => _dirty && _ticks >= _priority;
-    public bool IsFixed => _fixed;
-    public int Size => _size;
-
-    private bool _fixed;
-    private string _name;
-    protected bool _invokeLocal;
-    
-    private RagonEntity _entity;
-    private bool _dirty;
-    private int _size;
-    private int _ticks;
-    private int _priority;
- 
-    protected RagonProperty(int priority, bool invokeLocal)
-    {
-      _size = 0;
-      _priority = priority;
-      _fixed = false;
-      _invokeLocal = invokeLocal;
-    }
-    
-    public void SetName(string name)
-    {
-      _name = name;
-    }
-    
-    protected void SetFixedSize(int size)
-    {
-      _size = size;
-      _fixed = true;
-    }
-
-    protected void InvokeChanged()
-    {
-      if (!_invokeLocal)
-        return;
-      
-      Changed?.Invoke();
-    }
-
-    protected void MarkAsChanged()
-    {
-      InvokeChanged();
-      
-      if (_dirty) return;
-      _dirty = true;
-
-      _entity?.TrackChangedProperty(this);
-    }
-
-    internal void Flush()
-    {
-      _dirty = false;
-      _ticks = 0;
-    }
-
-    internal void AddTick()
-    {
-      _ticks++;
-    }
-    
-    internal void AssignEntity(RagonEntity obj)
-    {
-      _entity = obj;
-      
-      Changed?.Invoke();
-    }
-
-    internal void Write(RagonBuffer buffer)
-    {
-      if (_fixed)
-      {
-        Serialize(buffer);
-        return;
-      }
-
-      var sizeOffset = buffer.WriteOffset;
-      buffer.Write(0, 16);
-      var propOffset = buffer.WriteOffset;
-
-      Serialize(buffer);
-      
-      var propSize = (uint) (buffer.WriteOffset - propOffset);
-      buffer.Write(propSize, 16, sizeOffset);
-    }
-
-    public virtual void Serialize(RagonBuffer buffer)
-    {
-    }
-
-    public virtual void Deserialize(RagonBuffer buffer)
-    {
-    }
-  }
-}

Ragon.Client/Sources/Handler/AuthorizeFailedHandler.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.
@@ -19,7 +19,7 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal class AuthorizeFailedHandler: Handler
+internal class AuthorizeFailedHandler: IHandler
 {
   private readonly RagonListenerList _listenerList;
   public AuthorizeFailedHandler(RagonListenerList list)
@@ -27,9 +27,9 @@ internal class AuthorizeFailedHandler: Handler
     _listenerList = list;
   }
   
-  public void Handle(RagonBuffer buffer)
+  public void Handle(RagonStream reader)
   {
-    var message = buffer.ReadString();
+    var message = reader.ReadString();
     _listenerList.OnAuthorizationFailed(message);
   }
 }

Ragon.Client/Sources/Handler/AuthorizeSuccessHandler.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.
@@ -19,20 +19,26 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal  class AuthorizeSuccessHandler: Handler
+internal class AuthorizeSuccessHandler: IHandler
 {
   private readonly RagonListenerList _listenerList;
+  private readonly RagonClient _client;
   
-  public AuthorizeSuccessHandler(RagonListenerList listenerList)
+  public AuthorizeSuccessHandler(
+    RagonClient client,
+    RagonListenerList listenerList)
   {
+    _client = client;
     _listenerList = listenerList;
   }
   
-  public void Handle(RagonBuffer buffer)
+  public void Handle(RagonStream reader)
   {
-    var playerId = buffer.ReadString();
-    var playerName = buffer.ReadString();
+    var playerId = reader.ReadString();
+    var playerName = reader.ReadString();
+    var playerPayload = reader.ReadString();
 
-    _listenerList.OnAuthorizationSuccess(playerId, playerName);
+    _client.UpdateState(RagonState.LOBBY);
+    _listenerList.OnAuthorizationSuccess(playerId, playerName, playerPayload);
   }
 }

Ragon.Client/Sources/Handler/EntityCreateHandler.cs

@@ -1,58 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal  class EntityCreateHandler : Handler
-{
-  private readonly RagonClient _client;
-  private readonly RagonPlayerCache _playerCache;
-  private readonly RagonEntityCache _entityCache;
-  
-  public EntityCreateHandler(
-    RagonClient client,
-    RagonPlayerCache playerCache,
-    RagonEntityCache entityCache
-  )
-  {
-    _client = client;
-    _entityCache = entityCache;
-    _playerCache = playerCache;
-  }
-
-  public void Handle(RagonBuffer buffer)
-  {
-    var attachId = buffer.ReadUShort();
-    var entityType = buffer.ReadUShort();
-    var entityId = buffer.ReadUShort();
-    var ownerId = buffer.ReadUShort();
-    var player = _playerCache.GetPlayerByPeer(ownerId);
-    var payload = new RagonPayload(buffer.Capacity);
-    payload.Read(buffer);
-
-    if (player == null)
-    {
-      RagonLog.Warn($"Owner {ownerId}|{player.Name} not found in players");
-      return;
-    }
-    
-    var hasAuthority = _playerCache.LocalPlayer.Id == player.Id;
-    var entity = _entityCache.OnCreate(attachId, entityType, 0, entityId, hasAuthority);
-    entity.Attach(_client, entityId, entityType, hasAuthority, player, payload);
-  }
-}

Ragon.Client/Sources/Handler/EntityDestroyHandler.cs

@@ -1,39 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal  class EntityDestroyHandler: Handler
-{
-  private readonly RagonEntityCache _entityCache;
-  
-  public EntityDestroyHandler(RagonEntityCache entityCache)
-  {
-    _entityCache = entityCache;
-  }
-  
-  public void Handle(RagonBuffer buffer)
-  {
-    var entityId = buffer.ReadUShort();
-    var payload = new RagonPayload(buffer.Capacity);
-    payload.Read(buffer);
-    
-    _entityCache.OnDestroy(entityId, payload);
-  }
-}

Ragon.Client/Sources/Handler/EntityEventHandler.cs

@@ -1,57 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class EntityEventHandler : Handler
-{
-    private readonly RagonClient _client;
-    private readonly RagonPlayerCache _playerCache;
-    private readonly RagonEntityCache _entityCache;
-
-    public EntityEventHandler(
-        RagonClient client,
-        RagonPlayerCache playerCache,
-        RagonEntityCache entityCache
-    )
-    {
-        _client = client;
-        _playerCache = playerCache;
-        _entityCache = entityCache;
-    }
-
-    public void Handle(RagonBuffer buffer)
-    {
-        var eventCode = buffer.ReadUShort();
-        var peerId = buffer.ReadUShort();
-        var executionMode = (RagonReplicationMode)buffer.ReadByte();
-        var entityId = buffer.ReadUShort();
-
-        var player = _playerCache.GetPlayerByPeer(peerId);
-        if (player == null)
-        {
-            RagonLog.Warn($"Player not found for event {eventCode}");
-            return;
-        }
-
-        if (player.IsMe && executionMode == RagonReplicationMode.LocalAndServer)
-            return;
-
-        _entityCache.OnEvent(player, entityId, eventCode, buffer);
-    }
-}

Ragon.Client/Sources/Handler/IHandler.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.
@@ -19,7 +19,7 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-public interface Handler
+public interface IHandler
 {
-  public void Handle(RagonBuffer buffer);
+  public void Handle(RagonStream reader);
 }

Ragon.Client/Sources/Handler/JoinFailedHandler.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.
@@ -19,7 +19,7 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal  class JoinFailedHandler: Handler
+internal  class JoinFailedHandler: IHandler
 {
   private readonly RagonListenerList _listenerList;
   
@@ -28,9 +28,9 @@ internal  class JoinFailedHandler: Handler
     _listenerList = listenerList;
   }
   
-  public void Handle(RagonBuffer buffer)
+  public void Handle(RagonStream reader)
   {
-    var message = buffer.ReadString();
+    var message = reader.ReadString();
     _listenerList.OnFailed(message);
   }
 }

Ragon.Client/Sources/Handler/JoinSuccessHandler.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.
@@ -19,9 +19,9 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-public struct RagonRoomInformation
+public struct RoomParameters
 {
-  public RagonRoomInformation(string roomId, string playerId, string ownerId, ushort min, ushort max)
+  public RoomParameters(string roomId, string playerId, string ownerId, ushort min, ushort max)
   {
     RoomId = roomId;
     PlayerId = playerId;
@@ -37,44 +37,52 @@ public struct RagonRoomInformation
   public ushort Max { get; private set; }
 }
 
-internal class JoinSuccessHandler : Handler
+internal class JoinSuccessHandler : IHandler
 {
   private readonly RagonListenerList _listenerList;
   private readonly RagonPlayerCache _playerCache;
-  private readonly RagonEntityCache _entityCache;
   private readonly RagonClient _client;
-  private readonly RagonBuffer _buffer;
+  private readonly RagonRoom _room;
 
   public JoinSuccessHandler(
     RagonClient client,
-    RagonBuffer buffer,
-    RagonListenerList listenerList,
-    RagonPlayerCache playerCache,
-    RagonEntityCache entityCache
+    RagonRoom room
   )
   {
-    _buffer = buffer;
     _client = client;
-    _listenerList = listenerList;
-    _entityCache = entityCache;
-    _playerCache = playerCache;
+    _room = room;
   }
 
-  public void Handle(RagonBuffer buffer)
+  public void Handle(RagonStream reader)
   {
-    var roomId = buffer.ReadString();
-    var localId = buffer.ReadString();
-    var ownerId = buffer.ReadString();
-    var min = buffer.ReadUShort();
-    var max = buffer.ReadUShort();
-    var map = buffer.ReadString();
-
-    var scene = new RagonScene(_client, _playerCache, _entityCache);
-    var roomInfo = new RagonRoomInformation(roomId, localId, ownerId, min, max);
-    var room = new RagonRoom(_client, _entityCache, _playerCache, roomInfo, scene);
-
+    var roomId = reader.ReadString();
+    var min = reader.ReadUShort();
+    var max = reader.ReadUShort();
+    var localId = reader.ReadString();
+    var ownerId = reader.ReadString();
+    var roomInfo = new RoomParameters(roomId, localId, ownerId, min, max);
+    
     _playerCache.SetOwnerAndLocal(ownerId, localId);
-    _client.AssignRoom(room);
-    _listenerList.OnLevel(map);
+    _room.Reset(roomInfo);
+    _room.UserData.Read(reader);
+
+    var playersCount = reader.ReadUShort();
+    RagonLog.Trace("Players: " + playersCount);
+    for (var i = 0; i < playersCount; i++)
+    {
+      var playerPeerId = reader.ReadUShort();
+      var playerId = reader.ReadString();
+      var playerName = reader.ReadString();
+
+      var player = _playerCache.AddPlayer(playerPeerId, playerId, playerName);
+
+      player.UserData.Read(reader);
+
+      RagonLog.Trace($"Player {playerPeerId} - {playerId} - {playerName}");
+    }
+
+    _client.UpdateState(RagonState.ROOM);
+
+    _listenerList.OnJoined();
   }
 }

Ragon.Client/Sources/Handler/LeaveRoomHandler.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.
@@ -19,26 +19,23 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal  class LeaveRoomHandler : Handler
+internal class LeaveRoomHandler : IHandler
 {
   private readonly RagonClient _client;
   private readonly RagonListenerList _listenerList;
-  private readonly RagonEntityCache _entityCache;
   
   public LeaveRoomHandler(
     RagonClient client,
-    RagonListenerList listenerList,
-    RagonEntityCache entityCache)
+    RagonListenerList listenerList)
   {
     _client = client;
     _listenerList = listenerList;
-    _entityCache = entityCache;
   }
 
-  public void Handle(RagonBuffer buffer)
+  public void Handle(RagonStream reader)
   {    
     _listenerList.OnLeft();
-    _entityCache.Cleanup();
-    _client.Room.Cleanup();
+    
+    _client.Room.Clear();
   }
 }

Ragon.Client/Sources/Handler/LoadSceneHandler.cs

@@ -1,44 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class SceneLoadHandler: Handler
-{
-  private readonly RagonClient _client;
-  private readonly RagonListenerList _listenerList;
-  
-  public SceneLoadHandler(
-    RagonClient ragonClient,
-    RagonListenerList listenerList
-    )
-  {
-    _client = ragonClient;
-    _listenerList = listenerList;
-  }
-  
-  public void Handle(RagonBuffer buffer)
-  {
-    var sceneName = buffer.ReadString();
-    var room = _client.Room;
-    
-    room.Cleanup();
-    
-    _listenerList.OnLevel(sceneName);
-  }
-}

Ragon.Client/Sources/Handler/OwnershipRoomHandler.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.
@@ -19,35 +19,32 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal  class OwnershipHandler: Handler
+internal class OwnershipRoomHandler : IHandler
 {
   private readonly RagonListenerList _listenerList;
   private readonly RagonPlayerCache _playerCache;
-  private readonly RagonEntityCache _entityCache;
-  
-  public OwnershipHandler(
+
+  public OwnershipRoomHandler(
     RagonListenerList listenerList,
-    RagonPlayerCache playerCache,
-    RagonEntityCache entityCache)
+    RagonPlayerCache playerCache)
   {
     _listenerList = listenerList;
     _playerCache = playerCache;
-    _entityCache = entityCache;
   }
-  
-  public void Handle(RagonBuffer buffer)
+
+  public void Handle(RagonStream reader)
   {
-    var newOwnerId = buffer.ReadString();
-    var player = _playerCache.GetPlayerById(newOwnerId);
+    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);
-
-    var entities = buffer.ReadUShort();
-    for (var i = 0; i < entities; i++)
-    {
-      var entityId = buffer.ReadUShort();
-      _entityCache.OnOwnershipChanged(player, entityId);
-    }
   }
 }

Ragon.Client/Sources/Handler/PlayerJoinHandler.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.
@@ -19,7 +19,7 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal class PlayerJoinHandler : Handler
+internal class PlayerJoinHandler : IHandler
 {
   private RagonPlayerCache _playerCache;
   private RagonListenerList _listenerList;
@@ -33,11 +33,11 @@ internal class PlayerJoinHandler : Handler
     _listenerList = listenerList;
   }
 
-  public void Handle(RagonBuffer buffer)
+  public void Handle(RagonStream reader)
   {
-    var playerPeerId = buffer.ReadUShort();
-    var playerId = buffer.ReadString();
-    var playerName = buffer.ReadString();
+    var playerPeerId = reader.ReadUShort();
+    var playerId = reader.ReadString();
+    var playerName = reader.ReadString();
 
     _playerCache.AddPlayer(playerPeerId, playerId, playerName);
 
@@ -45,6 +45,6 @@ internal class PlayerJoinHandler : Handler
     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

@@ -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.
@@ -19,42 +19,45 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal class PlayerLeftHandler : Handler
+internal class PlayerLeftHandler : IHandler
 {
   private RagonPlayerCache _playerCache;
-  private RagonEntityCache _entityCache;
   private RagonListenerList _listenerList;
 
   public PlayerLeftHandler(
-    RagonEntityCache entityCache,
     RagonPlayerCache playerCache,
     RagonListenerList listenerList
   )
   {
-    _entityCache = entityCache;
     _playerCache = playerCache;
     _listenerList = listenerList;
   }
 
-  public void Handle(RagonBuffer buffer)
+  public void Handle(RagonStream reader)
   {
-    var playerId = buffer.ReadString();
+    var playerId = reader.ReadString();
     var player = _playerCache.GetPlayerById(playerId);
     if (player != null)
     {
       _playerCache.RemovePlayer(playerId);
       _listenerList.OnPlayerLeft(player);
 
-      var entities = buffer.ReadUShort();
+      var entities = reader.ReadUShort();
       var toDeleteIds = new ushort[entities];
       for (var i = 0; i < entities; i++)
       {
-        var entityId = buffer.ReadUShort();
+        var entityId = reader.ReadUShort();
         toDeleteIds[i] = entityId;
       }
 
-      foreach (var id in toDeleteIds)
-        _entityCache.OnDestroy(id, new RagonPayload());
+    
+      // var emptyPayload = new RagonPayload(0);
+      // foreach (var id in toDeleteIds)
+        // _entityCache.OnDestroy(id, emptyPayload);
+    }
+    else
+    {
+      RagonLog.Warn($"Player with Id:{playerId} not found in cache");
     }
   }
 }

Ragon.Client/Sources/Handler/PlayerUserDataHandler.cs

@@ -0,0 +1,52 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Ragon.Protocol;
+
+namespace Ragon.Client
+{
+
+  internal class PlayerUserDataHandler: IHandler
+  {
+    private RagonPlayerCache _playerCache;
+    private RagonListenerList _listenerList;
+
+    public PlayerUserDataHandler(
+      RagonPlayerCache playerCache,
+      RagonListenerList listenerList
+    )
+    {
+      _playerCache = playerCache;
+      _listenerList = listenerList;
+    }
+    public void Handle(RagonStream reader)
+    {
+      var playerPeerId = reader.ReadUShort();
+      var player = _playerCache.GetPlayerByPeer(playerPeerId);
+
+      if (player != null)
+      {
+        var changes = player.UserData.Read(reader);
+        
+        _listenerList.OnPlayerUserData(player, changes);
+        
+        return;
+      }
+      
+      RagonLog.Warn("Received user data for unknown player.");
+    }
+  }
+}

Ragon.Client/Sources/Handler/RoomEventHandler.cs

@@ -0,0 +1,55 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Ragon.Protocol;
+
+namespace Ragon.Client;
+
+public class RoomEventHandler : IHandler
+{
+  private readonly RagonClient _client;
+  private readonly RagonPlayerCache _playerCache;
+
+  public RoomEventHandler(
+    RagonClient client,
+    RagonPlayerCache playerCache
+  )
+  {
+    _client = client;
+    _playerCache = playerCache;
+  }
+
+  public void Handle(RagonStream buffer)
+  {
+    var eventCode = buffer.ReadUShort();
+    var peerId = buffer.ReadUShort();
+    var executionMode = (RagonReplicationMode) buffer.ReadByte();
+
+    var player = _playerCache.GetPlayerByPeer(peerId);
+    if (player == null)
+    {
+      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.HandleEvent(eventCode, player, buffer);
+  }
+}

Ragon.Client/Sources/Handler/RoomListHandler.cs

@@ -0,0 +1,43 @@
+using Ragon.Protocol;
+
+namespace Ragon.Client;
+
+internal class RoomListHandler: IHandler
+{
+  private RagonListenerList _listenerList;
+  private RagonSession _session;
+  
+  public RoomListHandler(RagonSession session, RagonListenerList list)
+  {
+    _session = session;
+    _listenerList = list;
+  }
+  
+  public void Handle(RagonStream reader)
+  {
+    var roomCount = reader.ReadUShort();
+    var roomList = new RagonRoomInformation[roomCount];
+    for (int i = 0; i < roomCount; i++)
+    {
+      var id = reader.ReadString();
+      var scene = reader.ReadString();
+      var maxPlayers = reader.ReadUShort();
+      var minPlayers = reader.ReadUShort();
+      var players = reader.ReadUShort();
+
+      var roomInfo = new RagonRoomInformation()
+      {
+        Id = id,
+        Scene = scene,
+        PlayerCount = players,
+        PlayerMax = maxPlayers,
+        PlayerMin = minPlayers,
+        Properties = new Dictionary<string, byte[]>() 
+      };
+      
+      roomList[i] = roomInfo;
+    }
+    
+    _listenerList.OnRoomList(roomList);
+  }
+}

Ragon.Client/Sources/Handler/RoomUserDataHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
+ * Copyright 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.
@@ -18,8 +18,21 @@ using Ragon.Protocol;
 
 namespace Ragon.Client
 {
-  public interface IRagonPayload: IRagonSerializable
+  internal class RoomUserDataHandler : IHandler
   {
-    
+    private readonly RagonClient _client;
+    private readonly RagonListenerList _listenerList;
+
+    public RoomUserDataHandler(RagonClient client, RagonListenerList listenerList)
+    {
+      _client = client;
+      _listenerList = listenerList;
+    }
+
+    public void Handle(RagonStream reader)
+    {
+      var changes = _client.Room?.UserData.Read(reader);
+      _listenerList.OnRoomUserData(changes);
+    }
   }
 }

Ragon.Client/Sources/Handler/SnapshotHandler.cs

@@ -1,97 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class SnapshotHandler : Handler
-{
-  private RagonClient _client;
-  private RagonListenerList _listenerList;
-  private RagonEntityCache _entityCache;
-  private RagonPlayerCache _playerCache;
-
-  public SnapshotHandler(
-    RagonClient ragonClient,
-    RagonListenerList listenerList,
-    RagonEntityCache entityCache,
-    RagonPlayerCache playerCache
-  )
-  {
-    _client = ragonClient;
-    _listenerList = listenerList;
-    _entityCache = entityCache;
-    _playerCache = playerCache;
-  }
-
-  public void Handle(RagonBuffer buffer)
-  {
-    var playersCount = buffer.ReadUShort();
-    RagonLog.Trace("Players: " + playersCount);
-    for (var i = 0; i < playersCount; i++)
-    {
-      var playerPeerId = buffer.ReadUShort();
-      var playerId = buffer.ReadString();
-      var playerName = buffer.ReadString();
-
-      _playerCache.AddPlayer(playerPeerId, playerId, playerName);
-    }
-    var dynamicEntities = buffer.ReadUShort();
-    RagonLog.Trace("Dynamic Entities: " + dynamicEntities);
-    for (var i = 0; i < dynamicEntities; i++)
-    {
-      var entityType = buffer.ReadUShort();
-      var entityId = buffer.ReadUShort();
-      var ownerPeerId = buffer.ReadUShort();
-      var payloadSize = buffer.ReadUShort();
-      var player = _playerCache.GetPlayerByPeer(ownerPeerId);
-      
-      var payload = new RagonPayload(payloadSize);
-      payload.Read(buffer);
-
-      var hasAuthority = _playerCache.LocalPlayer.Id == player.Id;
-      var entity = _entityCache.OnCreate(0, entityType, 0, entityId, hasAuthority);
-      
-      entity.Read(buffer);
-      entity.Attach(_client, entityId, entityType, hasAuthority, player, payload);
-    }
-
-    var staticEntities = buffer.ReadUShort();
-    RagonLog.Trace("Scene Entities: " + staticEntities);
-    for (var i = 0; i < staticEntities; i++)
-    {
-      var entityType = buffer.ReadUShort();
-      var entityId = buffer.ReadUShort();
-      var staticId = buffer.ReadUShort();
-      var ownerPeerId = buffer.ReadUShort();
-      var payloadSize = buffer.ReadUShort();
-      var player = _playerCache.GetPlayerByPeer(ownerPeerId);
-      
-      var payload = new RagonPayload(payloadSize);
-      payload.Read(buffer);
-
-      var hasAuthority = _playerCache.LocalPlayer.Id == player.Id;
-      var entity = _entityCache.OnCreate(0, entityType, staticId, entityId, hasAuthority);
-      
-      entity.Read(buffer);
-      entity.Attach(_client, entityId, entityType, hasAuthority, player, payload);
-    }
-    
-    _listenerList.OnJoined();
-  }
-}

Ragon.Client/Sources/Handler/TimestampHandler.cs

@@ -0,0 +1,21 @@
+using Ragon.Protocol;
+
+namespace Ragon.Client;
+
+public class TimestampHandler: IHandler
+{
+  private readonly RagonClient _client;
+  public TimestampHandler(RagonClient client)
+  {
+    _client = client;
+  }
+  
+  public void Handle(RagonStream buffer)
+  {
+    var timestamp0 = (uint)buffer.ReadInt(); 
+    var timestamp1 = (uint)buffer.ReadInt();
+    var value = new DoubleToUInt { Int0 = timestamp0, Int1 = timestamp1 };
+    
+    _client.UpdateTimestamp(value.Double);
+  }
+}

Ragon.Client/Sources/IO/INetworkChannel.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.

Ragon.Client/Sources/IO/INetworkConnection.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.
@@ -15,6 +15,8 @@
  */
 
 
+using Ragon.Protocol;
+
 namespace Ragon.Client;
 
 public interface INetworkConnection: IRagonConnection
@@ -23,7 +25,7 @@ public interface INetworkConnection: IRagonConnection
     public INetworkChannel Unreliable { get; }
     public Action<byte[]> OnData { get; set; }
     public Action OnConnected { get; set; }
-    public Action<DisconnectReason> OnDisconnected { get; set; }
+    public Action<RagonDisconnect> OnDisconnected { get; set; }
     public ulong BytesSent { get; }
     public  ulong BytesReceived { get; }
     public int Ping { get;  }

Ragon.Client/Sources/IO/NetworkStatistics.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.

Ragon.Client/Sources/IRagonConnection.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.
@@ -18,5 +18,5 @@ namespace Ragon.Client;
 
 public interface IRagonConnection
 {
- 
+  public void Close();
 }

Ragon.Client/Sources/IRagonEvent.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.
@@ -20,6 +20,5 @@ namespace Ragon.Client
 {
   public interface IRagonEvent: IRagonSerializable
   {
-    
   }
 }

Ragon.Client/Sources/IUserData.cs

@@ -0,0 +1,27 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Ragon.Protocol;
+
+namespace Ragon.Client;
+
+public interface IUserData
+{
+  public byte[] this[string key] { get; set; }
+  bool Dirty { get; }
+  IReadOnlyList<string> Read(RagonStream buffer);
+  void Write(RagonStream buffer);
+}

Ragon.Client/Sources/Listener/IRagonAuthorizationListener.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.

Ragon.Client/Sources/Listener/IRagonConnectionListener.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.
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
+using Ragon.Protocol;
+
 namespace Ragon.Client;
 
-public interface IRagonConnectedListener
+public interface IRagonConnectionListener
 {
   void OnConnected(RagonClient client);
-  void OnDisconnected(RagonClient client);
+  void OnDisconnected(RagonClient client, RagonDisconnect reason);
 }

Ragon.Client/Sources/Listener/IRagonDataListener.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.
@@ -16,7 +16,7 @@
 
 namespace Ragon.Client;
 
-public interface IRagonSceneCollector
+public interface IRagonDataListener
 {
-  public RagonEntity[] Collect();
+  public void OnData(RagonClient client, RagonPlayer player, byte[] data);
 }

Ragon.Client/Sources/Listener/IRagonFailedListener.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.

Ragon.Client/Sources/Listener/IRagonJoinListener.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.

Ragon.Client/Sources/Listener/IRagonLeftListener.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.

Ragon.Client/Sources/Listener/IRagonLevelListener.cs

@@ -1,22 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Ragon.Client;
-
-public interface IRagonLevelListener
-{
-  void OnLevel(RagonClient client, string sceneName);
-}

Ragon.Client/Sources/Listener/IRagonListener.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.
@@ -18,14 +18,17 @@ namespace Ragon.Client
 {
   public interface IRagonListener : 
     IRagonAuthorizationListener, 
-    IRagonConnectedListener, 
+    IRagonConnectionListener, 
     IRagonFailedListener,
     IRagonJoinListener, 
     IRagonLeftListener, 
-    IRagonLevelListener, 
     IRagonOwnershipChangedListener,
     IRagonPlayerJoinListener, 
-    IRagonPlayerLeftListener
+    IRagonPlayerLeftListener,
+    IRagonRoomListListener,
+    IRagonRoomUserDataListener,
+    IRagonPlayerUserDataListener
   {
+    
   }
 }

Ragon.Client/Sources/Listener/IRagonOwnershipChangedListener.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.

Ragon.Client/Sources/Listener/IRagonPlayerJoinListener.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.

Ragon.Client/Sources/Listener/IRagonPlayerLeftListener.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.

Ragon.Client/Sources/Listener/IRagonPlayerUserDataListener.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.
@@ -16,7 +16,7 @@
 
 namespace Ragon.Client;
 
-public interface IRagonEntityListener
+public interface IRagonPlayerUserDataListener
 {
-  public void OnEntityCreated(RagonEntity entity);
+  void OnPlayerUserDataUpdated(RagonClient client, RagonPlayer player, IReadOnlyList<string> changes);
 }

Ragon.Client/Sources/Listener/IRagonRoomListListener.cs

@@ -0,0 +1,6 @@
+namespace Ragon.Client;
+
+public interface IRagonRoomListListener
+{
+  public void OnRoomListUpdate(RagonClient client, IReadOnlyList<RagonRoomInformation> roomsInfos);
+}

Ragon.Client/Sources/Listener/IRagonRoomUserDataListener.cs

@@ -0,0 +1,6 @@
+namespace Ragon.Client;
+
+public interface IRagonRoomUserDataListener
+{
+  public void OnUserDataUpdated(RagonClient client, IReadOnlyList<string> changes);
+}

Ragon.Client/Sources/Log/IRagonLogger.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.

Ragon.Client/Sources/Log/Loggers/RagonConsoleLogger.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.

Ragon.Client/Sources/Log/RagonLog.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.

Ragon.Client/Sources/Log/RagonLogLevel.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.

Ragon.Client/Sources/RagonClient.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.
@@ -21,169 +21,233 @@ namespace Ragon.Client
   public sealed class RagonClient
   {
     private readonly INetworkConnection _connection;
-    private readonly IRagonEntityListener _entityListener;
-    private readonly IRagonSceneCollector _sceneCollector;
-    private Handler[] _processors;
-    private RagonBuffer _readBuffer;
-    private RagonBuffer _writeBuffer;
+    private readonly NetworkStatistics _stats;
+
+    private IHandler[] _handlers;
+    private RagonStream _readBuffer;
+    private RagonStream _writeBuffer;
     private RagonRoom _room;
     private RagonSession _session;
-    private RagonListenerList _listenerList;
+    private RagonListenerList _listeners;
     private RagonPlayerCache _playerCache;
-    private RagonEntityCache _entityCache;
     private RagonEventCache _eventCache;
-    private RagonStatus _status;
-    private NetworkStatistics _stats;
+    private RagonState _state;
 
-    private float _replicatationRate = 0;
-    private float _replicatationTime = 0;
+    private double _serverTimestamp;
+    private float _replicationRate = 0;
+    private float _replicationTime = 0;
 
+    public double ServerTimestamp => _serverTimestamp;
     public IRagonConnection Connection => _connection;
-    public RagonStatus Status => _status;
+    public RagonState State => _state;
     public RagonSession Session => _session;
     public RagonEventCache Event => _eventCache;
-    public RagonEntityCache Entity => _entityCache;
     public NetworkStatistics Statistics => _stats;
     public RagonRoom Room => _room;
 
-    internal RagonBuffer Buffer => _writeBuffer;
+    internal RagonStream Buffer => _writeBuffer;
     internal INetworkChannel Reliable => _connection.Reliable;
     internal INetworkChannel Unreliable => _connection.Unreliable;
 
     #region PUBLIC
 
-    public RagonClient(
-      INetworkConnection connection, 
-      IRagonEntityListener entityListener,
-      IRagonSceneCollector sceneCollector, 
-      int rate)
+    public RagonClient(INetworkConnection connection, int rate)
     {
-      _listenerList = new RagonListenerList(this);
-      _entityListener = entityListener;
-      _sceneCollector = sceneCollector;
-      
+      _listeners = new RagonListenerList(this);
+
       _connection = connection;
       _connection.OnData += OnData;
       _connection.OnConnected += OnConnected;
       _connection.OnDisconnected += OnDisconnected;
 
-      _replicatationRate = (1000.0f / rate) / 1000.0f;
-      _replicatationTime = 0;
+      _replicationRate = (1000.0f / rate) / 1000.0f;
+      _replicationTime = 0;
 
       _eventCache = new RagonEventCache();
+      _writeBuffer = new RagonStream();
+      _readBuffer = new RagonStream();
+      _playerCache = new RagonPlayerCache();
+      _session = new RagonSession(this, _writeBuffer);
+      _room = new RagonRoom(this, _playerCache);
       _stats = new NetworkStatistics();
-      _status = RagonStatus.DISCONNECTED;
+      _state = RagonState.DISCONNECTED;
+      
+      _handlers = new IHandler[byte.MaxValue];
+      _handlers[(byte)RagonOperation.AUTHORIZED_SUCCESS] = new AuthorizeSuccessHandler(this, _listeners);
+      _handlers[(byte)RagonOperation.AUTHORIZED_FAILED] = new AuthorizeFailedHandler(_listeners);
+      _handlers[(byte)RagonOperation.JOIN_SUCCESS] = new JoinSuccessHandler(this, _room);
+      _handlers[(byte)RagonOperation.JOIN_FAILED] = new JoinFailedHandler(_listeners);
+      _handlers[(byte)RagonOperation.LEAVE_ROOM] = new LeaveRoomHandler(this, _listeners);
+      _handlers[(byte)RagonOperation.OWNERSHIP_ROOM_CHANGED] = new OwnershipRoomHandler(_listeners, _playerCache);
+      _handlers[(byte)RagonOperation.PLAYER_JOINED] = new PlayerJoinHandler(_playerCache, _listeners);
+      _handlers[(byte)RagonOperation.PLAYER_LEAVED] = new PlayerLeftHandler(_playerCache, _listeners);
+      _handlers[(byte)RagonOperation.REPLICATE_ROOM_EVENT] = new RoomEventHandler(this, _playerCache);
+      _handlers[(byte)RagonOperation.TIMESTAMP_SYNCHRONIZATION] = new TimestampHandler(this);
+      _handlers[(byte)RagonOperation.ROOM_LIST_UPDATED] = new RoomListHandler(_session, _listeners);
+      _handlers[(byte)RagonOperation.ROOM_DATA_UPDATED] = new RoomUserDataHandler(this, _listeners);
+      _handlers[(byte)RagonOperation.PLAYER_DATA_UPDATED] = new PlayerUserDataHandler(_playerCache, _listeners);
     }
-
-    public void AddListener(IRagonListener listener)
-    {
-      _listenerList.Add(listener);
-    }
-
-    public void RemoveListener(IRagonListener listener)
-    {
-      _listenerList.Remove(listener);
-    }
-
+    
     public void Connect(string address, ushort port, string protocol)
     {
-      _writeBuffer = new RagonBuffer();
-      _readBuffer = new RagonBuffer();
-      _session = new RagonSession(this, _readBuffer);
-
-      _playerCache = new RagonPlayerCache();
-      _entityCache = new RagonEntityCache(this, _playerCache, _entityListener, _sceneCollector);
-
-      _processors = new Handler[byte.MaxValue];
-      _processors[(byte)RagonOperation.AUTHORIZED_SUCCESS] = new AuthorizeSuccessHandler(_listenerList);
-      _processors[(byte)RagonOperation.AUTHORIZED_FAILED] = new AuthorizeFailedHandler(_listenerList);
-      _processors[(byte)RagonOperation.JOIN_SUCCESS] =
-        new JoinSuccessHandler(this, _readBuffer, _listenerList, _playerCache, _entityCache);
-      _processors[(byte)RagonOperation.JOIN_FAILED] = new JoinFailedHandler(_listenerList);
-      _processors[(byte)RagonOperation.LEAVE_ROOM] = new LeaveRoomHandler(this, _listenerList, _entityCache);
-      _processors[(byte)RagonOperation.OWNERSHIP_CHANGED] =
-        new OwnershipHandler(_listenerList, _playerCache, _entityCache);
-      _processors[(byte)RagonOperation.PLAYER_JOINED] = new PlayerJoinHandler(_playerCache, _listenerList);
-      _processors[(byte)RagonOperation.PLAYER_LEAVED] =
-        new PlayerLeftHandler(_entityCache, _playerCache, _listenerList);
-      _processors[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadHandler(this, _listenerList);
-      _processors[(byte)RagonOperation.CREATE_ENTITY] = new EntityCreateHandler(this, _playerCache, _entityCache);
-      _processors[(byte)RagonOperation.DESTROY_ENTITY] = new EntityDestroyHandler(_entityCache);
-      _processors[(byte)RagonOperation.REPLICATE_ENTITY_STATE] = new StateEntityHandler(_entityCache);
-      _processors[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] =
-        new EntityEventHandler(this, _playerCache, _entityCache);
-      _processors[(byte)RagonOperation.SNAPSHOT] =
-        new SnapshotHandler(this, _listenerList, _entityCache, _playerCache);
-
       var protocolRaw = RagonVersion.Parse(protocol);
       _connection.Connect(address, port, protocolRaw);
     }
 
     public void Disconnect()
     {
-      _status = RagonStatus.DISCONNECTED;
-      _room.Cleanup();
+      _state = RagonState.DISCONNECTED;
+      _room.Clear();
+      
       _connection.Disconnect();
-      OnDisconnected(DisconnectReason.MANUAL);
+
+      OnDisconnected(RagonDisconnect.MANUAL);
     }
 
     public void Update(float dt)
     {
-      _replicatationTime += dt;
-      if (_replicatationTime >= _replicatationRate)
+      if (_state != RagonState.DISCONNECTED)
       {
-        _entityCache.WriteState(_readBuffer);
-        _replicatationTime = 0;
+        _replicationTime += dt;
+        if (_replicationTime >= _replicationRate)
+        {
+          _replicationTime = 0;
+        
+          SendTimestamp();
+          SendRoomUserData();
+          SendPlayerUserData();
+        }
+
+        _stats.Update(_connection.BytesSent, _connection.BytesReceived, _connection.Ping, dt);
       }
 
-      _stats.Update(_connection.BytesSent, _connection.BytesReceived, _connection.Ping, dt);
+      _listeners.Update();
       _connection.Update();
     }
 
     public void Dispose()
     {
-      _status = RagonStatus.DISCONNECTED;
-      _connection.Disconnect();
+      if (_state != RagonState.DISCONNECTED)
+      {
+        _state = RagonState.DISCONNECTED;
+        _connection.Disconnect();
+      }
+
       _connection.Dispose();
     }
 
+    public void AddListener(IRagonListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonAuthorizationListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonConnectionListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonFailedListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonJoinListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonLeftListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonOwnershipChangedListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonPlayerJoinListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonPlayerLeftListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonRoomListListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonPlayerUserDataListener listener) => _listeners.Add(listener);
+    public void AddListener(IRagonRoomUserDataListener listener) => _listeners.Add(listener);
+    public void RemoveListener(IRagonListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonAuthorizationListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonConnectionListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonFailedListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonJoinListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonLeftListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonOwnershipChangedListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonPlayerJoinListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonPlayerLeftListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonRoomListListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonRoomUserDataListener listener) => _listeners.Remove(listener);
+    public void RemoveListener(IRagonPlayerUserDataListener listener) => _listeners.Remove(listener);
+
     #endregion
 
     #region INTERNAL
-
-    internal void AssignRoom(RagonRoom room)
+    
+    internal void UpdateState(RagonState state)
     {
-      _room = room;
-      _status = RagonStatus.ROOM;
+      _state = state;
+    }
+
+    internal void UpdateTimestamp(double time)
+    {
+      _serverTimestamp = time;
     }
 
     #endregion
 
     #region PRIVATE
 
+    private void SendTimestamp()
+    {
+      var timestamp = RagonTime.CurrentTimestamp();
+      var value = new DoubleToUInt()
+      {
+        Double = timestamp,
+      };
+
+      _writeBuffer.Clear();
+      _writeBuffer.WriteOperation(RagonOperation.TIMESTAMP_SYNCHRONIZATION);
+      _writeBuffer.WriteInt((int)value.Int0);
+      _writeBuffer.WriteInt((int)value.Int1);
+    }
+
+    private void SendRoomUserData()
+    {
+      if (_room == null) return;
+
+      var props = _room.UserData;
+      if (!props.Dirty) return;
+
+      _writeBuffer.Clear();
+      _writeBuffer.WriteOperation(RagonOperation.ROOM_DATA_UPDATED);
+
+      props.Write(_writeBuffer);
+
+      var sendData = _writeBuffer.ToArray();
+      _connection.Reliable.Send(sendData);
+    }
+
+    private void SendPlayerUserData()
+    {
+      if (_playerCache.Local == null) return;
+
+      var props = _playerCache.Local.UserData;
+      if (!props.Dirty) return;
+
+      _writeBuffer.Clear();
+      _writeBuffer.WriteOperation(RagonOperation.PLAYER_DATA_UPDATED);
+
+      props.Write(_writeBuffer);
+
+      var sendData = _writeBuffer.ToArray();
+      _connection.Reliable.Send(sendData);
+    }
+
     private void OnConnected()
     {
       RagonLog.Trace("Connected");
 
-      _listenerList.OnConnected();
-      _status = RagonStatus.CONNECTED;
+      _listeners.OnConnected();
+      _state = RagonState.CONNECTED;
     }
 
-    private void OnDisconnected(DisconnectReason reason)
+    private void OnDisconnected(RagonDisconnect reason)
     {
       RagonLog.Trace($"Disconnected: {reason}");
 
-      _listenerList.OnDisconnected();
-      _status = RagonStatus.DISCONNECTED;
+      _listeners.OnDisconnected(reason);
+      _state = RagonState.DISCONNECTED;
     }
 
-    public void OnData(byte[] data)
+    private void OnData(byte[] data)
     {
       _readBuffer.Clear();
       _readBuffer.FromArray(data);
 
       var operation = _readBuffer.ReadByte();
-      _processors[operation].Handle(_readBuffer);
+      _handlers[operation].Handle(_readBuffer);
     }
 
     #endregion

Ragon.Client/Sources/RagonEntityCache.cs

@@ -1,232 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-public sealed class RagonEntityCache
-{
-  private readonly List<RagonEntity> _entityList = new();
-  private readonly Dictionary<uint, RagonEntity> _entityMap = new();
-  private readonly Dictionary<uint, RagonEntity> _pendingEntities = new();
-  private readonly Dictionary<uint, RagonEntity> _sceneEntities = new();
-  
-  private readonly RagonClient _client;
-  private readonly IRagonEntityListener _entityListener;
-  private readonly IRagonSceneCollector _sceneCollector;
-  private readonly RagonPlayerCache _playerCache;
-
-  private int _localEntitiesCounter = 0;
-  
-  public RagonEntityCache(
-    RagonClient client, 
-    RagonPlayerCache playerCache, 
-    IRagonEntityListener listener,
-    IRagonSceneCollector sceneCollector
-    )
-  {
-    _client = client;
-    _entityListener = listener;
-    _sceneCollector = sceneCollector;
-    _playerCache = playerCache;
-  }
-
-  public RagonEntity FindById(ushort id)
-  {
-    return _entityMap[id];
-  }
-  
-  public void Create(RagonEntity entity, IRagonPayload? spawnPayload)
-  {
-    var attachId = (ushort) (_playerCache.LocalPlayer.PeerId + _localEntitiesCounter++) ;
-    var buffer = _client.Buffer;
-    
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.CREATE_ENTITY);
-    buffer.WriteUShort(attachId);
-    buffer.WriteUShort(entity.Type);
-    buffer.WriteByte((byte) entity.Authority);
-
-    entity.State.WriteInfo(buffer);
-    
-    spawnPayload?.Serialize(buffer);
-    
-    _pendingEntities.Add(attachId, entity);
-    
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-
-  public void Destroy(RagonEntity entity, IRagonPayload? destroyPayload)
-  {
-    if (!entity.IsAttached)
-    {
-      RagonLog.Warn("Can't destroy object, he is not created");
-      return;
-    }
-    var buffer = _client.Buffer;
-    
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.DESTROY_ENTITY);
-    buffer.WriteUShort(entity.Id);
-
-    destroyPayload?.Serialize(buffer);
-
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-
-  internal void WriteState(RagonBuffer buffer)
-  {
-    var changedEntities = 0u;
-    
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_STATE);
-
-    var offset = buffer.WriteOffset;
-    buffer.Write(0, 16);
-
-    foreach (var ent in _entityList)
-    {
-      if (!ent.IsAttached ||
-          !ent.Replication ||
-          !ent.PropertiesChanged) continue;
-      
-      ent.Write(buffer);
-      
-      changedEntities++;
-    }
-
-    if (changedEntities <= 0) return;
-    
-    buffer.Write(changedEntities, 16, offset);
-
-    var data = buffer.ToArray();
-    _client.Unreliable.Send(data);
-  }
-  
-  internal void WriteScene(RagonBuffer buffer)
-  {
-    _sceneEntities.Clear();
-    
-    var entities = _sceneCollector.Collect();
-    buffer.WriteUShort((ushort) entities.Length);
-    foreach (var entity in entities)
-    {
-      buffer.WriteUShort(entity.Type);
-      buffer.WriteByte((byte) entity.Authority);
-      buffer.WriteUShort(entity.SceneId);
-      
-      entity.State.WriteInfo(buffer);
-      
-      _sceneEntities.Add(entity.SceneId, entity);
-    }
-  }
-
-  internal void CacheScene()
-  {
-    _sceneEntities.Clear();
-    
-    var entities = _sceneCollector.Collect();
-    foreach (var entity in entities)
-      _sceneEntities.Add(entity.SceneId, entity);
-  }
-  
-  internal void Cleanup()
-  {
-    var payload = new RagonPayload();
-    foreach (var ent in _entityList)
-      ent.Detach(payload);
-
-    _entityMap.Clear();
-    _entityList.Clear();
-  }
-  
-  internal RagonEntity OnCreate(ushort attachId, ushort entityType, ushort sceneId, ushort entityId, bool hasAuthority)
-  {
-    if (sceneId > 0)
-    {
-      if (_sceneEntities.TryGetValue(sceneId, out var entity))
-      {
-        _entityMap.Add(entityId, entity);
-        
-        if (hasAuthority)
-          _entityList.Add(entity);
-        
-        return entity;
-      }
-    }
-    
-    if (_pendingEntities.Remove(attachId, out var existsEntity))
-    {
-      _entityMap.Add(entityId, existsEntity);
-      
-      if (hasAuthority)
-        _entityList.Add(existsEntity);
-      
-      return existsEntity;
-    }
-    else
-    {
-      var entity = new RagonEntity(entityType, sceneId);
-      
-      _entityMap.Add(entityId, entity);
-      
-      if (hasAuthority)
-        _entityList.Add(entity);
-      
-      _entityListener.OnEntityCreated(entity);
-
-      return entity;
-    }
-  }
-  
-
-  internal void OnDestroy(ushort entityId, RagonPayload payload)
-  {
-    if (_entityMap.Remove(entityId, out var ragonEntity))
-    {
-      _entityList.Remove(ragonEntity);
-      
-      ragonEntity.Detach(payload);
-    }
-  }
-
-  internal void OnState(ushort entityId, RagonBuffer buffer)
-  {
-    if (_entityMap.TryGetValue(entityId, out var entity))
-      entity.Read(buffer);
-    else 
-      RagonLog.Warn($"Entity {entityId} not found!");
-  }
-
-  internal void OnEvent(RagonPlayer player, ushort entityId, ushort eventCode, RagonBuffer buffer)
-  {
-    if (_entityMap.TryGetValue(entityId, out var entity))
-      entity.Event(eventCode, player, buffer);
-    else 
-      RagonLog.Warn($"Entity {entityId} not found!");
-  }
-
-  internal void OnOwnershipChanged(RagonPlayer player, ushort entityId)
-  {
-    if (_entityMap.TryGetValue(entityId, out var entity))
-      entity.OnOwnershipChanged(player);
-    else
-      RagonLog.Warn($"Entity {entityId} not found!");
-  }
-}

Ragon.Client/Sources/RagonEventCache.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.
@@ -26,8 +26,14 @@ public class RagonEventCache
   public ushort GetEventCode<TEvent>(TEvent _) where TEvent : IRagonEvent
   {
     var type = typeof(TEvent);
-    var evntCode = _eventsRegistryByType[type];
-    return evntCode;
+   
+    if (!_eventsRegistryByType.TryGetValue(type, out var eventCode))
+    {
+      RagonLog.Error($"Event with type {type} not registered");
+      return 0;
+    }
+    
+    return eventCode;
   }
 
   public void Register<T>() where T : IRagonEvent, new()

Ragon.Client/Sources/RagonListenerList.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.
@@ -14,93 +14,256 @@
  * limitations under the License.
  */
 
+using Ragon.Protocol;
+
 namespace Ragon.Client
 {
   internal class RagonListenerList
   {
-    public int Count => _listeners.Count;
-    private List<IRagonListener> _listeners = new();
-    private RagonClient _client;
+    private readonly RagonClient _client;
+    private readonly List<IRagonAuthorizationListener> _authorizationListeners = new();
+    private readonly List<IRagonConnectionListener> _connectionListeners = new();
+    private readonly List<IRagonFailedListener> _failedListeners = new();
+    private readonly List<IRagonJoinListener> _joinListeners = new();
+    private readonly List<IRagonLeftListener> _leftListeners = new();
+    private readonly List<IRagonOwnershipChangedListener> _ownershipChangedListeners = new();
+    private readonly List<IRagonPlayerJoinListener> _playerJoinListeners = new();
+    private readonly List<IRagonPlayerLeftListener> _playerLeftListeners = new();
+    private readonly List<IRagonRoomListListener> _roomListListeners = new();
+    private readonly List<IRagonRoomUserDataListener> _roomUserDataListeners = new();
+    private readonly List<IRagonPlayerUserDataListener> _playerUserDataListeners = new();
+    private readonly List<Action> _delayedActions = new();
 
     public RagonListenerList(RagonClient client)
     {
       _client = client;
     }
-    
+
     public void Add(IRagonListener listener)
     {
-      _listeners.Add(listener);
+      _authorizationListeners.Add(listener);
+      _connectionListeners.Add(listener);
+      _failedListeners.Add(listener);
+      _joinListeners.Add(listener);
+      _leftListeners.Add(listener);
+      _ownershipChangedListeners.Add(listener);
+      _playerJoinListeners.Add(listener);
+      _playerLeftListeners.Add(listener);
+      _roomUserDataListeners.Add(listener);
+      _playerUserDataListeners.Add(listener);
     }
 
     public void Remove(IRagonListener listener)
     {
-      _listeners.Remove(listener);
+      _delayedActions.Add(() =>
+      {
+        _authorizationListeners.Remove(listener);
+        _connectionListeners.Remove(listener);
+        _failedListeners.Remove(listener);
+        _joinListeners.Remove(listener);
+        _leftListeners.Remove(listener);
+        _ownershipChangedListeners.Remove(listener);
+        _playerJoinListeners.Remove(listener);
+        _playerLeftListeners.Remove(listener);
+        _roomUserDataListeners.Remove(listener);
+        _playerUserDataListeners.Remove(listener);
+      });
+    }
+
+    public void Update()
+    {
+      foreach (var action in _delayedActions)
+        action.Invoke();
+
+      _delayedActions.Clear();
+    }
+
+    public void Add(IRagonAuthorizationListener listener)
+    {
+      _authorizationListeners.Add(listener);
+    }
+
+    public void Add(IRagonConnectionListener listener)
+    {
+      _connectionListeners.Add(listener);
+    }
+
+    public void Add(IRagonFailedListener listener)
+    {
+      _failedListeners.Add(listener);
+    }
+
+    public void Add(IRagonJoinListener listener)
+    {
+      _joinListeners.Add(listener);
+    }
+
+    public void Add(IRagonLeftListener listener)
+    {
+      _leftListeners.Add(listener);
+    }
+
+    public void Add(IRagonOwnershipChangedListener listener)
+    {
+      _ownershipChangedListeners.Add(listener);
+    }
+
+    public void Add(IRagonPlayerJoinListener listener)
+    {
+      _playerJoinListeners.Add(listener);
+    }
+
+    public void Add(IRagonPlayerLeftListener listener)
+    {
+      _playerLeftListeners.Add(listener);
+    }
+
+    public void Add(IRagonRoomListListener listener)
+    {
+      _roomListListeners.Add(listener);
+    }
+
+    public void Add(IRagonRoomUserDataListener listener)
+    {
+      _roomUserDataListeners.Add(listener);
     }
     
-    public void OnAuthorizationSuccess(string playerId, string playerName)
+    public void Add(IRagonPlayerUserDataListener listener)
     {
-      foreach (var listener in _listeners)
+      _playerUserDataListeners.Add(listener);
+    }
+
+    public void Remove(IRagonAuthorizationListener listener)
+    {
+      _delayedActions.Add(() => _authorizationListeners.Remove(listener));
+    }
+
+    public void Remove(IRagonConnectionListener listener)
+    {
+      _delayedActions.Add(() => _connectionListeners.Remove(listener));
+    }
+
+    public void Remove(IRagonFailedListener listener)
+    {
+      _delayedActions.Add(() => _failedListeners.Remove(listener));
+    }
+
+    public void Remove(IRagonJoinListener listener)
+    {
+      _delayedActions.Add(() => _joinListeners.Remove(listener));
+    }
+
+    public void Remove(IRagonLeftListener listener)
+    {
+      _delayedActions.Add(() => _leftListeners.Remove(listener));
+    }
+
+    public void Remove(IRagonOwnershipChangedListener listener)
+    {
+      _delayedActions.Add(() => _ownershipChangedListeners.Remove(listener));
+    }
+
+    public void Remove(IRagonPlayerJoinListener listener)
+    {
+      _delayedActions.Add(() => _playerJoinListeners.Remove(listener));
+    }
+
+    public void Remove(IRagonPlayerLeftListener listener)
+    {
+      _delayedActions.Add(() => _playerLeftListeners.Remove(listener));
+    }
+
+    public void Remove(IRagonRoomListListener listener)
+    {
+      _delayedActions.Add(() => _roomListListeners.Remove(listener));
+    }
+
+    public void Remove(IRagonRoomUserDataListener listener)
+    {
+      _delayedActions.Add(() => _roomUserDataListeners.Remove(listener));
+    }
+    
+    public void Remove(IRagonPlayerUserDataListener listener)
+    {
+      _delayedActions.Add(() => _playerUserDataListeners.Remove(listener));
+    }
+
+    public void OnAuthorizationSuccess(string playerId, string playerName, string payload)
+    {
+      foreach (var listener in _authorizationListeners)
         listener.OnAuthorizationSuccess(_client, playerId, playerName);
     }
-    
+
     public void OnAuthorizationFailed(string message)
     {
-      foreach (var listener in _listeners)
+      foreach (var listener in _authorizationListeners)
         listener.OnAuthorizationFailed(_client, message);
     }
-    
+
     public void OnLeft()
     {
-      foreach (var listener in _listeners)
+      foreach (var listener in _leftListeners)
         listener.OnLeft(_client);
     }
 
     public void OnFailed(string message)
     {
-      foreach (var listener in _listeners)
+      foreach (var listener in _failedListeners)
         listener.OnFailed(_client, message);
     }
 
     public void OnOwnershipChanged(RagonPlayer player)
     {
-      foreach (var listener in _listeners)
+      foreach (var listener in _ownershipChangedListeners)
         listener.OnOwnershipChanged(_client, player);
     }
 
     public void OnPlayerLeft(RagonPlayer player)
     {
-      foreach (var listener in _listeners)
+      foreach (var listener in _playerLeftListeners)
         listener.OnPlayerLeft(_client, player);
     }
 
     public void OnPlayerJoined(RagonPlayer player)
     {
-      foreach (var listener in _listeners)
+      foreach (var listener in _playerJoinListeners)
         listener.OnPlayerJoined(_client, player);
     }
 
-    public void OnLevel(string sceneName)
-    {
-      foreach (var listener in _listeners)
-        listener.OnLevel(_client, sceneName);
-    }
-
     public void OnJoined()
     {
-      foreach (var listener in _listeners)
+      foreach (var listener in _joinListeners)
         listener.OnJoined(_client);
     }
 
     public void OnConnected()
     {
-      foreach (var listener in _listeners)
+      foreach (var listener in _connectionListeners)
         listener.OnConnected(_client);
     }
 
-    public void OnDisconnected()
+    public void OnDisconnected(RagonDisconnect disconnect)
     {
-      foreach (var listener in _listeners)
-        listener.OnDisconnected(_client);
+      foreach (var listener in _connectionListeners)
+        listener.OnDisconnected(_client, disconnect);
+    }
+
+    public void OnRoomList(RagonRoomInformation[] roomInfos)
+    {
+      foreach (var listListener in _roomListListeners)
+        listListener.OnRoomListUpdate(_client, roomInfos);
+    }
+
+    public void OnRoomUserData(IReadOnlyList<string> changes)
+    {
+      foreach (var userDataListener in _roomUserDataListeners)
+        userDataListener.OnUserDataUpdated(_client, changes);
+    }
+
+    public void OnPlayerUserData(RagonPlayer player, IReadOnlyList<string> changes)
+    {
+      foreach(var playerUserDataListener in _playerUserDataListeners)
+        playerUserDataListener.OnPlayerUserDataUpdated(_client, player, changes);
     }
   }
 }

Ragon.Client/Sources/RagonPlayer.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.
@@ -23,15 +23,17 @@ namespace Ragon.Client
     public string Name { get; set; }
     public ushort PeerId { get; set; }
     public bool IsRoomOwner { get; set; }
-    public bool IsMe { get; set; }
+    public bool IsLocal { get; set; }
+    public IUserData UserData { get; private set; }
     
-    public RagonPlayer(ushort peerId, string playerId, string name, bool isRoomOwner, bool isMe)
+    public RagonPlayer(ushort peerId, string playerId, string name, bool isRoomOwner, bool isLocal)
     {
       PeerId = peerId;
       IsRoomOwner = isRoomOwner;
-      IsMe = isMe;
+      IsLocal = isLocal;
       Name = name;
       Id = playerId;
-    } 
+      UserData = isLocal ? new RagonUserData() : new RagonUserDataReadOnly();
+    }
   }
 }

Ragon.Client/Sources/RagonPlayerCache.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.
@@ -18,16 +18,30 @@ namespace Ragon.Client;
 
 public sealed class RagonPlayerCache
 {
-  private List<RagonPlayer> _players = new List<RagonPlayer>();
-  private Dictionary<string, RagonPlayer> _playersById = new();
-  private Dictionary<ushort, RagonPlayer> _playersByConnection = new();
+  private readonly List<RagonPlayer> _players = new();
+  private readonly Dictionary<string, RagonPlayer> _playersById = new();
+  private readonly Dictionary<ushort, RagonPlayer> _playersByConnection = new();
 
+  public IReadOnlyList<RagonPlayer> Players => _players;
   public RagonPlayer Owner { get; private set; }
-  public RagonPlayer LocalPlayer { 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;
@@ -38,10 +52,10 @@ public sealed class RagonPlayerCache
     _localId = localId;
   }
 
-  public void AddPlayer(ushort peerId, string playerId, string playerName)
+  public RagonPlayer AddPlayer(ushort peerId, string playerId, string playerName)
   {
     if (_playersById.ContainsKey(playerId))
-      return;
+      return null;
 
     var isOwner = playerId == _ownerId;
     var isLocal = playerId == _localId;
@@ -50,8 +64,8 @@ public sealed class RagonPlayerCache
 
     var player = new RagonPlayer(peerId, playerId, playerName, isOwner, isLocal);
 
-    if (player.IsMe)
-      LocalPlayer = player;
+    if (player.IsLocal)
+      Local = player;
 
     if (player.IsRoomOwner)
       Owner = player;
@@ -59,24 +73,29 @@ public sealed class RagonPlayerCache
     _players.Add(player);
     _playersById.Add(player.Id, player);
     _playersByConnection.Add(player.PeerId, player);
+    
+    return player;
   }
 
   public void RemovePlayer(string playerId)
   {
-    if (_playersById.Remove(playerId, out var player))
+    if (_playersById.TryGetValue(playerId, out var player))
     {
       _players.Remove(player);
+      _playersById.Remove(playerId);
       _playersByConnection.Remove(player.PeerId);
     }
   }
 
-  public void OnOwnershipChanged(string playerId)
+  public void OnOwnershipChanged(ushort playerPeerId)
   {
     foreach (var player in _players)
     {
-      if (player.Id == playerId)
+      if (player.PeerId == playerPeerId)
+      {
         Owner = player;
-      player.IsRoomOwner = player.Id == playerId;
+        Owner.IsRoomOwner = true;
+      }
     }
   }
 
@@ -87,4 +106,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/RagonRoom.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.
@@ -14,49 +14,186 @@
  * limitations under the License.
  */
 
+using Ragon.Protocol;
+
 namespace Ragon.Client
 {
   public class RagonRoom
   {
-    private RagonClient _client;
-    private RagonScene _scene;
-    private RagonEntityCache _entityCache;
-    private RagonPlayerCache _playerCache;
-    private RagonRoomInformation _information;
+    private class EventSubscription : IDisposable
+    {
+      private List<Action<RagonPlayer, IRagonEvent>> _callbacks;
+      private List<Action<RagonPlayer, IRagonEvent>> _localCallbacks;
+      private Action<RagonPlayer, IRagonEvent> _callback;
 
-    public string Id => _information.RoomId;
-    public int MinPlayers => _information.Min;
-    public int MaxPlayers => _information.Max;
+      public EventSubscription(
+        List<Action<RagonPlayer, IRagonEvent>> callbacks,
+        List<Action<RagonPlayer, IRagonEvent>> localCallbacks,
+        Action<RagonPlayer, IRagonEvent> callback)
+      {
+        _callbacks = callbacks;
+        _localCallbacks = localCallbacks;
+        _callback = callback;
+      }
 
-    public RagonPlayer Local => _playerCache.LocalPlayer;
+      public void Dispose()
+      {
+        _callbacks?.Remove(_callback);
+        _localCallbacks?.Remove(_callback);
+
+        _callbacks = null!;
+        _localCallbacks = null!;
+        _callback = null!;
+      }
+    }
+
+    private delegate void OnEventDelegate(RagonPlayer player, RagonStream serializer);
+
+    private readonly RagonClient _client;
+    private readonly RagonPlayerCache _playerCache;
+    private RoomParameters _parameters;
+    private RagonUserData _userData;
+
+    public string Id => _parameters.RoomId;
+    public int MinPlayers => _parameters.Min;
+    public int MaxPlayers => _parameters.Max;
+
+    public IReadOnlyList<RagonPlayer> Players => _playerCache.Players;
+    public RagonPlayer Local => _playerCache.Local;
     public RagonPlayer Owner => _playerCache.Owner;
+    public RagonUserData UserData => _userData;
 
-    public RagonRoom(RagonClient client,
-      RagonEntityCache entityCache,
-      RagonPlayerCache playerCache,
-      RagonRoomInformation information,
-      RagonScene scene)
+    private readonly Dictionary<int, OnEventDelegate> _events = new();
+
+    private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _localListeners = new();
+
+    private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _listeners = new();
+    
+    public RagonRoom(RagonClient client, RagonPlayerCache playerCache)
     {
       _client = client;
-      _information = information;
-      _entityCache = entityCache;
       _playerCache = playerCache;
-      _scene = scene;
+      
     }
 
-    internal void Cleanup()
+    public void Reset(RoomParameters parameters)
     {
-      _entityCache.Cleanup();
+      Clear();
+    
+      _userData = new RagonUserData();
+      _parameters = parameters;
       _playerCache.Cleanup();
     }
+    
+    internal void HandleEvent(ushort eventCode, RagonPlayer caller, RagonStream buffer)
+    {
+      if (_events.TryGetValue(eventCode, out var evnt))
+        evnt?.Invoke(caller, buffer);
+      else
+        RagonLog.Warn($"Handler event {Id} with eventCode {eventCode} not defined");
+    }
 
-    public void LoadScene(string map) => _scene.Load(map);
-    public void SceneLoaded() => _scene.SceneLoaded();
+    internal void HandleUserData(RagonStream buffer)
+    {
+      _userData.Read(buffer);
+    }
 
-    public void CreateEntity(RagonEntity entity) => CreateEntity(entity, null);
-    public void CreateEntity(RagonEntity entity, IRagonPayload? payload) => _entityCache.Create(entity, payload);
+    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))
+      {
+        callbacks = new List<Action<RagonPlayer, IRagonEvent>>();
+        _listeners.Add(eventCode, callbacks);
+      }
 
-    public void DestroyEntity(RagonEntity entityId) => DestroyEntity(entityId, null);
-    public void DestroyEntity(RagonEntity entityId, IRagonPayload? payload) => _entityCache.Destroy(entityId, payload);
+      if (!_localListeners.TryGetValue(eventCode, out var localCallbacks))
+      {
+        localCallbacks = new List<Action<RagonPlayer, IRagonEvent>>();
+        _localListeners.Add(eventCode, localCallbacks);
+      }
+
+      callbacks.Add(action);
+      localCallbacks.Add(action);
+
+      if (!_events.ContainsKey(eventCode))
+      {
+        _events.Add(eventCode, (player, serializer) =>
+        {
+          t.Deserialize(serializer);
+
+          foreach (var callbackListener in callbacks)
+            callbackListener.Invoke(player, t);
+        });
+      }
+
+      return new EventSubscription(callbacks, localCallbacks, action);
+    }
+
+    public void ReplicateEvent<TEvent>(TEvent evnt, RagonTarget target, RagonReplicationMode replicationMode)
+      where TEvent : IRagonEvent, new()
+    {
+      var evntId = _client.Event.GetEventCode(evnt);
+      var buffer = _client.Buffer;
+
+      {
+        if (replicationMode == RagonReplicationMode.Local &&
+            _localListeners.TryGetValue(evntId, out var localListeners))
+        {
+          foreach (var listener in localListeners)
+            listener.Invoke(_client.Room.Local, evnt);
+          return;
+        }
+      }
+
+      {
+        if (replicationMode == RagonReplicationMode.LocalAndServer &&
+            _localListeners.TryGetValue(evntId, out var localListeners))
+        {
+          foreach (var listener in localListeners)
+            listener.Invoke(_client.Room.Local, evnt);
+        }
+      }
+
+      buffer.Clear();
+      buffer.WriteOperation(RagonOperation.REPLICATE_ROOM_EVENT);
+      buffer.WriteUShort(evntId);
+      buffer.WriteByte((byte)replicationMode);
+      buffer.WriteByte((byte)target);
+
+      evnt.Serialize(buffer);
+
+      var sendData = buffer.ToArray();
+      _client.Reliable.Send(sendData);
+    }
+
+    public void ReplicateEvent<TEvent>(TEvent evnt, RagonPlayer target, RagonReplicationMode replicationMode)
+      where TEvent : IRagonEvent, new()
+    {
+      var evntId = _client.Event.GetEventCode(evnt);
+      var buffer = _client.Buffer;
+
+      buffer.Clear();
+      buffer.WriteOperation(RagonOperation.REPLICATE_ROOM_EVENT);
+      buffer.WriteUShort(evntId);
+      buffer.WriteByte((byte)replicationMode);
+      buffer.WriteByte((byte)RagonTarget.Player);
+      buffer.WriteUShort(target.PeerId);
+
+      evnt.Serialize(buffer);
+
+      var sendData = buffer.ToArray();
+      _client.Reliable.Send(sendData);
+    }
+
+    public void Clear()
+    {
+      _events.Clear();
+      _listeners.Clear();
+      _localListeners.Clear();
+    }
   }
 }

Ragon.Client/Sources/RagonRoomInformation.cs

@@ -0,0 +1,12 @@
+namespace Ragon.Client
+{
+  public struct RagonRoomInformation
+  {
+    public string Id;
+    public string Scene;
+    public int PlayerMax;
+    public int PlayerMin;
+    public int PlayerCount;
+    public Dictionary<string, byte[]> Properties;
+  }
+}

Ragon.Client/Sources/RagonScene.cs

@@ -1,61 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-public class RagonScene
-{
-  private readonly RagonClient _client;
-  private readonly RagonEntityCache _entityCache;
-  private readonly RagonPlayerCache _playerCache;
-  
-  public RagonScene(RagonClient client, RagonPlayerCache playerCache, RagonEntityCache entityCache)
-  {
-    _client = client;
-    _playerCache = playerCache;
-    _entityCache = entityCache;
-  }
-
-  internal void Load(string map)
-  {
-    var buffer = _client.Buffer;
-    
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.LOAD_SCENE);
-    buffer.WriteString(map);
-
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-
-  internal void SceneLoaded()
-  {
-    var buffer = _client.Buffer;
-    
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.SCENE_LOADED);
-
-    if (_playerCache.IsRoomOwner)
-      _entityCache.WriteScene(buffer);
-    else
-      _entityCache.CacheScene();
-    
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-}

Ragon.Client/Sources/RagonSession.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.
@@ -21,20 +21,21 @@ namespace Ragon.Client
   public class RagonSession
   {
     private readonly RagonClient _client;
-    private readonly RagonBuffer _buffer;
     
-    public RagonSession(RagonClient client, RagonBuffer buffer)
+    private readonly RagonStream _buffer;
+
+    public RagonSession(RagonClient client, RagonStream buffer)
     {
       _client = client;
       _buffer = buffer;
     }
 
-    public void CreateOrJoin(string map, int minPlayers, int maxPlayers)
+    public void CreateOrJoin(string sessionName, int minPlayers, int maxPlayers)
     {
-      var parameters = new RagonRoomParameters() {Map = map, Min = minPlayers, Max = maxPlayers};
+      var parameters = new RagonRoomParameters() { Min = minPlayers, Max = maxPlayers };
       CreateOrJoin(parameters);
     }
-    
+
     public void CreateOrJoin(RagonRoomParameters parameters)
     {
       _buffer.Clear();
@@ -46,17 +47,17 @@ namespace Ragon.Client
       _client.Reliable.Send(sendData);
     }
 
-    public void Create(string map, int minPlayers, int maxPlayers)
+    public void Create(string sessionName, int minPlayers, int maxPlayers)
     {
-      Create(null, new RagonRoomParameters() {Map = map, Min = minPlayers, Max = maxPlayers});
+      Create(null, new RagonRoomParameters() { Min = minPlayers, Max = maxPlayers });
     }
 
-    public void Create(string roomId, string map, int minPlayers, int maxPlayers)
+    public void Create(string roomId, string sessionName, int minPlayers, int maxPlayers)
     {
-      Create(roomId, new RagonRoomParameters() {Map = map, Min = minPlayers, Max = maxPlayers});
+      Create(roomId, new RagonRoomParameters() { Min = minPlayers, Max = maxPlayers });
     }
-    
-    public  void Create(string roomId, RagonRoomParameters parameters)
+
+    public void Create(string roomId, RagonRoomParameters parameters)
     {
       _buffer.Clear();
       _buffer.WriteOperation(RagonOperation.CREATE_ROOM);
@@ -76,14 +77,14 @@ namespace Ragon.Client
       var sendData = _buffer.ToArray();
       _client.Reliable.Send(sendData);
     }
-    
-    public  void Leave()
+
+    public void Leave()
     {
-      var sendData = new[] {(byte) RagonOperation.LEAVE_ROOM};
+      var sendData = new[] { (byte)RagonOperation.LEAVE_ROOM };
       _client.Reliable.Send(sendData);
     }
 
-    public  void Join(string roomId)
+    public void Join(string roomId)
     {
       _buffer.Clear();
       _buffer.WriteOperation(RagonOperation.JOIN_ROOM);
@@ -93,17 +94,16 @@ namespace Ragon.Client
       _client.Reliable.Send(sendData);
     }
 
-    public  void AuthorizeWithKey(string key, string playerName, byte[] additonalData)
+    public void AuthorizeWithKey(string key, string playerName, string payload = "")
     {
       _buffer.Clear();
       _buffer.WriteOperation(RagonOperation.AUTHORIZE);
       _buffer.WriteString(key);
       _buffer.WriteString(playerName);
-      _buffer.WriteBytes(additonalData);
+      _buffer.WriteString(payload);
 
       var sendData = _buffer.ToArray();
       _client.Reliable.Send(sendData);
     }
-    
   }
 }

Ragon.Client/Sources/RagonState.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.
@@ -16,7 +16,7 @@
 
 namespace Ragon.Client
 {
-  public enum RagonStatus
+  public enum RagonState
   {
     DISCONNECTED,
     CONNECTED,

Ragon.Client/Sources/RagonUserData.cs

@@ -0,0 +1,104 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Ragon.Protocol;
+
+namespace Ragon.Client
+{
+  public class RagonUserData : IUserData
+  {
+    public byte[] this[string key]
+    {
+      get => _properties[key];
+      set
+      {
+        _properties[key] = value;
+
+        if (!_changesCache.ContainsKey(key))
+        {
+          _localChanges.Add(key);
+          _changesCache.Add(key, true);
+        }
+      }
+    }
+
+    public void Remove(string key)
+    {
+      if (_properties.Remove(key))
+      {
+        if (!_changesCache.ContainsKey(key))
+        {
+          _localChanges.Add(key);
+          _changesCache.Add(key, true);
+        }
+      }
+    }
+
+    public bool Dirty => _localChanges.Count > 0;
+
+    private readonly List<string> _localChanges = new();
+    private readonly Dictionary<string, bool> _changesCache = new();
+    private readonly Dictionary<string, byte[]> _properties = new();
+
+    public RagonUserData()
+    {
+    }
+
+    public IReadOnlyList<string> Read(RagonStream buffer)
+    {
+      var len = buffer.ReadUShort();
+      var changes = new List<string>(len);
+      for (int i = 0; i < len; i++)
+      {
+        var key = buffer.ReadString();
+        var valueSize = buffer.ReadUShort();
+        if (valueSize > 0)
+        {
+          var value = buffer.ReadBinary(valueSize);
+          _properties[key] = value;
+        }
+        else
+        {
+          _properties.Remove(key);
+        }
+
+        changes.Add(key);
+      }
+
+      return changes;
+    }
+
+    public void Write(RagonStream buffer)
+    {
+      buffer.WriteUShort((ushort)_localChanges.Count);
+      foreach (var propertyChanged in _localChanges)
+      {
+        buffer.WriteString(propertyChanged);
+        if (_properties.TryGetValue(propertyChanged, out var property))
+        {
+          buffer.WriteUShort((ushort)property.Length);
+          buffer.WriteBinary(property);
+        }
+        else
+        {
+          buffer.WriteUShort(0);
+        }
+      }
+
+      _localChanges.Clear();
+    }
+  }
+}

Ragon.Client/Sources/RagonUserDataReadOnly.cs

@@ -0,0 +1,67 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Ragon.Protocol;
+
+namespace Ragon.Client;
+
+public class RagonUserDataReadOnly : IUserData
+{
+  public byte[] this[string key]
+  {
+    get => _properties[key];
+    set { }
+  }
+
+  public bool Dirty => _dirty;
+
+  private bool _dirty = false;
+  private readonly Dictionary<string, byte[]> _properties = new();
+
+  public RagonUserDataReadOnly()
+  {
+  }
+
+  public void Write(RagonStream buffer)
+  {
+  
+  }
+
+  public IReadOnlyList<string> Read(RagonStream buffer)
+  {
+    var len = buffer.ReadUShort();
+    var changes = new List<string>(len);
+    for (int i = 0; i < len; i++)
+    {
+      var key = buffer.ReadString();
+      var valueSize = buffer.ReadUShort();  
+      if (valueSize > 0)
+      {
+        var value = buffer.ReadBinary(valueSize);
+        _properties[key] = value;
+          
+      }
+      else
+      {
+        _properties.Remove(key);
+      }
+        
+      changes.Add(key);
+    }
+
+    return changes;
+  }
+}

Ragon.Protocol/Ragon.Protocol.csproj

@@ -4,8 +4,17 @@
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>disable</Nullable>
         <LangVersion>8</LangVersion>
-        <TargetFramework>netstandard2.1</TargetFramework>
         <RootNamespace>Ragon.Common</RootNamespace>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Title>Ragon.Protocol</Title>
+        <Copyright>Eduard Kargin</Copyright>
+        <Version>1.4.0</Version>
+        <Authors>Eduard Kargin</Authors>
+        <PackageProjectUrl>https://ragon.io</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
+        <RepositoryType>Source</RepositoryType>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -16,8 +25,8 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <OutputPath>C:\Users\edmand46\RagonProjects\ragon-unity-sdk\Assets\Ragon-Unity-SDK\Runtime\Plugins</OutputPath>
-      <DefineConstants>TRACE;NETSTACK_SPAN</DefineConstants>
+      <OutputPath></OutputPath>
+      <DefineConstants>TRACE;</DefineConstants>
       <DebugType>none</DebugType>
     </PropertyGroup>
 </Project>

Ragon.Protocol/Sources/RagonAuthority.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.

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.
@@ -58,7 +58,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 
@@ -69,16 +68,19 @@ namespace Ragon.Protocol
     private int _read;
     private int _write;
     private uint[] _buckets;
+    private byte[] _rawData;
     private readonly UTF8Encoding _utf8Encoding = new UTF8Encoding(false, true);
 
+    public byte[] RawData => _rawData;
     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)
     {
       _buckets = new uint[capacity];
+      _rawData = Array.Empty<byte>();
       _read = 0;
       _write = 0;
     }
@@ -119,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)
     {
@@ -145,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)
     {
@@ -234,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;
@@ -245,12 +276,13 @@ namespace Ragon.Protocol
 
       if (currentBucketIndex + 1 >= _buckets.Length)
         Resize(1);
-      
+
       _buckets[currentBucketIndex] = (uint)result;
       _buckets[currentBucketIndex + 1] = (uint)(result >> 32);
 
       _write += numBits;
     }
+    
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public uint Read(int numBits = 16)
@@ -282,22 +314,25 @@ 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;
     }
-    
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void ReadSpan(ref Span<uint> data, int size)
+    public void ReadArray(uint[] data, int size)
     {
       var used = _read & 0x0000001F;
       var index = _read >> 5;
       var limit = (size + 32 - 1) / 32;
       var capacity = size;
+
+      if (index + limit >= _buckets.Length)
+        Resize(size);
       
       for (int i = 0; i < limit; i++)
       {
@@ -306,22 +341,24 @@ namespace Ragon.Protocol
         var bucketRaw = (ulong)_buckets[index];
         if (index + 1 < _buckets.Length)
           bucketRaw |= (ulong)_buckets[index + 1] << 32;
-      
+
         var bucket = bucketRaw >> used;
         var result = bucket & mask;
-      
+
         data[i] = (uint)result;
         if (i + 1 < data.Length)
           data[i + 1] = (uint)(result >> 32);
-      
+
         index += 1;
         capacity -= dataSize;
       }
-      
+
       _read += size;
     }
 
-    public void WriteSpan(ref ReadOnlySpan<uint> data, int size)
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void WriteArray(uint[] data, int size)
     {
       var used = _write & 0x0000001F;
       var index = _write >> 5;
@@ -329,20 +366,20 @@ namespace Ragon.Protocol
 
       if (index + limit >= _buckets.Length)
         Resize(size);
-      
+
       for (var i = 0; i < limit; i += 1)
       {
-        var prepared = (ulong) data[i] << used;
+        var prepared = (ulong)data[i] << used;
         var mask = (1UL << used) - 1;
         var scratch = _buckets[index] & mask;
         var result = scratch | prepared;
-      
+
         _buckets[index] = (uint)result;
         _buckets[index + 1] = (uint)(result >> 32);
-      
+
         index += 1;
       }
-      
+
       _write += size;
     }
 
@@ -352,6 +389,18 @@ namespace Ragon.Protocol
       _write = 0;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void CopyFrom(RagonBuffer buffer, int size)
+    {
+      WriteArray(buffer._buckets, size);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void ToBuffer(RagonBuffer buffer, int size)
+    {
+      ReadArray(buffer._buckets, size);
+    }
+
     public void FromArray(byte[] data)
     {
       var length = data.Length;
@@ -384,10 +433,13 @@ namespace Ragon.Protocol
 
       _write = ((length - 1) * 8) + positionInByte;
       _read = 0;
+      _rawData = data;
     }
 
     public byte[] ToArray()
     {
+      Write(1, 1);
+
       var data = new byte[Length];
       int bucketsCount = (_write >> 5) + 1;
       int length = data.Length;
@@ -413,6 +465,32 @@ namespace Ragon.Protocol
       return data;
     }
 
+    public void ToArray(byte[] outData)
+    {
+      Write(1, 1);
+
+      var bucketsCount = (_write >> 5) + 1;
+      var length = Length;
+
+      for (int i = 0; i < bucketsCount; i++)
+      {
+        var dataIdx = i * 4;
+        var bucket = _buckets[i];
+
+        if (dataIdx < length)
+          outData[dataIdx] = (byte)bucket;
+
+        if (dataIdx + 1 < length)
+          outData[dataIdx + 1] = (byte)(bucket >> 8);
+
+        if (dataIdx + 2 < length)
+          outData[dataIdx + 2] = (byte)(bucket >> 16);
+
+        if (dataIdx + 3 < length)
+          outData[dataIdx + 3] = (byte)(bucket >> 24);
+      }
+    }
+
     private void Resize(int capacity)
     {
       var buckets = new uint[_buckets.Length * 2 + capacity];

Ragon.Protocol/Sources/RagonDisconnect.cs

@@ -0,0 +1,9 @@
+namespace Ragon.Protocol
+{
+  public enum RagonDisconnect
+  {
+    MANUAL,
+    TIMEOUT,
+    SERVER,
+  }
+}

Ragon.Protocol/Sources/RagonOperation.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.
@@ -17,26 +17,25 @@
 
 namespace Ragon.Protocol
 {
-  public enum RagonOperation: byte
+  public enum RagonOperation : byte
   {
-    AUTHORIZE,
-    AUTHORIZED_SUCCESS,
-    AUTHORIZED_FAILED,
-    JOIN_OR_CREATE_ROOM,
-    CREATE_ROOM,
-    JOIN_ROOM,
-    LEAVE_ROOM,
-    OWNERSHIP_CHANGED,
-    JOIN_SUCCESS,
-    JOIN_FAILED,
-    LOAD_SCENE,
-    SCENE_LOADED,
-    PLAYER_JOINED,
-    PLAYER_LEAVED,
-    CREATE_ENTITY,
-    DESTROY_ENTITY,
-    SNAPSHOT,
-    REPLICATE_ENTITY_STATE,
-    REPLICATE_ENTITY_EVENT,
+    AUTHORIZE = 1,
+    AUTHORIZED_SUCCESS = 2,
+    AUTHORIZED_FAILED = 3,
+    JOIN_OR_CREATE_ROOM = 4,
+    CREATE_ROOM = 5,
+    JOIN_ROOM = 6,
+    LEAVE_ROOM = 7,
+    OWNERSHIP_ROOM_CHANGED = 9,
+    JOIN_SUCCESS = 10,
+    JOIN_FAILED = 11,
+    PLAYER_JOINED = 14,
+    PLAYER_LEAVED = 15,
+    REPLICATE_ROOM_EVENT = 22,
+    TRANSFER_ROOM_OWNERSHIP = 23,
+    TIMESTAMP_SYNCHRONIZATION = 25,
+    ROOM_LIST_UPDATED = 26,
+    PLAYER_DATA_UPDATED = 27,
+    ROOM_DATA_UPDATED = 28,
   }
 }

Ragon.Protocol/Sources/RagonReplicationMode.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.

Ragon.Protocol/Sources/RagonRoomParameters.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.
@@ -17,24 +17,21 @@
 
 namespace Ragon.Protocol
 {
-  public class RagonRoomParameters: IRagonSerializable
+  public class RagonRoomParameters
   {
-    public string Map { get; set; }
     public int Min { get; set; } 
     public int Max { get; set; } 
     
-    public void Serialize(RagonBuffer buffer)
+    public void Serialize(RagonStream buffer)
     {
-      buffer.WriteString(Map);
-      buffer.WriteInt(Min, 1, 32);
-      buffer.WriteInt(Max, 1, 32);
+      buffer.WriteInt(Min);
+      buffer.WriteInt(Max);
     }
 
-    public void Deserialize(RagonBuffer buffer)
+    public void Deserialize(RagonStream buffer)
     {
-      Map = buffer.ReadString();
-      Min = buffer.ReadInt(1, 32);
-      Max = buffer.ReadInt(1, 32);
+      Min = buffer.ReadInt();
+      Max = buffer.ReadInt();
     }
   }
 }

Ragon.Protocol/Sources/RagonSerializable.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.
@@ -19,7 +19,7 @@ namespace Ragon.Protocol
 {
   public interface IRagonSerializable
   {
-    public void Serialize(RagonBuffer buffer);
-    public void Deserialize(RagonBuffer buffer);
+    public void Serialize(RagonStream buffer);
+    public void Deserialize(RagonStream buffer);
   }
 }

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.Protocol/Sources/RagonTarget.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.

Ragon.Protocol/Sources/RagonUtils.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.
@@ -16,9 +16,34 @@
 
 
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace Ragon.Protocol
 {
+  [StructLayout(LayoutKind.Explicit)]
+  public struct DoubleToUInt
+  {
+    [FieldOffset(0)]
+    public double Double;
+    
+    [FieldOffset(0)]
+    public uint Int0;
+    
+    [FieldOffset(4)]
+    public uint Int1;
+  }
+  
+  public static class RagonTime {
+    public static double CurrentTimestamp()
+    {
+      var currentTime = System.DateTime.UtcNow.ToUniversalTime().Subtract(
+        new System.DateTime(1970, 1, 1, 0, 0, 0, System.DateTimeKind.Utc)
+      ).TotalMilliseconds;
+      
+      return currentTime; 
+    }
+  }
+  
   public static class DeBruijn
   {
     private static readonly int[] _lookup = new int[32]

Ragon.Protocol/Sources/RagonVersion.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.
@@ -21,7 +21,7 @@ namespace Ragon.Protocol
   {
     public static uint Parse(string version)
     {
-      var strings = version.Split(".");
+      var strings = version.Split('.');
       if (strings.Length < 3)
         return 0;
       

Ragon.Relay/Program.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.
@@ -16,12 +16,12 @@
 
 namespace Ragon.Relay
 {
-    class Program
+  class Program
+  {
+    static void Main(string[] args)
     {
-        static void Main(string[] args)
-        {
-            var relay = new Relay();
-            relay.Start();
-        }
+      var relay = new Relay();
+      relay.Start();
     }
+  }
 }

Ragon.Relay/Ragon.Relay.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <RootNamespace>Ragon.Relay</RootNamespace>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -23,9 +23,15 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Ragon.Server.ENet\Ragon.Server.ENet.csproj" />
-      <ProjectReference Include="..\Ragon.Server.DotNetWebSockets\Ragon.Server.DotNetWebSockets.csproj" />
       <ProjectReference Include="..\Ragon.Server\Ragon.Server.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="ENet-CSharp" Version="2.4.8" />
+      <PackageReference Include="Google.Protobuf" Version="3.29.0" />
+      <PackageReference Include="MsgPack.Cli" Version="1.0.1" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+      <PackageReference Include="NLog" Version="5.3.2" />
+    </ItemGroup>
+
 </Project>

Ragon.Relay/Relay.cs

@@ -1,53 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using NLog;
-using Ragon.Server;
-using Ragon.Server.ENet;
-using Ragon.Server.DotNetWebsockets;
-
-
-namespace Ragon.Relay;
-
-public class Relay
-{
-  public void Start()
-  {
-    var logger = LogManager.GetLogger("Ragon.Relay");
-    logger.Info("Relay Application");
-
-    var configuration = Configuration.Load("relay.config.json");
-    var serverType = Configuration.GetServerType(configuration.ServerType);
-
-    INetworkServer server = null;
-    switch (serverType)
-    {
-      case ServerType.ENET:
-        server = new ENetServer();
-        break;
-      case ServerType.WEBSOCKET:
-        server = new DotNetWebSocketServer();
-        break;
-      default:
-        server = new ENetServer();
-        break;
-    }
-
-    var relay = new RagonServer(server, configuration);
-    logger.Info("Started");
-    relay.Start();
-  }
-}

Ragon.Relay/Sources/Logger/RelayLogger.cs

@@ -0,0 +1,40 @@
+using System;
+using NLog;
+using Ragon.Server.Logging;
+
+namespace Ragon.Relay;
+
+public class RelayLogger: IRagonLogger
+{
+  private Logger _nlogger;
+  
+  public RelayLogger(string tag)
+  {
+    _nlogger = LogManager.GetLogger(tag);
+  }
+  
+  public void Warning(string message)
+  {
+    _nlogger.Warn(message);
+  }
+
+  public void Info(string message)
+  {
+    _nlogger.Info(message);
+  }
+
+  public void Error(string message)
+  {
+    _nlogger.Error(message);
+  }
+
+  public void Error(Exception ex)
+  {
+    _nlogger.Error(ex);
+  }
+
+  public void Trace(string message)
+  {
+    _nlogger.Trace(message);
+  }
+}

Ragon.Relay/Sources/Logger/RelayLoggerFactory.cs

@@ -0,0 +1,11 @@
+using Ragon.Server.Logging;
+
+namespace Ragon.Relay;
+
+public class RelayLoggerFactory: IRagonLoggerFactory
+{
+  public IRagonLogger GetLogger(string tag)
+  {
+    return new RelayLogger(tag);
+  }
+}

Ragon.Relay/Sources/Plugin/RelayRoomPlugin.cs

@@ -0,0 +1,23 @@
+using System;
+using Ragon.Server.Plugin;
+
+namespace Ragon.Relay;
+
+public class RelayRoomPlugin: BaseRoomPlugin
+{
+  public void Tick(float dt)
+  {
+    
+  }
+  public void OnAttached()
+  {
+    Console.WriteLine("Room attached");
+    
+    
+  }
+
+  public void OnDetached()
+  {
+    Console.WriteLine("Room detached");
+  }
+}

Ragon.Relay/Sources/Plugin/RelayServerPlugin.cs

@@ -0,0 +1,43 @@
+using Ragon.Server;
+using Ragon.Server.Lobby;
+using Ragon.Server.Plugin;
+using Ragon.Server.Time;
+
+namespace Ragon.Relay
+{
+  public class RelayServerPlugin : BaseServerPlugin
+  {
+    private RelayConfiguration _relayConfiguration;
+    private RagonScheduler _scheduler;
+    private RagonConnectionRegistry _connectionRegistry;
+    private IRagonLobby _lobby;
+    private Reporter _reporter;
+
+    public RelayServerPlugin(RelayConfiguration config)
+    {
+      _relayConfiguration = config;
+    }
+
+    public override void OnAttached(IRagonServer server)
+    {
+      base.OnAttached(server);
+      
+      _lobby = server.Lobby;
+      _connectionRegistry = server.ConnectionRegistry;
+      _scheduler = server.Scheduler;
+      _reporter = new Reporter(_relayConfiguration, server, "127.0.0.1", 5000);
+
+      server.Scheduler.Run(new RagonActionTimer(() => _reporter.Done(), 1, -1));
+    }
+
+    public override bool OnCommand(string command, string payload)
+    {
+      return true;
+    }
+
+    public override IRoomPlugin CreateRoomPlugin(RoomInformation information)
+    {
+      return new RelayRoomPlugin();
+    }
+  }
+}

Ragon.Relay/Sources/Relay.cs

@@ -0,0 +1,81 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.IO;
+using System.Threading;
+using Newtonsoft.Json;
+using Ragon.Server;
+using Ragon.Server.IO;
+using Ragon.Server.Logging;
+using Ragon.Server.Plugin;
+using Ragon.Server.WebSocketServer;
+using Ragon.Transport;
+
+namespace Ragon.Relay
+{
+  public class Relay
+  {
+    public void Start()
+    {
+      LoggerManager.SetLoggerFactory(new RelayLoggerFactory());
+
+      var logger = LoggerManager.GetLogger("Relay");
+      logger.Info("Relay Application");
+
+      var data = File.ReadAllText("relay.config.json");
+      var configuration = JsonConvert.DeserializeObject<RelayConfiguration>(data);
+      var serverType = RagonServerConfiguration.GetServerType(configuration.ServerType);
+
+      INetworkServer networkServer = new ENetServer();
+      IServerPlugin plugin = new RelayServerPlugin();
+      
+      switch (serverType)
+      {
+        case ServerType.ENET:
+          networkServer = new ENetServer();
+          break;
+        case ServerType.WEBSOCKET:
+          networkServer = new WebSocketServer();
+          break;
+      }
+
+      var serverConfiguration = new RagonServerConfiguration()
+      {
+        LimitConnections = configuration.LimitConnections,
+        LimitRooms = configuration.LimitRooms,
+        LimitBufferedEvents = configuration.LimitBufferedEvents,
+        LimitPlayersPerRoom = configuration.LimitPlayersPerRoom,
+        LimitUserDataSize = configuration.LimitUserDataSize,
+        LimitPropertySize = configuration.LimitPropertySize,
+        Port = configuration.Port,
+        Protocol = configuration.Protocol,
+        ServerKey = configuration.ServerKey,
+        ServerTickRate = configuration.ServerTickRate,
+        ServerAddress = configuration.ServerAddress,
+      };
+      
+      var relay = new RagonServer(networkServer, plugin, serverConfiguration);
+      relay.Listen();
+      while (relay.IsRunning)
+      {
+        relay.Tick();
+        Thread.Sleep(1);
+      }
+
+      relay.Dispose();
+    }
+  }
+}