Skip to content

Post client disconnection callback before cancelling jobs #342

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

Merged
LossyDragon merged 2 commits into from
May 31, 2025
Merged

Post client disconnection callback before cancelling jobs #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a8f0ee
Post client disconnection callback before cancelling jobs
LossyDragon May 31, 2025
a162f74
Fix potential race condition.
LossyDragon May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/in/dragonbra/javasteam/networking/steam3/WebSocketConnection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ class WebSocketConnection :

job.cancelChildren()
}
}

onDisconnected(userInitiated)
onDisconnected(userInitiated)
}
}

override fun send(data: ByteArray) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/in/dragonbra/javasteam/steam/CMClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ public abstract class CMClient {
private final EventHandler<DisconnectedEventArgs> disconnected = new EventHandler<>() {
@Override
public void handleEvent(Object sender, DisconnectedEventArgs e) {
logger.debug("EventHandler `disconnected` called");
logger.debug("EventHandler `disconnected` called. User Initiated: " + e.isUserInitiated() +
", Expected Disconnection: " + expectDisconnection);

isConnected = false;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/in/dragonbra/javasteam/steam/steamclient/SteamClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,14 @@ class SteamClient @JvmOverloads constructor(
override fun onClientDisconnected(userInitiated: Boolean) {
super.onClientDisconnected(userInitiated)

postCallback(DisconnectedCallback(userInitiated))

// if we are disconnected, cancel all pending jobs
jobManager.cancelPendingJobs()

jobManager.setTimeoutsEnabled(false)

clearHandlerCaches()

postCallback(DisconnectedCallback(userInitiated))
}

fun clearHandlerCaches() {
Expand Down