thunderstrike/puppeteer
thunderstrike/puppeteer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: revert to private prop (#11332)

Browse Source
This commit is contained in:
Nikolay Vitkov 2023-11-10 10:49:26 +01:00 committed by GitHub
parent 409f7f8583
commit a52aa51bd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/puppeteer-core/src/bidi/Page.ts
View File

@ -99,7 +99,7 @@ export class BidiPage extends Page {
#accessibility: Accessibility; #accessibility: Accessibility;
#connection: BidiConnection; #connection: BidiConnection;
#frameTree = new FrameTree<BidiFrame>(); #frameTree = new FrameTree<BidiFrame>();
_networkManager: BidiNetworkManager; #networkManager: BidiNetworkManager;
#viewport: Viewport | null = null; #viewport: Viewport | null = null;
#closedDeferred = Deferred.create<never, TargetCloseError>(); #closedDeferred = Deferred.create<never, TargetCloseError>();
#subscribedEvents = new Map<Bidi.Event['method'], Handler<any>>([ #subscribedEvents = new Map<Bidi.Event['method'], Handler<any>>([
@ -179,7 +179,7 @@ export class BidiPage extends Page {
this.#browsingContext.on(event, subscriber); this.#browsingContext.on(event, subscriber);
} }
this._networkManager = new BidiNetworkManager(this.#connection, this); this.#networkManager = new BidiNetworkManager(this.#connection, this);
for (const [event, subscriber] of this.#subscribedEvents) { for (const [event, subscriber] of this.#subscribedEvents) {
this.#connection.on(event, subscriber); this.#connection.on(event, subscriber);
@ -187,7 +187,7 @@ export class BidiPage extends Page {
for (const [event, subscriber] of this.#networkManagerEvents) { for (const [event, subscriber] of this.#networkManagerEvents) {
// TODO: remove any // TODO: remove any
this._networkManager.on(event, subscriber as any); this.#networkManager.on(event, subscriber as any);
} }
const frame = new BidiFrame( const frame = new BidiFrame(
@ -391,7 +391,7 @@ export class BidiPage extends Page {
this.#removeFramesRecursively(child); this.#removeFramesRecursively(child);
} }
frame[disposeSymbol](); frame[disposeSymbol]();
this._networkManager.clearMapAfterFrameDispose(frame); this.#networkManager.clearMapAfterFrameDispose(frame);
this.#frameTree.removeFrame(frame); this.#frameTree.removeFrame(frame);
this.emit(PageEvent.FrameDetached, frame); this.emit(PageEvent.FrameDetached, frame);
} }
@ -471,7 +471,7 @@ export class BidiPage extends Page {
} }
getNavigationResponse(id?: string | null): BidiHTTPResponse | null { getNavigationResponse(id?: string | null): BidiHTTPResponse | null {
return this._networkManager.getNavigationResponse(id); return this.#networkManager.getNavigationResponse(id);
} }
override isClosed(): boolean { override isClosed(): boolean {
@ -484,7 +484,7 @@ export class BidiPage extends Page {
} }
this.#closedDeferred.reject(new TargetCloseError('Page closed!')); this.#closedDeferred.reject(new TargetCloseError('Page closed!'));
this._networkManager.dispose(); this.#networkManager.dispose();
await this.#connection.send('browsingContext.close', { await this.#connection.send('browsingContext.close', {
context: this.mainFrame()._id, context: this.mainFrame()._id,
@ -699,7 +699,7 @@ export class BidiPage extends Page {
): Promise<BidiHTTPRequest> { ): Promise<BidiHTTPRequest> {
const {timeout = this._timeoutSettings.timeout()} = options; const {timeout = this._timeoutSettings.timeout()} = options;
return await waitForHTTP( return await waitForHTTP(
this._networkManager, this.#networkManager,
NetworkManagerEvent.Request, NetworkManagerEvent.Request,
urlOrPredicate, urlOrPredicate,
timeout, timeout,
@ -715,7 +715,7 @@ export class BidiPage extends Page {
): Promise<BidiHTTPResponse> { ): Promise<BidiHTTPResponse> {
const {timeout = this._timeoutSettings.timeout()} = options; const {timeout = this._timeoutSettings.timeout()} = options;
return await waitForHTTP( return await waitForHTTP(
this._networkManager, this.#networkManager,
NetworkManagerEvent.Response, NetworkManagerEvent.Response,
urlOrPredicate, urlOrPredicate,
timeout, timeout,
@ -732,7 +732,7 @@ export class BidiPage extends Page {
} = options; } = options;
await firstValueFrom( await firstValueFrom(
this._waitForNetworkIdle(this._networkManager, idleTime).pipe( this._waitForNetworkIdle(this.#networkManager, idleTime).pipe(
raceWith(timeout(ms), from(this.#closedDeferred.valueOrThrow())) raceWith(timeout(ms), from(this.#closedDeferred.valueOrThrow()))
) )
); );
@ -749,7 +749,7 @@ export class BidiPage extends Page {
} | null> { } | null> {
const delay = networkIdle const delay = networkIdle
? this._waitForNetworkIdle( ? this._waitForNetworkIdle(
this._networkManager, this.#networkManager,
NETWORK_IDLE_TIME, NETWORK_IDLE_TIME,
networkIdle === 'networkidle0' ? 0 : 2 networkIdle === 'networkidle0' ? 0 : 2
) )