Skip to content

chore: fix PlaywrightClient disconnection logic #9149

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
mxschmitt merged 2 commits into from
Sep 28, 2021
Merged

chore: fix PlaywrightClient disconnection logic #9149

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce5de1b
test: unflake selectors-register.spec.ts - should work
mxschmitt Sep 25, 2021
cf1b4f3
use makeWaitForNextTask
mxschmitt Sep 28, 2021
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
16 changes: 13 additions & 3 deletions src/remote/playwrightClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import WebSocket from 'ws';
import { Connection } from '../client/connection';
import { Playwright } from '../client/playwright';
import { makeWaitForNextTask } from '../utils/utils';

export type PlaywrightClientConnectOptions = {
wsEndpoint: string;
Expand All @@ -32,15 +33,24 @@ export class PlaywrightClient {
const { wsEndpoint, timeout = 30000 } = options;
const connection = new Connection();
const ws = new WebSocket(wsEndpoint);
connection.onmessage = message => ws.send(JSON.stringify(message));
ws.on('message', message => connection.dispatch(JSON.parse(message.toString())));
const waitForNextTask = makeWaitForNextTask();
connection.onmessage = message => {
if (ws.readyState === 2 /** CLOSING */ || ws.readyState === 3 /** CLOSED */)
Comment thread
mxschmitt marked this conversation as resolved.
throw new Error('PlaywrightClient: writing to closed WebSocket connection');
ws.send(JSON.stringify(message));
};
ws.on('message', message => waitForNextTask(() => connection.dispatch(JSON.parse(message.toString()))));
const errorPromise = new Promise((_, reject) => ws.on('error', error => reject(error)));
const closePromise = new Promise((_, reject) => ws.on('close', () => reject(new Error('Connection closed'))));
const playwrightClientPromise = new Promise<PlaywrightClient>((resolve, reject) => {
let playwright: Playwright;
ws.on('open', async () => {
const playwright = await connection.initializePlaywright();
playwright = await connection.initializePlaywright();
resolve(new PlaywrightClient(playwright, ws));
});
ws.on('close', () => {
playwright?._cleanup();
});
});
let timer: NodeJS.Timeout;
try {
Expand Down