fix: remove rejected channel query promises from channel query lock #2549
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2549 +/- ##
=======================================
Coverage 84.79% 84.79%
=======================================
Files 392 392
Lines 8196 8197 +1
Branches 2041 2041
=======================================
+ Hits 6950 6951 +1
Misses 959 959
Partials 287 287 ☔ View full report in Codecov by Sentry. |
|
Size Change: +32 B (0%) Total Size: 1.08 MB
ℹ️ View Unchanged
|
oliverlaz
reviewed
Oct 29, 2024
src/utils/getChannel.ts
Outdated
Comment on lines
71
to
78
| try { | ||
| WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid] = theChannel.watch(options); | ||
| await WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid]; | ||
| delete WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid]; | ||
| } catch (e) { | ||
| delete WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid]; | ||
| throw e; | ||
| } |
There was a problem hiding this comment.
Suggested change
| try { | |
| WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid] = theChannel.watch(options); | |
| await WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid]; | |
| delete WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid]; | |
| } catch (e) { | |
| delete WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid]; | |
| throw e; | |
| } | |
| try { | |
| WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid] = theChannel.watch(options); | |
| await WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid]; | |
| } finally { | |
| delete WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid]; | |
| } |
Can be simplified a bit :)
There was a problem hiding this comment.
I wanted to re-throw the error to prevent breaking change
oliverlaz
approved these changes
Oct 29, 2024
MartinCupela
deleted the
fix/remove-channel-query-inprogress-ref-on-error
branch
github-actions bot
pushed a commit
that referenced
this pull request
Oct 29, 2024
## [12.4.1](v12.4.0...v12.4.1) (2024-10-29) ### Bug Fixes * remove rejected channel query promises from channel query lock ([#2549](#2549)) ([631a928](631a928))
|
🎉 This PR is included in version 12.4.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
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.
🎯 Goal
Remove stale promise references from the channel query lock. If not removed, even if the whole chat is remounted, the rejected promise from the past leads to display of error in the chat UI. This is because the lock is located in the global scope.