Backups/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We don't need a MasterServer class

Browse Source
This commit is contained in:
EntenKoeniq
2021-07-12 04:11:44 +02:00
parent 8d1ba087d8
commit ce79c7f064
1 changed files with 56 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
Server/Server.cs
View File

@ -17,72 +17,6 @@ namespace CoopServer
public string Country { get; set; } public string Country { get; set; }
} }
class MasterServer
{
private Thread MainThread;
public void Start()
{
MainThread = new Thread(Listen);
MainThread.Start();
}
private async void Listen()
{
try
{
IpInfo info;
try
{
using HttpClient httpClient = new();
string data = await httpClient.GetStringAsync("https://ipinfo.io/json");
info = JsonConvert.DeserializeObject<IpInfo>(data);
}
catch
{
info = new() { Country = "?" };
}
bool responseError = false;
HttpClient client = new();
while (!responseError)
{
string msg =
"{ " +
"\"port\": \"" + Server.MainSettings.ServerPort + "\", " +
"\"name\": \"" + Server.MainSettings.ServerName + "\", " +
"\"version\": \"" + Server.CurrentModVersion.Replace("_", ".") + "\", " +
"\"players\": \"" + Server.MainNetServer.ConnectionsCount + "\", " +
"\"maxPlayers\": \"" + Server.MainSettings.MaxPlayers + "\", " +
"\"allowlist\": \"" + Server.MainSettings.Allowlist + "\", " +
"\"country\": \"" + info.Country + "\"" +
" }";
HttpResponseMessage response = await client.PostAsync(Server.MainSettings.MasterServer, new StringContent(msg, Encoding.UTF8, "application/json"));
string responseContent = await response.Content.ReadAsStringAsync();
if (responseContent != "OK!")
{
Logging.Error(responseContent);
responseError = true;
}
else
{
// Sleep for 10s
Thread.Sleep(10000);
}
}
}
catch (Exception ex)
{
Logging.Error(ex.Message);
}
}
}
class Server class Server
{ {
public static readonly string CurrentModVersion = Enum.GetValues(typeof(ModVersion)).Cast<ModVersion>().Last().ToString(); public static readonly string CurrentModVersion = Enum.GetValues(typeof(ModVersion)).Cast<ModVersion>().Last().ToString();
@ -93,8 +27,6 @@ namespace CoopServer
public static NetServer MainNetServer; public static NetServer MainNetServer;
private readonly MasterServer MainMasterServer = new();
private static readonly Dictionary<string, EntitiesPlayer> Players = new(); private static readonly Dictionary<string, EntitiesPlayer> Players = new();
public Server() public Server()
@ -130,7 +62,62 @@ namespace CoopServer
if (MainSettings.AnnounceSelf) if (MainSettings.AnnounceSelf)
{ {
MainMasterServer.Start(); #region -- MASTERSERVER --
new Thread(async () =>
{
try
{
IpInfo info;
try
{
using HttpClient httpClient = new();
string data = await httpClient.GetStringAsync("https://ipinfo.io/json");
info = JsonConvert.DeserializeObject<IpInfo>(data);
}
catch
{
info = new() { Country = "?" };
}
bool responseError = false;
HttpClient client = new();
while (!responseError)
{
string msg =
"{ " +
"\"port\": \"" + Server.MainSettings.ServerPort + "\", " +
"\"name\": \"" + Server.MainSettings.ServerName + "\", " +
"\"version\": \"" + Server.CurrentModVersion.Replace("_", ".") + "\", " +
"\"players\": \"" + Server.MainNetServer.ConnectionsCount + "\", " +
"\"maxPlayers\": \"" + Server.MainSettings.MaxPlayers + "\", " +
"\"allowlist\": \"" + Server.MainSettings.Allowlist + "\", " +
"\"country\": \"" + info.Country + "\"" +
" }";
HttpResponseMessage response = await client.PostAsync(Server.MainSettings.MasterServer, new StringContent(msg, Encoding.UTF8, "application/json"));
string responseContent = await response.Content.ReadAsStringAsync();
if (responseContent != "OK!")
{
Logging.Error(responseContent);
responseError = true;
}
else
{
// Sleep for 10s
Thread.Sleep(10000);
}
}
}
catch (Exception ex)
{
Logging.Error(ex.Message);
}
}).Start();
#endregion
} }
Listen(); Listen();