Skip to content

Commit

Permalink
[Streaming, Preview] Remove watershed, use ws in NodeWebSocket (#…
Browse files Browse the repository at this point in the history
…1425)

* remove watershed socket impl, work on tests

* clean-up bf-streaming package.json, add eslint config

* cleanup BFAdapter streaming tests

* clean up casing on relative imports

* apply PR feedback to NodeWebSocket class
  • Loading branch information
stevengum authored Nov 19, 2019
1 parent dba9cf6 commit ecfcf7d
Show file tree
Hide file tree
Showing 19 changed files with 967 additions and 1,209 deletions.
2 changes: 1 addition & 1 deletion libraries/botbuilder/package.json
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
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

0 comments on commit ecfcf7d

Please sign in to comment.