diff --git a/packages/playwright-core/src/client/mockingProxy.ts b/packages/playwright-core/src/client/mockingProxy.ts index 92fa87ce7a..13ee4ce741 100644 --- a/packages/playwright-core/src/client/mockingProxy.ts +++ b/packages/playwright-core/src/client/mockingProxy.ts @@ -21,7 +21,7 @@ import { Events } from './events'; export class MockingProxy extends ChannelOwner { private _port: number; - private _browserRequests = new Map(); + private _browserRequests = new Map(); constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.MockingProxyInitializer) { super(parent, type, guid, initializer); @@ -30,9 +30,9 @@ export class MockingProxy extends ChannelOwner { const requestContext = APIRequestContext.from(initializer.requestContext); this._channel.on('route', async (params: channels.MockingProxyRouteEvent) => { - const browserRequest = params.browserRequestRoute ? this._browserRequests.get(params.browserRequestRoute) : undefined; - if (params.browserRequestRoute) - this._browserRequests.delete(params.browserRequestRoute); + const browserRequest = params.browserRequest ? this._browserRequests.get(params.browserRequest) : undefined; + if (params.browserRequest) + this._browserRequests.delete(params.browserRequest); const route = network.Route.from(params.route); route._context = requestContext; this.emit(Events.MockingProxy.Route, { route, browserRequest }); @@ -48,8 +48,8 @@ export class MockingProxy extends ChannelOwner { if (isSimpleCORS) return await route.continue(); - this._browserRequests.set(route._guid, route); - const proxyUrl = `http://localhost:${this.port()}/pw_meta:${route._guid}/`; + this._browserRequests.set(route._guid, route.request()); + const proxyUrl = `http://localhost:${this.port()}/pw_meta:${route.request()._guid}/`; await route.continue({ headers: { 'x-playwright-proxy': encodeURIComponent(proxyUrl) } }); } diff --git a/packages/playwright-core/src/protocol/validator.ts b/packages/playwright-core/src/protocol/validator.ts index 3588e848e5..2bd4de157d 100644 --- a/packages/playwright-core/src/protocol/validator.ts +++ b/packages/playwright-core/src/protocol/validator.ts @@ -348,7 +348,7 @@ scheme.MockingProxyInitializer = tObject({ }); scheme.MockingProxyRouteEvent = tObject({ route: tChannel(['Route']), - browserRequestRoute: tOptional(tString), + browserRequest: tOptional(tString), }); scheme.MockingProxySetInterceptionPatternsParams = tObject({ patterns: tArray(tObject({ diff --git a/packages/playwright-core/src/server/dispatchers/mockingProxyDispatcher.ts b/packages/playwright-core/src/server/dispatchers/mockingProxyDispatcher.ts index 6ad0237c03..a9bc4af7b6 100644 --- a/packages/playwright-core/src/server/dispatchers/mockingProxyDispatcher.ts +++ b/packages/playwright-core/src/server/dispatchers/mockingProxyDispatcher.ts @@ -36,9 +36,9 @@ export class MockingProxyDispatcher extends Dispatcher { + this.addObjectListener(MockingProxy.Events.Route, ({ route, browserRequest }: {route: Route, browserRequest?: string }) => { const requestDispatcher = RequestDispatcher.from(this as any, route.request()); - this._dispatchEvent('route', { route: RouteDispatcher.from(requestDispatcher, route), browserRequestRoute }); + this._dispatchEvent('route', { route: RouteDispatcher.from(requestDispatcher, route), browserRequest }); }); } diff --git a/packages/playwright-core/src/server/mockingProxy.ts b/packages/playwright-core/src/server/mockingProxy.ts index 8ffa046dc6..898b9d1dfc 100644 --- a/packages/playwright-core/src/server/mockingProxy.ts +++ b/packages/playwright-core/src/server/mockingProxy.ts @@ -70,9 +70,9 @@ export class MockingProxy extends SdkObject implements RequestContext { if (req.url?.startsWith('/')) req.url = req.url.substring(1); - let browserRequestRoute: string | undefined; + let browserRequest: string | undefined; if (req.url?.startsWith('pw_meta:')) { - browserRequestRoute = req.url.substring('pw_meta:'.length, req.url.indexOf('/')); + browserRequest = req.url.substring('pw_meta:'.length, req.url.indexOf('/')); req.url = req.url.substring(req.url.indexOf('/') + 1); } @@ -209,7 +209,7 @@ export class MockingProxy extends SdkObject implements RequestContext { }); if (this._matches?.(req.url!)) - this.emit(MockingProxy.Events.Route, { route, browserRequestRoute }); + this.emit(MockingProxy.Events.Route, { route, browserRequest }); else await route.continue({ isFallback: false }); } diff --git a/packages/protocol/src/channels.d.ts b/packages/protocol/src/channels.d.ts index aafe0f343e..e4b3c266c9 100644 --- a/packages/protocol/src/channels.d.ts +++ b/packages/protocol/src/channels.d.ts @@ -593,7 +593,7 @@ export interface MockingProxyChannel extends MockingProxyEventTarget, EventTarge } export type MockingProxyRouteEvent = { route: RouteChannel, - browserRequestRoute?: string, + browserRequest?: string, }; export type MockingProxySetInterceptionPatternsParams = { patterns: { diff --git a/packages/protocol/src/protocol.yml b/packages/protocol/src/protocol.yml index 6178c6e04d..721d99e558 100644 --- a/packages/protocol/src/protocol.yml +++ b/packages/protocol/src/protocol.yml @@ -700,7 +700,7 @@ MockingProxy: route: parameters: route: Route - browserRequestRoute: string? + browserRequest: string? Root: type: interface