Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: reparent network back to context (#17023)

Browse source
This commit is contained in:
Pavel Feldman 2022-09-05 01:19:44 -07:00 committed by GitHub
parent 01d83f1d5e
commit f4b90e5cc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
packages/playwright-core/src/server/dispatchers/networkDispatchers.ts
View file

@ -21,13 +21,13 @@ import type { Request, Response, Route } from '../network';
import { WebSocket } from '../network'; import { WebSocket } from '../network';
import type { RootDispatcher } from './dispatcher'; import type { RootDispatcher } from './dispatcher';
import { Dispatcher, existingDispatcher, lookupNullableDispatcher } from './dispatcher'; import { Dispatcher, existingDispatcher, lookupNullableDispatcher } from './dispatcher';
import { WorkerDispatcher } from './pageDispatcher';
import { TracingDispatcher } from './tracingDispatcher'; import { TracingDispatcher } from './tracingDispatcher';
import type { BrowserContextDispatcher } from './browserContextDispatcher'; import type { BrowserContextDispatcher } from './browserContextDispatcher';
import type { PageDispatcher } from './pageDispatcher'; import type { PageDispatcher } from './pageDispatcher';
import { FrameDispatcher } from './frameDispatcher'; import { FrameDispatcher } from './frameDispatcher';
import { WorkerDispatcher } from './pageDispatcher';
export class RequestDispatcher extends Dispatcher<Request, channels.RequestChannel, FrameDispatcher | WorkerDispatcher> implements channels.RequestChannel { export class RequestDispatcher extends Dispatcher<Request, channels.RequestChannel, BrowserContextDispatcher> implements channels.RequestChannel {
_type_Request: boolean; _type_Request: boolean;
static from(scope: BrowserContextDispatcher, request: Request): RequestDispatcher { static from(scope: BrowserContextDispatcher, request: Request): RequestDispatcher {
@ -39,19 +39,18 @@ export class RequestDispatcher extends Dispatcher<Request, channels.RequestChann
return request ? RequestDispatcher.from(scope, request) : undefined; return request ? RequestDispatcher.from(scope, request) : undefined;
} }
private constructor(contextScope: BrowserContextDispatcher, request: Request) { private constructor(scope: BrowserContextDispatcher, request: Request) {
const postData = request.postDataBuffer(); const postData = request.postDataBuffer();
const scope = parentScopeForRequest(contextScope, request);
super(scope, request, 'Request', { super(scope, request, 'Request', {
frame: request.frame() ? scope : undefined, frame: FrameDispatcher.fromNullable(scope as any as PageDispatcher, request.frame()),
serviceWorker: request.serviceWorker() ? scope : undefined, serviceWorker: WorkerDispatcher.fromNullable(scope, request.serviceWorker()),
url: request.url(), url: request.url(),
resourceType: request.resourceType(), resourceType: request.resourceType(),
method: request.method(), method: request.method(),
postData: postData === null ? undefined : postData, postData: postData === null ? undefined : postData,
headers: request.headers(), headers: request.headers(),
isNavigationRequest: request.isNavigationRequest(), isNavigationRequest: request.isNavigationRequest(),
redirectedFrom: RequestDispatcher.fromNullable(contextScope, request.redirectedFrom()), redirectedFrom: RequestDispatcher.fromNullable(scope, request.redirectedFrom()),
}); });
this._type_Request = true; this._type_Request = true;
} }
@ -65,7 +64,7 @@ export class RequestDispatcher extends Dispatcher<Request, channels.RequestChann
} }
} }
export class ResponseDispatcher extends Dispatcher<Response, channels.ResponseChannel, FrameDispatcher | WorkerDispatcher> implements channels.ResponseChannel { export class ResponseDispatcher extends Dispatcher<Response, channels.ResponseChannel, BrowserContextDispatcher> implements channels.ResponseChannel {
_type_Response = true; _type_Response = true;
static from(scope: BrowserContextDispatcher, response: Response): ResponseDispatcher { static from(scope: BrowserContextDispatcher, response: Response): ResponseDispatcher {
@ -77,11 +76,10 @@ export class ResponseDispatcher extends Dispatcher<Response, channels.ResponseCh
return response ? ResponseDispatcher.from(scope, response) : undefined; return response ? ResponseDispatcher.from(scope, response) : undefined;
} }
private constructor(contextScope: BrowserContextDispatcher, response: Response) { private constructor(scope: BrowserContextDispatcher, response: Response) {
const scope = parentScopeForRequest(contextScope, response.request());
super(scope, response, 'Response', { super(scope, response, 'Response', {
// TODO: responses in popups can point to non-reported requests. // TODO: responses in popups can point to non-reported requests.
request: RequestDispatcher.from(contextScope, response.request()), request: RequestDispatcher.from(scope, response.request()),
url: response.url(), url: response.url(),
status: response.status(), status: response.status(),
statusText: response.statusText(), statusText: response.statusText(),
@ -227,11 +225,3 @@ export class APIRequestContextDispatcher extends Dispatcher<APIRequestContext, c
this._object.disposeResponse(params.fetchUid); this._object.disposeResponse(params.fetchUid);
} }
} }
function parentScopeForRequest(scope: BrowserContextDispatcher, request: Request): FrameDispatcher | WorkerDispatcher {
if (request.frame())
return FrameDispatcher.from(scope as any as PageDispatcher, request.frame()!); // Context will swap for Page after reparent.
if (request.serviceWorker())
return WorkerDispatcher.fromNullable(scope, request.serviceWorker())!;
throw new Error('Internal error: requests does not belong to a page or a worker');
}

7
tests/library/channels.spec.ts
View file

@ -69,11 +69,10 @@ it('should scope context handles', async ({ browserType, server, expectScopeStat
{ _guid: 'browser-type', objects: [ { _guid: 'browser-type', objects: [
{ _guid: 'browser', objects: [ { _guid: 'browser', objects: [
{ _guid: 'browser-context', objects: [ { _guid: 'browser-context', objects: [
{ _guid: 'request', objects: [] },
{ _guid: 'response', objects: [] },
{ _guid: 'page', objects: [ { _guid: 'page', objects: [
{ _guid: 'frame', objects: [ { _guid: 'frame', objects: [] },
{ _guid: 'request', objects: [] },
{ _guid: 'response', objects: [] },
] },
] }, ] },
{ _guid: 'request-context', objects: [] }, { _guid: 'request-context', objects: [] },
{ _guid: 'tracing', objects: [] } { _guid: 'tracing', objects: [] }