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>
84 lines
2.2 KiB
C++
Executable File
84 lines
2.2 KiB
C++
Executable File
|
|
|
|
#include "client_connection.h"
|
|
|
|
#include <QWebSocket>
|
|
|
|
namespace LtsWebSocket
|
|
{
|
|
|
|
ClientConnection::ClientConnection(QWebSocket *socket, QObject *parent)
|
|
: QThread(parent)
|
|
, m_socket(socket ? socket : new QWebSocket)
|
|
{
|
|
}
|
|
|
|
ClientConnection::~ClientConnection()
|
|
{
|
|
DEBUG_LOG() << "Thread closed" << this;
|
|
delete m_socket;
|
|
qDeleteAll(m_messageQueue);
|
|
}
|
|
|
|
bool ClientConnection::init()
|
|
{
|
|
if (m_socket == nullptr)
|
|
{
|
|
ERROR_LOG() << "Initialisation failed due to an invalid socket";
|
|
return false;
|
|
}
|
|
|
|
DEBUG_LOG() << "Started new thread" << this;
|
|
connect(m_socket, &QWebSocket::textMessageReceived, this, &ClientConnection::onNewTextMessageFromSocket, Qt::DirectConnection);
|
|
connect(m_socket, &QWebSocket::connected, this, &ClientConnection::sendMessagesFromQueue);
|
|
connect(m_socket, &QWebSocket::disconnected, this, &ClientConnection::onSocketDisconnect);
|
|
|
|
return true;
|
|
}
|
|
|
|
void ClientConnection::addReply(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() << "Sending message: " << msg ;
|
|
m_socket->sendTextMessage(msg);
|
|
delete message;
|
|
}
|
|
|
|
void ClientConnection::onNewTextMessageFromSocket(const QString &message)
|
|
{
|
|
DEBUG_LOG() << "Recv msg: " << message << this;
|
|
emit newTextMessage(this, message);
|
|
}
|
|
|
|
void ClientConnection::sendMessagesFromQueue()
|
|
{
|
|
INFO_LOG() << "Client connected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
|
|
|
|
if (m_socket->state() != QAbstractSocket::ConnectedState)
|
|
return;
|
|
while (!m_messageQueue.isEmpty())
|
|
{
|
|
ReplyMessage *message = m_messageQueue.dequeue();
|
|
const QString msg(message->toJsonString());
|
|
TRACE_LOG() << "Send msg: " << msg;
|
|
m_socket->sendTextMessage(msg);
|
|
delete message;
|
|
DEBUG_LOG() << "Sent message from queue, new size: " << m_messageQueue.size();
|
|
}
|
|
}
|
|
|
|
void ClientConnection::onSocketDisconnect()
|
|
{
|
|
DEBUG_LOG() << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
|
|
exit(0);
|
|
emit disconnected(this);
|
|
}
|
|
|
|
}
|