chatterino2
Code Issues

Fix write connection reconnection issues (#2850)

Browse Source 
Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
Ben de Graaff
2021-06-06 16:25:13 +02:00
committed by GitHub
parent 0b4c521c9b
commit 8639f450f2
5 changed files with 127 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/irc/IrcConnection2.cpp
+95 -29
View File
@@ -1,9 +1,13 @@
#include "IrcConnection2.hpp"
#include "common/QLogging.hpp"
#include "common/Version.hpp"
namespace chatterino {
// The minimum interval between attempting to establish a new connection
const int RECONNECT_MIN_INTERVAL = 15000;
namespace {
const auto payload = QString("chatterino/" CHATTERINO_VERSION);
@@ -13,40 +17,95 @@ namespace {
IrcConnection::IrcConnection(QObject *parent)
: Communi::IrcConnection(parent)
{
// send ping every x seconds
// Log connection errors for ease-of-debugging
QObject::connect(this, &Communi::IrcConnection::socketError, this,
[this](QAbstractSocket::SocketError error) {
qCDebug(chatterinoIrc) << "Connection error:" << error;
});
QObject::connect(
this, &Communi::IrcConnection::socketStateChanged, this,
[this](QAbstractSocket::SocketState state) {
if (state == QAbstractSocket::UnconnectedState)
{
this->pingTimer_.stop();
// The socket will enter unconnected state both in case of
// socket error (including failures to connect) and regular
// disconnects. We signal that the connection was lost if this
// was not the result of us calling `close`.
if (!this->expectConnectionLoss_.load())
{
this->connectionLost.invoke(false);
}
}
});
// Schedule a reconnect that won't violate RECONNECT_MIN_INTERVAL
this->smartReconnect.connect([this] {
if (this->reconnectTimer_.isActive())
{
return;
}
auto delta =
std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::steady_clock::now() - this->lastConnected_)
.count();
delta = delta < RECONNECT_MIN_INTERVAL
? (RECONNECT_MIN_INTERVAL - delta)
: 10;
qCDebug(chatterinoIrc) << "Reconnecting in" << delta << "ms";
this->reconnectTimer_.start(delta);
});
this->reconnectTimer_.setInterval(RECONNECT_MIN_INTERVAL);
this->reconnectTimer_.setSingleShot(true);
QObject::connect(&this->reconnectTimer_, &QTimer::timeout, [this] {
if (this->isConnected())
{
// E.g. user manually reconnecting doesn't cancel this path, so
// just ignore
qCDebug(chatterinoIrc) << "Reconnect: already reconnected";
}
else
{
qCDebug(chatterinoIrc) << "Reconnecting";
this->open();
}
});
// Send ping every x seconds
this->pingTimer_.setInterval(5000);
this->pingTimer_.start();
QObject::connect(&this->pingTimer_, &QTimer::timeout, [this] {
if (this->isConnected())
{
if (this->waitingForPong_.load())
if (this->recentlyReceivedMessage_.load())
{
// Not sending another ping as we haven't received the matching pong yet
// If we're still receiving messages, all is well
this->recentlyReceivedMessage_ = false;
this->waitingForPong_ = false;
return;
}
if (!this->recentlyReceivedMessage_.load())
if (this->waitingForPong_.load())
{
// The remote server did not send a PONG fast enough; close the
// connection
this->close();
this->connectionLost.invoke(true);
}
else
{
this->sendRaw("PING " + payload);
this->reconnectTimer_.start();
this->waitingForPong_ = true;
}
this->recentlyReceivedMessage_ = false;
}
});
// reconnect after x seconds without receiving a message
this->reconnectTimer_.setInterval(5000);
this->reconnectTimer_.setSingleShot(true);
QObject::connect(&this->reconnectTimer_, &QTimer::timeout, [this] {
if (this->isConnected())
{
reconnectRequested.invoke();
}
});
QObject::connect(this, &Communi::IrcConnection::connected, this, [this] {
this->waitingForPong_ = false;
this->pingTimer_.start();
});
QObject::connect(this, &Communi::IrcConnection::pongMessageReceived,
@@ -57,20 +116,27 @@ IrcConnection::IrcConnection(QObject *parent)
}
});
QObject::connect(
this, &Communi::IrcConnection::messageReceived,
[this](Communi::IrcMessage *message) {
this->recentlyReceivedMessage_ = true;
QObject::connect(this, &Communi::IrcConnection::messageReceived,
[this](Communi::IrcMessage *message) {
// This connection is probably still alive
this->recentlyReceivedMessage_ = true;
});
}
if (this->reconnectTimer_.isActive())
{
this->reconnectTimer_.stop();
void IrcConnection::open()
{
// Accurately track the time a connection was opened
this->lastConnected_ = std::chrono::steady_clock::now();
this->expectConnectionLoss_ = false;
this->waitingForPong_ = false;
this->recentlyReceivedMessage_ = false;
Communi::IrcConnection::open();
}
// The reconnect timer had started, that means we were waiting for a pong.
// Since we received a message, this means that any pong response is meaningless, so we can just stop waiting for the pong and send another ping soon:tm:
this->waitingForPong_ = false;
}
});
void IrcConnection::close()
{
this->expectConnectionLoss_ = true;
Communi::IrcConnection::close();
}
} // namespace chatterino