Skip to content

chore: reciprocate worker websocket close events #102

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

Open
ruifigueira wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: reciprocate worker websocket close events #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion packages/playwright-cloudflare/src/cloudflare/webSocketTransport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export class WebSocketTransport implements ConnectionTransport {
private _ws: WebSocket;
private _pingInterval: NodeJS.Timer;
private _chunks: Uint8Array[] = [];
private closeResolver: PromiseWithResolvers<void>;
onmessage?: (message: ProtocolResponse) => void;
onclose?: () => void;
readonly sessionId: string;
Expand All @@ -36,15 +37,20 @@ export class WebSocketTransport implements ConnectionTransport {
this.onmessage!(JSON.parse(message) as ProtocolResponse);
});
this._ws.addEventListener('close', () => {
// https://github.com/cloudflare/workerd/issues/4327#issuecomment-3670433485
if (this._ws.readyState !== WebSocket.CLOSED)
this._ws.close();
clearInterval(this._pingInterval as NodeJS.Timeout);
if (this.onclose)
this.onclose();
this.closeResolver.resolve();
});
this._ws.addEventListener('error', e => {
// eslint-disable-next-line no-console
console.error(`Websocket error: SessionID: ${sessionId}`, e);
clearInterval(this._pingInterval as NodeJS.Timeout);
});
this.closeResolver = Promise.withResolvers();
}

send(message: ProtocolRequest): void {
Expand All @@ -62,7 +68,7 @@ export class WebSocketTransport implements ConnectionTransport {
if (this._ws.readyState === WebSocket.CLOSED)
return;
this.close();
// TODO wait for close event
await this.closeResolver.promise;
}

toString(): string {
Expand Down
Loading