OpenCodeBox/fishbait
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent LLB from registering the same LRM node twice

Browse source
This commit is contained in:
Derek S 2021-04-05 23:43:48 -05:00
parent 35bd75bc05
commit 137ff64d17
3 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Config.cs
View file

@ -12,5 +12,6 @@ namespace LightReflectiveMirror.LoadBalancing
public string AuthKey = "AuthKey"; public string AuthKey = "AuthKey";
public ushort EndpointPort = 7070; public ushort EndpointPort = 7070;
public ushort RelayEndpointPort = 8080; public ushort RelayEndpointPort = 8080;
public bool ShowDebugLogs = false;
} }
} }

20
LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Endpoint.cs
View file

@ -33,15 +33,25 @@ namespace LightReflectiveMirror.LoadBalancing
string address = context.Request.RemoteEndPoint.Address.ToString(); string address = context.Request.RemoteEndPoint.Address.ToString();
Console.WriteLine("Received auth req [" + receivedAuthKey + "] == [" + Program.conf.AuthKey + "]"); if(Program.showDebugLogs)
Console.WriteLine("Received auth req [" + receivedAuthKey + "] == [" + Program.conf.AuthKey + "]");
// if server is authenticated // if server is authenticated
if (receivedAuthKey != null && address != null && endpointPort != null && gamePort != null && receivedAuthKey == Program.conf.AuthKey) if (receivedAuthKey != null && address != null && endpointPort != null && gamePort != null && receivedAuthKey == Program.conf.AuthKey)
{ {
Console.WriteLine($"Server accepted: {address}:{gamePort}"); if(Program.showDebugLogs)
var _gamePort = Convert.ToUInt16(gamePort); Console.WriteLine($"Server accepted: {address}:{gamePort}");
var _endpointPort = Convert.ToUInt16(endpointPort);
await Program.instance.AddServer(address, _gamePort, _endpointPort); try
{
var _gamePort = Convert.ToUInt16(gamePort);
var _endpointPort = Convert.ToUInt16(endpointPort);
await Program.instance.AddServer(address, _gamePort, _endpointPort);
}
catch
{
await context.Response.SendResponseAsync(HttpStatusCode.BadRequest);
}
await context.Response.SendResponseAsync(HttpStatusCode.Ok); await context.Response.SendResponseAsync(HttpStatusCode.Ok);
} }

30
LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program.cs
View file

@ -17,6 +17,7 @@ namespace LightReflectiveMirror.LoadBalancing
public Dictionary<RelayAddress, RelayServerInfo> availableRelayServers = new(); public Dictionary<RelayAddress, RelayServerInfo> availableRelayServers = new();
private int _pingDelay = 10000; private int _pingDelay = 10000;
public static bool showDebugLogs = false;
const string API_PATH = "/api/stats"; const string API_PATH = "/api/stats";
const string CONFIG_PATH = "config.json"; const string CONFIG_PATH = "config.json";
@ -41,6 +42,7 @@ namespace LightReflectiveMirror.LoadBalancing
{ {
conf = JsonConvert.DeserializeObject<Config>(File.ReadAllText(CONFIG_PATH)); conf = JsonConvert.DeserializeObject<Config>(File.ReadAllText(CONFIG_PATH));
_pingDelay = conf.ConnectedServerPingRate; _pingDelay = conf.ConnectedServerPingRate;
showDebugLogs = conf.ShowDebugLogs;
if (new EndpointServer().Start(conf.EndpointPort)) if (new EndpointServer().Start(conf.EndpointPort))
WriteLogMessage("Endpoint server started successfully", ConsoleColor.Green); WriteLogMessage("Endpoint server started successfully", ConsoleColor.Green);
@ -58,13 +60,21 @@ namespace LightReflectiveMirror.LoadBalancing
public async Task AddServer(string serverIP, ushort port, ushort endpointPort) public async Task AddServer(string serverIP, ushort port, ushort endpointPort)
{ {
var relayAddr = new RelayAddress { Port = port, EndpointPort = endpointPort, Address = serverIP };
if (availableRelayServers.ContainsKey(relayAddr))
{
WriteLogMessage($"LRM Node {serverIP}:{port} tried to register while already registered!");
return;
}
var stats = await ManualPingServer(serverIP, endpointPort); var stats = await ManualPingServer(serverIP, endpointPort);
if(stats.HasValue) if (stats.HasValue)
availableRelayServers.Add(new RelayAddress { Port = port, EndpointPort = endpointPort, Address = serverIP }, stats.Value); availableRelayServers.Add(relayAddr, stats.Value);
} }
public async Task<RelayServerInfo?> ManualPingServer(string serverIP, ushort port) public async Task<RelayServerInfo?> ManualPingServer(string serverIP, ushort port)
{ {
using (WebClient wc = new WebClient()) using (WebClient wc = new WebClient())
{ {
@ -74,7 +84,7 @@ namespace LightReflectiveMirror.LoadBalancing
return JsonConvert.DeserializeObject<RelayServerInfo>(receivedStats); return JsonConvert.DeserializeObject<RelayServerInfo>(receivedStats);
} }
catch(Exception e) catch (Exception e)
{ {
// Server failed to respond to stats, dont add to load balancer. // Server failed to respond to stats, dont add to load balancer.
return null; return null;
@ -103,12 +113,13 @@ namespace LightReflectiveMirror.LoadBalancing
{ {
while (true) while (true)
{ {
WriteLogMessage("Pinging " + availableRelayServers.Count + " available relays"); if (showDebugLogs)
WriteLogMessage("Pinging " + availableRelayServers.Count + " available relays");
// Create a new list so we can modify the collection in our loop. // Create a new list so we can modify the collection in our loop.
var keys = new List<RelayAddress>(availableRelayServers.Keys); var keys = new List<RelayAddress>(availableRelayServers.Keys);
for(int i = 0; i < keys.Count; i++) for (int i = 0; i < keys.Count; i++)
{ {
string url = $"http://{keys[i].Address}:{keys[i].EndpointPort}{API_PATH}"; string url = $"http://{keys[i].Address}:{keys[i].EndpointPort}{API_PATH}";
@ -119,7 +130,8 @@ namespace LightReflectiveMirror.LoadBalancing
var serverStats = wc.DownloadString(url); var serverStats = wc.DownloadString(url);
var deserializedData = JsonConvert.DeserializeObject<RelayServerInfo>(serverStats); var deserializedData = JsonConvert.DeserializeObject<RelayServerInfo>(serverStats);
WriteLogMessage("Server " + keys[i].Address + " still exists, keeping in collection."); if (showDebugLogs)
WriteLogMessage("Server " + keys[i].Address + " still exists, keeping in collection.");
if (availableRelayServers.ContainsKey(keys[i])) if (availableRelayServers.ContainsKey(keys[i]))
availableRelayServers[keys[i]] = deserializedData; availableRelayServers[keys[i]] = deserializedData;
@ -130,7 +142,8 @@ namespace LightReflectiveMirror.LoadBalancing
{ {
// server doesnt exist anymore probably // server doesnt exist anymore probably
// do more shit here // do more shit here
WriteLogMessage("Server " + keys[i] + " does not exist anymore, removing", ConsoleColor.Red); if (showDebugLogs)
WriteLogMessage("Server " + keys[i] + " does not exist anymore, removing", ConsoleColor.Red);
availableRelayServers.Remove(keys[i]); availableRelayServers.Remove(keys[i]);
} }
} }
@ -214,5 +227,4 @@ namespace LightReflectiveMirror.LoadBalancing
public RelayAddress relayInfo; public RelayAddress relayInfo;
} }
} }