feat: restore properties

feature: State -> Properties

Ragon.Common/Sources/RagonOperation.cs

@@ -21,9 +21,8 @@ namespace Ragon.Common
     PLAYER_LEAVED,
     
     CREATE_ENTITY,
-    CREATE_STATIC_ENTITY,
+    CREATE_SCENE_ENTITY,
     DESTROY_ENTITY,
-    
     SNAPSHOT,
     
     REPLICATE_ENTITY_STATE,

Ragon.Common/Sources/RagonSerializer.cs

@@ -11,10 +11,15 @@ namespace Ragon.Common
   {
     [FieldOffset(0)] public int Int;
     [FieldOffset(0)] public float Float;
+    [FieldOffset(0)] public long Long;
     [FieldOffset(0)] public byte Byte0;
     [FieldOffset(1)] public byte Byte1;
     [FieldOffset(2)] public byte Byte2;
     [FieldOffset(3)] public byte Byte3;
+    [FieldOffset(4)] public byte Byte4;
+    [FieldOffset(5)] public byte Byte5;
+    [FieldOffset(6)] public byte Byte6;
+    [FieldOffset(7)] public byte Byte7;
   }
 
   public class RagonSerializer
@@ -22,6 +27,7 @@ namespace Ragon.Common
     private byte[] _data;
     private int _offset;
     private int _size;
+    
     public int Lenght => _offset;
     public int Size => _size - _offset;
 
@@ -40,12 +46,18 @@ namespace Ragon.Common
     }
     
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void WriteByte(byte value)
+    public void AddOffset(int offset)
+    {
+      _offset += offset;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteByte(byte value)
     {
       ResizeIfNeed(1);
-      
       _data[_offset] = value;
       _offset += 1;
+      return 1;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -57,12 +69,12 @@ namespace Ragon.Common
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void WriteBool(bool value)
+    public int WriteBool(bool value)
     {
       ResizeIfNeed(1);
-      
       _data[_offset] = value ? (byte) 1 : (byte) 0;
       _offset += 1;
+      return 1;
     }
 
 
@@ -76,7 +88,7 @@ namespace Ragon.Common
 
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void WriteInt(int value)
+    public int WriteInt(int value)
     {
       ResizeIfNeed(4);
       var converter = new ValueConverter() {Int = value};
@@ -85,21 +97,76 @@ namespace Ragon.Common
       _data[_offset + 2] = converter.Byte2;
       _data[_offset + 3] = converter.Byte3;
       _offset += 4;
+      return 4;
+    }
+    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteInt(int value, int offset)
+    {
+      ResizeIfNeed(4);
+      var converter = new ValueConverter() {Int = value};
+      _data[offset] = converter.Byte0;
+      _data[offset + 1] = converter.Byte1;
+      _data[offset + 2] = converter.Byte2;
+      _data[offset + 3] = converter.Byte3;
+      return 4;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public int ReadInt()
     {
-      var converter = new ValueConverter() { Byte0 = _data[_offset], Byte1 = _data[_offset + 1], Byte2 = _data[_offset + 2], Byte3 = _data[_offset + 3] };
+      var converter = new ValueConverter {Byte0 = _data[_offset], Byte1 = _data[_offset + 1], Byte2 = _data[_offset + 2], Byte3 = _data[_offset + 3]};
       _offset += 4;
       return converter.Int;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void WriteFloat(float value)
+    public void WriteLong(long value)
+    {
+      ResizeIfNeed(8);
+      WriteLong(value, _offset);
+      _offset += 8;
+    }
+    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteLong(long value, int offset)
+    {
+      var converter = new ValueConverter() {Long = value};
+      _data[offset] = converter.Byte0;
+      _data[offset + 1] = converter.Byte1;
+      _data[offset + 2] = converter.Byte2;
+      _data[offset + 3] = converter.Byte3;
+      _data[offset + 4] = converter.Byte4;
+      _data[offset + 5] = converter.Byte5;
+      _data[offset + 6] = converter.Byte6;
+      _data[offset + 7] = converter.Byte7;
+      return 8;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public long ReadLong()
+    {
+      var converter = new ValueConverter
+      {
+        Byte0 = _data[_offset],
+        Byte1 = _data[_offset + 1],
+        Byte2 = _data[_offset + 2],
+        Byte3 = _data[_offset + 3],
+        Byte4 = _data[_offset + 4],
+        Byte5 = _data[_offset + 5],
+        Byte6 = _data[_offset + 6],
+        Byte7 = _data[_offset + 7],
+      };
+      _offset += 8;
+      return converter.Long;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteFloat(float value)
     {
       var converter = new ValueConverter() {Float = value};
       WriteInt(converter.Int);
+      return 4;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -112,15 +179,16 @@ namespace Ragon.Common
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void WriteString(string value)
+    public int WriteString(string value)
     {
-      var stringRaw = Encoding.UTF8.GetBytes(value).AsSpan();
-      ResizeIfNeed(2 + stringRaw.Length);
+      var rawData = Encoding.UTF8.GetBytes(value).AsSpan();
+      ResizeIfNeed(2 + rawData.Length);
+      WriteUShort((ushort) rawData.Length);
+      var data = _data.AsSpan().Slice(_offset, rawData.Length);
+      rawData.CopyTo(data);
+      _offset += rawData.Length;
 
-      WriteUShort((ushort) stringRaw.Length);
-      var data = _data.AsSpan().Slice(_offset, stringRaw.Length);
-      stringRaw.CopyTo(data);
-      _offset += stringRaw.Length;
+      return rawData.Length + 2;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -144,7 +212,7 @@ namespace Ragon.Common
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void WriteData(ref ReadOnlySpan<byte> payload)
+    public int WriteData(ref ReadOnlySpan<byte> payload)
     {
       ResizeIfNeed(payload.Length);
 
@@ -153,6 +221,7 @@ namespace Ragon.Common
 
       payload.CopyTo(payloadData);
       _offset += payload.Length;
+      return payload.Length;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -168,12 +237,14 @@ namespace Ragon.Common
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void WriteOperation(RagonOperation ragonOperation)
+    public int WriteOperation(RagonOperation ragonOperation)
     {
       ResizeIfNeed(1);
 
       _data[_offset] = (byte) ragonOperation;
       _offset += 1;
+
+      return 1;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -185,13 +256,24 @@ namespace Ragon.Common
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void WriteUShort(ushort value)
+    public int WriteUShort(ushort value)
     {
       ResizeIfNeed(2);
 
       _data[_offset] = (byte) (value & 0x00FF);
       _data[_offset + 1] = (byte) ((value & 0xFF00) >> 8);
       _offset += 2;
+
+      return 2;
+    }
+    
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int WriteUShort(ushort value, int offset)
+    {
+      ResizeIfNeed(2);
+      _data[offset] = (byte) (value & 0x00FF);
+      _data[offset + 1] = (byte) ((value & 0xFF00) >> 8);
+      return 2;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -228,7 +310,7 @@ namespace Ragon.Common
     {
       Clear();
       ResizeIfNeed(data.Length);
-      Buffer.BlockCopy(data, 0, _data, 0, _offset);
+      Buffer.BlockCopy(data, 0, _data, 0, data.Length);
       _size = data.Length;
     }
 

Ragon.SimpleServer/Source/AuthorizationProvider.cs

@@ -12,7 +12,7 @@ public class AuthorizationProviderByKey: IAuthorizationProvider
     _configuration = configuration;
   }
   
-  public async Task OnAuthorizationRequest(string key, string name, byte protocol, byte[] additionalData, Action<string, string> accept, Action<uint> reject)
+  public async Task OnAuthorizationRequest(string key, string name, byte[] additionalData, Action<string, string> accept, Action<uint> reject)
   {
     if (key == _configuration.Key)
     {

Ragon.SimpleServer/config.json

@@ -1,5 +1,6 @@
 {
   "key": "defaultkey",
+  "protocol": "1.0.0",
   "statisticsInterval": 5,
   "sendRate": 30,
   "port": 4444,

Ragon/Sources/Authorization/AuthorizationManager.cs

@@ -25,11 +25,11 @@ public class AuthorizationManager : IAuthorizationManager
     _playersByPeers = new Dictionary<uint, Player>();
   }
 
-  public void OnAuthorization(uint peerId, string key, string name, byte protocol)
+  public void OnAuthorization(uint peerId, string key, string name)
   {
     var dispatcher = _gameThread.ThreadDispatcher;
     
-    _provider.OnAuthorizationRequest(key, name, protocol, Array.Empty<byte>(),
+    _provider.OnAuthorizationRequest(key, name, Array.Empty<byte>(),
       (playerId, playerName) => { dispatcher.Dispatch(() => Accepted(peerId, playerId, playerName)); },
       (errorCode) => { dispatcher.Dispatch(() => Rejected(peerId, errorCode)); });
   }

Ragon/Sources/Authorization/IAuthorizationProvider.cs

@@ -5,5 +5,5 @@ namespace Ragon.Core;
 
 public interface  IAuthorizationProvider
 {
-  Task OnAuthorizationRequest(string key, string playerName, byte protocol, byte[] additionalData, Action<string, string> Accept, Action<uint> Reject);
+  Task OnAuthorizationRequest(string key, string playerName, byte[] additionalData, Action<string, string> Accept, Action<uint> Reject);
 }

Ragon/Sources/Bootstrap.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using NLog;
 
@@ -16,5 +17,6 @@ namespace Ragon.Core
       var app = new Application(factory, configuration);
       return app;
     }
+
   }
 }

Ragon/Sources/Configuration/Configuration.cs

@@ -6,6 +6,7 @@ namespace Ragon.Core
   public struct Configuration
   {
     public string Key;
+    public string Protocol;
     public int StatisticsInterval;
     public ushort SendRate;
     public ushort Port;

Ragon/Sources/Configuration/ConfigurationLoader.cs

@@ -9,7 +9,7 @@ namespace Ragon.Core
   public static class ConfigurationLoader
   {
     private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
-    private static readonly string _serverVersion = "1.0.9-rc";
+    private static readonly string _serverVersion = "1.0.13-rc";
 
     private static void CopyrightInfo()
     {

Ragon/Sources/Entity/Entity.cs

@@ -1,26 +1,27 @@
+using System;
 using Ragon.Common;
 
 namespace Ragon.Core;
 
 public class Entity
 {
-  private static int _idGenerator = 0;
-  public int EntityId { get; private set; }
-  public int StaticId { get; private set; }
-  public uint OwnerId { get; private set; }
+  private static ushort _idGenerator = 0;
+  public ushort EntityId { get; private set; }
+  public ushort StaticId { get; private set; }
   public ushort EntityType { get; private set; }
+  public ushort OwnerId { get; private set; }
   public RagonAuthority Authority { get; private set; }
-  public EntityState State { get; private set; }
-  public EntityState Payload { get; private set; }
+  public EntityProperty[] Properties { get; private set; }
+  public byte[] Payload { get; set; }
   
-  public Entity(uint ownerId, ushort entityType, int staticId, RagonAuthority stateAuthority, RagonAuthority eventAuthority)
+  public Entity(ushort ownerId, ushort entityType, ushort staticId, RagonAuthority stateAuthority, RagonAuthority eventAuthority, int props)
   {
     OwnerId = ownerId;
     StaticId = staticId;
     EntityType = entityType;
     EntityId = _idGenerator++;
-    State = new EntityState(stateAuthority);
-    Payload = new EntityState(stateAuthority);
+    Properties = new EntityProperty[props];
+    Payload = Array.Empty<byte>();
     Authority = eventAuthority;
   }
 }

Ragon/Sources/Entity/EntityProperty.cs

@@ -0,0 +1,39 @@
+using System;
+using Ragon.Common;
+
+namespace Ragon.Core;
+
+public class EntityProperty
+{
+    public int Size { get; set; }
+    public bool IsDirty { get; private set; }
+    public bool IsFixed { get; private set; }
+    private byte[] _data;
+
+    public EntityProperty(int size, bool isFixed)
+    {
+        _data = new byte[512];
+
+        Size = size;
+        IsFixed = isFixed;
+        IsDirty = true;
+    }
+    
+    public ReadOnlySpan<byte> Read()
+    {
+        var dataSpan = _data.AsSpan();
+        
+        return dataSpan.Slice(0, Size);
+    }
+
+    public void Write(ref ReadOnlySpan<byte> src)
+    {
+        src.CopyTo(_data);
+        IsDirty = true;
+    }
+  
+    public void Clear()
+    {
+        IsDirty = false;
+    }
+}

Ragon/Sources/Entity/EntityState.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-using Ragon.Common;
-
-namespace Ragon.Core;
-
-public class EntityState
-{
-  public bool isDirty { get; private set; }
-  public RagonAuthority Authority { get; private set; }
-  public int Size => _size;
-  
-  private int _size = 0;
-  private byte[] _data = new byte[2048];
-  
-  public EntityState(RagonAuthority ragonAuthority)
-  {
-    Authority = ragonAuthority;
-    isDirty = false;
-  }
-
-  public ReadOnlySpan<byte> Read()
-  {
-    return _data.AsSpan().Slice(0, _size);
-  }
-
-  public void Write(ref ReadOnlySpan<byte> src)
-  {
-    src.CopyTo(_data);
-    _size = src.Length;
-    isDirty = true;
-  }
-  
-  public void Clear()
-  {
-    isDirty = false;
-  }
-}

Ragon/Sources/Game/GameRoom.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using NLog;
 using Ragon.Common;
@@ -11,6 +12,7 @@ namespace Ragon.Core
     public int PlayersMin { get; private set; }
     public int PlayersMax { get; private set; }
     public int PlayersCount => _players.Count;
+    public int EntitiesCount => _entities.Count;
     public string Id { get; private set; }
     public string Map { get; private set; }
 
@@ -28,6 +30,8 @@ namespace Ragon.Core
     private uint[] _readyPlayers = Array.Empty<uint>();
     private uint[] _allPlayers = Array.Empty<uint>();
     private Entity[] _entitiesAll = Array.Empty<Entity>();
+    private HashSet<Entity> _entitiesDirtySet = new HashSet<Entity>();
+    private List<Entity> _entitiesDirty = new List<Entity>();
     private List<uint> _peersCache = new List<uint>();
 
     public GameRoom(IGameThread gameThread, PluginBase pluginBase, string roomId, string map, int min, int max)
@@ -113,11 +117,25 @@ namespace Ragon.Core
           Broadcast(_readyPlayers, sendData);
         }
 
+        if (_allPlayers.Length > 0 && player.PeerId == _owner)
+        {
+          var nextOwnerId = _allPlayers[0];
+          _owner = nextOwnerId;
+          var nextOwner = _players[nextOwnerId];
+
+          _serializer.Clear();
+          _serializer.WriteOperation(RagonOperation.OWNERSHIP_CHANGED);
+          _serializer.WriteString(nextOwner.Id);
+
+          var sendData = _serializer.ToArray();
+          Broadcast(_readyPlayers, sendData);
+        }
+
         _entitiesAll = _entities.Values.ToArray();
       }
     }
 
-    public void ProcessEvent(uint peerId, RagonOperation operation, ReadOnlySpan<byte> payloadRawData)
+    public void ProcessEvent(ushort peerId, RagonOperation operation, ReadOnlySpan<byte> payloadRawData)
     {
       _serializer.Clear();
       _serializer.FromSpan(ref payloadRawData);
@@ -126,14 +144,39 @@ namespace Ragon.Core
       {
         case RagonOperation.REPLICATE_ENTITY_STATE:
         {
-          var entityId = _serializer.ReadInt();
+          var entitiesCount = _serializer.ReadUShort();
+          for (var entityIndex = 0; entityIndex < entitiesCount; entityIndex++)
+          {
+            var entityId = _serializer.ReadUShort();
             if (_entities.TryGetValue(entityId, out var ent))
             {
-            if (ent.State.Authority == RagonAuthority.OWNER_ONLY && ent.OwnerId != peerId)
+              if (ent.OwnerId != peerId)
+              {
+                _logger.Warn($"Not owner can't change properties of object {entityId}");
                 return;
+              }
 
-            var entityStateData = _serializer.ReadData(_serializer.Size);
-            ent.State.Write(ref entityStateData);
+              for (var i = 0; i < ent.Properties.Length; i++)
+              {
+                if (_serializer.ReadBool())
+                {
+                  var property = ent.Properties[i];
+                  if (!property.IsFixed)
+                    property.Size = _serializer.ReadUShort();
+
+                  var propertyPayload = _serializer.ReadData(property.Size);
+                  property.Write(ref propertyPayload);
+                }
+              }
+
+              if (_entitiesDirtySet.Add(ent))
+                _entitiesDirty.Add(ent);
+            }
+            else
+            {
+              _logger.Error($"Entity with Id {entityId} not found, replication interrupted");
+              break;
+            }
           }
 
           break;
@@ -143,7 +186,7 @@ namespace Ragon.Core
           var evntId = _serializer.ReadUShort();
           var evntMode = _serializer.ReadByte();
           var targetMode = (RagonTarget) _serializer.ReadByte();
-          var entityId = _serializer.ReadInt();
+          var entityId = _serializer.ReadUShort();
 
           if (!_entities.TryGetValue(entityId, out var ent))
             return;
@@ -164,8 +207,9 @@ namespace Ragon.Core
           _serializer.WriteUShort(evntId);
           _serializer.WriteUShort((ushort) peerId);
           _serializer.WriteByte(evntMode);
-          _serializer.WriteInt(entityId);
+          _serializer.WriteUShort(entityId);
           _serializer.WriteData(ref payload);
+
           var sendData = _serializer.ToArray();
 
           switch (targetMode)
@@ -191,6 +235,7 @@ namespace Ragon.Core
               break;
             }
           }
+
           break;
         }
         case RagonOperation.LOAD_SCENE:
@@ -253,19 +298,26 @@ namespace Ragon.Core
               break;
             }
           }
+
           break;
         }
-        case RagonOperation.CREATE_STATIC_ENTITY:
+        case RagonOperation.CREATE_SCENE_ENTITY:
         {
           var entityType = _serializer.ReadUShort();
           var staticId = _serializer.ReadUShort();
-          var stateAuthority = (RagonAuthority) _serializer.ReadByte();
-          var eventAuthority = (RagonAuthority) _serializer.ReadByte();
-          var entity = new Entity(peerId, entityType, staticId, stateAuthority, eventAuthority);
+          var propertiesCount = _serializer.ReadUShort();
+
+          var entity = new Entity(peerId, entityType, staticId, RagonAuthority.ALL, RagonAuthority.OWNER_ONLY, propertiesCount);
+          for (var i = 0; i < propertiesCount; i++)
+          {
+            var propertyType = _serializer.ReadBool();
+            var propertySize = _serializer.ReadUShort();
+            entity.Properties[i] = new EntityProperty(propertySize, propertyType);
+          }
 
           {
             var entityPayload = _serializer.ReadData(_serializer.Size);
-            entity.Payload.Write(ref entityPayload);
+            entity.Payload = entityPayload.ToArray();
           }
 
           var player = _players[peerId];
@@ -280,16 +332,15 @@ namespace Ragon.Core
           _plugin.OnEntityCreated(player, entity);
 
           _serializer.Clear();
-          _serializer.WriteOperation(RagonOperation.CREATE_STATIC_ENTITY);
+          _serializer.WriteOperation(RagonOperation.CREATE_SCENE_ENTITY);
           _serializer.WriteUShort(entityType);
+          _serializer.WriteUShort(entity.EntityId);
           _serializer.WriteUShort(staticId);
-          _serializer.WriteByte((byte) stateAuthority);
-          _serializer.WriteByte((byte) eventAuthority);
-          _serializer.WriteInt(entity.EntityId);
           _serializer.WriteUShort(ownerId);
 
           {
-            var entityPayload = entity.Payload.Read();
+            ReadOnlySpan<byte> entityPayload = entity.Payload.AsSpan();
+            _serializer.WriteUShort((ushort) entityPayload.Length);
             _serializer.WriteData(ref entityPayload);
           }
 
@@ -300,13 +351,18 @@ namespace Ragon.Core
         case RagonOperation.CREATE_ENTITY:
         {
           var entityType = _serializer.ReadUShort();
-          var stateAuthority = (RagonAuthority) _serializer.ReadByte();
-          var eventAuthority = (RagonAuthority) _serializer.ReadByte();
-          var entity = new Entity(peerId, entityType, -1, stateAuthority, eventAuthority);
+          var propertiesCount = _serializer.ReadUShort();
+          var entity = new Entity(peerId, entityType, 0, RagonAuthority.ALL, RagonAuthority.ALL, propertiesCount);
+          for (var i = 0; i < propertiesCount; i++)
+          {
+            var propertyType = _serializer.ReadBool();
+            var propertySize = _serializer.ReadUShort();
+            entity.Properties[i] = new EntityProperty(propertySize, propertyType);
+          }
 
           {
             var entityPayload = _serializer.ReadData(_serializer.Size);
-            entity.Payload.Write(ref entityPayload);
+            entity.Payload = entityPayload.ToArray();
           }
 
           var player = _players[peerId];
@@ -323,13 +379,12 @@ namespace Ragon.Core
           _serializer.Clear();
           _serializer.WriteOperation(RagonOperation.CREATE_ENTITY);
           _serializer.WriteUShort(entityType);
-          _serializer.WriteByte((byte) stateAuthority);
-          _serializer.WriteByte((byte) eventAuthority);
-          _serializer.WriteInt(entity.EntityId);
+          _serializer.WriteUShort(entity.EntityId);
           _serializer.WriteUShort(ownerId);
 
           {
-            var entityPayload = entity.Payload.Read();
+            ReadOnlySpan<byte> entityPayload = entity.Payload.AsSpan();
+            _serializer.WriteUShort((ushort) entityPayload.Length);
             _serializer.WriteData(ref entityPayload);
           }
 
@@ -359,6 +414,7 @@ namespace Ragon.Core
             _serializer.Clear();
             _serializer.WriteOperation(RagonOperation.DESTROY_ENTITY);
             _serializer.WriteInt(entityId);
+            _serializer.WriteUShort((ushort) destroyPayload.Length);
             _serializer.WriteData(ref destroyPayload);
 
             var sendData = _serializer.ToArray();
@@ -372,7 +428,7 @@ namespace Ragon.Core
           _serializer.Clear();
           _serializer.WriteOperation(RagonOperation.SNAPSHOT);
 
-          _serializer.WriteInt(_allPlayers.Length);
+          _serializer.WriteUShort((ushort) _allPlayers.Length);
           foreach (var playerPeerId in _allPlayers)
           {
             _serializer.WriteString(_players[playerPeerId].Id);
@@ -380,49 +436,42 @@ namespace Ragon.Core
             _serializer.WriteString(_players[playerPeerId].PlayerName);
           }
 
-          var dynamicCount = _entitiesAll.Where(e => e.StaticId == -1).ToArray();
-          _serializer.WriteInt(dynamicCount.Length);
-          foreach (var entity in dynamicCount)
+          var dynamicEntities = _entitiesAll.Where(e => e.StaticId == 0).ToArray();
+          _serializer.WriteUShort((ushort) dynamicEntities.Length);
+          foreach (var entity in dynamicEntities)
           {
-            if (entity.StaticId != -1) continue;
+            ReadOnlySpan<byte> payload = entity.Payload.AsSpan();
 
-            var payload = entity.Payload.Read();
-            var state = entity.State.Read();
-
-            _serializer.WriteInt(entity.EntityId);
-            _serializer.WriteByte((byte) entity.State.Authority);
-            _serializer.WriteByte((byte) entity.Authority);
             _serializer.WriteUShort(entity.EntityType);
+            _serializer.WriteUShort(entity.EntityId);
             _serializer.WriteUShort((ushort) entity.OwnerId);
             _serializer.WriteUShort((ushort) payload.Length);
             _serializer.WriteData(ref payload);
-            _serializer.WriteData(ref state);
           }
 
-          var staticCount = _entitiesAll.Where(e => e.StaticId != -1).ToArray();
-          _serializer.WriteInt(staticCount.Length);
+          var staticCount = _entitiesAll.Where(e => e.StaticId != 0).ToArray();
+          _serializer.WriteUShort((ushort) staticCount.Length);
           foreach (var entity in staticCount)
           {
-            var payload = entity.Payload.Read();
-            var state = entity.State.Read();
+            ReadOnlySpan<byte> payload = entity.Payload.AsSpan();
 
-            _serializer.WriteInt(entity.EntityId);
-            _serializer.WriteUShort((ushort) entity.StaticId);
-            _serializer.WriteByte((byte) entity.State.Authority);
-            _serializer.WriteByte((byte) entity.Authority);
             _serializer.WriteUShort(entity.EntityType);
-            _serializer.WriteUShort((ushort) entity.OwnerId);
+            _serializer.WriteUShort(entity.EntityId);
+            _serializer.WriteUShort(entity.StaticId);
+            _serializer.WriteUShort(entity.OwnerId);
             _serializer.WriteUShort((ushort) payload.Length);
             _serializer.WriteData(ref payload);
-            _serializer.WriteData(ref state);
           }
 
           var sendData = _serializer.ToArray();
           Send(peerId, sendData, DeliveryType.Reliable);
 
+          RestoreProperties(peerId);
+
           _players[peerId].IsLoaded = true;
           _readyPlayers = _players.Where(p => p.Value.IsLoaded).Select(p => p.Key).ToArray();
           _plugin.OnPlayerJoined(_players[peerId]);
+
           break;
         }
       }
@@ -432,23 +481,67 @@ namespace Ragon.Core
     {
       _scheduler.Tick(deltaTime);
 
-      foreach (var entity in _entitiesAll)
+      if (_entitiesDirty.Count > 0)
       {
-        if (entity.State.isDirty)
-        {
-          var state = entity.State.Read();
-
         _serializer.Clear();
         _serializer.WriteOperation(RagonOperation.REPLICATE_ENTITY_STATE);
-          _serializer.WriteInt(entity.EntityId);
-          _serializer.WriteData(ref state);
+        _serializer.WriteUShort((ushort) _entitiesDirty.Count);
+
+        for (var entityIndex = 0; entityIndex < _entitiesDirty.Count; entityIndex++)
+        {
+          var entity = _entitiesDirty[entityIndex];
+          _serializer.WriteUShort(entity.EntityId);
+
+          for (int propertyIndex = 0; propertyIndex < entity.Properties.Length; propertyIndex++)
+          {
+            var property = entity.Properties[propertyIndex];
+            if (property.IsDirty)
+            {
+              _serializer.WriteBool(true);
+              var span = _serializer.GetWritableData(property.Size);
+              var data = property.Read();
+              data.CopyTo(span);
+              property.Clear();
+            }
+            else
+            {
+              _serializer.WriteBool(false);
+            }
+          }
+        }
+
+        _entitiesDirty.Clear();
+        _entitiesDirtySet.Clear();
 
         var sendData = _serializer.ToArray();
-          Broadcast(_readyPlayers, sendData, DeliveryType.Unreliable);
+        Broadcast(_readyPlayers, sendData);
+      }
+    }
 
-          entity.State.Clear();
+    public void RestoreProperties(uint peerId)
+    {
+      _serializer.Clear();
+      _serializer.WriteOperation(RagonOperation.REPLICATE_ENTITY_STATE);
+      _serializer.WriteUShort((ushort) _entitiesAll.Length);
+
+      for (var entityIndex = 0; entityIndex < _entitiesAll.Length; entityIndex++)
+      {
+        var entity = _entitiesAll[entityIndex];
+        _serializer.WriteUShort(entity.EntityId);
+
+        for (int propertyIndex = 0; propertyIndex < entity.Properties.Length; propertyIndex++)
+        {
+          var property = entity.Properties[propertyIndex];
+          _serializer.WriteBool(true);
+
+          var span = _serializer.GetWritableData(property.Size);
+          var data = property.Read();
+          data.CopyTo(span);
         }
       }
+
+      var sendData = _serializer.ToArray();
+      Send(peerId, sendData, DeliveryType.Reliable);
     }
 
     public void Start()

Ragon/Sources/Game/GameThread.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Threading;
 using Ragon.Common;
 using ENet;
@@ -11,36 +10,33 @@ namespace Ragon.Core
   {
     private readonly RoomManager _roomManager;
     private readonly Thread _thread;
-    private readonly Stopwatch _gameLoopTimer;
     private readonly Lobby _lobby;
+    private readonly ISocketServer _server;
+    private readonly IDispatcherInternal _dispatcherInternal;
+    private readonly IDispatcher _dispatcher;
     private readonly ILogger _logger = LogManager.GetCurrentClassLogger();
     private readonly float _deltaTime = 0.0f;
-    private readonly Stopwatch _statisticsTimer;
     private readonly Configuration _configuration;
-    private readonly IDispatcherInternal _dispatcherInternal;
 
-    public IDispatcher ThreadDispatcher { get; private set; }
-    public ISocketServer Server { get; private set; }
+    public ISocketServer Server => _server;
+    public IDispatcher ThreadDispatcher => _dispatcher;
 
     public GameThread(PluginFactory factory, Configuration configuration)
     {
+      var authorizationProvider = factory.CreateAuthorizationProvider(configuration);
+
       _configuration = configuration;
 
-      var authorizationProvider = factory.CreateAuthorizationProvider(configuration);
       var dispatcher = new Dispatcher();
       _dispatcherInternal = dispatcher;
+      _dispatcher = dispatcher;
 
-      ThreadDispatcher = dispatcher;
-      Server = new ENetServer(this);
-
+      _server = new ENetServer(this);
       _deltaTime = 1000.0f / configuration.SendRate;
 
       _roomManager = new RoomManager(factory, this);
       _lobby = new Lobby(authorizationProvider, _roomManager, this);
 
-      _gameLoopTimer = new Stopwatch();
-      _statisticsTimer = new Stopwatch();
-
       _thread = new Thread(Execute);
       _thread.Name = "Game Thread";
       _thread.IsBackground = true;
@@ -48,19 +44,33 @@ namespace Ragon.Core
 
     public void Start()
     {
-      Server.Start(_configuration.Port, _configuration.MaxConnections);
+      var strings = _configuration.Protocol.Split(".");
+      if (strings.Length < 3)
+      {
+        _logger.Error("Wrong protocol passed to connect method");
+        return;
+      }
 
-      _gameLoopTimer.Start();
-      _statisticsTimer.Start();
+      var parts = new uint[] {0, 0, 0};
+      for (int i = 0; i < parts.Length; i++)
+      {
+        if (!uint.TryParse(strings[i], out var v))
+        {
+          _logger.Error("Wrong protocol");
+          return;
+        }
+
+        parts[i] = v;
+      }
+
+      uint encoded = (parts[0] << 16) | (parts[1] << 8) | parts[2];
+      _server.Start(_configuration.Port, _configuration.MaxConnections, encoded);
       _thread.Start();
     }
 
     public void Stop()
     {
-      Server.Stop();
-
-      _gameLoopTimer.Stop();
-      _statisticsTimer.Stop();
+      _server.Stop();
       _thread.Interrupt();
     }
 
@@ -68,23 +78,11 @@ namespace Ragon.Core
     {
       while (true)
       {
-        Server.Process();
-
+        _server.Process();
         _dispatcherInternal.Process();
+        _roomManager.Tick(_deltaTime);
 
-        var elapsedMilliseconds = _gameLoopTimer.ElapsedMilliseconds;
-        if (elapsedMilliseconds > _deltaTime)
-        {
-          _roomManager.Tick(elapsedMilliseconds / 1000.0f);
-          _gameLoopTimer.Restart();
-          continue;
-        }
-
-        if (_statisticsTimer.Elapsed.Seconds > _configuration.StatisticsInterval && _roomManager.RoomsBySocket.Count > 0)
-        {
-          _logger.Trace($"Rooms: {_roomManager.Rooms.Count} Clients: {_roomManager.RoomsBySocket.Count}");
-          _statisticsTimer.Restart();
-        }
+        Thread.Sleep((int) _deltaTime);
       }
     }
 
@@ -104,7 +102,7 @@ namespace Ragon.Core
       {
         try
         {
-          var peerId = evnt.Peer.ID;
+          var peerId = (ushort) evnt.Peer.ID;
           var dataRaw = new byte[evnt.Packet.Length];
           evnt.Packet.CopyTo(dataRaw);
 

Ragon/Sources/Lobby/Lobby.cs

@@ -23,7 +23,7 @@ public class Lobby : ILobby
     _authorizationManager = new AuthorizationManager(provider, gameThread, this, _serializer);
   }
 
-  public void ProcessEvent(uint peerId, RagonOperation op, ReadOnlySpan<byte> payload)
+  public void ProcessEvent(ushort peerId, RagonOperation op, ReadOnlySpan<byte> payload)
   {
     _serializer.Clear();
     _serializer.FromSpan(ref payload);
@@ -32,8 +32,7 @@ public class Lobby : ILobby
     {
       var key = _serializer.ReadString();
       var playerName = _serializer.ReadString();
-      var protocol = _serializer.ReadByte();
-      _authorizationManager.OnAuthorization(peerId, key, playerName, protocol);
+      _authorizationManager.OnAuthorization(peerId, key, playerName);
       return;
     }
 

Ragon/Sources/Server/ENet/ENetServer.cs

@@ -1,46 +1,42 @@
 using System;
+using System.Diagnostics;
+using System.Timers;
 using ENet;
 using NLog;
 
 namespace Ragon.Core
 {
-  public enum Status
-  {
-    Stopped,
-    Listening,
-    Disconnecting,
-    Connecting,
-    Assigning,
-    Connected
-  }
-
   public class ENetServer : ISocketServer
   {
-    public Status Status { get; private set; }
-
     private ILogger _logger = LogManager.GetCurrentClassLogger();
     private Host _host;
+    private uint _protocol;
     private Address _address;
     private Event _netEvent;
     private Peer[] _peers;
     private IHandler _handler;
+    private Stopwatch _timer;
     
     public ENetServer(IHandler handler)
     {
       _handler = handler;
+      _timer = Stopwatch.StartNew();
+      _peers = Array.Empty<Peer>();
+      _host = new Host();
     }
 
-    public void Start(ushort port, int connections)
+    public void Start(ushort port, int connections, uint protocol)
     {
       _address = default;
       _address.Port = port;
       _peers = new Peer[connections];
-
-      _host = new Host();
+      _protocol = protocol;
       _host.Create(_address, connections, 2, 0, 0, 1024 * 1024);
       
-      Status = Status.Listening;
+      
+      var protocolDecoded = (protocol >> 16 & 0xFF) + "." + (protocol >> 8 & 0xFF) + "." + (protocol & 0xFF);
       _logger.Info($"Network listening on {port}");
+      _logger.Info($"Protocol: {protocolDecoded}");
     }
 
     public void Broadcast(uint[] peersIds, byte[] data, DeliveryType type)
@@ -57,7 +53,7 @@ namespace Ragon.Core
       else if (type == DeliveryType.Unreliable)
       {
         channel = 1;
-        packetFlags = PacketFlags.None;
+        packetFlags = PacketFlags.UnreliableFragmented;
       }
 
       newPacket.Create(data, data.Length, packetFlags);
@@ -98,7 +94,7 @@ namespace Ragon.Core
       {
         if (_host.CheckEvents(out _netEvent) <= 0)
         {
-          if (_host.Service(15, out _netEvent) <= 0)
+          if (_host.Service(0, out _netEvent) <= 0)
             break;
 
           polled = true;
@@ -107,11 +103,17 @@ namespace Ragon.Core
         switch (_netEvent.Type)
         {
           case EventType.None:
-            Console.WriteLine("None event");
+          {
+            _logger.Trace("None event");
             break;
-
+          }
           case EventType.Connect:
           {
+            // if (IsValidProtocol(_netEvent.Data))
+            // {
+            //   _logger.Warn("Mismatched protocol, close connection");
+            //   break;
+            // }
             _peers[_netEvent.Peer.ID] = _netEvent.Peer;
             _handler.OnEvent(_netEvent);
             break;
@@ -140,5 +142,10 @@ namespace Ragon.Core
     {
       _host?.Dispose();
     }
+
+    private bool IsValidProtocol(uint protocol)
+    {
+      return protocol == _protocol;
+    }
   }
 }

Ragon/Sources/Server/ISocketServer.cs

@@ -2,7 +2,7 @@ namespace Ragon.Core;
 
 public interface ISocketServer
 {
-  public void Start(ushort port, int connections);
+  public void Start(ushort port, int connections, uint protocol);
   public void Process();
   public void Stop();
   public void Send(uint peerId, byte[] data, DeliveryType type);

license

@@ -1,7 +1,7 @@
-MIT License
-
 Copyright (c) 2022 Eduard Kargin (theedison4@gmail.com)
 
+MIT License:
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights