-
Notifications
You must be signed in to change notification settings - Fork 128
Handle Web Socket error #324
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| import 'dotenv/config'; | ||
| import 'global-agent/bootstrap'; | ||
|
|
||
| import { defineEventAttribute, EventTarget } from 'event-target-shim'; | ||
| import nock from 'nock'; | ||
| import onErrorResumeNext from 'on-error-resume-next'; | ||
|
|
||
| import { DirectLine } from '../src/directLine'; | ||
|
|
||
| function corsReply(nockRequest) { | ||
| nockRequest.reply(function () { | ||
| const { headers } = this.req; | ||
|
|
||
| return [ | ||
| 200, | ||
| null, | ||
| { | ||
| 'Access-Control-Allow-Headers': headers['access-control-request-headers'], | ||
| 'Access-Control-Allow-Methods': headers['access-control-request-method'], | ||
| 'Access-Control-Allow-Origin': headers.origin | ||
| } | ||
| ]; | ||
| }); | ||
| } | ||
|
|
||
| describe('Unhappy path', () => { | ||
| let unsubscribes; | ||
|
|
||
| beforeEach(() => (unsubscribes = [])); | ||
| afterEach(() => unsubscribes.forEach(fn => onErrorResumeNext(fn))); | ||
|
|
||
| describe('broken Web Socket', () => { | ||
| let numErrors; | ||
| let numReconnections; | ||
|
|
||
| beforeEach(async () => { | ||
| numErrors = 0; | ||
| numReconnections = 0; | ||
|
|
||
| nock('https://directline.botframework.com') | ||
| .persist() | ||
| .post(uri => uri.startsWith('/v3/directline/conversations')) | ||
| .reply( | ||
| 200, | ||
| JSON.stringify({ | ||
| conversationId: '123', | ||
| token: '456', | ||
| streamUrl: 'wss://not-exist-domain' | ||
| }) | ||
| ) | ||
| .get(uri => uri.startsWith('/v3/directline/conversations')) | ||
| .reply( | ||
| 200, | ||
| JSON.stringify({ | ||
| conversationId: '123', | ||
| token: '456', | ||
| streamUrl: 'wss://not-exist-domain' | ||
| }) | ||
| ); | ||
|
|
||
| corsReply( | ||
| nock('https://directline.botframework.com') | ||
| .persist() | ||
| .options(uri => uri.startsWith('/v3/directline/conversations')) | ||
| ); | ||
|
|
||
| window.WebSocket = class extends ( | ||
| EventTarget | ||
| ) { | ||
| constructor() { | ||
| super(); | ||
|
|
||
| numReconnections++; | ||
|
|
||
| setTimeout(() => { | ||
| numErrors++; | ||
|
|
||
| this.dispatchEvent(new ErrorEvent('error', { error: new Error('artificial') })); | ||
| this.dispatchEvent(new CustomEvent('close')); | ||
| }, 10); | ||
| } | ||
| }; | ||
|
|
||
| defineEventAttribute(window.WebSocket.prototype, 'close'); | ||
| defineEventAttribute(window.WebSocket.prototype, 'error'); | ||
| }); | ||
|
|
||
| test('should reconnect only once for every error', async () => { | ||
| const directLine = new DirectLine({ | ||
| token: '123', | ||
| webSocket: true | ||
| }); | ||
|
|
||
| // Remove retry delay | ||
| directLine.getRetryDelay = () => 0; | ||
|
|
||
| unsubscribes.push(() => directLine.end()); | ||
|
|
||
| await new Promise(resolve => { | ||
| const subscription = directLine.activity$.subscribe(() => {}); | ||
|
|
||
| setTimeout(() => { | ||
| subscription.unsubscribe(); | ||
| resolve(); | ||
| }, 2000); | ||
| }); | ||
|
|
||
| // Because we abruptly stopped reconnection after 2 seconds, there is a | ||
| // 10ms window that the number of reconnections is 1 more than number of errors. | ||
| expect(Math.abs(numReconnections - numErrors)).toBeLessThanOrEqual(1); | ||
|
|
||
| // As we loop reconnections for 2000 ms, and we inject errors every 10 ms. | ||
| // We should only see at most 200 errors and reconnections. | ||
| expect(numReconnections).toBeLessThanOrEqual(200); | ||
| }); | ||
| }); | ||
| }); |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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.
normal web socket close should lead to non-error RX stream completion, right?
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.
I am keeping the original logic as-is, i.e.
onclosewill throw an error. And I think it's intentional.If you look at line 910,
BotFramework-DirectLineJS/src/directLine.ts
Line 912 in 6fc932d
Looks like the author of the logic intentionally want to retry whenever the server or browser close the connection. And to do that, the code need to throw error on graceful close.
What do you think?