Compare commits
3 Commits
v1.4.0-preview
...
v1.4.1
| Author | SHA1 | Date | |
|---|---|---|---|
| f7719e1bca | |||
| 211b24fe2b | |||
| bdf7d4f94a |
@@ -63,6 +63,7 @@ namespace Ragon.Relay
|
|||||||
Protocol = configuration.Protocol,
|
Protocol = configuration.Protocol,
|
||||||
ServerKey = configuration.ServerKey,
|
ServerKey = configuration.ServerKey,
|
||||||
ServerTickRate = configuration.ServerTickRate,
|
ServerTickRate = configuration.ServerTickRate,
|
||||||
|
ServerAddress = configuration.ServerAddress,
|
||||||
};
|
};
|
||||||
|
|
||||||
var relay = new RagonServer(networkServer, plugin, serverConfiguration);
|
var relay = new RagonServer(networkServer, plugin, serverConfiguration);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ namespace Ragon.Relay
|
|||||||
{
|
{
|
||||||
public string ServerKey;
|
public string ServerKey;
|
||||||
public string ServerType;
|
public string ServerType;
|
||||||
|
public string ServerAddress;
|
||||||
public ushort ServerTickRate;
|
public ushort ServerTickRate;
|
||||||
public string Protocol;
|
public string Protocol;
|
||||||
public ushort Port;
|
public ushort Port;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"serverKey": "defaultkey",
|
"serverKey": "defaultkey",
|
||||||
"serverType": "enet",
|
"serverType": "enet",
|
||||||
|
"serverAddress": "*",
|
||||||
"serverTickRate": 30,
|
"serverTickRate": 30,
|
||||||
"protocol": "1.0.0",
|
"protocol": "1.0.0",
|
||||||
"port": 5000,
|
"port": 5000,
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ namespace Ragon.Server.ENetServer
|
|||||||
_host.Create(address, _connections.Length, 2, 0, 0, 1024 * 1024);
|
_host.Create(address, _connections.Length, 2, 0, 0, 1024 * 1024);
|
||||||
|
|
||||||
var protocolDecoded = RagonVersion.Parse(_protocol);
|
var protocolDecoded = RagonVersion.Parse(_protocol);
|
||||||
_logger.Info($"Listen at 127.0.0.1:{configuration.Port}");
|
_logger.Info($"Listen at {configuration.Address}:{configuration.Port}");
|
||||||
_logger.Info($"Protocol: {protocolDecoded}");
|
_logger.Info($"Protocol: {protocolDecoded}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -146,13 +146,13 @@ public class WebSocketServer : INetworkServer
|
|||||||
_connections = new WebSocketConnection[configuration.LimitConnections];
|
_connections = new WebSocketConnection[configuration.LimitConnections];
|
||||||
|
|
||||||
_httpListener = new HttpListener();
|
_httpListener = new HttpListener();
|
||||||
_httpListener.Prefixes.Add($"http://+:{configuration.Port}/");
|
_httpListener.Prefixes.Add($"http://{configuration.Address}:{configuration.Port}/");
|
||||||
_httpListener.Start();
|
_httpListener.Start();
|
||||||
|
|
||||||
_executor.Run(() => StartAccept(_cancellationTokenSource.Token));
|
_executor.Run(() => StartAccept(_cancellationTokenSource.Token));
|
||||||
|
|
||||||
var protocolDecoded = RagonVersion.Parse(configuration.Protocol);
|
var protocolDecoded = RagonVersion.Parse(configuration.Protocol);
|
||||||
_logger.Info($"Listen at http://0.0.0.0:{configuration.Port}/");
|
_logger.Info($"Listen at http://{configuration.Address}:{configuration.Port}/");
|
||||||
_logger.Info($"Protocol: {protocolDecoded}");
|
_logger.Info($"Protocol: {protocolDecoded}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -75,6 +75,8 @@ namespace Ragon.Server.Handler
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
_logger.Warning($"Invalid key for connection {context.Connection.Id}");
|
||||||
|
|
||||||
Reject(context);
|
Reject(context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -100,7 +102,7 @@ namespace Ragon.Server.Handler
|
|||||||
var sendData = _writer.ToArray();
|
var sendData = _writer.ToArray();
|
||||||
context.Connection.Reliable.Send(sendData);
|
context.Connection.Reliable.Send(sendData);
|
||||||
|
|
||||||
_logger.Trace($"Connection {context.Connection.Id} as {playerId}|{context.LobbyPlayer.Name} authorized");
|
_logger.Trace($"Approved {context.Connection.Id} as {playerId}|{context.LobbyPlayer.Name}");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Reject(RagonContext context)
|
public void Reject(RagonContext context)
|
||||||
@@ -113,7 +115,7 @@ namespace Ragon.Server.Handler
|
|||||||
context.Connection.Reliable.Send(sendData);
|
context.Connection.Reliable.Send(sendData);
|
||||||
context.Connection.Close();
|
context.Connection.Close();
|
||||||
|
|
||||||
_logger.Trace($"Connection {context.Connection.Id}");
|
_logger.Trace($"Rejected Connectin:{context.Connection.Id}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -27,7 +27,7 @@ namespace Ragon.Server;
|
|||||||
|
|
||||||
public class RagonServer : IRagonServer, INetworkListener
|
public class RagonServer : IRagonServer, INetworkListener
|
||||||
{
|
{
|
||||||
private const string ServerVersion = "1.4.0";
|
private const string ServerVersion = "1.4.1";
|
||||||
|
|
||||||
private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(RagonServer));
|
private readonly IRagonLogger _logger = LoggerManager.GetLogger(nameof(RagonServer));
|
||||||
private readonly INetworkServer _server;
|
private readonly INetworkServer _server;
|
||||||
@@ -66,7 +66,6 @@ public class RagonServer : IRagonServer, INetworkListener
|
|||||||
_timer = new Stopwatch();
|
_timer = new Stopwatch();
|
||||||
|
|
||||||
var contextObserver = new RagonContextObserver(_contextsByPlayerId);
|
var contextObserver = new RagonContextObserver(_contextsByPlayerId);
|
||||||
|
|
||||||
_scheduler.Run(new RagonActionTimer(SendRoomList, 2.0f));
|
_scheduler.Run(new RagonActionTimer(SendRoomList, 2.0f));
|
||||||
_scheduler.Run(new RagonActionTimer(SendPlayerUserData, 0.1f));
|
_scheduler.Run(new RagonActionTimer(SendPlayerUserData, 0.1f));
|
||||||
_scheduler.Run(new RagonActionTimer(SendRoomUserData, 0.1f));
|
_scheduler.Run(new RagonActionTimer(SendRoomUserData, 0.1f));
|
||||||
@@ -119,7 +118,7 @@ public class RagonServer : IRagonServer, INetworkListener
|
|||||||
{
|
{
|
||||||
LimitConnections = _configuration.LimitConnections,
|
LimitConnections = _configuration.LimitConnections,
|
||||||
Protocol = RagonVersion.Parse(_configuration.Protocol),
|
Protocol = RagonVersion.Parse(_configuration.Protocol),
|
||||||
Address = "0.0.0.0",
|
Address = _configuration.ServerAddress,
|
||||||
Port = _configuration.Port,
|
Port = _configuration.Port,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -156,7 +155,9 @@ public class RagonServer : IRagonServer, INetworkListener
|
|||||||
|
|
||||||
_lobby.RemoveIfEmpty(room);
|
_lobby.RemoveIfEmpty(room);
|
||||||
}
|
}
|
||||||
_contextsByPlayerId.Remove(context.LobbyPlayer.Id);
|
|
||||||
|
if (context.ConnectionStatus == ConnectionStatus.Authorized)
|
||||||
|
_contextsByPlayerId.Remove(context.LobbyPlayer.Id);
|
||||||
|
|
||||||
_logger.Trace($"Disconnected: {connection.Id}");
|
_logger.Trace($"Disconnected: {connection.Id}");
|
||||||
}
|
}
|
||||||
@@ -176,7 +177,9 @@ public class RagonServer : IRagonServer, INetworkListener
|
|||||||
room.DetachPlayer(context.RoomPlayer);
|
room.DetachPlayer(context.RoomPlayer);
|
||||||
_lobby.RemoveIfEmpty(room);
|
_lobby.RemoveIfEmpty(room);
|
||||||
}
|
}
|
||||||
_contextsByPlayerId.Remove(context.LobbyPlayer.Id);
|
|
||||||
|
if (context.ConnectionStatus == ConnectionStatus.Authorized)
|
||||||
|
_contextsByPlayerId.Remove(context.LobbyPlayer.Id);
|
||||||
|
|
||||||
_logger.Trace($"Timeout: {connection.Id}|{context.LobbyPlayer.Name}|{context.LobbyPlayer.Id}");
|
_logger.Trace($"Timeout: {connection.Id}|{context.LobbyPlayer.Name}|{context.LobbyPlayer.Id}");
|
||||||
}
|
}
|
||||||
@@ -287,7 +290,7 @@ public class RagonServer : IRagonServer, INetworkListener
|
|||||||
|
|
||||||
private void CopyrightInfo()
|
private void CopyrightInfo()
|
||||||
{
|
{
|
||||||
_logger.Info($"Ragon Server Version: {ServerVersion}");
|
_logger.Info($"Server Version: {ServerVersion}");
|
||||||
_logger.Info($"Machine Name: {Environment.MachineName}");
|
_logger.Info($"Machine Name: {Environment.MachineName}");
|
||||||
_logger.Info($"OS: {Environment.OSVersion}");
|
_logger.Info($"OS: {Environment.OSVersion}");
|
||||||
_logger.Info($"Processors: {Environment.ProcessorCount}");
|
_logger.Info($"Processors: {Environment.ProcessorCount}");
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ public enum ServerType
|
|||||||
public struct RagonServerConfiguration
|
public struct RagonServerConfiguration
|
||||||
{
|
{
|
||||||
public string ServerKey;
|
public string ServerKey;
|
||||||
|
public string ServerAddress;
|
||||||
public ushort ServerTickRate;
|
public ushort ServerTickRate;
|
||||||
public string Protocol;
|
public string Protocol;
|
||||||
public ushort Port;
|
public ushort Port;
|
||||||
|
|||||||
Reference in New Issue
Block a user