fix: parent step for API calls inside waitForEvent callback #33409
+99
−15
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
Test results for "tests 1"36791 passed, 630 skipped Merge workflow run. |
pavelfeldman
reviewed
Nov 2, 2024
| @@ -39,6 +39,17 @@ class ZoneManager { | |||
| return this._asyncLocalStorage.run(undefined, func); | |||
| } | |||
|
|
|||
| currentZoneBefore(type: ZoneType): ZoneReference { | |||
| let zone = this._asyncLocalStorage.getStore(); | |||
| while (zone && zone.type === type) | |||
There was a problem hiding this comment.
I'm not sure I understand the logic here.
|
|
||
| constructor(channelOwner: ChannelOwner<channels.EventTargetChannel>, event: string) { | ||
| this._waitId = createGuid(); | ||
| this._channelOwner = channelOwner; | ||
| // Save current chain before the wait for event API call (we don't nest API calls) | ||
| // and restore it later to find proper parent for the event listener. | ||
| this._savedZone = zones.currentZoneBefore('apiZone'); |
There was a problem hiding this comment.
What does it mean zone before zone? Do you mean simply current zone?
pavelfeldman
reviewed
Nov 2, 2024
| @@ -53,6 +64,20 @@ class ZoneManager { | |||
| } | |||
| } | |||
|
|
|||
| export class ZoneReference { | |||
There was a problem hiding this comment.
What's is zone reference? I thought zone was a zone reference already. Real zone is the async context. I don't think we need 3 types, should be just async context and a logical apiCall zone with a parent.
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.
Fixes #33186