Skip to content

Watermark support for websocket #96

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 3 commits into from
Oct 13, 2018
Merged

Watermark support for websocket #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc5b432
Watermark must be forwarded to the server even in the case of websocket
ckkMicrosoft Oct 5, 2018
1f94896
Coding style update
compulim Oct 13, 2018
7573db1
Update CHANGELOG.md
compulim Oct 13, 2018
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Added
- Add support for watermark in Web Socket, in [#96](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/96)

## [0.9.17] - 2018-08-31
### Changed
Expand Down
22 changes: 13 additions & 9 deletions src/directLine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,25 +316,29 @@ export class DirectLine implements IBotConnection {
this.token = options.secret || options.token;
this.webSocket = (options.webSocket === undefined ? true : options.webSocket) && typeof WebSocket !== 'undefined' && WebSocket !== undefined;

if (options.domain)
if (options.domain) {
this.domain = options.domain;
}

if (options.conversationId) {
this.conversationId = options.conversationId;
}

if (options.watermark) {
if (this.webSocket)
console.warn("Watermark was ignored: it is not supported using websockets at the moment");
else
this.watermark = options.watermark;
this.watermark = options.watermark;
}

if (options.streamUrl) {
if (options.token && options.conversationId)
if (options.token && options.conversationId) {
this.streamUrl = options.streamUrl;
else
console.warn("streamUrl was ignored: you need to provide a token and a conversationid");
} else {
console.warn('streamUrl was ignored: you need to provide a token and a conversationid');
}
}
if (options.pollingInterval !== undefined)

if (options.pollingInterval !== undefined) {
this.pollingInterval = options.pollingInterval;
}

this.activity$ = (this.webSocket
? this.webSocketActivity$()
Expand Down