wip

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
-          release_name: SimpleServer-${{ github.ref }}
+          release_name: Ragon.SimpleServer-${{ github.ref }}
           prerelease: true
 
   build:
@@ -53,10 +53,10 @@ jobs:
       - name: Build
         shell: bash
         run: |
-          release_name="SimpleServer-${{ env.TAG }}-${{ matrix.target }}"
+          release_name="Ragon.SimpleServer-${{ env.TAG }}-${{ matrix.target }}"
           
           # Build everything
-          dotnet publish SimpleServer/SimpleServer.csproj -c Release --runtime "${{ matrix.target }}" -p:PublishSingleFile=true -o "$release_name"
+          dotnet publish Ragon.SimpleServer/Ragon.SimpleServer.csproj -c Release --runtime "${{ matrix.target }}" -p:PublishSingleFile=true -o "$release_name"
           
           # Pack files        
           7z a -tzip "${release_name}.zip" "./${release_name}/*"

Ragon.Common/Protocol/RagonSerializer.cs

@@ -14,7 +14,7 @@ namespace Ragon.Common
     public int Lenght => _offset;
     public int Size => _size - _offset;
     
-    public RagonSerializer(int capacity = 2048)
+    public RagonSerializer(int capacity = 256)
     {
       _data = new byte[capacity];
       _offset = 0;
@@ -31,7 +31,7 @@ namespace Ragon.Common
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public int ReadByte()
+    public byte ReadByte()
     {
       var value = _data[_offset];
       _offset += 1;
@@ -171,6 +171,15 @@ namespace Ragon.Common
       _size = data.Length;
     }
     
+    public void FromArray(byte[] data)
+    {
+      Clear();
+      ResizeIfNeed(data.Length);
+      Buffer.BlockCopy(data, 0, _data, 0, _offset);
+      _size = data.Length;
+    }
+
+    
     public byte[] ToArray()
     {
       var bytes = new byte[_offset];
@@ -183,7 +192,7 @@ namespace Ragon.Common
       if (_offset + lenght < _data.Length)
         return;
       
-      var newData = new byte[_data.Length * 2 + lenght];
+      var newData = new byte[_data.Length * 4 + lenght];
       Buffer.BlockCopy(_data, 0, newData, 0, _data.Length);
       _data = newData;
     }

Ragon.SimpleServer/Program.cs

@@ -9,9 +9,10 @@ namespace SimpleServer
         static void Main(string[] args)
         {
             var bootstrap = new Bootstrap();
-            bootstrap.Configure(new SimplePluginFactory());
+            var app = bootstrap.Configure(new SimplePluginFactory());
-            
+            app.Start();
             Console.Read();
+            app.Stop();
         }
     }
 }

Ragon.SimpleServer/Ragon.SimpleServer.csproj

@@ -23,8 +23,4 @@
       <ProjectReference Include="..\Ragon\Ragon.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Source\Managers" />
-    </ItemGroup>
-
 </Project>

Ragon.SimpleServer/Source/AuthorizationProviderByKey.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Threading.Tasks;
+using Ragon.Core;
+
+namespace Game.Source;
+
+public class AuthorizationProviderByKey: IAuthorizationProvider
+{
+  private Configuration _configuration;
+  public AuthorizationProviderByKey(Configuration configuration)
+  {
+    _configuration = configuration;
+  }
+  
+  public async Task OnAuthorizationRequest(string key, string name, byte protocol, byte[] additionalData, Action<string, string> accept, Action<uint> reject)
+  {
+    if (key == _configuration.Key)
+    {
+      var playerId = Guid.NewGuid().ToString();
+      var playerName = name;
+      
+      accept(playerId, playerName);
+    }
+    else
+    {
+      reject(0);
+    }  
+  }
+}

Ragon.SimpleServer/Source/Plugins/SimplePlugin.cs

@@ -1,8 +1,4 @@
-using System.Runtime.InteropServices;
+using Ragon.Core;
-using Game.Source.Events;
-using NLog;
-using Ragon.Common;
-using Ragon.Core;
 
 namespace Game.Source
 {
@@ -20,12 +16,13 @@ namespace Game.Source
    
     public override void OnPlayerJoined(Player player)
     {
-      _logger.Info("Player joined " + player.PlayerName);
+      
+      _logger.Info($"Player({player.PlayerName}) joined to Room({GameRoom.Id})");
     }
 
     public override void OnPlayerLeaved(Player player)
     {
-      _logger.Info("Player leaved " + player.PlayerName);
+      _logger.Info($"Player({player.PlayerName}) left from Room({GameRoom.Id})");
     }
   }
 }

Ragon.SimpleServer/Source/SimplePluginFactory.cs

@@ -5,16 +5,14 @@ namespace Game.Source
 {
   public class SimplePluginFactory : PluginFactory
   {
-    public string PluginName { get; set; }  = "SimplePlugin";
     public PluginBase CreatePlugin(string map)
     {
-      
       return new SimplePlugin();
     }
     
-    public AuthorizationManager CreateManager(Configuration configuration)
+    public IAuthorizationProvider CreateAuthorizationProvider(Configuration configuration)
     {
-      return new AuthorizerByKey(configuration);
+      return new AuthorizationProviderByKey(configuration);
     }
   }
 }

Ragon.SimpleServer/config.json

@@ -0,0 +1,8 @@
+{
+  "key": "defaultkey",
+  "tickRate": 30,
+  "skipTimeout": 60,
+  "server": {
+    "port": 4444
+  }
+}

Ragon.Stress/Ragon.Stress.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <RootNamespace>StressTest</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Ragon.Common\Ragon.Common.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="ENet-CSharp" Version="2.4.8" />
+    </ItemGroup>
+
+</Project>

Ragon.sln

@@ -2,10 +2,12 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ragon", "Ragon\Ragon.csproj", "{BABA1AF0-CF91-43F2-9577-53800068ACCF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleServer", "SimpleServer\SimpleServer.csproj", "{C2B87ADE-A122-4366-8EB7-24DAE11EBAF0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ragon.SimpleServer", "Ragon.SimpleServer\Ragon.SimpleServer.csproj", "{C2B87ADE-A122-4366-8EB7-24DAE11EBAF0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ragon.Common", "Ragon.Common\Ragon.Common.csproj", "{F478B2A2-36F4-43B9-9BB7-382A57C449B2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ragon.Stress", "Ragon.Stress\Ragon.Stress.csproj", "{45E4C6A4-6AB5-4BEA-82DD-1F75C1648EC4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -24,5 +26,9 @@ Global
 		{F478B2A2-36F4-43B9-9BB7-382A57C449B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F478B2A2-36F4-43B9-9BB7-382A57C449B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F478B2A2-36F4-43B9-9BB7-382A57C449B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45E4C6A4-6AB5-4BEA-82DD-1F75C1648EC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45E4C6A4-6AB5-4BEA-82DD-1F75C1648EC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45E4C6A4-6AB5-4BEA-82DD-1F75C1648EC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45E4C6A4-6AB5-4BEA-82DD-1F75C1648EC4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

Ragon/Ragon.csproj

@@ -18,7 +18,7 @@
 
     <ItemGroup>
       <PackageReference Include="ENet-CSharp" Version="2.4.8" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta1" />
       <PackageReference Include="NLog" Version="5.0.0-rc2" />
     </ItemGroup>
 

Ragon/Sources/Application.cs

@@ -2,97 +2,35 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using ENet;
 using NLog;
 
 namespace Ragon.Core
 {
-  public class Application : IDisposable
+  public class Application
   {
     private readonly Logger _logger = LogManager.GetCurrentClassLogger();
-    private readonly List<RoomThread> _roomThreads = new();
+    private readonly GameThread _gameThread;
-    private readonly Dictionary<uint, RoomThread> _socketByRoomThreads = new();
-    private readonly Dictionary<RoomThread, int> _roomThreadCounter = new();
-    private readonly Configuration _configuration;
-    private readonly ENetServer _socketServer;
-    private int _roomThreadBalancer = 0;
 
-    private Thread _thread;
+    public Application(PluginFactory factory, Configuration configuration)
-    
-    public Application(PluginFactory factory, Configuration configuration, int threadsCount)
     {
-      _socketServer = new ENetServer();
+      ThreadPool.SetMinThreads(1, 1);
-      _configuration = configuration;
       
-      for (var i = 0; i < threadsCount; i++)
+      _gameThread = new GameThread(factory, configuration);
-      {
-        var roomThread = new RoomThread(factory, configuration);
-        _roomThreadCounter.Add(roomThread, 0);
-        _roomThreads.Add(roomThread);
-      }
-    }
-
-    private void Loop()
-    {
-      while (true)
-      {
-        foreach (var roomThread in _roomThreads)
-          while (roomThread.ReadOutEvent(out var evnt))
-            _socketServer.WriteEvent(evnt);
-        
-        while (_socketServer.ReadEvent(out var evnt))
-        {
-          if (evnt.Type == EventType.CONNECTED)
-          {
-            if (_roomThreadBalancer >= _roomThreads.Count)
-              _roomThreadBalancer = 0;
-            
-            var roomThread = _roomThreads[_roomThreadBalancer];
-            _roomThreadCounter[roomThread] += 1;
-            _socketByRoomThreads.Add(evnt.PeerId, roomThread);
-            
-            // TODO: Todo room manager matchmaking across all room threads
-            // TEMP_FIX: Remove this magical number
-            if (_roomThreadCounter[roomThread] > 20)
-              _roomThreadBalancer++;
-          }
-
-          if (_socketByRoomThreads.TryGetValue(evnt.PeerId, out var existsRoomThread))
-            existsRoomThread.WriteInEvent(evnt);
-
-          if (evnt.Type == EventType.DISCONNECTED)
-          {
-            _socketByRoomThreads.Remove(evnt.PeerId, out var roomThread);
-            _roomThreadCounter[roomThread] =- 1;
-          }
-
-          if (evnt.Type == EventType.TIMEOUT)
-          {
-            _socketByRoomThreads.Remove(evnt.PeerId, out var roomThread);
-            _roomThreadCounter[roomThread] =- 1;
-          }
-        }
-
-        Thread.Sleep(1);
-      }
     }
     
     public void Start()
     {
-      _socketServer.Start(_configuration.Server.Port);
+      Library.Initialize();
       
-      foreach (var roomThread in _roomThreads)
+      _gameThread.Start();
-        roomThread.Start();
-
-      _thread = new Thread(Loop);
-      _thread.Start();
     }
 
-    public void Dispose()
+    public void Stop()
     {
-      foreach (var roomThread in _roomThreads)
+      _gameThread.Stop();
-        roomThread.Dispose();
       
-      _roomThreads.Clear();
+      Library.Deinitialize();
     }
   }
 }

Ragon/Sources/Authorization/AuthorizationManager.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using Ragon.Common;
+
+namespace Ragon.Core;
+
+public class AuthorizationManager : IAuthorizationManager
+{
+  private IAuthorizationProvider _provider;
+  private IGameThread _gameThread;
+  private Lobby _lobby;
+  private RagonSerializer _serializer;
+  private readonly Dictionary<uint, Player> _playersByPeers;
+  private readonly Dictionary<string, Player> _playersByIds;
+  
+  public AuthorizationManager(IAuthorizationProvider provider, IGameThread gameThread, Lobby lobby, RagonSerializer serializer)
+  {
+    _serializer = serializer;
+    _lobby = lobby;
+    _provider = provider;
+    _gameThread = gameThread;
+    _playersByIds = new Dictionary<string, Player>();
+    _playersByPeers = new Dictionary<uint, Player>();
+  }
+
+  public void OnAuthorization(uint peerId, string key, string name, byte protocol)
+  {
+    var dispatcher = _gameThread.GetDispatcher();
+    _provider.OnAuthorizationRequest(key, name, protocol, Array.Empty<byte>(),
+      (playerId, playerName) => { dispatcher.Dispatch(() => Accepted(peerId, playerId, playerName)); },
+      (errorCode) => { dispatcher.Dispatch(() => Rejected(peerId, errorCode)); });
+  }
+
+  public void Accepted(uint peerId, string playerId, string playerName)
+  {
+    _serializer.Clear();
+    _serializer.WriteOperation(RagonOperation.AUTHORIZED_SUCCESS);
+    _serializer.WriteString(playerId);
+    _serializer.WriteString(playerName);
+
+    var player = new Player()
+    {
+      Id = playerId,
+      PlayerName = playerName,
+      PeerId = peerId,
+      IsLoaded = false,
+      Entities = new List<Entity>(),
+      EntitiesIds = new List<int>(),
+    };
+    
+    _playersByIds.Add(playerId, player);
+    _playersByPeers.Add(peerId, player);
+    
+    var sendData = _serializer.ToArray();
+    _gameThread.SendSocketEvent(new SocketEvent() {Data = sendData, PeerId = peerId, Type = EventType.DATA, Delivery = DeliveryType.Reliable});
+  }
+
+  public void Rejected(uint peerId, uint code)
+  {
+    _serializer.Clear();
+    _serializer.WriteOperation(RagonOperation.AUTHORIZED_FAILED);
+    _serializer.WriteInt((int) code);
+
+    var sendData = _serializer.ToArray();
+    _gameThread.SendSocketEvent(new SocketEvent() {Data = sendData, PeerId = peerId, Type = EventType.DATA, Delivery = DeliveryType.Reliable});
+    var emtpyData = Array.Empty<byte>();
+    _gameThread.SendSocketEvent(new SocketEvent() {Data = emtpyData, PeerId = peerId, Type = EventType.DISCONNECTED, Delivery = DeliveryType.Reliable});
+  }
+
+  public void Cleanup(uint peerId)
+  {
+    if (_playersByPeers.Remove(peerId, out var player))
+      _playersByIds.Remove(player.Id);
+  }
+
+  public Player GetPlayer(uint peerId)
+  {
+    return _playersByPeers[peerId];
+  }
+  
+  public Player GetPlayer(string playerId)
+  {
+    return _playersByIds[playerId];
+  }
+}

Ragon/Sources/Authorization/IAuthorizationManager.cs

@@ -0,0 +1,6 @@
+namespace Ragon.Core;
+
+public interface IAuthorizationManager
+{
+  
+}

Ragon/Sources/Authorization/IAuthorizationProvider.cs

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

Ragon/Sources/AuthorizationManager.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace Ragon.Core;
-
-public class AuthorizationManager
-{
-  public virtual bool OnAuthorize(uint peerId, ref ReadOnlySpan<byte> payload)
-  {
-    return true;
-  }
-}

Ragon/Sources/Bootstrap.cs

@@ -8,13 +8,13 @@ namespace Ragon.Core
   {
     private ILogger _logger = LogManager.GetCurrentClassLogger();
 
-    public void Configure(PluginFactory factory)
+    public Application Configure(PluginFactory factory)
     {
       _logger.Info("Configure application...");
       var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "config.json");
       var configuration = ConfigurationLoader.Load(filePath);
-      var app = new Application(factory, configuration, 2);
+      var app = new Application(factory, configuration);
-      app.Start();
+      return app;
     }
   }
 }

Ragon/Sources/Configuration/Configuration.cs

@@ -6,13 +6,13 @@ namespace Ragon.Core
   public struct Server 
   {
     public ushort Port;
-    public ushort TickRate;
   }
   
   [Serializable]
   public struct Configuration
   {
     public string Key;
+    public ushort TickRate;
     public Server Server;
   }
 }

Ragon/Sources/Core/Communication/IReceiver.cs

@@ -0,0 +1,6 @@
+namespace Ragon.Core;
+
+public interface Receiver<T>
+{
+  public bool Receive(out T data);
+}

Ragon/Sources/Core/Communication/ISender.cs

@@ -0,0 +1,6 @@
+namespace Ragon.Core;
+
+public interface ISender<T>
+{
+  public void Send(T data);
+}

Ragon/Sources/Core/IO/Dispatcher.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace Ragon.Core;
+
+public class Dispatcher: IDispatcher
+{
+  public Queue<DispatcherTask> _actions = new Queue<DispatcherTask>();
+  public void Dispatch(Action action)
+  {
+    lock (_actions)
+      _actions.Enqueue(new DispatcherTask() { Action = action });
+  }
+
+  public void Process()
+  {
+    lock(_actions)
+      while(_actions.TryDequeue(out var action))
+        action.Execute();
+  }
+}

Ragon/Sources/Core/IO/DispatcherTask.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Diagnostics;
+
+namespace Ragon.Core;
+
+public class DispatcherTask
+{
+  public Action Action;
+  public Action Callback;
+
+  public void Execute()
+  {
+    Action?.Invoke();
+  }
+}

Ragon/Sources/Core/IO/IDispatcher.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Ragon.Core;
+
+public interface IDispatcher
+{
+  public void Dispatch(Action action);
+  public void Process();
+}

Ragon/Sources/Core/Utils/SynchronizedCache.cs

@@ -0,0 +1,130 @@
+using System.Collections.Generic;
+using System.Threading;
+
+namespace Ragon.Core.Core.Utils;
+
+public class SynchronizedCache 
+{
+    private ReaderWriterLockSlim cacheLock = new ReaderWriterLockSlim();
+    private Dictionary<int, string> innerCache = new Dictionary<int, string>();
+
+    public int Count
+    { get { return innerCache.Count; } }
+
+    public string Read(int key)
+    {
+        cacheLock.EnterReadLock();
+        try
+        {
+            return innerCache[key];
+        }
+        finally
+        {
+            cacheLock.ExitReadLock();
+        }
+    }
+
+    public void Add(int key, string value)
+    {
+        cacheLock.EnterWriteLock();
+        try
+        {
+            innerCache.Add(key, value);
+        }
+        finally
+        {
+            cacheLock.ExitWriteLock();
+        }
+    }
+
+    public bool AddWithTimeout(int key, string value, int timeout)
+    {
+        if (cacheLock.TryEnterWriteLock(timeout))
+        {
+            try
+            {
+                innerCache.Add(key, value);
+            }
+            finally
+            {
+                cacheLock.ExitWriteLock();
+            }
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    public AddOrUpdateStatus AddOrUpdate(int key, string value)
+    {
+        cacheLock.EnterUpgradeableReadLock();
+        try
+        {
+            string result = null;
+            if (innerCache.TryGetValue(key, out result))
+            {
+                if (result == value)
+                {
+                    return AddOrUpdateStatus.Unchanged;
+                }
+                else
+                {
+                    cacheLock.EnterWriteLock();
+                    try
+                    {
+                        innerCache[key] = value;
+                    }
+                    finally
+                    {
+                        cacheLock.ExitWriteLock();
+                    }
+                    return AddOrUpdateStatus.Updated;
+                }
+            }
+            else
+            {
+                cacheLock.EnterWriteLock();
+                try
+                {
+                    innerCache.Add(key, value);
+                }
+                finally
+                {
+                    cacheLock.ExitWriteLock();
+                }
+                return AddOrUpdateStatus.Added;
+            }
+        }
+        finally
+        {
+            cacheLock.ExitUpgradeableReadLock();
+        }
+    }
+
+    public void Delete(int key)
+    {
+        cacheLock.EnterWriteLock();
+        try
+        {
+            innerCache.Remove(key);
+        }
+        finally
+        {
+            cacheLock.ExitWriteLock();
+        }
+    }
+
+    public enum AddOrUpdateStatus
+    {
+        Added,
+        Updated,
+        Unchanged
+    };
+
+    ~SynchronizedCache()
+    {
+       if (cacheLock != null) cacheLock.Dispose();
+    }
+}

Ragon/Sources/Event/EventStream.cs

@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.ExceptionServices;
-using DisruptorUnity3d;
-
-namespace Ragon.Core;
-
-public class EventStream
-{
-  private Stack<Event> _pool = new Stack<Event>(1024);
-  private RingBuffer<Event> _events = new RingBuffer<Event>(1024);
-
-  // public ref Event Reserve()
-  // {
-  //   if (_pool.Count == 0)
-  //   {
-  //     var evnt = new Event();
-  //     return ref evnt;
-  //   }
-  //   // var evnt = _pool.Pop();
-  //   // ref Event evntRef = ref evnt;
-  //   // return evntRef;
-  // }
-
-  // public void Retain(ref Event @event)
-  // {
-  //   
-  // }
-  //
-  // public void WriteEvent(ref Event evnt)
-  // {
-  //   // _pool.Push(evnt);
-  //   _events.Enqueue(evnt);
-  // }
-  //
-  // public ref Event ReadEvent()
-  // {
-  //   
-  // }
-}

Ragon/Sources/Event/SocketEvent.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace Ragon.Core
 {
-  public struct Event
+  public struct SocketEvent
   {
     public EventType Type;
     public DeliveryType Delivery;

Ragon/Sources/Game/GameRoom.cs

@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
+
 using System.Linq;
 using NLog;
 using Ragon.Common;
 
 namespace Ragon.Core
 {
-  public class Room : IDisposable
+  public class GameRoom : IGameRoom
   {
     public int PlayersMin { get; private set; }
     public int PlayersMax { get; private set; }
@@ -22,7 +22,7 @@ namespace Ragon.Core
     private uint _ticks;
 
     private readonly PluginBase _plugin;
-    private readonly RoomThread _roomThread;
+    private readonly IGameThread _sender;
     private readonly RagonSerializer _serializer = new(512);
 
     // Cache
@@ -30,13 +30,9 @@ namespace Ragon.Core
     private uint[] _allPlayers = Array.Empty<uint>();
     private Entity[] _entitiesAll = Array.Empty<Entity>();
     
-    public Player GetPlayerById(uint peerId) => _players[peerId];
+    public GameRoom(IGameThread sender, PluginBase pluginBase, string map, int min, int max)
-    public Entity GetEntityById(int entityId) => _entities[entityId];
-    public Player GetOwner() => _players[_owner];
-
-    public Room(RoomThread roomThread, PluginBase pluginBase, string map, int min, int max)
     {
-      _roomThread = roomThread;
+      _sender = sender;
       _plugin = pluginBase;
 
       Map = map;
@@ -48,23 +44,13 @@ namespace Ragon.Core
       _plugin.Attach(this);
     }
 
-    public void Joined(uint peerId, ReadOnlySpan<byte> payload)
+    public void Joined(Player player, ReadOnlySpan<byte> payload)
     {
       if (_players.Count == 0)
       {
-        _owner = peerId;
+        _owner = player.PeerId;
       }
       
-      var player = new Player()
-      {
-        Id = Guid.NewGuid().ToString(),
-        PlayerName = "Player " + peerId,
-        PeerId = peerId,
-        IsLoaded = false,
-        Entities = new List<Entity>(),
-        EntitiesIds = new List<int>(),
-      };
-      
       {
         _serializer.Clear();
         _serializer.WriteOperation(RagonOperation.PLAYER_JOINED);
@@ -76,7 +62,7 @@ namespace Ragon.Core
         Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
       }
       
-      _players.Add(peerId, player);
+      _players.Add(player.PeerId, player);
       _allPlayers = _players.Select(p => p.Key).ToArray();
       
       {
@@ -89,7 +75,7 @@ namespace Ragon.Core
         _serializer.WriteUShort((ushort) PlayersMax);
 
         var sendData = _serializer.ToArray();
-        Send(peerId, sendData, DeliveryType.Reliable);
+        Send(player.PeerId, sendData, DeliveryType.Reliable);
       }
 
       {
@@ -98,7 +84,7 @@ namespace Ragon.Core
         _serializer.WriteString(Map);
 
         var sendData = _serializer.ToArray();
-        Send(peerId, sendData, DeliveryType.Reliable);
+        Send(player.PeerId, sendData, DeliveryType.Reliable);
       }
     }
 
@@ -145,13 +131,18 @@ namespace Ragon.Core
             Broadcast(_readyPlayers, sendData);
           }
         }
+
+        _entitiesAll = _entities.Values.ToArray();
       }
     }
 
-    public void ProcessEvent(RagonOperation operation, uint peerId, ReadOnlySpan<byte> rawData)
+    public void ProcessEvent(uint peerId, ReadOnlySpan<byte> rawData)
     {
+      var operation = (RagonOperation) rawData[0];
+      var payloadRawData = rawData.Slice(1, rawData.Length - 1);
+       
       _serializer.Clear();
-      _serializer.FromSpan(ref rawData);
+      _serializer.FromSpan(ref payloadRawData);
       
       switch (operation)
       {
@@ -304,15 +295,16 @@ namespace Ragon.Core
           _serializer.WriteInt(_entitiesAll.Length);
           foreach (var entity in _entitiesAll)
           {
+            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((ushort) entity.OwnerId);
-            var payload = entity.Payload.Read();
             _serializer.WriteUShort((ushort) payload.Length);
             _serializer.WriteData(ref payload);
-            var state = entity.State.Read();
             _serializer.WriteUShort((ushort) state.Length);
             _serializer.WriteData(ref state);
           }
@@ -363,18 +355,19 @@ namespace Ragon.Core
     {
       _logger.Info("Room stopped");
       _plugin.OnStop();
+      
+      _plugin.Detach();
     }
 
+    public Player GetPlayerById(uint peerId) => _players[peerId];
 
-    public void Dispose()
+    public Entity GetEntityById(int entityId) => _entities[entityId];
-    {
+    
-      _logger.Info("Room destroyed");
+    public Player GetOwner() => _players[_owner];
-      _plugin.Dispose();
-    }
     
     public void Send(uint peerId, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable)
     {
-      _roomThread.WriteOutEvent(new Event()
+      _sender.SendSocketEvent(new SocketEvent()
       {
         PeerId = peerId,
         Data = rawData,
@@ -387,7 +380,7 @@ namespace Ragon.Core
     {
       foreach (var peer in peersIds)
       {
-        _roomThread.WriteOutEvent(new Event()
+        _sender.SendSocketEvent(new SocketEvent()
         {
           PeerId = peer,
           Data = rawData,
@@ -401,7 +394,7 @@ namespace Ragon.Core
     {
       foreach (var player in _players.Values.ToArray())
       {
-        _roomThread.WriteOutEvent(new Event()
+        _sender.SendSocketEvent(new SocketEvent()
         {
           PeerId = player.PeerId,
           Data = rawData,

Ragon/Sources/Game/GameThread.cs

@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using NLog;
+
+namespace Ragon.Core
+{
+  public class GameThread : IGameThread
+  {
+    private readonly Dictionary<uint, GameRoom> _socketByRooms;
+    private readonly RoomManager _roomManager;
+    private readonly ENetServer _socketServer;
+    private readonly Thread _thread;
+    private readonly Server _serverConfiguration;
+    private readonly Stopwatch _gameLoopTimer;
+    private readonly Lobby _lobby;
+    private readonly IDispatcher _dispatcher;
+    private readonly ILogger _logger = LogManager.GetCurrentClassLogger();
+    private readonly float _deltaTime = 0.0f;
+    
+    private int _packets = 0;
+    private readonly Stopwatch _packetsTimer;
+    public GameThread(PluginFactory factory, Configuration configuration)
+    {
+      var authorizationProvider = factory.CreateAuthorizationProvider(configuration);
+
+      _serverConfiguration = configuration.Server;
+      _deltaTime = 1000.0f / configuration.TickRate;
+
+      _dispatcher = new Dispatcher();
+      _roomManager = new RoomManager(factory, this);
+      _lobby = new Lobby(authorizationProvider, _roomManager, this);
+      _socketServer = new ENetServer();
+      _gameLoopTimer = new Stopwatch();
+      _packetsTimer = new Stopwatch();
+      _socketByRooms = new Dictionary<uint, GameRoom>();
+
+      _thread = new Thread(Execute);
+      _thread.Name = "Game Thread";
+      _thread.IsBackground = true;
+    }
+
+    public void Start()
+    {
+      _gameLoopTimer.Start();
+      _packetsTimer.Start();
+      
+      _socketServer.Start(_serverConfiguration.Port);
+      _thread.Start();
+    }
+
+    public void Stop()
+    {
+      _gameLoopTimer.Stop();
+      _packetsTimer.Stop();
+      _socketServer.Stop();
+      _thread.Interrupt();
+    }
+
+    private void Execute()
+    {
+      while (true)
+      {
+        _dispatcher.Process();
+        
+        while (_socketServer.ReceiveBuffer.TryDequeue(out var evnt))
+        {
+          if (evnt.Type == EventType.DISCONNECTED || evnt.Type == EventType.TIMEOUT)
+          {
+            if (_socketByRooms.Remove(evnt.PeerId, out var room))
+              room.Leave(evnt.PeerId);
+
+            _lobby.OnDisconnected(evnt.PeerId);
+          }
+
+          if (evnt.Type == EventType.DATA)
+          {
+            _packets += 1;
+            try
+            {
+              var peerId = evnt.PeerId;
+              var data = new ReadOnlySpan<byte>(evnt.Data);
+              if (_socketByRooms.TryGetValue(evnt.PeerId, out var room))
+              {
+                room.ProcessEvent(peerId, data);
+              }
+              else
+              {
+                _lobby.ProcessEvent(peerId, data);
+              }
+            }
+            catch (Exception exception)
+            {
+              _logger.Error(exception);
+            }
+          }
+        }
+
+        var elapsedMilliseconds = _gameLoopTimer.ElapsedMilliseconds;
+        if (elapsedMilliseconds > _deltaTime)
+        {
+          _roomManager.Tick(elapsedMilliseconds / 1000.0f);
+          _gameLoopTimer.Restart();
+          continue;
+        }
+
+        if (_packetsTimer.Elapsed.Seconds > 1)
+        {
+          _logger.Trace($"Clients: {_socketByRooms.Keys.Count} Packets: {_packets} per sec");
+          _packetsTimer.Restart();
+          _packets = 0;
+        }
+        Thread.Sleep(15);
+      }
+    }
+
+    public void Attach(uint peerId, GameRoom room)
+    {
+      _socketByRooms.Add(peerId, room);
+    }
+
+    public void Detach(uint peerId)
+    {
+      _socketByRooms.Remove(peerId);
+    }
+
+    public void SendSocketEvent(SocketEvent socketEvent)
+    {
+      _socketServer.SendBuffer.Enqueue(socketEvent);
+    }
+
+    public IDispatcher GetDispatcher()
+    {
+      return _dispatcher;
+    }
+  }
+}

Ragon/Sources/Game/IGameRoom.cs

@@ -0,0 +1,18 @@
+namespace Ragon.Core;
+
+public interface IGameRoom
+{
+  public string Id { get; }
+  public string Map { get; }
+  public int PlayersMin { get; }
+  public int PlayersMax { get; }
+  public int PlayersCount { get; }
+  
+  public Player GetPlayerById(uint peerId);
+  public Entity GetEntityById(int entityId);
+  public Player GetOwner();
+  
+  public void Send(uint peerId, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable);
+  public void Broadcast(uint[] peersIds, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable);
+  public void Broadcast(byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable);
+}

Ragon/Sources/Game/IGameThread.cs

@@ -0,0 +1,11 @@
+using Ragon.Common;
+
+namespace Ragon.Core;
+
+public interface IGameThread
+{
+  public void Attach(uint peerId, GameRoom room);
+  public void Detach(uint peerId);
+  public void SendSocketEvent(SocketEvent socketEvent);
+  public IDispatcher GetDispatcher();
+}

Ragon/Sources/Lobby/Lobby.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using Ragon.Common;
+namespace Ragon.Core;
+
+public class Lobby
+{
+  private readonly RagonSerializer _serializer;
+  private readonly AuthorizationManager _authorizationManager;
+  private readonly RoomManager _roomManager;
+
+  public Lobby(IAuthorizationProvider provider, RoomManager manager, IGameThread gameThread)
+  {
+    _roomManager = manager;
+    _serializer = new RagonSerializer();
+    _authorizationManager = new AuthorizationManager(provider, gameThread, this, _serializer);
+  }
+
+  public void ProcessEvent(uint peerId, ReadOnlySpan<byte> data)
+  {
+    var op = (RagonOperation) data[0];
+    var payload = data.Slice(1, data.Length - 1);
+
+    _serializer.Clear();
+    _serializer.FromSpan(ref payload);
+
+    switch (op)
+    {
+      case RagonOperation.AUTHORIZE:
+      {
+        var key = _serializer.ReadString();
+        var playerName = _serializer.ReadString();
+        var protocol = _serializer.ReadByte();
+        _authorizationManager.OnAuthorization(peerId, key, playerName, protocol);
+        break;
+      }
+      case RagonOperation.JOIN_ROOM:
+      {
+        var roomId = _serializer.ReadString();
+        var player = _authorizationManager.GetPlayer(peerId);
+        _roomManager.Join(player, roomId, Array.Empty<byte>());
+        break;
+      }
+      case RagonOperation.JOIN_OR_CREATE_ROOM:
+      {
+        var map = _serializer.ReadString();
+        var min = _serializer.ReadInt();
+        var max = _serializer.ReadInt();
+        var player = _authorizationManager.GetPlayer(peerId);
+        _roomManager.JoinOrCreate(player, map, min, max, Array.Empty<byte>());
+        break;
+      }
+      case RagonOperation.LEAVE_ROOM:
+      {
+        var player = _authorizationManager.GetPlayer(peerId);
+        _roomManager.Left(player, Array.Empty<byte>());
+        break;
+      }
+    }
+  }
+
+  public void OnDisconnected(uint peerId)
+  {
+    _authorizationManager.Cleanup(peerId);
+  }
+}

Ragon/Sources/Matchmaking/Matchmaking.cs

@@ -0,0 +1,77 @@
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NLog;
+using Ragon.Common;
+
+namespace Ragon.Core;
+
+public class RoomManager
+{
+  private readonly IGameThread _gameThread;
+  private readonly PluginFactory _factory;
+  private readonly Logger _logger = LogManager.GetCurrentClassLogger();
+  private List<GameRoom> _rooms = new List<GameRoom>();
+
+  public RoomManager(PluginFactory factory, IGameThread gameThread)
+  {
+    _gameThread = gameThread;
+    _factory = factory;
+  } 
+  
+  public void Join(Player player, string roomId, byte[] payload)
+  {
+    if (_rooms.Count > 0)
+    {
+      foreach (var existRoom in _rooms)
+      {
+        if (existRoom.Id == roomId && existRoom.PlayersCount < existRoom.PlayersMax)
+        {
+          existRoom.Joined(player, payload);
+          _gameThread.Attach(player.PeerId, existRoom);
+          break;
+        }
+      }
+    }
+  }
+
+  public void JoinOrCreate(Player player, string map, int min, int max, byte[] payload)
+  {
+    if (_rooms.Count > 0)
+    {
+      foreach (var existRoom in _rooms)
+      {
+        if (existRoom.Map == map && existRoom.PlayersCount < existRoom.PlayersMax)
+        {
+          existRoom.Joined(player, payload);
+          _gameThread.Attach(player.PeerId, existRoom);
+          
+          return;
+        }
+      }
+    }
+
+    var plugin = _factory.CreatePlugin(map);
+    if (plugin == null)
+      throw new NullReferenceException($"Plugin for map {map} is null");
+
+    var room = new GameRoom(_gameThread, plugin, map, min, max); 
+    room.Joined(player, payload);
+    room.Start();
+
+    _gameThread.Attach(player.PeerId, room);
+    _rooms.Add(room);
+  }
+
+  public void Left(Player player, byte[] payload)
+  {
+    
+  }
+
+  public void Tick(float deltaTime)
+  {
+    foreach (var gameRoom in _rooms)
+      gameRoom.Tick(deltaTime);
+  }
+}

Ragon/Sources/Plugin/PluginBase.cs

@@ -7,7 +7,7 @@ using Ragon.Common;
 
 namespace Ragon.Core
 {
-  public class PluginBase : IDisposable
+  public class PluginBase 
   {
     private delegate void SubscribeDelegate(Player player, ref ReadOnlySpan<byte> data);
 
@@ -18,20 +18,20 @@ namespace Ragon.Core
     private readonly BitBuffer _buffer = new();
     private readonly RagonSerializer _serializer = new();
 
-    protected Room Room { get; private set; }
+    protected IGameRoom GameRoom { get; private set; }
     protected ILogger _logger;
 
-    public void Attach(Room room)
+    public void Attach(GameRoom gameRoom)
     {
       _logger = LogManager.GetLogger($"Plugin<{GetType().Name}>");
 
-      Room = room;
+      GameRoom = gameRoom;
 
       _globalEvents.Clear();
       _entityEvents.Clear();
     }
 
-    public void Dispose()
+    public void Detach()
     {
       _globalEvents.Clear();
       _entityEvents.Clear();
@@ -153,8 +153,8 @@ namespace Ragon.Core
       if (!_entityEvents[entityId].ContainsKey(evntCode))
         return false;
 
-      var player = Room.GetPlayerById(peerId);
+      var player = GameRoom.GetPlayerById(peerId);
-      var entity = Room.GetEntityById(entityId);
+      var entity = GameRoom.GetEntityById(entityId);
       _entityEvents[entityId][evntCode].Invoke(player, entity, ref payload);
 
       return true;
@@ -164,7 +164,7 @@ namespace Ragon.Core
     {
       if (_globalEvents.ContainsKey(evntCode))
       {
-        var player = Room.GetPlayerById(peerId);
+        var player = GameRoom.GetPlayerById(peerId);
         _globalEvents[evntCode].Invoke(player, ref payload);
         return true;
       }
@@ -184,7 +184,7 @@ namespace Ragon.Core
       _buffer.ToSpan(ref payloadData);
 
       var sendData = _serializer.ToArray();
-      Room.Send(player.PeerId, sendData);
+      GameRoom.Send(player.PeerId, sendData);
     }
 
     public void BroadcastEvent(ushort eventCode, IRagonSerializable payload)
@@ -199,7 +199,7 @@ namespace Ragon.Core
       _buffer.ToSpan(ref payloadData);
 
       var sendData = _serializer.ToArray();
-      Room.Broadcast(sendData, DeliveryType.Reliable);
+      GameRoom.Broadcast(sendData, DeliveryType.Reliable);
     }
 
     public void SendEntityEvent(Player player, Entity entity, IRagonSerializable payload)
@@ -215,7 +215,7 @@ namespace Ragon.Core
       _buffer.ToSpan(ref payloadData);
 
       var sendData = _serializer.ToArray();
-      Room.Send(player.PeerId, sendData, DeliveryType.Reliable);
+      GameRoom.Send(player.PeerId, sendData, DeliveryType.Reliable);
     }
 
     public void BroadcastEntityEvent(Entity entity, IRagonSerializable payload)
@@ -231,7 +231,7 @@ namespace Ragon.Core
       _buffer.ToSpan(ref payloadData);
 
       var sendData = _serializer.ToArray();
-      Room.Broadcast(sendData);
+      GameRoom.Broadcast(sendData);
     }
 
 

Ragon/Sources/Plugin/PluginFactory.cs

@@ -3,7 +3,7 @@ namespace Ragon.Core
   public interface PluginFactory
   {
     public PluginBase CreatePlugin(string map);
-    public AuthorizationManager CreateManager(Configuration configuration);
+    public IAuthorizationProvider CreateAuthorizationProvider(Configuration configuration);
   }
   
   

Ragon/Sources/Rooms/RoomManager.cs

@@ -1,211 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NLog;
-using Ragon.Common;
-
-namespace Ragon.Core
-{
-  public class RoomManager
-  {
-    private readonly Logger _logger = LogManager.GetCurrentClassLogger();
-    private List<Room> _rooms;
-    private Dictionary<uint, Room> _peersByRoom;
-    private PluginFactory _factory;
-    private AuthorizationManager _manager;
-    private RoomThread _roomThread;
-    private RagonSerializer _serializer;
-    public Action<(uint, Room)> OnJoined;
-    public Action<(uint, Room)> OnLeaved;
-
-    public RoomManager(RoomThread roomThread, PluginFactory factory)
-    {
-      _roomThread = roomThread;
-      _factory = factory;
-
-      _serializer = new RagonSerializer();
-      _manager = _factory.CreateManager(roomThread.Configuration);
-      _rooms = new List<Room>();
-      _peersByRoom = new Dictionary<uint, Room>();
-    }
-
-    public void ProcessEvent(RagonOperation operation, uint peerId, ReadOnlySpan<byte> payload)
-    {
-      switch (operation)
-      {
-        case RagonOperation.AUTHORIZE:
-        {
-          OnAuthorize(peerId, payload);
-          break;
-        }
-        case RagonOperation.JOIN_OR_CREATE_ROOM:
-        {
-          var room = JoinOrCreate(peerId, payload);
-          if (room == null)
-          {
-            var sendData = new[] {(byte) RagonOperation.JOIN_FAILED};
-            _roomThread.WriteOutEvent(new Event()
-            {
-              Delivery = DeliveryType.Reliable,
-              Type = EventType.DATA,
-              Data = sendData,
-              PeerId = peerId,
-            });
-            return;
-          }
-          OnJoined?.Invoke((peerId, room));
-          break;
-        }
-        case RagonOperation.JOIN_ROOM:
-        {
-          var room = Join(peerId, payload);
-          if (room == null)
-          {
-            var sendData = new[] {(byte) RagonOperation.JOIN_FAILED};
-            _roomThread.WriteOutEvent(new Event()
-            {
-              Delivery = DeliveryType.Reliable,
-              Type = EventType.DATA,
-              Data = sendData,
-              PeerId = peerId,
-            });
-            
-            return;
-          }
-          OnJoined?.Invoke((peerId, room));
-          break;
-        }
-        case RagonOperation.LEAVE_ROOM:
-        {
-          var room = Left(peerId, payload);
-          OnLeaved((peerId, room));
-          break;
-        }
-      }
-    }
-
-    public void OnAuthorize(uint peerId, ReadOnlySpan<byte> payload)
-    {
-      if (_manager.OnAuthorize(peerId, ref payload))
-      {
-        var sendData = new[] {(byte) RagonOperation.AUTHORIZED_SUCCESS};
-        _roomThread.WriteOutEvent(new Event()
-        {
-          Delivery = DeliveryType.Reliable,
-          Type = EventType.DATA,
-          Data = sendData,
-          PeerId = peerId,
-        });
-      }
-      else
-      {
-        var sendData = new[] {(byte) RagonOperation.AUTHORIZED_FAILED};
-        _roomThread.WriteOutEvent(new Event()
-        {
-          Delivery = DeliveryType.Reliable,
-          Type = EventType.DATA,
-          Data = sendData,
-          PeerId = peerId,
-        });
-        _roomThread.WriteOutEvent(new Event()
-        {
-          Delivery = DeliveryType.Reliable,
-          Type = EventType.DISCONNECTED,
-          Data = Array.Empty<byte>(),
-          PeerId = peerId,
-        });
-      }
-    }
-
-    public Room? Join(uint peerId, ReadOnlySpan<byte> payload)
-    {
-      var roomId = Encoding.UTF8.GetString(payload);
-      
-      if (_rooms.Count > 0)
-      {
-        foreach (var existRoom in _rooms)
-        {
-          if (existRoom.Id == roomId && existRoom.PlayersCount < existRoom.PlayersMax)
-          {
-            existRoom.Joined(peerId, payload);
-
-            _peersByRoom.Add(peerId, existRoom);
-
-            return existRoom;
-          }
-        }
-      }
-
-      return null;
-    }
-
-    public Room? JoinOrCreate(uint peerId, ReadOnlySpan<byte> payload)
-    {
-      _serializer.Clear();
-      _serializer.FromSpan(ref payload);
-
-      var min = _serializer.ReadUShort();
-      var max = _serializer.ReadUShort();
-      var map = _serializer.ReadString();
-      
-      Room room = null;
-      if (_rooms.Count > 0)
-      {
-        foreach (var existRoom in _rooms)
-        {
-          if (existRoom.Map == map && existRoom.PlayersCount < existRoom.PlayersMax)
-          {
-            room = existRoom;
-            room.Joined(peerId, payload);
-
-            _peersByRoom.Add(peerId, room);
-
-            return room;
-          }
-        }
-      }
-
-      var plugin = _factory.CreatePlugin(map);
-      if (plugin == null)
-        throw new NullReferenceException($"Plugin for map {map} is null");
-
-      room = new Room(_roomThread, plugin, map, min, max);
-      room.Joined(peerId, payload);
-      room.Start();
-
-      _peersByRoom.Add(peerId, room);
-      _rooms.Add(room);
-
-      return room;
-    }
-
-    public Room Left(uint peerId, ReadOnlySpan<byte> payload)
-    {
-      _peersByRoom.Remove(peerId, out var room);
-
-      return room;
-    }
-
-    public void Disconnected(uint peerId)
-    {
-      _peersByRoom.Remove(peerId, out var room);
-      if (room != null)
-      {
-        room.Leave(peerId);
-        if (room.PlayersCount <= 0 && room.PlayersMin > 0)
-        {
-          _rooms.Remove(room);
-
-          room.Stop();
-          room.Dispose();
-        }
-      }
-    }
-
-    public void Tick(float deltaTime)
-    {
-      foreach (Room room in _rooms)
-        room.Tick(deltaTime);
-    }
-  }
-}

Ragon/Sources/Rooms/RoomThread.cs

@@ -1,110 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using DisruptorUnity3d;
-using NLog;
-using Ragon.Common;
-
-namespace Ragon.Core
-{
-  public class RoomThread : IDisposable
-  {
-    private readonly RoomManager _roomManager;
-    private readonly Dictionary<uint, Room> _socketByRooms;
-    private readonly Thread _thread;
-    private readonly Stopwatch _timer;
-    private readonly ILogger _logger = LogManager.GetCurrentClassLogger();
-    private readonly float _deltaTime = 0.0f;
-    private readonly RingBuffer<Event> _receiveBuffer = new(2048);
-    private readonly RingBuffer<Event> _sendBuffer = new(2048);
-
-    public Configuration Configuration { get; private set; }
-    public bool ReadOutEvent(out Event evnt) => _sendBuffer.TryDequeue(out evnt);
-    public void WriteOutEvent(Event evnt) => _sendBuffer.Enqueue(evnt);
-
-    public bool ReadIntEvent(out Event evnt) => _receiveBuffer.TryDequeue(out evnt);
-    public void WriteInEvent(Event evnt) => _receiveBuffer.Enqueue(evnt);
-
-    public RoomThread(PluginFactory factory, Configuration configuration)
-    {
-      _thread = new Thread(Execute);
-      _thread.IsBackground = true;
-      _timer = new Stopwatch();
-      _socketByRooms = new Dictionary<uint, Room>();
-
-      Configuration = configuration;
-      _deltaTime = 1000.0f / Configuration.Server.TickRate;
-
-      _roomManager = new RoomManager(this, factory);
-      _roomManager.OnJoined += (tuple) => _socketByRooms.Add(tuple.Item1, tuple.Item2);
-      _roomManager.OnLeaved += (tuple) => _socketByRooms.Remove(tuple.Item1);
-    }
-
-    public void Start()
-    {
-      _timer.Start();
-      _thread.Start();
-    }
-
-    public void Stop()
-    {
-      _thread.Interrupt();
-    }
-
-    private void Execute()
-    {
-      while (true)
-      {
-        while (_receiveBuffer.TryDequeue(out var evnt))
-        {
-          if (evnt.Type == EventType.DISCONNECTED || evnt.Type == EventType.TIMEOUT)
-          {
-            if (_socketByRooms.ContainsKey(evnt.PeerId))
-            {
-              _roomManager.Disconnected(evnt.PeerId);
-              _socketByRooms.Remove(evnt.PeerId);
-            }
-          }
-
-          if (evnt.Type == EventType.DATA)
-          {
-            var data = new ReadOnlySpan<byte>(evnt.Data);
-            var operation = (RagonOperation) data[0];
-            var payload = data.Slice(1, data.Length - 1);
-            
-            if (_socketByRooms.TryGetValue(evnt.PeerId, out var room))
-            {
-              try
-              {
-                room.ProcessEvent(operation, evnt.PeerId, payload);
-              }
-              catch (Exception exception)
-              {
-                _logger.Error(exception);
-              }
-            }
-            else
-            {
-              _roomManager.ProcessEvent(operation, evnt.PeerId, payload);
-            }
-          }
-        }
-
-        var elapsedMilliseconds = _timer.ElapsedMilliseconds;
-        if (elapsedMilliseconds > _deltaTime)
-        {
-          _roomManager.Tick(elapsedMilliseconds / 1000.0f);
-          _timer.Restart();
-          continue;
-        }
-
-        Thread.Sleep(15);
-      }
-    }
-
-    public void Dispose()
-    {
-    }
-  }
-}

Ragon/Sources/Server/ENetServer.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using DisruptorUnity3d;
@@ -18,7 +17,7 @@ namespace Ragon.Core
     Connected
   }
 
-  public class ENetServer : IDisposable
+  public class ENetServer
   {
     public Status Status { get; private set; }
 
@@ -28,17 +27,13 @@ namespace Ragon.Core
     private Address _address;
     private ENet.Event _netEvent;
     private Peer[] _peers;
-
+    private int _seconds = 0;
-    private RingBuffer<Event> _receiveBuffer;
+    private Stopwatch _packetsTimer;
-    private RingBuffer<Event> _sendBuffer;
+    public RingBuffer<SocketEvent> SendBuffer;
-    
+    public RingBuffer<SocketEvent> ReceiveBuffer;
-    public void WriteEvent(Event evnt) => _sendBuffer.Enqueue(evnt);
-    public bool ReadEvent(out Event evnt) => _receiveBuffer.TryDequeue(out evnt);
     
     public void Start(ushort port)
     {
-      Library.Initialize();
-
       _address = default;
       _address.Port = port;
 
@@ -46,22 +41,24 @@ namespace Ragon.Core
       _host.Create(_address, 4095, 2, 0, 0, 1024 * 1024);
 
       _peers = new Peer[4095];
-      _sendBuffer = new RingBuffer<Event>(8192 + 8192);
+      
-      _receiveBuffer = new RingBuffer<Event>(8192 + 8192);
+      ReceiveBuffer = new RingBuffer<SocketEvent>(8192 + 8192);
+      SendBuffer = new RingBuffer<SocketEvent>(8192 + 8192);
 
       Status = Status.Listening;
-      
+      _packetsTimer = new Stopwatch();
       _thread = new Thread(Execute);
       _thread.Name = "NetworkThread";
       _thread.Start();
-      _logger.Info($"ENet Server Started at port {port}");
+      _logger.Info($"Network listening on {port}");
     }
 
     private void Execute()
     {
+      _packetsTimer.Start();
       while (true)
       {
-        while (_sendBuffer.TryDequeue(out var data))
+        while (SendBuffer.TryDequeue(out var data))
         {
           if (data.Type == EventType.DATA)
           {
@@ -86,7 +83,7 @@ namespace Ragon.Core
           else if (data.Type == EventType.DISCONNECTED)
           {
             _peers[data.PeerId].DisconnectNow(0);
-            _receiveBuffer.Enqueue(data);
+            ReceiveBuffer.Enqueue(data);
           }
         }
       
@@ -95,7 +92,7 @@ namespace Ragon.Core
         {
           if (_host.CheckEvents(out _netEvent) <= 0)
           {
-            if (_host.Service(16, out _netEvent) <= 0)
+            if (_host.Service(15, out _netEvent) <= 0)
               break;
 
             polled = true;
@@ -109,21 +106,21 @@ namespace Ragon.Core
 
             case ENet.EventType.Connect:
             {
-              var @event = new Event {PeerId = _netEvent.Peer.ID, Type = EventType.CONNECTED};
+              var @event = new SocketEvent {PeerId = _netEvent.Peer.ID, Type = EventType.CONNECTED};
               _peers[_netEvent.Peer.ID] = _netEvent.Peer;
-              _receiveBuffer.Enqueue(@event);
+              ReceiveBuffer.Enqueue(@event);
               break;
             }
             case ENet.EventType.Disconnect:
             {
-              var @event = new Event {PeerId = _netEvent.Peer.ID, Type = EventType.DISCONNECTED};
+              var @event = new SocketEvent {PeerId = _netEvent.Peer.ID, Type = EventType.DISCONNECTED};
-              _receiveBuffer.Enqueue(@event);
+              ReceiveBuffer.Enqueue(@event);
               break;
             }
             case ENet.EventType.Timeout:
             {
-              var @event = new Event {PeerId = _netEvent.Peer.ID, Type = EventType.TIMEOUT};
+              var @event = new SocketEvent {PeerId = _netEvent.Peer.ID, Type = EventType.TIMEOUT};
-              _receiveBuffer.Enqueue(@event);
+              ReceiveBuffer.Enqueue(@event);
               break;
             }
             case ENet.EventType.Receive:
@@ -133,20 +130,23 @@ namespace Ragon.Core
               _netEvent.Packet.CopyTo(data);
               _netEvent.Packet.Dispose();
               
-              var @event = new Event {PeerId = _netEvent.Peer.ID, Type = EventType.DATA, Data = data };
+              var @event = new SocketEvent {PeerId = _netEvent.Peer.ID, Type = EventType.DATA, Data = data };
-              
+              ReceiveBuffer.Enqueue(@event);
-              _receiveBuffer.Enqueue(@event);
               break;
             }
           }
         }
+
+        if (_packetsTimer.Elapsed.Seconds > 5)
+        {
+          Console.WriteLine($"Connections: {_host.PeersCount}");
+          _packetsTimer.Restart();
+        }
       }
     }
 
-    public void Dispose()
+    public void Stop()
     {
-      Library.Deinitialize();
-
       _host?.Dispose();
     }
   }

Ragon/Sources/Server/WebsocketServer.cs

@@ -1,60 +0,0 @@
-using System;
-using System.Net;
-using System.Net.WebSockets;
-using System.Threading;
-using DisruptorUnity3d;
-using NLog;
-
-namespace Ragon.Core;
-
-public class WebsocketServer : IDisposable
-{
-  private HttpListener _httpListener;
-  private ILogger _logger = LogManager.GetCurrentClassLogger();
-  private Thread _thread;
-  private ENet.Event _netEvent;
-
-  private RingBuffer<Event> _receiveBuffer;
-  private RingBuffer<Event> _sendBuffer;
-
-  public void WriteEvent(Event evnt) => _sendBuffer.Enqueue(evnt);
-  public bool ReadEvent(out Event evnt) => _receiveBuffer.TryDequeue(out evnt);
-  
-  public void Start(ushort port)
-  {
-    // _httpListener = new HttpListener();
-    // _httpListener.Prefixes.Add("http://localhost/");
-    // _httpListener.Start();
-    //
-    // _thread = new Thread(Execute);
-    // _thread.Name = "NetworkThread";
-    // _thread.Start();
-    // _logger.Info($"Socket Server Started at port {port}");
-  }
-
-  public void Execute()
-  {
-    
-  }
-
-  public async void ExecuteAsync()
-  {
-    // while (true)
-    // {
-    //   HttpListenerContext context = await _httpListener.GetContextAsync();
-    //   if (context.Request.IsWebSocketRequest)
-    //   {
-    //     HttpListenerWebSocketContext webSocketContext = await context.AcceptWebSocketAsync(null);
-    //     WebSocket webSocket = webSocketContext.WebSocket;
-    //     while (webSocket.State == WebSocketState.Open)
-    //     {
-    //       await webSocket.SendAsync(... );
-    //     }
-    //   }
-    // }
-  }
-
-  public void Dispose()
-  {
-  }
-}

Ragon/Sources/Storage/EntityInfo.cs

@@ -1,6 +0,0 @@
-namespace Ragon.Core.Storage;
-
-public struct EntityInfo
-{
-  
-}

Ragon/Sources/Storage/PlayerInfo.cs

@@ -1,6 +0,0 @@
-namespace Ragon.Core.Storage;
-
-public struct PlayerInfo
-{
-  
-}

Ragon/Sources/Storage/RoomInfo.cs

@@ -1,6 +0,0 @@
-namespace Ragon.Core.Storage;
-
-public struct RoomInfo
-{
-  
-}

Ragon/Sources/Storage/Storage.cs

@@ -1,29 +0,0 @@
-
-namespace Ragon.Core.Storage;
-
-public class Storage
-{
-  // private ConnectionMultiplexer _connection;
-  
-  public Storage(Configuration _configuration)
-  {
-    // _connection = ConnectionMultiplexer.Connect(_configuration.Key);
-  }
-
-  public void UpdateEntity(int entityId)
-  {
-    // var db = _connection.GetDatabase();
-    
-    // db.set("entity_", )
-  }
-
-  public void UpdatePlayer()
-  {
-    
-  }
-
-  public void UpdateRoom()
-  {
-    
-  }
-}

SimpleServer/Source/AuthorizerByKey.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Text;
-using Ragon.Core;
-
-namespace Game.Source;
-
-public class AuthorizerByKey: AuthorizationManager
-{
-  private Configuration _configuration;
-  public AuthorizerByKey(Configuration configuration)
-  {
-    _configuration = configuration;
-  }
-
-  public override bool OnAuthorize(uint peerId, ref ReadOnlySpan<byte> payload)
-  {
-    var key = Encoding.UTF8.GetString(payload);
-    return _configuration.Key == key;
-  }
-}

SimpleServer/Source/Events/SimpleEvent.cs

@@ -1,19 +0,0 @@
-using NetStack.Serialization;
-using Ragon.Common;
-
-namespace Game.Source.Events;
-
-public class SimpleEvent: IRagonSerializable
-{
-  public string Name;
-  
-  public void Serialize(BitBuffer buffer)
-  {
-    buffer.AddString(Name);
-  }
-
-  public void Deserialize(BitBuffer buffer)
-  {
-    Name = buffer.ReadString();
-  }
-}

SimpleServer/config.json

@@ -1,8 +0,0 @@
-{
-  "key": "defaultkey",
-  "server": {
-    "port": 4444,
-    "skipTimeout": 60,
-    "tickRate": 30 
-  }
-}