Use new HTTP-based master server client

4 files changed, 31 insertions, 49 deletions

diff --git a/include/aoapplication.h b/include/aoapplication.h
index 835c7fd9..d0d5121e 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -61,7 +61,6 @@ public:
   void ms_packet_received(AOPacket *p_packet);
   void server_packet_received(AOPacket *p_packet);
 
-  void send_ms_packet(AOPacket *p_packet);
   void send_server_packet(AOPacket *p_packet, bool encoded = true);
 
   void call_settings_menu();
@@ -119,7 +118,7 @@ public:
   QVector<server_type> &get_favorite_list() { return favorite_list; }
   void add_favorite_server(int p_server);
 
-  void set_server_list();
+  void set_server_list(QVector<server_type> &servers) { server_list = servers; }
   QVector<server_type> &get_server_list() { return server_list; }
 
   // reads the theme from config.ini and sets it accordingly
@@ -528,9 +527,6 @@ private:
   QVector<server_type> server_list;
   QVector<server_type> favorite_list;
 
-private slots:
-  void ms_connect_finished(bool connected, bool will_retry);
-
 public slots:
   void server_disconnected();
   void loading_cancelled();
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index a6c8b8e9..de1a3b5c 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -23,6 +23,7 @@
 #include <QtWidgets/QWidget>
 
 #include <QDirIterator>
+#include <QTextBrowser>
 #include <QTextStream>
 
 class Lobby;
@@ -174,6 +175,10 @@ private:
   QLabel *ui_log_lbl;
   QCheckBox *ui_log_cb;
 
+  QWidget *ui_privacy_tab;
+  QVBoxLayout *ui_privacy_layout;
+  QTextBrowser *ui_privacy_policy;
+
   bool needs_default_audiodev();
   void update_values();
 
diff --git a/include/lobby.h b/include/lobby.h
index 0f066ab4..1d2cbc6c 100644
--- a/include/lobby.h
+++ b/include/lobby.h
@@ -30,6 +30,8 @@ public:
   void set_widgets();
   void list_servers();
   void list_favorites();
+  void get_motd();
+  void check_for_updates();
   void append_chatmessage(QString f_name, QString f_message);
   void append_error(QString f_message);
   void set_player_count(int players_online, int max_players);
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 <QDnsLookup>
+#include <QNetworkAccessManager>
 #include <QTcpSocket>
 #include <QTime>
 #include <QTimer>
+
 #include <cstring>
 
+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<void()> &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<void(QString)> &cb);
+private slots:
+  void heartbeat_playing();
+  void ms_request_finished(QNetworkReply *reply,
+                           const std::function<void()> &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