torsten/yourpart3
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor WebSocket server connection management and message handling

Browse Source 
- Update WebSocketUserData to use a message queue for handling outgoing messages, improving concurrency and message delivery.
- Modify pingClients method to handle multiple connections per user and implement timeout logic for ping responses.
- Enhance addConnection and removeConnection methods to manage multiple connections for each user, including detailed logging of connection states.
- Update handleBrokerMessage to send messages to all active connections for a user, ensuring proper queue management and callback invocation.
This commit is contained in:
Torsten Schulz (local)
2025-11-04 15:36:43 +01:00
committed by Torsten (PC)
parent 6a1260687b
commit 00a5f47cae
2 changed files with 108 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
src/websocket_server.cpp
View File

@@ -5,6 +5,7 @@
#include <chrono>
#include <cstring>
#include <future>
#include <algorithm>
using json = nlohmann::json;
@@ -169,7 +170,8 @@ void WebSocketServer::pingClients() {
{
std::shared_lock<std::shared_mutex> lock(connectionsMutex);
for (auto& pair : connections) {
auto* ud = reinterpret_cast<WebSocketUserData*>(lws_wsi_user(pair.second));
for (auto* wsi : pair.second) {
auto* ud = reinterpret_cast<WebSocketUserData*>(lws_wsi_user(wsi));
if (!ud) continue;
// Prüfe ob Pong-Timeout erreicht wurde
@@ -182,7 +184,7 @@ void WebSocketServer::pingClients() {
if (ud->pingTimeoutCount >= WebSocketUserData::MAX_PING_TIMEOUTS) {
std::cout << "Verbindung wird getrennt: Zu viele Ping-Timeouts für User " << ud->userId << std::endl;
toDisconnect.push_back(pair.second);
toDisconnect.push_back(wsi);
} else {
// Reset für nächsten Versuch
ud->pongReceived = true;
@@ -191,6 +193,7 @@ void WebSocketServer::pingClients() {
}
}
}
}
// Trenne problematische Verbindungen
for (auto* wsi : toDisconnect) {
@@ -261,7 +264,31 @@ int WebSocketServer::wsCallback(struct lws *wsi,
}
case LWS_CALLBACK_SERVER_WRITEABLE: {
// Prüfe ob es eine Nachricht zum Senden gibt
if (ud->pendingMessage.empty()) {
std::string messageToSend;
{
std::lock_guard<std::mutex> lock(ud->messageQueueMutex);
if (!ud->messageQueue.empty()) {
messageToSend = std::move(ud->messageQueue.front());
ud->messageQueue.pop();
}
}
if (!messageToSend.empty()) {
// Nachricht senden
std::cout << "[WRITEABLE] Sende Nachricht: " << messageToSend << std::endl;
unsigned char buf[LWS_PRE + messageToSend.length()];
memcpy(buf + LWS_PRE, messageToSend.c_str(), messageToSend.length());
lws_write(wsi, buf + LWS_PRE, messageToSend.length(), LWS_WRITE_TEXT);
std::cout << "[WRITEABLE] Nachricht erfolgreich gesendet" << std::endl;
// Wenn noch weitere Nachrichten in der Queue sind, wieder schreibbereit machen
{
std::lock_guard<std::mutex> lock(ud->messageQueueMutex);
if (!ud->messageQueue.empty()) {
lws_callback_on_writable(wsi);
}
}
} else {
// Ping senden
ud->lastPingTime = std::chrono::steady_clock::now();
ud->pongReceived = false;
@@ -269,21 +296,13 @@ int WebSocketServer::wsCallback(struct lws *wsi,
memcpy(buf + LWS_PRE, "ping", 4);
lws_write(wsi, buf + LWS_PRE, 4, LWS_WRITE_TEXT);
// std::cout << "Ping an Client gesendet" << std::endl;
} else {
// Nachricht senden
std::cout << "[WRITEABLE] Sende Nachricht: " << ud->pendingMessage << std::endl;
unsigned char buf[LWS_PRE + ud->pendingMessage.length()];
memcpy(buf + LWS_PRE, ud->pendingMessage.c_str(), ud->pendingMessage.length());
lws_write(wsi, buf + LWS_PRE, ud->pendingMessage.length(), LWS_WRITE_TEXT);
ud->pendingMessage.clear();
std::cout << "[WRITEABLE] Nachricht erfolgreich gesendet" << std::endl;
}
break;
}
case LWS_CALLBACK_CLOSED:
// Verbindung aus der Map entfernen
if (!ud->userId.empty()) {
instance->removeConnection(ud->userId);
instance->removeConnection(ud->userId, wsi);
std::cout << "WebSocket-Verbindung geschlossen für User: " << ud->userId << std::endl;
}
break;
@@ -316,28 +335,44 @@ void WebSocketServer::handleBrokerMessage(const std::string &message) {
auto userId = getUserIdFromFalukantUserId(fid);
std::cout << "[handleBrokerMessage] Broker-Nachricht für Falukant-User " << fid << " -> User-ID " << userId << std::endl;
std::shared_lock<std::shared_mutex> lock(connectionsMutex);
std::cout << "[handleBrokerMessage] Aktive Verbindungen: " << connections.size() << std::endl;
auto it = connections.find(userId);
if (it != connections.end()) {
std::cout << "[handleBrokerMessage] Sende Nachricht an User " << userId << ": " << message << std::endl;
// Nachricht in der UserData speichern
auto *ud = reinterpret_cast<WebSocketUserData*>(lws_wsi_user(it->second));
if (ud) {
ud->pendingMessage = message;
std::cout << "[handleBrokerMessage] Nachricht in pendingMessage gespeichert" << std::endl;
} else {
std::cerr << "[handleBrokerMessage] FEHLER: ud ist nullptr!" << std::endl;
// Prüfe ob User-ID gefunden wurde
if (userId.empty()) {
std::cerr << "[handleBrokerMessage] WARNUNG: User-ID für Falukant-User " << fid << " nicht gefunden! Nachricht wird nicht gesendet." << std::endl;
return;
}
lws_callback_on_writable(it->second);
std::shared_lock<std::shared_mutex> lock(connectionsMutex);
std::cout << "[handleBrokerMessage] Aktive User-Verbindungen: " << connections.size() << std::endl;
auto it = connections.find(userId);
if (it != connections.end() && !it->second.empty()) {
std::cout << "[handleBrokerMessage] Sende Nachricht an User " << userId << " (" << it->second.size() << " Verbindungen): " << message << std::endl;
// Nachricht an alle Verbindungen des Users senden
for (auto* wsi : it->second) {
auto *ud = reinterpret_cast<WebSocketUserData*>(lws_wsi_user(wsi));
if (ud) {
bool wasEmpty = false;
{
std::lock_guard<std::mutex> lock(ud->messageQueueMutex);
wasEmpty = ud->messageQueue.empty();
ud->messageQueue.push(message);
std::cout << "[handleBrokerMessage] Nachricht zur Queue hinzugefügt (Queue-Größe: " << ud->messageQueue.size() << ")" << std::endl;
}
// Nur wenn die Queue leer war, den Callback aufrufen
// (sonst wird er bereits durch den WRITEABLE-Handler aufgerufen)
if (wasEmpty) {
lws_callback_on_writable(wsi);
}
} else {
std::cerr << "[handleBrokerMessage] FEHLER: ud ist nullptr für eine Verbindung!" << std::endl;
}
}
} else {
std::cout << "[handleBrokerMessage] Keine aktive Verbindung für User " << userId << " gefunden" << std::endl;
std::cout << "[handleBrokerMessage] Verfügbare User-IDs in connections:" << std::endl;
for (const auto& pair : connections) {
std::cout << " - " << pair.first << std::endl;
std::cout << " - " << pair.first << " (" << pair.second.size() << " Verbindungen)" << std::endl;
}
}
} else {
@@ -372,12 +407,36 @@ void WebSocketServer::setWorkers(const std::vector<std::unique_ptr<Worker>> &wor
void WebSocketServer::addConnection(const std::string &userId, struct lws *wsi) {
std::unique_lock<std::shared_mutex> lock(connectionsMutex);
connections[userId] = wsi;
std::cout << "[addConnection] Verbindung für User " << userId << " gespeichert (Insgesamt: " << connections.size() << " Verbindungen)" << std::endl;
connections[userId].push_back(wsi);
size_t totalConnections = 0;
for (const auto& pair : connections) {
totalConnections += pair.second.size();
}
std::cout << "[addConnection] Verbindung für User " << userId << " gespeichert (User hat " << connections[userId].size() << " Verbindung(en), insgesamt: " << totalConnections << " Verbindungen)" << std::endl;
}
void WebSocketServer::removeConnection(const std::string &userId) {
void WebSocketServer::removeConnection(const std::string &userId, struct lws *wsi) {
std::unique_lock<std::shared_mutex> lock(connectionsMutex);
connections.erase(userId);
std::cout << "[removeConnection] Verbindung für User " << userId << " entfernt (Insgesamt: " << connections.size() << " Verbindungen)" << std::endl;
auto it = connections.find(userId);
if (it != connections.end()) {
// Entferne die spezifische Verbindung aus dem Vektor
auto& connList = it->second;
connList.erase(std::remove(connList.begin(), connList.end(), wsi), connList.end());
// Speichere die verbleibende Anzahl vor dem möglichen Löschen
size_t remainingConnections = connList.size();
// Wenn keine Verbindungen mehr vorhanden sind, entferne den Eintrag
if (connList.empty()) {
connections.erase(it);
}
size_t totalConnections = 0;
for (const auto& pair : connections) {
totalConnections += pair.second.size();
}
std::cout << "[removeConnection] Verbindung für User " << userId << " entfernt (User hat noch " << remainingConnections << " Verbindung(en), insgesamt: " << totalConnections << " Verbindungen)" << std::endl;
} else {
std::cout << "[removeConnection] Warnung: Keine Verbindungen für User " << userId << " gefunden" << std::endl;
}
}

7
src/websocket_server.h
View File

@@ -20,7 +20,8 @@
struct WebSocketUserData {
std::string userId;
bool pongReceived = true;
std::string pendingMessage;
std::queue<std::string> messageQueue;
std::mutex messageQueueMutex;
std::chrono::steady_clock::time_point lastPingTime;
std::chrono::steady_clock::time_point lastPongTime;
int pingTimeoutCount = 0;
@@ -48,7 +49,7 @@ private:
void handleBrokerMessage(const std::string &message);
std::string getUserIdFromFalukantUserId(int falukantUserId);
void addConnection(const std::string &userId, struct lws *wsi);
void removeConnection(const std::string &userId);
void removeConnection(const std::string &userId, struct lws *wsi);
static int wsCallback(struct lws *wsi,
enum lws_callback_reasons reason,
@@ -72,7 +73,7 @@ private:
std::queue<std::string> messageQueue;
std::shared_mutex connectionsMutex;
std::unordered_map<std::string, struct lws*> connections;
std::unordered_map<std::string, std::vector<struct lws*>> connections;
std::vector<Worker*> workers;