Add TCP socket support for DRO servers

DRO servers only advertise a plain port (no ws_port/wss_port), so they
were assigned protocol="tcp" but the WebSocket connection rejected the
tcp:// URL scheme. This adds raw TCP transport via a new TcpConnection
class so DRO servers can be connected to directly.

- Add AOConnection abstract base class with shared signals/interface
- Add TcpConnection using QTcpSocket with AO packet buffering/parsing
- Refactor WebSocketConnection to inherit from AOConnection
- NetworkManager picks TcpConnection or WebSocketConnection by protocol
- Fix CMakeLists.txt include path for bass.h (moved to lib/bass/ in AttorneyOnline#1112)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: SyntaxNyah

CMakeLists.txt

@@ -12,7 +12,7 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 option(AO_BUILD_TESTS "Build test programs" ON)
-option(AO_ENABLE_DISCORD_RPC "Enable Discord Rich Presence" ON)
+option(AO_ENABLE_DISCORD_RPC "Enable Discord Rich Presence" OFF)
 
 find_package(QT NAMES Qt6)
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Network Widgets Concurrent WebSockets UiTools)
@@ -64,8 +64,6 @@ qt_add_executable(Attorney_Online
   src/debug_functions.h
   src/demoserver.cpp
   src/demoserver.h
-  src/discord_rich_presence.cpp
-  src/discord_rich_presence.h
   src/emotes.cpp
   src/eventfilters.cpp
   src/eventfilters.h
@@ -103,8 +101,18 @@ qt_add_executable(Attorney_Online
   src/screenslidetimer.h src/screenslidetimer.cpp
   src/moderation_functions.h src/moderation_functions.cpp
   src/network/serverinfo.h src/network/serverinfo.cpp
+  src/network/aoconnection.h src/network/aoconnection.cpp
+  src/network/tcpconnection.h src/network/tcpconnection.cpp
 )
 
+# Conditionally add Discord RPC sources
+if(AO_ENABLE_DISCORD_RPC)
+  target_sources(Attorney_Online PRIVATE
+    src/discord_rich_presence.cpp
+    src/discord_rich_presence.h
+  )
+endif()
+
 set_target_properties(Attorney_Online PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin")
 
 if(WIN32)
@@ -115,7 +123,7 @@ if(WIN32)
   endif()
 endif()
 
-target_include_directories(Attorney_Online PRIVATE src lib)
+target_include_directories(Attorney_Online PRIVATE src lib lib/bass)
 target_link_directories(Attorney_Online PRIVATE lib)
 target_link_libraries(Attorney_Online PRIVATE
   Qt${QT_VERSION_MAJOR}::Core
@@ -140,4 +148,4 @@ endif()
 
 set_target_properties(Attorney_Online PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY $<1:${CMAKE_CURRENT_LIST_DIR}/bin>
-        RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_CURRENT_LIST_DIR}/bin>)
+        RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_CURRENT_LIST_DIR}/bin>)

src/network/aoconnection.cpp

@@ -0,0 +1,6 @@
+#include "aoconnection.h"
+
+AOConnection::AOConnection(AOApplication *ao_app, QObject *parent)
+    : QObject(parent)
+    , ao_app(ao_app)
+{}

src/network/aoconnection.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include "aopacket.h"
+#include "serverinfo.h"
+
+#include <QObject>
+
+class AOApplication;
+
+class AOConnection : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit AOConnection(AOApplication *ao_app, QObject *parent = nullptr);
+  virtual ~AOConnection() = default;
+
+  virtual bool isConnected() = 0;
+  virtual void connectToServer(const ServerInfo &server) = 0;
+  virtual void disconnectFromServer() = 0;
+  virtual void sendPacket(AOPacket packet) = 0;
+
+Q_SIGNALS:
+  void connectedToServer();
+  void disconnectedFromServer();
+  void errorOccurred(QString error);
+  void receivedPacket(AOPacket packet);
+
+protected:
+  AOApplication *ao_app;
+};

src/network/tcpconnection.cpp

@@ -0,0 +1,90 @@
+#include "tcpconnection.h"
+
+#include "aopacket.h"
+
+TcpConnection::TcpConnection(AOApplication *ao_app, QObject *parent)
+    : AOConnection(ao_app, parent)
+    , m_socket(new QTcpSocket(this))
+{
+  connect(m_socket, &QTcpSocket::connected, this, &TcpConnection::onConnected);
+  connect(m_socket, &QTcpSocket::disconnected, this, &TcpConnection::onDisconnected);
+  connect(m_socket, &QAbstractSocket::errorOccurred, this, &TcpConnection::onError);
+  connect(m_socket, &QTcpSocket::readyRead, this, &TcpConnection::onReadyRead);
+}
+
+TcpConnection::~TcpConnection()
+{
+  m_socket->disconnect(this);
+  disconnectFromServer();
+}
+
+bool TcpConnection::isConnected()
+{
+  return m_socket->state() == QAbstractSocket::ConnectedState;
+}
+
+void TcpConnection::connectToServer(const ServerInfo &server)
+{
+  disconnectFromServer();
+  m_buffer.clear();
+  m_socket->connectToHost(server.address, server.port);
+}
+
+void TcpConnection::disconnectFromServer()
+{
+  if (isConnected())
+  {
+    m_socket->disconnectFromHost();
+  }
+}
+
+void TcpConnection::sendPacket(AOPacket packet)
+{
+  m_socket->write(packet.toString(true).toUtf8());
+}
+
+void TcpConnection::onConnected()
+{
+  Q_EMIT connectedToServer();
+}
+
+void TcpConnection::onDisconnected()
+{
+  Q_EMIT disconnectedFromServer();
+}
+
+void TcpConnection::onError(QAbstractSocket::SocketError error)
+{
+  Q_UNUSED(error);
+  Q_EMIT errorOccurred(m_socket->errorString());
+}
+
+void TcpConnection::onReadyRead()
+{
+  m_buffer += QString::fromUtf8(m_socket->readAll());
+
+  while (true)
+  {
+    int end = m_buffer.indexOf("#%");
+    if (end == -1)
+    {
+      break;
+    }
+
+    QString message = m_buffer.left(end);
+    m_buffer = m_buffer.mid(end + 2);
+
+    QStringList raw_content = message.split('#');
+    if (raw_content.isEmpty())
+    {
+      continue;
+    }
+    const QString header = raw_content.takeFirst();
+    for (QString &data : raw_content)
+    {
+      data = AOPacket::decode(data);
+    }
+
+    Q_EMIT receivedPacket(AOPacket(header, raw_content));
+  }
+}

src/network/tcpconnection.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include "aoconnection.h"
+
+#include <QTcpSocket>
+
+class TcpConnection : public AOConnection
+{
+  Q_OBJECT
+
+public:
+  explicit TcpConnection(AOApplication *ao_app, QObject *parent = nullptr);
+  ~TcpConnection() override;
+
+  bool isConnected() override;
+  void connectToServer(const ServerInfo &server) override;
+  void disconnectFromServer() override;
+  void sendPacket(AOPacket packet) override;
+
+private:
+  QTcpSocket *m_socket;
+  QString m_buffer;
+
+private Q_SLOTS:
+  void onConnected();
+  void onDisconnected();
+  void onError(QAbstractSocket::SocketError error);
+  void onReadyRead();
+};

src/network/websocketconnection.cpp

@@ -6,8 +6,7 @@
 #include <QUrl>
 
 WebSocketConnection::WebSocketConnection(AOApplication *ao_app, QObject *parent)
-    : QObject(parent)
-    , ao_app(ao_app)
+    : AOConnection(ao_app, parent)
     , m_socket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
     , m_last_state(QAbstractSocket::UnconnectedState)
 {

src/network/websocketconnection.h

@@ -1,38 +1,25 @@
 #pragma once
 
-#include "aopacket.h"
-#include "serverinfo.h"
+#include "aoconnection.h"
 
-#include <QObject>
 #include <QWebSocket>
 
-class AOApplication;
-
-class WebSocketConnection : public QObject
+class WebSocketConnection : public AOConnection
 {
   Q_OBJECT
 
 public:
   explicit WebSocketConnection(AOApplication *ao_app, QObject *parent = nullptr);
-  virtual ~WebSocketConnection();
-
-  bool isConnected();
+  ~WebSocketConnection() override;
 
-  void connectToServer(const ServerInfo &server);
-  void disconnectFromServer();
+  bool isConnected() override;
 
-  void sendPacket(AOPacket packet);
+  void connectToServer(const ServerInfo &server) override;
+  void disconnectFromServer() override;
 
-Q_SIGNALS:
-  void connectedToServer();
-  void disconnectedFromServer();
-  void errorOccurred(QString error);
-
-  void receivedPacket(AOPacket packet);
+  void sendPacket(AOPacket packet) override;
 
 private:
-  AOApplication *ao_app;
-
   QWebSocket *m_socket;
   QAbstractSocket::SocketState m_last_state;
 

src/networkmanager.cpp

@@ -3,6 +3,8 @@
 #include "datatypes.h"
 #include "debug_functions.h"
 #include "lobby.h"
+#include "network/tcpconnection.h"
+#include "network/websocketconnection.h"
 #include "options.h"
 
 #include <QAbstractSocket>
@@ -153,7 +155,14 @@ void NetworkManager::connect_to_server(ServerInfo server)
   disconnect_from_server();
 
   qInfo().noquote() << QObject::tr("Connecting to %1").arg(server.toString());
-  m_connection = new WebSocketConnection(ao_app, this);
+  if (server.protocol == "tcp")
+  {
+    m_connection = new TcpConnection(ao_app, this);
+  }
+  else
+  {
+    m_connection = new WebSocketConnection(ao_app, this);
+  }
 
   connect(m_connection, &WebSocketConnection::connectedToServer, ao_app, &AOApplication::server_connected);
   connect(m_connection, &WebSocketConnection::disconnectedFromServer, ao_app, &AOApplication::server_disconnected);

src/networkmanager.h

@@ -2,7 +2,7 @@
 
 #include "aoapplication.h"
 #include "aopacket.h"
-#include "network/websocketconnection.h"
+#include "network/aoconnection.h"
 
 #include <QDnsLookup>
 #include <QNetworkAccessManager>
@@ -50,7 +50,7 @@ private Q_SLOTS:
   AOApplication *ao_app;
   QNetworkAccessManager *http;
 
-  WebSocketConnection *m_connection = nullptr;
+  AOConnection *m_connection = nullptr;
 
   QTimer *heartbeat_timer;
 

test/CMakeLists.txt

@@ -12,7 +12,7 @@ function(ao_declare_test test_id)
   message(STATUS "Adding test: ${test_id}")
   message(STATUS "Source files: ${ARGN}")
   add_executable(${test_id} ${ARGN})
-  target_include_directories(${test_id} PRIVATE ../src src)
+  target_include_directories(${test_id} PRIVATE ../src src ../lib/bass)
   target_link_directories(${test_id} PRIVATE ../lib)
   target_link_libraries(${test_id} PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Test)
   add_test(NAME ${test_id} COMMAND ${test_id})