Ensure readyState is set to SR_CLOSED on successful WebSocket closure #693
Conversation
This file contains 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
cipolleschi
suggested changes
Oct 7, 2024
There was a problem hiding this comment.
Hi @nnabeyang, thanks for the contribution.
I think that the line you added is correct but not in the best place. I added a comment.
SocketRocket/SRWebSocket.m
Outdated
| @@ -1113,6 +1113,8 @@ - (void)_pumpWriting | |||
| } | |||
| } | |||
|
|
|||
| self.readyState = SR_CLOSED; | |||
There was a problem hiding this comment.
Shouldn't this code go inside the if(!_failed)?
What's the state of the WebSocket if we send a command to close it and it fails to close for whatever reason? Is it in closing state? is it open?
There was a problem hiding this comment.
@cipolleschi Thank you! You're right, it does make more sense to put it inside if(!_failed). I fixed it.
|
@cipolleschi has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
@cipolleschi merged this pull request in 2204e53. |
nnabeyang
deleted the
fix-websocket-readystate-closed-before-closure-delegate
branch
nnabeyang
added a commit
to lisb/SocketRocket
that referenced
this pull request
Oct 16, 2024
…facebookincubator#693) Summary: This PR fixes an issue where the `readyState` was not properly set to `SR_CLOSED` when the WebSocket closed successfully. ### Changes: - Previously, during a successful WebSocket closure, the `readyState` remained at `SR_CLOSING` and was not updated to `SR_CLOSED`. - With this fix, the `readyState` is now set to `SR_CLOSED` before the delegate method responsible for handling the WebSocket closure is called. Pull Request resolved: facebookincubator#693 Reviewed By: nlutsenko Differential Revision: D64108852 Pulled By: cipolleschi fbshipit-source-id: d683d951e3b0069f1e909c091e8bc4e5d5066dab
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.
This PR fixes an issue where the
readyStatewas not properly set toSR_CLOSEDwhen the WebSocket closed successfully.Changes:
readyStateremained atSR_CLOSINGand was not updated toSR_CLOSED.readyStateis now set toSR_CLOSEDbefore the delegate method responsible for handling the WebSocket closure is called.