Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(server): disconnect ws clients on server close (#6215)

Browse source
This commit is contained in:
Yury Semikhatsky 2021-04-16 17:07:56 -07:00 committed by GitHub
parent e4ae6503d7
commit 17ead28285
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/remote/playwrightServer.ts
View file

@ -33,7 +33,7 @@ export interface PlaywrightServerDelegate {
} }
export class PlaywrightServer { export class PlaywrightServer {
private _server: http.Server | undefined; private _wsServer: ws.Server | undefined;
private _clientsCount = 0; private _clientsCount = 0;
private _delegate: PlaywrightServerDelegate; private _delegate: PlaywrightServerDelegate;
@ -74,11 +74,10 @@ export class PlaywrightServer {
}); });
}); });
this._server = server;
debugLog('Listening at ' + wsEndpoint); debugLog('Listening at ' + wsEndpoint);
const wsServer = new ws.Server({ server: this._server, path }); this._wsServer = new ws.Server({ server, path });
wsServer.on('connection', async socket => { this._wsServer.on('connection', async socket => {
if (this._clientsCount && !this._delegate.allowMultipleClients) { if (this._clientsCount && !this._delegate.allowMultipleClients) {
socket.close(); socket.close();
return; return;
@ -117,10 +116,12 @@ export class PlaywrightServer {
} }
async close() { async close() {
if (!this._server) if (!this._wsServer)
return; return;
debugLog('Closing server'); debugLog('Closing server');
await new Promise(f => this._server!.close(f)); // First disconnect all remaining clients.
await new Promise(f => this._wsServer!.close(f));
await new Promise(f => this._wsServer!.options.server!.close(f));
await this._delegate.onClose(); await this._delegate.onClose();
} }
} }