🐛 scene entities not execute buffered events

Fix/payload

.gitignore

@@ -3,4 +3,6 @@
 .vs
 obj
 bin
-*.user
+*.user
+*.dylib
+*.dll

README.md

@@ -6,7 +6,7 @@
 
 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

Ragon.Client.Simulation/Sources/Game.cs

@@ -1,8 +1,10 @@
 
 
+using Ragon.Protocol;
+
 namespace Ragon.Client.Simulation;
 
-public class Game : IRagonListener
+public class Game : IRagonListener, IRagonSceneRequestListener
 {
     private RagonFloat _health;
     private RagonInt _points;
@@ -18,7 +20,7 @@ public class Game : IRagonListener
     public void OnConnected(RagonClient client)
     {
         RagonLog.Trace("Connected");
-        _client.Session.AuthorizeWithKey("defaultkey", "Player Eduard", Array.Empty<byte>());
+        _client.Session.AuthorizeWithKey("defaultkey", "Player Eduard");
     }
 
     public void OnAuthorizationSuccess(RagonClient client, string playerId, string playerName)
@@ -33,6 +35,41 @@ public class Game : IRagonListener
     }
 
     public void OnJoined(RagonClient client)
+    {
+        
+    }
+
+    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, RagonDisconnect ragonDisconnect)
+    {
+        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 OnSceneLoaded(RagonClient client)
     {
         RagonLog.Trace("Joined");
 
@@ -53,43 +90,6 @@ public class Game : IRagonListener
         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()
@@ -107,4 +107,10 @@ public class Game : IRagonListener
             _timer = 0;
         }
     }
+
+    public void OnRequestScene(RagonClient client, string sceneName)
+    {
+        client.Room.SceneLoaded();
+        
+    }
 }

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

@@ -16,6 +16,7 @@
 
 
 using ENet;
+using Ragon.Protocol;
 using Event = ENet.Event;
 using EventType = ENet.EventType;
 
@@ -31,7 +32,7 @@ namespace Ragon.Client
     
     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; }
@@ -98,10 +99,10 @@ namespace Ragon.Client
             OnConnected?.Invoke();
             break;
           case EventType.Disconnect:
-            OnDisconnected?.Invoke(DisconnectReason.MANUAL);
+            OnDisconnected?.Invoke(RagonDisconnect.SERVER);
             break;
           case EventType.Timeout:
-            OnDisconnected?.Invoke(DisconnectReason.TIMEOUT);
+            OnDisconnected?.Invoke(RagonDisconnect.TIMEOUT);
             break;
           case EventType.Receive:
             var data = new byte[_netEvent.Packet.Length];

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

@@ -16,6 +16,7 @@
 
 
 using ENet;
+using Ragon.Protocol;
 using Event = ENet.Event;
 using EventType = ENet.EventType;
 
@@ -31,7 +32,7 @@ namespace Ragon.Client
     
     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; }
@@ -99,10 +100,10 @@ namespace Ragon.Client
             OnConnected?.Invoke();
             break;
           case EventType.Disconnect:
-            OnDisconnected?.Invoke(DisconnectReason.MANUAL);
+            OnDisconnected?.Invoke(RagonDisconnect.SERVER);
             break;
           case EventType.Timeout:
-            OnDisconnected?.Invoke(DisconnectReason.TIMEOUT);
+            OnDisconnected?.Invoke(RagonDisconnect.TIMEOUT);
             break;
           case EventType.Receive:
             var data = new byte[_netEvent.Packet.Length];

Ragon.Client/Ragon.Client.csproj

@@ -1,22 +1,22 @@
 <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>
+        <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>/Users/edmand46/RagonProjects/ragon-oss-examples/Assets/Ragon/Plugins/</OutputPath>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <OutputPath>/Users/edmand46/RagonProjects/ragon-unity-sdk/Assets/Ragon/Runtime/Plugins</OutputPath>
+      <OutputPath>/Users/edmand46/RagonProjects/ragon-oss-examples/Assets/Ragon/Plugins/</OutputPath>
     </PropertyGroup>
 
     <ItemGroup>

Ragon.Client/Sources/Entity/RagonEntity.cs

@@ -22,16 +22,17 @@ 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; }
 
@@ -41,25 +42,27 @@ namespace Ragon.Client
 
     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 readonly Dictionary<int, OnEventDelegate> _events = new Dictionary<int, OnEventDelegate>();
-    private Dictionary<int, Action<RagonPlayer, IRagonEvent>> _localEvents = new();
+    private readonly Dictionary<int, Action<RagonPlayer, IRagonEvent>> _localEvents = new Dictionary<int, Action<RagonPlayer, IRagonEvent>>();
 
     public RagonEntity(ushort type = 0, ushort sceneId = 0)
     {
       State = new RagonEntityState(this);
       Type = type;
       
+      _spawnPayload = new RagonPayload(0);
+      _destroyPayload = new RagonPayload(0);
       _sceneId = sceneId;
     }
 
-    internal void Attach(RagonClient client, ushort entityId, ushort entityType, bool hasAuthority, RagonPlayer owner, RagonPayload payload)
+    internal void Attach(RagonClient client, ushort entityId, ushort entityType, bool hasAuthority, RagonPlayer owner)
     {
       Type = entityType;
       Id = entityId;
@@ -67,37 +70,44 @@ namespace Ragon.Client
       IsAttached = true;
       Replication = true;
       HasAuthority = hasAuthority;
-      
+
-      _client = client; 
+      _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();
+      if (data.Size <= 0) return payload;
+      
+      var buffer = new RagonBuffer();
+      
+      data.Write(buffer);
+      
       payload.Deserialize(buffer);
-
+      
       return payload;
     }
+    
+    public void AttachPayload(RagonPayload payload)
+    {
+      _spawnPayload = payload;
+    } 
 
-    public T GetSpawnPayload<T>() where T : IRagonPayload, new()
+    public T GetAttachPayload<T>() where T : IRagonPayload, new()
     {
       return GetPayload<T>(_spawnPayload);
     }
 
-    public T GetDestroyPayload<T>() where T : IRagonPayload, new()
+    public T GetDetachPayload<T>() where T : IRagonPayload, new()
     {
       return GetPayload<T>(_destroyPayload);
     }
@@ -105,6 +115,12 @@ namespace Ragon.Client
     public void ReplicateEvent<TEvent>(TEvent evnt, RagonPlayer target, RagonReplicationMode replicationMode)
       where TEvent : IRagonEvent, new()
     {
+      if (!IsAttached)
+      {
+        RagonLog.Error("Entity not attached");
+        return;
+      }
+
       var evntId = _client.Event.GetEventCode(evnt);
       var buffer = _client.Buffer;
 
@@ -112,12 +128,12 @@ namespace Ragon.Client
       buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
       buffer.WriteUShort(Id);
       buffer.WriteUShort(evntId);
-      buffer.WriteByte((byte) replicationMode);
+      buffer.WriteByte((byte)replicationMode);
-      buffer.WriteByte((byte) RagonTarget.Player);
+      buffer.WriteByte((byte)RagonTarget.Player);
-      buffer.WriteUShort((ushort) target.PeerId);
+      buffer.WriteUShort(target.PeerId);
 
       evnt.Serialize(buffer);
-      
+
       var sendData = buffer.ToArray();
       _client.Reliable.Send(sendData);
     }
@@ -128,31 +144,34 @@ namespace Ragon.Client
       RagonReplicationMode replicationMode = RagonReplicationMode.Server)
       where TEvent : IRagonEvent, new()
     {
+      if (!IsAttached)
+      {
+        RagonLog.Error("Entity not attached");
+        return;
+      }
+
+      var eventCode = _client.Event.GetEventCode(evnt);
       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.WriteUShort(eventCode);
-      buffer.WriteByte((byte) replicationMode);
+      buffer.WriteByte((byte)replicationMode);
-      buffer.WriteByte((byte) target);
+      buffer.WriteByte((byte)target);
 
       evnt.Serialize(buffer);
 
@@ -167,11 +186,13 @@ namespace Ragon.Client
 
       if (_events.ContainsKey(eventCode))
       {
-        RagonLog.Warn($"Event already {eventCode} subscribed");
+        _events.Remove(eventCode);
-        return;
+        _localEvents.Remove(eventCode);
+
+        RagonLog.Warn($"Event already {eventCode} subscribed, removed old one!");
       }
-    
+
-      _localEvents.Add(eventCode, (player, eventData) => { callback.Invoke(player, (TEvent) eventData); });
+      _localEvents.Add(eventCode, (player, eventData) => { callback.Invoke(player, (TEvent)eventData); });
       _events.Add(eventCode, (player, serializer) =>
       {
         t.Deserialize(serializer);
@@ -196,8 +217,10 @@ namespace Ragon.Client
 
     internal void Event(ushort eventCode, RagonPlayer caller, RagonBuffer buffer)
     {
-      if (_events.ContainsKey(eventCode))
+      if (_events.TryGetValue(eventCode, out var evnt))
-        _events[eventCode]?.Invoke(caller, buffer);
+        evnt?.Invoke(caller, buffer);
+      else
+        RagonLog.Warn($"Handler event on entity {Id} with eventCode {eventCode} not defined");
     }
 
     internal void TrackChangedProperty(RagonProperty property)
@@ -208,10 +231,10 @@ namespace Ragon.Client
     public void OnOwnershipChanged(RagonPlayer player)
     {
       var prevOwner = Owner;
-      
+
       Owner = player;
-      HasAuthority = player.PeerId == _client.Room.Local.PeerId;
+      HasAuthority = player.IsLocal;
-      
+
       OwnershipChanged?.Invoke(prevOwner, player);
     }
   }

Ragon.Client/Sources/Entity/RagonEntityState.cs

@@ -53,7 +53,7 @@ public sealed class RagonEntityState
     {
       var changed = buffer.ReadBool();
       if (changed)
-        property.Deserialize(buffer);
+        property.Read(buffer);
     }
   }
 

Ragon.Client/Sources/Entity/RagonPayload.cs

@@ -19,10 +19,10 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-public struct RagonPayload
+public class RagonPayload
 {
-  private uint[] _data = new uint[128];
+  private readonly uint[] _data = new uint[128];
-  private int _size = 0;
+  private readonly int _size = 0;
 
   public RagonPayload(int capacity)
   {
@@ -32,16 +32,12 @@ public struct RagonPayload
 
   public void Read(RagonBuffer buffer)
   {
-    var readOnlySpan = _data.AsSpan();
+    buffer.ReadArray(_data, _size);
-
-    buffer.ReadSpan(ref readOnlySpan, _size);
   }
 
   public void Write(RagonBuffer buffer)
   {
-    ReadOnlySpan<uint> readOnlySpan = _data.AsSpan();
+    buffer.WriteArray(_data, _size);
-
-    buffer.WriteSpan(ref readOnlySpan, _size);
   }
 
   public override string ToString()

Ragon.Client/Sources/Entity/RagonProperty.cs

@@ -29,22 +29,25 @@ namespace Ragon.Client
     public bool IsFixed => _fixed;
     public int Size => _size;
 
-    private bool _fixed;
+    private RagonBuffer _propertyBuffer;
-    private string _name;
+    private RagonEntity _entity;    
-    protected bool _invokeLocal;
-
-    private RagonEntity _entity;
     private bool _dirty;
     private int _size;
     private int _ticks;
     private int _priority;
+    private bool _fixed;
+    private string _name;
+
+    protected bool InvokeLocal;
 
     protected RagonProperty(int priority, bool invokeLocal)
     {
       _size = 0;
       _priority = priority;
       _fixed = false;
-      _invokeLocal = invokeLocal;
+      _propertyBuffer = new RagonBuffer();
+      
+      InvokeLocal = invokeLocal;
     }
 
     public void SetName(string name)
@@ -60,7 +63,7 @@ namespace Ragon.Client
 
     protected void InvokeChanged()
     {
-      if (!_invokeLocal)
+      if (!InvokeLocal)
         return;
 
       Changed?.Invoke();
@@ -91,26 +94,44 @@ namespace Ragon.Client
     internal void AssignEntity(RagonEntity ent)
     {
       _entity = ent;
-      
+
       Changed?.Invoke();
     }
 
     internal void Write(RagonBuffer buffer)
     {
+      _propertyBuffer.Clear();
+      
       if (_fixed)
       {
-        Serialize(buffer);
+        Serialize(_propertyBuffer);
+        
+        buffer.FromBuffer(_propertyBuffer, _size);
         return;
       }
 
-      var sizeOffset = buffer.WriteOffset;
+      Serialize(_propertyBuffer);
-      buffer.Write(0, 16);
-      var propOffset = buffer.WriteOffset;
 
-      Serialize(buffer);
+      var propertySize = (ushort) _propertyBuffer.WriteOffset;
+      buffer.WriteUShort(propertySize);;
+      buffer.FromBuffer(_propertyBuffer, propertySize);
+    }
 
-      var propSize = (uint)(buffer.WriteOffset - propOffset);
+    internal void Read(RagonBuffer buffer)
-      buffer.Write(propSize, 16, sizeOffset);
+    {
+      _propertyBuffer.Clear();
+      
+      if (_fixed)
+      {
+        buffer.ToBuffer(_propertyBuffer, _size);
+        
+        Deserialize(_propertyBuffer);
+        return;
+      }
+      
+      var propSize = buffer.ReadUShort();
+      buffer.ToBuffer(_propertyBuffer, propSize);
+      Deserialize(_propertyBuffer);
     }
 
     public virtual void Serialize(RagonBuffer buffer)

Ragon.Client/Sources/Handler/AuthorizeSuccessHandler.cs

@@ -22,9 +22,13 @@ namespace Ragon.Client;
 internal  class AuthorizeSuccessHandler: Handler
 {
   private readonly RagonListenerList _listenerList;
+  private readonly RagonClient _client;
   
-  public AuthorizeSuccessHandler(RagonListenerList listenerList)
+  public AuthorizeSuccessHandler(
+    RagonClient client,
+    RagonListenerList listenerList)
   {
+    _client = client;
     _listenerList = listenerList;
   }
   
@@ -32,7 +36,9 @@ internal  class AuthorizeSuccessHandler: Handler
   {
     var playerId = buffer.ReadString();
     var playerName = buffer.ReadString();
+    var playerPayload = buffer.ReadString();
 
-    _listenerList.OnAuthorizationSuccess(playerId, playerName);
+    _client.SetStatus(RagonStatus.LOBBY);
+    _listenerList.OnAuthorizationSuccess(playerId, playerName, playerPayload);
   }
 }

Ragon.Client/Sources/Handler/EntityCreateHandler.cs

@@ -23,16 +23,18 @@ internal  class EntityCreateHandler : Handler
   private readonly RagonClient _client;
   private readonly RagonPlayerCache _playerCache;
   private readonly RagonEntityCache _entityCache;
-  
+  private readonly IRagonEntityListener _entityListener;
   public EntityCreateHandler(
     RagonClient client,
     RagonPlayerCache playerCache,
-    RagonEntityCache entityCache
+    RagonEntityCache entityCache,
+    IRagonEntityListener entityListener
   )
   {
     _client = client;
     _entityCache = entityCache;
     _playerCache = playerCache;
+    _entityListener = entityListener;
   }
 
   public void Handle(RagonBuffer buffer)
@@ -51,8 +53,14 @@ internal  class EntityCreateHandler : Handler
       return;
     }
     
-    var hasAuthority = _playerCache.LocalPlayer.Id == player.Id;
+    var hasAuthority = _playerCache.Local.Id == player.Id;
-    var entity = _entityCache.OnCreate(attachId, entityType, 0, entityId, hasAuthority);
+    var entity = _entityCache.TryGetEntity(attachId, entityType, 0, entityId, hasAuthority, out var hasCreated);
-    entity.Attach(_client, entityId, entityType, hasAuthority, player, payload);
+    
+    entity.AttachPayload(payload);
+
+    if (hasCreated)
+      _entityListener.OnEntityCreated(entity);
+    
+    entity.Attach(_client, entityId, entityType, hasAuthority, player);
   }
 }

Ragon.Client/Sources/Handler/EntityEventHandler.cs

@@ -49,7 +49,7 @@ internal class EntityEventHandler : Handler
             return;
         }
 
-        if (player.IsMe && executionMode == RagonReplicationMode.LocalAndServer)
+        if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
             return;
 
         _entityCache.OnEvent(player, entityId, eventCode, buffer);

Ragon.Client/Sources/Handler/EntityOwnershipHandler.cs

@@ -19,13 +19,13 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal  class OwnershipHandler: Handler
+internal class EntityOwnershipHandler: Handler
 {
   private readonly RagonListenerList _listenerList;
   private readonly RagonPlayerCache _playerCache;
   private readonly RagonEntityCache _entityCache;
   
-  public OwnershipHandler(
+  public EntityOwnershipHandler(
     RagonListenerList listenerList,
     RagonPlayerCache playerCache,
     RagonEntityCache entityCache)
@@ -37,17 +37,16 @@ internal  class OwnershipHandler: Handler
   
   public void Handle(RagonBuffer buffer)
   {
-    var newOwnerId = buffer.ReadString();
+    var newOwnerId = buffer.ReadUShort();
-    var player = _playerCache.GetPlayerById(newOwnerId);
-
-    _playerCache.OnOwnershipChanged(newOwnerId);
-    _listenerList.OnOwnershipChanged(player);
-
     var entities = buffer.ReadUShort();
+    
+    var player = _playerCache.GetPlayerByPeer(newOwnerId);
     for (var i = 0; i < entities; i++)
     {
       var entityId = buffer.ReadUShort();
       _entityCache.OnOwnershipChanged(player, entityId);
+      
+      RagonLog.Trace("Entity changed owner: " + entityId);
     }
   }
 }

Ragon.Client/Sources/Handler/EntityRemoveHandler.cs

@@ -19,11 +19,11 @@ using Ragon.Protocol;
 
 namespace Ragon.Client;
 
-internal  class EntityDestroyHandler: Handler
+internal  class EntityRemoveHandler: Handler
 {
   private readonly RagonEntityCache _entityCache;
   
-  public EntityDestroyHandler(RagonEntityCache entityCache)
+  public EntityRemoveHandler(RagonEntityCache entityCache)
   {
     _entityCache = entityCache;
   }

Ragon.Client/Sources/Handler/JoinSuccessHandler.cs

@@ -43,7 +43,6 @@ internal class JoinSuccessHandler : Handler
   private readonly RagonPlayerCache _playerCache;
   private readonly RagonEntityCache _entityCache;
   private readonly RagonClient _client;
-  private readonly RagonBuffer _buffer;
 
   public JoinSuccessHandler(
     RagonClient client,
@@ -53,7 +52,6 @@ internal class JoinSuccessHandler : Handler
     RagonEntityCache entityCache
   )
   {
-    _buffer = buffer;
     _client = client;
     _listenerList = listenerList;
     _entityCache = entityCache;
@@ -67,14 +65,15 @@ internal class JoinSuccessHandler : Handler
     var ownerId = buffer.ReadString();
     var min = buffer.ReadUShort();
     var max = buffer.ReadUShort();
-    var map = buffer.ReadString();
+    var sceneName = buffer.ReadString();
 
-    var scene = new RagonScene(_client, _playerCache, _entityCache);
+    var scene = new RagonScene(_client, _playerCache, _entityCache, sceneName);
     var roomInfo = new RagonRoomInformation(roomId, localId, ownerId, min, max);
     var room = new RagonRoom(_client, _entityCache, _playerCache, roomInfo, scene);
 
     _playerCache.SetOwnerAndLocal(ownerId, localId);
     _client.AssignRoom(room);
-    _listenerList.OnLevel(map);
+    
+    _listenerList.OnSceneRequest(sceneName);
   }
 }

Ragon.Client/Sources/Handler/LoadSceneHandler.cs

@@ -38,7 +38,8 @@ internal class SceneLoadHandler: Handler
     var room = _client.Room;
     
     room.Cleanup();
+    room.Update(sceneName);
     
-    _listenerList.OnLevel(sceneName);
+    _listenerList.OnSceneRequest(sceneName);
   }
 }

Ragon.Client/Sources/Handler/OwnershipRoomHandler.cs

@@ -0,0 +1,46 @@
+/*
+ * 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 OwnershipRoomHandler: Handler
+{
+  private readonly RagonListenerList _listenerList;
+  private readonly RagonPlayerCache _playerCache;
+  private readonly RagonEntityCache _entityCache;
+  
+  public OwnershipRoomHandler(
+    RagonListenerList listenerList,
+    RagonPlayerCache playerCache,
+    RagonEntityCache entityCache)
+  {
+    _listenerList = listenerList;
+    _playerCache = playerCache;
+    _entityCache = entityCache;
+  }
+  
+  public void Handle(RagonBuffer buffer)
+  {
+    var newOwnerId = buffer.ReadUShort();
+    var player = _playerCache.GetPlayerByPeer(newOwnerId);
+
+    _playerCache.OnOwnershipChanged(newOwnerId);
+    _listenerList.OnOwnershipChanged(player);
+  }
+}

Ragon.Client/Sources/Handler/PlayerLeftHandler.cs

@@ -53,8 +53,9 @@ internal class PlayerLeftHandler : Handler
         toDeleteIds[i] = entityId;
       }
 
+      var emptyPayload = new RagonPayload(0);
       foreach (var id in toDeleteIds)
-        _entityCache.OnDestroy(id, new RagonPayload());
+        _entityCache.OnDestroy(id, emptyPayload);
     }
   }
 }

Ragon.Client/Sources/Handler/SnapshotHandler.cs

@@ -15,25 +15,29 @@
  */
 
 
+using System.Diagnostics;
 using Ragon.Protocol;
 
 namespace Ragon.Client;
 
 internal class SnapshotHandler : Handler
 {
-  private RagonClient _client;
+  private readonly IRagonEntityListener _entityListener;
-  private RagonListenerList _listenerList;
+  private readonly RagonClient _client;
-  private RagonEntityCache _entityCache;
+  private readonly RagonListenerList _listenerList;
-  private RagonPlayerCache _playerCache;
+  private readonly RagonEntityCache _entityCache;
+  private readonly RagonPlayerCache _playerCache;
 
   public SnapshotHandler(
     RagonClient ragonClient,
     RagonListenerList listenerList,
     RagonEntityCache entityCache,
-    RagonPlayerCache playerCache
+    RagonPlayerCache playerCache,
+    IRagonEntityListener entityListener
   )
   {
     _client = ragonClient;
+    _entityListener = entityListener;
     _listenerList = listenerList;
     _entityCache = entityCache;
     _playerCache = playerCache;
@@ -50,7 +54,10 @@ internal class SnapshotHandler : Handler
       var playerName = buffer.ReadString();
 
       _playerCache.AddPlayer(playerPeerId, playerId, playerName);
+
+      RagonLog.Trace($"Player {playerPeerId} - {playerId} - {playerName}");
     }
+
     var dynamicEntities = buffer.ReadUShort();
     RagonLog.Trace("Dynamic Entities: " + dynamicEntities);
     for (var i = 0; i < dynamicEntities; i++)
@@ -59,16 +66,29 @@ internal class SnapshotHandler : Handler
       var entityId = buffer.ReadUShort();
       var ownerPeerId = buffer.ReadUShort();
       var payloadSize = buffer.ReadUShort();
-      var player = _playerCache.GetPlayerByPeer(ownerPeerId);
       
-      var payload = new RagonPayload(payloadSize);
+      var player = _playerCache.GetPlayerByPeer(ownerPeerId);
-      payload.Read(buffer);
+      if (player == null)
+      {
+        RagonLog.Error($"Player not found with peerId: ${ownerPeerId}");
+        return;
+      }
 
-      var hasAuthority = _playerCache.LocalPlayer.Id == player.Id;
+      var hasAuthority = _playerCache.Local.Id == player.Id;
-      var entity = _entityCache.OnCreate(0, entityType, 0, entityId, hasAuthority);
+      var entity = _entityCache.TryGetEntity(0, entityType, 0, entityId, hasAuthority, out _);
+      
+      if (payloadSize > 0)
+      {
+        var payload = new RagonPayload(payloadSize);
+        payload.Read(buffer);
+       
+        entity.AttachPayload(payload);
+      }
+      
+      _entityListener.OnEntityCreated(entity);
       
       entity.Read(buffer);
-      entity.Attach(_client, entityId, entityType, hasAuthority, player, payload);
+      entity.Attach(_client, entityId, entityType, hasAuthority, player);
     }
 
     var staticEntities = buffer.ReadUShort();
@@ -80,18 +100,27 @@ internal class SnapshotHandler : Handler
       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 player = _playerCache.GetPlayerByPeer(ownerPeerId);
-      var entity = _entityCache.OnCreate(0, entityType, staticId, entityId, hasAuthority);
+      if (player == null)
+      {
+        RagonLog.Error($"Player not found with peerId: ${ownerPeerId}");
+        return;
+      }
+
+      var hasAuthority = _playerCache.Local.Id == player.Id;
+      var entity = _entityCache.TryGetEntity(0, entityType, staticId, entityId, hasAuthority, out _);
       
       entity.Read(buffer);
-      entity.Attach(_client, entityId, entityType, hasAuthority, player, payload);
+      entity.Attach(_client, entityId, entityType, hasAuthority, player);
     }
-    
+
-    _listenerList.OnJoined();
+    if (_client.Status == RagonStatus.LOBBY)
+    { 
+      _client.SetStatus(RagonStatus.ROOM);
+      _listenerList.OnJoined();
+    }
+
+    _listenerList.OnSceneLoaded();
   }
 }

Ragon.Client/Sources/IO/INetworkConnection.cs

@@ -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/Listener/IRagonConnectionListener.cs

@@ -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/IRagonListener.cs

@@ -18,14 +18,15 @@ namespace Ragon.Client
 {
   public interface IRagonListener : 
     IRagonAuthorizationListener, 
-    IRagonConnectedListener, 
+    IRagonConnectionListener, 
     IRagonFailedListener,
     IRagonJoinListener, 
     IRagonLeftListener, 
-    IRagonLevelListener, 
+    IRagonSceneListener, 
     IRagonOwnershipChangedListener,
     IRagonPlayerJoinListener, 
     IRagonPlayerLeftListener
   {
+    
   }
 }

Ragon.Client/Sources/Listener/IRagonSceneListener.cs

@@ -16,8 +16,7 @@
 
 namespace Ragon.Client;
 
-public enum DisconnectReason
+public interface IRagonSceneListener
 {
-  MANUAL,
+  void OnSceneLoaded(RagonClient client);
-  TIMEOUT,
 }

Ragon.Client/Sources/Listener/IRagonSceneRequestListener.cs

@@ -0,0 +1,6 @@
+namespace Ragon.Client;
+
+public interface IRagonSceneRequestListener
+{
+  void OnRequestScene(RagonClient client, string sceneName);
+}

Ragon.Client/Sources/RagonClient.cs

@@ -21,19 +21,19 @@ namespace Ragon.Client
   public sealed class RagonClient
   {
     private readonly INetworkConnection _connection;
-    private readonly IRagonEntityListener _entityListener;
+    private readonly NetworkStatistics _stats;
-    private readonly IRagonSceneCollector _sceneCollector;
+    private IRagonEntityListener _entityListener;
+    private IRagonSceneCollector _sceneCollector;
     private Handler[] _handlers;
     private RagonBuffer _readBuffer;
     private RagonBuffer _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 float _replicationRate = 0;
     private float _replicationTime = 0;
@@ -52,21 +52,15 @@ namespace Ragon.Client
 
     #region PUBLIC
 
-    public RagonClient(
+    public RagonClient(INetworkConnection connection, int rate)
-      INetworkConnection connection, 
-      IRagonEntityListener entityListener,
-      IRagonSceneCollector sceneCollector, 
-      int rate)
     {
-      _listenerList = new RagonListenerList(this);
-      _entityListener = entityListener;
-      _sceneCollector = sceneCollector;
-      
       _connection = connection;
       _connection.OnData += OnData;
       _connection.OnConnected += OnConnected;
       _connection.OnDisconnected += OnDisconnected;
 
+      listeners = new RagonListenerList(this);
+
       _replicationRate = (1000.0f / rate) / 1000.0f;
       _replicationTime = 0;
 
@@ -74,36 +68,55 @@ namespace Ragon.Client
       _stats = new NetworkStatistics();
       _status = RagonStatus.DISCONNECTED;
     }
-    
+
+
+    public void Configure(IRagonSceneCollector sceneCollector)
+    {
+      _sceneCollector = sceneCollector;
+    }
+
+    public void Configure(IRagonEntityListener listener)
+    {
+      _entityListener = listener;
+    }
+
     public void Connect(string address, ushort port, string protocol)
     {
+      if (_sceneCollector == null)
+      {
+        RagonLog.Error("Scene collector is not defined!");
+        return;
+      }
+
+      if (_entityListener == null)
+      {
+        RagonLog.Error("Entity Listener is not defined!");
+        return;
+      }
+
       _writeBuffer = new RagonBuffer();
       _readBuffer = new RagonBuffer();
       _session = new RagonSession(this, _readBuffer);
 
       _playerCache = new RagonPlayerCache();
-      _entityCache = new RagonEntityCache(this, _playerCache, _entityListener, _sceneCollector);
+      _entityCache = new RagonEntityCache(this, _playerCache, _sceneCollector);
 
       _handlers = new Handler[byte.MaxValue];
-      _handlers[(byte)RagonOperation.AUTHORIZED_SUCCESS] = new AuthorizeSuccessHandler(_listenerList);
+      _handlers[(byte)RagonOperation.AUTHORIZED_SUCCESS] = new AuthorizeSuccessHandler(this, listeners);
-      _handlers[(byte)RagonOperation.AUTHORIZED_FAILED] = new AuthorizeFailedHandler(_listenerList);
+      _handlers[(byte)RagonOperation.AUTHORIZED_FAILED] = new AuthorizeFailedHandler(listeners);
-      _handlers[(byte)RagonOperation.JOIN_SUCCESS] =
+      _handlers[(byte)RagonOperation.JOIN_SUCCESS] = new JoinSuccessHandler(this, _readBuffer, listeners, _playerCache, _entityCache);
-        new JoinSuccessHandler(this, _readBuffer, _listenerList, _playerCache, _entityCache);
+      _handlers[(byte)RagonOperation.JOIN_FAILED] = new JoinFailedHandler(listeners);
-      _handlers[(byte)RagonOperation.JOIN_FAILED] = new JoinFailedHandler(_listenerList);
+      _handlers[(byte)RagonOperation.LEAVE_ROOM] = new LeaveRoomHandler(this, listeners, _entityCache);
-      _handlers[(byte)RagonOperation.LEAVE_ROOM] = new LeaveRoomHandler(this, _listenerList, _entityCache);
+      _handlers[(byte)RagonOperation.OWNERSHIP_ROOM_CHANGED] = new OwnershipRoomHandler(listeners, _playerCache, _entityCache);
-      _handlers[(byte)RagonOperation.OWNERSHIP_CHANGED] =
+      _handlers[(byte)RagonOperation.OWNERSHIP_ENTITY_CHANGED] = new EntityOwnershipHandler(listeners, _playerCache, _entityCache);
-        new OwnershipHandler(_listenerList, _playerCache, _entityCache);
+      _handlers[(byte)RagonOperation.PLAYER_JOINED] = new PlayerJoinHandler(_playerCache, listeners);
-      _handlers[(byte)RagonOperation.PLAYER_JOINED] = new PlayerJoinHandler(_playerCache, _listenerList);
+      _handlers[(byte)RagonOperation.PLAYER_LEAVED] = new PlayerLeftHandler(_entityCache, _playerCache, listeners);
-      _handlers[(byte)RagonOperation.PLAYER_LEAVED] =
+      _handlers[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadHandler(this, listeners);
-        new PlayerLeftHandler(_entityCache, _playerCache, _listenerList);
+      _handlers[(byte)RagonOperation.CREATE_ENTITY] = new EntityCreateHandler(this, _playerCache, _entityCache, _entityListener);
-      _handlers[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadHandler(this, _listenerList);
+      _handlers[(byte)RagonOperation.REMOVE_ENTITY] = new EntityRemoveHandler(_entityCache);
-      _handlers[(byte)RagonOperation.CREATE_ENTITY] = new EntityCreateHandler(this, _playerCache, _entityCache);
-      _handlers[(byte)RagonOperation.DESTROY_ENTITY] = new EntityDestroyHandler(_entityCache);
       _handlers[(byte)RagonOperation.REPLICATE_ENTITY_STATE] = new StateEntityHandler(_entityCache);
-      _handlers[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] =
+      _handlers[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] = new EntityEventHandler(this, _playerCache, _entityCache);
-        new EntityEventHandler(this, _playerCache, _entityCache);
+      _handlers[(byte)RagonOperation.SNAPSHOT] = new SnapshotHandler(this, listeners, _entityCache, _playerCache, _entityListener);
-      _handlers[(byte)RagonOperation.SNAPSHOT] =
-        new SnapshotHandler(this, _listenerList, _entityCache, _playerCache);
 
       var protocolRaw = RagonVersion.Parse(protocol);
       _connection.Connect(address, port, protocolRaw);
@@ -114,19 +127,25 @@ namespace Ragon.Client
       _status = RagonStatus.DISCONNECTED;
       _room.Cleanup();
       _connection.Disconnect();
-      OnDisconnected(DisconnectReason.MANUAL);
+
+      OnDisconnected(RagonDisconnect.MANUAL);
     }
 
     public void Update(float dt)
     {
-      _replicationTime += dt;
+      if (_status != RagonStatus.DISCONNECTED)
-      if (_replicationTime >= _replicationRate)
       {
-        _entityCache.WriteState(_readBuffer);
+        _replicationTime += dt;
-        _replicationTime = 0;
+        if (_replicationTime >= _replicationRate)
+        {
+          _entityCache.WriteState(_readBuffer);
+          _replicationTime = 0;
+        }
+
+        _stats.Update(_connection.BytesSent, _connection.BytesReceived, _connection.Ping, dt);
       }
 
-      _stats.Update(_connection.BytesSent, _connection.BytesReceived, _connection.Ping, dt);
+      listeners.Update();
       _connection.Update();
     }
 
@@ -137,28 +156,30 @@ namespace Ragon.Client
       _connection.Dispose();
     }
 
-    public void AddListener(IRagonListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonListener listener) => listeners.Add(listener);
-    public void AddListener(IRagonAuthorizationListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonAuthorizationListener listener) => listeners.Add(listener);
-    public void AddListener(IRagonConnectedListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonConnectionListener listener) => listeners.Add(listener);
-    public void AddListener(IRagonFailedListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonFailedListener listener) => listeners.Add(listener);
-    public void AddListener(IRagonJoinListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonJoinListener listener) => listeners.Add(listener);
-    public void AddListener(IRagonLeftListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonLeftListener listener) => listeners.Add(listener);
-    public void AddListener(IRagonLevelListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonOwnershipChangedListener listener) => listeners.Add(listener);
-    public void AddListener(IRagonOwnershipChangedListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonPlayerJoinListener listener) => listeners.Add(listener);
-    public void AddListener(IRagonPlayerJoinListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonPlayerLeftListener listener) => listeners.Add(listener);
-    public void AddListener(IRagonPlayerLeftListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonSceneListener listener) => listeners.Add(listener);
+    public void AddListener(IRagonSceneRequestListener 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(IRagonSceneListener listener) => listeners.Remove(listener);
+    public void RemoveListener(IRagonSceneRequestListener listener) => listeners.Remove(listener);
 
-    public void RemoveListener(IRagonListener listener) => _listenerList.Remove(listener);
-    public void RemoveListener(IRagonAuthorizationListener listener) => _listenerList.Remove(listener);
-    public void RemoveListener(IRagonConnectedListener listener) => _listenerList.Remove(listener);
-    public void RemoveListener(IRagonFailedListener listener) => _listenerList.Remove(listener);
-    public void RemoveListener(IRagonJoinListener listener) => _listenerList.Remove(listener);
-    public void RemoveListener(IRagonLeftListener listener) => _listenerList.Remove(listener);
-    public void RemoveListener(IRagonLevelListener listener) => _listenerList.Remove(listener);
-    public void RemoveListener(IRagonOwnershipChangedListener listener) => _listenerList.Remove(listener);
-    public void RemoveListener(IRagonPlayerJoinListener listener) => _listenerList.Remove(listener);
-    public void RemoveListener(IRagonPlayerLeftListener listener) => _listenerList.Remove(listener);
-    
     #endregion
 
     #region INTERNAL
@@ -166,7 +187,11 @@ namespace Ragon.Client
     internal void AssignRoom(RagonRoom room)
     {
       _room = room;
-      _status = RagonStatus.ROOM;
+    }
+
+    internal void SetStatus(RagonStatus status)
+    {
+      _status = status;
     }
 
     #endregion
@@ -177,15 +202,15 @@ namespace Ragon.Client
     {
       RagonLog.Trace("Connected");
 
-      _listenerList.OnConnected();
+      listeners.OnConnected();
       _status = RagonStatus.CONNECTED;
     }
 
-    private void OnDisconnected(DisconnectReason reason)
+    private void OnDisconnected(RagonDisconnect reason)
     {
       RagonLog.Trace($"Disconnected: {reason}");
 
-      _listenerList.OnDisconnected();
+      listeners.OnDisconnected(reason);
       _status = RagonStatus.DISCONNECTED;
     }
 

Ragon.Client/Sources/RagonEntityCache.cs

@@ -24,67 +24,78 @@ public sealed class RagonEntityCache
   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, 
+    RagonClient client,
-    RagonPlayerCache playerCache, 
+    RagonPlayerCache playerCache,
-    IRagonEntityListener listener,
     IRagonSceneCollector sceneCollector
-    )
+  )
   {
     _client = client;
-    _entityListener = listener;
     _sceneCollector = sceneCollector;
     _playerCache = playerCache;
   }
 
-  public RagonEntity FindById(ushort id)
+  public bool TryGetEntity(ushort id, out RagonEntity entity)
   {
-    return _entityMap[id];
+    return _entityMap.TryGetValue(id, out entity);
   }
-  
+
-  public void Create(RagonEntity entity, IRagonPayload? spawnPayload)
+  public void Create(RagonEntity entity, RagonPayload spawnPayload)
   {
-    var attachId = (ushort) (_playerCache.LocalPlayer.PeerId + _localEntitiesCounter++) ;
+    var attachId = (ushort)(_playerCache.Local.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);
+    buffer.WriteByte((byte)entity.Authority);
 
     entity.State.WriteInfo(buffer);
-    
+
-    spawnPayload?.Serialize(buffer);
+    spawnPayload?.Write(buffer);
-    
+
     _pendingEntities.Add(attachId, entity);
-    
+
     var sendData = buffer.ToArray();
     _client.Reliable.Send(sendData);
   }
 
-  public void Destroy(RagonEntity entity, IRagonPayload? destroyPayload)
+  public void Transfer(RagonEntity entity, RagonPlayer player)
+  {
+    var buffer = _client.Buffer;
+
+    buffer.Clear();
+    buffer.WriteOperation(RagonOperation.TRANSFER_ENTITY_OWNERSHIP);
+    buffer.WriteUShort(entity.Id);
+    buffer.WriteUShort(player.PeerId);
+
+    var sendData = buffer.ToArray();
+    _client.Reliable.Send(sendData);
+  }
+
+  public void Destroy(RagonEntity entity, RagonPayload 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.WriteOperation(RagonOperation.REMOVE_ENTITY);
     buffer.WriteUShort(entity.Id);
 
-    destroyPayload?.Serialize(buffer);
+    destroyPayload?.Write(buffer);
 
     var sendData = buffer.ToArray();
     _client.Reliable.Send(sendData);
@@ -93,7 +104,7 @@ public sealed class RagonEntityCache
   internal void WriteState(RagonBuffer buffer)
   {
     var changedEntities = 0u;
-    
+
     buffer.Clear();
     buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_STATE);
 
@@ -105,34 +116,34 @@ public sealed class RagonEntityCache
       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);
+    buffer.WriteUShort((ushort)entities.Length);
     foreach (var entity in entities)
     {
       buffer.WriteUShort(entity.Type);
-      buffer.WriteByte((byte) entity.Authority);
+      buffer.WriteByte((byte)entity.Authority);
       buffer.WriteUShort(entity.SceneId);
-      
+
       entity.State.WriteInfo(buffer);
-      
+
       _sceneEntities.Add(entity.SceneId, entity);
     }
   }
@@ -140,15 +151,15 @@ public sealed class RagonEntityCache
   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();
+    var payload = new RagonPayload(0);
     foreach (var ent in _entityList)
       ent.Detach(payload);
 
@@ -156,53 +167,58 @@ public sealed class RagonEntityCache
     _entityList.Clear();
   }
   
-  internal RagonEntity OnCreate(ushort attachId, ushort entityType, ushort sceneId, ushort entityId, bool hasAuthority)
+  internal RagonEntity TryGetEntity(ushort attachId, ushort entityType, ushort sceneId, ushort entityId, bool hasAuthority, out bool hasCreated)
   {
     if (sceneId > 0)
     {
-      if (_sceneEntities.TryGetValue(sceneId, out var entity))
+      if (_sceneEntities.TryGetValue(sceneId, out var sceneEntity))
       {
-        _entityMap.Add(entityId, entity);
+        _entityMap.Add(entityId, sceneEntity);
-        
+
         if (hasAuthority)
-          _entityList.Add(entity);
+          _entityList.Add(sceneEntity);
         
-        return entity;
+        hasCreated = false;
+        
+        return sceneEntity;
       }
     }
-    
-    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;
+    if (_pendingEntities.TryGetValue(attachId, out var pendingEntity))
+    {
+      _pendingEntities.Remove(attachId);
+      _entityMap.Add(entityId, pendingEntity);
+
+      if (hasAuthority)
+        _entityList.Add(pendingEntity);
+
+      hasCreated = false;
+
+      return pendingEntity;
     }
+
+
+    var entity = new RagonEntity(entityType, sceneId);
+    
+    _entityMap.Add(entityId, entity);
+    
+    if (hasAuthority)
+      _entityList.Add(entity);
+
+    hasCreated = true;
+    
+    return entity;
   }
-  
+
 
   internal void OnDestroy(ushort entityId, RagonPayload payload)
   {
-    if (_entityMap.Remove(entityId, out var ragonEntity))
+    if (_entityMap.TryGetValue(entityId, out var entity))
     {
-      _entityList.Remove(ragonEntity);
+      _entityMap.Remove(entityId);
-      
+      _entityList.Remove(entity);
-      ragonEntity.Detach(payload);
+
+      entity.Detach(payload);
     }
   }
 
@@ -210,7 +226,7 @@ public sealed class RagonEntityCache
   {
     if (_entityMap.TryGetValue(entityId, out var entity))
       entity.Read(buffer);
-    else 
+    else
       RagonLog.Warn($"Entity {entityId} not found!");
   }
 
@@ -218,15 +234,24 @@ public sealed class RagonEntityCache
   {
     if (_entityMap.TryGetValue(entityId, out var entity))
       entity.Event(eventCode, player, buffer);
-    else 
+    else
       RagonLog.Warn($"Entity {entityId} not found!");
   }
 
   internal void OnOwnershipChanged(RagonPlayer player, ushort entityId)
   {
     if (_entityMap.TryGetValue(entityId, out var entity))
+    {
+      if (player.IsLocal)
+        _entityList.Add(entity);
+      else
+        _entityList.Remove(entity);
+
       entity.OnOwnershipChanged(player);
+    }
     else
+    {
       RagonLog.Warn($"Entity {entityId} not found!");
+    }
   }
 }

Ragon.Client/Sources/RagonEventCache.cs

@@ -26,8 +26,12 @@ public class RagonEventCache
   public ushort GetEventCode<TEvent>(TEvent _) where TEvent : IRagonEvent
   {
     var type = typeof(TEvent);
-    var evntCode = _eventsRegistryByType[type];
+    if (!_eventsRegistryByType.TryGetValue(type, out var eventCode))
-    return evntCode;
+    {
+      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

@@ -14,20 +14,24 @@
  * limitations under the License.
  */
 
+using Ragon.Protocol;
+
 namespace Ragon.Client
 {
   internal class RagonListenerList
   {
     private readonly RagonClient _client;
     private readonly List<IRagonAuthorizationListener> _authorizationListeners = new();
-    private readonly List<IRagonConnectedListener> _connectionListeners = 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<IRagonLevelListener> _levelListeners = new();
+    private readonly List<IRagonSceneListener> _sceneListeners = new();
+    private readonly List<IRagonSceneRequestListener> _sceneRequestListeners = new();
     private readonly List<IRagonOwnershipChangedListener> _ownershipChangedListeners = new();
     private readonly List<IRagonPlayerJoinListener> _playerJoinListeners = new();
     private readonly List<IRagonPlayerLeftListener> _playerLeftListeners = new();
+    private readonly List<Action> _delayedActions = new();
     
     public RagonListenerList(RagonClient client)
     {
@@ -41,7 +45,7 @@ namespace Ragon.Client
       _failedListeners.Add(listener);
       _joinListeners.Add(listener);
       _leftListeners.Add(listener);
-      _levelListeners.Add(listener);
+      _sceneListeners.Add(listener);
       _ownershipChangedListeners.Add(listener);
       _playerJoinListeners.Add(listener);
       _playerLeftListeners.Add(listener);
@@ -49,23 +53,40 @@ namespace Ragon.Client
 
     public void Remove(IRagonListener listener)
     {
-      _authorizationListeners.Remove(listener);
+      _delayedActions.Add(() =>
-      _connectionListeners.Remove(listener);
+      {
-      _failedListeners.Remove(listener);
+        _authorizationListeners.Remove(listener);
-      _joinListeners.Remove(listener);
+        _connectionListeners.Remove(listener);
-      _leftListeners.Remove(listener);
+        _failedListeners.Remove(listener);
-      _levelListeners.Remove(listener);
+        _joinListeners.Remove(listener);
-      _ownershipChangedListeners.Remove(listener);
+        _leftListeners.Remove(listener);
-      _playerJoinListeners.Remove(listener);
+        _sceneListeners.Remove(listener);
-      _playerLeftListeners.Remove(listener);
+        _ownershipChangedListeners.Remove(listener);
+        _playerJoinListeners.Remove(listener);
+        _playerLeftListeners.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(IRagonConnectedListener listener)
+    public void Add(IRagonSceneRequestListener listener)
+    {
+      _sceneRequestListeners.Add(listener);
+    }
+    
+    public void Add(IRagonConnectionListener listener)
     {
       _connectionListeners.Add(listener);
     }
@@ -85,9 +106,9 @@ namespace Ragon.Client
       _leftListeners.Add(listener);
     }
     
-    public void Add(IRagonLevelListener  listener)
+    public void Add(IRagonSceneListener  listener)
     {
-      _levelListeners.Add(listener);
+      _sceneListeners.Add(listener);
     }
     
     public void Add(IRagonOwnershipChangedListener  listener)
@@ -105,52 +126,58 @@ namespace Ragon.Client
       _playerLeftListeners.Add(listener);
     }
 
-    public void Remove(IRagonAuthorizationListener listener)
+    public void Remove(IRagonSceneRequestListener listener)
     {
-      _authorizationListeners.Remove(listener);
+      _delayedActions.Add(() => _sceneRequestListeners.Remove(listener));
     }
     
-    public void Remove(IRagonConnectedListener listener)
+    public void Remove(IRagonAuthorizationListener listener)
     {
-      _connectionListeners.Remove(listener);
+      _delayedActions.Add(() => _authorizationListeners.Remove(listener));
+    }
+    
+    public void Remove(IRagonConnectionListener listener)
+    {
+      
+      _delayedActions.Add(() => _connectionListeners.Remove(listener));
     }
     
     public void Remove(IRagonFailedListener listener)
     {
-      _failedListeners.Remove(listener);
+      _delayedActions.Add(() => _failedListeners.Remove(listener));
     }
     
     public void Remove(IRagonJoinListener listener)
     {
-      _joinListeners.Remove(listener);
+      _delayedActions.Add(() => _joinListeners.Remove(listener));
     }
     
     public void Remove(IRagonLeftListener  listener)
     {
-      _leftListeners.Remove(listener);
+      _delayedActions.Add(() => _leftListeners.Remove(listener));
     }
     
-    public void Remove(IRagonLevelListener  listener)
+    public void Remove(IRagonSceneListener  listener)
     {
-      _levelListeners.Remove(listener);
+      _delayedActions.Add(() => _sceneListeners.Remove(listener));
     }
     
     public void Remove(IRagonOwnershipChangedListener  listener)
     {
-      _ownershipChangedListeners.Remove(listener);
+      _delayedActions.Add(() => _ownershipChangedListeners.Remove(listener));
     }
 
     public void Remove(IRagonPlayerJoinListener  listener)
     {
-      _playerJoinListeners.Remove(listener);
+      _delayedActions.Add(() => _playerJoinListeners.Remove(listener));
     }
     
     public void Remove(IRagonPlayerLeftListener  listener)
     {
-      _playerLeftListeners.Remove(listener);
+      _delayedActions.Add(() => _playerLeftListeners.Remove(listener));
     }
 
-    public void OnAuthorizationSuccess(string playerId, string playerName)
+    public void OnAuthorizationSuccess(string playerId, string playerName, string payload)
     {
       foreach (var listener in _authorizationListeners)
         listener.OnAuthorizationSuccess(_client, playerId, playerName);
@@ -192,10 +219,16 @@ namespace Ragon.Client
         listener.OnPlayerJoined(_client, player);
     }
 
-    public void OnLevel(string sceneName)
+    public void OnSceneLoaded()
     {
-      foreach (var listener in _levelListeners)
+      foreach (var listener in _sceneListeners)
-        listener.OnLevel(_client, sceneName);
+        listener.OnSceneLoaded(_client);
+    }
+    
+    public void OnSceneRequest(string sceneName)
+    {
+      foreach (var listener in _sceneRequestListeners)
+        listener.OnRequestScene(_client, sceneName);
     }
 
     public void OnJoined()
@@ -210,10 +243,10 @@ namespace Ragon.Client
         listener.OnConnected(_client);
     }
 
-    public void OnDisconnected()
+    public void OnDisconnected(RagonDisconnect disconnect)
     {
       foreach (var listener in _connectionListeners)
-        listener.OnDisconnected(_client);
+        listener.OnDisconnected(_client, disconnect);
     }
   }
 }

Ragon.Client/Sources/RagonPlayer.cs

@@ -23,13 +23,13 @@ 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 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;
     } 

Ragon.Client/Sources/RagonPlayerCache.cs

@@ -18,12 +18,13 @@ namespace Ragon.Client;
 
 public sealed class RagonPlayerCache
 {
-  private List<RagonPlayer> _players = new List<RagonPlayer>();
+  private readonly List<RagonPlayer> _players = new();
-  private Dictionary<string, RagonPlayer> _playersById = new();
+  private readonly Dictionary<string, RagonPlayer> _playersById = new();
-  private Dictionary<ushort, RagonPlayer> _playersByConnection = 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];
@@ -50,8 +51,8 @@ public sealed class RagonPlayerCache
 
     var player = new RagonPlayer(peerId, playerId, playerName, isOwner, isLocal);
 
-    if (player.IsMe)
+    if (player.IsLocal)
-      LocalPlayer = player;
+      Local = player;
 
     if (player.IsRoomOwner)
       Owner = player;
@@ -63,20 +64,23 @@ public sealed class RagonPlayerCache
 
   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;
+      }
     }
   }
 

Ragon.Client/Sources/RagonRoom.cs

@@ -27,10 +27,12 @@ namespace Ragon.Client
     public string Id => _information.RoomId;
     public int MinPlayers => _information.Min;
     public int MaxPlayers => _information.Max;
+    public string Scene => _scene.Name;
 
-    public RagonPlayer Local => _playerCache.LocalPlayer;
+    public IReadOnlyList<RagonPlayer> Players => _playerCache.Players;
+    public RagonPlayer Local => _playerCache.Local;
     public RagonPlayer Owner => _playerCache.Owner;
-
+    
     public RagonRoom(RagonClient client,
       RagonEntityCache entityCache,
       RagonPlayerCache playerCache,
@@ -50,13 +52,19 @@ namespace Ragon.Client
       _playerCache.Cleanup();
     }
 
-    public void LoadScene(string map) => _scene.Load(map);
+    internal void Update(string sceneName)
+    {
+      _scene.Update(sceneName);
+    }
+
+    public void LoadScene(string sceneName) => _scene.Load(sceneName);
     public void SceneLoaded() => _scene.SceneLoaded();
 
     public void CreateEntity(RagonEntity entity) => CreateEntity(entity, null);
-    public void CreateEntity(RagonEntity entity, IRagonPayload? payload) => _entityCache.Create(entity, payload);
+    public void CreateEntity(RagonEntity entity, RagonPayload payload) => _entityCache.Create(entity, payload);
+    public void TransferEntity(RagonEntity entity, RagonPlayer player) => _entityCache.Transfer(entity, player);
 
     public void DestroyEntity(RagonEntity entityId) => DestroyEntity(entityId, null);
-    public void DestroyEntity(RagonEntity entityId, IRagonPayload? payload) => _entityCache.Destroy(entityId, payload);
+    public void DestroyEntity(RagonEntity entityId, RagonPayload payload) => _entityCache.Destroy(entityId, payload);
   }
 }

Ragon.Client/Sources/RagonScene.cs

@@ -20,24 +20,33 @@ namespace Ragon.Client;
 
 public class RagonScene
 {
+  public string Name { get; private set; }
+  
   private readonly RagonClient _client;
   private readonly RagonEntityCache _entityCache;
   private readonly RagonPlayerCache _playerCache;
   
-  public RagonScene(RagonClient client, RagonPlayerCache playerCache, RagonEntityCache entityCache)
+  public RagonScene(RagonClient client, RagonPlayerCache playerCache, RagonEntityCache entityCache, string sceneName)
   {
+    Name = sceneName;
+    
     _client = client;
     _playerCache = playerCache;
     _entityCache = entityCache;
   }
 
-  internal void Load(string map)
+  internal void Update(string scene)
+  {
+    Name = scene;
+  }
+  
+  internal void Load(string sceneName)
   {
     var buffer = _client.Buffer;
     
     buffer.Clear();
     buffer.WriteOperation(RagonOperation.LOAD_SCENE);
-    buffer.WriteString(map);
+    buffer.WriteString(sceneName);
 
     var sendData = buffer.ToArray();
     _client.Reliable.Send(sendData);

Ragon.Client/Sources/RagonSession.cs

@@ -29,9 +29,9 @@ namespace Ragon.Client
       _buffer = buffer;
     }
 
-    public void CreateOrJoin(string map, int minPlayers, int maxPlayers)
+    public void CreateOrJoin(string sceneName, int minPlayers, int maxPlayers)
     {
-      var parameters = new RagonRoomParameters() {Map = map, Min = minPlayers, Max = maxPlayers};
+      var parameters = new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers};
       CreateOrJoin(parameters);
     }
     
@@ -46,14 +46,14 @@ namespace Ragon.Client
       _client.Reliable.Send(sendData);
     }
 
-    public void Create(string map, int minPlayers, int maxPlayers)
+    public void Create(string sceneName, int minPlayers, int maxPlayers)
     {
-      Create(null, new RagonRoomParameters() {Map = map, Min = minPlayers, Max = maxPlayers});
+      Create(null, new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers});
     }
 
-    public void Create(string roomId, string map, int minPlayers, int maxPlayers)
+    public void Create(string roomId, string sceneNa, int minPlayers, int maxPlayers)
     {
-      Create(roomId, new RagonRoomParameters() {Map = map, Min = minPlayers, Max = maxPlayers});
+      Create(roomId, new RagonRoomParameters() {Scene = sceneNa, Min = minPlayers, Max = maxPlayers});
     }
     
     public  void Create(string roomId, RagonRoomParameters parameters)
@@ -93,13 +93,13 @@ 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/Utils/CompressorExtension.cs

@@ -0,0 +1,27 @@
+using Ragon.Client.Compressor;
+using Ragon.Protocol;
+
+namespace Ragon.Client.Utils;
+
+public static class CompressorExtension
+{
+  public static float Read(this FloatCompressor compressor, RagonBuffer buffer)
+  {
+    return compressor.Decompress(buffer.Read(compressor.RequiredBits));
+  }
+
+  public static void Write(this FloatCompressor compressor, RagonBuffer buffer, float value)
+  {
+    buffer.Write(compressor.Compress(value), compressor.RequiredBits);
+  }
+  
+  public static float Read(this IntCompressor compressor, RagonBuffer buffer)
+  {
+    return compressor.Decompress(buffer.Read(compressor.RequiredBits));
+  }
+
+  public static void Write(this IntCompressor compressor, RagonBuffer buffer, int value)
+  {
+    buffer.Write(compressor.Compress(value), compressor.RequiredBits);
+  }
+}

Ragon.Protocol/Ragon.Protocol.csproj

@@ -4,8 +4,16 @@
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>disable</Nullable>
         <LangVersion>8</LangVersion>
-        <TargetFramework>netstandard2.1</TargetFramework>
         <RootNamespace>Ragon.Common</RootNamespace>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Version>1.2.4-rc</Version>
+        <Title>Ragon.Protocol</Title>
+        <Copyright>Eduard Kargin</Copyright>
+        <PackageProjectUrl>https://ragon-server.com</PackageProjectUrl>
+        <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 +24,8 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <OutputPath>C:\Users\edmand46\RagonProjects\ragon-unity-sdk\Assets\Ragon-Unity-SDK\Runtime\Plugins</OutputPath>
+      <OutputPath></OutputPath>
-      <DefineConstants>TRACE;NETSTACK_SPAN</DefineConstants>
+      <DefineConstants>TRACE;</DefineConstants>
       <DebugType>none</DebugType>
     </PropertyGroup>
 </Project>

Ragon.Protocol/Sources/RagonBuffer.cs

@@ -58,7 +58,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 
@@ -245,7 +244,7 @@ namespace Ragon.Protocol
 
       if (currentBucketIndex + 1 >= _buckets.Length)
         Resize(1);
-      
+
       _buckets[currentBucketIndex] = (uint)result;
       _buckets[currentBucketIndex + 1] = (uint)(result >> 32);
 
@@ -290,15 +289,15 @@ namespace Ragon.Protocol
 
       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;
-      
+
       for (int i = 0; i < limit; i++)
       {
         var dataSize = capacity > 32 ? 32 : capacity;
@@ -306,22 +305,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 +330,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 +353,18 @@ namespace Ragon.Protocol
       _write = 0;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void FromBuffer(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;

Ragon.Protocol/Sources/RagonDisconnect.cs

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

Ragon.Protocol/Sources/RagonOperation.cs

@@ -26,7 +26,8 @@ namespace Ragon.Protocol
     CREATE_ROOM,
     JOIN_ROOM,
     LEAVE_ROOM,
-    OWNERSHIP_CHANGED,
+    OWNERSHIP_ENTITY_CHANGED,
+    OWNERSHIP_ROOM_CHANGED,
     JOIN_SUCCESS,
     JOIN_FAILED,
     LOAD_SCENE,
@@ -34,9 +35,11 @@ namespace Ragon.Protocol
     PLAYER_JOINED,
     PLAYER_LEAVED,
     CREATE_ENTITY,
-    DESTROY_ENTITY,
+    REMOVE_ENTITY,
     SNAPSHOT,
     REPLICATE_ENTITY_STATE,
     REPLICATE_ENTITY_EVENT,
+    TRANSFER_ROOM_OWNERSHIP,
+    TRANSFER_ENTITY_OWNERSHIP,
   }
 }

Ragon.Protocol/Sources/RagonRoomParameters.cs

@@ -19,20 +19,20 @@ namespace Ragon.Protocol
 {
   public class RagonRoomParameters: IRagonSerializable
   {
-    public string Map { get; set; }
+    public string Scene { get; set; }
     public int Min { get; set; } 
     public int Max { get; set; } 
     
     public void Serialize(RagonBuffer buffer)
     {
-      buffer.WriteString(Map);
+      buffer.WriteString(Scene);
       buffer.WriteInt(Min, 1, 32);
       buffer.WriteInt(Max, 1, 32);
     }
 
     public void Deserialize(RagonBuffer buffer)
     {
-      Map = buffer.ReadString();
+      Scene = buffer.ReadString();
       Min = buffer.ReadInt(1, 32);
       Max = buffer.ReadInt(1, 32);
     }

Ragon.Protocol/Sources/RagonVersion.cs

@@ -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/Ragon.Relay.csproj

@@ -24,7 +24,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Ragon.Server.ENet\Ragon.Server.ENet.csproj" />
-      <ProjectReference Include="..\Ragon.Server.DotNetWebSockets\Ragon.Server.DotNetWebSockets.csproj" />
+      <ProjectReference Include="..\Ragon.Server.WebSocketServer\Ragon.Server.WebSocketServer.csproj" />
       <ProjectReference Include="..\Ragon.Server\Ragon.Server.csproj" />
     </ItemGroup>
 

Ragon.Relay/Sources/Command/KickPlayerCommand.cs

@@ -0,0 +1,6 @@
+namespace Ragon.Relay;
+
+public class KickPlayerCommand
+{
+  public string Id;
+}

Ragon.Relay/Sources/Relay.cs

@@ -17,8 +17,9 @@
 using NLog;
 using Ragon.Server;
 using Ragon.Server.ENet;
-using Ragon.Server.DotNetWebsockets;
+using Ragon.Server.WebSocketServer;
-
+using Ragon.Server.IO;
+using Ragon.Server.Plugin;
 
 namespace Ragon.Relay;
 
@@ -29,24 +30,22 @@ public class Relay
     var logger = LogManager.GetLogger("Ragon.Relay");
     logger.Info("Relay Application");
 
-    var configuration = Configuration.Load("relay.config.json");
+    var configuration = RagonServerConfiguration.Load("relay.config.json");
-    var serverType = Configuration.GetServerType(configuration.ServerType);
+    var serverType = RagonServerConfiguration.GetServerType(configuration.ServerType);
 
-    INetworkServer server = null;
+    INetworkServer networkServer = new ENetServer();
+    IServerPlugin plugin = new RelayServerPlugin();
     switch (serverType)
     {
       case ServerType.ENET:
-        server = new ENetServer();
+        networkServer = new ENetServer();
         break;
       case ServerType.WEBSOCKET:
-        server = new DotNetWebSocketServer();
+        networkServer = new WebSocketServer();
-        break;
-      default:
-        server = new ENetServer();
         break;
     }
 
-    var relay = new RagonServer(server, configuration);
+    var relay = new RagonServer(networkServer, plugin, configuration);
     logger.Info("Started");
     relay.Start();
   }

Ragon.Relay/Sources/RelayRoomPlugin.cs

@@ -0,0 +1,37 @@
+using System;
+using Ragon.Server;
+using Ragon.Server.Entity;
+using Ragon.Server.Plugin;
+using Ragon.Server.Room;
+
+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");
+  }
+
+  public bool OnEntityCreate(RagonRoomPlayer creator, RagonEntity entity)
+  {
+    Console.WriteLine($"Entity created: {entity.Id}");
+    return true;
+  }
+
+  public bool OnEntityRemove(RagonRoomPlayer destroyer, RagonEntity entity)
+  {
+    Console.WriteLine($"Entity destroyed: {entity.Id}");
+    return true;
+  }
+}

Ragon.Relay/Sources/RelayServerPlugin.cs

@@ -0,0 +1,24 @@
+using System;
+using Newtonsoft.Json;
+using Ragon.Server.Plugin;
+
+namespace Ragon.Relay;
+
+public class RelayServerPlugin: BaseServerPlugin
+{
+  public override bool OnCommand(string command, string payload)
+  {
+    Console.WriteLine(command);
+    if (command == "kick-player")
+    {
+      var commandPayload = JsonConvert.DeserializeObject<KickPlayerCommand>(payload);
+      var player = Server.GetPlayerById(commandPayload.Id);
+      if (player != null)
+        player.Connection.Close();
+      else
+        Console.WriteLine($"Player not found with Id {commandPayload.Id}");
+    }
+    
+    return true;
+  }
+}

Ragon.Relay/relay.config.json

@@ -3,8 +3,18 @@
   "serverType": "enet",
   "serverTickRate": 30,
   "gameProtocol": "1.0.0",
-  "port": 5001,
+  "port": 5000,
+  "httpPort": 5001,
+  "httpKey": "defaultkey",
   "limitConnections": 4095,
   "limitPlayersPerRoom": 20,
-  "limitRooms": 200
+  "limitRooms": 200,
+  "limitBufferedEvents": 50,
+  "webHooks":
+  {
+    "room-created": "http://127.0.0.1:3000/service/create-room",
+    "room-removed": "http://127.0.0.1:3000/service/remove-room",
+    "room-joined": "http://127.0.0.1:3000/service/join-room",
+    "room-leaved": "http://127.0.0.1:3000/service/leave-room"
+  }
 }

Ragon.Server.ENet/Ragon.Server.ENet.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Ragon.ENet</RootNamespace>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="ENet-CSharp" Version="2.4.8" />
-      <PackageReference Include="NLog" Version="5.1.1" />
+      <PackageReference Include="NLog" Version="5.2.2" />
     </ItemGroup>
 
     <ItemGroup>

Ragon.Server.ENet/Sources/ENetConnection.cs

@@ -15,6 +15,7 @@
  */
 
 using ENet;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.ENet;
 
@@ -23,11 +24,19 @@ public sealed class ENetConnection: INetworkConnection
   public ushort Id { get; }
   public INetworkChannel Reliable { get; private set; }
   public INetworkChannel Unreliable { get; private set; }
+  private Peer _peer;
   
   public ENetConnection(Peer peer)
   {
+    _peer = peer;
+    
     Id = (ushort) peer.ID;
     Reliable = new ENetReliableChannel(peer, 0);
     Unreliable = new ENetUnreliableChannel(peer, 1);
   }
+  
+  public void Close()
+  {
+    _peer.Disconnect(0);
+  }
 }

Ragon.Server.ENet/Sources/ENetReliableChannel.cs

@@ -15,6 +15,7 @@
  */
 
 using ENet;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.ENet;
 

Ragon.Server.ENet/Sources/ENetServer.cs

@@ -17,6 +17,7 @@
 using ENet;
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.ENet
 {

Ragon.Server.ENet/Sources/ENetUnreliableChannel.cs

@@ -15,6 +15,7 @@
  */
 
 using ENet;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.ENet;
 

Ragon.Server.WebSocketServer/Ragon.Server.WebSocketServer.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Ragon.WebSockets</RootNamespace>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="NLog" Version="5.1.1" />
+      <PackageReference Include="NLog" Version="5.2.2" />
     </ItemGroup>
 
     <ItemGroup>

Ragon.Server.WebSocketServer/Sources/WebSocketConnection.cs

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-using System.Net.WebSockets;
 using NLog;
+using System.Net.WebSockets;
+using Ragon.Server.IO;
 
-namespace Ragon.Server.DotNetWebsockets;
+namespace Ragon.Server.WebSocketServer;
 
 public sealed class WebSocketConnection : INetworkConnection
 {
@@ -43,6 +44,11 @@ public sealed class WebSocketConnection : INetworkConnection
         Unreliable = unreliableChannel;
     }
 
+    public void Close()
+    {
+        Socket.CloseAsync(WebSocketCloseStatus.NormalClosure, null, CancellationToken.None);
+    }
+    
     public async Task Flush()
     {
         foreach (var channel in _channels)

Ragon.Server.WebSocketServer/Sources/WebSocketReliableChannel.cs

@@ -15,9 +15,9 @@
  */
 
 using System.Net.WebSockets;
-using Ragon.Server;
+using Ragon.Server.IO;
 
-namespace Ragon.Server.DotNetWebsockets;
+namespace Ragon.Server.WebSocketServer;
 
 public class WebSocketReliableChannel : INetworkChannel
 {

Ragon.Server.WebSocketServer/Sources/WebSocketServer.cs

@@ -18,10 +18,11 @@ using System.Net;
 using System.Net.WebSockets;
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.IO;
 
-namespace Ragon.Server.DotNetWebsockets;
+namespace Ragon.Server.WebSocketServer;
 
-public class DotNetWebSocketServer : INetworkServer
+public class WebSocketServer : INetworkServer
 {
   public Executor Executor => _executor;
   
@@ -34,7 +35,7 @@ public class DotNetWebSocketServer : INetworkServer
   private List<WebSocketConnection> _activeConnections;
   private CancellationTokenSource _cancellationTokenSource;
   
-  public DotNetWebSocketServer()
+  public WebSocketServer()
   {
     _sequencer = new Stack<ushort>();
     _connections = Array.Empty<WebSocketConnection>();

Ragon.Server/Ragon.Server.csproj

@@ -1,19 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Ragon.Core</RootNamespace>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Version>1.2.4-rc</Version>
+        <Title>Ragon.Server</Title>
+        <Copyright>Eduard Kargin</Copyright>
+        <PackageProjectUrl>https://ragon-server.com</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
+        <RepositoryType>Source</RepositoryType>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <LangVersion>10</LangVersion>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-      <PackageReference Include="NLog" Version="5.1.1" />
+        <PackageReference Include="NLog" Version="5.2.2" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Ragon.Protocol\Ragon.Protocol.csproj" />
+        <ProjectReference Include="..\Ragon.Protocol\Ragon.Protocol.csproj" />
     </ItemGroup>
 
 </Project>

Ragon.Server/Sources/Entity/IRagonEntity.cs

@@ -0,0 +1,16 @@
+using Ragon.Protocol;
+using Ragon.Server.Room;
+
+namespace Ragon.Server.Entity;
+
+public interface IRagonEntity
+{
+  public ushort Id { get; }
+  public ushort Type { get; }
+  public ushort StaticId { get; }
+  public ushort AttachId { get; }
+  public RagonRoomPlayer Owner { get; }
+  public RagonAuthority Authority { get; }
+  public RagonPayload Payload { get; }
+  public IRagonEntityState State { get; }
+}

Ragon.Server/Sources/Entity/IRagonEntityState.cs

@@ -0,0 +1,8 @@
+using Ragon.Protocol;
+
+namespace Ragon.Server.Entity;
+
+public interface IRagonEntityState
+{
+  
+}

Ragon.Server/Sources/Entity/RagonEntity.cs

@@ -16,10 +16,11 @@
 
 
 using Ragon.Protocol;
+using Ragon.Server.Room;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Entity;
 
-public class RagonEntity
+public class RagonEntity : IRagonEntity
 {
   private static ushort _idGenerator = 100;
   public ushort Id { get; private set; }
@@ -29,30 +30,36 @@ public class RagonEntity
   public RagonRoomPlayer Owner { get; private set; }
   public RagonAuthority Authority { get; private set; }
   public RagonPayload Payload { get; private set; }
-  public RagonEntityState State { get; private set; }
+  public IRagonEntityState State => _state;
 
   private readonly List<RagonEvent> _bufferedEvents;
+  private readonly int _limitBufferedEvents;
+  private readonly RagonEntityState _state;
 
-  public RagonEntity(RagonRoomPlayer owner, ushort type, ushort staticId, ushort attachId, RagonAuthority eventAuthority)
+  public RagonEntity(RagonEntityParameters parameters)
   {
-    Owner = owner;
-    StaticId = staticId;
-    Type = type;
-    AttachId = attachId;
     Id = _idGenerator++;
-    Authority = eventAuthority;
+
-    State = new RagonEntityState(this);
+    StaticId = parameters.StaticId;
+    Type = parameters.Type;
+    AttachId = parameters.AttachId;
+    Authority = parameters.Authority;
     Payload = new RagonPayload();
 
+    _state = new RagonEntityState(this);
     _bufferedEvents = new List<RagonEvent>();
+    _limitBufferedEvents = parameters.BufferedEvents;
   }
 
-
+  public void Attach(RagonRoomPlayer owner)
-  public void SetOwner(RagonRoomPlayer owner)
   {
     Owner = owner;
   }
 
+  public void Detach()
+  {
+  }
+
   public void RestoreBufferedEvents(RagonRoomPlayer roomPlayer, RagonBuffer writer)
   {
     foreach (var evnt in _bufferedEvents)
@@ -82,7 +89,7 @@ public class RagonEntity
     buffer.WriteUShort(Type);
     buffer.WriteUShort(Id);
     buffer.WriteUShort(Owner.Connection.Id);
-      
+
     Payload.Write(buffer);
 
     var sendData = buffer.ToArray();
@@ -96,7 +103,7 @@ public class RagonEntity
     var buffer = room.Writer;
 
     buffer.Clear();
-    buffer.WriteOperation(RagonOperation.DESTROY_ENTITY);
+    buffer.WriteOperation(RagonOperation.REMOVE_ENTITY);
     buffer.WriteUShort(Id);
 
     Payload.Write(buffer);
@@ -110,13 +117,16 @@ public class RagonEntity
   {
     buffer.WriteUShort(Type);
     buffer.WriteUShort(Id);
+    
     if (StaticId != 0)
       buffer.WriteUShort(StaticId);
+    
     buffer.WriteUShort(Owner.Connection.Id);
-
     buffer.WriteUShort(Payload.Size);
+    
     Payload.Write(buffer);
-    State.Snapshot(buffer);
+    
+    _state.Snapshot(buffer);
   }
 
   public void ReplicateEvent(
@@ -152,11 +162,12 @@ public class RagonEntity
     if (Authority == RagonAuthority.OwnerOnly &&
         Owner.Connection.Id != caller.Connection.Id)
     {
-      Console.WriteLine($"Player have not enough authority for event with Id {evnt.EventCode}");
       return;
     }
 
-    if (eventMode == RagonReplicationMode.Buffered && targetMode != RagonTarget.Owner)
+    if (eventMode == RagonReplicationMode.Buffered &&
+        targetMode != RagonTarget.Owner &&
+        _bufferedEvents.Count < _limitBufferedEvents)
     {
       _bufferedEvents.Add(evnt);
     }
@@ -209,4 +220,24 @@ public class RagonEntity
       }
     }
   }
+
+  public void AddProperty(RagonProperty property)
+  {
+    _state.AddProperty(property);
+  }
+
+  public void WriteState(RagonBuffer writer)
+  {
+    _state.Write(writer);
+  }
+
+  public bool TryReadState(RagonRoomPlayer player, RagonBuffer reader)
+  {
+    if (Owner.Connection.Id != player.Connection.Id)
+      return false;
+
+    _state.Read(reader);
+
+    return true;
+  }
 }

Ragon.Server/Sources/Entity/RagonEntityParameters.cs

@@ -0,0 +1,28 @@
+/*
+ * 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.Server.Entity;
+
+public ref struct RagonEntityParameters
+{
+  public ushort Type;
+  public ushort StaticId;
+  public ushort AttachId;
+  public RagonAuthority Authority;
+  public int BufferedEvents;
+}

Ragon.Server/Sources/Entity/RagonEntityState.cs

@@ -17,12 +17,12 @@
 
 using Ragon.Protocol;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Entity;
 
-public class RagonEntityState
+public class RagonEntityState: IRagonEntityState
 {
-  private List<RagonProperty> _properties;
+  private readonly List<RagonProperty> _properties;
-  private RagonEntity _entity;
+  private readonly RagonEntity _entity;
 
   public RagonEntityState(RagonEntity entity, int capacity = 10)
   {
@@ -65,8 +65,7 @@ public class RagonEntityState
   {
     foreach (var property in _properties)
     {
-      var hasPayload = property.IsFixed || !property.IsFixed && property.Size > 0;
+      if (property.HasData)
-      if (hasPayload)
       {
         buffer.WriteBool(true);
         property.Write(buffer);

Ragon.Server/Sources/Entity/RagonEvent.cs

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-
 using Ragon.Protocol;
+using Ragon.Server.Room;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Entity;
 
 public class RagonEvent
 {
@@ -39,15 +39,13 @@ public class RagonEvent
   
   public void Read(RagonBuffer buffer)
   {
-    var readOnlySpan = _data.AsSpan();
     _size = buffer.Capacity;
-    buffer.ReadSpan(ref readOnlySpan, _size);
+    buffer.ReadArray(_data, _size);
   }
 
   public void Write(RagonBuffer buffer)
   {
     if (_size == 0) return;
-    ReadOnlySpan<uint> readOnlySpan = _data.AsSpan();
+    buffer.WriteArray(_data, _size);
-    buffer.WriteSpan(ref readOnlySpan, _size);
   }
 }

Ragon.Server/Sources/Entity/RagonPayload.cs

@@ -17,7 +17,7 @@
 
 using Ragon.Protocol;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Entity;
 
 public class RagonPayload
 {
@@ -28,19 +28,13 @@ public class RagonPayload
 
   public void Read(RagonBuffer buffer)
   {
-    var readOnlySpan = _data.AsSpan();
-    
     _size = buffer.Capacity;
-    
+    buffer.ReadArray(_data, _size);
-    buffer.ReadSpan(ref readOnlySpan, _size);
   }
 
   public void Write(RagonBuffer buffer)
   {
     if (_size == 0) return;
-    
+    buffer.WriteArray(_data, _size);
-    ReadOnlySpan<uint> readOnlySpan = _data.AsSpan();
-
-    buffer.WriteSpan(ref readOnlySpan, _size);
   }
 }

Ragon.Server/Sources/Entity/RagonProperty.cs

@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-
-using System.ComponentModel;
 using Ragon.Protocol;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Entity;
 
 public class RagonProperty : RagonPayload
 {
   public int Size { get; set; }
   public bool IsDirty { get; private set; }
   public bool IsFixed { get; private set; }
+  public bool HasData { get; private set; }
 
   private uint[] _data;
 
@@ -39,24 +38,23 @@ public class RagonProperty : RagonPayload
 
   public void Read(RagonBuffer buffer)
   {
-    var readOnlySpan = _data.AsSpan();
     if (IsFixed)
     {
-      buffer.ReadSpan(ref readOnlySpan, Size);
+      buffer.ReadArray(_data, Size);
     }
     else
     {
       Size = (int) buffer.Read();
-      buffer.ReadSpan(ref readOnlySpan, Size);
+      buffer.ReadArray(_data, Size);
     }
     
+    HasData = true;
     IsDirty = true;
   }
 
   public void Write(RagonBuffer buffer)
   {
-    ReadOnlySpan<uint> readOnlySpan = _data.AsSpan();
+    buffer.WriteArray(_data, Size);
-    buffer.WriteSpan(ref readOnlySpan, Size);
   }
 
   public void Clear()

Ragon.Server/Sources/Handler/AuthorizationOperation.cs

@@ -16,40 +16,97 @@
 
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.Lobby;
+using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
 
-namespace Ragon.Server;
+
+namespace Ragon.Server.Handler;
 
 public sealed class AuthorizationOperation: IRagonOperation
 {
   private Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly RagonWebHookPlugin _ragonWebHook;
+  private readonly RagonContextObserver _contextObserver;
+  private readonly RagonBuffer _writer;
+  
+  public AuthorizationOperation(
+    RagonWebHookPlugin ragonWebHook,
+    RagonContextObserver contextObserver,
+    RagonBuffer writer)
+  {
+    _ragonWebHook = ragonWebHook;
+    _contextObserver = contextObserver;
+    _writer = writer;
+  }
   
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {
-    if (context.LobbyPlayer.Status == LobbyPlayerStatus.Authorized)
+    if (context.ConnectionStatus == ConnectionStatus.Authorized)
     {
-      _logger.Warn("Player already authorized");    
+      _logger.Warn("Player already authorized!");    
       return;
     }
-    
+
+    if (context.ConnectionStatus == ConnectionStatus.InProcess)
+    {
+      _logger.Warn("Player already request authorization!");    
+      return;
+    }
+
+    var configuration = context.Configuration; 
     var key = reader.ReadString();
-    var playerName = reader.ReadString();
+    var name = reader.ReadString();
-    var additionalPayload = new RagonPayload();
+    var payload = reader.ReadString();
-    additionalPayload.Read(reader);
+    
+    if (key == configuration.ServerKey)
+    {
+      if (_ragonWebHook.RequestAuthorization(context, name, payload)) 
+        return;
+      
+      var lobbyPlayer = new RagonLobbyPlayer(context.Connection, Guid.NewGuid().ToString(), name, payload);
+      context.SetPlayer(lobbyPlayer);
+      
+      Approve(context);
+    }
+    else
+    {
+      Reject(context);
+    }
+  }
 
-    context.LobbyPlayer.Name = playerName;
+  public void Approve(RagonContext context)
-    context.LobbyPlayer.AdditionalData = Array.Empty<byte>();
+  {
-    context.LobbyPlayer.Status = LobbyPlayerStatus.Authorized;
+    context.ConnectionStatus  = ConnectionStatus.Authorized;
 
+    _contextObserver.OnAuthorized(context);
+    
     var playerId = context.LobbyPlayer.Id;
+    var playerName = context.LobbyPlayer.Name;
+    var playerPayload = context.LobbyPlayer.Payload;
+
+    _writer.Clear();
+    _writer.WriteOperation(RagonOperation.AUTHORIZED_SUCCESS);
+    _writer.WriteString(playerId);
+    _writer.WriteString(playerName);
+    _writer.WriteString(playerPayload);
     
-    writer.Clear();
+    var sendData = _writer.ToArray();
-    writer.WriteOperation(RagonOperation.AUTHORIZED_SUCCESS);
-    writer.WriteString(playerId);
-    writer.WriteString(playerName);
-    
-    var sendData = writer.ToArray();
     context.Connection.Reliable.Send(sendData);
     
-    _logger.Trace($"Connection {context.Connection.Id} as {playerId}|{context.LobbyPlayer.Name} authorized");
+    _logger.Trace($"Connection {context.Connection.Id} as {playerId}|{context.LobbyPlayer.Name} authorized");   
+  }
+
+  public void Reject(RagonContext context)
+  {
+    _writer.Clear();
+    _writer.WriteOperation(RagonOperation.AUTHORIZED_FAILED);
+
+    var sendData = _writer.ToArray();
+    
+    context.Connection.Reliable.Send(sendData);
+    context.Connection.Close();
+      
+    _logger.Trace($"Connection {context.Connection.Id}");
   }
 }

Ragon.Server/Sources/Handler/EntityCreateOperation.cs

@@ -16,12 +16,13 @@
 
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.Entity;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public sealed class EntityCreateOperation : IRagonOperation
 {
-  private Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {
@@ -32,21 +33,35 @@ public sealed class EntityCreateOperation : IRagonOperation
     var eventAuthority = (RagonAuthority) reader.ReadByte();
     var propertiesCount = reader.ReadUShort();
 
-    var entity = new RagonEntity(player, entityType, 0, attachId, eventAuthority);
+    var entityParameters = new RagonEntityParameters()
+    {
+      Type = entityType,
+      Authority = eventAuthority,
+      AttachId = attachId,
+      StaticId = 0,
+      BufferedEvents = context.Configuration.LimitBufferedEvents,
+    };
+    
+    var entity = new RagonEntity(entityParameters);
     for (var i = 0; i < propertiesCount; i++)
     {
       var propertyType = reader.ReadBool();
       var propertySize = reader.ReadUShort();
 
-      entity.State.AddProperty(new RagonProperty(propertySize, propertyType));
+      entity.AddProperty(new RagonProperty(propertySize, propertyType));
     }
-
+    
     if (reader.Capacity > 0)
       entity.Payload.Read(reader);
-
+    
+    var plugin = room.Plugin;
+    if (!plugin.OnEntityCreate(player, entity))
+      return;
+    
+    entity.Attach(player);
     room.AttachEntity(entity);
     player.AttachEntity(entity);
-
+    
     entity.Create();
     
     _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} created entity {entity.Id}:{entity.Type}");

Ragon.Server/Sources/Handler/EntityEventOperation.cs

@@ -16,12 +16,13 @@
 
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.Entity;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public sealed class EntityEventOperation : IRagonOperation
 {
-  private Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {
@@ -39,20 +40,19 @@ public sealed class EntityEventOperation : IRagonOperation
     var eventMode = (RagonReplicationMode)reader.ReadByte();
     var targetMode = (RagonTarget)reader.ReadByte();
     var targetPlayerPeerId = (ushort)0;
-
+    
     if (targetMode == RagonTarget.Player)
       targetPlayerPeerId = reader.ReadUShort();
 
-    var ragonEvent = new RagonEvent(player, eventId);
+    var @event = new RagonEvent(player, eventId);
-    ragonEvent.Read(reader);
+    @event.Read(reader);
 
-    if (targetMode == RagonTarget.Player &&
+    if (targetMode == RagonTarget.Player && room.Players.TryGetValue(targetPlayerPeerId, out var targetPlayer))
-        context.Room.Players.TryGetValue(targetPlayerPeerId, out var targetPlayer))
     {
-      ent.ReplicateEvent(player, ragonEvent, eventMode, targetPlayer);
+      ent.ReplicateEvent(player, @event, eventMode, targetPlayer);
       return;
     }
 
-    ent.ReplicateEvent(player, ragonEvent, eventMode, targetMode);
+    ent.ReplicateEvent(player, @event, eventMode, targetMode);
   }
 }

Ragon.Server/Sources/Handler/EntityOwnershipOperation.cs

@@ -0,0 +1,53 @@
+using NLog;
+using Ragon.Protocol;
+
+namespace Ragon.Server.Handler;
+
+public sealed class EntityOwnershipOperation : IRagonOperation
+{
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
+
+  public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
+  {
+    var currentOwner = context.RoomPlayer;
+    var room = context.Room;
+    
+    var entityId = reader.ReadUShort();
+    var playerPeerId = reader.ReadUShort();
+
+    if (!room.Entities.TryGetValue(entityId, out var entity))
+    {
+      _logger.Error($"Entity not found with id {entityId}");
+      return;
+    }
+    
+    if (entity.Owner.Connection.Id != currentOwner.Connection.Id)
+    {
+      _logger.Error($"Player not owner of entity with id {entityId}");
+      return;
+    } 
+
+    if (!room.Players.TryGetValue(playerPeerId, out var nextOwner))
+    {
+      _logger.Error($"Player not found with id {entityId}");
+      return;
+    }    
+    
+    currentOwner.Entities.Remove(entity);
+    nextOwner.Entities.Add(entity);
+    
+    entity.Attach(nextOwner);
+    
+    _logger.Trace($"Entity {entity.Id} next owner {nextOwner.Connection.Id}");
+    
+    writer.Clear();
+    writer.WriteOperation(RagonOperation.OWNERSHIP_ENTITY_CHANGED);
+    writer.WriteUShort(playerPeerId);
+    writer.WriteUShort(1);
+    writer.WriteUShort(entity.Id);
+    
+    var sendData = writer.ToArray();
+    foreach (var player in room.PlayerList)
+      player.Connection.Reliable.Send(sendData);
+  }
+}

Ragon.Server/Sources/Handler/EntityRemoveOperation.cs

@@ -16,12 +16,13 @@
 
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.Entity;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public sealed class EntityDestroyOperation: IRagonOperation
 {
-  private Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
   
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {

Ragon.Server/Sources/Handler/EntityStateOperation.cs

@@ -17,23 +17,23 @@
 using NLog;
 using Ragon.Protocol;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public sealed class EntityStateOperation: IRagonOperation
 {
-  private ILogger _logger = LogManager.GetCurrentClassLogger();
+  private readonly ILogger _logger = LogManager.GetCurrentClassLogger();
   
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {
     var room = context.Room;
+    var player = context.RoomPlayer;
     var entitiesCount = reader.ReadUShort();
     
     for (var entityIndex = 0; entityIndex < entitiesCount; entityIndex++)
     {
       var entityId = reader.ReadUShort();
-      if (room.Entities.TryGetValue(entityId, out var entity) && entity.Owner.Connection.Id == context.Connection.Id)
+      if (room.Entities.TryGetValue(entityId, out var entity) && entity.TryReadState(player, reader))
       {
-        entity.State.Read(reader);
         room.Track(entity);
       }
       else

Ragon.Server/Sources/Handler/IRagonOperation.cs

@@ -16,7 +16,7 @@
 
 using Ragon.Protocol;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public interface IRagonOperation
 {

Ragon.Server/Sources/Handler/RoomCreateOperation.cs

@@ -16,17 +16,29 @@
 
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.Lobby;
+using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
+using Ragon.Server.Room;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public sealed class RoomCreateOperation: IRagonOperation
 {
-  private RagonRoomParameters _roomParameters = new();
+  private readonly RagonRoomParameters _roomParameters = new();
-  private Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly IServerPlugin _serverPlugin;
+  private readonly RagonWebHookPlugin _ragonWebHookPlugin;
   
+  public RoomCreateOperation(IServerPlugin serverPlugin, RagonWebHookPlugin ragonWebHook)
+  {
+    _serverPlugin = serverPlugin;
+    _ragonWebHookPlugin = ragonWebHook;
+  }
+
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {
-    if (context.LobbyPlayer.Status == LobbyPlayerStatus.Unauthorized)
+    if (context.ConnectionStatus == ConnectionStatus.Unauthorized)
     {
       _logger.Warn($"Player {context.Connection.Id} not authorized for this request");
       return;
@@ -56,23 +68,28 @@ public sealed class RoomCreateOperation: IRagonOperation
     
     var information = new RoomInformation()
     {
-        Map = _roomParameters.Map,
+        Scene = _roomParameters.Scene,
         Max = _roomParameters.Max,
         Min = _roomParameters.Min,
     };
 
     var lobbyPlayer = context.LobbyPlayer;
+    var roomPlayer = new RagonRoomPlayer(context.Connection, lobbyPlayer.Id, lobbyPlayer.Name);
+    
+    var roomPlugin = _serverPlugin.CreateRoomPlugin(information);
+    var room = new RagonRoom(roomId, information, roomPlugin);
+    
+    roomPlayer.OnAttached(room);
     
-    var room = new RagonRoom(roomId, information);
     context.Scheduler.Run(room);
     context.Lobby.Persist(room);
+    context.SetRoom(room, roomPlayer);
     
-    var player = new RagonRoomPlayer(lobbyPlayer.Connection, lobbyPlayer.Id, lobbyPlayer.Name);
+    _ragonWebHookPlugin.RoomCreated(context, room, roomPlayer);
-    context.SetRoom(room, player);
     
-    _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} create room {room.Id} {information}");
+    _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} create room {room.Id} with scene {information.Scene}");
     
-    JoinSuccess(player, room, writer);
+    JoinSuccess(roomPlayer, room, writer);
     
     _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} joined to room {room.Id}");
   }
@@ -84,9 +101,9 @@ public sealed class RoomCreateOperation: IRagonOperation
     writer.WriteString(room.Id);
     writer.WriteString(player.Id);
     writer.WriteString(room.Owner.Id);
-    writer.WriteUShort((ushort) room.Info.Min);
+    writer.WriteUShort((ushort) room.PlayerMin);
-    writer.WriteUShort((ushort) room.Info.Max);
+    writer.WriteUShort((ushort) room.PlayerMax);
-    writer.WriteString(room.Info.Map);
+    writer.WriteString(room.Scene);
 
     var sendData = writer.ToArray();
     player.Connection.Reliable.Send(sendData);

Ragon.Server/Sources/Handler/RoomJoinOperation.cs

@@ -16,12 +16,22 @@
 
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
+using Ragon.Server.Room;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public sealed class RoomJoinOperation : IRagonOperation
 {
-  private Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
+
+  private readonly RagonWebHookPlugin _webHook;
+  
+  public RoomJoinOperation(RagonWebHookPlugin plugin)
+  {
+    _webHook = plugin;
+  }
 
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {
@@ -30,42 +40,47 @@ public sealed class RoomJoinOperation : IRagonOperation
 
     if (!context.Lobby.FindRoomById(roomId, out var existsRoom))
     {
-      JoinFailed(lobbyPlayer, writer);
+      JoinFailed(context, writer);
       
       _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} failed to join room {roomId}");
       return;
     }
 
-    var player = new RagonRoomPlayer(lobbyPlayer.Connection, lobbyPlayer.Id, lobbyPlayer.Name);
+    var player = new RagonRoomPlayer(context.Connection, lobbyPlayer.Id, lobbyPlayer.Name);
     context.SetRoom(existsRoom, player);
     
-    JoinSuccess(player, existsRoom, writer);
+    if (!existsRoom.Plugin.OnPlayerJoined(player))
+      return;
+    
+    _webHook.RoomJoined(context, existsRoom, player);
+    
+    JoinSuccess(context, existsRoom, writer);
     
     _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} joined to {existsRoom.Id}");
   }
 
-  private void JoinSuccess(RagonRoomPlayer player, RagonRoom room, RagonBuffer writer)
+  private void JoinSuccess(RagonContext context, RagonRoom room, RagonBuffer writer)
   {
     writer.Clear();
     writer.WriteOperation(RagonOperation.JOIN_SUCCESS);
     writer.WriteString(room.Id);
-    writer.WriteString(player.Id);
+    writer.WriteString(context.RoomPlayer.Id);
     writer.WriteString(room.Owner.Id);
-    writer.WriteUShort((ushort) room.Info.Min);
+    writer.WriteUShort((ushort) room.PlayerMin);
-    writer.WriteUShort((ushort) room.Info.Max);
+    writer.WriteUShort((ushort) room.PlayerMax);
-    writer.WriteString(room.Info.Map);
+    writer.WriteString(room.Scene);
 
     var sendData = writer.ToArray();
-    player.Connection.Reliable.Send(sendData);
+    context.Connection.Reliable.Send(sendData);
   }
 
-  private void JoinFailed(RagonLobbyPlayer player, RagonBuffer writer)
+  private void JoinFailed(RagonContext context, RagonBuffer writer)
   {
     writer.Clear();
     writer.WriteOperation(RagonOperation.JOIN_FAILED);
     writer.WriteString($"Room not exists");
 
     var sendData = writer.ToArray();
-    player.Connection.Reliable.Send(sendData);
+    context.Connection.Reliable.Send(sendData);
   }
 }

Ragon.Server/Sources/Handler/RoomJoinOrCreateOperation.cs

@@ -16,17 +16,29 @@
 
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.Lobby;
+using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
+using Ragon.Server.Room;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public sealed class RoomJoinOrCreateOperation : IRagonOperation
 {
-  private RagonRoomParameters _roomParameters = new();
+  private readonly RagonRoomParameters _roomParameters = new();
-  private Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly IServerPlugin _serverPlugin;
+  private readonly RagonWebHookPlugin _ragonWebHookPlugin;
   
+  public RoomJoinOrCreateOperation(IServerPlugin serverPlugin, RagonWebHookPlugin plugin)
+  {
+    _serverPlugin = serverPlugin;
+    _ragonWebHookPlugin = plugin;
+  }
+
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {
-    if (context.LobbyPlayer.Status == LobbyPlayerStatus.Unauthorized)
+    if (context.ConnectionStatus == ConnectionStatus.Unauthorized)
     {
       _logger.Warn("Player not authorized for this request");
       return;
@@ -37,30 +49,35 @@ public sealed class RoomJoinOrCreateOperation : IRagonOperation
     
     _roomParameters.Deserialize(reader);
 
-    if (context.Lobby.FindRoomByMap(_roomParameters.Map, out var existsRoom))
+    if (context.Lobby.FindRoomByScene(_roomParameters.Scene, out var existsRoom))
     {
-      var player = new RagonRoomPlayer(lobbyPlayer.Connection, lobbyPlayer.Id, lobbyPlayer.Name);
+      var player = new RagonRoomPlayer(context.Connection, lobbyPlayer.Id, lobbyPlayer.Name);
       context.SetRoom(existsRoom, player);
       
+      _ragonWebHookPlugin.RoomJoined(context, existsRoom, player);
+      
       JoinSuccess(player, existsRoom, writer);
     }
     else
     {
       var information = new RoomInformation()
       {
-        Map = _roomParameters.Map,
+        Scene = _roomParameters.Scene,
         Max = _roomParameters.Max,
         Min = _roomParameters.Min,
       };
 
-      var room = new RagonRoom(roomId, information);
+      var roomPlayer = new RagonRoomPlayer(context.Connection, lobbyPlayer.Id, lobbyPlayer.Name);
+      var roomPlugin = _serverPlugin.CreateRoomPlugin(information);
+      var room = new RagonRoom(roomId, information, roomPlugin);
+      
+      _ragonWebHookPlugin.RoomCreated(context, room, roomPlayer);
+      
       context.Lobby.Persist(room);
       context.Scheduler.Run(room);
-      
-      var roomPlayer = new RagonRoomPlayer(lobbyPlayer.Connection, lobbyPlayer.Id, lobbyPlayer.Name);
       context.SetRoom(room, roomPlayer);
       
-      _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} create room {room.Id} {information}");
+      _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} create room {room.Id} with scene {information.Scene}");
 
       JoinSuccess(roomPlayer, room, writer);
     }
@@ -73,9 +90,9 @@ public sealed class RoomJoinOrCreateOperation : IRagonOperation
     writer.WriteString(room.Id);
     writer.WriteString(player.Id);
     writer.WriteString(room.Owner.Id);
-    writer.WriteUShort((ushort) room.Info.Min);
+    writer.WriteUShort((ushort) room.PlayerMin);
-    writer.WriteUShort((ushort) room.Info.Max);
+    writer.WriteUShort((ushort) room.PlayerMax);
-    writer.WriteString(room.Info.Map);
+    writer.WriteString(room.Scene);
 
     var sendData = writer.ToArray();
     player.Connection.Reliable.Send(sendData);

Ragon.Server/Sources/Handler/RoomLeaveOperation.cs

@@ -16,19 +16,34 @@
 
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public sealed class RoomLeaveOperation: IRagonOperation
 {
-  private Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly RagonWebHookPlugin _webHook;
+  public RoomLeaveOperation(RagonWebHookPlugin plugin)
+  {
+    _webHook = plugin;
+  }
+
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {
     var room = context.Room;
     var roomPlayer = context.RoomPlayer;
+    
     if (room != null)
-    { 
+    {
-      context.Room?.DetachPlayer(roomPlayer);
+      var plugin = room.Plugin; 
+      
+      plugin.OnPlayerLeaved(roomPlayer);
+      room.DetachPlayer(roomPlayer);
+      
+      _webHook.RoomLeaved(context, room, roomPlayer);
+      
       _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} leaved from {room.Id}");
     }
   }

Ragon.Server/Sources/Handler/RoomOwnershipOperation.cs

@@ -0,0 +1,14 @@
+using NLog;
+using Ragon.Protocol;
+using Ragon.Server.Entity;
+
+namespace Ragon.Server.Handler;
+
+public sealed class RoomOwnershipOperation : IRagonOperation
+{
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
+  public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
+  {
+   
+  }
+}

Ragon.Server/Sources/Handler/SceneLoadOperation.cs

@@ -18,11 +18,11 @@
 using NLog;
 using Ragon.Protocol;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public class SceneLoadOperation: IRagonOperation
 {
-  private Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
   
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {
@@ -33,7 +33,7 @@ public class SceneLoadOperation: IRagonOperation
     
     if (roomOwner.Connection.Id != currentPlayer.Connection.Id)
     { 
-      _logger.Warn("Only owner can change map!");
+      _logger.Warn("Only owner can change scene!");
       return;
     }
     

Ragon.Server/Sources/Handler/SceneLoadedOperation.cs

@@ -16,16 +16,24 @@
 
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.Entity;
+using Ragon.Server.Lobby;
+using Ragon.Server.Room;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Handler;
 
 public sealed class SceneLoadedOperation : IRagonOperation
 {
-  private Logger _logger = LogManager.GetCurrentClassLogger();
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
+  
+  public SceneLoadedOperation()
+  {
+   
+  }
 
   public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
   {
-    if (context.LobbyPlayer.Status == LobbyPlayerStatus.Unauthorized)
+    if (context.ConnectionStatus == ConnectionStatus.Unauthorized)
       return;
 
     var owner = context.Room.Owner;
@@ -41,20 +49,33 @@ public sealed class SceneLoadedOperation : IRagonOperation
         var eventAuthority = (RagonAuthority)reader.ReadByte();
         var staticId = reader.ReadUShort();
         var propertiesCount = reader.ReadUShort();
-    
+
-        var entity = new RagonEntity(player, entityType, staticId, 0, eventAuthority);
+        var entityParameters = new RagonEntityParameters()
+        {
+          Type = entityType,
+          Authority = eventAuthority,
+          AttachId = 0,
+          StaticId = staticId,
+          BufferedEvents = context.Configuration.LimitBufferedEvents,
+        };
+
+        var entity = new RagonEntity(entityParameters);
         for (var propertyIndex = 0; propertyIndex < propertiesCount; propertyIndex++)
         {
           var propertyType = reader.ReadBool();
           var propertySize = reader.ReadUShort();
-          entity.State.AddProperty(new RagonProperty(propertySize, propertyType));
+          entity.AddProperty(new RagonProperty(propertySize, propertyType));
         }
+        
+        var roomPlugin = room.Plugin;
+        if (!roomPlugin.OnEntityCreate(player, entity)) continue;
+        
+        var playerInfo = $"Player {context.Connection.Id}|{context.LobbyPlayer.Name}";
+        var entityInfo = $"{entity.Id}:{entity.Type}";
 
-        var playerInfo = $"Player {context.Connection.Id}|{context.LobbyPlayer.Name}"; 
+        _logger.Trace($"{playerInfo} created static entity {entityInfo}");
-        var entityInfo = $"{entity.Id}:{entity.Type}"; 
+
-        
+        entity.Attach(player);
-        _logger.Trace($"{playerInfo} created entity {entityInfo}");
-        
         room.AttachEntity(entity);
         player.AttachEntity(entity);
       }
@@ -123,7 +144,7 @@ public sealed class SceneLoadedOperation : IRagonOperation
       writer.WriteString(roomPlayer.Id);
       writer.WriteString(roomPlayer.Name);
     }
-    
+
     var dynamicEntities = room.DynamicEntitiesList;
     var dynamicEntitiesCount = (ushort)dynamicEntities.Count;
     writer.WriteUShort(dynamicEntitiesCount);
@@ -135,7 +156,7 @@ public sealed class SceneLoadedOperation : IRagonOperation
     writer.WriteUShort(staticEntitiesCount);
     foreach (var entity in staticEntities)
       entity.Snapshot(writer);
-    
+
     var sendData = writer.ToArray();
     foreach (var player in receviersList)
       player.Connection.Reliable.Send(sendData);

Ragon.Server/Sources/Http/RagonHttpServer.cs

@@ -0,0 +1,111 @@
+/*
+ * 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 System.Net;
+using System.Text.Json;
+using Ragon.Server.IO;
+using Ragon.Server.Plugin;
+
+namespace Ragon.Server.Http;
+
+public class RagonHttpServer
+{
+  private readonly ILogger _logger = LogManager.GetCurrentClassLogger();
+  private readonly IExecutor _executor;
+  private readonly IServerPlugin _serverPlugin;
+  private HttpListener _httpListener;
+  private CancellationTokenSource _cancellationTokenSource;
+
+  public RagonHttpServer(IExecutor executor, IServerPlugin serverPlugin)
+  {
+    _serverPlugin = serverPlugin;
+    _executor = executor;
+  }
+
+  public async void StartAccept(CancellationToken cancellationToken)
+  {
+    while (!cancellationToken.IsCancellationRequested)
+    {
+      var context = await _httpListener.GetContextAsync();
+
+      if (context.Request.HttpMethod != "POST")
+      {
+        context.Response.StatusCode = 404;
+        context.Response.ContentLength64 = 0;
+        context.Response.Close();
+      }
+
+      var request = context.Request;
+      var reader = new StreamReader(request.InputStream, request.ContentEncoding);
+      var rawJson = await reader.ReadToEndAsync();
+      var httpCommand = JsonDocument.Parse(rawJson);
+      if (httpCommand != null)
+      {
+        try
+        {
+          var command = httpCommand.RootElement.GetProperty("command");
+          var payload = httpCommand.RootElement.GetProperty("payload");
+
+          if (_serverPlugin.OnCommand(command.GetString() ?? "none", payload.GetRawText()))
+          {
+            context.Response.StatusCode = 200;
+            context.Response.ContentLength64 = 0;
+            context.Response.Close(); 
+          }
+          else
+          {
+            context.Response.StatusCode = 403;
+            context.Response.ContentLength64 = 0;
+            context.Response.Close();
+          }
+        }
+        catch (Exception ex)
+        {
+          _logger.Error(ex);
+          
+          context.Response.StatusCode = 505;
+          context.Response.ContentLength64 = 0;
+          context.Response.Close();
+        }
+        
+        continue;
+      }
+
+      context.Response.StatusCode = 403;
+      context.Response.ContentLength64 = 0;
+      context.Response.Close();
+    }
+  }
+
+  public void Start(RagonServerConfiguration configuration)
+  {
+    _cancellationTokenSource = new CancellationTokenSource();
+    _logger.Info($"Listen at http://0.0.0.0:{configuration.HttpPort}/");
+
+    _httpListener = new HttpListener();
+    _httpListener.Prefixes.Add($"http://127.0.0.1:{configuration.HttpPort}/");
+    _httpListener.Start();
+
+    _executor.Run(() => StartAccept(_cancellationTokenSource.Token), TaskCreationOptions.LongRunning);
+  }
+
+  public void Stop()
+  {
+    _cancellationTokenSource.Cancel();
+    _httpListener.Stop();
+  }
+}

Ragon.Server/Sources/IO/Executor.cs

@@ -16,26 +16,31 @@
 
 using System.Threading.Channels;
 
-namespace Ragon.Server;
+namespace Ragon.Server.IO;
 
-public class Executor: TaskScheduler, IExecutor
+public class Executor : TaskScheduler, IExecutor
 {
-  private ChannelReader<Task> _reader;
+  private readonly ChannelReader<Task> _reader;
-  private ChannelWriter<Task> _writer;
+  private readonly ChannelWriter<Task> _writer;
-  private Queue<Task> _pendingTasks;
+  private readonly Queue<Task> _pendingTasks;
-  private TaskFactory _taskFactory;
+  private readonly TaskFactory _taskFactory;
 
-  public void Run(Action action)
+  public Task Run(Action action, TaskCreationOptions task = TaskCreationOptions.None)
   {
-    _taskFactory.StartNew(action);
+    return _taskFactory.StartNew(action, task);
   }
 
   public Executor()
   {
-    var channel = Channel.CreateUnbounded<Task>();
+    var channel = Channel.CreateUnbounded<Task>(new UnboundedChannelOptions()
+    {
+      SingleReader = true, 
+      SingleWriter = true,
+    });
+    
     _reader = channel.Reader;
     _writer = channel.Writer;
-    
+
     _taskFactory = new TaskFactory(this);
     _pendingTasks = new Queue<Task>();
   }
@@ -60,7 +65,7 @@ public class Executor: TaskScheduler, IExecutor
     while (_reader.TryRead(out var task))
     {
       TryExecuteTask(task);
-      
+
       if (task.Status == TaskStatus.Running)
         _pendingTasks.Enqueue(task);
     }

Ragon.Server/Sources/IO/IExecutor.cs

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-namespace Ragon.Server;
+namespace Ragon.Server.IO;
 
 public interface IExecutor
 {
-  public void Run(Action action);
+  public Task Run(Action action, TaskCreationOptions task = TaskCreationOptions.None);
 }

Ragon.Server/Sources/IO/INetworkChannel.cs

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Ragon.Server;
+namespace Ragon.Server.IO;
 
 public interface INetworkChannel
 {

Ragon.Server/Sources/IO/INetworkConnection.cs

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-namespace Ragon.Server;
+namespace Ragon.Server.IO;
 
 public interface INetworkConnection
 {
     public ushort Id { get; }
     public INetworkChannel Reliable { get; }
     public INetworkChannel Unreliable { get; }
+    public void Close();
 }

Ragon.Server/Sources/IO/INetworkListener.cs

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Ragon.Server;
+namespace Ragon.Server.IO;
 
 public interface INetworkListener
 {

Ragon.Server/Sources/IO/INetworkServer.cs

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Ragon.Server;
+namespace Ragon.Server.IO;
 
 public interface INetworkServer
 {

Ragon.Server/Sources/IO/NetworkConfiguration.cs

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Ragon.Server;
+namespace Ragon.Server.IO;
 
 public struct NetworkConfiguration
 {

Ragon.Server/Sources/IRagonContextObserver.cs

@@ -0,0 +1,31 @@
+/*
+ * 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.Server;
+
+public class RagonContextObserver
+{
+  private Dictionary<string, RagonContext> _contexts;
+  public RagonContextObserver(Dictionary<string, RagonContext> contexts)
+  {
+    _contexts = contexts;
+  }
+
+  public void OnAuthorized(RagonContext context) 
+  {
+    _contexts.Add(context.LobbyPlayer.Id, context);
+  }
+}

Ragon.Server/Sources/IRagonServer.cs

@@ -0,0 +1,26 @@
+/*
+ * 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.Server.IO;
+using Ragon.Server.Lobby;
+
+namespace Ragon.Server;
+
+public interface IRagonServer
+{
+  RagonLobbyPlayer? GetPlayerByConnection(INetworkConnection connection);
+  RagonLobbyPlayer? GetPlayerById(string id);
+}

Ragon.Server/Sources/Lobby/IRagonLobby.cs

@@ -15,13 +15,14 @@
  */
 
 using System.Diagnostics.CodeAnalysis;
+using Ragon.Server.Room;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Lobby;
 
 public interface IRagonLobby
 {
   public bool FindRoomById(string roomId, [MaybeNullWhen(false)] out RagonRoom room);
-  public bool FindRoomByMap(string map, [MaybeNullWhen(false)] out RagonRoom room);
+  public bool FindRoomByScene(string sceneName, [MaybeNullWhen(false)] out RagonRoom room);
   public void Persist(RagonRoom room);
-  public void RemoveIfEmpty(RagonRoom room);
+  public bool RemoveIfEmpty(RagonRoom room);
 }

Ragon.Server/Sources/Lobby/RagonLobbyInMemory.cs

@@ -16,8 +16,9 @@
 
 using System.Diagnostics.CodeAnalysis;
 using NLog;
+using Ragon.Server.Room;
 
-namespace Ragon.Server;
+namespace Ragon.Server.Lobby;
 
 public class LobbyInMemory : IRagonLobby
 {
@@ -28,8 +29,7 @@ public class LobbyInMemory : IRagonLobby
   {
     foreach (var existRagonRoom in _rooms)
     {
-      var info = existRagonRoom.Info;
+      if (existRagonRoom.Id == RagonRoomId && existRagonRoom.PlayerMin < existRagonRoom.PlayerMax)
-      if (existRagonRoom.Id == RagonRoomId && info.Min < info.Max)
       {
         room = existRagonRoom;
         return true;
@@ -40,12 +40,11 @@ public class LobbyInMemory : IRagonLobby
     return false;
   }
 
-  public bool FindRoomByMap(string map, [MaybeNullWhen(false)] out RagonRoom room)
+  public bool FindRoomByScene(string sceneName, [MaybeNullWhen(false)] out RagonRoom room)
   {
     foreach (var existsRoom in _rooms)
     {
-      var info = existsRoom.Info;
+      if (existsRoom.Scene == sceneName && existsRoom.PlayerCount < existsRoom.PlayerMax)
-      if (info.Map == map && existsRoom.Players.Count < info.Max)
       {
         room = existsRoom;
         return true;
@@ -62,18 +61,23 @@ public class LobbyInMemory : IRagonLobby
     _logger.Trace($"New room: {room.Id}");
     
     foreach (var r in _rooms)
-      _logger.Trace($"Room: {r.Id} {r.Info} Players: {r.Players.Count} Entities: {r.Entities.Count}");
+      _logger.Trace($"Room: {r.Id} Scene: {r.Scene} Players: {r.Players.Count} Entities: {r.Entities.Count}");
   }
 
-  public void RemoveIfEmpty(RagonRoom room)
+  public bool RemoveIfEmpty(RagonRoom room)
   {
+    var result = false;
     if (room.Players.Count == 0)
     {
       _rooms.Remove(room);
       _logger.Trace($"Room {room.Id} removed");
+
+      result = true;
     }
 
     foreach (var r in _rooms)
-      _logger.Trace($"Room: {r.Id} {r.Info} Players: {r.Players.Count} Entities: {r.Entities.Count}");
+      _logger.Trace($"Room: {r.Id} Scene: {r.Scene} Players: {r.Players.Count} Entities: {r.Entities.Count}");
+
+    return result;
   }
 }

Ragon.Server/Sources/Lobby/RagonLobbyPlayer.cs

@@ -14,28 +14,29 @@
  * limitations under the License.
  */
 
-namespace Ragon.Server;
+using Ragon.Server.IO;
 
-public enum LobbyPlayerStatus
+namespace Ragon.Server.Lobby;
+
+public enum ConnectionStatus
 {
   Unauthorized,
+  InProcess,
   Authorized,
 }
 
 public class RagonLobbyPlayer
 {
+  public INetworkConnection Connection { get; }
   public string Id { get; private set; }
-  public string Name { get; set; }
+  public string Name { get; private set; }
-  public byte[] AdditionalData { get; set; }
+  public string Payload { get; private set; }
-  public LobbyPlayerStatus Status { get; set; }
-  public INetworkConnection Connection { get; private set; }
   
-  public RagonLobbyPlayer(INetworkConnection connection)
+  public RagonLobbyPlayer(INetworkConnection connection, string id, string name, string payload)
   {
-    Id = Guid.NewGuid().ToString();
+    Id = id;
+    Name = name;
+    Payload = payload;
     Connection = connection;
-    Status = LobbyPlayerStatus.Unauthorized;
-    Name = "None";
-    AdditionalData = Array.Empty<byte>();
   }
 }

Ragon.Server/Sources/Plugin/BaseRoomPlugin.cs

@@ -0,0 +1,67 @@
+/*
+ * 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.Server.Entity;
+using Ragon.Server.IO;
+using Ragon.Server.Room;
+
+namespace Ragon.Server.Plugin;
+
+public class BaseRoomPlugin: IRoomPlugin
+{
+  public IRagonRoom Room { get; private set; }
+  
+  public virtual void OnAttached(IRagonRoom room)
+  {
+    Room = room;
+  }
+  
+  public virtual void OnDetached()
+  {
+    
+  }
+  
+  #region VIRTUAL
+
+  public virtual bool OnPlayerJoined(RagonRoomPlayer player)
+  {
+    return true;
+  }
+
+  public virtual bool OnPlayerLeaved(RagonRoomPlayer player)
+  {
+    return true;
+  }
+
+  public virtual void Tick(float dt)
+  {
+    
+  }
+  
+  public virtual bool OnEntityCreate(RagonRoomPlayer creator, IRagonEntity entity)
+  {
+    
+    return true;
+  }
+
+  public virtual bool OnEntityRemove(RagonRoomPlayer remover, IRagonEntity entity)
+  {
+    
+    return true;
+  }
+  
+  #endregion
+}

Ragon.Server/Sources/Plugin/BaseServerPlugin.cs

@@ -0,0 +1,56 @@
+/*
+ * 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.Server.IO;
+using Ragon.Server.Lobby;
+using Ragon.Server.Room;
+
+namespace Ragon.Server.Plugin;
+
+public class BaseServerPlugin: IServerPlugin
+{
+  public IRagonServer Server { get; protected set; }
+  
+  public virtual void OnAttached(IRagonServer server)
+  {
+    Server  = server;
+  }
+
+  public virtual void OnDetached()
+  {
+    
+  }
+
+  public virtual bool OnRoomCreate(RagonLobbyPlayer player, RagonRoom room)
+  {
+    return true;
+  }
+
+  public virtual bool OnRoomRemove(RagonLobbyPlayer player, RagonRoom room)
+  {
+    return true;
+  }
+
+  public virtual bool OnCommand(string command, string payload)
+  {
+    return true;
+  }
+
+  public IRoomPlugin CreateRoomPlugin(RoomInformation information)
+  {
+    return new BaseRoomPlugin();
+  }
+}

Ragon.Server/Sources/Plugin/IRoomPlugin.cs

@@ -0,0 +1,31 @@
+/*
+ * 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.Server.Entity;
+using Ragon.Server.Room;
+
+namespace Ragon.Server.Plugin;
+
+public interface IRoomPlugin
+{
+  void Tick(float dt);
+  void OnAttached(IRagonRoom room);
+  void OnDetached();
+  bool OnPlayerJoined(RagonRoomPlayer player);
+  bool OnPlayerLeaved(RagonRoomPlayer player);
+  bool OnEntityCreate(RagonRoomPlayer player, IRagonEntity entity);
+  bool OnEntityRemove(RagonRoomPlayer player, IRagonEntity entity);
+}

Ragon.Server/Sources/Plugin/IServerPlugin.cs

@@ -0,0 +1,31 @@
+/*
+ * 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.Server.Http;
+using Ragon.Server.Lobby;
+using Ragon.Server.Room;
+
+namespace Ragon.Server.Plugin;
+
+public interface IServerPlugin
+{
+  void OnAttached(IRagonServer server);
+  void OnDetached();
+  bool OnRoomCreate(RagonLobbyPlayer player, RagonRoom room);
+  bool OnRoomRemove(RagonLobbyPlayer player, RagonRoom room);
+  bool OnCommand(string command, string payload);
+  IRoomPlugin CreateRoomPlugin(RoomInformation information);
+}

Ragon.Server/Sources/Plugin/Web/Dto/PlayerDto.cs

@@ -0,0 +1,32 @@
+/*
+ * 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.Server.Room;
+
+namespace Ragon.Server.Plugin.Web;
+
+[Serializable]
+public class PlayerDto
+{
+  public string Id { get; set;}
+  public string Name { get; set; }
+  
+  public PlayerDto(RagonRoomPlayer ragonRoomPlayer)
+  {
+    Id = ragonRoomPlayer.Id;
+    Name = ragonRoomPlayer.Name;
+  }
+}

Ragon.Server/Sources/Plugin/Web/Dto/RoomDto.cs

@@ -0,0 +1,39 @@
+/*
+ * 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.Server.Room;
+
+namespace Ragon.Server.Plugin.Web;
+
+[Serializable]
+public class RoomDto
+{
+  public string Id { get; set;}
+  public int PlayerMin { get; set; }
+  public int PlayerMax { get; set; }
+  public int PlayerCount { get; set; }
+  public PlayerDto[] Players { get; set; }
+
+  public RoomDto(RagonRoom room)
+  {
+    Id = room.Id;
+    PlayerMin = room.PlayerMin;
+    PlayerMax = room.PlayerMax;
+    PlayerCount = room.PlayerCount;
+
+    Players = room.PlayerList.Select(p => new PlayerDto(p)).ToArray();
+  }
+}

Ragon.Server/Sources/Plugin/Web/RagonWebHookPlugin.cs

@@ -0,0 +1,135 @@
+/*
+ * 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.Net;
+using System.Net.Http.Json;
+using Newtonsoft.Json;
+using Ragon.Protocol;
+using Ragon.Server.Handler;
+using Ragon.Server.Lobby;
+using Ragon.Server.Room;
+
+namespace Ragon.Server.Plugin.Web;
+
+public class RagonWebHookPlugin
+{
+  private Dictionary<string, string> _webHooks;
+
+  private RagonServer _server;
+  private HttpClient _httpClient;
+
+  public RagonWebHookPlugin(RagonServer server, RagonServerConfiguration configuration)
+  {
+    _webHooks = new Dictionary<string, string>(configuration.WebHooks);
+    _httpClient = new HttpClient();
+    _server = server;
+  }
+
+  public bool RequestAuthorization(RagonContext context, string name, string password)
+  {
+    if (_webHooks.TryGetValue("authorization-request", out var value))
+    {
+      var httpContent = new StringContent("");
+      var executor = context.Executor;
+      executor.Run(async () =>
+      {
+        var authorizationOperation = (AuthorizationOperation) _server.ResolveOperation(RagonOperation.AUTHORIZE);
+        var response = await _httpClient.PostAsync(new Uri(value), httpContent);
+        if (response.StatusCode != HttpStatusCode.OK)
+        {
+          authorizationOperation.Reject(context);
+          return;
+        }
+
+        var content = await response.Content.ReadAsStringAsync();
+        var authorizationResponse = JsonConvert.DeserializeObject<AuthorizationResponse>(content);
+        if (authorizationResponse != null)
+        {
+          var lobbyPlayer = new RagonLobbyPlayer(context.Connection, authorizationResponse.Id, authorizationResponse.Name, authorizationResponse.Payload);
+
+          context.SetPlayer(lobbyPlayer);
+          authorizationOperation.Approve(context);
+        }
+        else
+        {
+          authorizationOperation.Reject(context);
+        }
+      });
+      return true;
+    }
+
+    return false;
+  }
+
+  public void RoomCreated(RagonContext context, RagonRoom room, RagonRoomPlayer player)
+  {
+    if (_webHooks.TryGetValue("room-created", out var value) && !string.IsNullOrEmpty(value))
+    {
+      var request = new RoomCreatedRequest()
+      {
+        Room = new RoomDto(room),
+        Player = new PlayerDto(player)
+      };
+      var content = JsonContent.Create(request);
+      var executor = context.Executor;
+      executor.Run(() => _httpClient.PostAsync(new Uri(value), content, CancellationToken.None));
+    }
+  }
+
+  public void RoomRemoved(RagonContext context, RagonRoom ragonRoom)
+  {
+    if (_webHooks.TryGetValue("room-removed", out var value) && !string.IsNullOrEmpty(value))
+    {
+      var request = new RoomRemovedRequest()
+      {
+        Room = new RoomDto(ragonRoom)
+      };
+      var content = JsonContent.Create(request);
+      var executor = context.Executor;
+      executor.Run(() => _httpClient.PostAsync(new Uri(value), content, CancellationToken.None));
+    }
+  }
+
+  public void RoomJoined(RagonContext context, RagonRoom existsRoom, RagonRoomPlayer player)
+  {
+    if (_webHooks.TryGetValue("room-joined", out var value) && !string.IsNullOrEmpty(value))
+    {
+      var request = new RoomJoinedRequest()
+      {
+        Room = new RoomDto(existsRoom),
+        Player = new PlayerDto(player)
+      };
+      var content = JsonContent.Create(request);
+      var executor = context.Executor;
+      executor.Run(() => _httpClient.PostAsync(new Uri(value), content, CancellationToken.None));
+    }
+  }
+
+  public void RoomLeaved(RagonContext context, RagonRoom room, RagonRoomPlayer roomPlayer)
+  {
+    if (_webHooks.TryGetValue("room-leaved", out var value) && !string.IsNullOrEmpty(value))
+    {
+      var request = new RoomLeavedRequest()
+      {
+        Room = new RoomDto(room),
+        Player = new PlayerDto(roomPlayer)
+      };
+      var content = JsonContent.Create(request);
+      var executor = context.Executor;
+      executor.Run(() => _httpClient.PostAsync(new Uri(value), content, CancellationToken.None));
+    }
+  }
+}

Ragon.Server/Sources/Plugin/Web/Request/AuthorizationRequest.cs

@@ -14,4 +14,11 @@
  * limitations under the License.
  */
 
-global using Xunit;
+namespace Ragon.Server.Plugin.Web;
+
+[Serializable]
+public class AuthorizationRequest
+{
+  public string Name;
+  public string Token;
+}