From b682d69e494acdbf5fc97a81109faa667ad1918f Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sun, 13 Jun 2021 22:16:41 -0500 Subject: Use new HTTP-based master server client --- include/networkmanager.h | 67 +++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 44 deletions(-) (limited to 'include/networkmanager.h') diff --git a/include/networkmanager.h b/include/networkmanager.h index ed57a956..a05c5510 100644 --- a/include/networkmanager.h +++ b/include/networkmanager.h @@ -1,28 +1,23 @@ #ifndef NETWORKMANAGER_H #define NETWORKMANAGER_H -// Qt for Android has stubbed QDnsLookup. This is not documented in any part of -// their wiki. This prevents SRV lookup/failover behavior from functioning. -// https://bugreports.qt.io/browse/QTBUG-56143 -#ifndef ANDROID -#define MS_FAILOVER_SUPPORTED -#endif - -//#define LOCAL_MS - -#ifdef LOCAL_MS -#undef MS_FAILOVER_SUPPORTED -#endif - #include "aoapplication.h" #include "aopacket.h" #include +#include #include #include #include + #include +enum MSDocumentType { + PrivacyPolicy, + Motd, + ClientVersion +}; + class NetworkManager : public QObject { Q_OBJECT @@ -31,53 +26,37 @@ public: ~NetworkManager(); AOApplication *ao_app; - QTcpSocket *ms_socket; + QNetworkAccessManager *http; QTcpSocket *server_socket; - QDnsLookup *ms_dns; - QTimer *ms_reconnect_timer; - - const QString ms_srv_hostname = "_aoms._tcp.aceattorneyonline.com"; -#ifdef LOCAL_MS - QString ms_nosrv_hostname = "localhost"; -#else - QString ms_nosrv_hostname = "master.aceattorneyonline.com"; -#endif - const quint16 ms_port = 27016; - const int timeout_milliseconds = 2000; + QString ms_baseurl = "https://ms3.oldmud0.workers.dev"; - // in seconds - const int ms_reconnect_delay = 7; - - bool ms_partial_packet = false; - QString ms_temp_packet = ""; + const int timeout_milliseconds = 5000; bool partial_packet = false; QString temp_packet = ""; unsigned int s_decryptor = 5; - void connect_to_master(); - void connect_to_master_nosrv(); void connect_to_server(server_type p_server); public slots: - void ship_ms_packet(QString p_packet); + void get_server_list(const std::function &cb); void ship_server_packet(QString p_packet); + void handle_server_packet(); -signals: - void ms_connect_finished(bool success, bool will_retry); + void request_document(MSDocumentType document_type, + const std::function &cb); +private slots: + void heartbeat_playing(); + void ms_request_finished(QNetworkReply *reply, + const std::function &cb); private: - void perform_srv_lookup(); - -private slots: - void on_srv_lookup(); - void handle_ms_packet(); - void handle_server_packet(); - void on_ms_nosrv_connect_success(); - void on_ms_socket_error(QAbstractSocket::SocketError error); - void retry_ms_connect(); + QString get_user_agent() const { + return QStringLiteral("AttorneyOnline/%1 (Desktop)") + .arg(ao_app->get_version_string()); + } }; #endif // NETWORKMANAGER_H -- cgit From f1107aeac51658a0525d4231b2f1f39131acbcb5 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 18 Dec 2021 20:29:55 -0600 Subject: Finish out feature - Add periodic timer for heartbeat - Add option to settings for opting out from heartbeat/player metrics - Change base URL to permanent URL --- include/networkmanager.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/networkmanager.h') diff --git a/include/networkmanager.h b/include/networkmanager.h index a05c5510..ebee4810 100644 --- a/include/networkmanager.h +++ b/include/networkmanager.h @@ -28,10 +28,12 @@ public: AOApplication *ao_app; QNetworkAccessManager *http; QTcpSocket *server_socket; + QTimer *heartbeat_timer; - QString ms_baseurl = "https://ms3.oldmud0.workers.dev"; + QString ms_baseurl = "https://servers.aceattorneyonline.com"; const int timeout_milliseconds = 5000; + const int heartbeat_interval = 60 * 5; bool partial_packet = false; QString temp_packet = ""; @@ -47,8 +49,8 @@ public slots: void request_document(MSDocumentType document_type, const std::function &cb); + void send_heartbeat(); private slots: - void heartbeat_playing(); void ms_request_finished(QNetworkReply *reply, const std::function &cb); -- cgit From cf12168ebd426d7658d7f7021c47be519caa215a Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 18 Dec 2021 22:22:30 -0600 Subject: Qt 5.9 compat; remove dead code --- include/networkmanager.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/networkmanager.h') diff --git a/include/networkmanager.h b/include/networkmanager.h index ebee4810..2e61291f 100644 --- a/include/networkmanager.h +++ b/include/networkmanager.h @@ -32,7 +32,6 @@ public: QString ms_baseurl = "https://servers.aceattorneyonline.com"; - const int timeout_milliseconds = 5000; const int heartbeat_interval = 60 * 5; bool partial_packet = false; -- cgit From 5d79a83fb5a0f322271e5e3d6c37a8782d42a61a Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Thu, 30 Dec 2021 21:26:28 -0600 Subject: Prevent old/bad "backup MS" values from preventing connection --- include/networkmanager.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/networkmanager.h') diff --git a/include/networkmanager.h b/include/networkmanager.h index 2e61291f..1e1a60b7 100644 --- a/include/networkmanager.h +++ b/include/networkmanager.h @@ -22,15 +22,16 @@ class NetworkManager : public QObject { Q_OBJECT public: - NetworkManager(AOApplication *parent); - ~NetworkManager(); + explicit NetworkManager(AOApplication *parent); + ~NetworkManager() = default; AOApplication *ao_app; QNetworkAccessManager *http; QTcpSocket *server_socket; QTimer *heartbeat_timer; - QString ms_baseurl = "https://servers.aceattorneyonline.com"; + const QString DEFAULT_MS_BASEURL = "https://servers.aceattorneyonline.com"; + QString ms_baseurl = DEFAULT_MS_BASEURL; const int heartbeat_interval = 60 * 5; -- cgit