fix: user data changes not cleared

.github/workflows/main.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Build
         shell: bash
         run: |

Ragon.Client/Sources/Handler/RoomListHandler.cs

@@ -17,6 +17,7 @@ internal class RoomListHandler: IHandler
   {
     var roomCount = reader.ReadUShort();
     var roomList = new RagonRoomInformation[roomCount];
+    
     for (int i = 0; i < roomCount; i++)
     {
       var id = reader.ReadString();

Ragon.Client/Sources/RagonUserData.cs

@@ -98,6 +98,7 @@ namespace Ragon.Client
         }
       }
 
+      _changesCache.Clear();
       _localChanges.Clear();
     }
   }

Ragon.Relay/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:9.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:7.0
+FROM mcr.microsoft.com/dotnet/runtime:9.0
 
 WORKDIR /App
 

Ragon.Relay/Sources/Relay.cs

@@ -15,6 +15,7 @@
  */
 
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using Newtonsoft.Json;
@@ -40,7 +41,7 @@ namespace Ragon.Relay
       var configuration = JsonConvert.DeserializeObject<RelayConfiguration>(data);
       var serverType = RagonServerConfiguration.GetServerType(configuration.ServerType);
 
-      INetworkServer networkServer = new ENetServer();
+      INetworkServer networkServer;
       IServerPlugin plugin = new RelayServerPlugin();
 
       switch (serverType)
@@ -51,6 +52,9 @@ namespace Ragon.Relay
         case ServerType.WEBSOCKET:
           networkServer = new WebSocketServer();
           break;
+        default:
+          networkServer = new ENetServer();
+          break;
       }
 
       var serverConfiguration = new RagonServerConfiguration()
@@ -70,10 +74,27 @@ namespace Ragon.Relay
 
       var relay = new RagonServer(networkServer, plugin, serverConfiguration);
       relay.Start();
+
+      var sw = Stopwatch.StartNew();
+      var tickRateMs = 1000.0 / configuration.ServerTickRate;
+      var nextTickMs = tickRateMs;
+
       while (relay.IsRunning)
       {
         relay.Tick();
-        Thread.Sleep(1);
+
+        var sleepTime = nextTickMs - sw.Elapsed.TotalMilliseconds;
+        if (sleepTime > 0)
+        {
+          Thread.Sleep((int)sleepTime);
+        }
+
+        nextTickMs += tickRateMs;
+
+        if (nextTickMs < sw.Elapsed.TotalMilliseconds)
+        {
+          nextTickMs = sw.Elapsed.TotalMilliseconds + tickRateMs;
+        }
       }
 
       relay.Dispose();

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

@@ -4,7 +4,6 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Ragon.ENet</RootNamespace>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Copyright>Eduard Kargin</Copyright>
         <Authors>Eduard Kargin</Authors>
@@ -15,6 +14,7 @@
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
         <RepositoryType>Source</RepositoryType>
+        <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

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

@@ -4,7 +4,6 @@
         <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>
@@ -15,6 +14,7 @@
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
         <RepositoryType>Source</RepositoryType>
+        <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

Ragon.Server/Ragon.Server.csproj

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

Ragon.Server/Sources/Lobby/RagonLobbyDispatcher.cs

@@ -16,6 +16,7 @@ public class RagonLobbyDispatcher
   {
     writer.Clear();
     writer.WriteOperation(RagonOperation.ROOM_LIST_UPDATED);
+    
     var rooms = _lobby.Rooms;
     
     if (projectId > 0)

Ragon.Server/Sources/RagonServer.cs

@@ -42,9 +42,7 @@ public class RagonServer : IRagonServer, INetworkListener
   private readonly Dictionary<ushort, RagonContext> _contextsByConnection;
   private readonly Dictionary<string, RagonContext> _contextsByPlayerId;
   private readonly ProjectRegistry _projectRegistry;
-  private readonly Stopwatch _timer;
   private readonly RagonLobbyDispatcher _lobbySerializer;
-  private readonly long _tickRate = 0;
   private bool _isRunning = false;
 
   public bool IsRunning => _isRunning;
@@ -66,13 +64,12 @@ public class RagonServer : IRagonServer, INetworkListener
     _scheduler = new RagonScheduler();
     _reader = new RagonBuffer();
     _writer = new RagonBuffer();
-    _tickRate = 1000 / _configuration.ServerTickRate;
-    _timer = new Stopwatch();
 
     var contextObserver = new RagonContextObserver(_contextsByPlayerId);
     _scheduler.Run(new RagonActionTimer(SendRoomList, 2.0f));
     _scheduler.Run(new RagonActionTimer(SendPlayerUserData, 0.1f));
     _scheduler.Run(new RagonActionTimer(SendRoomUserData, 0.1f));
+    _scheduler.Run(new RagonActionTimer(SendTimestamp, 1.0f / _configuration.ServerTickRate));
     
     _serverPlugin.OnAttached(this);
 
@@ -98,19 +95,8 @@ public class RagonServer : IRagonServer, INetworkListener
   }
   public void Tick()
   {
-    if (_timer.ElapsedMilliseconds > _tickRate * 2)
-    {
-      _logger.Warning($"Slow performance: {_timer.ElapsedMilliseconds}");
-    }
-
-    if (_timer.ElapsedMilliseconds > _tickRate)
-    {
-      _timer.Restart();
-      _scheduler.Update(_timer.ElapsedMilliseconds / 1000.0f);
-
-      SendTimestamp();
-    }
-
+    var deltaTime = 1.0f / _configuration.ServerTickRate;
+    _scheduler.Update(deltaTime);
     _server.Update();
   }
 
@@ -129,8 +115,6 @@ public class RagonServer : IRagonServer, INetworkListener
     _server.Listen(this, networkConfiguration);
     _serverPlugin.OnAttached(this);
 
-    _timer.Start();
-
     _isRunning = true;
   }
 

Ragon.Server/Sources/Room/RagonRoom.cs

@@ -148,8 +148,7 @@ public class RagonRoom : IRagonRoom, IRagonAction
     RagonTarget targetMode
   )
   {
-    if (eventMode == RagonReplicationMode.Buffered && targetMode != RagonTarget.Owner &&
-        _bufferedEvents.Count < _limitBufferedEvents)
+    if (eventMode == RagonReplicationMode.Buffered && targetMode != RagonTarget.Owner && _bufferedEvents.Count < _limitBufferedEvents)
     {
       _bufferedEvents.Add(evnt);
     }