🚧 pass-through raw data, refactoring

This commit is contained in:
2023-10-07 19:30:52 +03:00
parent 8788cb0fcf
commit e1a3ea45e2
29 changed files with 434 additions and 219 deletions
+26
View File
@@ -426,6 +426,32 @@ namespace Ragon.Protocol
return data; return data;
} }
public void ToArray(byte[] outData)
{
Debug.Assert(outData.Length >= Length);
var bucketsCount = (_write >> 5) + 1;
var length = Length;
for (int i = 0; i < bucketsCount; i++)
{
var dataIdx = i * 4;
var bucket = _buckets[i];
if (dataIdx < length)
outData[dataIdx] = (byte)bucket;
if (dataIdx + 1 < length)
outData[dataIdx + 1] = (byte)(bucket >> 8);
if (dataIdx + 2 < length)
outData[dataIdx + 2] = (byte)(bucket >> 16);
if (dataIdx + 3 < length)
outData[dataIdx + 3] = (byte)(bucket >> 24);
}
}
private void Resize(int capacity) private void Resize(int capacity)
{ {
var buckets = new uint[_buckets.Length * 2 + capacity]; var buckets = new uint[_buckets.Length * 2 + capacity];
+25 -24
View File
@@ -19,29 +19,30 @@ namespace Ragon.Protocol
{ {
public enum RagonOperation: byte public enum RagonOperation: byte
{ {
AUTHORIZE, AUTHORIZE = 1,
AUTHORIZED_SUCCESS, AUTHORIZED_SUCCESS = 2,
AUTHORIZED_FAILED, AUTHORIZED_FAILED = 3,
JOIN_OR_CREATE_ROOM, JOIN_OR_CREATE_ROOM = 4,
CREATE_ROOM, CREATE_ROOM = 5,
JOIN_ROOM, JOIN_ROOM = 6,
LEAVE_ROOM, LEAVE_ROOM = 7,
OWNERSHIP_ENTITY_CHANGED, OWNERSHIP_ENTITY_CHANGED = 8,
OWNERSHIP_ROOM_CHANGED, OWNERSHIP_ROOM_CHANGED= 9,
JOIN_SUCCESS, JOIN_SUCCESS = 10,
JOIN_FAILED, JOIN_FAILED = 11,
LOAD_SCENE, LOAD_SCENE = 12,
SCENE_LOADED, SCENE_LOADED = 13,
PLAYER_JOINED, PLAYER_JOINED = 14,
PLAYER_LEAVED, PLAYER_LEAVED = 15,
CREATE_ENTITY, CREATE_ENTITY = 16,
REMOVE_ENTITY, REMOVE_ENTITY = 17,
SNAPSHOT, SNAPSHOT = 18,
REPLICATE_ENTITY_STATE, REPLICATE_ENTITY_STATE = 19,
REPLICATE_ENTITY_EVENT, REPLICATE_ENTITY_EVENT = 20,
TRANSFER_ROOM_OWNERSHIP, REPLICATE_RAW_DATA = 21,
TRANSFER_ENTITY_OWNERSHIP, REPLICATE_ROOM_EVENT = 22,
REPLICATE_RAW_DATA, TRANSFER_ROOM_OWNERSHIP = 23,
TIMESTAMP_SYNCHRONIZATION, TRANSFER_ENTITY_OWNERSHIP = 24,
TIMESTAMP_SYNCHRONIZATION = 25,
} }
} }
+2 -2
View File
@@ -31,8 +31,8 @@ public sealed class ENetConnection: INetworkConnection
_peer = peer; _peer = peer;
Id = (ushort) peer.ID; Id = (ushort) peer.ID;
Reliable = new ENetReliableChannel(peer, 0); Reliable = new ENetReliableChannel(peer, NetworkChannel.RELIABLE);
Unreliable = new ENetUnreliableChannel(peer, 1); Unreliable = new ENetUnreliableChannel(peer, NetworkChannel.UNRELIABLE);
} }
public void Close() public void Close()
@@ -14,7 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
using System.Net;
using ENet; using ENet;
using Ragon.Protocol;
using Ragon.Server.IO; using Ragon.Server.IO;
namespace Ragon.Server.ENet; namespace Ragon.Server.ENet;
@@ -23,11 +25,13 @@ public sealed class ENetReliableChannel: INetworkChannel
{ {
private Peer _peer; private Peer _peer;
private byte _channelId; private byte _channelId;
private byte[] _data;
public ENetReliableChannel(Peer peer, int channelId) public ENetReliableChannel(Peer peer, NetworkChannel channel)
{ {
_peer = peer; _peer = peer;
_channelId = (byte) channelId; _data = new byte[1500];
_channelId = (byte) channel;
} }
public void Send(byte[] data) public void Send(byte[] data)
@@ -37,4 +41,14 @@ public sealed class ENetReliableChannel: INetworkChannel
_peer.Send(_channelId, ref newPacket); _peer.Send(_channelId, ref newPacket);
} }
public void Send(RagonBuffer buffer)
{
buffer.ToArray(_data);
var newPacket = new Packet();
newPacket.Create(_data, buffer.Length, PacketFlags.Reliable);
_peer.Send(_channelId, ref newPacket);
}
} }
+1 -1
View File
@@ -118,7 +118,7 @@ namespace Ragon.Server.ENet
_event.Packet.CopyTo(dataRaw); _event.Packet.CopyTo(dataRaw);
_event.Packet.Dispose(); _event.Packet.Dispose();
_listener.OnData(connection, dataRaw); _listener.OnData(connection, (NetworkChannel) _event.ChannelID, dataRaw);
break; break;
} }
} }
@@ -15,6 +15,7 @@
*/ */
using ENet; using ENet;
using Ragon.Protocol;
using Ragon.Server.IO; using Ragon.Server.IO;
namespace Ragon.Server.ENet; namespace Ragon.Server.ENet;
@@ -23,11 +24,12 @@ public sealed class ENetUnreliableChannel: INetworkChannel
{ {
private Peer _peer; private Peer _peer;
private byte _channelId; private byte _channelId;
private byte[] _data;
public ENetUnreliableChannel(Peer peer, int channelId) public ENetUnreliableChannel(Peer peer, NetworkChannel channel)
{ {
_peer = peer; _peer = peer;
_channelId = (byte) channelId; _channelId = (byte) channel;
} }
public void Send(byte[] data) public void Send(byte[] data)
@@ -37,4 +39,14 @@ public sealed class ENetUnreliableChannel: INetworkChannel
_peer.Send(_channelId, ref newPacket); _peer.Send(_channelId, ref newPacket);
} }
public void Send(RagonBuffer buffer)
{
buffer.ToArray(_data);
var newPacket = new Packet();
newPacket.Create(_data, buffer.Length, PacketFlags.None);
_peer.Send(_channelId, ref newPacket);
}
} }
@@ -15,6 +15,7 @@
*/ */
using System.Net.WebSockets; using System.Net.WebSockets;
using Ragon.Protocol;
using Ragon.Server.IO; using Ragon.Server.IO;
namespace Ragon.Server.WebSocketServer; namespace Ragon.Server.WebSocketServer;
@@ -35,9 +36,17 @@ public class WebSocketReliableChannel : INetworkChannel
_queue.Enqueue(data); _queue.Enqueue(data);
} }
public void Send(RagonBuffer buffer)
{
var sendData = buffer.ToArray();
_queue.Enqueue(sendData);
}
public async Task Flush() public async Task Flush()
{ {
while (_queue.TryDequeue(out var sendData) && _socket.State == WebSocketState.Open) while (_queue.TryDequeue(out var sendData) && _socket.State == WebSocketState.Open)
{
await _socket.SendAsync(sendData, WebSocketMessageType.Binary, WebSocketMessageFlags.EndOfMessage, CancellationToken.None); await _socket.SendAsync(sendData, WebSocketMessageType.Binary, WebSocketMessageFlags.EndOfMessage, CancellationToken.None);
}
} }
} }
@@ -82,9 +82,12 @@ public class WebSocketServer : INetworkServer
try try
{ {
var result = await webSocket.ReceiveAsync(buffer, cancellationToken); var result = await webSocket.ReceiveAsync(buffer, cancellationToken);
var dataRaw = buffer.Slice(0, result.Count); if (result.Count > 0)
if (dataRaw.Length > 0) {
_networkListener.OnData(connection, dataRaw.ToArray()); var channel = (RagonOperation) bytes[0] == RagonOperation.REPLICATE_RAW_DATA ? NetworkChannel.RAW : NetworkChannel.RELIABLE;
var payload = buffer.Slice(0, buffer.Length);
_networkListener.OnData(connection, channel , payload.ToArray());
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -22,24 +22,25 @@ using Ragon.Server.Plugin.Web;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class AuthorizationOperation: IRagonOperation public sealed class AuthorizationOperation: BaseOperation
{ {
private Logger _logger = LogManager.GetCurrentClassLogger(); private Logger _logger = LogManager.GetCurrentClassLogger();
private readonly RagonWebHookPlugin _ragonWebHook; private readonly RagonWebHookPlugin _webhook;
private readonly RagonContextObserver _contextObserver; private readonly RagonContextObserver _observer;
private readonly RagonBuffer _writer; private readonly RagonBuffer _writer;
public AuthorizationOperation( public AuthorizationOperation(
RagonWebHookPlugin ragonWebHook, RagonBuffer reader,
RagonContextObserver contextObserver, RagonBuffer writer,
RagonBuffer writer) RagonWebHookPlugin webhook,
RagonContextObserver observer): base(reader, writer)
{ {
_ragonWebHook = ragonWebHook; _webhook = webhook;
_contextObserver = contextObserver; _observer = observer;
_writer = writer; _writer = writer;
} }
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public override void Handle(RagonContext context, byte[] data)
{ {
if (context.ConnectionStatus == ConnectionStatus.Authorized) if (context.ConnectionStatus == ConnectionStatus.Authorized)
{ {
@@ -54,13 +55,13 @@ public sealed class AuthorizationOperation: IRagonOperation
} }
var configuration = context.Configuration; var configuration = context.Configuration;
var key = reader.ReadString(); var key = Reader.ReadString();
var name = reader.ReadString(); var name = Reader.ReadString();
var payload = reader.ReadString(); var payload = Reader.ReadString();
if (key == configuration.ServerKey) if (key == configuration.ServerKey)
{ {
if (_ragonWebHook.RequestAuthorization(context, name, payload)) if (_webhook.RequestAuthorization(context, name, payload))
return; return;
var lobbyPlayer = new RagonLobbyPlayer(context.Connection, Guid.NewGuid().ToString(), name, payload); var lobbyPlayer = new RagonLobbyPlayer(context.Connection, Guid.NewGuid().ToString(), name, payload);
@@ -78,7 +79,7 @@ public sealed class AuthorizationOperation: IRagonOperation
{ {
context.ConnectionStatus = ConnectionStatus.Authorized; context.ConnectionStatus = ConnectionStatus.Authorized;
_contextObserver.OnAuthorized(context); _observer.OnAuthorized(context);
var playerId = context.LobbyPlayer.Id; var playerId = context.LobbyPlayer.Id;
var playerName = context.LobbyPlayer.Name; var playerName = context.LobbyPlayer.Name;
@@ -108,4 +109,6 @@ public sealed class AuthorizationOperation: IRagonOperation
_logger.Trace($"Connection {context.Connection.Id}"); _logger.Trace($"Connection {context.Connection.Id}");
} }
} }
@@ -18,7 +18,16 @@ using Ragon.Protocol;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public interface IRagonOperation public abstract class BaseOperation
{ {
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer); protected readonly RagonBuffer Reader;
protected readonly RagonBuffer Writer;
public BaseOperation(RagonBuffer reader, RagonBuffer writer)
{
Reader = reader;
Writer = writer;
}
public abstract void Handle(RagonContext context, byte[] data);
} }
@@ -20,18 +20,22 @@ using Ragon.Server.Entity;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class EntityCreateOperation : IRagonOperation public sealed class EntityCreateOperation : BaseOperation
{ {
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public EntityCreateOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
{
}
public override void Handle(RagonContext context, byte[] data)
{ {
var player = context.RoomPlayer; var player = context.RoomPlayer;
var room = context.Room; var room = context.Room;
var attachId = reader.ReadUShort(); var attachId = Reader.ReadUShort();
var entityType = reader.ReadUShort(); var entityType = Reader.ReadUShort();
var eventAuthority = (RagonAuthority) reader.ReadByte(); var eventAuthority = (RagonAuthority) Reader.ReadByte();
var propertiesCount = reader.ReadUShort(); var propertiesCount = Reader.ReadUShort();
var entityParameters = new RagonEntityParameters() var entityParameters = new RagonEntityParameters()
{ {
@@ -45,14 +49,14 @@ public sealed class EntityCreateOperation : IRagonOperation
var entity = new RagonEntity(entityParameters); var entity = new RagonEntity(entityParameters);
for (var i = 0; i < propertiesCount; i++) for (var i = 0; i < propertiesCount; i++)
{ {
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));
} }
if (reader.Capacity > 0) if (Reader.Capacity > 0)
entity.Payload.Read(reader); entity.Payload.Read(Reader);
var plugin = room.Plugin; var plugin = room.Plugin;
if (!plugin.OnEntityCreate(player, entity)) if (!plugin.OnEntityCreate(player, entity))
@@ -66,4 +70,6 @@ public sealed class EntityCreateOperation : IRagonOperation
_logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} created entity {entity.Id}:{entity.Type}"); _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} created entity {entity.Id}:{entity.Type}");
} }
} }
@@ -20,15 +20,19 @@ using Ragon.Server.Event;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class EntityEventOperation : IRagonOperation public sealed class EntityEventOperation : BaseOperation
{ {
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public EntityEventOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
{
}
public override void Handle(RagonContext context, byte[] data)
{ {
var player = context.RoomPlayer; var player = context.RoomPlayer;
var room = context.Room; var room = context.Room;
var entityId = reader.ReadUShort(); var entityId = Reader.ReadUShort();
if (!room.Entities.TryGetValue(entityId, out var ent)) if (!room.Entities.TryGetValue(entityId, out var ent))
{ {
@@ -36,16 +40,16 @@ public sealed class EntityEventOperation : IRagonOperation
return; return;
} }
var eventId = reader.ReadUShort(); var eventId = Reader.ReadUShort();
var eventMode = (RagonReplicationMode)reader.ReadByte(); var eventMode = (RagonReplicationMode)Reader.ReadByte();
var targetMode = (RagonTarget)reader.ReadByte(); var targetMode = (RagonTarget)Reader.ReadByte();
var targetPlayerPeerId = (ushort)0; var targetPlayerPeerId = (ushort)0;
if (targetMode == RagonTarget.Player) if (targetMode == RagonTarget.Player)
targetPlayerPeerId = reader.ReadUShort(); targetPlayerPeerId = Reader.ReadUShort();
var @event = new RagonEvent(player, eventId); var @event = new RagonEvent(player, eventId);
@event.Read(reader); @event.Read(Reader);
if (targetMode == RagonTarget.Player && room.Players.TryGetValue(targetPlayerPeerId, out var targetPlayer)) if (targetMode == RagonTarget.Player && room.Players.TryGetValue(targetPlayerPeerId, out var targetPlayer))
{ {
@@ -3,17 +3,21 @@ using Ragon.Protocol;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class EntityOwnershipOperation : IRagonOperation public sealed class EntityOwnershipOperation : BaseOperation
{ {
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public EntityOwnershipOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
{
}
public override void Handle(RagonContext context, byte[] data)
{ {
var currentOwner = context.RoomPlayer; var currentOwner = context.RoomPlayer;
var room = context.Room; var room = context.Room;
var entityId = reader.ReadUShort(); var entityId = Reader.ReadUShort();
var playerPeerId = reader.ReadUShort(); var playerPeerId = Reader.ReadUShort();
if (!room.Entities.TryGetValue(entityId, out var entity)) if (!room.Entities.TryGetValue(entityId, out var entity))
{ {
@@ -40,13 +44,13 @@ public sealed class EntityOwnershipOperation : IRagonOperation
_logger.Trace($"Entity {entity.Id} next owner {nextOwner.Connection.Id}"); _logger.Trace($"Entity {entity.Id} next owner {nextOwner.Connection.Id}");
writer.Clear(); Writer.Clear();
writer.WriteOperation(RagonOperation.OWNERSHIP_ENTITY_CHANGED); Writer.WriteOperation(RagonOperation.OWNERSHIP_ENTITY_CHANGED);
writer.WriteUShort(playerPeerId); Writer.WriteUShort(playerPeerId);
writer.WriteUShort(1); Writer.WriteUShort(1);
writer.WriteUShort(entity.Id); Writer.WriteUShort(entity.Id);
var sendData = writer.ToArray(); var sendData = Writer.ToArray();
foreach (var player in room.PlayerList) foreach (var player in room.PlayerList)
player.Connection.Reliable.Send(sendData); player.Connection.Reliable.Send(sendData);
} }
@@ -20,20 +20,24 @@ using Ragon.Server.Entity;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class EntityDestroyOperation: IRagonOperation public sealed class EntityDestroyOperation: BaseOperation
{ {
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public EntityDestroyOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
{
}
public override void Handle(RagonContext context, byte[] data)
{ {
var player = context.RoomPlayer; var player = context.RoomPlayer;
var room = context.Room; var room = context.Room;
var entityId = reader.ReadUShort(); var entityId = Reader.ReadUShort();
if (room.Entities.TryGetValue(entityId, out var entity)) if (room.Entities.TryGetValue(entityId, out var entity))
{ {
var payload = new RagonPayload(); var payload = new RagonPayload();
payload.Read(reader); payload.Read(Reader);
room.DetachEntity(entity); room.DetachEntity(entity);
player.DetachEntity(entity); player.DetachEntity(entity);
@@ -19,20 +19,24 @@ using Ragon.Protocol;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class EntityStateOperation: IRagonOperation public sealed class EntityStateOperation: BaseOperation
{ {
private readonly ILogger _logger = LogManager.GetCurrentClassLogger(); private readonly ILogger _logger = LogManager.GetCurrentClassLogger();
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public EntityStateOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
{
}
public override void Handle(RagonContext context, byte[] data)
{ {
var room = context.Room; var room = context.Room;
var player = context.RoomPlayer; var player = context.RoomPlayer;
var entitiesCount = reader.ReadUShort(); var entitiesCount = Reader.ReadUShort();
for (var entityIndex = 0; entityIndex < entitiesCount; entityIndex++) for (var entityIndex = 0; entityIndex < entitiesCount; entityIndex++)
{ {
var entityId = reader.ReadUShort(); var entityId = Reader.ReadUShort();
if (room.Entities.TryGetValue(entityId, out var entity) && entity.TryReadState(player, reader)) if (room.Entities.TryGetValue(entityId, out var entity) && entity.TryReadState(player, Reader))
{ {
room.Track(entity); room.Track(entity);
} }
@@ -23,20 +23,20 @@ using Ragon.Server.Room;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class RoomCreateOperation: IRagonOperation public sealed class RoomCreateOperation : BaseOperation
{ {
private readonly RagonRoomParameters _roomParameters = new(); private readonly RagonRoomParameters _roomParameters = new();
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
private readonly IServerPlugin _serverPlugin; private readonly IServerPlugin _serverPlugin;
private readonly RagonWebHookPlugin _ragonWebHookPlugin; private readonly RagonWebHookPlugin _ragonWebHookPlugin;
public RoomCreateOperation(IServerPlugin serverPlugin, RagonWebHookPlugin ragonWebHook) public RoomCreateOperation(RagonBuffer reader, RagonBuffer writer, IServerPlugin serverPlugin, RagonWebHookPlugin ragonWebHook) : base(reader, writer)
{ {
_serverPlugin = serverPlugin; _serverPlugin = serverPlugin;
_ragonWebHookPlugin = ragonWebHook; _ragonWebHookPlugin = ragonWebHook;
} }
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public override void Handle(RagonContext context, byte[] data)
{ {
if (context.ConnectionStatus == ConnectionStatus.Unauthorized) if (context.ConnectionStatus == ConnectionStatus.Unauthorized)
{ {
@@ -44,19 +44,19 @@ public sealed class RoomCreateOperation: IRagonOperation
return; return;
} }
var custom = reader.ReadBool(); var custom = Reader.ReadBool();
var roomId = Guid.NewGuid().ToString(); var roomId = Guid.NewGuid().ToString();
if (custom) if (custom)
{ {
roomId = reader.ReadString(); roomId = Reader.ReadString();
if (context.Lobby.FindRoomById(roomId, out _)) if (context.Lobby.FindRoomById(roomId, out _))
{ {
writer.Clear(); Writer.Clear();
writer.WriteOperation(RagonOperation.JOIN_FAILED); Writer.WriteOperation(RagonOperation.JOIN_FAILED);
writer.WriteString($"Room with id {roomId} already exists"); Writer.WriteString($"Room with id {roomId} already exists");
var sendData = writer.ToArray(); var sendData = Writer.ToArray();
context.Connection.Reliable.Send(sendData); context.Connection.Reliable.Send(sendData);
_logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} join failed to room {roomId}, room already exist"); _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} join failed to room {roomId}, room already exist");
@@ -64,13 +64,13 @@ public sealed class RoomCreateOperation: IRagonOperation
} }
} }
_roomParameters.Deserialize(reader); _roomParameters.Deserialize(Reader);
var information = new RoomInformation() var information = new RoomInformation()
{ {
Scene = _roomParameters.Scene, Scene = _roomParameters.Scene,
Max = _roomParameters.Max, Max = _roomParameters.Max,
Min = _roomParameters.Min, Min = _roomParameters.Min,
}; };
var lobbyPlayer = context.LobbyPlayer; var lobbyPlayer = context.LobbyPlayer;
@@ -89,7 +89,7 @@ public sealed class RoomCreateOperation: IRagonOperation
_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} with scene {information.Scene}");
JoinSuccess(roomPlayer, room, writer); JoinSuccess(roomPlayer, room, Writer);
_logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} joined to room {room.Id}"); _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} joined to room {room.Id}");
} }
@@ -101,8 +101,8 @@ public sealed class RoomCreateOperation: IRagonOperation
writer.WriteString(room.Id); writer.WriteString(room.Id);
writer.WriteString(player.Id); writer.WriteString(player.Id);
writer.WriteString(room.Owner.Id); writer.WriteString(room.Owner.Id);
writer.WriteUShort((ushort) room.PlayerMin); writer.WriteUShort((ushort)room.PlayerMin);
writer.WriteUShort((ushort) room.PlayerMax); writer.WriteUShort((ushort)room.PlayerMax);
writer.WriteString(room.Scene); writer.WriteString(room.Scene);
var sendData = writer.ToArray(); var sendData = writer.ToArray();
@@ -0,0 +1,47 @@
/*
* Copyright 2023 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 NLog;
using Ragon.Protocol;
namespace Ragon.Server.Handler;
public sealed class RoomDataOperation : BaseOperation
{
public RoomDataOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
{
}
public override void Handle(RagonContext context, byte[] data)
{
var player = context.RoomPlayer;
var room = context.Room;
Writer.Clear();
Writer.WriteOperation(RagonOperation.REPLICATE_RAW_DATA);
Writer.WriteUShort(player.Connection.Id);
var playerData = Writer.ToArray();
var payloadData = data;
var size = playerData.Length + payloadData.Length;
var sendData = new byte[size];
Array.Copy(playerData, 0, sendData, 0, playerData.Length);
Array.Copy(payloadData, 0, sendData, playerData.Length, payloadData.Length);
room.Broadcast(sendData);
}
}
@@ -0,0 +1,44 @@
using Ragon.Protocol;
using Ragon.Server.Event;
namespace Ragon.Server.Handler;
public class RoomEventOperation : BaseOperation
{
public RoomEventOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
{
}
public override void Handle(RagonContext context, byte[] data)
{
var room = context.Room;
var player = context.RoomPlayer;
var eventId = Reader.ReadUShort();
var replicationMode = (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);
Writer.Clear();
Writer.WriteUShort(eventId);
Writer.WriteUShort(player.Connection.Id);
Writer.WriteUShort((ushort) replicationMode);
var sendData = Writer.ToArray();
if (targetMode == RagonTarget.Player && room.Players.TryGetValue(targetPlayerPeerId, out var targetPlayer))
{
targetPlayer.Connection.Reliable.Send(sendData);
return;
}
foreach (var roomPlayer in room.ReadyPlayersList)
roomPlayer.Connection.Reliable.Send(sendData);
}
}
@@ -22,25 +22,25 @@ using Ragon.Server.Room;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class RoomJoinOperation : IRagonOperation public sealed class RoomJoinOperation : BaseOperation
{ {
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
private readonly RagonWebHookPlugin _webHook; private readonly RagonWebHookPlugin _webHook;
public RoomJoinOperation(RagonWebHookPlugin plugin) public RoomJoinOperation(RagonBuffer reader, RagonBuffer writer, RagonWebHookPlugin plugin) : base(reader, writer)
{ {
_webHook = plugin; _webHook = plugin;
} }
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
public override void Handle(RagonContext context, byte[] data)
{ {
var roomId = reader.ReadString(); var roomId = Reader.ReadString();
var lobbyPlayer = context.LobbyPlayer; var lobbyPlayer = context.LobbyPlayer;
if (!context.Lobby.FindRoomById(roomId, out var existsRoom)) if (!context.Lobby.FindRoomById(roomId, out var existsRoom))
{ {
JoinFailed(context, writer); JoinFailed(context, Writer);
_logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} failed to join room {roomId}"); _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} failed to join room {roomId}");
return; return;
@@ -54,7 +54,7 @@ public sealed class RoomJoinOperation : IRagonOperation
_webHook.RoomJoined(context, existsRoom, player); _webHook.RoomJoined(context, existsRoom, player);
JoinSuccess(context, existsRoom, writer); JoinSuccess(context, existsRoom, Writer);
_logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} joined to {existsRoom.Id}"); _logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} joined to {existsRoom.Id}");
} }
@@ -66,8 +66,8 @@ public sealed class RoomJoinOperation : IRagonOperation
writer.WriteString(room.Id); writer.WriteString(room.Id);
writer.WriteString(context.RoomPlayer.Id); writer.WriteString(context.RoomPlayer.Id);
writer.WriteString(room.Owner.Id); writer.WriteString(room.Owner.Id);
writer.WriteUShort((ushort) room.PlayerMin); writer.WriteUShort((ushort)room.PlayerMin);
writer.WriteUShort((ushort) room.PlayerMax); writer.WriteUShort((ushort)room.PlayerMax);
writer.WriteString(room.Scene); writer.WriteString(room.Scene);
var sendData = writer.ToArray(); var sendData = writer.ToArray();
@@ -23,20 +23,20 @@ using Ragon.Server.Room;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class RoomJoinOrCreateOperation : IRagonOperation public sealed class RoomJoinOrCreateOperation : BaseOperation
{ {
private readonly RagonRoomParameters _roomParameters = new(); private readonly RagonRoomParameters _roomParameters = new();
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
private readonly IServerPlugin _serverPlugin; private readonly IServerPlugin _serverPlugin;
private readonly RagonWebHookPlugin _ragonWebHookPlugin; private readonly RagonWebHookPlugin _ragonWebHookPlugin;
public RoomJoinOrCreateOperation(IServerPlugin serverPlugin, RagonWebHookPlugin plugin) public RoomJoinOrCreateOperation(RagonBuffer reader, RagonBuffer writer, IServerPlugin serverPlugin, RagonWebHookPlugin plugin): base(reader, writer)
{ {
_serverPlugin = serverPlugin; _serverPlugin = serverPlugin;
_ragonWebHookPlugin = plugin; _ragonWebHookPlugin = plugin;
} }
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public override void Handle(RagonContext context, byte[] data)
{ {
if (context.ConnectionStatus == ConnectionStatus.Unauthorized) if (context.ConnectionStatus == ConnectionStatus.Unauthorized)
{ {
@@ -47,7 +47,7 @@ public sealed class RoomJoinOrCreateOperation : IRagonOperation
var roomId = Guid.NewGuid().ToString(); var roomId = Guid.NewGuid().ToString();
var lobbyPlayer = context.LobbyPlayer; var lobbyPlayer = context.LobbyPlayer;
_roomParameters.Deserialize(reader); _roomParameters.Deserialize(Reader);
if (context.Lobby.FindRoomByScene(_roomParameters.Scene, out var existsRoom)) if (context.Lobby.FindRoomByScene(_roomParameters.Scene, out var existsRoom))
{ {
@@ -56,7 +56,7 @@ public sealed class RoomJoinOrCreateOperation : IRagonOperation
_ragonWebHookPlugin.RoomJoined(context, existsRoom, player); _ragonWebHookPlugin.RoomJoined(context, existsRoom, player);
JoinSuccess(player, existsRoom, writer); JoinSuccess(player, existsRoom, Writer);
} }
else else
{ {
@@ -79,7 +79,7 @@ public sealed class RoomJoinOrCreateOperation : IRagonOperation
_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} with scene {information.Scene}");
JoinSuccess(roomPlayer, room, writer); JoinSuccess(roomPlayer, room, Writer);
} }
} }
@@ -21,16 +21,17 @@ using Ragon.Server.Plugin.Web;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class RoomLeaveOperation: IRagonOperation public sealed class RoomLeaveOperation: BaseOperation
{ {
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
private readonly RagonWebHookPlugin _webHook; private readonly RagonWebHookPlugin _webHook;
public RoomLeaveOperation(RagonWebHookPlugin plugin)
public RoomLeaveOperation(RagonBuffer reader, RagonBuffer writer, RagonWebHookPlugin plugin): base(reader, writer)
{ {
_webHook = plugin; _webHook = plugin;
} }
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public override void Handle(RagonContext context, byte[] data)
{ {
var room = context.Room; var room = context.Room;
var roomPlayer = context.RoomPlayer; var roomPlayer = context.RoomPlayer;
@@ -4,10 +4,15 @@ using Ragon.Server.Entity;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class RoomOwnershipOperation : IRagonOperation public sealed class RoomOwnershipOperation : BaseOperation
{ {
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
public RoomOwnershipOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
{
}
public override void Handle(RagonContext context, byte[] data)
{ {
} }
@@ -20,16 +20,18 @@ using Ragon.Protocol;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public class SceneLoadOperation: IRagonOperation public class SceneLoadOperation: BaseOperation
{ {
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public SceneLoadOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer) {}
public override void Handle(RagonContext context, byte[] data)
{ {
var roomOwner = context.Room.Owner; var roomOwner = context.Room.Owner;
var currentPlayer = context.RoomPlayer; var currentPlayer = context.RoomPlayer;
var room = context.Room; var room = context.Room;
var sceneName = reader.ReadString(); var sceneName = Reader.ReadString();
if (roomOwner.Connection.Id != currentPlayer.Connection.Id) if (roomOwner.Connection.Id != currentPlayer.Connection.Id)
{ {
@@ -39,11 +41,11 @@ public class SceneLoadOperation: IRagonOperation
room.UpdateMap(sceneName); room.UpdateMap(sceneName);
writer.Clear(); Writer.Clear();
writer.WriteOperation(RagonOperation.LOAD_SCENE); Writer.WriteOperation(RagonOperation.LOAD_SCENE);
writer.WriteString(sceneName); Writer.WriteString(sceneName);
var sendData = writer.ToArray(); var sendData = Writer.ToArray();
foreach (var player in room.PlayerList) foreach (var player in room.PlayerList)
player.Connection.Reliable.Send(sendData); player.Connection.Reliable.Send(sendData);
} }
@@ -22,16 +22,16 @@ using Ragon.Server.Room;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public sealed class SceneLoadedOperation : IRagonOperation public sealed class SceneLoadedOperation : BaseOperation
{ {
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
public SceneLoadedOperation() public SceneLoadedOperation(RagonBuffer reader, RagonBuffer writer): base(reader, writer)
{ {
} }
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public override void Handle(RagonContext context, byte[] data)
{ {
if (context.ConnectionStatus == ConnectionStatus.Unauthorized) if (context.ConnectionStatus == ConnectionStatus.Unauthorized)
return; return;
@@ -42,13 +42,13 @@ public sealed class SceneLoadedOperation : IRagonOperation
if (player == owner) if (player == owner)
{ {
var statics = reader.ReadUShort(); var statics = Reader.ReadUShort();
for (var staticIndex = 0; staticIndex < statics; staticIndex++) for (var staticIndex = 0; staticIndex < statics; staticIndex++)
{ {
var entityType = reader.ReadUShort(); var entityType = Reader.ReadUShort();
var eventAuthority = (RagonAuthority)reader.ReadByte(); var eventAuthority = (RagonAuthority)Reader.ReadByte();
var staticId = reader.ReadUShort(); var staticId = Reader.ReadUShort();
var propertiesCount = reader.ReadUShort(); var propertiesCount = Reader.ReadUShort();
var entityParameters = new RagonEntityParameters() var entityParameters = new RagonEntityParameters()
{ {
@@ -62,8 +62,8 @@ public sealed class SceneLoadedOperation : IRagonOperation
var entity = new RagonEntity(entityParameters); var entity = new RagonEntity(entityParameters);
for (var propertyIndex = 0; propertyIndex < propertiesCount; propertyIndex++) for (var propertyIndex = 0; propertyIndex < propertiesCount; propertyIndex++)
{ {
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));
} }
@@ -86,14 +86,14 @@ public sealed class SceneLoadedOperation : IRagonOperation
foreach (var roomPlayer in room.WaitPlayersList) foreach (var roomPlayer in room.WaitPlayersList)
{ {
DispatchPlayerJoinExcludePlayer(room, roomPlayer, writer); DispatchPlayerJoinExcludePlayer(room, roomPlayer, Writer);
roomPlayer.SetReady(); roomPlayer.SetReady();
} }
room.UpdateReadyPlayerList(); room.UpdateReadyPlayerList();
DispatchSnapshot(room, room.WaitPlayersList, writer); DispatchSnapshot(room, room.WaitPlayersList, Writer);
room.WaitPlayersList.Clear(); room.WaitPlayersList.Clear();
} }
@@ -101,14 +101,14 @@ public sealed class SceneLoadedOperation : IRagonOperation
{ {
player.SetReady(); player.SetReady();
DispatchPlayerJoinExcludePlayer(room, player, writer); DispatchPlayerJoinExcludePlayer(room, player, Writer);
room.UpdateReadyPlayerList(); room.UpdateReadyPlayerList();
DispatchSnapshot(room, new List<RagonRoomPlayer>() { player }, writer); DispatchSnapshot(room, new List<RagonRoomPlayer>() { player }, Writer);
foreach (var entity in room.EntityList) foreach (var entity in room.EntityList)
entity.RestoreBufferedEvents(player, writer); entity.RestoreBufferedEvents(player, Writer);
} }
else else
{ {
@@ -2,12 +2,16 @@ using Ragon.Protocol;
namespace Ragon.Server.Handler; namespace Ragon.Server.Handler;
public class TimestampSyncOperation: IRagonOperation public class TimestampSyncOperation: BaseOperation
{ {
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer) public TimestampSyncOperation(RagonBuffer reader, RagonBuffer writer) : base(reader, writer)
{ {
var timestamp0 = reader.Read(32); }
var timestamp1 = reader.Read(32);
public override void Handle(RagonContext context, byte[] data)
{
var timestamp0 = Reader.Read(32);
var timestamp1 = Reader.Read(32);
var value = new DoubleToUInt() { Int0 = timestamp0, Int1 = timestamp1 }; var value = new DoubleToUInt() { Int0 = timestamp0, Int1 = timestamp1 };
context.RoomPlayer?.SetTimestamp(value.Double); context.RoomPlayer?.SetTimestamp(value.Double);
@@ -21,4 +21,5 @@ namespace Ragon.Server.IO;
public interface INetworkChannel public interface INetworkChannel
{ {
void Send(byte[] data); void Send(byte[] data);
void Send(RagonBuffer buffer);
} }
+1 -1
View File
@@ -21,5 +21,5 @@ public interface INetworkListener
void OnConnected(INetworkConnection connection); void OnConnected(INetworkConnection connection);
void OnDisconnected(INetworkConnection connection); void OnDisconnected(INetworkConnection connection);
void OnTimeout(INetworkConnection connection); void OnTimeout(INetworkConnection connection);
void OnData(INetworkConnection connection, byte[] data); void OnData(INetworkConnection connection, NetworkChannel channel, byte[] data);
} }
@@ -0,0 +1,8 @@
namespace Ragon.Server.IO;
public enum NetworkChannel
{
RELIABLE = 1,
UNRELIABLE = 2,
RAW = 3,
}
+30 -26
View File
@@ -31,7 +31,7 @@ public class RagonServer : IRagonServer, INetworkListener
{ {
private readonly Logger _logger = LogManager.GetCurrentClassLogger(); private readonly Logger _logger = LogManager.GetCurrentClassLogger();
private readonly INetworkServer _server; private readonly INetworkServer _server;
private readonly IRagonOperation[] _handlers; private readonly BaseOperation[] _handlers;
private readonly IRagonLobby _lobby; private readonly IRagonLobby _lobby;
private readonly IServerPlugin _serverPlugin; private readonly IServerPlugin _serverPlugin;
private readonly Thread _dedicatedThread; private readonly Thread _dedicatedThread;
@@ -73,22 +73,23 @@ public class RagonServer : IRagonServer, INetworkListener
_serverPlugin.OnAttached(this); _serverPlugin.OnAttached(this);
_handlers = new IRagonOperation[byte.MaxValue]; _handlers = new BaseOperation[byte.MaxValue];
_handlers[(byte) RagonOperation.AUTHORIZE] = new AuthorizationOperation(_webhooks, contextObserver, _writer); _handlers[(byte)RagonOperation.AUTHORIZE] = new AuthorizationOperation(_reader, _writer, _webhooks, contextObserver);
_handlers[(byte) RagonOperation.JOIN_OR_CREATE_ROOM] = new RoomJoinOrCreateOperation(plugin, _webhooks); _handlers[(byte)RagonOperation.JOIN_OR_CREATE_ROOM] = new RoomJoinOrCreateOperation(_reader, _writer, plugin, _webhooks);
_handlers[(byte) RagonOperation.CREATE_ROOM] = new RoomCreateOperation(plugin, _webhooks); _handlers[(byte)RagonOperation.CREATE_ROOM] = new RoomCreateOperation(_reader, _writer, plugin, _webhooks);
_handlers[(byte) RagonOperation.JOIN_ROOM] = new RoomJoinOperation(_webhooks); _handlers[(byte)RagonOperation.JOIN_ROOM] = new RoomJoinOperation(_reader, _writer, _webhooks);
_handlers[(byte) RagonOperation.LEAVE_ROOM] = new RoomLeaveOperation(_webhooks); _handlers[(byte)RagonOperation.LEAVE_ROOM] = new RoomLeaveOperation(_reader, _writer, _webhooks);
_handlers[(byte) RagonOperation.LOAD_SCENE] = new SceneLoadOperation(); _handlers[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadOperation(_reader, _writer);
_handlers[(byte) RagonOperation.SCENE_LOADED] = new SceneLoadedOperation(); _handlers[(byte)RagonOperation.SCENE_LOADED] = new SceneLoadedOperation(_reader, _writer);
_handlers[(byte) RagonOperation.CREATE_ENTITY] = new EntityCreateOperation(); _handlers[(byte)RagonOperation.CREATE_ENTITY] = new EntityCreateOperation(_reader, _writer);
_handlers[(byte) RagonOperation.REMOVE_ENTITY] = new EntityDestroyOperation(); _handlers[(byte)RagonOperation.REMOVE_ENTITY] = new EntityDestroyOperation(_reader, _writer);
_handlers[(byte) RagonOperation.REPLICATE_ENTITY_EVENT] = new EntityEventOperation(); _handlers[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] = new EntityEventOperation(_reader, _writer);
_handlers[(byte) RagonOperation.REPLICATE_ENTITY_STATE] = new EntityStateOperation(); _handlers[(byte)RagonOperation.REPLICATE_ENTITY_STATE] = new EntityStateOperation(_reader, _writer);
_handlers[(byte) RagonOperation.TRANSFER_ROOM_OWNERSHIP] = new EntityOwnershipOperation(); _handlers[(byte)RagonOperation.TRANSFER_ROOM_OWNERSHIP] = new EntityOwnershipOperation(_reader, _writer);
_handlers[(byte) RagonOperation.TRANSFER_ENTITY_OWNERSHIP] = new EntityOwnershipOperation(); _handlers[(byte)RagonOperation.TRANSFER_ENTITY_OWNERSHIP] = new EntityOwnershipOperation(_reader, _writer);
_handlers[(byte)RagonOperation.REPLICATE_RAW_DATA] = new RoomDataOperation(); _handlers[(byte)RagonOperation.TIMESTAMP_SYNCHRONIZATION] = new TimestampSyncOperation(_reader, _writer);
_handlers[(byte)RagonOperation.TIMESTAMP_SYNCHRONIZATION] = new TimestampSyncOperation(); _handlers[(byte)RagonOperation.REPLICATE_ROOM_EVENT] = new RoomEventOperation(_reader, _writer);
_handlers[(byte)RagonOperation.REPLICATE_RAW_DATA] = new RoomDataOperation(_reader, _writer);
_logger.Trace($"Server Tick Rate: {_configuration.ServerTickRate}"); _logger.Trace($"Server Tick Rate: {_configuration.ServerTickRate}");
} }
@@ -185,7 +186,7 @@ public class RagonServer : IRagonServer, INetworkListener
} }
} }
public void OnData(INetworkConnection connection, byte[] data) public void OnData(INetworkConnection connection, NetworkChannel channel, byte[] data)
{ {
try try
{ {
@@ -193,10 +194,17 @@ public class RagonServer : IRagonServer, INetworkListener
{ {
_writer.Clear(); _writer.Clear();
_reader.Clear(); _reader.Clear();
if (channel == NetworkChannel.RAW)
{
_handlers[(byte)RagonOperation.REPLICATE_RAW_DATA].Handle(context, data);
return;
}
_reader.FromArray(data); _reader.FromArray(data);
var operation = _reader.ReadByte(); var operation = _reader.ReadByte();
_handlers[operation].Handle(context, _reader, _writer); _handlers[operation].Handle(context, data);
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -222,22 +230,18 @@ public class RagonServer : IRagonServer, INetworkListener
_server.BroadcastUnreliable(sendData); _server.BroadcastUnreliable(sendData);
} }
public IRagonOperation ResolveOperation(RagonOperation operation) public BaseOperation ResolveOperation(RagonOperation operation)
{ {
return _handlers[(byte)operation]; return _handlers[(byte)operation];
} }
public RagonLobbyPlayer? GetPlayerByConnection(INetworkConnection connection) public RagonLobbyPlayer? GetPlayerByConnection(INetworkConnection connection)
{ {
return _contextsByConnection.TryGetValue(connection.Id, out var context) ? return _contextsByConnection.TryGetValue(connection.Id, out var context) ? context.LobbyPlayer : null;
context.LobbyPlayer :
null;
} }
public RagonLobbyPlayer? GetPlayerById(string playerId) public RagonLobbyPlayer? GetPlayerById(string playerId)
{ {
return _contextsByPlayerId.TryGetValue(playerId, out var context) ? return _contextsByPlayerId.TryGetValue(playerId, out var context) ? context.LobbyPlayer : null;
context.LobbyPlayer :
null;
} }
} }