Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5136f08dab |
@@ -331,6 +331,9 @@ namespace Ragon.Protocol
|
|||||||
var limit = (size + 32 - 1) / 32;
|
var limit = (size + 32 - 1) / 32;
|
||||||
var capacity = size;
|
var capacity = size;
|
||||||
|
|
||||||
|
if (index + limit >= _buckets.Length)
|
||||||
|
Resize(size);
|
||||||
|
|
||||||
for (int i = 0; i < limit; i++)
|
for (int i = 0; i < limit; i++)
|
||||||
{
|
{
|
||||||
var dataSize = capacity > 32 ? 32 : capacity;
|
var dataSize = capacity > 32 ? 32 : capacity;
|
||||||
|
|||||||
@@ -56,9 +56,11 @@ namespace Ragon.Relay
|
|||||||
var serverConfiguration = new RagonServerConfiguration()
|
var serverConfiguration = new RagonServerConfiguration()
|
||||||
{
|
{
|
||||||
LimitConnections = configuration.LimitConnections,
|
LimitConnections = configuration.LimitConnections,
|
||||||
LimitRooms = configuration.LimitConnections,
|
LimitRooms = configuration.LimitRooms,
|
||||||
LimitBufferedEvents = configuration.LimitConnections,
|
LimitBufferedEvents = configuration.LimitBufferedEvents,
|
||||||
LimitPlayersPerRoom = configuration.LimitConnections,
|
LimitPlayersPerRoom = configuration.LimitPlayersPerRoom,
|
||||||
|
LimitUserDataSize = configuration.LimitUserDataSize,
|
||||||
|
LimitPropertySize = configuration.LimitPropertySize,
|
||||||
Port = configuration.Port,
|
Port = configuration.Port,
|
||||||
Protocol = configuration.Protocol,
|
Protocol = configuration.Protocol,
|
||||||
ServerKey = configuration.ServerKey,
|
ServerKey = configuration.ServerKey,
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ namespace Ragon.Relay
|
|||||||
public int LimitPlayersPerRoom;
|
public int LimitPlayersPerRoom;
|
||||||
public int LimitRooms;
|
public int LimitRooms;
|
||||||
public int LimitBufferedEvents;
|
public int LimitBufferedEvents;
|
||||||
public int LimitUserData;
|
public int LimitUserDataSize;
|
||||||
|
public int LimitPropertySize;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,10 +4,11 @@
|
|||||||
"serverAddress": "*",
|
"serverAddress": "*",
|
||||||
"serverTickRate": 30,
|
"serverTickRate": 30,
|
||||||
"protocol": "1.0.0",
|
"protocol": "1.0.0",
|
||||||
"port": 5000,
|
"port": 8000,
|
||||||
"limitConnections": 4095,
|
"limitConnections": 4095,
|
||||||
"limitPlayersPerRoom": 20,
|
"limitPlayersPerRoom": 20,
|
||||||
"limitRooms": 200,
|
"limitRooms": 200,
|
||||||
"limitBufferedEvents": 50,
|
"limitBufferedEvents": 50,
|
||||||
"limitUserData": 1024
|
"limitUserDataSize": 1024,
|
||||||
|
"limitPropertySize": 512
|
||||||
}
|
}
|
||||||
@@ -14,6 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
using System.Buffers;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Net.WebSockets;
|
using System.Net.WebSockets;
|
||||||
using Ragon.Protocol;
|
using Ragon.Protocol;
|
||||||
@@ -82,20 +83,30 @@ public class WebSocketServer : INetworkServer
|
|||||||
_networkListener.OnConnected(connection);
|
_networkListener.OnConnected(connection);
|
||||||
|
|
||||||
var webSocket = connection.Socket;
|
var webSocket = connection.Socket;
|
||||||
var bytes = new byte[2048];
|
var rawData = new byte[2048];
|
||||||
var buffer = new Memory<byte>(bytes);
|
var rawDataBuffer = new Memory<byte>(rawData);
|
||||||
|
var data = new ArrayBufferWriter<byte>();
|
||||||
|
|
||||||
while (
|
while (webSocket.State == WebSocketState.Open || !cancellationToken.IsCancellationRequested)
|
||||||
webSocket.State == WebSocketState.Open ||
|
|
||||||
!cancellationToken.IsCancellationRequested)
|
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var result = await webSocket.ReceiveAsync(buffer, cancellationToken);
|
while (true)
|
||||||
if (result.Count > 0)
|
|
||||||
{
|
{
|
||||||
var payload = buffer.Slice(0, result.Count);
|
var result = await webSocket.ReceiveAsync(rawDataBuffer, cancellationToken);
|
||||||
_networkListener.OnData(connection, NetworkChannel.RELIABLE, payload.ToArray());
|
var payload = rawDataBuffer.Slice(0, result.Count);
|
||||||
|
|
||||||
|
data.Write(payload.Span);
|
||||||
|
|
||||||
|
if (result.EndOfMessage)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.WrittenCount > 0)
|
||||||
|
{
|
||||||
|
_networkListener.OnData(connection, NetworkChannel.RELIABLE, data.WrittenMemory.ToArray());
|
||||||
|
|
||||||
|
data.Clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
@@ -27,13 +27,13 @@ public class RagonProperty : RagonPayload
|
|||||||
|
|
||||||
private uint[] _data;
|
private uint[] _data;
|
||||||
|
|
||||||
public RagonProperty(int size, bool isFixed)
|
public RagonProperty(int size, bool isFixed, int limit)
|
||||||
{
|
{
|
||||||
Size = size;
|
Size = size;
|
||||||
IsFixed = isFixed;
|
IsFixed = isFixed;
|
||||||
IsDirty = false;
|
IsDirty = false;
|
||||||
|
|
||||||
_data = new uint[128];
|
_data = new uint[limit / 4 + 1];
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Read(RagonBuffer buffer)
|
public void Read(RagonBuffer buffer)
|
||||||
|
|||||||
@@ -24,11 +24,14 @@ namespace Ragon.Server.Handler;
|
|||||||
public sealed class EntityCreateOperation : BaseOperation
|
public sealed class EntityCreateOperation : BaseOperation
|
||||||
{
|
{
|
||||||
private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(EntityCreateOperation));
|
private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(EntityCreateOperation));
|
||||||
|
private RagonServerConfiguration _configuration;
|
||||||
public EntityCreateOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
|
|
||||||
|
public EntityCreateOperation(RagonBuffer reader, RagonBuffer writer, RagonServerConfiguration configuration) :
|
||||||
|
base(reader, writer)
|
||||||
{
|
{
|
||||||
|
_configuration = configuration;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Handle(RagonContext context, NetworkChannel channel)
|
public override void Handle(RagonContext context, NetworkChannel channel)
|
||||||
{
|
{
|
||||||
var player = context.RoomPlayer;
|
var player = context.RoomPlayer;
|
||||||
@@ -53,7 +56,7 @@ public sealed class EntityCreateOperation : BaseOperation
|
|||||||
var propertyType = Reader.ReadBool();
|
var propertyType = Reader.ReadBool();
|
||||||
var propertySize = Reader.ReadUShort();
|
var propertySize = Reader.ReadUShort();
|
||||||
|
|
||||||
entity.AddProperty(new RagonProperty(propertySize, propertyType));
|
entity.AddProperty(new RagonProperty(propertySize, propertyType, _configuration.LimitPropertySize));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Reader.Capacity > 0)
|
if (Reader.Capacity > 0)
|
||||||
|
|||||||
@@ -27,9 +27,11 @@ namespace Ragon.Server.Handler
|
|||||||
public sealed class SceneLoadedOperation : BaseOperation
|
public sealed class SceneLoadedOperation : BaseOperation
|
||||||
{
|
{
|
||||||
private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(SceneLoadedOperation));
|
private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(SceneLoadedOperation));
|
||||||
|
private RagonServerConfiguration _configuration;
|
||||||
public SceneLoadedOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
|
|
||||||
|
public SceneLoadedOperation(RagonBuffer reader, RagonBuffer writer, RagonServerConfiguration serverConfiguration) : base(reader, writer)
|
||||||
{
|
{
|
||||||
|
_configuration = serverConfiguration;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Handle(RagonContext context, NetworkChannel channel)
|
public override void Handle(RagonContext context, NetworkChannel channel)
|
||||||
@@ -40,6 +42,7 @@ namespace Ragon.Server.Handler
|
|||||||
var owner = context.Room.Owner;
|
var owner = context.Room.Owner;
|
||||||
var player = context.RoomPlayer;
|
var player = context.RoomPlayer;
|
||||||
var room = context.Room;
|
var room = context.Room;
|
||||||
|
|
||||||
if (player.IsLoaded)
|
if (player.IsLoaded)
|
||||||
{
|
{
|
||||||
_logger.Warning($"Player {player.Name}:{player.Connection.Id} already ready");
|
_logger.Warning($"Player {player.Name}:{player.Connection.Id} already ready");
|
||||||
@@ -70,10 +73,11 @@ namespace Ragon.Server.Handler
|
|||||||
{
|
{
|
||||||
var propertyType = Reader.ReadBool();
|
var propertyType = Reader.ReadBool();
|
||||||
var propertySize = Reader.ReadUShort();
|
var propertySize = Reader.ReadUShort();
|
||||||
entity.AddProperty(new RagonProperty(propertySize, propertyType));
|
entity.AddProperty(new RagonProperty(propertySize, propertyType, _configuration.LimitPropertySize));
|
||||||
}
|
}
|
||||||
|
|
||||||
var roomPlugin = room.Plugin;
|
var roomPlugin = room.Plugin;
|
||||||
|
|
||||||
if (!roomPlugin.OnEntityCreate(player, entity)) continue;
|
if (!roomPlugin.OnEntityCreate(player, entity)) continue;
|
||||||
|
|
||||||
var playerInfo = $"Player {context.Connection.Id}|{context.LobbyPlayer.Name}";
|
var playerInfo = $"Player {context.Connection.Id}|{context.LobbyPlayer.Name}";
|
||||||
|
|||||||
@@ -79,8 +79,8 @@ public class RagonServer : IRagonServer, INetworkListener
|
|||||||
_handlers[(byte)RagonOperation.JOIN_ROOM] = new RoomJoinOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.JOIN_ROOM] = new RoomJoinOperation(_reader, _writer);
|
||||||
_handlers[(byte)RagonOperation.LEAVE_ROOM] = new RoomLeaveOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.LEAVE_ROOM] = new RoomLeaveOperation(_reader, _writer);
|
||||||
_handlers[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadOperation(_reader, _writer);
|
||||||
_handlers[(byte)RagonOperation.SCENE_LOADED] = new SceneLoadedOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.SCENE_LOADED] = new SceneLoadedOperation(_reader, _writer, _configuration);
|
||||||
_handlers[(byte)RagonOperation.CREATE_ENTITY] = new EntityCreateOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.CREATE_ENTITY] = new EntityCreateOperation(_reader, _writer, _configuration);
|
||||||
_handlers[(byte)RagonOperation.REMOVE_ENTITY] = new EntityDestroyOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.REMOVE_ENTITY] = new EntityDestroyOperation(_reader, _writer);
|
||||||
_handlers[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] = new EntityEventOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] = new EntityEventOperation(_reader, _writer);
|
||||||
_handlers[(byte)RagonOperation.REPLICATE_ENTITY_STATE] = new EntityStateOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.REPLICATE_ENTITY_STATE] = new EntityStateOperation(_reader, _writer);
|
||||||
@@ -89,8 +89,8 @@ public class RagonServer : IRagonServer, INetworkListener
|
|||||||
_handlers[(byte)RagonOperation.TIMESTAMP_SYNCHRONIZATION] = new TimestampSyncOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.TIMESTAMP_SYNCHRONIZATION] = new TimestampSyncOperation(_reader, _writer);
|
||||||
_handlers[(byte)RagonOperation.REPLICATE_ROOM_EVENT] = new RoomEventOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.REPLICATE_ROOM_EVENT] = new RoomEventOperation(_reader, _writer);
|
||||||
_handlers[(byte)RagonOperation.REPLICATE_RAW_DATA] = new RoomDataOperation(_reader, _writer);
|
_handlers[(byte)RagonOperation.REPLICATE_RAW_DATA] = new RoomDataOperation(_reader, _writer);
|
||||||
_handlers[(byte)RagonOperation.ROOM_DATA_UPDATED] = new RoomUserDataOperation(_reader, _writer, _configuration.LimitUserData);
|
_handlers[(byte)RagonOperation.ROOM_DATA_UPDATED] = new RoomUserDataOperation(_reader, _writer, _configuration.LimitUserDataSize);
|
||||||
_handlers[(byte)RagonOperation.PLAYER_DATA_UPDATED] = new PlayerUserDataOperation(_reader, _writer, _configuration.LimitUserData);
|
_handlers[(byte)RagonOperation.PLAYER_DATA_UPDATED] = new PlayerUserDataOperation(_reader, _writer, _configuration.LimitUserDataSize);
|
||||||
}
|
}
|
||||||
public void Tick()
|
public void Tick()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -34,7 +34,8 @@ public struct RagonServerConfiguration
|
|||||||
public int LimitPlayersPerRoom;
|
public int LimitPlayersPerRoom;
|
||||||
public int LimitRooms;
|
public int LimitRooms;
|
||||||
public int LimitBufferedEvents;
|
public int LimitBufferedEvents;
|
||||||
public int LimitUserData;
|
public int LimitUserDataSize;
|
||||||
|
public int LimitPropertySize;
|
||||||
|
|
||||||
private static Dictionary<string, ServerType> _serverTypes = new Dictionary<string, ServerType>()
|
private static Dictionary<string, ServerType> _serverTypes = new Dictionary<string, ServerType>()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user