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

chore: follow up to web socket util extraction (#29536)

Browse source
This commit is contained in:
Pavel Feldman 2024-02-16 18:16:45 -08:00 committed by GitHub
parent 4f1d8cdd63
commit 043c5aaffb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/playwright-core/src/utils/wsServer.ts
View file

@ -39,10 +39,10 @@ export type WSConnection = {
}; };
export type WSServerDelegate = { export type WSServerDelegate = {
onHeaders: (headers: string[]) => void; onHeaders?: (headers: string[]) => void;
onUpgrade: (request: http.IncomingMessage, socket: stream.Duplex) => { error: string } | undefined; onUpgrade?: (request: http.IncomingMessage, socket: stream.Duplex) => { error: string } | undefined;
onConnection: (request: http.IncomingMessage, url: URL, ws: WebSocket, id: string) => WSConnection; onConnection: (request: http.IncomingMessage, url: URL, ws: WebSocket, id: string) => WSConnection;
onClose(): Promise<void>; onClose?(): Promise<void>;
}; };
export class WSServer { export class WSServer {
@ -89,7 +89,8 @@ export class WSServer {
perMessageDeflate, perMessageDeflate,
}); });
this._wsServer.on('headers', headers => this._delegate.onHeaders(headers)); if (this._delegate.onHeaders)
this._wsServer.on('headers', headers => this._delegate.onHeaders!(headers));
server.on('upgrade', (request, socket, head) => { server.on('upgrade', (request, socket, head) => {
const pathname = new URL('http://localhost' + request.url!).pathname; const pathname = new URL('http://localhost' + request.url!).pathname;
@ -98,7 +99,7 @@ export class WSServer {
socket.destroy(); socket.destroy();
return; return;
} }
const upgradeResult = this._delegate.onUpgrade(request, socket); const upgradeResult = this._delegate.onUpgrade?.(request, socket);
if (upgradeResult) { if (upgradeResult) {
socket.write(upgradeResult.error); socket.write(upgradeResult.error);
socket.destroy(); socket.destroy();
@ -142,5 +143,7 @@ export class WSServer {
this._wsServer = undefined; this._wsServer = undefined;
this.server = undefined; this.server = undefined;
debugLogger.log('server', 'closed server'); debugLogger.log('server', 'closed server');
await this._delegate.onClose?.();
} }
} }