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
chore: `existingDispatcher()` is based on connection (#35986)
Dmitry Gozmand73a846030ad
diff --git a/packages/playwright-core/src/inProcessFactory.ts b/packages/playwright-core/src/inProcessFactory.tsindex e6ef380b71..f4355970c0 100644--- a/packages/playwright-core/src/inProcessFactory.ts+++ b/packages/playwright-core/src/inProcessFactory.ts@@ -51,7 +51,7 @@ export function createInProcessPlaywright(): PlaywrightAPI {dispatcherConnection.onmessage = message => setImmediate(() => clientConnection.dispatch(message));clientConnection.onmessage = message => setImmediate(() => dispatcherConnection.dispatch(message));- clientConnection.toImpl = (x: any) => x ? dispatcherConnection._dispatchers.get(x._guid)!._object : dispatcherConnection._dispatchers.get('');+ clientConnection.toImpl = (x: any) => x ? dispatcherConnection._dispatcherByGuid.get(x._guid)!._object : dispatcherConnection._dispatcherByGuid.get('');(playwrightAPI as any)._toImpl = clientConnection.toImpl;return playwrightAPI;}diff --git a/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts b/packages/playwright-core/src/server/dispatchers/androidDispatcher.tsindex c20670dd69..8f008defbf 100644--- a/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts@@ -15,7 +15,7 @@*/import { BrowserContextDispatcher } from './browserContextDispatcher';-import { Dispatcher, existingDispatcher } from './dispatcher';+import { Dispatcher } from './dispatcher';import { AndroidDevice } from '../android/android';import type { RootDispatcher } from './dispatcher';@@ -46,7 +46,7 @@ export class AndroidDeviceDispatcher extends Dispatcher<AndroidDevice, channels._type_AndroidDevice = true;static from(scope: AndroidDispatcher, device: AndroidDevice): AndroidDeviceDispatcher {- const result = existingDispatcher<AndroidDeviceDispatcher>(device);+ const result = scope.connection.existingDispatcher<AndroidDeviceDispatcher>(device);return result || new AndroidDeviceDispatcher(scope, device);}diff --git a/packages/playwright-core/src/server/dispatchers/artifactDispatcher.ts b/packages/playwright-core/src/server/dispatchers/artifactDispatcher.tsindex 5a21cd7a5b..478754a961 100644--- a/packages/playwright-core/src/server/dispatchers/artifactDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/artifactDispatcher.ts@@ -16,7 +16,7 @@import fs from 'fs';-import { Dispatcher, existingDispatcher } from './dispatcher';+import { Dispatcher } from './dispatcher';import { StreamDispatcher } from './streamDispatcher';import { mkdirIfNeeded } from '../utils/fileUtils';@@ -35,7 +35,7 @@ export class ArtifactDispatcher extends Dispatcher<Artifact, channels.ArtifactChstatic fromNullable(parentScope: DispatcherScope, artifact: Artifact): ArtifactDispatcher | undefined {if (!artifact)return undefined;- const result = existingDispatcher<ArtifactDispatcher>(artifact);+ const result = parentScope.connection.existingDispatcher<ArtifactDispatcher>(artifact);return result || new ArtifactDispatcher(parentScope, artifact);}diff --git a/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts b/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.tsindex 878f18f7ca..fd80ba1eeb 100644--- a/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts@@ -21,7 +21,7 @@ import { BrowserContext } from '../browserContext';import { ArtifactDispatcher } from './artifactDispatcher';import { CDPSessionDispatcher } from './cdpSessionDispatcher';import { DialogDispatcher } from './dialogDispatcher';-import { Dispatcher, existingDispatcher } from './dispatcher';+import { Dispatcher } from './dispatcher';import { ElementHandleDispatcher } from './elementHandlerDispatcher';import { APIRequestContextDispatcher, RequestDispatcher, ResponseDispatcher, RouteDispatcher } from './networkDispatchers';import { BindingCallDispatcher, PageDispatcher, WorkerDispatcher } from './pageDispatcher';@@ -129,7 +129,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel// - We are redirected from a reported request so that redirectedTo was updated on client.// - We are a navigation request and dispatcher will be reported as a part of the goto return value and newDocument param anyways.// By the time requestFinished is triggered to update the request, we should have a request on the client already.- const redirectFromDispatcher = request.redirectedFrom() && existingDispatcher(request.redirectedFrom());+ const redirectFromDispatcher = request.redirectedFrom() && this.connection.existingDispatcher(request.redirectedFrom());if (!redirectFromDispatcher && !this._shouldDispatchNetworkEvent(request, 'request') && !request.isNavigationRequest())return;const requestDispatcher = RequestDispatcher.from(this, request);@@ -139,7 +139,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel});});this.addObjectListener(BrowserContext.Events.Response, (response: Response) => {- const requestDispatcher = existingDispatcher<RequestDispatcher>(response.request());+ const requestDispatcher = this.connection.existingDispatcher<RequestDispatcher>(response.request());if (!requestDispatcher && !this._shouldDispatchNetworkEvent(response.request(), 'response'))return;this._dispatchEvent('response', {@@ -148,7 +148,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel});});this.addObjectListener(BrowserContext.Events.RequestFailed, (request: Request) => {- const requestDispatcher = existingDispatcher<RequestDispatcher>(request);+ const requestDispatcher = this.connection.existingDispatcher<RequestDispatcher>(request);if (!requestDispatcher && !this._shouldDispatchNetworkEvent(request, 'requestFailed'))return;this._dispatchEvent('requestFailed', {@@ -159,7 +159,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel});});this.addObjectListener(BrowserContext.Events.RequestFinished, ({ request, response }: { request: Request, response: Response | null }) => {- const requestDispatcher = existingDispatcher<RequestDispatcher>(request);+ const requestDispatcher = this.connection.existingDispatcher<RequestDispatcher>(request);if (!requestDispatcher && !this._shouldDispatchNetworkEvent(request, 'requestFinished'))return;this._dispatchEvent('requestFinished', {@@ -178,7 +178,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channelprivate _shouldDispatchEvent(page: Page | undefined, event: channels.BrowserContextUpdateSubscriptionParams['event'] & channels.PageUpdateSubscriptionParams['event']): boolean {if (this._subscriptions.has(event))return true;- const pageDispatcher = page ? existingDispatcher<PageDispatcher>(page) : undefined;+ const pageDispatcher = page ? this.connection.existingDispatcher<PageDispatcher>(page) : undefined;if (pageDispatcher?._subscriptions.has(event))return true;return false;@@ -290,7 +290,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channelasync setWebSocketInterceptionPatterns(params: channels.PageSetWebSocketInterceptionPatternsParams, metadata: CallMetadata): Promise<void> {this._webSocketInterceptionPatterns = params.patterns;if (params.patterns.length)- await WebSocketRouteDispatcher.installIfNeeded(this._context);+ await WebSocketRouteDispatcher.installIfNeeded(this.connection, this._context);}async storageState(params: channels.BrowserContextStorageStateParams, metadata: CallMetadata): Promise<channels.BrowserContextStorageStateResult> {diff --git a/packages/playwright-core/src/server/dispatchers/browserDispatcher.ts b/packages/playwright-core/src/server/dispatchers/browserDispatcher.tsindex 60682b366b..599edb6497 100644--- a/packages/playwright-core/src/server/dispatchers/browserDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/browserDispatcher.ts@@ -17,7 +17,6 @@import { Browser } from '../browser';import { BrowserContextDispatcher } from './browserContextDispatcher';import { CDPSessionDispatcher } from './cdpSessionDispatcher';-import { existingDispatcher } from './dispatcher';import { Dispatcher } from './dispatcher';import { BrowserContext } from '../browserContext';import { Selectors } from '../selectors';@@ -164,7 +163,7 @@ export class ConnectedBrowserDispatcher extends Dispatcher<Browser, channels.Broasync function newContextForReuse(browser: Browser, scope: BrowserDispatcher, params: channels.BrowserNewContextForReuseParams, selectors: Selectors | null, metadata: CallMetadata): Promise<channels.BrowserNewContextForReuseResult> {const { context, needsReset } = await browser.newContextForReuse(params, metadata);if (needsReset) {- const oldContextDispatcher = existingDispatcher<BrowserContextDispatcher>(context);+ const oldContextDispatcher = scope.connection.existingDispatcher<BrowserContextDispatcher>(context);if (oldContextDispatcher)oldContextDispatcher._dispose();await context.resetForReuse(metadata, params);diff --git a/packages/playwright-core/src/server/dispatchers/dispatcher.ts b/packages/playwright-core/src/server/dispatchers/dispatcher.tsindex 10e6dd9df5..4b78f25c93 100644--- a/packages/playwright-core/src/server/dispatchers/dispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/dispatcher.ts@@ -31,13 +31,8 @@ import type { RegisteredListener } from '../utils/eventsHelper';import type { ValidatorContext } from '../../protocol/validator';import type * as channels from '@protocol/channels';-export const dispatcherSymbol = Symbol('dispatcher');const metadataValidator = createMetadataValidator();-export function existingDispatcher<DispatcherType>(object: any): DispatcherType | undefined {- return object[dispatcherSymbol];-}-let maxDispatchersOverride: number | undefined;export function setMaxDispatchersForTest(value: number | undefined) {maxDispatchersOverride = value;@@ -50,7 +45,7 @@ function maxDispatchersForBucket(gcBucket: string) {}export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeType extends DispatcherScope> extends EventEmitter implements channels.Channel {- private _connection: DispatcherConnection;+ readonly connection: DispatcherConnection;// Parent is always "isScope".private _parent: ParentScopeType | undefined;// Only "isScope" channel owners have registered dispatchers inside.@@ -67,7 +62,7 @@ export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeTconstructor(parent: ParentScopeType | DispatcherConnection, object: Type, type: string, initializer: channels.InitializerTraits<Type>, gcBucket?: string) {super();- this._connection = parent instanceof DispatcherConnection ? parent : parent._connection;+ this.connection = parent instanceof DispatcherConnection ? parent : parent.connection;this._parent = parent instanceof DispatcherConnection ? undefined : parent;const guid = object.guid;@@ -76,17 +71,15 @@ export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeTthis._object = object;this._gcBucket = gcBucket ?? type;- (object as any)[dispatcherSymbol] = this;-- this._connection.registerDispatcher(this);+ this.connection.registerDispatcher(this);if (this._parent) {assert(!this._parent._dispatchers.has(guid));this._parent._dispatchers.set(guid, this);}if (this._parent)- this._connection.sendCreate(this._parent, type, guid, initializer);- this._connection.maybeDisposeStaleDispatchers(this._gcBucket);+ this.connection.sendCreate(this._parent, type, guid, initializer);+ this.connection.maybeDisposeStaleDispatchers(this._gcBucket);}parentScope(): ParentScopeType {@@ -104,7 +97,7 @@ export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeToldParent._dispatchers.delete(child._guid);this._dispatchers.set(child._guid, child);child._parent = this;- this._connection.sendAdopt(this, child);+ this.connection.sendAdopt(this, child);}async _handleCommand(callMetadata: CallMetadata, method: string, validParams: any) {@@ -125,12 +118,12 @@ export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeT// Just ignore this event outside of tests.return;}- this._connection.sendEvent(this, method as string, params);+ this.connection.sendEvent(this, method as string, params);}_dispose(reason?: 'gc') {this._disposeRecursively(new TargetClosedError());- this._connection.sendDispose(this, reason);+ this.connection.sendDispose(this, reason);}protected _onDispose() {@@ -144,15 +137,15 @@ export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeT// Clean up from parent and connection.this._parent?._dispatchers.delete(this._guid);- const list = this._connection._dispatchersByBucket.get(this._gcBucket);+ const list = this.connection._dispatchersByBucket.get(this._gcBucket);list?.delete(this._guid);- this._connection._dispatchers.delete(this._guid);+ this.connection._dispatcherByGuid.delete(this._guid);+ this.connection._dispatcherByObject.delete(this._object);// Dispose all children.for (const dispatcher of [...this._dispatchers.values()])dispatcher._disposeRecursively(error);this._dispatchers.clear();- delete (this._object as any)[dispatcherSymbol];this._openScope.close(error);}@@ -188,7 +181,8 @@ export class RootDispatcher extends Dispatcher<{ guid: '' }, any, any> {}export class DispatcherConnection {- readonly _dispatchers = new Map<string, DispatcherScope>();+ readonly _dispatcherByGuid = new Map<string, DispatcherScope>();+ readonly _dispatcherByObject = new Map<any, DispatcherScope>();readonly _dispatchersByBucket = new Map<string, Set<string>>();onmessage = (message: object) => {};private _waitOperations = new Map<string, CallMetadata>();@@ -237,7 +231,7 @@ export class DispatcherConnection {private _tChannelImplFromWire(names: '*' | string[], arg: any, path: string, context: ValidatorContext): any {if (arg && typeof arg === 'object' && typeof arg.guid === 'string') {const guid = arg.guid;- const dispatcher = this._dispatchers.get(guid);+ const dispatcher = this._dispatcherByGuid.get(guid);if (!dispatcher)throw new ValidationError(`${path}: no object with guid ${guid}`);if (names !== '*' && !names.includes(dispatcher._type))@@ -256,9 +250,14 @@ export class DispatcherConnection {throw new ValidationError(`${path}: expected dispatcher ${names.toString()}`);}+ existingDispatcher<DispatcherType>(object: any): DispatcherType | undefined {+ return this._dispatcherByObject.get(object) as DispatcherType | undefined;+ }+registerDispatcher(dispatcher: DispatcherScope) {- assert(!this._dispatchers.has(dispatcher._guid));- this._dispatchers.set(dispatcher._guid, dispatcher);+ assert(!this._dispatcherByGuid.has(dispatcher._guid));+ this._dispatcherByGuid.set(dispatcher._guid, dispatcher);+ this._dispatcherByObject.set(dispatcher._object, dispatcher);let list = this._dispatchersByBucket.get(dispatcher._gcBucket);if (!list) {list = new Set();@@ -276,7 +275,7 @@ export class DispatcherConnection {const disposeCount = (maxDispatchers / 10) | 0;this._dispatchersByBucket.set(gcBucket, new Set(dispatchersArray.slice(disposeCount)));for (let i = 0; i < disposeCount; ++i) {- const d = this._dispatchers.get(dispatchersArray[i]);+ const d = this._dispatcherByGuid.get(dispatchersArray[i]);if (!d)continue;d._dispose('gc');@@ -285,7 +284,7 @@ export class DispatcherConnection {async dispatch(message: object) {const { id, guid, method, params, metadata } = message as any;- const dispatcher = this._dispatchers.get(guid);+ const dispatcher = this._dispatcherByGuid.get(guid);if (!dispatcher) {this.onmessage({ id, error: serializeError(new TargetClosedError()) });return;diff --git a/packages/playwright-core/src/server/dispatchers/elementHandlerDispatcher.ts b/packages/playwright-core/src/server/dispatchers/elementHandlerDispatcher.tsindex 9a398fb351..7c46400c3f 100644--- a/packages/playwright-core/src/server/dispatchers/elementHandlerDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/elementHandlerDispatcher.ts@@ -15,7 +15,6 @@*/import { BrowserContextDispatcher } from './browserContextDispatcher';-import { existingDispatcher } from './dispatcher';import { FrameDispatcher } from './frameDispatcher';import { JSHandleDispatcher, parseArgument, serializeResult } from './jsHandleDispatcher';import { PageDispatcher, WorkerDispatcher } from './pageDispatcher';@@ -34,17 +33,17 @@ export class ElementHandleDispatcher extends JSHandleDispatcher implements channreadonly _elementHandle: ElementHandle;static from(scope: JSHandleDispatcherParentScope, handle: ElementHandle): ElementHandleDispatcher {- return existingDispatcher<ElementHandleDispatcher>(handle) || new ElementHandleDispatcher(scope, handle);+ return scope.connection.existingDispatcher<ElementHandleDispatcher>(handle) || new ElementHandleDispatcher(scope, handle);}static fromNullable(scope: JSHandleDispatcherParentScope, handle: ElementHandle | null): ElementHandleDispatcher | undefined {if (!handle)return undefined;- return existingDispatcher<ElementHandleDispatcher>(handle) || new ElementHandleDispatcher(scope, handle);+ return scope.connection.existingDispatcher<ElementHandleDispatcher>(handle) || new ElementHandleDispatcher(scope, handle);}static fromJSHandle(scope: JSHandleDispatcherParentScope, handle: js.JSHandle): JSHandleDispatcher {- const result = existingDispatcher<JSHandleDispatcher>(handle);+ const result = scope.connection.existingDispatcher<JSHandleDispatcher>(handle);if (result)return result;return handle.asElement() ? new ElementHandleDispatcher(scope, handle.asElement()!) : new JSHandleDispatcher(scope, handle);diff --git a/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts b/packages/playwright-core/src/server/dispatchers/frameDispatcher.tsindex ef8b891d2f..7c3ed72868 100644--- a/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts@@ -15,7 +15,7 @@*/import { Frame } from '../frames';-import { Dispatcher, existingDispatcher } from './dispatcher';+import { Dispatcher } from './dispatcher';import { ElementHandleDispatcher } from './elementHandlerDispatcher';import { parseArgument, serializeResult } from './jsHandleDispatcher';import { ResponseDispatcher } from './networkDispatchers';@@ -35,7 +35,7 @@ export class FrameDispatcher extends Dispatcher<Frame, channels.FrameChannel, Brprivate _browserContextDispatcher: BrowserContextDispatcher;static from(scope: BrowserContextDispatcher, frame: Frame): FrameDispatcher {- const result = existingDispatcher<FrameDispatcher>(frame);+ const result = scope.connection.existingDispatcher<FrameDispatcher>(frame);return result || new FrameDispatcher(scope, frame);}@@ -50,7 +50,7 @@ export class FrameDispatcher extends Dispatcher<Frame, channels.FrameChannel, Br// methods on Page that redirect to the main frame remain operational.// Note: we cannot check parentFrame() here because it may be null after the frame has been detached.const gcBucket = frame._page.mainFrame() === frame ? 'MainFrame' : 'Frame';- const pageDispatcher = existingDispatcher<PageDispatcher>(frame._page);+ const pageDispatcher = scope.connection.existingDispatcher<PageDispatcher>(frame._page);super(pageDispatcher || scope, frame, 'Frame', {url: frame.url(),name: frame.name(),diff --git a/packages/playwright-core/src/server/dispatchers/networkDispatchers.ts b/packages/playwright-core/src/server/dispatchers/networkDispatchers.tsindex c6c783f390..0c28fa688b 100644--- a/packages/playwright-core/src/server/dispatchers/networkDispatchers.ts+++ b/packages/playwright-core/src/server/dispatchers/networkDispatchers.ts@@ -15,7 +15,7 @@*/import { WebSocket } from '../network';-import { Dispatcher, existingDispatcher } from './dispatcher';+import { Dispatcher } from './dispatcher';import { FrameDispatcher } from './frameDispatcher';import { WorkerDispatcher } from './pageDispatcher';import { TracingDispatcher } from './tracingDispatcher';@@ -34,7 +34,7 @@ export class RequestDispatcher extends Dispatcher<Request, channels.RequestChannprivate _browserContextDispatcher: BrowserContextDispatcher;static from(scope: BrowserContextDispatcher, request: Request): RequestDispatcher {- const result = existingDispatcher<RequestDispatcher>(request);+ const result = scope.connection.existingDispatcher<RequestDispatcher>(request);return result || new RequestDispatcher(scope, request);}@@ -47,7 +47,7 @@ export class RequestDispatcher extends Dispatcher<Request, channels.RequestChann// Always try to attach request to the page, if not, frame.const frame = request.frame();const page = request.frame()?._page;- const pageDispatcher = page ? existingDispatcher<PageDispatcher>(page) : null;+ const pageDispatcher = page ? scope.connection.existingDispatcher<PageDispatcher>(page) : null;const frameDispatcher = frame ? FrameDispatcher.from(scope, frame) : null;super(pageDispatcher || frameDispatcher || scope, request, 'Request', {frame: FrameDispatcher.fromNullable(scope, request.frame()),@@ -77,7 +77,7 @@ export class ResponseDispatcher extends Dispatcher<Response, channels.ResponseCh_type_Response = true;static from(scope: BrowserContextDispatcher, response: Response): ResponseDispatcher {- const result = existingDispatcher<ResponseDispatcher>(response);+ const result = scope.connection.existingDispatcher<ResponseDispatcher>(response);const requestDispatcher = RequestDispatcher.from(scope, response.request());return result || new ResponseDispatcher(requestDispatcher, response);}@@ -124,7 +124,7 @@ export class RouteDispatcher extends Dispatcher<Route, channels.RouteChannel, Re_type_Route = true;static from(scope: RequestDispatcher, route: Route): RouteDispatcher {- const result = existingDispatcher<RouteDispatcher>(route);+ const result = scope.connection.existingDispatcher<RouteDispatcher>(route);return result || new RouteDispatcher(scope, route);}@@ -177,7 +177,7 @@ export class APIRequestContextDispatcher extends Dispatcher<APIRequestContext, c_type_APIRequestContext = true;static from(scope: RootDispatcher | BrowserContextDispatcher, request: APIRequestContext): APIRequestContextDispatcher {- const result = existingDispatcher<APIRequestContextDispatcher>(request);+ const result = scope.connection.existingDispatcher<APIRequestContextDispatcher>(request);return result || new APIRequestContextDispatcher(scope, request);}diff --git a/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts b/packages/playwright-core/src/server/dispatchers/pageDispatcher.tsindex 818ff50991..84d0e3f1a0 100644--- a/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts@@ -15,7 +15,7 @@*/import { Page, Worker } from '../page';-import { Dispatcher, existingDispatcher } from './dispatcher';+import { Dispatcher } from './dispatcher';import { parseError } from '../errors';import { ArtifactDispatcher } from './artifactDispatcher';import { ElementHandleDispatcher } from './elementHandlerDispatcher';@@ -53,7 +53,7 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Browsstatic fromNullable(parentScope: BrowserContextDispatcher, page: Page | undefined): PageDispatcher | undefined {if (!page)return undefined;- const result = existingDispatcher<PageDispatcher>(page);+ const result = parentScope.connection.existingDispatcher<PageDispatcher>(page);return result || new PageDispatcher(parentScope, page);}@@ -195,7 +195,7 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Browsasync setWebSocketInterceptionPatterns(params: channels.PageSetWebSocketInterceptionPatternsParams, metadata: CallMetadata): Promise<void> {this._webSocketInterceptionPatterns = params.patterns;if (params.patterns.length)- await WebSocketRouteDispatcher.installIfNeeded(this._page);+ await WebSocketRouteDispatcher.installIfNeeded(this.connection, this._page);}async expectScreenshot(params: channels.PageExpectScreenshotParams, metadata: CallMetadata): Promise<channels.PageExpectScreenshotResult> {@@ -346,7 +346,7 @@ export class WorkerDispatcher extends Dispatcher<Worker, channels.WorkerChannel,static fromNullable(scope: PageDispatcher | BrowserContextDispatcher, worker: Worker | null): WorkerDispatcher | undefined {if (!worker)return undefined;- const result = existingDispatcher<WorkerDispatcher>(worker);+ const result = scope.connection.existingDispatcher<WorkerDispatcher>(worker);return result || new WorkerDispatcher(scope, worker);}diff --git a/packages/playwright-core/src/server/dispatchers/tracingDispatcher.ts b/packages/playwright-core/src/server/dispatchers/tracingDispatcher.tsindex 096e50ca17..42a9804b36 100644--- a/packages/playwright-core/src/server/dispatchers/tracingDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/tracingDispatcher.ts@@ -15,7 +15,7 @@*/import { ArtifactDispatcher } from './artifactDispatcher';-import { Dispatcher, existingDispatcher } from './dispatcher';+import { Dispatcher } from './dispatcher';import type { BrowserContextDispatcher } from './browserContextDispatcher';import type { APIRequestContextDispatcher } from './networkDispatchers';@@ -27,7 +27,7 @@ export class TracingDispatcher extends Dispatcher<Tracing, channels.TracingChann_type_Tracing = true;static from(scope: BrowserContextDispatcher | APIRequestContextDispatcher, tracing: Tracing): TracingDispatcher {- const result = existingDispatcher<TracingDispatcher>(tracing);+ const result = scope.connection.existingDispatcher<TracingDispatcher>(tracing);return result || new TracingDispatcher(scope, tracing);}diff --git a/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts b/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.tsindex 9ad27dea5f..dc48f12150 100644--- a/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts@@ -15,7 +15,7 @@*/import { Page } from '../page';-import { Dispatcher, existingDispatcher } from './dispatcher';+import { Dispatcher } from './dispatcher';import { PageDispatcher } from './pageDispatcher';import * as rawWebSocketMockSource from '../../generated/webSocketMockSource';import { prepareGeneratedScript } from '../javascript';@@ -25,6 +25,7 @@ import { eventsHelper } from '../utils/eventsHelper';import type { BrowserContextDispatcher } from './browserContextDispatcher';import type { BrowserContext } from '../browserContext';+import type { DispatcherConnection } from './dispatcher';import type { Frame } from '../frames';import type * as ws from '@injected/webSocketMock';import type * as channels from '@protocol/channels';@@ -57,13 +58,13 @@ export class WebSocketRouteDispatcher extends Dispatcher<{ guid: string }, chann(scope as any)._dispatchEvent('webSocketRoute', { webSocketRoute: this });}- static async installIfNeeded(target: Page | BrowserContext) {+ static async installIfNeeded(connection: DispatcherConnection, target: Page | BrowserContext) {const kBindingName = '__pwWebSocketBinding';const context = target instanceof Page ? target.browserContext : target;if (!context.hasBinding(kBindingName)) {await context.exposeBinding(kBindingName, false, (source, payload: ws.BindingPayload) => {if (payload.type === 'onCreate') {- const contextDispatcher = existingDispatcher<BrowserContextDispatcher>(context);+ const contextDispatcher = connection.existingDispatcher<BrowserContextDispatcher>(context);const pageDispatcher = contextDispatcher ? PageDispatcher.fromNullable(contextDispatcher, source.page) : undefined;let scope: PageDispatcher | BrowserContextDispatcher | undefined;if (pageDispatcher && matchesPattern(pageDispatcher, context._options.baseURL, payload.url))