Browse Source

Websocket: fix unnecessary reconnect

1.0.0
tobtoht 2 months ago
parent
commit
3ef10e9b53
Signed by: tobtoht GPG Key ID: 1CADD27F41F45C3C
  1. 2
      src/WindowManager.cpp
  2. 51
      src/utils/WebsocketClient.cpp
  3. 8
      src/utils/WebsocketClient.h

2
src/WindowManager.cpp

@ -460,8 +460,6 @@ void WindowManager::initTor() {
torManager()->init();
torManager()->start();
connect(torManager(), &TorManager::connectionStateChanged, &websocketNotifier()->websocketClient, &WebsocketClient::onToggleConnect);
this->onTorSettingsChanged();
}

51
src/utils/WebsocketClient.cpp

@ -9,76 +9,59 @@
WebsocketClient::WebsocketClient(QObject *parent)
: QObject(parent)
{
connect(&webSocket, &QWebSocket::binaryMessageReceived, this, &WebsocketClient::onbinaryMessageReceived);
connect(&webSocket, &QWebSocket::connected, this, &WebsocketClient::onConnected);
connect(&webSocket, &QWebSocket::disconnected, this, &WebsocketClient::closed);
connect(&webSocket, &QWebSocket::disconnected, this, &WebsocketClient::onDisconnected);
connect(&webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), this, &WebsocketClient::onError);
connect(&m_connectionTimer, &QTimer::timeout, this, &WebsocketClient::checkConnection);
connect(&webSocket, &QWebSocket::binaryMessageReceived, this, &WebsocketClient::onbinaryMessageReceived);
// Keep websocket connection alive
connect(&m_pingTimer, &QTimer::timeout, [this]{
if (webSocket.state() == QAbstractSocket::ConnectedState)
if (webSocket.state() == QAbstractSocket::ConnectedState) {
webSocket.ping();
}
});
m_pingTimer.setInterval(30 * 1000);
m_pingTimer.start();
}
void WebsocketClient::sendMsg(const QByteArray &data) {
if (webSocket.state() == QAbstractSocket::ConnectedState)
if (webSocket.state() == QAbstractSocket::ConnectedState) {
webSocket.sendBinaryMessage(data);
}
void WebsocketClient::onToggleConnect(bool connect) {
m_connect = connect;
if (m_connect)
checkConnection();
}
}
void WebsocketClient::start() {
// connect & reconnect on errors/close
#ifdef QT_DEBUG
qDebug() << "WebSocket connect:" << m_url.url();
#endif
if (m_connect)
auto state = webSocket.state();
if (state != QAbstractSocket::ConnectedState && state != QAbstractSocket::ConnectingState) {
webSocket.open(m_url);
if (!m_connectionTimer.isActive()) {
m_connectionTimer.start(2000);
}
}
void WebsocketClient::checkConnection() {
if (!m_connect)
return;
if (webSocket.state() == QAbstractSocket::UnconnectedState) {
#ifdef QT_DEBUG
qDebug() << "WebSocket reconnect";
#endif
this->start();
}
}
void WebsocketClient::onConnected() {
#ifdef QT_DEBUG
qDebug() << "WebSocket connected";
#endif
emit connectionEstablished();
}
void WebsocketClient::onDisconnected() {
qDebug() << "WebSocket disconnected";
QTimer::singleShot(1000, [this]{this->start();});
}
void WebsocketClient::onError(QAbstractSocket::SocketError error) {
qCritical() << "WebSocket error: " << error;
auto state = webSocket.state();
if (state == QAbstractSocket::ConnectedState || state == QAbstractSocket::ConnectingState)
if (state == QAbstractSocket::ConnectedState || state == QAbstractSocket::ConnectingState) {
webSocket.abort();
}
}
void WebsocketClient::onbinaryMessageReceived(const QByteArray &message) {
#ifdef QT_DEBUG
qDebug() << "WebSocket received:" << message;
#endif
if (!Utils::validateJSON(message)) {
qCritical() << "Could not interpret WebSocket message as JSON";
return;

8
src/utils/WebsocketClient.h

@ -20,24 +20,18 @@ public:
QWebSocket webSocket;
public slots:
void onToggleConnect(bool connect);
signals:
void closed();
void connectionEstablished();
void WSMessage(QJsonObject message);
private slots:
void onConnected();
void onDisconnected();
void onbinaryMessageReceived(const QByteArray &message);
void checkConnection();
void onError(QAbstractSocket::SocketError error);
private:
bool m_connect = false;
QUrl m_url = constants::websocketUrl;
QTimer m_connectionTimer;
QTimer m_pingTimer;
};

Loading…
Cancel
Save