mirror of
https://github.com/puppeteer/puppeteer
synced 2024-06-14 14:02:48 +00:00
e0c8d46af1
We'd like to pass an abortion signal inside Helper.waitForEvent in order to interrupt it when browser/page closes. Several approaches have been considered: 1. Pass CDPSession instance as a another parameter to the helper method and listen to Disconnected event on it. It would introduce undesired dependency on the session object. 2. Listen to the CDPSession closure at the call sites (e.g. waitForRequest) and pass an abortion promise which would be fulfilled when such event is fired. The listeners would have to be removed from the session on successful completion of waitForEvent so we'd have to pass some kind of DisposablePromise which would be disposed during cleanup. Such parameter looked somewhat hairy. 3. Create DisconnectPromise on CDPSession. One potential risk with that is all chained promises would hang around until the event is fired which might inadvertently cause memory leaks. On the other hand, adding such promise to Promise.race will remove dependency as soon as the race is finished. So this is the approach we're taking with one tweak: the promise is created locally inside Page. Ideally the disconnectPromise would throw when the session is closed but it may lead to uncaught promise errors if all chained promises are resolved, to avoid that the promise is resolved with an Error and Helper.waitForEvent throws it later. Fix #4733
61 lines
1.4 KiB
JavaScript
61 lines
1.4 KiB
JavaScript
/**
|
|
* Copyright 2019 Google Inc. All rights reserved.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
const DEFAULT_TIMEOUT = 30000;
|
|
|
|
class TimeoutSettings {
|
|
constructor() {
|
|
this._defaultTimeout = null;
|
|
this._defaultNavigationTimeout = null;
|
|
}
|
|
|
|
/**
|
|
* @param {number} timeout
|
|
*/
|
|
setDefaultTimeout(timeout) {
|
|
this._defaultTimeout = timeout;
|
|
}
|
|
|
|
/**
|
|
* @param {number} timeout
|
|
*/
|
|
setDefaultNavigationTimeout(timeout) {
|
|
this._defaultNavigationTimeout = timeout;
|
|
}
|
|
|
|
/**
|
|
* @return {number}
|
|
*/
|
|
navigationTimeout() {
|
|
if (this._defaultNavigationTimeout !== null)
|
|
return this._defaultNavigationTimeout;
|
|
if (this._defaultTimeout !== null)
|
|
return this._defaultTimeout;
|
|
return DEFAULT_TIMEOUT;
|
|
}
|
|
|
|
/**
|
|
* @return {number}
|
|
*/
|
|
timeout() {
|
|
if (this._defaultTimeout !== null)
|
|
return this._defaultTimeout;
|
|
return DEFAULT_TIMEOUT;
|
|
}
|
|
}
|
|
|
|
module.exports = {TimeoutSettings};
|