fixed: mistype

Ragon.Common/Sources/RagonSerializer.cs

@@ -27,6 +27,7 @@ namespace Ragon.Common
     private byte[] _data;
     private int _offset;
     private int _size;
+    
     public int Lenght => _offset;
     public int Size => _size - _offset;
 

Ragon/Sources/Authorization/AuthorizationManager.cs

@@ -48,7 +48,7 @@ public class AuthorizationManager : IAuthorizationManager
       PeerId = peerId,
       IsLoaded = false,
       Entities = new List<Entity>(),
-      EntitiesIds = new List<int>(),
+      EntitiesIds = new List<ushort>(),
     };
 
     _playersByIds.Add(playerId, player);

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,3 +1,4 @@
+using System;
 using Ragon.Common;
 
 namespace Ragon.Core;
@@ -20,7 +21,7 @@ public class Entity
     EntityType = entityType;
     EntityId = _idGenerator++;
     Properties = new EntityProperty[props];
-    Payload = new byte[1024];
+    Payload = Array.Empty<byte>();
     Authority = eventAuthority;
   }
 }

Ragon/Sources/Entity/EntityProperty.cs

@@ -6,17 +6,19 @@ namespace Ragon.Core;
 public class EntityProperty
 {
     public int Size { get; set; }
+    public int Capacity { 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];
+        Capacity = 512;
-
         Size = size;
         IsFixed = isFixed;
         IsDirty = true;
+        
+        _data = new byte[Capacity];
     }
     
     public ReadOnlySpan<byte> Read()

Ragon/Sources/Game/GameRoom.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using NLog;
 using Ragon.Common;
@@ -109,7 +108,7 @@ namespace Ragon.Core
           _serializer.WriteUShort((ushort) player.EntitiesIds.Count);
           foreach (var entityId in player.EntitiesIds)
           {
-            _serializer.WriteInt(entityId);
+            _serializer.WriteUShort(entityId);
             _entities.Remove(entityId);
           }
 
@@ -117,12 +116,12 @@ namespace Ragon.Core
           Broadcast(_readyPlayers, sendData);
         }
 
-        if (_allPlayers.Length > 0)
+        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);
@@ -130,7 +129,7 @@ namespace Ragon.Core
           var sendData = _serializer.ToArray();
           Broadcast(_readyPlayers, sendData);
         }
-        
+
         _entitiesAll = _entities.Values.ToArray();
       }
     }
@@ -155,17 +154,25 @@ namespace Ragon.Core
                 _logger.Warn($"Not owner can't change properties of object {entityId}");
                 return;
               }
-              
+
               for (var i = 0; i < ent.Properties.Length; i++)
               {
                 if (_serializer.ReadBool())
                 {
                   var property = ent.Properties[i];
+                  var size = property.Size; 
                   if (!property.IsFixed)
-                    property.Size = _serializer.ReadUShort();
+                    size = _serializer.ReadUShort();
+
+                  if (size > property.Capacity)
+                  {
+                    _logger.Warn($"Property {i} payload too large, size: {size}");
+                    continue;
+                  }
                   
-                  var propertyPayload = _serializer.ReadData(property.Size);
+                  var propertyPayload = _serializer.ReadData(size);
                   property.Write(ref propertyPayload);
+                  property.Size = size;
                 }
               }
 
@@ -178,6 +185,7 @@ namespace Ragon.Core
               break;
             }
           }
+
           break;
         }
         case RagonOperation.REPLICATE_ENTITY_EVENT:
@@ -208,7 +216,7 @@ namespace Ragon.Core
           _serializer.WriteByte(evntMode);
           _serializer.WriteUShort(entityId);
           _serializer.WriteData(ref payload);
-          
+
           var sendData = _serializer.ToArray();
 
           switch (targetMode)
@@ -339,6 +347,7 @@ namespace Ragon.Core
 
           {
             ReadOnlySpan<byte> entityPayload = entity.Payload.AsSpan();
+            _serializer.WriteUShort((ushort) entityPayload.Length);
             _serializer.WriteData(ref entityPayload);
           }
 
@@ -351,13 +360,11 @@ namespace Ragon.Core
           var entityType = _serializer.ReadUShort();
           var propertiesCount = _serializer.ReadUShort();
           var entity = new Entity(peerId, entityType, 0, RagonAuthority.ALL, RagonAuthority.ALL, propertiesCount);
-          // _logger.Trace("Created entity with properties: " + propertiesCount);
           for (var i = 0; i < propertiesCount; i++)
           {
             var propertyType = _serializer.ReadBool();
             var propertySize = _serializer.ReadUShort();
             entity.Properties[i] = new EntityProperty(propertySize, propertyType);
-            // _logger.Trace($"Property: {i} Size: {propertySize} IsFixed: {propertyType}");
           }
 
           {
@@ -369,7 +376,7 @@ namespace Ragon.Core
           player.Entities.Add(entity);
           player.EntitiesIds.Add(entity.EntityId);
 
-          var ownerId = (ushort) peerId;
+          var ownerId = peerId;
 
           _entities.Add(entity.EntityId, entity);
           _entitiesAll = _entities.Values.ToArray();
@@ -384,6 +391,7 @@ namespace Ragon.Core
 
           {
             ReadOnlySpan<byte> entityPayload = entity.Payload.AsSpan();
+            _serializer.WriteUShort((ushort) entityPayload.Length);
             _serializer.WriteData(ref entityPayload);
           }
 
@@ -413,6 +421,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();
@@ -464,9 +473,12 @@ namespace Ragon.Core
           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;
         }
       }
@@ -475,18 +487,23 @@ namespace Ragon.Core
     public void Tick(float deltaTime)
     {
       _scheduler.Tick(deltaTime);
+      
+      ReplicateProperties();
+    }
 
+    private void ReplicateProperties()
+    {
       if (_entitiesDirty.Count > 0)
       {
         _serializer.Clear();
         _serializer.WriteOperation(RagonOperation.REPLICATE_ENTITY_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];
@@ -512,6 +529,39 @@ namespace Ragon.Core
         Broadcast(_readyPlayers, sendData);
       }
     }
+    
+    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];
+          var hasPayload = property.IsFixed || property.Size > 0 && !property.IsFixed;
+          if (hasPayload)
+          {
+            _serializer.WriteBool(true);
+            var span = _serializer.GetWritableData(property.Size);
+            var data = property.Read();
+            data.CopyTo(span);
+          }
+          else
+          {
+            _serializer.WriteBool(false);
+          }
+        }
+      }
+
+      var sendData = _serializer.ToArray();
+      Send(peerId, sendData, DeliveryType.Reliable);
+    }
 
     public void Start()
     {
@@ -537,19 +587,13 @@ namespace Ragon.Core
 
     public IScheduler GetScheduler() => _scheduler;
 
-    public void Send(uint peerId, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable)
+    public void Send(uint peerId, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable) =>
-    {
       _gameThread.Server.Send(peerId, rawData, deliveryType);
-    }
 
-    public void Broadcast(uint[] peersIds, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable)
+    public void Broadcast(uint[] peersIds, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable) =>
-    {
       _gameThread.Server.Broadcast(peersIds, rawData, deliveryType);
-    }
 
-    public void Broadcast(byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable)
+    public void Broadcast(byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable) =>
-    {
       _gameThread.Server.Broadcast(_allPlayers, rawData, deliveryType);
-    }
   }
 }

Ragon/Sources/Game/GameThread.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Security.Cryptography;
 using System.Threading;
 using Ragon.Common;
 using ENet;
@@ -13,42 +10,33 @@ namespace Ragon.Core
   {
     private readonly RoomManager _roomManager;
     private readonly Thread _thread;
-    private readonly Stopwatch _gameLoopTimer;
-    private readonly Stopwatch _statisticsTimer;
-    
-    private readonly Stopwatch _serverTimer;
-    private readonly Stopwatch _logicTimer;
-    
     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 Configuration _configuration;
-    private readonly IDispatcherInternal _dispatcherInternal;
 
-    public IDispatcher ThreadDispatcher { get; private set; }
+    public ISocketServer Server => _server;
-    public ISocketServer Server { get; private set; }
+    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();
-      _serverTimer = new Stopwatch();
-      _logicTimer = new Stopwatch();
-
       _thread = new Thread(Execute);
       _thread.Name = "Game Thread";
       _thread.IsBackground = true;
@@ -62,6 +50,7 @@ namespace Ragon.Core
         _logger.Error("Wrong protocol passed to connect method");
         return;
       }
+
       var parts = new uint[] {0, 0, 0};
       for (int i = 0; i < parts.Length; i++)
       {
@@ -70,25 +59,18 @@ namespace Ragon.Core
           _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);
 
-      _gameLoopTimer.Start();
+      uint encoded = (parts[0] << 16) | (parts[1] << 8) | parts[2];
-      _statisticsTimer.Start();
+      _server.Start(_configuration.Port, _configuration.MaxConnections, encoded);
-      _logicTimer.Start();
-      _serverTimer.Start();
       _thread.Start();
     }
 
     public void Stop()
     {
-      Server.Stop();
+      _server.Stop();
-
-      _gameLoopTimer.Stop();
-      _statisticsTimer.Stop();
       _thread.Interrupt();
     }
 
@@ -96,29 +78,11 @@ namespace Ragon.Core
     {
       while (true)
       {
-        _logicTimer.Restart();
+        _server.Process();
-        _serverTimer.Restart();
-        
-        Server.Process();
-
         _dispatcherInternal.Process();
+        _roomManager.Tick(_deltaTime);
 
-        var elapsedMilliseconds = _gameLoopTimer.ElapsedMilliseconds;
+        Thread.Sleep((int) _deltaTime);
-        if (elapsedMilliseconds > _deltaTime)
-        {
-          _roomManager.Tick(elapsedMilliseconds / 1000.0f);
-          _gameLoopTimer.Restart();
-          continue;
-        }
-
-        if (_statisticsTimer.Elapsed.Seconds > _configuration.StatisticsInterval && _roomManager.RoomsBySocket.Count > 0)
-        {
-          var rooms = _roomManager.Rooms.Count;
-          var clients = _roomManager.RoomsBySocket.Count;
-          var entities = _roomManager.Rooms.Select(r => r.EntitiesCount).Sum();
-          _logger.Trace($"Rooms: {rooms} Clients: {clients} Entities: {entities}");
-          _statisticsTimer.Restart();
-        }
       }
     }
 
@@ -145,10 +109,10 @@ namespace Ragon.Core
           var data = new ReadOnlySpan<byte>(dataRaw);
           var operation = (RagonOperation) data[0];
           var payload = data.Slice(1, data.Length - 1);
-          
+
           if (_roomManager.RoomsBySocket.TryGetValue(peerId, out var room))
             room.ProcessEvent(peerId, operation, payload);
-          
+
           _lobby.ProcessEvent(peerId, operation, payload);
         }
         catch (Exception exception)

Ragon/Sources/Player/Player.cs

@@ -11,6 +11,6 @@ namespace Ragon.Core
     public bool IsLoaded { get; set; }
     
     public List<Entity> Entities;
-    public List<int> EntitiesIds;
+    public List<ushort> EntitiesIds;
   }
 }

Ragon/Sources/Server/ENet/ENetServer.cs

@@ -94,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;

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