torstenandCopilot
bafed3705f
- LtsWidgets: Fixed Qt6 API compatibility issues - QWheelEvent::delta() → angleDelta().y() - QStyleOption::init() → initFrom() - QComboBox activated signal signature change - QTextCodec removal (UTF-8 default in Qt6) - Missing widget includes added - LtsWebSocket: Fixed m_logger reference initialization - Added NGLLoggerBootstrap includes - Proper initialization in constructor initializer lists - CMake: Added BUILD_LTSWEBSOCKET option for temporary exclusion - Docker: RTI Connext permanent installation script added - ci/install-rti-in-docker.sh for persistent RTI setup - Removes need for volume mounting RTI into container - BUILD options: FilterManagement, RTI, Codification, Grantlee, LtsWebSocket can be disabled for partial builds during migration Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
86 lines
2.5 KiB
C++
86 lines
2.5 KiB
C++
|
|
|
|
#include "client_connection.h"
|
|
|
|
#include <NGLLogger/NGLLoggerBootstrap.h>
|
|
#include <QWebSocket>
|
|
|
|
namespace LtsWebSocket
|
|
{
|
|
|
|
ClientConnection::ClientConnection(QWebSocket* socket, QObject* parent)
|
|
: QThread(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger()), m_socket(socket ? socket : new QWebSocket)
|
|
{
|
|
}
|
|
|
|
ClientConnection::~ClientConnection()
|
|
{
|
|
DEBUG_LOG(m_logger) << "Thread closed" << this;
|
|
delete m_socket;
|
|
qDeleteAll(m_messageQueue);
|
|
}
|
|
|
|
bool ClientConnection::init()
|
|
{
|
|
if (m_socket == nullptr)
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation failed due to an invalid socket";
|
|
return false;
|
|
}
|
|
|
|
DEBUG_LOG(m_logger) << "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(m_logger) << "Adding message to queue, size: " << m_messageQueue.size();
|
|
return;
|
|
}
|
|
const QString msg(message->toJsonString());
|
|
DEBUG_LOG(m_logger) << "Sending message: " << msg;
|
|
m_socket->sendTextMessage(msg);
|
|
delete message;
|
|
}
|
|
|
|
void ClientConnection::onNewTextMessageFromSocket(const QString& message)
|
|
{
|
|
DEBUG_LOG(m_logger) << "Recv msg: " << message << this;
|
|
emit newTextMessage(this, message);
|
|
}
|
|
|
|
void ClientConnection::sendMessagesFromQueue()
|
|
{
|
|
INFO_LOG(m_logger) << "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(m_logger) << "Send msg: " << msg;
|
|
m_socket->sendTextMessage(msg);
|
|
delete message;
|
|
DEBUG_LOG(m_logger) << "Sent message from queue, new size: " << m_messageQueue.size();
|
|
}
|
|
}
|
|
|
|
void ClientConnection::onSocketDisconnect()
|
|
{
|
|
DEBUG_LOG(m_logger) << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":"
|
|
<< m_socket->peerPort();
|
|
exit(0);
|
|
emit disconnected(this);
|
|
}
|
|
|
|
} // namespace LtsWebSocket
|