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.
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
fix(share): propagate closed to firehose sources #6370
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
249b8bd
test: enable firehose test for share
cartant da90ba1
fix: add teardown directly to subscriber
cartant f39fe79
chore: add comment
cartant 60d5dbf
chore: remove firehose tests for deprecated ops
cartant 94d0aa0
refactor: move it up even further
cartant File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,6 +112,26 @@ export function share<T>(options?: ShareConfig<T>): OperatorFunction<T, T> { | |
// Create the subject if we don't have one yet. | ||
subject = subject ?? connector(); | ||
|
||
// Add the teardown directly to the subscriber - instead of returning it - | ||
// so that the handling of the subscriber's unsubscription will be wired | ||
// up _before_ the subscription to the source occurs. This is done so that | ||
// the assignment to the source connection's `closed` property will be seen | ||
// by synchronous firehose sources. | ||
subscriber.add(() => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🏆 |
||
refCount--; | ||
|
||
// If we're resetting on refCount === 0, and it's 0, we only want to do | ||
// that on "unsubscribe", really. Resetting on error or completion is a different | ||
// configuration. | ||
if (resetOnRefCountZero && !refCount && !hasErrored && !hasCompleted) { | ||
// We need to capture the connection before | ||
// we reset (if we need to reset). | ||
const conn = connection; | ||
reset(); | ||
conn?.unsubscribe(); | ||
} | ||
}); | ||
|
||
// The following line adds the subscription to the subscriber passed. | ||
// Basically, `subscriber === subject.subscribe(subscriber)` is `true`. | ||
subject.subscribe(subscriber); | ||
|
@@ -147,21 +167,5 @@ export function share<T>(options?: ShareConfig<T>): OperatorFunction<T, T> { | |
}); | ||
from(source).subscribe(connection); | ||
} | ||
|
||
// This is also added to `subscriber`, technically. | ||
return () => { | ||
refCount--; | ||
|
||
// If we're resetting on refCount === 0, and it's 0, we only want to do | ||
// that on "unsubscribe", really. Resetting on error or completion is a different | ||
// configuration. | ||
if (resetOnRefCountZero && !refCount && !hasErrored && !hasCompleted) { | ||
// We need to capture the connection before | ||
// we reset (if we need to reset). | ||
const conn = connection; | ||
reset(); | ||
conn?.unsubscribe(); | ||
} | ||
}; | ||
}); | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems like we'd still want this test for
refCount: true
.