-
Notifications
You must be signed in to change notification settings - Fork 37
fix: Improve error handling for FDv2 streaming #1184
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d217fb4
fix: Improve error handling for FDv2 streaming
kinyoklion 6917736
Merge branch 'main' into rlamb/fdv2-streaming-error-handling
kinyoklion 28bbc8a
fix: Use errorInfoFromNetworkError helper in onerror handler
kinyoklion 30d5200
Allow status code 0 for error filter.
kinyoklion 28ac8cf
Don't emit interrupted status on an error if the event source is stop…
kinyoklion File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -188,7 +188,10 @@ export function createStreamingBase(config: { | |
| } | ||
|
|
||
| if (!event?.data) { | ||
| config.logger?.warn(`Event from EventStream missing data for "${eventName}".`); | ||
| // Some events (e.g. 'error') may legitimately arrive without a body. | ||
| if (eventName !== 'error') { | ||
| config.logger?.warn(`Event from EventStream missing data for "${eventName}".`); | ||
| } | ||
| return; | ||
| } | ||
|
|
||
|
|
@@ -277,8 +280,18 @@ export function createStreamingBase(config: { | |
| config.logger?.info('Closed LaunchDarkly stream connection'); | ||
| }; | ||
|
|
||
| es.onerror = () => { | ||
| // Error handling is done by errorFilter. | ||
| es.onerror = (err?: HttpErrorResponse) => { | ||
|
Member
Author
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. Errors without an http status code are handled in this path, and ones with one are handled in the error filter. |
||
| if (stopped) { | ||
| return; | ||
| } | ||
|
|
||
| if (err && typeof err.status === 'number') { | ||
| // This condition will be handled by the error filter. | ||
| return; | ||
| } | ||
|
cursor[bot] marked this conversation as resolved.
|
||
| resultQueue.put( | ||
| interrupted(errorInfoFromNetworkError(err?.message ?? 'IO Error'), fdv1Fallback), | ||
| ); | ||
|
cursor[bot] marked this conversation as resolved.
kinyoklion marked this conversation as resolved.
cursor[bot] marked this conversation as resolved.
|
||
| }; | ||
|
|
||
| es.onopen = () => { | ||
|
|
||
Oops, something went wrong.
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.
When you have an event called 'error' that will listen to errors from the event source instead of of just messages.