Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
fix(screencast): unblock frame ack when an async client disconnects (#40674)
Pavel Feldman9fa531da5677
diff --git a/packages/playwright-core/src/server/screencast.ts b/packages/playwright-core/src/server/screencast.tsindex f8729b0ac8..6401075dec 100644--- a/packages/playwright-core/src/server/screencast.ts+++ b/packages/playwright-core/src/server/screencast.ts@@ -14,6 +14,7 @@* limitations under the License.*/+import { ManualPromise } from '@isomorphic/manualPromise';import { renderTitleForCall } from '@isomorphic/protocolFormatter';import { debugLogger } from '@utils/debugLogger';import { Page } from './page';@@ -39,7 +40,7 @@ type ActionOptions = {export class Screencast implements InstrumentationListener {readonly page: Page;- private _clients = new Set<ScreencastClient>();+ private _clients = new Map<ScreencastClient, ManualPromise<void>>();private _actions: ActionOptions | undefined;private _size: types.Size | undefined;private _lastFrame: types.ScreencastFrame | undefined;@@ -50,7 +51,7 @@ export class Screencast implements InstrumentationListener {}async handlePageOrContextClose() {- const clients = [...this._clients];+ const clients = [...this._clients.keys()];this._clients.clear();for (const client of clients) {if (client.gracefulClose)@@ -59,7 +60,7 @@ export class Screencast implements InstrumentationListener {}dispose() {- for (const client of this._clients)+ for (const client of this._clients.keys())client.dispose();this._clients.clear();this.page.instrumentation.removeListener(this);@@ -75,7 +76,7 @@ export class Screencast implements InstrumentationListener {addClient(client: ScreencastClient): { size: types.Size } {const isFirst = this._clients.size === 0;- this._clients.add(client);+ this._clients.set(client, new ManualPromise<void>());if (isFirst) {this._startScreencast(client.size, client.quality);} else if (this._lastFrame) {@@ -92,9 +93,12 @@ export class Screencast implements InstrumentationListener {}removeClient(client: ScreencastClient) {- if (!this._clients.has(client))+ const disconnected = this._clients.get(client);+ if (!disconnected)return;this._clients.delete(client);+ // A departing client must not block frame acks for the remaining clients.+ disconnected.resolve();if (!this._clients.size)this._stopScreencast();}@@ -131,10 +135,11 @@ export class Screencast implements InstrumentationListener {onScreencastFrame(frame: types.ScreencastFrame, ack?: () => void) {this._lastFrame = frame;const asyncResults: Promise<void>[] = [];- for (const client of this._clients) {+ for (const [client, disconnected] of this._clients) {const result = client.onFrame(frame);- if (result)- asyncResults.push(result);+ if (!result)+ continue;+ asyncResults.push(Promise.race([result.catch(() => {}), disconnected]));}if (ack) {// Ack when any client resolves (OR logic). This ensures that even if