Fix race conditions and delayed connections - #50
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR addresses reconnection/flush task race conditions in the Phoenix client and reduces delayed reconnect behavior by ensuring prior tasks/continuations are properly cancelled before starting replacements.
Changes:
- Add
PushBuffer.cancelAwaitingContinuation()and cancel prior timeout tasks when updating the next timeout. - Fix
PhoenixSockettask replacement races (flush/listen/heartbeat/reconnect) and reset reconnection state when connecting/disconnecting during a reconnect loop. - Add regression tests for cancelling an awaiting iterator and for reconnect-loop behavior around
disconnect()/connect().
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| Tests/PhoenixTests/PushBufferTests.swift | Adds tests for cancelling an awaiting iterator and ensuring a new iterator can proceed afterward. |
| Tests/PhoenixTests/PhoenixSocketTests.swift | Adds tests ensuring disconnect() stops reconnect loops and connect() after disconnect during reconnect has no backoff. |
| Sources/Phoenix/PushBuffer.swift | Adds continuation cancellation helper and fixes timeout task replacement by cancelling the previous task. |
| Sources/Phoenix/PhoenixSocket.swift | Cancels/replaces stored tasks safely, resets reconnect state on connect/disconnect, and improves cancellation handling in doConnect(). |
| Package.swift | Raises minimum supported platform versions. |
| .github/workflows/ci.yml | Updates CI runner and hard-pins an Xcode app bundle path. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Taskwas created and thus started before theTaskit was replacing had been cancelledPhoenixSocket.connect()by correctly resetting reconnection state in bothdisconnect()andconnect()