refactor: add parentSession() to CDPSession (#10709)

This commit is contained in:
Alex Rudenko 2023-08-08 12:21:43 +02:00 committed by GitHub
parent 2dec12fe8b
commit 932a5e0415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 3 deletions

View File

@ -310,7 +310,8 @@ export class Connection extends EventEmitter {
const session = new CDPSessionImpl(
this,
object.params.targetInfo.type,
sessionId
sessionId,
object.sessionId
);
this.#sessions.set(sessionId, session);
this.emit('sessionattached', session);
@ -470,6 +471,15 @@ export class CDPSession extends EventEmitter {
throw new Error('Not implemented');
}
/**
* Parent session in terms of CDP's auto-attach mechanism.
*
* @internal
*/
parentSession(): CDPSession | undefined {
return undefined;
}
send<T extends keyof ProtocolMapping.Commands>(
method: T,
...paramArgs: ProtocolMapping.Commands[T]['paramsType']
@ -504,21 +514,36 @@ export class CDPSessionImpl extends CDPSession {
#targetType: string;
#callbacks = new CallbackRegistry();
#connection?: Connection;
#parentSessionId?: string;
/**
* @internal
*/
constructor(connection: Connection, targetType: string, sessionId: string) {
constructor(
connection: Connection,
targetType: string,
sessionId: string,
parentSessionId: string | undefined
) {
super();
this.#connection = connection;
this.#targetType = targetType;
this.#sessionId = sessionId;
this.#parentSessionId = parentSessionId;
}
override connection(): Connection | undefined {
return this.#connection;
}
override parentSession(): CDPSession | undefined {
if (!this.#parentSessionId) {
return;
}
const parent = this.#connection?.session(this.#parentSessionId);
return parent ?? undefined;
}
override send<T extends keyof ProtocolMapping.Commands>(
method: T,
...paramArgs: ProtocolMapping.Commands[T]['paramsType']

View File

@ -36,6 +36,9 @@ class MockCDPSession extends EventEmitter {
id() {
return '1';
}
parentSession() {
return undefined;
}
}
describe('DeviceRequestPrompt', function () {

View File

@ -37,6 +37,9 @@ class MockCDPSession extends EventEmitter {
id() {
return '1';
}
parentSession() {
return undefined;
}
}
describe('NetworkManager', () => {

View File

@ -2649,7 +2649,7 @@
"testIdPattern": "[mouse.spec] Mouse should resize the textarea",
"platforms": ["darwin", "linux", "win32"],
"parameters": ["firefox", "webDriverBiDi"],
"expectations": ["PASS", "FAIL"]
"expectations": ["FAIL", "PASS"]
},
{
"testIdPattern": "[mouse.spec] Mouse should select the text with mouse",