chore: remove unused files / events
This commit is contained in:
parent
44ef81e4cd
commit
fceb6d80ae
|
|
@ -34,8 +34,6 @@ export const FrameManagerEvents = {
|
||||||
FrameDetached: Symbol('Events.FrameManager.FrameDetached'),
|
FrameDetached: Symbol('Events.FrameManager.FrameDetached'),
|
||||||
LifecycleEvent: Symbol('Events.FrameManager.LifecycleEvent'),
|
LifecycleEvent: Symbol('Events.FrameManager.LifecycleEvent'),
|
||||||
FrameNavigatedWithinDocument: Symbol('Events.FrameManager.FrameNavigatedWithinDocument'),
|
FrameNavigatedWithinDocument: Symbol('Events.FrameManager.FrameNavigatedWithinDocument'),
|
||||||
ExecutionContextCreated: Symbol('Events.FrameManager.ExecutionContextCreated'),
|
|
||||||
ExecutionContextDestroyed: Symbol('Events.FrameManager.ExecutionContextDestroyed'),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export class FrameManager extends EventEmitter {
|
export class FrameManager extends EventEmitter {
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ const readFileAsync = helper.promisify(fs.readFile);
|
||||||
export const FrameManagerEvents = {
|
export const FrameManagerEvents = {
|
||||||
FrameNavigatedWithinDocument: Symbol('FrameNavigatedWithinDocument'),
|
FrameNavigatedWithinDocument: Symbol('FrameNavigatedWithinDocument'),
|
||||||
TargetSwappedOnNavigation: Symbol('TargetSwappedOnNavigation'),
|
TargetSwappedOnNavigation: Symbol('TargetSwappedOnNavigation'),
|
||||||
LifecycleEvent: Symbol('LifecycleEvent'),
|
|
||||||
FrameAttached: Symbol('FrameAttached'),
|
FrameAttached: Symbol('FrameAttached'),
|
||||||
FrameDetached: Symbol('FrameDetached'),
|
FrameDetached: Symbol('FrameDetached'),
|
||||||
FrameNavigated: Symbol('FrameNavigated'),
|
FrameNavigated: Symbol('FrameNavigated'),
|
||||||
|
|
@ -108,7 +107,6 @@ export class FrameManager extends EventEmitter {
|
||||||
if (!frame)
|
if (!frame)
|
||||||
return;
|
return;
|
||||||
frame._onLoadingStopped();
|
frame._onLoadingStopped();
|
||||||
this.emit(FrameManagerEvents.LifecycleEvent, frame);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleFrameTree(frameTree: Protocol.Page.FrameResourceTree) {
|
_handleFrameTree(frameTree: Protocol.Page.FrameResourceTree) {
|
||||||
|
|
|
||||||
|
|
@ -1,170 +0,0 @@
|
||||||
/**
|
|
||||||
* Copyright 2019 Google Inc. All rights reserved.
|
|
||||||
* Modifications copyright (c) Microsoft Corporation.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { TargetSessionEvents } from './Connection';
|
|
||||||
import { TimeoutError } from '../Errors';
|
|
||||||
import { Frame, FrameManager, FrameManagerEvents } from './FrameManager';
|
|
||||||
import { assert, helper, RegisteredListener } from '../helper';
|
|
||||||
import { NetworkManagerEvents, Request, Response } from './NetworkManager';
|
|
||||||
|
|
||||||
export class LifecycleWatcher {
|
|
||||||
private _expectedLifecycle: string[];
|
|
||||||
private _frameManager: FrameManager;
|
|
||||||
private _frame: Frame;
|
|
||||||
private _timeout: number;
|
|
||||||
private _navigationRequest: Request | null = null;
|
|
||||||
private _eventListeners: RegisteredListener[];
|
|
||||||
private _sameDocumentNavigationPromise: Promise<Error | null>;
|
|
||||||
private _sameDocumentNavigationCompleteCallback: () => void;
|
|
||||||
private _lifecyclePromise: Promise<void>;
|
|
||||||
private _lifecycleCallback: () => void;
|
|
||||||
private _newDocumentNavigationPromise: Promise<Error | null>;
|
|
||||||
private _newDocumentNavigationCompleteCallback: () => void;
|
|
||||||
private _timeoutPromise: Promise<Error>;
|
|
||||||
private _terminationPromise: Promise<Error | null>;
|
|
||||||
private _terminationCallback: () => void;
|
|
||||||
private _maximumTimer: NodeJS.Timer;
|
|
||||||
private _hasSameDocumentNavigation: boolean;
|
|
||||||
|
|
||||||
constructor(frameManager: FrameManager, frame: Frame, waitUntil: string | string[], timeout: number) {
|
|
||||||
if (Array.isArray(waitUntil))
|
|
||||||
waitUntil = waitUntil.slice();
|
|
||||||
else if (typeof waitUntil === 'string')
|
|
||||||
waitUntil = [waitUntil];
|
|
||||||
this._expectedLifecycle = waitUntil.map(value => {
|
|
||||||
const protocolEvent = playwrightToProtocolLifecycle.get(value);
|
|
||||||
assert(protocolEvent, 'Unknown value for options.waitUntil: ' + value);
|
|
||||||
return protocolEvent;
|
|
||||||
});
|
|
||||||
|
|
||||||
this._frameManager = frameManager;
|
|
||||||
this._frame = frame;
|
|
||||||
this._timeout = timeout;
|
|
||||||
this._eventListeners = [
|
|
||||||
helper.addEventListener(frameManager._session, TargetSessionEvents.Disconnected, () => this._terminate(new Error('Navigation failed because browser has disconnected!'))),
|
|
||||||
helper.addEventListener(this._frameManager, FrameManagerEvents.LifecycleEvent, this._checkLifecycleComplete.bind(this)),
|
|
||||||
helper.addEventListener(this._frameManager, FrameManagerEvents.FrameNavigatedWithinDocument, this._navigatedWithinDocument.bind(this)),
|
|
||||||
helper.addEventListener(this._frameManager, FrameManagerEvents.FrameDetached, this._onFrameDetached.bind(this)),
|
|
||||||
helper.addEventListener(this._frameManager.networkManager(), NetworkManagerEvents.Request, this._onRequest.bind(this)),
|
|
||||||
];
|
|
||||||
|
|
||||||
this._sameDocumentNavigationPromise = new Promise(fulfill => {
|
|
||||||
this._sameDocumentNavigationCompleteCallback = fulfill;
|
|
||||||
});
|
|
||||||
|
|
||||||
this._lifecyclePromise = new Promise(fulfill => {
|
|
||||||
this._lifecycleCallback = fulfill;
|
|
||||||
});
|
|
||||||
|
|
||||||
this._newDocumentNavigationPromise = new Promise(fulfill => {
|
|
||||||
this._newDocumentNavigationCompleteCallback = fulfill;
|
|
||||||
});
|
|
||||||
|
|
||||||
this._timeoutPromise = this._createTimeoutPromise();
|
|
||||||
this._terminationPromise = new Promise(fulfill => {
|
|
||||||
this._terminationCallback = fulfill;
|
|
||||||
});
|
|
||||||
this._checkLifecycleComplete();
|
|
||||||
}
|
|
||||||
|
|
||||||
_onRequest(request: Request) {
|
|
||||||
if (request.frame() !== this._frame || !request.isNavigationRequest())
|
|
||||||
return;
|
|
||||||
this._navigationRequest = request;
|
|
||||||
}
|
|
||||||
|
|
||||||
_onFrameDetached(frame: Frame) {
|
|
||||||
if (this._frame === frame) {
|
|
||||||
this._terminationCallback.call(null, new Error('Navigating frame was detached'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this._checkLifecycleComplete();
|
|
||||||
}
|
|
||||||
|
|
||||||
navigationResponse(): Response | null {
|
|
||||||
return this._navigationRequest ? this._navigationRequest.response() : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
_terminate(error: Error) {
|
|
||||||
this._terminationCallback.call(null, error);
|
|
||||||
}
|
|
||||||
|
|
||||||
sameDocumentNavigationPromise(): Promise<Error | null> {
|
|
||||||
return this._sameDocumentNavigationPromise;
|
|
||||||
}
|
|
||||||
|
|
||||||
newDocumentNavigationPromise(): Promise<Error | null> {
|
|
||||||
return this._newDocumentNavigationPromise;
|
|
||||||
}
|
|
||||||
|
|
||||||
lifecyclePromise(): Promise<any> {
|
|
||||||
return this._lifecyclePromise;
|
|
||||||
}
|
|
||||||
|
|
||||||
timeoutOrTerminationPromise(): Promise<Error | null> {
|
|
||||||
return Promise.race([this._timeoutPromise, this._terminationPromise]);
|
|
||||||
}
|
|
||||||
|
|
||||||
_createTimeoutPromise(): Promise<Error | null> {
|
|
||||||
if (!this._timeout)
|
|
||||||
return new Promise(() => {});
|
|
||||||
const errorMessage = 'Navigation timeout of ' + this._timeout + ' ms exceeded';
|
|
||||||
return new Promise(fulfill => this._maximumTimer = setTimeout(fulfill, this._timeout))
|
|
||||||
.then(() => new TimeoutError(errorMessage));
|
|
||||||
}
|
|
||||||
|
|
||||||
_navigatedWithinDocument(frame: Frame) {
|
|
||||||
if (frame !== this._frame)
|
|
||||||
return;
|
|
||||||
this._hasSameDocumentNavigation = true;
|
|
||||||
this._checkLifecycleComplete();
|
|
||||||
}
|
|
||||||
|
|
||||||
_checkLifecycleComplete() {
|
|
||||||
// We expect navigation to commit.
|
|
||||||
if (!checkLifecycle(this._frame, this._expectedLifecycle))
|
|
||||||
return;
|
|
||||||
this._lifecycleCallback();
|
|
||||||
if (this._hasSameDocumentNavigation)
|
|
||||||
this._sameDocumentNavigationCompleteCallback();
|
|
||||||
this._newDocumentNavigationCompleteCallback();
|
|
||||||
|
|
||||||
function checkLifecycle(frame: Frame, expectedLifecycle: string[]): boolean {
|
|
||||||
for (const event of expectedLifecycle) {
|
|
||||||
if (!frame._lifecycleEvents.has(event))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
for (const child of frame.childFrames()) {
|
|
||||||
if (!checkLifecycle(child, expectedLifecycle))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dispose() {
|
|
||||||
helper.removeEventListeners(this._eventListeners);
|
|
||||||
clearTimeout(this._maximumTimer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const playwrightToProtocolLifecycle = new Map([
|
|
||||||
['load', 'load'],
|
|
||||||
['domcontentloaded', 'DOMContentLoaded'],
|
|
||||||
['networkidle0', 'networkIdle'],
|
|
||||||
['networkidle2', 'networkAlmostIdle'],
|
|
||||||
]);
|
|
||||||
Loading…
Reference in a new issue