Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

chore(bidi): add support for the browsingContext.navigationCommitted event (#36854)

Holger Benl97dcac2e0e0c
diff --git a/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts b/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts
index 8456787030..f4e4a801d6 100644
--- a/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts
+++ b/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts
@@ -31,17 +31,15 @@ export class BidiNetworkManager {
private readonly _requests: Map<string, BidiRequest>;
private readonly _page: Page;
private readonly _eventListeners: RegisteredListener[];
- private readonly _onNavigationResponseStarted: (params: bidi.Network.ResponseStartedParameters) => void;
private _userRequestInterceptionEnabled: boolean = false;
private _protocolRequestInterceptionEnabled: boolean = false;
private _credentials: types.Credentials | undefined;
private _intercepId: bidi.Network.Intercept | undefined;
- constructor(bidiSession: BidiSession, page: Page, onNavigationResponseStarted: (params: bidi.Network.ResponseStartedParameters) => void) {
+ constructor(bidiSession: BidiSession, page: Page) {
this._session = bidiSession;
this._requests = new Map();
this._page = page;
- this._onNavigationResponseStarted = onNavigationResponseStarted;
this._eventListeners = [
eventsHelper.addEventListener(bidiSession, 'network.beforeRequestSent', this._onBeforeRequestSent.bind(this)),
eventsHelper.addEventListener(bidiSession, 'network.responseStarted', this._onResponseStarted.bind(this)),
@@ -116,8 +114,6 @@ export class BidiNetworkManager {
response.setRawResponseHeaders(null);
response.setResponseHeadersSize(params.response.headersSize);
this._page.frameManager.requestReceivedResponse(response);
- if (params.navigation)
- this._onNavigationResponseStarted(params);
}
private _onResponseCompleted(params: bidi.Network.ResponseCompletedParameters) {
diff --git a/packages/playwright-core/src/server/bidi/bidiPage.ts b/packages/playwright-core/src/server/bidi/bidiPage.ts
index f1cdc14dfe..97d07698f1 100644
--- a/packages/playwright-core/src/server/bidi/bidiPage.ts
+++ b/packages/playwright-core/src/server/bidi/bidiPage.ts
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import { assert } from '../../utils';
import { eventsHelper } from '../utils/eventsHelper';
import * as dialog from '../dialog';
import * as dom from '../dom';
@@ -61,7 +60,7 @@ export class BidiPage implements PageDelegate {
this._realmToContext = new Map();
this._page = new Page(this, browserContext);
this._browserContext = browserContext;
- this._networkManager = new BidiNetworkManager(this._session, this._page, this._onNavigationResponseStarted.bind(this));
+ this._networkManager = new BidiNetworkManager(this._session, this._page);
this._pdf = new BidiPDF(this._session);
this._page.on(Page.Events.FrameDetached, (frame: frames.Frame) => this._removeContextsForFrame(frame, false));
this._sessionListeners = [
@@ -69,6 +68,7 @@ export class BidiPage implements PageDelegate {
eventsHelper.addEventListener(bidiSession, 'script.message', this._onScriptMessage.bind(this)),
eventsHelper.addEventListener(bidiSession, 'browsingContext.contextDestroyed', this._onBrowsingContextDestroyed.bind(this)),
eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationStarted', this._onNavigationStarted.bind(this)),
+ eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationCommitted', this._onNavigationCommitted.bind(this)),
eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationAborted', this._onNavigationAborted.bind(this)),
eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationFailed', this._onNavigationFailed.bind(this)),
eventsHelper.addEventListener(bidiSession, 'browsingContext.fragmentNavigated', this._onFragmentNavigated.bind(this)),
@@ -178,25 +178,11 @@ export class BidiPage implements PageDelegate {
private _onNavigationStarted(params: bidi.BrowsingContext.NavigationInfo) {
const frameId = params.context;
this._page.frameManager.frameRequestedNavigation(frameId, params.navigation!);
-
- const url = params.url.toLowerCase();
- if (url.startsWith('file:') || url.startsWith('data:') || url === 'about:blank') {
- // Navigation to file urls doesn't emit network events, so we fire 'commit' event right when navigation is started.
- // Doing it in domcontentload would be too late as we'd clear frame tree.
- const frame = this._page.frameManager.frame(frameId)!;
- if (frame)
- this._page.frameManager.frameCommittedNewDocumentNavigation(frameId, params.url, '', params.navigation!, /* initial */ false);
- }
}
- // TODO: there is no separate event for committed navigation, so we approximate it with responseStarted.
- private _onNavigationResponseStarted(params: bidi.Network.ResponseStartedParameters) {
- const frameId = params.context!;
- const frame = this._page.frameManager.frame(frameId);
- assert(frame);
- this._page.frameManager.frameCommittedNewDocumentNavigation(frameId, params.response.url, '', params.navigation!, /* initial */ false);
- // if (!initial)
- // this._firstNonInitialNavigationCommittedFulfill();
+ private _onNavigationCommitted(params: bidi.BrowsingContext.NavigationInfo) {
+ const frameId = params.context;
+ this._page.frameManager.frameCommittedNewDocumentNavigation(frameId, params.url, '', params.navigation!, /* initial */ false);
}
private _onDomContentLoaded(params: bidi.BrowsingContext.NavigationInfo) {