Fix sending call member events on leave #3799
Merged
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
#3756 changed the membership update function to await on the next call, but this meant it never returned and therefore never cleared `updateCallMembershipRunning`. We therefore didn't send the updated call member event when leaving, instead sending it whenever the next poll interval arrived. This changes it to only await if we are retrying, not if we're just scheduling the next poll. Fixes element-hq/element-call#1763
toger5
reviewed
Oct 16, 2023
| } catch (e) { | ||
| resendDelay = CALL_MEMBER_EVENT_RETRY_DELAY_MIN + Math.random() * 2000; | ||
| const resendDelay = CALL_MEMBER_EVENT_RETRY_DELAY_MIN + Math.random() * 2000; |
There was a problem hiding this comment.
do declarations outlive the catch scope? (sorry this might be rust making me ancious)
There was a problem hiding this comment.
No, I think scopes are all the same in js (at least this one doesn't , I tested).
toger5
approved these changes
Oct 16, 2023
|
Not quite sure what you mean, but the problem was that we were using resendDelay to decide whether to await on the next call or not, but resendDelay was set both in the case of failures and also when we just wanted to schedule the next update (badly named variable really). |
toger5
reviewed
Oct 17, 2023
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.
#3756 changed the membership update function to await on the next call, but this meant it never returned and therefore never cleared
updateCallMembershipRunning. We therefore didn't send the updated call member event when leaving, instead sending it whenever the next poll interval arrived.This changes it to only await if we are retrying, not if we're just scheduling the next poll.
@toger5 review appreciated on this one - does this line up with what you expected your fix to do?
Fixes element-hq/element-call#1763
Checklist
Here's what your changelog entry will look like:
🐛 Bug Fixes