Skip to content

Revert #171 and #172 #240

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.

Sign up for GitHub

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
compulim merged 2 commits into from
Oct 25, 2019
Merged

Revert #171 and #172 #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d158a59
Reverting #171 and #172
compulim Oct 18, 2019
7ad00ad
Add entry
compulim Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Fixed

- Reverting PR [#171](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/171) and PR [#172](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/172), which caused infinite loop of reconnections, by [@compulim](https://github.com/compulim) in PR [#240](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/240)

## [0.11.5] - 2019-09-30

### Breaking Changes
Expand Down
22 changes: 8 additions & 14 deletions src/directLine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,6 @@ export class DirectLine implements IBotConnection {

private tokenRefreshSubscription: Subscription;

private ending: boolean;

constructor(options: DirectLineOptions) {
this.secret = options.secret;
this.token = options.secret || options.token;
Expand Down Expand Up @@ -497,10 +495,7 @@ export class DirectLine implements IBotConnection {
.flatMap(connectionStatus => {
switch (connectionStatus) {
case ConnectionStatus.Ended:
if (this.ending)
return Observable.of(connectionStatus);
else
return Observable.throw(errorConversationEnded);
return Observable.throw(errorConversationEnded);

case ConnectionStatus.FailedToConnect:
return Observable.throw(errorFailedToConnect);
Expand Down Expand Up @@ -624,8 +619,13 @@ export class DirectLine implements IBotConnection {
end() {
if (this.tokenRefreshSubscription)
this.tokenRefreshSubscription.unsubscribe();
this.ending = true;
this.connectionStatus$.next(ConnectionStatus.Ended);
try {
this.connectionStatus$.next(ConnectionStatus.Ended);
} catch (e) {
if (e === errorConversationEnded)
return;
throw(e);
}
}

getSessionId(): Observable<string> {
Expand Down Expand Up @@ -863,12 +863,6 @@ export class DirectLine implements IBotConnection {

ws.onmessage = message => message.data && subscriber.next(JSON.parse(message.data));

ws.onerror = error => {
konsole.log("WebSocket error", error);
if (sub) sub.unsubscribe();
subscriber.error(error);
}

// This is the 'unsubscribe' method, which is called when this observable is disposed.
// When the WebSocket closes itself, we throw an error, and this function is eventually called.
// When the observable is closed first (e.g. when tearing down a WebChat instance) then
Expand Down