Skip to content

[Streaming, Preview] Remove watershed, use ws in NodeWebSocket #1425

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
merged 6 commits into from
Nov 19, 2019
Merged

[Streaming, Preview] Remove watershed, use ws in NodeWebSocket #1425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24bf5ee
remove watershed socket impl, work on tests
stevengum Nov 7, 2019
a902676
clean-up bf-streaming package.json, add eslint config
stevengum Nov 7, 2019
5450ae7
cleanup BFAdapter streaming tests
stevengum Nov 17, 2019
2c60a4e
Merge branch '4.6-preview-streaming' into stgum/wsFactory
stevengum Nov 17, 2019
7247aac
clean up casing on relative imports
stevengum Nov 18, 2019
d3bbf1f
apply PR feedback to NodeWebSocket class
stevengum Nov 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
2 changes: 1 addition & 1 deletion libraries/botbuilder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"uuid": "^3.3.2"
},
"scripts": {
"test": "tsc && nyc mocha tests/",
"test": "tsc && nyc mocha --recursive \"tests/**/*.test.js\"",
"build": "tsc",
"build-docs": "typedoc --theme markdown --entryPoint botbuilder --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\botbuilder .\\lib\\index.d.ts ..\\botbuilder-core\\lib\\index.d.ts ..\\botframework-schema\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK\" --readme none",
"clean": "erase /q /s .\\lib",
Expand Down
2 changes: 1 addition & 1 deletion libraries/botbuilder/src/botFrameworkAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ export class BotFrameworkAdapter extends BotAdapter implements IUserTokenProvide
}

const upgrade = (res as any).claimUpgrade();
const socket = this.webSocketFactory.createWebSocket(req as IncomingMessage, upgrade.socket, upgrade.head);
const socket = await this.webSocketFactory.createWebSocket(req as IncomingMessage, upgrade.socket, upgrade.head);

await this.startWebSocket(socket);
}
Expand Down
Loading