Skip to content

Commit 4128598

Browse files
fix(directline): add new changes from master
1 parent b1229e9 commit 4128598

13 files changed

Lines changed: 1413 additions & 126 deletions

CHANGELOG.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1515

1616
## [Unreleased]
1717

18-
### Fixed
19-
20-
- 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)
21-
22-
## [0.11.5] - 2019-09-30
18+
### Changed
19+
- Update DirectLine to rxjs v6 pipeable operators, PR [#102](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/102/files)
2320

2421
### Breaking Changes
2522

@@ -67,12 +64,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
6764
- [`webpack@4.39.3`](https://npmjs.com/package/webpack)
6865
- [`webpack-cli@3.3.8`](https://npmjs.com/package/webpack-cli)
6966

67+
<<<<<<< HEAD
7068
### Added
7169
- Fix [#235](https://github.com/Microsoft/BotFramework-DirectLineJS/issues/235). Added metadata when uploading attachments, including `thumbnailUrl`, by [@compulim](https://github.com/compulim), in PR [#236](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/236)
7270

7371
### Fixed
7472
- Avoid posting an error on intentional end, by [@orgads](https://github.com/orgads) in PR [#172](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/172)
7573
- Surface Web Socket errors, by [@orgads](https://github.com/orgads) in PR [#171](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/171)
74+
=======
75+
>>>>>>> fix(directline): add new changes from master
7676
7777
## [0.11.4] - 2019-03-04
7878
### Changed
@@ -121,10 +121,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
121121
- `deep-extend` from `0.4.2` to `0.5.1`
122122
- `randomatic` from `1.1.7` to `3.1.0`
123123

124-
## [1.0.0]
125-
### Changed
126-
- Update DirectLine to rxjs v6 pipeable operators
127-
128124
## [0.9.17] - 2018-08-31
129125
### Changed
130126
- Add handling of 403/500 for `getSessionId`, in [#87](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/87)

built/directLine.d.ts

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import { BehaviorSubject, Observable } from 'rxjs';
2+
import { Activity, DirectLineOptions, Conversation, IBotConnection } from './directLine';
3+
import { ConnectionStatus } from './directline.enum';
4+
export * from './directline.interface';
5+
export * from './directline.enum';
6+
export declare class DirectLine implements IBotConnection {
7+
connectionStatus$: BehaviorSubject<ConnectionStatus>;
8+
activity$: Observable<Activity>;
9+
private domain;
10+
private webSocket;
11+
conversationId: string;
12+
private expiredTokenExhaustion;
13+
private secret;
14+
private token;
15+
private watermark;
16+
private streamUrl;
17+
private _botAgent;
18+
private _userAgent;
19+
referenceGrammarId: string;
20+
private pollingInterval;
21+
private tokenRefreshSubscription;
22+
constructor(options: DirectLineOptions);
23+
private checkConnection;
24+
setConnectionStatusFallback(connectionStatusFrom: ConnectionStatus, connectionStatusTo: ConnectionStatus, maxAttempts?: number): (status: ConnectionStatus) => ConnectionStatus;
25+
private expiredToken;
26+
private startConversation;
27+
private refreshTokenLoop;
28+
private refreshToken;
29+
reconnect(conversation: Conversation): void;
30+
end(): void;
31+
getSessionId(): Observable<string>;
32+
postActivity(activity: Activity): Observable<string>;
33+
private postMessageWithAttachments;
34+
private catchPostError;
35+
private catchExpiredToken;
36+
private pollingGetActivity$;
37+
private observableFromActivityGroup;
38+
private webSocketActivity$;
39+
private getRetryDelay;
40+
private observableWebSocket;
41+
private reconnectToConversation;
42+
private commonHeaders;
43+
private getBotAgent;
44+
}

0 commit comments

Comments
 (0)