Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: clear pubsub command queue on reconnect #599

Merged
merged 2 commits into from Jul 9, 2022
Merged

fix: clear pubsub command queue on reconnect #599

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8976f76
fix: clear queue on pubsub reconnect
iProdigy Jul 8, 2022
64205ba
fix: reset pubsub ping timer in more cases
iProdigy Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions pubsub/src/main/java/com/github/twitch4j/pubsub/TwitchPubSub.java
View file
Open in desktop
Expand Up @@ -255,8 +255,10 @@ public TwitchPubSub(WebsocketConnection websocketConnection, EventManager eventM
this.connection = new WebsocketConnection(spec -> {
spec.baseUrl(WEB_SOCKET_SERVER);
spec.wsPingPeriod(wsPingPeriod);
spec.onPreConnect(this::onPreConnect);
spec.onConnected(this::onConnected);
spec.onTextMessage(this::onTextMessage);
spec.onPostDisconnect(commandQueue::clear);
spec.taskExecutor(taskExecutor);
spec.proxyConfig(proxyConfig);
if (connectionBackoffStrategy != null)
Expand Down Expand Up @@ -339,10 +341,6 @@ public TwitchPubSub(WebsocketConnection websocketConnection, EventManager eventM
* Connecting to IRC-WS
*/
public void connect() {
// Reset last ping to avoid edge case loop where reconnect occurred after sending PING but before receiving PONG
lastPong = TimeUtils.getCurrentTimeInMillis();
lastPing = lastPong - 4 * 60 * 1000;

connection.connect();
}

Expand All @@ -361,6 +359,12 @@ public void reconnect() {
connection.reconnect();
}

protected void onPreConnect() {
// Reset last ping to avoid edge case loop where reconnect occurred after sending PING but before receiving PONG
lastPong = TimeUtils.getCurrentTimeInMillis();
lastPing = lastPong - 4 * 60 * 1000;
}

protected void onConnected() {
log.info("Connected to Twitch PubSub {}", WEB_SOCKET_SERVER);

Expand Down