torstenandCopilot
b774f4035c
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
89 lines
2.3 KiB
C++
Executable File
89 lines
2.3 KiB
C++
Executable File
|
|
|
|
#include "client_connection.h"
|
|
|
|
#include "WebSocketInterface/Messages/reply_message.h"
|
|
|
|
#include <QtWebSockets/QWebSocket>
|
|
#include <QtCore/QTimer>
|
|
|
|
using namespace CombatNetRadio::WebSocketInterface::Connection;
|
|
|
|
ClientConnection::ClientConnection(QWebSocket *socket, QObject *parent)
|
|
: QObject(parent)
|
|
, m_socket(socket)
|
|
, m_ip(socket->peerAddress())
|
|
, m_logger(getLogger(QLatin1String("ClientConnection")))
|
|
{}
|
|
|
|
ClientConnection::~ClientConnection()
|
|
{
|
|
if (m_socket)
|
|
{
|
|
m_socket->disconnect(this);
|
|
m_socket->close();
|
|
}
|
|
delete m_socket;
|
|
}
|
|
|
|
bool ClientConnection::init()
|
|
{
|
|
if (m_socket == nullptr)
|
|
{
|
|
ERROR_LOG() << "Initialisation failed due to an invalid socket";
|
|
return false;
|
|
}
|
|
|
|
connect(m_socket, &QWebSocket::textMessageReceived, this, &ClientConnection::onNewTextMessageFromSocket);
|
|
connect(m_socket, &QWebSocket::connected, this, &ClientConnection::sendMessagesFromQueue);
|
|
connect(m_socket, &QWebSocket::disconnected, this, &ClientConnection::onSocketDisconnect);
|
|
|
|
return true;
|
|
}
|
|
|
|
QHostAddress ClientConnection::ip() const
|
|
{
|
|
return m_ip;
|
|
}
|
|
|
|
void ClientConnection::addMessage(const CombatNetRadio::WebSocketInterface::Messages::ReplyMessage &message)
|
|
{
|
|
if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState)
|
|
{
|
|
m_messageQueue.enqueue(message);
|
|
DEBUG_LOG() << "Adding message to queue, size: " << m_messageQueue.size();
|
|
return;
|
|
}
|
|
const QString msg(message.toJsonString());
|
|
DEBUG_LOG() << "Send msg: " << msg;
|
|
m_socket->sendTextMessage(msg);
|
|
}
|
|
|
|
void ClientConnection::onNewTextMessageFromSocket(const QString &message)
|
|
{
|
|
DEBUG_LOG() << "Recv msg: " << message;
|
|
emit newTextMessage(this, message);
|
|
}
|
|
|
|
void ClientConnection::sendMessagesFromQueue()
|
|
{
|
|
if (m_socket->state() != QAbstractSocket::ConnectedState)
|
|
return;
|
|
while (!m_messageQueue.isEmpty())
|
|
{
|
|
Messages::ReplyMessage message = m_messageQueue.dequeue();
|
|
const QString msg(message.toJsonString());
|
|
TRACE_LOG() << "Send msg: " << msg;
|
|
m_socket->sendTextMessage(msg);
|
|
DEBUG_LOG() << "Sent message from queue, new size: " << m_messageQueue.size();
|
|
}
|
|
}
|
|
|
|
void ClientConnection::onSocketDisconnect()
|
|
{
|
|
DEBUG_LOG() << "Client with ip "
|
|
<< m_ip.toString()
|
|
<< " disconnected";
|
|
emit disconnected(this);
|
|
}
|