wip

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

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

Ragon.Client.Property/Sources/RagonBool.cs

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

Ragon.Client.Property/Sources/RagonFloat.cs

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

Ragon.Client.Property/Sources/RagonInt.cs

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

Ragon.Client.Property/Sources/RagonQuaternion.cs

@@ -1,76 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using System.Numerics;
-using Ragon.Client.Compressor;
-using Ragon.Protocol;
-
-namespace Ragon.Client.Property;
-
-public class RagonQuaternion : RagonProperty
-{
-  private Quaternion _value;
-
-  public Quaternion Value
-  {
-    get => _value;
-    set
-    {
-      _value = value;
-
-      MarkAsChanged();
-    }
-  }
-
-  private readonly FloatCompressor _compressor;
-
-  public RagonQuaternion(bool invokeLocal = false, int priority = 0) : base(priority, invokeLocal)
-  {
-    _compressor = new FloatCompressor(-1.0f, 1f, 0.01f);
-
-    SetFixedSize(_compressor.RequiredBits * 4);
-  }
-
-  public override void Serialize(RagonBuffer buffer)
-  {
-    var compressedX = _compressor.Compress(_value.X);
-    var compressedY = _compressor.Compress(_value.Y);
-    var compressedZ = _compressor.Compress(_value.Z);
-    var compressedW = _compressor.Compress(_value.W);
-
-    buffer.Write(compressedX, _compressor.RequiredBits);
-    buffer.Write(compressedY, _compressor.RequiredBits);
-    buffer.Write(compressedZ, _compressor.RequiredBits);
-    buffer.Write(compressedW, _compressor.RequiredBits);
-  }
-
-  public override void Deserialize(RagonBuffer buffer)
-  {
-    var compressedX = buffer.Read(_compressor.RequiredBits);
-    var compressedY = buffer.Read(_compressor.RequiredBits);
-    var compressedZ = buffer.Read(_compressor.RequiredBits);
-    var compressedW = buffer.Read(_compressor.RequiredBits);
-
-    var x = _compressor.Decompress(compressedX);
-    var y = _compressor.Decompress(compressedY);
-    var z = _compressor.Decompress(compressedZ);
-    var w = _compressor.Decompress(compressedW);
-
-    _value = new Quaternion(x, y, z, w);
-
-    InvokeChanged();
-  }
-}

Ragon.Client.Property/Sources/RagonString.cs

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

Ragon.Client.Property/Sources/RagonVector3.cs

@@ -1,330 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using System;
-using System.Numerics;
-using Ragon.Client.Compressor;
-using Ragon.Protocol;
-
-namespace Ragon.Client.Property
-{
-  [Serializable]
-  public enum RagonAxis
-  {
-    XYZ,
-    XY,
-    YZ,
-    XZ,
-    X,
-    Y,
-    Z
-  }
-
-  [Serializable]
-  public class RagonVector3 : RagonProperty
-  {
-    private Vector3 _value;
-
-    public Vector3 Value
-    {
-      get => _value;
-      set
-      {
-        _value = value;
-        
-        MarkAsChanged();
-      }
-    }
-
-    private RagonAxis _axis;
-    private FloatCompressor _compressorX;
-    private FloatCompressor _compressorY;
-    private FloatCompressor _compressorZ;
-
-
-    public RagonVector3(
-      RagonAxis axis = RagonAxis.XYZ,
-      bool invokeLocal = true,
-      int priority = 0
-    ) : base(priority, invokeLocal)
-    {
-      _axis = axis;
-
-      var defaultCompressor = new FloatCompressor(-1024.0f, 1024f, 0.01f);
-
-      _compressorX = defaultCompressor;
-      _compressorY = defaultCompressor;
-      _compressorZ = defaultCompressor;
-
-      switch (_axis)
-      {
-        case RagonAxis.XYZ:
-          SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits + _compressorZ.RequiredBits);
-          break;
-        case RagonAxis.XY:
-          SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits);
-          break;
-        case RagonAxis.XZ:
-          SetFixedSize(_compressorX.RequiredBits + _compressorZ.RequiredBits);
-          break;
-        case RagonAxis.YZ:
-          SetFixedSize(_compressorY.RequiredBits + _compressorZ.RequiredBits);
-          break;
-        case RagonAxis.X:
-          SetFixedSize(_compressorX.RequiredBits);
-          break;
-        case RagonAxis.Y:
-          SetFixedSize(_compressorY.RequiredBits);
-          break;
-        case RagonAxis.Z:
-          SetFixedSize(_compressorZ.RequiredBits);
-          break;
-      }
-    }
-
-    public RagonVector3(
-      Vector3 initialValue,
-      RagonAxis axis = RagonAxis.XYZ,
-      float min = -1024.0f,
-      float max = 1024.0f,
-      float precision = 0.1f,
-      bool invokeLocal = true,
-      int priority = 0
-    ) : base(priority, invokeLocal)
-    {
-      _value = initialValue;
-      _axis = axis;
-      
-      var defaultCompressor = new FloatCompressor(min, max, precision);
-
-      _compressorX = defaultCompressor;
-      _compressorY = defaultCompressor;
-      _compressorZ = defaultCompressor;
-
-      switch (_axis)
-      {
-        case RagonAxis.XYZ:
-          SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits + _compressorZ.RequiredBits);
-          break;
-        case RagonAxis.XY:
-          SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits);
-          break;
-        case RagonAxis.XZ:
-          SetFixedSize(_compressorX.RequiredBits + _compressorZ.RequiredBits);
-          break;
-        case RagonAxis.YZ:
-          SetFixedSize(_compressorY.RequiredBits + _compressorZ.RequiredBits);
-          break;
-        case RagonAxis.X:
-          SetFixedSize(_compressorX.RequiredBits);
-          break;
-        case RagonAxis.Y:
-          SetFixedSize(_compressorY.RequiredBits);
-          break;
-        case RagonAxis.Z:
-          SetFixedSize(_compressorZ.RequiredBits);
-          break;
-      }
-    }
-
-    public RagonVector3(
-      RagonAxis axis = RagonAxis.XYZ,
-      FloatCompressor compressorX = null,
-      FloatCompressor compressorY = null,
-      FloatCompressor compressorZ = null,
-      bool invokeLocal = true,
-      int priority = 0
-    ) : base(priority, invokeLocal)
-    {
-      _axis = axis;
-
-      var defaultCompressor = new FloatCompressor(-1024.0f, 1024f, 0.01f);
-
-      _compressorX = defaultCompressor;
-      _compressorY = defaultCompressor;
-      _compressorZ = defaultCompressor;
-
-      if (compressorX != null)
-        _compressorX = compressorX;
-
-      if (compressorY != null)
-        _compressorY = compressorY;
-
-      if (compressorZ != null)
-        _compressorZ = compressorZ;
-
-      switch (_axis)
-      {
-        case RagonAxis.XYZ:
-          SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits + _compressorZ.RequiredBits);
-          break;
-        case RagonAxis.XY:
-          SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits);
-          break;
-        case RagonAxis.XZ:
-          SetFixedSize(_compressorX.RequiredBits + _compressorZ.RequiredBits);
-          break;
-        case RagonAxis.YZ:
-          SetFixedSize(_compressorY.RequiredBits + _compressorZ.RequiredBits);
-          break;
-        case RagonAxis.X:
-          SetFixedSize(_compressorX.RequiredBits);
-          break;
-        case RagonAxis.Y:
-          SetFixedSize(_compressorY.RequiredBits);
-          break;
-        case RagonAxis.Z:
-          SetFixedSize(_compressorZ.RequiredBits);
-          break;
-      }
-    }
-
-    public override void Serialize(RagonBuffer buffer)
-    {
-      switch (_axis)
-      {
-        case RagonAxis.XYZ:
-        {
-          var compressedX = _compressorX.Compress(_value.X);
-          var compressedY = _compressorY.Compress(_value.Y);
-          var compressedZ = _compressorZ.Compress(_value.Z);
-
-          buffer.Write(compressedX, _compressorX.RequiredBits);
-          buffer.Write(compressedY, _compressorY.RequiredBits);
-          buffer.Write(compressedZ, _compressorZ.RequiredBits);
-        }
-          break;
-        case RagonAxis.XY:
-        {
-          var compressedX = _compressorX.Compress(_value.X);
-          var compressedY = _compressorY.Compress(_value.Y);
-          
-          buffer.Write(compressedX, _compressorX.RequiredBits);
-          buffer.Write(compressedY, _compressorY.RequiredBits);
-        }
-          break;
-        case RagonAxis.XZ:
-        {
-          var compressedX = _compressorX.Compress(_value.X);
-          var compressedZ = _compressorZ.Compress(_value.Z);
-
-          buffer.Write(compressedX, _compressorX.RequiredBits);
-          buffer.Write(compressedZ, _compressorZ.RequiredBits);
-          break;
-        }
-
-        case RagonAxis.YZ:
-        {
-          var compressedY = _compressorY.Compress(_value.Y);
-          var compressedZ = _compressorZ.Compress(_value.Z);
-
-          buffer.Write(compressedY, _compressorY.RequiredBits);
-          buffer.Write(compressedZ, _compressorZ.RequiredBits);
-          break;
-        }
-        case RagonAxis.X:
-        {
-          var compressedX = _compressorX.Compress(_value.X);
-
-          buffer.Write(compressedX, _compressorX.RequiredBits);
-          break;
-        }
-        case RagonAxis.Y:
-        {
-          var compressedY = _compressorY.Compress(_value.Y);
-          
-          buffer.Write(compressedY, _compressorY.RequiredBits);
-          break;
-        }
-        case RagonAxis.Z:
-        {
-          var compressedZ = _compressorZ.Compress(_value.Z);
-          
-          buffer.Write(compressedZ, _compressorZ.RequiredBits);
-          break;
-        }
-      }
-    }
-
-    public override void Deserialize(RagonBuffer buffer)
-    {
-      switch (_axis)
-      {
-        case RagonAxis.XYZ:
-        {
-          var compressedX = buffer.Read(_compressorX.RequiredBits);
-          var compressedY = buffer.Read(_compressorY.RequiredBits);
-          var compressedZ = buffer.Read(_compressorZ.RequiredBits);
-
-          _value.X = _compressorX.Decompress(compressedX);
-          _value.Y = _compressorY.Decompress(compressedY);
-          _value.Z = _compressorZ.Decompress(compressedZ);
-          break;
-        }
-        case RagonAxis.XY:
-        {
-          var compressedX = buffer.Read(_compressorX.RequiredBits);
-          var compressedY = buffer.Read(_compressorY.RequiredBits);
-
-          _value.X = _compressorX.Decompress(compressedX);
-          _value.Z = _compressorY.Decompress(compressedY);
-          break;
-        }
-        case RagonAxis.XZ:
-        {
-          var compressedX = buffer.Read(_compressorX.RequiredBits);
-          var compressedZ = buffer.Read(_compressorZ.RequiredBits);
-
-          _value.X = _compressorX.Decompress(compressedX);
-          _value.Z = _compressorZ.Decompress(compressedZ);
-          break;
-        }
-        case RagonAxis.YZ:
-        {
-          var compressedY = buffer.Read(_compressorY.RequiredBits);
-          var compressedZ = buffer.Read(_compressorZ.RequiredBits);
-
-          _value.Y = _compressorY.Decompress(compressedY);
-          _value.Z = _compressorZ.Decompress(compressedZ);
-          break;
-        }
-        case RagonAxis.X:
-        {
-          var compressedX = buffer.Read(_compressorX.RequiredBits);
-
-          _value.X = _compressorX.Decompress(compressedX);
-          break;
-        }
-        case RagonAxis.Y:
-        {
-          var compressedY = buffer.Read(_compressorY.RequiredBits);
-
-          _value.Y = _compressorY.Decompress(compressedY);
-          break;
-        }
-        case RagonAxis.Z:
-        {
-          var compressedZ = buffer.Read(_compressorZ.RequiredBits);
-
-          _value.Z = _compressorZ.Decompress(compressedZ);
-          break;
-        }
-      }
-
-      InvokeChanged();
-    }
-  }
-}

Ragon.Client/Ragon.Client.csproj

@@ -1,3 +1,4 @@
+
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>

Ragon.Client/Sources/Compressor/FloatCompressor.cs

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

Ragon.Client/Sources/Compressor/IntCompressor.cs

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

Ragon.Client/Sources/Entity/RagonEntity.cs

@@ -1,310 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client
-{
-  public sealed class RagonEntity : IDisposable
-  {
-    private class EventSubscription : IDisposable
-    {
-      private List<Action<RagonPlayer, IRagonEvent>> _callbacks;
-      private List<Action<RagonPlayer, IRagonEvent>> _localCallbacks;
-      private Action<RagonPlayer, IRagonEvent> _callback;
-
-      public EventSubscription(
-        List<Action<RagonPlayer, IRagonEvent>> callbacks,
-        List<Action<RagonPlayer, IRagonEvent>> localCallbacks,
-        Action<RagonPlayer, IRagonEvent> callback)
-      {
-        _callbacks = callbacks;
-        _localCallbacks = localCallbacks;
-        _callback = callback;
-      }
-
-      public void Dispose()
-      {
-        _callbacks?.Remove(_callback);
-        _localCallbacks?.Remove(_callback);
-
-        _callbacks = null!;
-        _localCallbacks = null!;
-        _callback = null!;
-      }
-    }
-
-    private delegate void OnEventDelegate(RagonPlayer player, RagonBuffer serializer);
-
-    private RagonClient _client;
-
-    public ushort Id { get; private set; }
-    public ushort Type { get; private set; }
-
-    public RagonAuthority Authority { get; private set; }
-    public RagonPlayer Owner { get; private set; }
-    public RagonEntityState State { get; private set; }
-
-    public bool IsStatic => SceneId > 0;
-    public bool IsReplicated { get; private set; }
-    public bool IsAttached { get; private set; }
-    public bool HasAuthority { get; private set; }
-
-    public event Action<RagonEntity> Attached;
-    public event Action Detached;
-    public event Action<RagonPlayer, RagonPlayer> OwnershipChanged;
-
-    internal bool PropertiesChanged => _propertiesChanged;
-    internal ushort SceneId => _sceneId;
-
-    private readonly ushort _sceneId;
-    private bool _propertiesChanged;
-
-    private RagonPayload _spawnPayload;
-    private RagonPayload _destroyPayload;
-
-    private readonly Dictionary<int, OnEventDelegate> _events = new();
-    private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _localListeners = new();
-    private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _listeners = new();
-
-    public RagonEntity(ushort type = 0, ushort sceneId = 0, bool replicated = true)
-    {
-      State = new RagonEntityState(this);
-      Type = type;
-      IsReplicated = replicated;
-
-      _spawnPayload = new RagonPayload(0);
-      _destroyPayload = new RagonPayload(0);
-      _sceneId = sceneId;
-    }
-
-    internal void Attach()
-    {
-      IsAttached = true;
-
-      Attached?.Invoke(this);
-    }
-
-    public void SetReplication(bool enabled)
-    {
-      IsReplicated = enabled;
-    }
-
-    internal void Detach(RagonPayload payload)
-    {
-      _destroyPayload = payload;
-
-      Detached?.Invoke();
-    }
-
-    internal T GetPayload<T>(RagonPayload data) where T : IRagonPayload, new()
-    {
-      var payload = new T();
-      if (data.Size <= 0) return payload;
-
-      var buffer = new RagonBuffer();
-
-      data.Write(buffer);
-
-      payload.Deserialize(buffer);
-
-      return payload;
-    }
-
-    public void Prepare(
-      RagonClient client,
-      ushort entityId,
-      ushort entityType,
-      bool hasAuthority,
-      RagonPlayer player,
-      RagonPayload payload
-      )
-    {
-      Type = entityType;
-      Id = entityId;
-      HasAuthority = hasAuthority;
-
-      _client = client;
-      _spawnPayload = payload;
-
-      Owner = player;
-    }
-
-    public T GetAttachPayload<T>() where T : IRagonPayload, new()
-    {
-      return GetPayload<T>(_spawnPayload);
-    }
-
-    public T GetDetachPayload<T>() where T : IRagonPayload, new()
-    {
-      return GetPayload<T>(_destroyPayload);
-    }
-
-    public void ReplicateEvent<TEvent>(TEvent evnt, RagonPlayer target, RagonReplicationMode replicationMode)
-      where TEvent : IRagonEvent, new()
-    {
-      if (!IsAttached)
-      {
-        RagonLog.Error("Entity not attached");
-        return;
-      }
-
-      var evntId = _client.Event.GetEventCode(evnt);
-      var buffer = _client.Buffer;
-
-      buffer.Clear();
-      buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
-      buffer.WriteUShort(Id);
-      buffer.WriteUShort(evntId);
-      buffer.WriteByte((byte)replicationMode);
-      buffer.WriteByte((byte)RagonTarget.Player);
-      buffer.WriteUShort(target.PeerId);
-
-      evnt.Serialize(buffer);
-
-      var sendData = buffer.ToArray();
-      _client.Reliable.Send(sendData);
-    }
-
-    public void ReplicateEvent<TEvent>(
-      TEvent evnt,
-      RagonTarget target = RagonTarget.All,
-      RagonReplicationMode replicationMode = RagonReplicationMode.Server)
-      where TEvent : IRagonEvent, new()
-    {
-      if (!IsAttached)
-      {
-        RagonLog.Error("Entity not attached");
-        return;
-      }
-
-      var eventCode = _client.Event.GetEventCode(evnt);
-      if (target != RagonTarget.ExceptOwner)
-      {
-        if (replicationMode == RagonReplicationMode.Local)
-        {
-          var localListeners = _localListeners[eventCode];
-          foreach (var listener in localListeners)
-            listener.Invoke(_client.Room.Local, evnt);
-          return;
-        }
-
-        if (replicationMode == RagonReplicationMode.LocalAndServer)
-        {
-          var localListeners = _localListeners[eventCode];
-          foreach (var listener in localListeners)
-            listener.Invoke(_client.Room.Local, evnt);
-        }
-      }
-
-      var buffer = _client.Buffer;
-
-      buffer.Clear();
-      buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
-      buffer.WriteUShort(Id);
-      buffer.WriteUShort(eventCode);
-      buffer.WriteByte((byte)replicationMode);
-      buffer.WriteByte((byte)target);
-
-      evnt.Serialize(buffer);
-
-      var sendData = buffer.ToArray();
-      _client.Reliable.Send(sendData);
-    }
-
-    public IDisposable OnEvent<TEvent>(Action<RagonPlayer, TEvent> callback) where TEvent : IRagonEvent, new()
-    {
-      var t = new TEvent();
-      var eventCode = _client.Event.GetEventCode(t);
-      var action = (RagonPlayer player, IRagonEvent eventData) => callback.Invoke(player, (TEvent)eventData);
-
-      if (!_listeners.TryGetValue(eventCode, out var callbacks))
-      {
-        callbacks = new List<Action<RagonPlayer, IRagonEvent>>();
-        _listeners.Add(eventCode, callbacks);
-      }
-
-      if (!_localListeners.TryGetValue(eventCode, out var localCallbacks))
-      {
-        localCallbacks = new List<Action<RagonPlayer, IRagonEvent>>();
-        _localListeners.Add(eventCode, localCallbacks);
-      }
-
-      callbacks.Add(action);
-      localCallbacks.Add(action);
-
-      if (!_events.ContainsKey(eventCode))
-      {
-        _events.Add(eventCode, (player, serializer) =>
-        {
-          t.Deserialize(serializer);
-
-          foreach (var callbackListener in callbacks)
-            callbackListener.Invoke(player, t);
-        });
-      }
-
-      return new EventSubscription(callbacks, localCallbacks, action);
-    }
-
-    internal void Write(RagonBuffer buffer)
-    {
-      buffer.WriteUShort(Id);
-
-      State.WriteState(buffer);
-
-      _propertiesChanged = false;
-    }
-
-    internal void Read(RagonBuffer buffer)
-    {
-      State.ReadState(buffer);
-    }
-
-    internal void Event(ushort eventCode, RagonPlayer caller, RagonBuffer buffer)
-    {
-      if (!IsReplicated) return;
-
-      if (_events.TryGetValue(eventCode, out var evnt))
-        evnt?.Invoke(caller, buffer);
-      else
-        RagonLog.Warn($"Handler event on entity {Id} with eventCode {eventCode} not defined");
-    }
-
-    internal void TrackChangedProperty(RagonProperty property)
-    {
-      _propertiesChanged = true;
-    }
-
-    public void OnOwnershipChanged(RagonPlayer player)
-    {
-      var prevOwner = Owner;
-
-      Owner = player;
-      HasAuthority = player.IsLocal;
-
-      OwnershipChanged?.Invoke(prevOwner, player);
-    }
-
-    public void Dispose()
-    {
-      _events.Clear();
-      _listeners.Clear();
-      _localListeners.Clear();
-    }
-  }
-}

Ragon.Client/Sources/Entity/RagonEntityState.cs

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

Ragon.Client/Sources/Entity/RagonPayload.cs

@@ -1,49 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-public class RagonPayload
-{
-  public static RagonPayload Empty = new RagonPayload(0);
-  
-  private readonly uint[] _data = new uint[128];
-  private readonly int _size = 0;
-
-  public RagonPayload(int capacity)
-  {
-    _size = capacity;
-  }
-  public int Size => _size;
-
-  public void Read(RagonBuffer buffer)
-  {
-    buffer.ReadArray(_data, _size);
-  }
-
-  public void Write(RagonBuffer buffer)
-  {
-    buffer.WriteArray(_data, _size);
-  }
-
-  public override string ToString()
-  {
-    return $"Payload Size: {_size}";
-  }
-}

Ragon.Client/Sources/Entity/RagonProperty.cs

@@ -1,146 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client
-{
-  [Serializable]
-  public class RagonProperty
-  {
-    public string Name => _name;
-    public RagonEntity Entity => _entity;
-
-    public event Action Changed;
-    public bool IsDirty => _dirty && _ticks >= _priority;
-    public bool IsFixed => _fixed;
-    public int Size => _size;
-
-    private RagonBuffer _propertyBuffer;
-    private RagonEntity _entity;
-    private bool _dirty;
-    private int _size;
-    private int _ticks;
-    private int _priority;
-    private bool _fixed;
-    private string _name;
-
-    protected bool InvokeLocal;
-
-    protected RagonProperty(int priority, bool invokeLocal)
-    {
-      _size = 0;
-      _priority = priority;
-      _fixed = false;
-      _propertyBuffer = new RagonBuffer();
-
-      InvokeLocal = invokeLocal;
-    }
-
-    public void SetName(string name)
-    {
-      _name = name;
-    }
-
-    protected void SetFixedSize(int size)
-    {
-      _size = size;
-      _fixed = true;
-    }
-
-    protected void InvokeChanged()
-    {
-      if (_entity.HasAuthority)
-        return;
-
-      Changed?.Invoke();
-    }
-
-    protected void MarkAsChanged()
-    {
-      if (InvokeLocal)
-        Changed?.Invoke();
-      
-      if (_dirty || _entity == null)
-        return;
-
-      _dirty = true;
-      _entity.TrackChangedProperty(this);
-    }
-
-    internal void Flush()
-    {
-      _dirty = false;
-      _ticks = 0;
-    }
-
-    internal void AddTick()
-    {
-      _ticks++;
-    }
-
-    internal void AssignEntity(RagonEntity ent)
-    {
-      _entity = ent;
-
-      Changed?.Invoke();
-    }
-
-    internal void Write(RagonBuffer buffer)
-    {
-      _propertyBuffer.Clear();
-
-      if (_fixed)
-      {
-        Serialize(_propertyBuffer);
-
-        buffer.CopyFrom(_propertyBuffer, _size);
-        return;
-      }
-
-      Serialize(_propertyBuffer);
-
-      var propertySize = (ushort)_propertyBuffer.WriteOffset;
-      buffer.WriteUShort(propertySize);
-      buffer.CopyFrom(_propertyBuffer, propertySize);
-    }
-
-    internal void Read(RagonBuffer buffer)
-    {
-      _propertyBuffer.Clear();
-
-      if (_fixed)
-      {
-        buffer.ToBuffer(_propertyBuffer, _size);
-
-        Deserialize(_propertyBuffer);
-        return;
-      }
-
-      var propSize = buffer.ReadUShort();
-      buffer.ToBuffer(_propertyBuffer, propSize);
-      Deserialize(_propertyBuffer);
-    }
-
-    public virtual void Serialize(RagonBuffer buffer)
-    {
-    }
-
-    public virtual void Deserialize(RagonBuffer buffer)
-    {
-    }
-  }
-}

Ragon.Client/Sources/Handler/AuthorizeFailedHandler.cs

@@ -27,7 +27,7 @@ internal class AuthorizeFailedHandler: IHandler
     _listenerList = list;
   }
   
-  public void Handle(RagonBuffer reader)
+  public void Handle(RagonStream reader)
   {
     var message = reader.ReadString();
     _listenerList.OnAuthorizationFailed(message);

Ragon.Client/Sources/Handler/AuthorizeSuccessHandler.cs

@@ -32,13 +32,13 @@ internal class AuthorizeSuccessHandler: IHandler
     _listenerList = listenerList;
   }
   
-  public void Handle(RagonBuffer reader)
+  public void Handle(RagonStream reader)
   {
     var playerId = reader.ReadString();
     var playerName = reader.ReadString();
     var playerPayload = reader.ReadString();
 
-    _client.SetStatus(RagonStatus.LOBBY);
+    _client.UpdateState(RagonState.LOBBY);
     _listenerList.OnAuthorizationSuccess(playerId, playerName, playerPayload);
   }
 }

Ragon.Client/Sources/Handler/EntityCreateHandler.cs

@@ -1,69 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class EntityCreateHandler : IHandler
-{
-  private readonly RagonClient _client;
-  private readonly RagonPlayerCache _playerCache;
-  private readonly RagonEntityCache _entityCache;
-  private readonly IRagonEntityListener _entityListener;
-  
-  public EntityCreateHandler(
-    RagonClient client,
-    RagonPlayerCache playerCache,
-    RagonEntityCache entityCache,
-    IRagonEntityListener entityListener
-  )
-  {
-    _client = client;
-    _entityCache = entityCache;
-    _playerCache = playerCache;
-    _entityListener = entityListener;
-  }
-
-  public void Handle(RagonBuffer reader)
-  {
-    var attachId = reader.ReadUShort();
-    var entityType = reader.ReadUShort();
-    var entityId = reader.ReadUShort();
-    var ownerId = reader.ReadUShort();
-    var player = _playerCache.GetPlayerByPeer(ownerId);
-    var payload = new RagonPayload(reader.Capacity);
-    payload.Read(reader);
-
-    if (player == null)
-    {
-      RagonLog.Warn($"Owner {ownerId}|{player.Name} not found in players");
-      
-      _playerCache.Dump();
-      return;
-    }
-    
-    var hasAuthority = _playerCache.Local.Id == player.Id;
-    var entity = _entityCache.TryGetEntity(attachId, entityType, 0, entityId, hasAuthority, out var hasCreated);
-    
-    entity.Prepare(_client, entityId, entityType, hasAuthority, player, payload);
-
-    if (hasCreated)
-      _entityListener.OnEntityCreated(entity);
-    
-    entity.Attach();
-  }
-}

Ragon.Client/Sources/Handler/EntityEventHandler.cs

@@ -1,56 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class EntityEventHandler : IHandler
-{
-  private readonly RagonPlayerCache _playerCache;
-  private readonly RagonEntityCache _entityCache;
-
-  public EntityEventHandler(
-    RagonPlayerCache playerCache,
-    RagonEntityCache entityCache
-  )
-  {
-    _playerCache = playerCache;
-    _entityCache = entityCache;
-  }
-
-  public void Handle(RagonBuffer reader)
-  {
-    var eventCode = reader.ReadUShort();
-    var peerId = reader.ReadUShort();
-    var executionMode = (RagonReplicationMode)reader.ReadByte();
-    var entityId = reader.ReadUShort();
-
-    var player = _playerCache.GetPlayerByPeer(peerId);
-    if (player == null)
-    {
-      RagonLog.Error($"Player with peerId:{peerId} not found as owner of event with code:{eventCode}");
-      
-      _playerCache.Dump();
-      return;
-    }
-
-    if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
-      return;
-
-    _entityCache.OnEvent(player, entityId, eventCode, reader);
-  }
-}

Ragon.Client/Sources/Handler/EntityOwnershipHandler.cs

@@ -1,60 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class EntityOwnershipHandler: IHandler
-{
-  private readonly RagonListenerList _listenerList;
-  private readonly RagonPlayerCache _playerCache;
-  private readonly RagonEntityCache _entityCache;
-  
-  public EntityOwnershipHandler(
-    RagonListenerList listenerList,
-    RagonPlayerCache playerCache,
-    RagonEntityCache entityCache)
-  {
-    _listenerList = listenerList;
-    _playerCache = playerCache;
-    _entityCache = entityCache;
-  }
-  
-  public void Handle(RagonBuffer reader)
-  {
-    var newOwnerId = reader.ReadUShort();
-    var entities = reader.ReadUShort();
-    
-    var player = _playerCache.GetPlayerByPeer(newOwnerId);
-    if (player == null)
-    {
-      RagonLog.Error($"Player with Id:{newOwnerId} not found in cache");
-      
-      _playerCache.Dump();
-      return;
-    }
-    
-    for (var i = 0; i < entities; i++)
-    {
-      var entityId = reader.ReadUShort();
-      _entityCache.OnOwnershipChanged(player, entityId);
-      
-      RagonLog.Trace("Entity changed owner: " + entityId);
-    }  
-  }
-}

Ragon.Client/Sources/Handler/EntityRemoveHandler.cs

@@ -1,39 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class EntityRemoveHandler: IHandler
-{
-  private readonly RagonEntityCache _entityCache;
-  
-  public EntityRemoveHandler(RagonEntityCache entityCache)
-  {
-    _entityCache = entityCache;
-  }
-  
-  public void Handle(RagonBuffer reader)
-  {
-    var entityId = reader.ReadUShort();
-    var payload = new RagonPayload(reader.Capacity);
-    payload.Read(reader);
-    
-    _entityCache.OnDestroy(entityId, payload);
-  }
-}

Ragon.Client/Sources/Handler/EntityStateHandler.cs

@@ -1,39 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class StateEntityHandler: IHandler
-{
-  private readonly RagonEntityCache _entityCache;
-  
-  public StateEntityHandler(RagonEntityCache entityCache)
-  {
-    _entityCache = entityCache;
-  }
-  
-  public void Handle(RagonBuffer reader)
-  {
-    var entitiesCount = reader.ReadUShort();
-    for (var i = 0; i < entitiesCount; i++)
-    {
-      var entityId = reader.ReadUShort();
-      _entityCache.OnState(entityId, reader);
-    }
-  }
-}

Ragon.Client/Sources/Handler/IHandler.cs

@@ -21,5 +21,5 @@ namespace Ragon.Client;
 
 public interface IHandler
 {
-  public void Handle(RagonBuffer reader);
+  public void Handle(RagonStream reader);
 }

Ragon.Client/Sources/Handler/JoinFailedHandler.cs

@@ -28,7 +28,7 @@ internal  class JoinFailedHandler: IHandler
     _listenerList = listenerList;
   }
   
-  public void Handle(RagonBuffer reader)
+  public void Handle(RagonStream reader)
   {
     var message = reader.ReadString();
     _listenerList.OnFailed(message);

Ragon.Client/Sources/Handler/JoinSuccessHandler.cs

@@ -41,38 +41,30 @@ internal class JoinSuccessHandler : IHandler
 {
   private readonly RagonListenerList _listenerList;
   private readonly RagonPlayerCache _playerCache;
-  private readonly RagonEntityCache _entityCache;
   private readonly RagonClient _client;
+  private readonly RagonRoom _room;
 
   public JoinSuccessHandler(
     RagonClient client,
-    RagonListenerList listenerList,
-    RagonPlayerCache playerCache,
-    RagonEntityCache entityCache
+    RagonRoom room
   )
   {
     _client = client;
-    _listenerList = listenerList;
-    _entityCache = entityCache;
-    _playerCache = playerCache;
+    _room = room;
   }
 
-  public void Handle(RagonBuffer reader)
+  public void Handle(RagonStream reader)
   {
     var roomId = reader.ReadString();
     var min = reader.ReadUShort();
     var max = reader.ReadUShort();
-    var sceneName = reader.ReadString();
     var localId = reader.ReadString();
     var ownerId = reader.ReadString();
+    var roomInfo = new RoomParameters(roomId, localId, ownerId, min, max);
     
     _playerCache.SetOwnerAndLocal(ownerId, localId);
-    
-    var scene = new RagonScene(_client, _playerCache, _entityCache, sceneName);
-    var roomInfo = new RoomParameters(roomId, localId, ownerId, min, max);
-    var room = new RagonRoom(_client, _entityCache, _playerCache, roomInfo, scene);
-
-    room.UserData.Read(reader);
+    _room.Reset(roomInfo);
+    _room.UserData.Read(reader);
 
     var playersCount = reader.ReadUShort();
     RagonLog.Trace("Players: " + playersCount);
@@ -89,10 +81,8 @@ internal class JoinSuccessHandler : IHandler
       RagonLog.Trace($"Player {playerPeerId} - {playerId} - {playerName}");
     }
 
-    _client.AssignRoom(room);
-    _client.SetStatus(RagonStatus.ROOM);
+    _client.UpdateState(RagonState.ROOM);
 
     _listenerList.OnJoined();
-    _listenerList.OnSceneRequest(sceneName);
   }
 }

Ragon.Client/Sources/Handler/LeaveRoomHandler.cs

@@ -23,22 +23,19 @@ internal class LeaveRoomHandler : IHandler
 {
   private readonly RagonClient _client;
   private readonly RagonListenerList _listenerList;
-  private readonly RagonEntityCache _entityCache;
   
   public LeaveRoomHandler(
     RagonClient client,
-    RagonListenerList listenerList,
-    RagonEntityCache entityCache)
+    RagonListenerList listenerList)
   {
     _client = client;
     _listenerList = listenerList;
-    _entityCache = entityCache;
   }
 
-  public void Handle(RagonBuffer reader)
+  public void Handle(RagonStream reader)
   {    
     _listenerList.OnLeft();
-    _entityCache.Cleanup();
-    _client.Room.Cleanup();
+    
+    _client.Room.Clear();
   }
 }

Ragon.Client/Sources/Handler/LoadSceneHandler.cs

@@ -1,45 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class SceneLoadHandler: IHandler
-{
-  private readonly RagonClient _client;
-  private readonly RagonListenerList _listenerList;
-  
-  public SceneLoadHandler(
-    RagonClient ragonClient,
-    RagonListenerList listenerList
-    )
-  {
-    _client = ragonClient;
-    _listenerList = listenerList;
-  }
-  
-  public void Handle(RagonBuffer reader)
-  {
-    var sceneName = reader.ReadString();
-    var room = _client.Room;
-    
-    room.Cleanup();
-    room.Update(sceneName);
-    
-    _listenerList.OnSceneRequest(sceneName);
-  }
-}

Ragon.Client/Sources/Handler/OwnershipRoomHandler.cs

@@ -23,19 +23,16 @@ internal class OwnershipRoomHandler : IHandler
 {
   private readonly RagonListenerList _listenerList;
   private readonly RagonPlayerCache _playerCache;
-  private readonly RagonEntityCache _entityCache;
 
   public OwnershipRoomHandler(
     RagonListenerList listenerList,
-    RagonPlayerCache playerCache,
-    RagonEntityCache entityCache)
+    RagonPlayerCache playerCache)
   {
     _listenerList = listenerList;
     _playerCache = playerCache;
-    _entityCache = entityCache;
   }
 
-  public void Handle(RagonBuffer reader)
+  public void Handle(RagonStream reader)
   {
     var newOwnerId = reader.ReadUShort();
     var player = _playerCache.GetPlayerByPeer(newOwnerId);

Ragon.Client/Sources/Handler/PlayerJoinHandler.cs

@@ -33,7 +33,7 @@ internal class PlayerJoinHandler : IHandler
     _listenerList = listenerList;
   }
 
-  public void Handle(RagonBuffer reader)
+  public void Handle(RagonStream reader)
   {
     var playerPeerId = reader.ReadUShort();
     var playerId = reader.ReadString();

Ragon.Client/Sources/Handler/PlayerLeftHandler.cs

@@ -22,21 +22,18 @@ namespace Ragon.Client;
 internal class PlayerLeftHandler : IHandler
 {
   private RagonPlayerCache _playerCache;
-  private RagonEntityCache _entityCache;
   private RagonListenerList _listenerList;
 
   public PlayerLeftHandler(
-    RagonEntityCache entityCache,
     RagonPlayerCache playerCache,
     RagonListenerList listenerList
   )
   {
-    _entityCache = entityCache;
     _playerCache = playerCache;
     _listenerList = listenerList;
   }
 
-  public void Handle(RagonBuffer reader)
+  public void Handle(RagonStream reader)
   {
     var playerId = reader.ReadString();
     var player = _playerCache.GetPlayerById(playerId);
@@ -53,9 +50,10 @@ internal class PlayerLeftHandler : IHandler
         toDeleteIds[i] = entityId;
       }
 
-      var emptyPayload = new RagonPayload(0);
-      foreach (var id in toDeleteIds)
-        _entityCache.OnDestroy(id, emptyPayload);
+    
+      // var emptyPayload = new RagonPayload(0);
+      // foreach (var id in toDeleteIds)
+        // _entityCache.OnDestroy(id, emptyPayload);
     }
     else
     {

Ragon.Client/Sources/Handler/PlayerUserDataHandler.cs

@@ -32,7 +32,7 @@ namespace Ragon.Client
       _playerCache = playerCache;
       _listenerList = listenerList;
     }
-    public void Handle(RagonBuffer reader)
+    public void Handle(RagonStream reader)
     {
       var playerPeerId = reader.ReadUShort();
       var player = _playerCache.GetPlayerByPeer(playerPeerId);

Ragon.Client/Sources/Handler/RoomDataHandler.cs

@@ -1,60 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class RoomDataHandler: IHandler
-{
-  private readonly RagonListenerList _listeners;
-  private readonly RagonPlayerCache _playerCache;
-    
-  public RoomDataHandler(
-    RagonPlayerCache playerCache,
-    RagonListenerList listeners)
-  {
-    _playerCache = playerCache;
-    _listeners = listeners;
-  }
-
-  public void Handle(RagonBuffer reader)
-  {
-    var rawData = reader.RawData;
-    var peerId = (ushort)(rawData[1] + (rawData[2] << 8));
-    
-    RagonPlayer player = null;
-    if (peerId != 10000)
-    {
-      player = _playerCache.GetPlayerByPeer(peerId);
-      if (player == null)
-      {
-        RagonLog.Error($"Player with peerId:{peerId} not found");
-
-        _playerCache.Dump();
-        return;
-      }
-    }
-
-    var headerSize = 3;
-    var payload = new byte[rawData.Length - headerSize];
-    
-    Array.Copy(rawData, headerSize, payload, 0, payload.Length);
-    
-    _listeners.OnData(player, payload);
-  }
-}

Ragon.Client/Sources/Handler/RoomEventHandler.cs

@@ -32,11 +32,11 @@ public class RoomEventHandler : IHandler
     _playerCache = playerCache;
   }
 
-  public void Handle(RagonBuffer buffer)
+  public void Handle(RagonStream buffer)
   {
     var eventCode = buffer.ReadUShort();
     var peerId = buffer.ReadUShort();
-    var executionMode = (RagonReplicationMode)buffer.ReadByte();
+    var executionMode = (RagonReplicationMode) buffer.ReadByte();
 
     var player = _playerCache.GetPlayerByPeer(peerId);
     if (player == null)

Ragon.Client/Sources/Handler/RoomListHandler.cs

@@ -13,7 +13,7 @@ internal class RoomListHandler: IHandler
     _listenerList = list;
   }
   
-  public void Handle(RagonBuffer reader)
+  public void Handle(RagonStream reader)
   {
     var roomCount = reader.ReadUShort();
     var roomList = new RagonRoomInformation[roomCount];

Ragon.Client/Sources/Handler/RoomUserDataHandler.cs

@@ -29,7 +29,7 @@ namespace Ragon.Client
       _listenerList = listenerList;
     }
 
-    public void Handle(RagonBuffer reader)
+    public void Handle(RagonStream reader)
     {
       var changes = _client.Room?.UserData.Read(reader);
       _listenerList.OnRoomUserData(changes);

Ragon.Client/Sources/Handler/SnapshotHandler.cs

@@ -1,118 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using System.Diagnostics;
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-internal class SnapshotHandler : IHandler
-{
-  private readonly IRagonEntityListener _entityListener;
-  private readonly RagonClient _client;
-  private readonly RagonListenerList _listenerList;
-  private readonly RagonEntityCache _entityCache;
-  private readonly RagonPlayerCache _playerCache;
-
-  public SnapshotHandler(
-    RagonClient ragonClient,
-    RagonListenerList listenerList,
-    RagonEntityCache entityCache,
-    RagonPlayerCache playerCache,
-    IRagonEntityListener entityListener
-  )
-  {
-    _client = ragonClient;
-    _entityListener = entityListener;
-    _listenerList = listenerList;
-    _entityCache = entityCache;
-    _playerCache = playerCache;
-  }
-
-  public void Handle(RagonBuffer buffer)
-  {
-    var entities = new List<RagonEntity>();
-    var dynamicEntities = buffer.ReadUShort();
-    RagonLog.Trace("Dynamic Entities: " + dynamicEntities);
-    for (var i = 0; i < dynamicEntities; i++)
-    {
-      var entityType = buffer.ReadUShort();
-      var entityId = buffer.ReadUShort();
-      var ownerPeerId = buffer.ReadUShort();
-      var payloadSize = buffer.ReadUShort();
-
-      var player = _playerCache.GetPlayerByPeer(ownerPeerId);
-      if (player == null)
-      {
-        RagonLog.Error($"Player not found with peerId: {ownerPeerId}");
-
-        _playerCache.Dump();
-        return;
-      }
-
-      var hasAuthority = _playerCache.Local.Id == player.Id;
-      var entity = _entityCache.TryGetEntity(0, entityType, 0, entityId, hasAuthority, out _);
-      var payload = RagonPayload.Empty;
-      if (payloadSize > 0)
-      {
-        payload = new RagonPayload(payloadSize);
-        payload.Read(buffer);
-      }
-
-      entity.Prepare(_client, entityId, entityType, hasAuthority, player, payload);
-
-      _entityListener.OnEntityCreated(entity);
-
-      entity.Read(buffer);
-
-      entities.Add(entity);
-    }
-
-    var staticEntities = buffer.ReadUShort();
-    RagonLog.Trace("Scene Entities: " + staticEntities);
-    for (var i = 0; i < staticEntities; i++)
-    {
-      var entityType = buffer.ReadUShort();
-      var entityId = buffer.ReadUShort();
-      var staticId = buffer.ReadUShort();
-      var ownerPeerId = buffer.ReadUShort();
-      var payloadSize = buffer.ReadUShort();
-
-      var player = _playerCache.GetPlayerByPeer(ownerPeerId);
-      if (player == null)
-      {
-        RagonLog.Error($"Player not found with peerId: {ownerPeerId}");
-
-        _playerCache.Dump();
-        return;
-      }
-
-      var hasAuthority = _playerCache.Local.Id == player.Id;
-      var entity = _entityCache.TryGetEntity(0, entityType, staticId, entityId, hasAuthority, out _);
-
-      entity.Prepare(_client, entityId, entityType, hasAuthority, player, RagonPayload.Empty);
-      entity.Read(buffer);
-
-      entities.Add(entity);
-    }
-    
-    foreach (var entity in entities)
-      entity.Attach();
-
-    _listenerList.OnSceneLoaded();
-  }
-}

Ragon.Client/Sources/Handler/TimestampHandler.cs

@@ -10,12 +10,12 @@ public class TimestampHandler: IHandler
     _client = client;
   }
   
-  public void Handle(RagonBuffer buffer)
+  public void Handle(RagonStream buffer)
   {
-    var timestamp0 = buffer.Read(32); 
-    var timestamp1 = buffer.Read(32);
+    var timestamp0 = (uint)buffer.ReadInt(); 
+    var timestamp1 = (uint)buffer.ReadInt();
     var value = new DoubleToUInt { Int0 = timestamp0, Int1 = timestamp1 };
     
-    _client.SetTimestamp(value.Double);
+    _client.UpdateTimestamp(value.Double);
   }
 }

Ragon.Client/Sources/IRagonEntityListener.cs

@@ -1,22 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Ragon.Client;
-
-public interface IRagonEntityListener
-{
-  public void OnEntityCreated(RagonEntity entity);
-}

Ragon.Client/Sources/IRagonEvent.cs

@@ -20,6 +20,5 @@ namespace Ragon.Client
 {
   public interface IRagonEvent: IRagonSerializable
   {
-    
   }
 }

Ragon.Client/Sources/IRagonPayload.cs

@@ -1,25 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client
-{
-  public interface IRagonPayload: IRagonSerializable
-  {
-    
-  }
-}

Ragon.Client/Sources/IRagonSceneCollector.cs

@@ -1,22 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Ragon.Client;
-
-public interface IRagonSceneCollector
-{
-  public RagonEntity[] Collect();
-}

Ragon.Client/Sources/IUserData.cs

@@ -22,6 +22,6 @@ public interface IUserData
 {
   public byte[] this[string key] { get; set; }
   bool Dirty { get; }
-  IReadOnlyList<string> Read(RagonBuffer buffer);
-  void Write(RagonBuffer buffer);
+  IReadOnlyList<string> Read(RagonStream buffer);
+  void Write(RagonStream buffer);
 }

Ragon.Client/Sources/Listener/IRagonListener.cs

@@ -22,7 +22,6 @@ namespace Ragon.Client
     IRagonFailedListener,
     IRagonJoinListener, 
     IRagonLeftListener, 
-    IRagonSceneListener, 
     IRagonOwnershipChangedListener,
     IRagonPlayerJoinListener, 
     IRagonPlayerLeftListener,

Ragon.Client/Sources/Listener/IRagonSceneListener.cs

@@ -1,22 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Ragon.Client;
-
-public interface IRagonSceneListener
-{
-  void OnSceneLoaded(RagonClient client);
-}

Ragon.Client/Sources/Listener/IRagonSceneRequestListener.cs

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

Ragon.Client/Sources/RagonClient.cs

@@ -22,18 +22,16 @@ namespace Ragon.Client
   {
     private readonly INetworkConnection _connection;
     private readonly NetworkStatistics _stats;
-    private IRagonEntityListener _entityListener;
-    private IRagonSceneCollector _sceneCollector;
+
     private IHandler[] _handlers;
-    private RagonBuffer _readBuffer;
-    private RagonBuffer _writeBuffer;
+    private RagonStream _readBuffer;
+    private RagonStream _writeBuffer;
     private RagonRoom _room;
     private RagonSession _session;
     private RagonListenerList _listeners;
     private RagonPlayerCache _playerCache;
-    private RagonEntityCache _entityCache;
     private RagonEventCache _eventCache;
-    private RagonStatus _status;
+    private RagonState _state;
 
     private double _serverTimestamp;
     private float _replicationRate = 0;
@@ -41,14 +39,13 @@ namespace Ragon.Client
 
     public double ServerTimestamp => _serverTimestamp;
     public IRagonConnection Connection => _connection;
-    public RagonStatus Status => _status;
+    public RagonState State => _state;
     public RagonSession Session => _session;
     public RagonEventCache Event => _eventCache;
-    public RagonEntityCache Entity => _entityCache;
     public NetworkStatistics Statistics => _stats;
     public RagonRoom Room => _room;
 
-    internal RagonBuffer Buffer => _writeBuffer;
+    internal RagonStream Buffer => _writeBuffer;
     internal INetworkChannel Reliable => _connection.Reliable;
     internal INetworkChannel Unreliable => _connection.Unreliable;
 
@@ -67,77 +64,41 @@ namespace Ragon.Client
       _replicationTime = 0;
 
       _eventCache = new RagonEventCache();
-      _stats = new NetworkStatistics();
-      _status = RagonStatus.DISCONNECTED;
-    }
-
-
-    public void Configure(IRagonSceneCollector sceneCollector)
-    {
-      _sceneCollector = sceneCollector;
-    }
-
-    public void Configure(IRagonEntityListener listener)
-    {
-      _entityListener = listener;
-    }
-
-    public void Connect(string address, ushort port, string protocol)
-    {
-      if (_sceneCollector == null)
-      {
-        RagonLog.Error("Scene collector is not defined!");
-        return;
-      }
-
-      if (_entityListener == null)
-      {
-        RagonLog.Error("Entity Listener is not defined!");
-        return;
-      }
-
-      _writeBuffer = new RagonBuffer();
-      _readBuffer = new RagonBuffer();
+      _writeBuffer = new RagonStream();
+      _readBuffer = new RagonStream();
       _playerCache = new RagonPlayerCache();
       _session = new RagonSession(this, _writeBuffer);
-      _entityCache = new RagonEntityCache(this, _playerCache, _sceneCollector);
+      _room = new RagonRoom(this, _playerCache);
+      _stats = new NetworkStatistics();
+      _state = RagonState.DISCONNECTED;
       
       _handlers = new IHandler[byte.MaxValue];
       _handlers[(byte)RagonOperation.AUTHORIZED_SUCCESS] = new AuthorizeSuccessHandler(this, _listeners);
       _handlers[(byte)RagonOperation.AUTHORIZED_FAILED] = new AuthorizeFailedHandler(_listeners);
-      _handlers[(byte)RagonOperation.JOIN_SUCCESS] =
-        new JoinSuccessHandler(this, _listeners, _playerCache, _entityCache);
+      _handlers[(byte)RagonOperation.JOIN_SUCCESS] = new JoinSuccessHandler(this, _room);
       _handlers[(byte)RagonOperation.JOIN_FAILED] = new JoinFailedHandler(_listeners);
-      _handlers[(byte)RagonOperation.LEAVE_ROOM] = new LeaveRoomHandler(this, _listeners, _entityCache);
-      _handlers[(byte)RagonOperation.OWNERSHIP_ROOM_CHANGED] =
-        new OwnershipRoomHandler(_listeners, _playerCache, _entityCache);
-      _handlers[(byte)RagonOperation.OWNERSHIP_ENTITY_CHANGED] =
-        new EntityOwnershipHandler(_listeners, _playerCache, _entityCache);
+      _handlers[(byte)RagonOperation.LEAVE_ROOM] = new LeaveRoomHandler(this, _listeners);
+      _handlers[(byte)RagonOperation.OWNERSHIP_ROOM_CHANGED] = new OwnershipRoomHandler(_listeners, _playerCache);
       _handlers[(byte)RagonOperation.PLAYER_JOINED] = new PlayerJoinHandler(_playerCache, _listeners);
-      _handlers[(byte)RagonOperation.PLAYER_LEAVED] = new PlayerLeftHandler(_entityCache, _playerCache, _listeners);
-      _handlers[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadHandler(this, _listeners);
-      _handlers[(byte)RagonOperation.CREATE_ENTITY] =
-        new EntityCreateHandler(this, _playerCache, _entityCache, _entityListener);
-      _handlers[(byte)RagonOperation.REMOVE_ENTITY] = new EntityRemoveHandler(_entityCache);
-      _handlers[(byte)RagonOperation.REPLICATE_ENTITY_STATE] = new StateEntityHandler(_entityCache);
-      _handlers[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] = new EntityEventHandler(_playerCache, _entityCache);
+      _handlers[(byte)RagonOperation.PLAYER_LEAVED] = new PlayerLeftHandler(_playerCache, _listeners);
       _handlers[(byte)RagonOperation.REPLICATE_ROOM_EVENT] = new RoomEventHandler(this, _playerCache);
-      _handlers[(byte)RagonOperation.SNAPSHOT] =
-        new SnapshotHandler(this, _listeners, _entityCache, _playerCache, _entityListener);
       _handlers[(byte)RagonOperation.TIMESTAMP_SYNCHRONIZATION] = new TimestampHandler(this);
-      _handlers[(byte)RagonOperation.REPLICATE_RAW_DATA] = new RoomDataHandler(_playerCache, _listeners);
       _handlers[(byte)RagonOperation.ROOM_LIST_UPDATED] = new RoomListHandler(_session, _listeners);
       _handlers[(byte)RagonOperation.ROOM_DATA_UPDATED] = new RoomUserDataHandler(this, _listeners);
       _handlers[(byte)RagonOperation.PLAYER_DATA_UPDATED] = new PlayerUserDataHandler(_playerCache, _listeners);
+    }
     
+    public void Connect(string address, ushort port, string protocol)
+    {
       var protocolRaw = RagonVersion.Parse(protocol);
       _connection.Connect(address, port, protocolRaw);
     }
 
     public void Disconnect()
     {
-      _status = RagonStatus.DISCONNECTED;
-      _room.Cleanup();
+      _state = RagonState.DISCONNECTED;
+      _room.Clear();
+      
       _connection.Disconnect();
 
       OnDisconnected(RagonDisconnect.MANUAL);
@@ -145,13 +106,12 @@ namespace Ragon.Client
 
     public void Update(float dt)
     {
-      if (_status != RagonStatus.DISCONNECTED)
+      if (_state != RagonState.DISCONNECTED)
       {
         _replicationTime += dt;
         if (_replicationTime >= _replicationRate)
         {
           _replicationTime = 0;
-          _entityCache.WriteState(_writeBuffer);
         
           SendTimestamp();
           SendRoomUserData();
@@ -167,9 +127,9 @@ namespace Ragon.Client
 
     public void Dispose()
     {
-      if (_status != RagonStatus.DISCONNECTED)
+      if (_state != RagonState.DISCONNECTED)
       {
-        _status = RagonStatus.DISCONNECTED;
+        _state = RagonState.DISCONNECTED;
         _connection.Disconnect();
       }
 
@@ -185,9 +145,6 @@ namespace Ragon.Client
     public void AddListener(IRagonOwnershipChangedListener listener) => _listeners.Add(listener);
     public void AddListener(IRagonPlayerJoinListener listener) => _listeners.Add(listener);
     public void AddListener(IRagonPlayerLeftListener listener) => _listeners.Add(listener);
-    public void AddListener(IRagonSceneListener listener) => _listeners.Add(listener);
-    public void AddListener(IRagonSceneRequestListener listener) => _listeners.Add(listener);
-    public void AddListener(IRagonDataListener listener) => _listeners.Add(listener);
     public void AddListener(IRagonRoomListListener listener) => _listeners.Add(listener);
     public void AddListener(IRagonPlayerUserDataListener listener) => _listeners.Add(listener);
     public void AddListener(IRagonRoomUserDataListener listener) => _listeners.Add(listener);
@@ -200,9 +157,6 @@ namespace Ragon.Client
     public void RemoveListener(IRagonOwnershipChangedListener listener) => _listeners.Remove(listener);
     public void RemoveListener(IRagonPlayerJoinListener listener) => _listeners.Remove(listener);
     public void RemoveListener(IRagonPlayerLeftListener listener) => _listeners.Remove(listener);
-    public void RemoveListener(IRagonSceneListener listener) => _listeners.Remove(listener);
-    public void RemoveListener(IRagonSceneRequestListener listener) => _listeners.Remove(listener);
-    public void RemoveListener(IRagonDataListener listener) => _listeners.Remove(listener);
     public void RemoveListener(IRagonRoomListListener listener) => _listeners.Remove(listener);
     public void RemoveListener(IRagonRoomUserDataListener listener) => _listeners.Remove(listener);
     public void RemoveListener(IRagonPlayerUserDataListener listener) => _listeners.Remove(listener);
@@ -211,18 +165,12 @@ namespace Ragon.Client
 
     #region INTERNAL
     
-    internal void AssignRoom(RagonRoom room)
+    internal void UpdateState(RagonState state)
     {
-      _room?.Dispose();
-      _room = room;
+      _state = state;
     }
 
-    internal void SetStatus(RagonStatus status)
-    {
-      _status = status;
-    }
-
-    internal void SetTimestamp(double time)
+    internal void UpdateTimestamp(double time)
     {
       _serverTimestamp = time;
     }
@@ -241,8 +189,8 @@ namespace Ragon.Client
 
       _writeBuffer.Clear();
       _writeBuffer.WriteOperation(RagonOperation.TIMESTAMP_SYNCHRONIZATION);
-      _writeBuffer.Write(value.Int0, 32);
-      _writeBuffer.Write(value.Int1, 32);
+      _writeBuffer.WriteInt((int)value.Int0);
+      _writeBuffer.WriteInt((int)value.Int1);
     }
 
     private void SendRoomUserData()
@@ -282,7 +230,7 @@ namespace Ragon.Client
       RagonLog.Trace("Connected");
 
       _listeners.OnConnected();
-      _status = RagonStatus.CONNECTED;
+      _state = RagonState.CONNECTED;
     }
 
     private void OnDisconnected(RagonDisconnect reason)
@@ -290,7 +238,7 @@ namespace Ragon.Client
       RagonLog.Trace($"Disconnected: {reason}");
 
       _listeners.OnDisconnected(reason);
-      _status = RagonStatus.DISCONNECTED;
+      _state = RagonState.DISCONNECTED;
     }
 
     private void OnData(byte[] data)

Ragon.Client/Sources/RagonEntityCache.cs

@@ -1,257 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-public sealed class RagonEntityCache
-{
-  private readonly List<RagonEntity> _entityList = new();
-  private readonly Dictionary<uint, RagonEntity> _entityMap = new();
-  private readonly Dictionary<uint, RagonEntity> _pendingEntities = new();
-  private readonly Dictionary<uint, RagonEntity> _sceneEntities = new();
-
-  private readonly RagonClient _client;
-  private readonly IRagonSceneCollector _sceneCollector;
-  private readonly RagonPlayerCache _playerCache;
-
-  private int _localEntitiesCounter = 0;
-
-  public RagonEntityCache(
-    RagonClient client,
-    RagonPlayerCache playerCache,
-    IRagonSceneCollector sceneCollector
-  )
-  {
-    _client = client;
-    _sceneCollector = sceneCollector;
-    _playerCache = playerCache;
-  }
-
-  public bool TryGetEntity(ushort id, out RagonEntity entity)
-  {
-    return _entityMap.TryGetValue(id, out entity);
-  }
-
-  public void Create(RagonEntity entity, RagonPayload spawnPayload)
-  {
-    var attachId = (ushort)(_playerCache.Local.PeerId + _localEntitiesCounter++);
-    var buffer = _client.Buffer;
-
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.CREATE_ENTITY);
-    buffer.WriteUShort(attachId);
-    buffer.WriteUShort(entity.Type);
-    buffer.WriteByte((byte)entity.Authority);
-
-    entity.State.WriteInfo(buffer);
-
-    spawnPayload?.Write(buffer);
-
-    _pendingEntities.Add(attachId, entity);
-
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-
-  public void Transfer(RagonEntity entity, RagonPlayer player)
-  {
-    var buffer = _client.Buffer;
-
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.TRANSFER_ENTITY_OWNERSHIP);
-    buffer.WriteUShort(entity.Id);
-    buffer.WriteUShort(player.PeerId);
-
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-
-  public void Destroy(RagonEntity entity, RagonPayload destroyPayload)
-  {
-    if (!entity.IsAttached && !entity.HasAuthority)
-    {
-      RagonLog.Warn("Can't destroy object");
-      return;
-    }
-
-    entity.SetReplication(false);
-
-    var buffer = _client.Buffer;
-
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.REMOVE_ENTITY);
-    buffer.WriteUShort(entity.Id);
-
-    destroyPayload?.Write(buffer);
-
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-
-  internal void WriteState(RagonBuffer buffer)
-  {
-    var changedEntities = 0u;
-
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_STATE);
-
-    var offset = buffer.WriteOffset;
-    buffer.Write(0, 16);
-
-    foreach (var ent in _entityList)
-    {
-      if (!ent.IsAttached ||
-          !ent.IsReplicated ||
-          !ent.PropertiesChanged) continue;
-
-      ent.Write(buffer);
-
-      changedEntities++;
-    }
-
-    if (changedEntities <= 0) return;
-
-    buffer.Write(changedEntities, 16, offset);
-
-    var data = buffer.ToArray();
-    _client.Unreliable.Send(data);
-  }
-
-  internal void WriteScene(RagonBuffer buffer)
-  {
-    _sceneEntities.Clear();
-
-    var entities = _sceneCollector.Collect();
-    buffer.WriteUShort((ushort)entities.Length);
-    foreach (var entity in entities)
-    {
-      buffer.WriteUShort(entity.Type);
-      buffer.WriteByte((byte)entity.Authority);
-      buffer.WriteUShort(entity.SceneId);
-
-      entity.State.WriteInfo(buffer);
-
-      _sceneEntities.Add(entity.SceneId, entity);
-    }
-  }
-
-  internal void CacheScene()
-  {
-    _sceneEntities.Clear();
-
-    var entities = _sceneCollector.Collect();
-    foreach (var entity in entities)
-      _sceneEntities.Add(entity.SceneId, entity);
-  }
-
-  internal void Cleanup()
-  {
-    var payload = new RagonPayload(0);
-    foreach (var ent in _entityList)
-      ent.Detach(payload);
-
-    _entityMap.Clear();
-    _entityList.Clear();
-  }
-
-  internal RagonEntity TryGetEntity(ushort attachId, ushort entityType, ushort sceneId, ushort entityId, bool hasAuthority, out bool hasCreated)
-  {
-    if (sceneId > 0)
-    {
-      if (_sceneEntities.TryGetValue(sceneId, out var sceneEntity))
-      {
-        _entityMap.Add(entityId, sceneEntity);
-
-        if (hasAuthority)
-          _entityList.Add(sceneEntity);
-
-        hasCreated = false;
-
-        return sceneEntity;
-      }
-    }
-
-    if (_pendingEntities.TryGetValue(attachId, out var pendingEntity) && hasAuthority)
-    {
-      _pendingEntities.Remove(attachId);
-      _entityMap.Add(entityId, pendingEntity);
-      _entityList.Add(pendingEntity);
-
-      hasCreated = false;
-
-      return pendingEntity;
-    }
-
-    var entity = new RagonEntity(entityType, sceneId);
-
-    _entityMap.Add(entityId, entity);
-
-    if (hasAuthority)
-      _entityList.Add(entity);
-
-    hasCreated = true;
-
-    return entity;
-  }
-
-
-  internal void OnDestroy(ushort entityId, RagonPayload payload)
-  {
-    if (_entityMap.TryGetValue(entityId, out var entity))
-    {
-      _entityMap.Remove(entityId);
-      _entityList.Remove(entity);
-
-      entity.Detach(payload);
-      entity.Dispose();
-    }
-  }
-
-  internal void OnState(ushort entityId, RagonBuffer buffer)
-  {
-    if (_entityMap.TryGetValue(entityId, out var entity))
-      entity.Read(buffer);
-    else
-      RagonLog.Warn($"Entity {entityId} not found!");
-  }
-
-  internal void OnEvent(RagonPlayer player, ushort entityId, ushort eventCode, RagonBuffer buffer)
-  {
-    if (_entityMap.TryGetValue(entityId, out var entity))
-      entity.Event(eventCode, player, buffer);
-    else
-      RagonLog.Warn($"Entity {entityId} not found!");
-  }
-
-  internal void OnOwnershipChanged(RagonPlayer player, ushort entityId)
-  {
-    if (_entityMap.TryGetValue(entityId, out var entity))
-    {
-      if (player.IsLocal)
-        _entityList.Add(entity);
-      else
-        _entityList.Remove(entity);
-
-      entity.OnOwnershipChanged(player);
-    }
-    else
-    {
-      RagonLog.Warn($"Entity {entityId} not found!");
-    }
-  }
-}

Ragon.Client/Sources/RagonEventCache.cs

@@ -26,11 +26,13 @@ public class RagonEventCache
   public ushort GetEventCode<TEvent>(TEvent _) where TEvent : IRagonEvent
   {
     var type = typeof(TEvent);
+   
     if (!_eventsRegistryByType.TryGetValue(type, out var eventCode))
     {
       RagonLog.Error($"Event with type {type} not registered");
       return 0;
     }
+    
     return eventCode;
   }
 

Ragon.Client/Sources/RagonListenerList.cs

@@ -26,12 +26,9 @@ namespace Ragon.Client
     private readonly List<IRagonFailedListener> _failedListeners = new();
     private readonly List<IRagonJoinListener> _joinListeners = new();
     private readonly List<IRagonLeftListener> _leftListeners = new();
-    private readonly List<IRagonSceneListener> _sceneListeners = new();
-    private readonly List<IRagonSceneRequestListener> _sceneRequestListeners = new();
     private readonly List<IRagonOwnershipChangedListener> _ownershipChangedListeners = new();
     private readonly List<IRagonPlayerJoinListener> _playerJoinListeners = new();
     private readonly List<IRagonPlayerLeftListener> _playerLeftListeners = new();
-    private readonly List<IRagonDataListener> _dataListeners = new();
     private readonly List<IRagonRoomListListener> _roomListListeners = new();
     private readonly List<IRagonRoomUserDataListener> _roomUserDataListeners = new();
     private readonly List<IRagonPlayerUserDataListener> _playerUserDataListeners = new();
@@ -49,7 +46,6 @@ namespace Ragon.Client
       _failedListeners.Add(listener);
       _joinListeners.Add(listener);
       _leftListeners.Add(listener);
-      _sceneListeners.Add(listener);
       _ownershipChangedListeners.Add(listener);
       _playerJoinListeners.Add(listener);
       _playerLeftListeners.Add(listener);
@@ -66,7 +62,6 @@ namespace Ragon.Client
         _failedListeners.Remove(listener);
         _joinListeners.Remove(listener);
         _leftListeners.Remove(listener);
-        _sceneListeners.Remove(listener);
         _ownershipChangedListeners.Remove(listener);
         _playerJoinListeners.Remove(listener);
         _playerLeftListeners.Remove(listener);
@@ -83,21 +78,11 @@ namespace Ragon.Client
       _delayedActions.Clear();
     }
 
-    public void Add(IRagonDataListener dataListener)
-    {
-      _dataListeners.Add(dataListener);
-    }
-
     public void Add(IRagonAuthorizationListener listener)
     {
       _authorizationListeners.Add(listener);
     }
 
-    public void Add(IRagonSceneRequestListener listener)
-    {
-      _sceneRequestListeners.Add(listener);
-    }
-
     public void Add(IRagonConnectionListener listener)
     {
       _connectionListeners.Add(listener);
@@ -118,11 +103,6 @@ namespace Ragon.Client
       _leftListeners.Add(listener);
     }
 
-    public void Add(IRagonSceneListener listener)
-    {
-      _sceneListeners.Add(listener);
-    }
-
     public void Add(IRagonOwnershipChangedListener listener)
     {
       _ownershipChangedListeners.Add(listener);
@@ -153,16 +133,6 @@ namespace Ragon.Client
       _playerUserDataListeners.Add(listener);
     }
 
-    public void Remove(IRagonDataListener listener)
-    {
-      _delayedActions.Add(() => _dataListeners.Remove(listener));
-    }
-
-    public void Remove(IRagonSceneRequestListener listener)
-    {
-      _delayedActions.Add(() => _sceneRequestListeners.Remove(listener));
-    }
-
     public void Remove(IRagonAuthorizationListener listener)
     {
       _delayedActions.Add(() => _authorizationListeners.Remove(listener));
@@ -188,11 +158,6 @@ namespace Ragon.Client
       _delayedActions.Add(() => _leftListeners.Remove(listener));
     }
 
-    public void Remove(IRagonSceneListener listener)
-    {
-      _delayedActions.Add(() => _sceneListeners.Remove(listener));
-    }
-
     public void Remove(IRagonOwnershipChangedListener listener)
     {
       _delayedActions.Add(() => _ownershipChangedListeners.Remove(listener));
@@ -265,18 +230,6 @@ namespace Ragon.Client
         listener.OnPlayerJoined(_client, player);
     }
 
-    public void OnSceneLoaded()
-    {
-      foreach (var listener in _sceneListeners)
-        listener.OnSceneLoaded(_client);
-    }
-
-    public void OnSceneRequest(string sceneName)
-    {
-      foreach (var listener in _sceneRequestListeners)
-        listener.OnRequestScene(_client, sceneName);
-    }
-
     public void OnJoined()
     {
       foreach (var listener in _joinListeners)
@@ -295,12 +248,6 @@ namespace Ragon.Client
         listener.OnDisconnected(_client, disconnect);
     }
 
-    public void OnData(RagonPlayer player, byte[] data)
-    {
-      foreach (var listener in _dataListeners)
-        listener.OnData(_client, player, data);
-    }
-
     public void OnRoomList(RagonRoomInformation[] roomInfos)
     {
       foreach (var listListener in _roomListListeners)

Ragon.Client/Sources/RagonRoom.cs

@@ -18,7 +18,7 @@ using Ragon.Protocol;
 
 namespace Ragon.Client
 {
-  public class RagonRoom : IDisposable
+  public class RagonRoom
   {
     private class EventSubscription : IDisposable
     {
@@ -47,59 +47,45 @@ namespace Ragon.Client
       }
     }
 
-    private delegate void OnEventDelegate(RagonPlayer player, RagonBuffer serializer);
+    private delegate void OnEventDelegate(RagonPlayer player, RagonStream serializer);
 
     private readonly RagonClient _client;
-    private readonly RagonScene _scene;
-    private readonly RagonEntityCache _entityCache;
     private readonly RagonPlayerCache _playerCache;
-    private readonly RoomParameters _parameters;
-    private readonly RagonUserData _userData;
+    private RoomParameters _parameters;
+    private RagonUserData _userData;
 
     public string Id => _parameters.RoomId;
     public int MinPlayers => _parameters.Min;
     public int MaxPlayers => _parameters.Max;
-    public string Scene => _scene.Name;
 
     public IReadOnlyList<RagonPlayer> Players => _playerCache.Players;
     public RagonPlayer Local => _playerCache.Local;
     public RagonPlayer Owner => _playerCache.Owner;
     public RagonUserData UserData => _userData;
 
-    private readonly Dictionary<int, OnEventDelegate> _events = new Dictionary<int, OnEventDelegate>();
+    private readonly Dictionary<int, OnEventDelegate> _events = new();
 
-    private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _localListeners =
-      new Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>>();
+    private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _localListeners = new();
 
-    private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _listeners =
-      new Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>>();
+    private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _listeners = new();
     
-    public RagonRoom(RagonClient client,
-      RagonEntityCache entityCache,
-      RagonPlayerCache playerCache,
-      RoomParameters parameters,
-      RagonScene scene)
+    public RagonRoom(RagonClient client, RagonPlayerCache playerCache)
     {
       _client = client;
-      _parameters = parameters;
-      _entityCache = entityCache;
       _playerCache = playerCache;
-      _scene = scene;
-      _userData = new RagonUserData();
+      
     }
 
-    internal void Cleanup()
+    public void Reset(RoomParameters parameters)
     {
-      _entityCache.Cleanup();
+      Clear();
+    
+      _userData = new RagonUserData();
+      _parameters = parameters;
       _playerCache.Cleanup();
     }
     
-    internal void Update(string sceneName)
-    {
-      _scene.Update(sceneName);
-    }
-
-    internal void HandleEvent(ushort eventCode, RagonPlayer caller, RagonBuffer buffer)
+    internal void HandleEvent(ushort eventCode, RagonPlayer caller, RagonStream buffer)
     {
       if (_events.TryGetValue(eventCode, out var evnt))
         evnt?.Invoke(caller, buffer);
@@ -107,7 +93,7 @@ namespace Ragon.Client
         RagonLog.Warn($"Handler event {Id} with eventCode {eventCode} not defined");
     }
 
-    internal void HandleUserData(RagonBuffer buffer)
+    internal void HandleUserData(RagonStream buffer)
     {
       _userData.Read(buffer);
     }
@@ -147,28 +133,64 @@ namespace Ragon.Client
       return new EventSubscription(callbacks, localCallbacks, action);
     }
 
-    public void LoadScene(string sceneName) => _scene.Load(sceneName);
-    public void SceneLoaded() => _scene.SceneLoaded();
-
-    public void ReplicateEvent<TEvent>(TEvent evnt, RagonTarget target, RagonReplicationMode mode)
-      where TEvent : IRagonEvent, new() => _scene.ReplicateEvent(evnt, target, mode);
-
-    public void ReplicateEvent<TEvent>(TEvent evnt, RagonPlayer target, RagonReplicationMode mode)
-      where TEvent : IRagonEvent, new() => _scene.ReplicateEvent(evnt, target, mode);
-
-    public void ReplicateData(byte[] data, bool reliable = false) => _scene.ReplicateData(data, reliable);
-
-    public void CreateEntity(RagonEntity entity) => CreateEntity(entity, null);
-    public void CreateEntity(RagonEntity entity, RagonPayload payload) => _entityCache.Create(entity, payload);
-    public void TransferEntity(RagonEntity entity, RagonPlayer player) => _entityCache.Transfer(entity, player);
-
-    public void DestroyEntity(RagonEntity entityId) => DestroyEntity(entityId, null);
-    public void DestroyEntity(RagonEntity entityId, RagonPayload payload) => _entityCache.Destroy(entityId, payload);
-
-    public void Dispose()
+    public void ReplicateEvent<TEvent>(TEvent evnt, RagonTarget target, RagonReplicationMode replicationMode)
+      where TEvent : IRagonEvent, new()
     {
-      Cleanup();
+      var evntId = _client.Event.GetEventCode(evnt);
+      var buffer = _client.Buffer;
 
+      {
+        if (replicationMode == RagonReplicationMode.Local &&
+            _localListeners.TryGetValue(evntId, out var localListeners))
+        {
+          foreach (var listener in localListeners)
+            listener.Invoke(_client.Room.Local, evnt);
+          return;
+        }
+      }
+
+      {
+        if (replicationMode == RagonReplicationMode.LocalAndServer &&
+            _localListeners.TryGetValue(evntId, out var localListeners))
+        {
+          foreach (var listener in localListeners)
+            listener.Invoke(_client.Room.Local, evnt);
+        }
+      }
+
+      buffer.Clear();
+      buffer.WriteOperation(RagonOperation.REPLICATE_ROOM_EVENT);
+      buffer.WriteUShort(evntId);
+      buffer.WriteByte((byte)replicationMode);
+      buffer.WriteByte((byte)target);
+
+      evnt.Serialize(buffer);
+
+      var sendData = buffer.ToArray();
+      _client.Reliable.Send(sendData);
+    }
+
+    public void ReplicateEvent<TEvent>(TEvent evnt, RagonPlayer target, RagonReplicationMode replicationMode)
+      where TEvent : IRagonEvent, new()
+    {
+      var evntId = _client.Event.GetEventCode(evnt);
+      var buffer = _client.Buffer;
+
+      buffer.Clear();
+      buffer.WriteOperation(RagonOperation.REPLICATE_ROOM_EVENT);
+      buffer.WriteUShort(evntId);
+      buffer.WriteByte((byte)replicationMode);
+      buffer.WriteByte((byte)RagonTarget.Player);
+      buffer.WriteUShort(target.PeerId);
+
+      evnt.Serialize(buffer);
+
+      var sendData = buffer.ToArray();
+      _client.Reliable.Send(sendData);
+    }
+
+    public void Clear()
+    {
       _events.Clear();
       _listeners.Clear();
       _localListeners.Clear();

Ragon.Client/Sources/RagonScene.cs

@@ -1,119 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Client;
-
-public class RagonScene
-{
-  public string Name { get; private set; }
-  
-  private readonly RagonClient _client;
-  private readonly RagonEntityCache _entityCache;
-  private readonly RagonPlayerCache _playerCache;
-  
-  public RagonScene(RagonClient client, RagonPlayerCache playerCache, RagonEntityCache entityCache, string sceneName)
-  {
-    Name = sceneName;
-    
-    _client = client;
-    _playerCache = playerCache;
-    _entityCache = entityCache;
-  }
-
-  internal void Update(string scene)
-  {
-    Name = scene;
-  }
-  
-  internal void Load(string sceneName)
-  {
-    var buffer = _client.Buffer;
-    
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.LOAD_SCENE);
-    buffer.WriteString(sceneName);
-
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-
-  internal void SceneLoaded()
-  {
-    var buffer = _client.Buffer;
-    
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.SCENE_LOADED);
-
-    if (_playerCache.IsRoomOwner)
-      _entityCache.WriteScene(buffer);
-    else
-      _entityCache.CacheScene();
-    
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-
-  internal void ReplicateEvent<TEvent>(TEvent evnt, RagonTarget target, RagonReplicationMode replicationMode)
-    where TEvent : IRagonEvent, new()
-  {
-    var evntId = _client.Event.GetEventCode(evnt);
-    var buffer = _client.Buffer;
-    
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.REPLICATE_ROOM_EVENT);
-    buffer.WriteUShort(evntId);
-    buffer.WriteByte((byte)replicationMode);
-    buffer.WriteByte((byte)target);
-    
-    evnt.Serialize(buffer);
-    
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-  
-  internal void ReplicateEvent<TEvent>(TEvent evnt, RagonPlayer target, RagonReplicationMode replicationMode)
-    where TEvent : IRagonEvent, new()
-  {
-    var evntId = _client.Event.GetEventCode(evnt);
-    var buffer = _client.Buffer;
-
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.REPLICATE_ROOM_EVENT);
-    buffer.WriteUShort(evntId);
-    buffer.WriteByte((byte)replicationMode);
-    buffer.WriteByte((byte)RagonTarget.Player);
-    buffer.WriteUShort(target.PeerId);
-
-    evnt.Serialize(buffer);
-
-    var sendData = buffer.ToArray();
-    _client.Reliable.Send(sendData);
-  }
-
-  public void ReplicateData(byte[] data, bool reliable)
-  {
-    var sendData = new byte[data.Length + 1];
-    sendData[0] = (byte) RagonOperation.REPLICATE_RAW_DATA;
-    Array.Copy(data, 0, sendData, 1, data.Length);
-    
-    if (reliable)
-      _client.Reliable.Send(sendData);
-    else
-      _client.Unreliable.Send(sendData);
-  }
-}

Ragon.Client/Sources/RagonSession.cs

@@ -21,17 +21,18 @@ namespace Ragon.Client
   public class RagonSession
   {
     private readonly RagonClient _client;
-    private readonly RagonBuffer _buffer;
     
-    public RagonSession(RagonClient client, RagonBuffer buffer)
+    private readonly RagonStream _buffer;
+
+    public RagonSession(RagonClient client, RagonStream buffer)
     {
       _client = client;
       _buffer = buffer;
     }
 
-    public void CreateOrJoin(string sceneName, int minPlayers, int maxPlayers)
+    public void CreateOrJoin(string sessionName, int minPlayers, int maxPlayers)
     {
-      var parameters = new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers};
+      var parameters = new RagonRoomParameters() { Min = minPlayers, Max = maxPlayers };
       CreateOrJoin(parameters);
     }
 
@@ -46,14 +47,14 @@ namespace Ragon.Client
       _client.Reliable.Send(sendData);
     }
 
-    public void Create(string sceneName, int minPlayers, int maxPlayers)
+    public void Create(string sessionName, int minPlayers, int maxPlayers)
     {
-      Create(null, new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers});
+      Create(null, new RagonRoomParameters() { Min = minPlayers, Max = maxPlayers });
     }
 
-    public void Create(string roomId, string sceneName, int minPlayers, int maxPlayers)
+    public void Create(string roomId, string sessionName, int minPlayers, int maxPlayers)
     {
-      Create(roomId, new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers});
+      Create(roomId, new RagonRoomParameters() { Min = minPlayers, Max = maxPlayers });
     }
 
     public void Create(string roomId, RagonRoomParameters parameters)
@@ -79,7 +80,7 @@ namespace Ragon.Client
 
     public void Leave()
     {
-      var sendData = new[] {(byte) RagonOperation.LEAVE_ROOM};
+      var sendData = new[] { (byte)RagonOperation.LEAVE_ROOM };
       _client.Reliable.Send(sendData);
     }
 
@@ -104,6 +105,5 @@ namespace Ragon.Client
       var sendData = _buffer.ToArray();
       _client.Reliable.Send(sendData);
     }
-    
   }
 }

Ragon.Client/Sources/RagonState.cs

@@ -16,7 +16,7 @@
 
 namespace Ragon.Client
 {
-  public enum RagonStatus
+  public enum RagonState
   {
     DISCONNECTED,
     CONNECTED,

Ragon.Client/Sources/RagonUserData.cs

@@ -57,7 +57,7 @@ namespace Ragon.Client
     {
     }
 
-    public IReadOnlyList<string> Read(RagonBuffer buffer)
+    public IReadOnlyList<string> Read(RagonStream buffer)
     {
       var len = buffer.ReadUShort();
       var changes = new List<string>(len);
@@ -67,7 +67,7 @@ namespace Ragon.Client
         var valueSize = buffer.ReadUShort();
         if (valueSize > 0)
         {
-          var value = buffer.ReadBytes(valueSize);
+          var value = buffer.ReadBinary(valueSize);
           _properties[key] = value;
         }
         else
@@ -81,7 +81,7 @@ namespace Ragon.Client
       return changes;
     }
 
-    public void Write(RagonBuffer buffer)
+    public void Write(RagonStream buffer)
     {
       buffer.WriteUShort((ushort)_localChanges.Count);
       foreach (var propertyChanged in _localChanges)
@@ -90,7 +90,7 @@ namespace Ragon.Client
         if (_properties.TryGetValue(propertyChanged, out var property))
         {
           buffer.WriteUShort((ushort)property.Length);
-          buffer.WriteBytes(property);
+          buffer.WriteBinary(property);
         }
         else
         {

Ragon.Client/Sources/RagonUserDataReadOnly.cs

@@ -35,12 +35,12 @@ public class RagonUserDataReadOnly : IUserData
   {
   }
 
-  public void Write(RagonBuffer buffer)
+  public void Write(RagonStream buffer)
   {
   
   }
 
-  public IReadOnlyList<string> Read(RagonBuffer buffer)
+  public IReadOnlyList<string> Read(RagonStream buffer)
   {
     var len = buffer.ReadUShort();
     var changes = new List<string>(len);
@@ -50,7 +50,7 @@ public class RagonUserDataReadOnly : IUserData
       var valueSize = buffer.ReadUShort();  
       if (valueSize > 0)
       {
-        var value = buffer.ReadBytes(valueSize);
+        var value = buffer.ReadBinary(valueSize);
         _properties[key] = value;
           
       }

Ragon.Client/Sources/Utils/CompressorExtension.cs

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

Ragon.Protocol/Sources/RagonBuffer.cs

@@ -65,8 +65,6 @@ namespace Ragon.Protocol
 {
   public class RagonBuffer
   {
-    private const int MaxBufferSize = 1024 * 1024; // 1MB max buffer size
-
     private int _read;
     private int _write;
     private uint[] _buckets;
@@ -406,12 +404,6 @@ namespace Ragon.Protocol
     public void FromArray(byte[] data)
     {
       var length = data.Length;
-
-      if (length > MaxBufferSize)
-      {
-        throw new InvalidOperationException($"Input data exceeds maximum buffer size: {length} bytes > {MaxBufferSize} bytes");
-      }
-
       var bucketsCount = length / 4 + 1;
 
       if (_buckets.Length < bucketsCount)
@@ -501,14 +493,7 @@ namespace Ragon.Protocol
 
     private void Resize(int capacity)
     {
-      var newSize = _buckets.Length * 2 + capacity;
-
-      if (newSize * 4 > MaxBufferSize)
-      {
-        throw new InvalidOperationException($"Buffer size limit exceeded: {newSize * 4} bytes > {MaxBufferSize} bytes");
-      }
-
-      var buckets = new uint[newSize];
+      var buckets = new uint[_buckets.Length * 2 + capacity];
       Array.Copy(_buckets, buckets, _buckets.Length);
       _buckets = buckets;
     }

Ragon.Protocol/Sources/RagonOperation.cs

@@ -17,7 +17,7 @@
 
 namespace Ragon.Protocol
 {
-  public enum RagonOperation: byte
+  public enum RagonOperation : byte
   {
     AUTHORIZE = 1,
     AUTHORIZED_SUCCESS = 2,
@@ -26,23 +26,13 @@ namespace Ragon.Protocol
     CREATE_ROOM = 5,
     JOIN_ROOM = 6,
     LEAVE_ROOM = 7,
-    OWNERSHIP_ENTITY_CHANGED = 8,
-    OWNERSHIP_ROOM_CHANGED= 9,
+    OWNERSHIP_ROOM_CHANGED = 9,
     JOIN_SUCCESS = 10,
     JOIN_FAILED = 11,
-    LOAD_SCENE = 12,
-    SCENE_LOADED = 13,
     PLAYER_JOINED = 14,
     PLAYER_LEAVED = 15,
-    CREATE_ENTITY = 16,
-    REMOVE_ENTITY = 17,
-    SNAPSHOT = 18,
-    REPLICATE_ENTITY_STATE = 19,
-    REPLICATE_ENTITY_EVENT = 20,
-    REPLICATE_RAW_DATA = 21,
     REPLICATE_ROOM_EVENT = 22,
     TRANSFER_ROOM_OWNERSHIP = 23,
-    TRANSFER_ENTITY_OWNERSHIP = 24,
     TIMESTAMP_SYNCHRONIZATION = 25,
     ROOM_LIST_UPDATED = 26,
     PLAYER_DATA_UPDATED = 27,

Ragon.Protocol/Sources/RagonRoomParameters.cs

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

Ragon.Protocol/Sources/RagonSerializable.cs

@@ -19,7 +19,7 @@ namespace Ragon.Protocol
 {
   public interface IRagonSerializable
   {
-    public void Serialize(RagonBuffer buffer);
-    public void Deserialize(RagonBuffer buffer);
+    public void Serialize(RagonStream buffer);
+    public void Deserialize(RagonStream buffer);
   }
 }

Ragon.Relay/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
 
 WORKDIR /App
 
@@ -7,7 +7,7 @@ COPY . ./
 RUN dotnet restore
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/runtime:9.0
+FROM mcr.microsoft.com/dotnet/runtime:7.0
 
 WORKDIR /App
 

Ragon.Relay/Ragon.Relay.csproj

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

Ragon.Relay/Sources/Command/KickPlayerCommand.cs

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

Ragon.Relay/Sources/Plugin/RelayRoomPlugin.cs

@@ -1,8 +1,5 @@
 using System;
-using Ragon.Server;
-using Ragon.Server.Entity;
 using Ragon.Server.Plugin;
-using Ragon.Server.Room;
 
 namespace Ragon.Relay;
 
@@ -12,26 +9,15 @@ public class RelayRoomPlugin: BaseRoomPlugin
   {
     
   }
-
   public void OnAttached()
   {
     Console.WriteLine("Room attached");
+    
+    
   }
 
   public void OnDetached()
   {
     Console.WriteLine("Room detached");
   }
-
-  public bool OnEntityCreate(RagonRoomPlayer creator, RagonEntity entity)
-  {
-    Console.WriteLine($"Entity created: {entity.Id}");
-    return true;
-  }
-
-  public bool OnEntityRemove(RagonRoomPlayer destroyer, RagonEntity entity)
-  {
-    Console.WriteLine($"Entity destroyed: {entity.Id}");
-    return true;
-  }
 }

Ragon.Relay/Sources/Plugin/RelayServerPlugin.cs

@@ -1,26 +1,37 @@
-using System;
-using Newtonsoft.Json;
 using Ragon.Server;
+using Ragon.Server.Lobby;
 using Ragon.Server.Plugin;
+using Ragon.Server.Time;
 
 namespace Ragon.Relay
 {
-
   public class RelayServerPlugin : BaseServerPlugin
   {
-    public override bool OnCommand(string command, string payload)
+    private RelayConfiguration _relayConfiguration;
+    private RagonScheduler _scheduler;
+    private RagonConnectionRegistry _connectionRegistry;
+    private IRagonLobby _lobby;
+    private Reporter _reporter;
+
+    public RelayServerPlugin(RelayConfiguration config)
     {
-      Console.WriteLine(command);
-      if (command == "kick-player")
-      {
-        var commandPayload = JsonConvert.DeserializeObject<KickPlayerCommand>(payload);
-        var player = Server.GetContextById(commandPayload.Id);
-        if (player != null)
-          player.Connection.Close();
-        else
-          Console.WriteLine($"Player not found with Id {commandPayload.Id}");
+      _relayConfiguration = config;
     }
 
+    public override void OnAttached(IRagonServer server)
+    {
+      base.OnAttached(server);
+      
+      _lobby = server.Lobby;
+      _connectionRegistry = server.ConnectionRegistry;
+      _scheduler = server.Scheduler;
+      _reporter = new Reporter(_relayConfiguration, server, "127.0.0.1", 5000);
+
+      server.Scheduler.Run(new RagonActionTimer(() => _reporter.Done(), 1, -1));
+    }
+
+    public override bool OnCommand(string command, string payload)
+    {
       return true;
     }
 

Ragon.Relay/Sources/Relay.cs

@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-using System;
 using System.IO;
 using System.Threading;
 using Newtonsoft.Json;
 using Ragon.Server;
-using Ragon.Server.ENetServer;
 using Ragon.Server.IO;
 using Ragon.Server.Logging;
 using Ragon.Server.Plugin;
 using Ragon.Server.WebSocketServer;
+using Ragon.Transport;
 
 namespace Ragon.Relay
 {
@@ -69,7 +68,7 @@ namespace Ragon.Relay
       };
       
       var relay = new RagonServer(networkServer, plugin, serverConfiguration);
-      relay.Start();
+      relay.Listen();
       while (relay.IsRunning)
       {
         relay.Tick();

Ragon.Relay/Sources/Reporter/Client.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Net;
+using System.Net.Sockets;
+using Ragon.Server.Logging;
+
+namespace Ragon.Relay;
+
+public class Client
+{
+  private readonly UdpClient _udpClient;
+  private readonly IPEndPoint _endpoint;
+  private readonly IRagonLogger _logger;
+  
+  public Client(string host, int port)
+  {
+    _logger = LoggerManager.GetLogger("Client");
+    _udpClient = new UdpClient();
+    _endpoint = new IPEndPoint(IPAddress.Parse(host), port);
+  }
+  
+  public void Send(byte[] data)
+  {
+    try
+    {
+      _udpClient.BeginSend(data, data.Length, _endpoint, SendCallback, null);
+    }
+    catch (Exception ex)
+    {
+      _logger.Error(ex.Message);
+    }
+  }
+
+  private void SendCallback(IAsyncResult ar)
+  {
+    try
+    {
+      _udpClient.EndSend(ar);
+    }
+    catch (Exception ex)
+    {
+      _logger.Error(ex.Message);
+    }
+  }
+}

Ragon.Relay/Sources/Reporter/Reporter.cs

@@ -0,0 +1,56 @@
+using Google.Protobuf;
+using Google.Protobuf.Collections;
+using Ragon.Server;
+
+namespace Ragon.Relay;
+
+public class Reporter
+{
+  private readonly Client _client;
+  private readonly IRagonServer _server;
+  private readonly RelayConfiguration _configuration;
+
+  public Reporter(
+    RelayConfiguration relayConfiguration,
+    IRagonServer server,
+    string host,
+    int port
+  )
+  {
+    _client = new Client(host, port);
+    _server = server;
+    _configuration = relayConfiguration;
+  }
+
+  public void Done()
+  {
+    for (var i = 0; i < 10; i++)
+    {
+      var message = new Data();
+      message.Statistics = new Statistics()
+      {
+        Connections = _server.ConnectionRegistry.Contexts.Count,
+        ConnectionsLimit = _configuration.LimitConnections,
+        Rooms = _server.Lobby.Rooms.Count,
+        RoomsLimit = _configuration.LimitRooms,
+      };
+
+      var room = new Room()
+      {
+        Id = $"Room ID {i}",
+      };
+
+      for (var j = 0; j < 10; j++)
+      {
+        room.Players.Add(new Player()
+        {
+          Id = $"Player ID {i}",
+        });
+      }
+
+      message.Room = room;
+
+      _client.Send(message.ToByteArray());
+    }
+  }
+}

Ragon.Relay/Sources/Transport/ENet/ENetConnection.cs

@@ -17,7 +17,7 @@
 using ENet;
 using Ragon.Server.IO;
 
-namespace Ragon.Server.ENetServer;
+namespace Ragon.Transport;
 
 public sealed class ENetConnection: INetworkConnection
 {

Ragon.Relay/Sources/Transport/ENet/ENetReliableChannel.cs

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-using System.Net;
+
 using ENet;
 using Ragon.Protocol;
 using Ragon.Server.IO;
 
-namespace Ragon.Server.ENetServer;
+namespace Ragon.Transport;
 
 public sealed class ENetReliableChannel: INetworkChannel
 {
@@ -42,12 +42,12 @@ public sealed class ENetReliableChannel: INetworkChannel
     _peer.Send(_channelId, ref newPacket);
   }
 
-  public void Send(RagonBuffer buffer)
+  public void Send(RagonStream buffer)
   {
-    buffer.ToArray(_data);
+    _data = buffer.ToArray();
     
     var newPacket = new Packet();
-    newPacket.Create(_data, buffer.Length, PacketFlags.Reliable);
+    newPacket.Create(_data, _data.Length, PacketFlags.Reliable);
     
     _peer.Send(_channelId, ref newPacket);
   }

Ragon.Relay/Sources/Transport/ENet/ENetServer.cs

@@ -0,0 +1,141 @@
+/*
+ * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using ENet;
+using Ragon.Protocol;
+using Ragon.Server.IO;
+using Ragon.Server.Logging;
+
+namespace Ragon.Transport;
+
+public sealed class ENetServer : INetworkServer
+{
+  private readonly Host _host = new();
+  private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(ENetServer));
+
+  private ENetConnection[] _connections = Array.Empty<ENetConnection>();
+  private INetworkListener _listener;
+  private uint _protocol;
+  private Event _event;
+
+  public void Listen(INetworkListener listener, NetworkConfiguration configuration)
+  {
+    Library.Initialize();
+
+    _connections = new ENetConnection[configuration.LimitConnections];
+
+    _listener = listener;
+    _protocol = configuration.Protocol;
+
+    var address = new Address
+    {
+      Port = (ushort)configuration.Port,
+    };
+
+    _host.Create(address, _connections.Length, 2, 0, 0, 1024 * 1024);
+
+    var protocolDecoded = RagonVersion.Parse(_protocol);
+    _logger.Info($"Listen at {configuration.Address}:{configuration.Port}");
+    _logger.Info($"Protocol: {protocolDecoded}");
+  }
+
+  public void Update()
+  {
+    bool polled = false;
+    while (!polled)
+    {
+      if (_host.CheckEvents(out _event) <= 0)
+      {
+        if (_host.Service(0, out _event) <= 0)
+          break;
+
+        polled = true;
+      }
+
+      switch (_event.Type)
+      {
+        case EventType.None:
+        {
+          _logger.Trace("None event");
+          break;
+        }
+        case EventType.Connect:
+        {
+          if (!IsValidProtocol(_event.Data))
+          {
+            _logger.Warning(
+              $"Mismatched protocol Server: {RagonVersion.Parse(_protocol)} Client: {RagonVersion.Parse(_event.Data)}, close connection");
+            _event.Peer.DisconnectNow(0);
+            break;
+          }
+
+          var connection = new ENetConnection(_event.Peer);
+
+          _connections[_event.Peer.ID] = connection;
+          _listener.OnConnected(connection);
+          break;
+        }
+        case EventType.Disconnect:
+        {
+          var connection = _connections[_event.Peer.ID];
+          _listener.OnDisconnected(connection);
+          break;
+        }
+        case EventType.Timeout:
+        {
+          var connection = _connections[_event.Peer.ID];
+          _listener.OnTimeout(connection);
+          break;
+        }
+        case EventType.Receive:
+        {
+          var peerId = (ushort)_event.Peer.ID;
+          var connection = _connections[peerId];
+          var dataRaw = new byte[_event.Packet.Length];
+
+          _event.Packet.CopyTo(dataRaw);
+          _event.Packet.Dispose();
+
+          _listener.OnData(connection, (NetworkChannel)_event.ChannelID, dataRaw);
+          break;
+        }
+      }
+    }
+  }
+
+  public void Broadcast(byte[] data, NetworkChannel channel)
+  {
+    var packet = new Packet();
+    var flag = channel == NetworkChannel.RELIABLE ? PacketFlags.Reliable : PacketFlags.None;
+
+    packet.Create(data, flag);
+
+    _host.Broadcast((byte)channel, ref packet);
+  }
+
+  public void Stop()
+  {
+    _host?.Dispose();
+
+    Library.Deinitialize();
+  }
+
+  private bool IsValidProtocol(uint protocol)
+  {
+    return protocol == _protocol;
+  }
+}

Ragon.Relay/Sources/Transport/ENet/ENetUnreliableChannel.cs

@@ -18,7 +18,7 @@ using ENet;
 using Ragon.Protocol;
 using Ragon.Server.IO;
 
-namespace Ragon.Server.ENetServer;
+namespace Ragon.Transport;
 
 public sealed class ENetUnreliableChannel: INetworkChannel
 {
@@ -40,12 +40,12 @@ public sealed class ENetUnreliableChannel: INetworkChannel
     _peer.Send(_channelId, ref newPacket);
   }
   
-  public void Send(RagonBuffer buffer)
+  public void Send(RagonStream buffer)
   {
-    buffer.ToArray(_data);
+    _data = buffer.ToArray();
     
     var newPacket = new Packet();
-    newPacket.Create(_data, buffer.Length, PacketFlags.None);
+    newPacket.Create(_data, _data.Length, PacketFlags.None);
     
     _peer.Send(_channelId, ref newPacket);
   }

Ragon.Relay/Sources/Transport/WebSocket/Executor/Executor.cs

@@ -14,18 +14,21 @@
  * limitations under the License.
  */
 
+using System;
+using System.Collections.Generic;
 using System.Threading.Channels;
+using System.Threading.Tasks;
 
 namespace Ragon.Server.IO;
 
-public class Executor : TaskScheduler, IExecutor
+public class Executor : TaskScheduler
 {
   private readonly ChannelReader<Task> _reader;
   private readonly ChannelWriter<Task> _writer;
   private readonly Queue<Task> _pendingTasks;
   private readonly TaskFactory _taskFactory;
 
-  public Task Run(Action action, TaskCreationOptions task = TaskCreationOptions.None)
+  public Task Run(Action action, TaskCreationOptions task)
   {
     return _taskFactory.StartNew(action, task);
   }

Ragon.Relay/Sources/Transport/WebSocket/WebSocketConnection.cs

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
+using System;
 using System.Net.WebSockets;
+using System.Threading;
+using System.Threading.Tasks;
 using Ragon.Server.IO;
 using Ragon.Server.Logging;
 

Ragon.Relay/Sources/Transport/WebSocket/WebSocketReliableChannel.cs

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
+using System.Collections.Generic;
 using System.Net.WebSockets;
+using System.Threading;
+using System.Threading.Tasks;
 using Ragon.Protocol;
 using Ragon.Server.IO;
 
@@ -36,7 +39,7 @@ public class WebSocketReliableChannel : INetworkChannel
         _queue.Enqueue(data);
     }
 
-    public void Send(RagonBuffer buffer)
+    public void Send(RagonStream buffer)
     {
         var sendData = buffer.ToArray();
         _queue.Enqueue(sendData);

Ragon.Relay/Sources/Transport/WebSocket/WebSocketServer.cs

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+using System;
 using System.Buffers;
+using System.Collections.Generic;
 using System.Net;
 using System.Net.WebSockets;
+using System.Threading;
 using Ragon.Protocol;
 using Ragon.Server.IO;
 using Ragon.Server.Logging;
@@ -43,7 +46,7 @@ public class WebSocketServer : INetworkServer
     _executor = new Executor();
   }
   
-  public async ValueTask StartAccept(CancellationToken cancellationToken)
+  public async void StartAccept(CancellationToken cancellationToken)
   {
     while (!cancellationToken.IsCancellationRequested)
     {
@@ -73,11 +76,11 @@ public class WebSocketServer : INetworkServer
       
       _connections[connection.Id] = connection;
       
-      _ = StartListen(connection, cancellationToken);
+      StartListen(connection, cancellationToken);
     }
   }
 
-  async ValueTask StartListen(WebSocketConnection connection, CancellationToken cancellationToken)
+  async void StartListen(WebSocketConnection connection, CancellationToken cancellationToken)
   {
     _activeConnections.Add(connection);
     _networkListener.OnConnected(connection);
@@ -125,7 +128,7 @@ public class WebSocketServer : INetworkServer
   {
     _executor.Update();
     
-    _ = Flush();
+    Flush();
   }
 
   public void Broadcast(byte[] data, NetworkChannel channel)
@@ -134,7 +137,7 @@ public class WebSocketServer : INetworkServer
       activeConnection.Reliable.Send(data);    
   }
 
-  public async ValueTask Flush()
+  public async void Flush()
   {
     foreach (var conn in _activeConnections)
       await conn.Flush();
@@ -160,8 +163,6 @@ public class WebSocketServer : INetworkServer
     _httpListener.Prefixes.Add($"http://{configuration.Address}:{configuration.Port}/");
     _httpListener.Start();
 
-    _executor.Run(() => StartAccept(_cancellationTokenSource.Token));
-
     var protocolDecoded = RagonVersion.Parse(configuration.Protocol);
     _logger.Info($"Listen at http://{configuration.Address}:{configuration.Port}/");
     _logger.Info($"Protocol: {protocolDecoded}");

Ragon.Relay/relay.config.json

@@ -10,6 +10,5 @@
   "limitRooms": 200,
   "limitBufferedEvents": 50,
   "limitUserDataSize": 1024,
-  "limitPropertySize": 512,
-  "limitConnectionsPerProject": 100
+  "limitPropertySize": 512
 }

Ragon.Server.ENetServer/Ragon.Server.ENetServer.csproj

@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <RootNamespace>Ragon.ENet</RootNamespace>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Copyright>Eduard Kargin</Copyright>
-        <Authors>Eduard Kargin</Authors>
-        <Version>1.4.0</Version>
-        <Title>Ragon Server ENet</Title>
-        <Description>Ragon Server ENet transport</Description>
-        <PackageProjectUrl>https://ragon.io</PackageProjectUrl>
-        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-        <RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
-        <RepositoryType>Source</RepositoryType>
-        <TargetFramework>net9.0</TargetFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <PackageReference Include="ENet-CSharp" Version="2.4.8" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Ragon.Server\Ragon.Server.csproj" />
-    </ItemGroup>
-
-</Project>

Ragon.Server.ENetServer/Sources/ENetServer.cs

@@ -1,141 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using ENet;
-using Ragon.Protocol;
-using Ragon.Server.IO;
-using Ragon.Server.Logging;
-
-namespace Ragon.Server.ENetServer
-{
-  public sealed class ENetServer : INetworkServer
-  {
-
-    private readonly Host _host = new();
-    private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(ENetServer));
-
-    private ENetConnection[] _connections = Array.Empty<ENetConnection>();
-    private INetworkListener _listener;
-    private uint _protocol;
-    private ENet.Event _event;
-
-    public void Listen(INetworkListener listener, NetworkConfiguration configuration)
-    {
-      Library.Initialize();
-
-      _connections = new ENetConnection[configuration.LimitConnections];
-
-      _listener = listener;
-      _protocol = configuration.Protocol;
-
-      var address = new Address
-      {
-        Port = (ushort)configuration.Port,
-      };
-
-      _host.Create(address, _connections.Length, 2, 0, 0, 1024 * 1024);
-
-      var protocolDecoded = RagonVersion.Parse(_protocol);
-      _logger.Info($"Listen at {configuration.Address}:{configuration.Port}");
-      _logger.Info($"Protocol: {protocolDecoded}");
-    }
-
-    public void Update()
-    {
-      bool polled = false;
-      while (!polled)
-      {
-        if (_host.CheckEvents(out _event) <= 0)
-        {
-          if (_host.Service(0, out _event) <= 0)
-            break;
-
-          polled = true;
-        }
-
-        switch (_event.Type)
-        {
-          case EventType.None:
-          {
-            _logger.Trace("None event");
-            break;
-          }
-          case EventType.Connect:
-          {
-            if (!IsValidProtocol(_event.Data))
-            {
-              _logger.Warning($"Mismatched protocol Server: {RagonVersion.Parse(_protocol)} Client: {RagonVersion.Parse(_event.Data)}, close connection");
-              _event.Peer.DisconnectNow(0);
-              break;
-            }
-
-            var connection = new ENetConnection(_event.Peer);
-
-            _connections[_event.Peer.ID] = connection;
-            _listener.OnConnected(connection);
-            break;
-          }
-          case EventType.Disconnect:
-          {
-            var connection = _connections[_event.Peer.ID];
-            _listener.OnDisconnected(connection);
-            break;
-          }
-          case EventType.Timeout:
-          {
-            var connection = _connections[_event.Peer.ID];
-            _listener.OnTimeout(connection);
-            break;
-          }
-          case EventType.Receive:
-          {
-            var peerId = (ushort)_event.Peer.ID;
-            var connection = _connections[peerId];
-            var dataRaw = new byte[_event.Packet.Length];
-
-            _event.Packet.CopyTo(dataRaw);
-            _event.Packet.Dispose();
-
-            _listener.OnData(connection, (NetworkChannel)_event.ChannelID, dataRaw);
-            break;
-          }
-        }
-      }
-    }
-
-    public void Broadcast(byte[] data, NetworkChannel channel)
-    {
-      var packet = new Packet();
-      var flag = channel == NetworkChannel.RELIABLE? PacketFlags.Reliable: PacketFlags.None;
-      
-      packet.Create(data, flag);
-
-      _host.Broadcast((byte)channel, ref packet);
-    }
-    
-    public void Stop()
-    {
-      _host?.Dispose();
-
-      Library.Deinitialize();
-    }
-
-    private bool IsValidProtocol(uint protocol)
-    {
-      return protocol == _protocol;
-    }
-  }
-}

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

@@ -4,6 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Ragon.WebSockets</RootNamespace>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <Copyright>Eduard Kargin</Copyright>
         <Authors>Eduard Kargin</Authors>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -14,11 +15,14 @@
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
         <RepositoryType>Source</RepositoryType>
-        <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\Ragon.Server\Ragon.Server.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Sources\" />
+    </ItemGroup>
+
 </Project>

Ragon.Server.WebSocketServer/Sources/Executor/IExecutor.cs

@@ -1,22 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Ragon.Server.IO;
-
-public interface IExecutor
-{
-  public Task Run(Action action, TaskCreationOptions task = TaskCreationOptions.None);
-}

Ragon.Server/Ragon.Server.csproj

@@ -14,7 +14,7 @@
         <RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
         <RepositoryType>Source</RepositoryType>
         <LangVersion>10</LangVersion>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

Ragon.Server/Sources/Data/RagonData.cs

@@ -12,28 +12,16 @@ public class RagonData
   {
   }
 
-  public void Read(RagonBuffer buffer, int maxSize = 0)
+  public void Read(RagonStream buffer)
   {
     var len = buffer.ReadUShort();
-    var totalSize = 0;
-
     for (int i = 0; i < len; i++)
     {
       var key = buffer.ReadString();
       var valueSize = buffer.ReadUShort();
-
-      if (maxSize > 0)
-      {
-        totalSize += valueSize;
-        if (totalSize > maxSize)
-        {
-          throw new InvalidOperationException($"User data exceeds limit: {totalSize} > {maxSize}");
-        }
-      }
-
       if (valueSize > 0)
       {
-        var value = buffer.ReadBytes(valueSize);
+        var value = buffer.ReadBinary(valueSize);
         _data[key] = value;
       }
       else
@@ -43,14 +31,14 @@ public class RagonData
     }
   }
 
-  public void Write(RagonBuffer buffer)
+  public void Write(RagonStream buffer)
   {
     buffer.WriteUShort((ushort)_data.Count);
     foreach (var prop in _data)
     {
       buffer.WriteString(prop.Key);
       buffer.WriteUShort((ushort)prop.Value.Length);
-      buffer.WriteBytes(prop.Value);
+      buffer.WriteBinary(prop.Value);
     }
 
     var toDelete = _data
@@ -63,14 +51,16 @@ public class RagonData
     IsDirty = false;
   }
 
-  public void Snapshot(RagonBuffer buffer)
+  public void Snapshot(RagonStream buffer)
   {
     buffer.WriteUShort((ushort)_data.Count);
     foreach (var prop in _data)
     {
       buffer.WriteString(prop.Key);
       buffer.WriteUShort((ushort)prop.Value.Length);
-      buffer.WriteBytes(prop.Value);
+      buffer.WriteBinary(prop.Value);
+      
+      Console.WriteLine($"Key: {prop.Key} Value: {prop.Value.Length}");
     }
   }
 }

Ragon.Server/Sources/Entity/IRagonEntity.cs

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

Ragon.Server/Sources/Entity/IRagonEntityState.cs

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

Ragon.Server/Sources/Entity/RagonEntity.cs

@@ -1,246 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-using Ragon.Server.Event;
-using Ragon.Server.Room;
-
-namespace Ragon.Server.Entity;
-
-public class RagonEntity : IRagonEntity
-{
-  private static ushort _idGenerator = 100;
-  public ushort Id { get; private set; }
-  public ushort Type { get; private set; }
-  public ushort StaticId { get; private set; }
-  public ushort AttachId { get; private set; }
-  public RagonRoomPlayer Owner { get; private set; }
-  public RagonAuthority Authority { get; private set; }
-  public RagonPayload Payload { get; private set; }
-  public IRagonEntityState State => _state;
-
-  private readonly List<RagonEvent> _bufferedEvents;
-  private readonly int _limitBufferedEvents;
-  private readonly RagonEntityState _state;
-
-  public RagonEntity(RagonEntityParameters parameters)
-  {
-    Id = _idGenerator++;
-
-    StaticId = parameters.StaticId;
-    Type = parameters.Type;
-    AttachId = parameters.AttachId;
-    Authority = parameters.Authority;
-    Payload = new RagonPayload();
-
-    _state = new RagonEntityState(this);
-    _bufferedEvents = new List<RagonEvent>();
-    _limitBufferedEvents = parameters.BufferedEvents;
-  }
-
-  public void Attach(RagonRoomPlayer owner)
-  {
-    Owner = owner;
-  }
-
-  public void Detach()
-  {
-  }
-
-  public void RestoreBufferedEvents(RagonRoomPlayer roomPlayer, RagonBuffer writer)
-  {
-    foreach (var evnt in _bufferedEvents)
-    {
-      writer.Clear();
-      writer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
-      writer.WriteUShort(evnt.EventCode);
-      writer.WriteUShort(evnt.Invoker.Connection.Id);
-      writer.WriteByte((byte)RagonReplicationMode.Server);
-      writer.WriteUShort(Id);
-
-      evnt.Write(writer);
-
-      var sendData = writer.ToArray();
-      roomPlayer.Connection.Reliable.Send(sendData);
-    }
-  }
-
-  public void Create()
-  {
-    var room = Owner.Room;
-    var buffer = room.Writer;
-
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.CREATE_ENTITY);
-    buffer.WriteUShort(AttachId);
-    buffer.WriteUShort(Type);
-    buffer.WriteUShort(Id);
-    buffer.WriteUShort(Owner.Connection.Id);
-
-    Payload.Write(buffer);
-
-    var sendData = buffer.ToArray();
-    foreach (var player in room.ReadyPlayersList)
-      player.Connection.Reliable.Send(sendData);
-  }
-
-  public void Destroy()
-  {
-    var room = Owner.Room;
-    var buffer = room.Writer;
-
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.REMOVE_ENTITY);
-    buffer.WriteUShort(Id);
-
-    Payload.Write(buffer);
-
-    var sendData = buffer.ToArray();
-    foreach (var player in room.ReadyPlayersList)
-      player.Connection.Reliable.Send(sendData);
-  }
-
-  public void Snapshot(RagonBuffer buffer)
-  {
-    buffer.WriteUShort(Type);
-    buffer.WriteUShort(Id);
-
-    if (StaticId != 0)
-      buffer.WriteUShort(StaticId);
-
-    buffer.WriteUShort(Owner.Connection.Id);
-    buffer.WriteUShort(Payload.Size);
-
-    Payload.Write(buffer);
-
-    _state.Snapshot(buffer);
-  }
-
-  public void ReplicateEvent(
-    RagonRoomPlayer invoker,
-    RagonEvent evnt,
-    RagonReplicationMode eventMode,
-    RagonRoomPlayer targetPlayer
-  )
-  {
-    if (Authority == RagonAuthority.OwnerOnly && invoker.Connection.Id != Owner.Connection.Id)
-    {
-      return;
-    }
-
-    var room = Owner.Room;
-    var buffer = room.Writer;
-    
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
-    buffer.WriteUShort(evnt.EventCode);
-    buffer.WriteUShort(invoker.Connection.Id);
-    buffer.WriteByte((byte)eventMode);
-    buffer.WriteUShort(Id);
-
-    evnt.Write(buffer);
-
-    var sendData = buffer.ToArray();
-    targetPlayer.Connection.Reliable.Send(sendData);
-  }
-
-  public void ReplicateEvent(
-    RagonRoomPlayer invoker,
-    RagonEvent evnt,
-    RagonReplicationMode eventMode,
-    RagonTarget targetMode
-  )
-  {
-    if (Authority == RagonAuthority.OwnerOnly && invoker.Connection.Id != Owner.Connection.Id)
-    {
-      return;
-    }
-
-    if (eventMode == RagonReplicationMode.Buffered && targetMode != RagonTarget.Owner && _bufferedEvents.Count < _limitBufferedEvents)
-    {
-      _bufferedEvents.Add(evnt);
-    }
-
-    var room = Owner.Room;
-    var buffer = room.Writer;
-
-    buffer.Clear();
-    buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
-    buffer.WriteUShort(evnt.EventCode);
-    buffer.WriteUShort(invoker.Connection.Id);
-    buffer.WriteByte((byte)eventMode);
-    buffer.WriteUShort(Id);
-
-    evnt.Write(buffer);
-
-    var sendData = buffer.ToArray();
-    switch (targetMode)
-    {
-      case RagonTarget.Owner:
-      {
-        Owner.Connection.Reliable.Send(sendData);
-        break;
-      }
-      case RagonTarget.ExceptOwner:
-      {
-        foreach (var roomPlayer in room.ReadyPlayersList)
-        {
-          if (roomPlayer.Connection.Id != Owner.Connection.Id)
-            roomPlayer.Connection.Reliable.Send(sendData);
-        }
-
-        break;
-      }
-      case RagonTarget.ExceptInvoker:
-      {
-        foreach (var roomPlayer in room.ReadyPlayersList)
-        {
-          if (roomPlayer.Connection.Id != invoker.Connection.Id)
-            roomPlayer.Connection.Reliable.Send(sendData);
-        }
-
-        break;
-      }
-      case RagonTarget.All:
-      {
-        foreach (var roomPlayer in room.ReadyPlayersList)
-          roomPlayer.Connection.Reliable.Send(sendData);
-        break;
-      }
-    }
-  }
-
-  public void AddProperty(RagonProperty property)
-  {
-    _state.AddProperty(property);
-  }
-
-  public void WriteState(RagonBuffer writer)
-  {
-    _state.Write(writer);
-  }
-
-  public bool TryReadState(RagonRoomPlayer player, RagonBuffer reader)
-  {
-    if (Owner.Connection.Id != player.Connection.Id)
-      return false;
-
-    _state.Read(reader);
-
-    return true;
-  }
-}

Ragon.Server/Sources/Entity/RagonEntityParameters.cs

@@ -1,28 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Server.Entity;
-
-public ref struct RagonEntityParameters
-{
-  public ushort Type;
-  public ushort StaticId;
-  public ushort AttachId;
-  public RagonAuthority Authority;
-  public int BufferedEvents;
-}

Ragon.Server/Sources/Entity/RagonEntityState.cs

@@ -1,77 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Server.Entity;
-
-public class RagonEntityState: IRagonEntityState
-{
-  private readonly List<RagonProperty> _properties;
-  private readonly RagonEntity _entity;
-
-  public RagonEntityState(RagonEntity entity, int capacity = 10)
-  {
-    _entity = entity;
-    _properties = new List<RagonProperty>(capacity);
-  }
-
-  public void AddProperty(RagonProperty property)
-  {
-    _properties.Add(property);
-  }
-
-  public void Write(RagonBuffer buffer)
-  {
-    buffer.WriteUShort(_entity.Id);
-    foreach (var property in _properties)
-    {
-      if (property.IsDirty)
-      {
-        buffer.WriteBool(true);
-        property.Write(buffer);
-        property.Clear();
-        continue;
-      }
-
-      buffer.WriteBool(false);
-    }
-  }
-
-  public void Read(RagonBuffer buffer)
-  {
-    foreach (var property in _properties)
-    {
-      if (buffer.ReadBool())
-        property.Read(buffer);
-    }
-  }
-
-  public void Snapshot(RagonBuffer buffer)
-  {
-    foreach (var property in _properties)
-    {
-      if (property.HasData)
-      {
-        buffer.WriteBool(true);
-        property.Write(buffer);
-        continue;
-      }
-      
-      buffer.WriteBool(false);
-    }
-  }
-}

Ragon.Server/Sources/Entity/RagonPayload.cs

@@ -1,40 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-
-namespace Ragon.Server.Entity;
-
-public class RagonPayload
-{
-  private uint[] _data = new uint[128];
-  private int _size = 0;
-  
-  public ushort Size => (ushort) _size;
-
-  public void Read(RagonBuffer buffer)
-  {
-    _size = buffer.Capacity;
-    buffer.ReadArray(_data, _size);
-  }
-
-  public void Write(RagonBuffer buffer)
-  {
-    if (_size == 0) return;
-    buffer.WriteArray(_data, _size);
-  }
-}

Ragon.Server/Sources/Entity/RagonProperty.cs

@@ -1,76 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-
-namespace Ragon.Server.Entity;
-
-public class RagonProperty : RagonPayload
-{
-  public int Size { get; set; }
-  public bool IsDirty { get; private set; }
-  public bool IsFixed { get; private set; }
-  public bool HasData { get; private set; }
-
-  private uint[] _data;
-
-  public RagonProperty(int size, bool isFixed, int limit)
-  {
-    Size = size;
-    IsFixed = isFixed;
-    IsDirty = false;
-    
-    _data = new uint[limit / 4 + 1]; 
-  }
-
-  public void Read(RagonBuffer buffer)
-  {
-    if (IsFixed)
-    {
-      buffer.ReadArray(_data, Size);
-    }
-    else
-    {
-      Size = (int) buffer.Read();
-      buffer.ReadArray(_data, Size);
-    }
-    
-    HasData = true;
-    IsDirty = true;
-  }
-
-  public void Write(RagonBuffer buffer)
-  {
-    if (IsFixed)
-    {
-      buffer.WriteArray(_data, Size);
-      return;
-    }
-    
-    buffer.Write((ushort) Size);
-    buffer.WriteArray(_data, Size);
-  }
-
-  public void Clear()
-  {
-    IsDirty = false;
-  }
-  
-  public void Dump()
-  {
-    Console.WriteLine( $"[{Size.ToString("00")}] {string.Join("", _data.Take(8).Reverse().Select(b => Convert.ToString(b, 2).PadLeft(32, '0')))}");
-  }
-}

Ragon.Server/Sources/Event/RagonEvent.cs

@@ -23,7 +23,7 @@ public class RagonEvent
 {
   public RagonRoomPlayer Invoker { get; private set; }
   public ushort EventCode { get; private set; }
-  public ushort Size => (ushort) _size;
+  public ushort Size => (ushort)_size;
 
   private uint[] _data = new uint[128];
   private int _size = 0;
@@ -37,15 +37,15 @@ public class RagonEvent
     EventCode = eventCode;
   }
 
-  public void Read(RagonBuffer buffer)
+  public void Read(RagonStream buffer)
   {
-    _size = buffer.Capacity;
-    buffer.ReadArray(_data, _size);
+                // _size = buffer.Capacity;
+                // buffer.ReadArray(_data, _size);
   }
 
-  public void Write(RagonBuffer buffer)
+  public void Write(RagonStream buffer)
   {
-    if (_size <= 0) return;
-    buffer.WriteArray(_data, _size);
+    // if (_size <= 0) return;
+    // buffer.WriteArray(_data, _size);
   }
 }

Ragon.Server/Sources/Handler/AuthorizationOperation.cs

@@ -19,7 +19,6 @@ using Ragon.Server.IO;
 using Ragon.Server.Lobby;
 using Ragon.Server.Logging;
 using Ragon.Server.Plugin;
-using Ragon.Server.Project;
 
 namespace Ragon.Server.Handler
 {
@@ -30,23 +29,20 @@ namespace Ragon.Server.Handler
     private readonly IRagonServer _server;
     private readonly RagonContextObserver _observer;
     private readonly RagonServerConfiguration _configuration;
-    private readonly RagonBuffer _writer;
-    private readonly ProjectRegistry _projectRegistry;
+    private readonly RagonStream _writer;
 
-    public AuthorizationOperation(RagonBuffer reader,
-      RagonBuffer writer,
+    public AuthorizationOperation(RagonStream reader,
+      RagonStream writer,
       IRagonServer server,
       IServerPlugin serverPlugin,
       RagonContextObserver observer,
-      RagonServerConfiguration configuration,
-      ProjectRegistry projectRegistry) : base(reader, writer)
+      RagonServerConfiguration configuration) : base(reader, writer)
     {
       _serverPlugin = serverPlugin;
       _configuration = configuration;
       _observer = observer;
       _writer = writer;
       _server = server;
-      _projectRegistry = projectRegistry;
     }
 
     public override void Handle(RagonContext context, NetworkChannel channel)
@@ -63,45 +59,31 @@ namespace Ragon.Server.Handler
         return;
       }
 
-      var projectKey = Reader.ReadString();
+      var configuration = _configuration;
+      var key = Reader.ReadString();
       var name = Reader.ReadString();
       var payload = Reader.ReadString();
 
-      if (!_projectRegistry.ValidateKey(projectKey))
+      if (key == configuration.ServerKey)
       {
-        _logger.Warning($"Invalid project key from connection {context.Connection.Id}");
-        Reject(context);
-        return;
-      }
-
-      if (!_projectRegistry.CanConnect(projectKey))
-      {
-        _logger.Warning($"Connection limit reached for project key: {projectKey}");
-        Reject(context);
-        return;
-      }
-
         var authorizeViaPlugin = _serverPlugin.OnAuthorize(new ConnectionRequest(_server, context.Connection.Id, payload));
         if (authorizeViaPlugin)
           return;
 
-      var project = _projectRegistry.GetOrCreateProject(projectKey);
-      if (project == null)
-      {
-        _logger.Warning($"Failed to create project for key: {projectKey}");
-        Reject(context);
-        return;
-      }
-
         var id = Guid.NewGuid().ToString();
-      Approve(context, new ConnectionResponse(id, name, payload), project.Id);
+        Approve(context, new ConnectionResponse(id, name, payload));
+      }
+      else
+      {
+        _logger.Warning($"Invalid key for connection {context.Connection.Id}");
         
-      _projectRegistry.RegisterConnection(project.Id);
+        Reject(context);
+      }
     }
 
-    public void Approve(RagonContext context, ConnectionResponse result, int projectId)
+    public void Approve(RagonContext context, ConnectionResponse result)
     {
-      var lobbyPlayer = new RagonLobbyPlayer(context.Connection, result.Id, result.Name, result.Payload, projectId);
+      var lobbyPlayer = new RagonLobbyPlayer(context.Connection, result.Id, result.Name, result.Payload);
       context.SetPlayer(lobbyPlayer);
       context.ConnectionStatus = ConnectionStatus.Authorized;
 
@@ -120,7 +102,7 @@ namespace Ragon.Server.Handler
       var sendData = _writer.ToArray();
       context.Connection.Reliable.Send(sendData);
 
-      _logger.Trace($"Approved {context.Connection.Id} as {playerId}|{context.LobbyPlayer.Name} for project {projectId}");
+      _logger.Trace($"Approved {context.Connection.Id} as {playerId}|{context.LobbyPlayer.Name}");
     }
 
     public void Reject(RagonContext context)

Ragon.Server/Sources/Handler/BaseOperation.cs

@@ -21,10 +21,10 @@ namespace Ragon.Server.Handler;
 
 public abstract class BaseOperation
 {
-  protected readonly RagonBuffer Reader;
-  protected readonly RagonBuffer Writer;
+  protected readonly RagonStream Reader;
+  protected readonly RagonStream Writer;
   
-  public BaseOperation(RagonBuffer reader, RagonBuffer writer)
+  public BaseOperation(RagonStream reader, RagonStream writer)
   {
     Reader = reader;
     Writer = writer;

Ragon.Server/Sources/Handler/EntityCreateOperation.cs

@@ -1,79 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-using Ragon.Server.Entity;
-using Ragon.Server.IO;
-using Ragon.Server.Logging;
-
-namespace Ragon.Server.Handler;
-
-public sealed class EntityCreateOperation : BaseOperation
-{
-  private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(EntityCreateOperation));
-  private RagonServerConfiguration _configuration;
-
-  public EntityCreateOperation(RagonBuffer reader, RagonBuffer writer, RagonServerConfiguration configuration) :
-    base(reader, writer)
-  {
-    _configuration = configuration;
-  }
-
-  public override void Handle(RagonContext context, NetworkChannel channel)
-  {
-    var player = context.RoomPlayer;
-    var room = context.Room;
-    var attachId = Reader.ReadUShort();
-    var entityType = Reader.ReadUShort();
-    var eventAuthority = (RagonAuthority) Reader.ReadByte();
-    var propertiesCount = Reader.ReadUShort();
-
-    var entityParameters = new RagonEntityParameters()
-    {
-      Type = entityType,
-      Authority = eventAuthority,
-      AttachId = attachId,
-      StaticId = 0,
-      BufferedEvents = context.LimitBufferedEvents,
-    };
-    
-    var entity = new RagonEntity(entityParameters);
-    for (var i = 0; i < propertiesCount; i++)
-    {
-      var propertyType = Reader.ReadBool();
-      var propertySize = Reader.ReadUShort();
-
-      entity.AddProperty(new RagonProperty(propertySize, propertyType, _configuration.LimitPropertySize));
-    }
-    
-    if (Reader.Capacity > 0)
-      entity.Payload.Read(Reader);
-    
-    var plugin = room.Plugin;
-    if (!plugin.OnEntityCreate(player, entity))
-      return;
-    
-    entity.Attach(player);
-    room.AttachEntity(entity);
-    player.AttachEntity(entity);
-    
-    entity.Create();
-    
-    _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} created entity {entity.Id}:{entity.Type}");
-  }
-
-
-}

Ragon.Server/Sources/Handler/EntityEventOperation.cs

@@ -1,63 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-using Ragon.Server.Event;
-using Ragon.Server.IO;
-using Ragon.Server.Logging;
-
-namespace Ragon.Server.Handler;
-
-public sealed class EntityEventOperation : BaseOperation
-{
-  private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(EntityEventOperation));
-  
-  public EntityEventOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
-  {
-  }
-
-  public override void Handle(RagonContext context, NetworkChannel channel)
-  {
-    var player = context.RoomPlayer;
-    var room = context.Room;
-    var entityId = Reader.ReadUShort();
-
-    if (!room.Entities.TryGetValue(entityId, out var ent))
-    {
-      _logger.Warning($"Entity not found for event with Id {entityId}");
-      return;
-    }
-
-    var eventId = Reader.ReadUShort();
-    var eventMode = (RagonReplicationMode)Reader.ReadByte();
-    var targetMode = (RagonTarget)Reader.ReadByte();
-    var targetPlayerPeerId = (ushort)0;
-    
-    if (targetMode == RagonTarget.Player)
-      targetPlayerPeerId = Reader.ReadUShort();
-
-    var @event = new RagonEvent(player, eventId);
-    @event.Read(Reader);
-
-    if (targetMode == RagonTarget.Player && room.Players.TryGetValue(targetPlayerPeerId, out var targetPlayer))
-    {
-      ent.ReplicateEvent(player, @event, eventMode, targetPlayer);
-      return;
-    }
-
-    ent.ReplicateEvent(player, @event, eventMode, targetMode);
-  }
-}

Ragon.Server/Sources/Handler/EntityOwnershipOperation.cs

@@ -1,75 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-using Ragon.Protocol;
-using Ragon.Server.IO;
-using Ragon.Server.Logging;
-
-namespace Ragon.Server.Handler;
-
-public sealed class EntityOwnershipOperation : BaseOperation
-{
-  private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(EntityOwnershipOperation));
-  
-  public EntityOwnershipOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
-  {
-  }
-
-  public override void Handle(RagonContext context, NetworkChannel channel)
-  {
-    var currentOwner = context.RoomPlayer;
-    var room = context.Room;
-    
-    var entityId = Reader.ReadUShort();
-    var playerPeerId = Reader.ReadUShort();
-
-    if (!room.Entities.TryGetValue(entityId, out var entity))
-    {
-      _logger.Error($"Entity not found with id {entityId}");
-      return;
-    }
-    
-    if (entity.Owner.Connection.Id != currentOwner.Connection.Id)
-    {
-      _logger.Error($"Player not owner of entity with id {entityId}");
-      return;
-    } 
-
-    if (!room.Players.TryGetValue(playerPeerId, out var nextOwner))
-    {
-      _logger.Error($"Player not found with id {playerPeerId}");
-      return;
-    }    
-    
-    currentOwner.Entities.Remove(entity);
-    nextOwner.Entities.Add(entity);
-    
-    entity.Attach(nextOwner);
-    
-    _logger.Trace($"Entity {entity.Id} next owner {nextOwner.Connection.Id}");
-    
-    Writer.Clear();
-    Writer.WriteOperation(RagonOperation.OWNERSHIP_ENTITY_CHANGED);
-    Writer.WriteUShort(playerPeerId);
-    Writer.WriteUShort(1);
-    Writer.WriteUShort(entity.Id);
-    
-    var sendData = Writer.ToArray();
-    foreach (var player in room.PlayerList)
-      player.Connection.Reliable.Send(sendData);
-  }
-}

Ragon.Server/Sources/Handler/EntityRemoveOperation.cs

@@ -1,55 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-using Ragon.Server.Entity;
-using Ragon.Server.IO;
-using Ragon.Server.Logging;
-
-namespace Ragon.Server.Handler;
-
-public sealed class EntityDestroyOperation: BaseOperation
-{
-  private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(EntityDestroyOperation));
-  
-  public EntityDestroyOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
-  {
-  }
-
-  public override void Handle(RagonContext context, NetworkChannel channel)
-  {
-    var player = context.RoomPlayer;
-    var room = context.Room;
-    var entityId = Reader.ReadUShort();
-    
-    if (room.Entities.TryGetValue(entityId, out var entity) && entity.Owner.Connection.Id == player.Connection.Id)
-    {
-      var payload = new RagonPayload();
-      payload.Read(Reader);
-      
-      room.DetachEntity(entity);
-      player.DetachEntity(entity);
-      
-      entity.Destroy();
-      
-      _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} destoyed entity {entity.Id}");
-    }
-    else
-    {
-      _logger.Trace($"Entity {entity.Id} not found or Player {context.Connection.Id}|{context.LobbyPlayer.Name} have not authority");
-    }
-  }
-}

Ragon.Server/Sources/Handler/EntityStateOperation.cs

@@ -1,50 +0,0 @@
-/*
- * Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using Ragon.Protocol;
-using Ragon.Server.IO;
-using Ragon.Server.Logging;
-
-namespace Ragon.Server.Handler;
-
-public sealed class EntityStateOperation: BaseOperation
-{
-  private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(EntityStateOperation));
-
-  public EntityStateOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
-  {
-  }
-
-  public override void Handle(RagonContext context, NetworkChannel channel)
-  {
-    var room = context.Room;
-    var player = context.RoomPlayer;
-    var entitiesCount = Reader.ReadUShort();
-    
-    for (var entityIndex = 0; entityIndex < entitiesCount; entityIndex++)
-    {
-      var entityId = Reader.ReadUShort();
-      if (room.Entities.TryGetValue(entityId, out var entity) && entity.TryReadState(player, Reader))
-      {
-        room.Track(entity);
-      }
-      else
-      {
-        _logger.Error($"Entity with Id {entityId} not found, replication interrupted");
-      }
-    }
-  }
-}

Ragon.Server/Sources/Handler/PlayerUserDataOperation.cs

@@ -11,8 +11,8 @@ namespace Ragon.Server.Handler
     private readonly int _userDataLimit;
 
     public PlayerUserDataOperation(
-      RagonBuffer reader,
-      RagonBuffer writer,
+      RagonStream reader,
+      RagonStream writer,
       int userDataLimit
     ) : base(reader, writer)
     {
@@ -27,7 +27,7 @@ namespace Ragon.Server.Handler
         return;
       }
 
-      context.UserData.Read(Reader, _userDataLimit);
+      context.UserData.Read(Reader);
     }
   }
 }

Ragon.Server/Sources/Handler/RoomCreateOperation.cs

@@ -32,8 +32,8 @@ namespace Ragon.Server.Handler
     private readonly RagonServerConfiguration _configuration;
 
     public RoomCreateOperation(
-      RagonBuffer reader,
-      RagonBuffer writer,
+      RagonStream reader,
+      RagonStream writer,
       IServerPlugin serverPlugin,
       RagonServerConfiguration configuration 
     ) : base(reader,
@@ -76,7 +76,6 @@ namespace Ragon.Server.Handler
 
       var information = new RoomInformation()
       {
-        Scene = _roomParameters.Scene,
         Max = _roomParameters.Max,
         Min = _roomParameters.Min,
       };
@@ -88,7 +87,7 @@ namespace Ragon.Server.Handler
       var roomPlayer = new RagonRoomPlayer(context, lobbyPlayer.Id, lobbyPlayer.Name);
 
       var roomPlugin = _serverPlugin.CreateRoomPlugin(information);
-      var room = new RagonRoom(roomId, information, roomPlugin, lobbyPlayer.ProjectId);
+      var room = new RagonRoom(roomId, information, roomPlugin);
 
       room.Plugin.OnAttached(room);
       roomPlayer.OnAttached(room);
@@ -97,8 +96,7 @@ namespace Ragon.Server.Handler
       context.Lobby.Persist(room);
       context.SetRoom(room, roomPlayer);
 
-      _logger.Trace(
-        $"Player {context.Connection.Id}|{context.LobbyPlayer.Name} create room {room.Id} with scene {information.Scene}");
+      _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} create room {room.Id}");
 
       JoinSuccess(roomPlayer, room, Writer);
 
@@ -107,14 +105,13 @@ namespace Ragon.Server.Handler
       _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} joined to room {room.Id}");
     }
 
-    private void JoinSuccess(RagonRoomPlayer player, RagonRoom room, RagonBuffer writer)
+    private void JoinSuccess(RagonRoomPlayer player, RagonRoom room, RagonStream writer)
     {
       writer.Clear();
       writer.WriteOperation(RagonOperation.JOIN_SUCCESS);
       writer.WriteString(room.Id);
       writer.WriteUShort((ushort)room.PlayerMin);
       writer.WriteUShort((ushort)room.PlayerMax);
-      writer.WriteString(room.Scene);
       writer.WriteString(player.Id);
       writer.WriteString(room.Owner.Id);