Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #222 from Salanto/purge-ms2-take2

Browse Source 
Take 2 : Purge ms2 advertiser and change naming
This commit is contained in:
Rosemary Witchaven 2022-01-07 16:38:06 -06:00 committed by GitHub
commit 0b35f11763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 176 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
akashi/main.cpp
View File

@ -15,7 +15,6 @@
// You should have received a copy of the GNU Affero General Public License // // You should have received a copy of the GNU Affero General Public License //
// along with this program. If not, see <https://www.gnu.org/licenses/>. // // along with this program. If not, see <https://www.gnu.org/licenses/>. //
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
#include <include/advertiser.h>
#include <include/server.h> #include <include/server.h>
#include <include/config_manager.h> #include <include/config_manager.h>
@ -24,12 +23,10 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QDebug> #include <QDebug>
Advertiser* advertiser;
Server* server; Server* server;
void cleanup() { void cleanup() {
server->deleteLater(); server->deleteLater();
advertiser->deleteLater();
} }
int main(int argc, char* argv[]) int main(int argc, char* argv[])
@ -47,19 +44,7 @@ int main(int argc, char* argv[])
QCoreApplication::quit(); QCoreApplication::quit();
} }
else { else {
if (ConfigManager::advertiseServer()) {
advertiser =
new Advertiser(ConfigManager::masterServerIP(), ConfigManager::masterServerPort(),
ConfigManager::webaoPort(), ConfigManager::serverPort(),
ConfigManager::serverName(), ConfigManager::serverDescription());
advertiser->contactMasterServer();
}
server = new Server(ConfigManager::serverPort(), ConfigManager::webaoPort()); server = new Server(ConfigManager::serverPort(), ConfigManager::webaoPort());
if (advertiser != nullptr) {
QObject::connect(server, &Server::reloadRequest, advertiser, &Advertiser::reloadRequested);
}
server->start(); server->start();
} }

17
bin/config_sample/config.ini
View File

@ -1,16 +1,7 @@
[Options] [Options]
; Whether or not the server should appear on the master server.
advertise=true
; The maximum number of players that can join the server at once. ; The maximum number of players that can join the server at once.
max_players=100 max_players=100
; The IP address of the master server. Unless something happens to the default one, you shouldn't change this.
ms_ip=master.aceattorneyonline.com
; The port of the master server. Unless something happens to the default one, you shouldn't change this.
ms_port=27016
; The TCP port to listen for incoming connections on. ; The TCP port to listen for incoming connections on.
port=27016 port=27016
@ -64,11 +55,11 @@ afk_timeout = 300
; The URL of the server's remote repository, sent to the client during their initial handshake. Used by WebAO users for custom content. ; The URL of the server's remote repository, sent to the client during their initial handshake. Used by WebAO users for custom content.
asset_url=http://attorneyoffline.de/base/ asset_url=http://attorneyoffline.de/base/
[ModernAdvertiser] [Advertiser]
; Options for the HTTP based Masterserver. ; Options for the Masterserver.
; Whether or not the server should appear on the master server. ; Whether or not the server should appear on the master server.
advertise=false advertise=true
; Wether the advertiser prints additional debug info ; Wether the advertiser prints additional debug info
debug=false debug=false
@ -76,7 +67,7 @@ debug=false
; The IP address of the master server. Unless something happens to the default one, you shouldn't change this. ; The IP address of the master server. Unless something happens to the default one, you shouldn't change this.
ms_ip=https://servers.aceattorneyonline.com/servers ms_ip=https://servers.aceattorneyonline.com/servers
; Optional hostname of your server. Can either be an IP or a DNS name. Disabled automatic IP detection of ms3. ; Optional hostname of your server. Can either be an IP or a DNS name. Disables automatic IP detection of ms3.
hostname= hostname=
[Dice] [Dice]

10
core/core.pro
View File

@ -21,11 +21,10 @@ DESTDIR = $$PWD/../bin
# In order to do so, uncomment the following line. # In order to do so, uncomment the following line.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
# Enable this to print network messages tothe console # Enable this to print network messages to the console
#DEFINES += NET_DEBUG #DEFINES += NET_DEBUG
SOURCES += \ SOURCES += \
src/advertiser.cpp \
src/aoclient.cpp \ src/aoclient.cpp \
src/aopacket.cpp \ src/aopacket.cpp \
src/area_data.cpp \ src/area_data.cpp \
@ -45,13 +44,12 @@ SOURCES += \
src/testimony_recorder.cpp \ src/testimony_recorder.cpp \
src/ws_client.cpp \ src/ws_client.cpp \
src/ws_proxy.cpp \ src/ws_proxy.cpp \
src/http_advertiser.cpp \ src/advertiser.cpp \
src/logger/u_logger.cpp \ src/logger/u_logger.cpp \
src/logger/writer_modcall.cpp \ src/logger/writer_modcall.cpp \
src/logger/writer_full.cpp src/logger/writer_full.cpp
HEADERS += include/advertiser.h \ HEADERS += include/aoclient.h \
include/aoclient.h \
include/aopacket.h \ include/aopacket.h \
include/area_data.h \ include/area_data.h \
include/config_manager.h \ include/config_manager.h \
@ -61,7 +59,7 @@ HEADERS += include/advertiser.h \
include/server.h \ include/server.h \
include/ws_client.h \ include/ws_client.h \
include/ws_proxy.h \ include/ws_proxy.h \
include/http_advertiser.h \ include/advertiser.h \
include/logger/u_logger.h \ include/logger/u_logger.h \
include/logger/writer_modcall.h \ include/logger/writer_modcall.h \
include/logger/writer_full.h include/logger/writer_full.h

138
core/include/advertiser.h
View File

@ -15,126 +15,100 @@
// You should have received a copy of the GNU Affero General Public License // // You should have received a copy of the GNU Affero General Public License //
// along with this program. If not, see <https://www.gnu.org/licenses/>. // // along with this program. If not, see <https://www.gnu.org/licenses/>. //
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
#ifndef MASTER_H #ifndef ADVERTISER_H
#define MASTER_H #define ADVERTISER_H
#include "include/aopacket.h" #include <QtNetwork>
#include <QObject>
#include <QCoreApplication> #include "include/config_manager.h"
#include <QHostAddress>
#include <QString>
#include <QTcpSocket>
#include <QTimer>
/** /**
* @brief A communicator class to update the master server on the server's status. * @brief Represents the advertiser of the server. Sends current server information to masterserver.
*
* @see https://github.com/AttorneyOnline/docs/blob/master/docs/development/network.md#master-server-protocol
* for more explanation about how to communicate with the master server.
*/ */
class Advertiser : public QObject { class Advertiser : public QObject
{
Q_OBJECT Q_OBJECT
public:
public:
/** /**
* @brief Constructor for the Advertiser class. * @brief Constructor for the HTTP_Advertiser class.
*
* @param p_ip The IP of the master server.
* @param p_port The port on which the connection to the master server should be established.
* @param p_ws_port The port on which the server will accept connections from clients through WebSocket.
* @param p_local_port The port on which the server will accept connections from clients through TCP.
* @param p_name The name of the server, as reported in the client's server browser.
* @param p_description The description of the server, as reported in the client's server browser.
* @param p_parent Qt-based parent, passed along to inherited constructor from QObject.
*/ */
Advertiser(const QString p_ip, const int p_port, const int p_ws_port, const int p_local_port, explicit Advertiser();
const QString p_name, const QString p_description, QObject* p_parent = nullptr) :
QObject(p_parent),
ip(p_ip),
port(p_port),
ws_port(p_ws_port),
local_port(p_local_port),
name(p_name),
description(p_description)
{};
/** /**
* @brief Destructor for the Advertiser class. * @brief Deconstructor for the HTTP_Advertiser class. Yes, that's it. Can't say more about it.
*
* @details Marks the socket used to establish connection to the master server to be deleted later.
*/ */
~Advertiser(); ~Advertiser();
/** public slots:
* @brief Sets up the socket used for master server connection, establishes connection to the master server.
*/
void contactMasterServer();
public slots:
/**
* @brief Handles data that was read from the master server's socket.
*
* @note Currently does nothing.
*/
void readData();
/** /**
* @brief Announces the server's presence to the master server. * @brief Establishes a connection with masterserver to register or update the listing on the masterserver.
*/ */
void socketConnected(); void msAdvertiseServer();
/** /**
* @brief Handles disconnection from the master server through the socket. * @brief Reads the information send as a reply for further error handling.
* * @param reply Response data from the masterserver. Information contained is send to the console if debug is enabled.
* @note Currently does nothing but outputs a line about the disconnection in the debug output.
*/ */
void socketDisconnected(); void msRequestFinished(QNetworkReply *f_reply);
/** /**
* @brief Handles updating the advertiser and recontacting the master server. * @brief Updates the playercount of the server in the advertiser.
*
* @param p_name The new server name.
* @param p_desc The new server description.
*/ */
void reloadRequested(QString p_name, QString p_desc); void updatePlayerCount(int f_current_players);
private:
/**
* @copydoc ConfigManager::server_settings::ms_ip
*/
QString ip;
/** /**
* @copydoc ConfigManager::server_settings::ms_port * @brief Updates advertisement values
*/ */
int port; void updateAdvertiserSettings();
private:
/** /**
* @copydoc ConfigManager::server_settings::ws_port * @brief Pointer to the network manager, necessary to execute POST requests to the masterserver.
*/ */
int ws_port; QNetworkAccessManager* m_manager;
/** /**
* @copydoc ConfigManager::server_settings::port * @brief Name of the server send to the masterserver. Changing this will change the display name in the serverlist
*
* @bug See #port.
*/ */
int local_port; QString m_name;
/** /**
* @copydoc ConfigManager::server_settings::name * @brief Optional hostname of the server. Can either be an IP or a DNS name. Disabled automatic IP detection of ms3.
*/ */
QString name; QString m_hostname;
/** /**
* @copydoc ConfigManager::server_settings::description * @brief Description of the server that is displayed in the client when the server is selected.
*/ */
QString description; QString m_description;
/** /**
* @brief The socket used to establish connection to the master server. * @brief Client port for the AO2-Client.
*/ */
QTcpSocket* socket; int m_port;
/**
* @brief Websocket proxy port for WebAO users.
*/
int m_ws_port;
/**
* @brief Maximum amount of clients that can be connected to the server.
*/
int m_players;
/**
* @brief URL of the masterserver that m_manager posts to. This is almost never changed.
*/
QUrl m_masterserver;
/**
* @brief Controls if network replies are printed to console. Should only be true if issues communicating with masterserver appear.
*/
bool m_debug;
}; };
#endif // MASTER_H #endif // ADVERTISER_H

31
core/include/config_manager.h
View File

@ -120,13 +120,6 @@ class ConfigManager {
*/ */
static QStringList iprangeBans(); static QStringList iprangeBans();
/**
* @brief Returns true if the server should advertise to the master server.
*
* @return See short description.
*/
static bool advertiseServer();
/** /**
* @brief Returns the maximum number of players the server will allow. * @brief Returns the maximum number of players the server will allow.
* *
@ -134,20 +127,6 @@ class ConfigManager {
*/ */
static int maxPlayers(); static int maxPlayers();
/**
* @brief Returns the IP of the master server to advertise to.
*
* @return See short description.
*/
static QString masterServerIP();
/**
* @brief Returns the port of the master server to advertise to.
*
* @return See short description.
*/
static int masterServerPort();
/** /**
* @brief Returns the port to listen for connections on. * @brief Returns the port to listen for connections on.
* *
@ -434,19 +413,19 @@ class ConfigManager {
static QStringList gimpList(); static QStringList gimpList();
/** /**
* @brief Returns if the HTTP advertiser is constructed or not. * @brief Returns if the advertiser is enabled to advertise on ms3.
*/ */
static bool advertiseHTTPServer(); static bool advertiseServer();
/** /**
* @brief Returns if the HTTP advertiser prints debug info to console. * @brief Returns if the advertiser prints debug info to console.
*/ */
static bool advertiserHTTPDebug(); static bool advertiserDebug();
/** /**
* @brief Returns the IP or URL of the masterserver. * @brief Returns the IP or URL of the masterserver.
*/ */
static QUrl advertiserHTTPIP(); static QUrl advertiserIP();
/** /**
* @brief Returns an optional hostname paramemter for the advertiser. * @brief Returns an optional hostname paramemter for the advertiser.

114
core/include/http_advertiser.h
View File

@ -1,114 +0,0 @@
//////////////////////////////////////////////////////////////////////////////////////
// akashi - a server for Attorney Online 2 //
// Copyright (C) 2020 scatterflower //
// //
// This program is free software: you can redistribute it and/or modify //
// it under the terms of the GNU Affero General Public License as //
// published by the Free Software Foundation, either version 3 of the //
// License, or (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU Affero General Public License for more details. //
// //
// You should have received a copy of the GNU Affero General Public License //
// along with this program. If not, see <https://www.gnu.org/licenses/>. //
//////////////////////////////////////////////////////////////////////////////////////
#ifndef HTTP_ADVERTISER_H
#define HTTP_ADVERTISER_H
#include <QtNetwork>
#include <QObject>
#include "include/config_manager.h"
/**
* @brief Represents the advertiser of the server. Sends current server information to masterserver.
*/
class HTTPAdvertiser : public QObject
{
Q_OBJECT
public:
/**
* @brief Constructor for the HTTP_Advertiser class.
*/
explicit HTTPAdvertiser();
/**
* @brief Deconstructor for the HTTP_Advertiser class. Yes, that's it. Can't say more about it.
*/
~HTTPAdvertiser();
public slots:
/**
* @brief Establishes a connection with masterserver to register or update the listing on the masterserver.
*/
void msAdvertiseServer();
/**
* @brief Reads the information send as a reply for further error handling.
* @param reply Response data from the masterserver. Information contained is send to the console if debug is enabled.
*/
void msRequestFinished(QNetworkReply *f_reply);
/**
* @brief Updates the playercount of the server in the advertiser.
*/
void updatePlayerCount(int f_current_players);
/**
* @brief Updates advertisement values
*/
void updateAdvertiserSettings();
private:
/**
* @brief Pointer to the network manager, necessary to execute POST requests to the masterserver.
*/
QNetworkAccessManager* m_manager;
/**
* @brief Name of the server send to the masterserver. Changing this will change the display name in the serverlist
*/
QString m_name;
/**
* @brief Optional hostname of the server. Can either be an IP or a DNS name. Disabled automatic IP detection of ms3.
*/
QString m_hostname;
/**
* @brief Description of the server that is displayed in the client when the server is selected.
*/
QString m_description;
/**
* @brief Client port for the AO2-Client.
*/
int m_port;
/**
* @brief Websocket proxy port for WebAO users.
*/
int m_ws_port;
/**
* @brief Maximum amount of clients that can be connected to the server.
*/
int m_players;
/**
* @brief URL of the masterserver that m_manager posts to. This is almost never changed.
*/
QUrl m_masterserver;
/**
* @brief Controls if network replies are printed to console. Should only be true if issues communicating with masterserver appear.
*/
bool m_debug;
};
#endif // HTTP_ADVERTISER_H

6
core/include/server.h
View File

@ -25,7 +25,7 @@
#include "include/db_manager.h" #include "include/db_manager.h"
#include "include/discord.h" #include "include/discord.h"
#include "include/config_manager.h" #include "include/config_manager.h"
#include "include/http_advertiser.h" #include "include/advertiser.h"
#include "include/logger/u_logger.h" #include "include/logger/u_logger.h"
#include <QCoreApplication> #include <QCoreApplication>
@ -373,12 +373,12 @@ class Server : public QObject {
/** /**
* @brief Handles HTTP server advertising. * @brief Handles HTTP server advertising.
*/ */
HTTPAdvertiser* httpAdvertiser; Advertiser* ms3_Advertiser;
/** /**
* @brief Advertises the server in a regular intervall. * @brief Advertises the server in a regular intervall.
*/ */
QTimer* httpAdvertiserTimer; QTimer* AdvertiserTimer;
/** /**
* @brief Handles the universal log framework. * @brief Handles the universal log framework.

163
core/src/advertiser.cpp
View File

@ -1,86 +1,97 @@
//////////////////////////////////////////////////////////////////////////////////////
// akashi - a server for Attorney Online 2 //
// Copyright (C) 2020 scatterflower //
// //
// This program is free software: you can redistribute it and/or modify //
// it under the terms of the GNU Affero General Public License as //
// published by the Free Software Foundation, either version 3 of the //
// License, or (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU Affero General Public License for more details. //
// //
// You should have received a copy of the GNU Affero General Public License //
// along with this program. If not, see <https://www.gnu.org/licenses/>. //
//////////////////////////////////////////////////////////////////////////////////////
#include "include/advertiser.h" #include "include/advertiser.h"
void Advertiser::contactMasterServer() Advertiser::Advertiser()
{ {
socket = new QTcpSocket(this); m_manager = new QNetworkAccessManager();
connect(socket, &QTcpSocket::readyRead, this, &Advertiser::readData); connect(m_manager, &QNetworkAccessManager::finished,
connect(socket, &QTcpSocket::connected, this, &Advertiser::socketConnected); this, &Advertiser::msRequestFinished);
connect(socket, &QTcpSocket::disconnected, this, &Advertiser::socketDisconnected);
socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
socket->connectToHost(ip, port);
}
void Advertiser::readData() m_name = ConfigManager::serverName();
{ m_hostname = ConfigManager::advertiserHostname();
// The information coming back from the MS isn't very useful m_description = ConfigManager::serverDescription();
// However, it can be useful to see it when debugging m_port = ConfigManager::serverPort();
#ifdef NET_DEBUG m_ws_port = ConfigManager::webaoPort();
qDebug() << "From MS:" << socket->readAll(); m_masterserver = ConfigManager::advertiserIP();
#endif m_debug = ConfigManager::advertiserDebug();
}
void Advertiser::socketConnected()
{
qDebug("Connected to the master server");
QString concat_ports;
if (ws_port == -1)
concat_ports = QString::number(local_port);
else
concat_ports =
QString::number(local_port) + "&" + QString::number(ws_port);
AOPacket ao_packet("SCC",
{concat_ports, name, description,
"akashi " + QCoreApplication::applicationVersion()});
QByteArray data = ao_packet.toUtf8();
socket->write(data);
#ifdef NET_DEBUG
qDebug() << "To MS:" << data;
#endif
socket->flush();
}
void Advertiser::socketDisconnected()
{
qDebug("Connection to master server lost");
QTimer timer;
while (socket->state() == QAbstractSocket::UnconnectedState) {
timer.start(60000);
QEventLoop timer_loop;
connect(&timer, SIGNAL(timeout()), &timer_loop, SLOT(quit()));
timer_loop.exec();
socket->connectToHost(ip, port);
socket->waitForConnected();
}
}
void Advertiser::reloadRequested(QString p_name, QString p_desc)
{
name = p_name;
description = p_desc;
socketConnected();
} }
Advertiser::~Advertiser() Advertiser::~Advertiser()
{ {
socket->deleteLater(); m_manager->deleteLater();
} }
void Advertiser::msAdvertiseServer()
{
if (m_masterserver.isValid()) {
QUrl url(m_masterserver);
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QJsonObject l_json;
if (!m_hostname.isEmpty()) {
l_json["ip"] = m_hostname;
}
l_json["port"] = m_port;
if (m_ws_port != -1) {
l_json["ws_port"] = m_ws_port;
}
l_json["players"] = m_players;
l_json["name"] = m_name;
if (!m_description.isEmpty()) {
l_json["description"] = m_description;
}
m_manager->post(request, QJsonDocument(l_json).toJson());
if (m_debug)
qDebug().noquote() << "Advertised Server";
return;
}
if (m_debug)
qWarning().noquote() << "Unable to advertise. Masterserver URL '" + m_masterserver.toString() + "' is not valid.";
return;
}
void Advertiser::msRequestFinished(QNetworkReply *f_reply)
{
if (m_debug) {
if (f_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 200) {
qDebug().noquote() << "Succesfully advertised server.";
}
else {
QJsonDocument json = QJsonDocument::fromJson(f_reply->readAll());
if (json.isNull()) {
qCritical().noquote() << "Invalid JSON response from" << f_reply->url();
f_reply->deleteLater();
return;
}
qDebug().noquote() << "Got valid response from" << f_reply->url();
qDebug() << json;
}
}
f_reply->deleteLater();
}
void Advertiser::updatePlayerCount(int f_current_players)
{
m_players = f_current_players;
}
void Advertiser::updateAdvertiserSettings()
{
m_name = ConfigManager::serverName();
m_hostname = ConfigManager::advertiserHostname();
m_description = ConfigManager::serverDescription();
m_masterserver = ConfigManager::advertiserIP();
m_debug = ConfigManager::advertiserDebug();
}

30
core/src/config_manager.cpp
View File

@ -267,11 +267,6 @@ QStringList ConfigManager::loadConfigFile(const QString filename)
return stringlist; return stringlist;
} }
bool ConfigManager::advertiseServer()
{
return m_settings->value("Options/advertise", true).toBool();
}
int ConfigManager::maxPlayers() int ConfigManager::maxPlayers()
{ {
bool ok; bool ok;
@ -283,16 +278,6 @@ int ConfigManager::maxPlayers()
return l_players; return l_players;
} }
QString ConfigManager::masterServerIP()
{
return m_settings->value("Options/ms_ip", "master.aceattorneyonline.com").toString();
}
int ConfigManager::masterServerPort()
{
return m_settings->value("Options/ms_port", 27016).toInt();
}
int ConfigManager::serverPort() int ConfigManager::serverPort()
{ {
return m_settings->value("Options/port", 27016).toInt(); return m_settings->value("Options/port", 27016).toInt();
@ -577,24 +562,25 @@ QStringList ConfigManager::gimpList()
return m_commands->gimps; return m_commands->gimps;
} }
bool ConfigManager::advertiseHTTPServer() bool ConfigManager::advertiseServer()
{ {
return m_settings->value("ModernAdvertiser/advertise","true").toBool(); return m_settings->value("Advertiser/advertise","true").toBool();
} }
bool ConfigManager::advertiserHTTPDebug() bool ConfigManager::advertiserDebug()
{ {
return m_settings->value("ModernAdvertiser/debug","true").toBool(); return m_settings->value("Advertiser/debug","true").toBool();
} }
QUrl ConfigManager::advertiserHTTPIP() QUrl ConfigManager::advertiserIP()
{ {
return m_settings->value("ModernAdvertiser/ms_ip","").toUrl(); qDebug() << m_settings->value("Advertiser/ms_ip","").toUrl();
return m_settings->value("Advertiser/ms_ip","").toUrl();
} }
QString ConfigManager::advertiserHostname() QString ConfigManager::advertiserHostname()
{ {
return m_settings->value("ModernAdvertiser/hostname","").toString(); return m_settings->value("Advertiser/hostname","").toString();
} }
qint64 ConfigManager::uptime() qint64 ConfigManager::uptime()

97
core/src/http_advertiser.cpp
View File

@ -1,97 +0,0 @@
#include "include/http_advertiser.h"
HTTPAdvertiser::HTTPAdvertiser()
{
m_manager = new QNetworkAccessManager();
connect(m_manager, &QNetworkAccessManager::finished,
this, &HTTPAdvertiser::msRequestFinished);
m_name = ConfigManager::serverName();
m_hostname = ConfigManager::advertiserHostname();
m_description = ConfigManager::serverDescription();
m_port = ConfigManager::serverPort();
m_ws_port = ConfigManager::webaoPort();
m_masterserver = ConfigManager::advertiserHTTPIP();
m_debug = ConfigManager::advertiserHTTPDebug();
}
HTTPAdvertiser::~HTTPAdvertiser()
{
m_manager->deleteLater();
}
void HTTPAdvertiser::msAdvertiseServer()
{
if (m_masterserver.isValid()) {
QUrl url(m_masterserver);
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QJsonObject l_json;
if (!m_hostname.isEmpty()) {
l_json["ip"] = m_hostname;
}
l_json["port"] = m_port;
if (m_ws_port != -1) {
l_json["ws_port"] = m_ws_port;
}
l_json["players"] = m_players;
l_json["name"] = m_name;
if (!m_description.isEmpty()) {
l_json["description"] = m_description;
}
m_manager->post(request, QJsonDocument(l_json).toJson());
if (m_debug)
qDebug().noquote() << "Advertised Server";
return;
}
if (m_debug)
qWarning().noquote() << "Unable to advertise. Masterserver URL '" + m_masterserver.toString() + "' is not valid.";
return;
}
void HTTPAdvertiser::msRequestFinished(QNetworkReply *f_reply)
{
if (m_debug) {
if (f_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 200) {
qDebug().noquote() << "Succesfully advertised server.";
}
else {
QJsonDocument json = QJsonDocument::fromJson(f_reply->readAll());
if (json.isNull()) {
qCritical().noquote() << "Invalid JSON response from" << f_reply->url();
f_reply->deleteLater();
return;
}
qDebug().noquote() << "Got valid response from" << f_reply->url();
qDebug() << json;
}
}
f_reply->deleteLater();
}
void HTTPAdvertiser::updatePlayerCount(int f_current_players)
{
m_players = f_current_players;
}
void HTTPAdvertiser::updateAdvertiserSettings()
{
m_name = ConfigManager::serverName();
m_hostname = ConfigManager::advertiserHostname();
m_description = ConfigManager::serverDescription();
m_masterserver = ConfigManager::advertiserHTTPIP();
m_debug = ConfigManager::advertiserHTTPDebug();
}

18
core/src/server.cpp
View File

@ -63,19 +63,19 @@ void Server::start()
handleDiscordIntegration(); handleDiscordIntegration();
//Construct modern advertiser if enabled in config //Construct modern advertiser if enabled in config
if (ConfigManager::advertiseHTTPServer()) { if (ConfigManager::advertiseServer()) {
httpAdvertiserTimer = new QTimer(this); AdvertiserTimer = new QTimer(this);
httpAdvertiser = new HTTPAdvertiser(); ms3_Advertiser = new Advertiser();
connect(httpAdvertiserTimer, &QTimer::timeout, connect(AdvertiserTimer, &QTimer::timeout,
httpAdvertiser, &HTTPAdvertiser::msAdvertiseServer); ms3_Advertiser, &Advertiser::msAdvertiseServer);
connect(this, &Server::updatePlayerCount, connect(this, &Server::updatePlayerCount,
httpAdvertiser, &HTTPAdvertiser::updatePlayerCount); ms3_Advertiser, &Advertiser::updatePlayerCount);
connect(this, &Server::updateHTTPConfiguration, connect(this, &Server::updateHTTPConfiguration,
httpAdvertiser, &HTTPAdvertiser::updateAdvertiserSettings); ms3_Advertiser, &Advertiser::updateAdvertiserSettings);
emit updatePlayerCount(m_player_count); emit updatePlayerCount(m_player_count);
httpAdvertiser->msAdvertiseServer(); ms3_Advertiser->msAdvertiseServer();
httpAdvertiserTimer->start(300000); AdvertiserTimer->start(300000);
} }
//Get characters from config file //Get characters from config file