2019-01-16 01:21:23 +00:00
|
|
|
/**
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2022-06-22 13:25:44 +00:00
|
|
|
import {Protocol} from 'devtools-protocol';
|
2022-08-31 08:50:22 +00:00
|
|
|
import {source as injectedSource} from '../generated/injected.js';
|
2022-08-17 12:39:41 +00:00
|
|
|
import {assert} from '../util/assert.js';
|
2022-08-31 08:50:22 +00:00
|
|
|
import {createDeferredPromise} from '../util/DeferredPromise.js';
|
2022-09-15 06:22:20 +00:00
|
|
|
import {isErrorLike} from '../util/ErrorLike.js';
|
2022-06-22 13:25:44 +00:00
|
|
|
import {CDPSession} from './Connection.js';
|
|
|
|
import {ExecutionContext} from './ExecutionContext.js';
|
2022-08-17 15:45:45 +00:00
|
|
|
import {Frame} from './Frame.js';
|
2022-08-26 10:55:30 +00:00
|
|
|
import {FrameManager} from './FrameManager.js';
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
import {MouseButton} from './Input.js';
|
2022-06-23 09:31:43 +00:00
|
|
|
import {JSHandle} from './JSHandle.js';
|
2022-09-15 06:22:20 +00:00
|
|
|
import {LazyArg} from './LazyArg.js';
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
import {LifecycleWatcher, PuppeteerLifeCycleEvent} from './LifecycleWatcher.js';
|
|
|
|
import {TimeoutSettings} from './TimeoutSettings.js';
|
2023-01-26 07:56:33 +00:00
|
|
|
import {EvaluateFunc, HandleFor, NodeFor} from './types.js';
|
2022-09-15 06:22:20 +00:00
|
|
|
import {createJSHandle, debugError, pageBindingInitString} from './util.js';
|
|
|
|
import {TaskManager, WaitTask} from './WaitTask.js';
|
2022-11-10 16:11:18 +00:00
|
|
|
import {MAIN_WORLD, PUPPETEER_WORLD} from './IsolatedWorlds.js';
|
|
|
|
|
|
|
|
import type PuppeteerUtil from '../injected/injected.js';
|
|
|
|
import type {ElementHandle} from './ElementHandle.js';
|
2020-04-20 10:32:08 +00:00
|
|
|
|
2020-07-02 15:13:22 +00:00
|
|
|
/**
|
|
|
|
* @public
|
|
|
|
*/
|
2020-04-29 11:28:16 +00:00
|
|
|
export interface WaitForSelectorOptions {
|
2022-08-10 21:34:29 +00:00
|
|
|
/**
|
|
|
|
* Wait for the selected element to be present in DOM and to be visible, i.e.
|
|
|
|
* to not have `display: none` or `visibility: hidden` CSS properties.
|
|
|
|
*
|
|
|
|
* @defaultValue `false`
|
|
|
|
*/
|
2020-04-28 14:35:43 +00:00
|
|
|
visible?: boolean;
|
2022-08-10 21:34:29 +00:00
|
|
|
/**
|
|
|
|
* Wait for the selected element to not be found in the DOM or to be hidden,
|
|
|
|
* i.e. have `display: none` or `visibility: hidden` CSS properties.
|
|
|
|
*
|
|
|
|
* @defaultValue `false`
|
|
|
|
*/
|
2020-04-28 14:35:43 +00:00
|
|
|
hidden?: boolean;
|
2022-08-10 21:34:29 +00:00
|
|
|
/**
|
|
|
|
* Maximum time to wait in milliseconds. Pass `0` to disable timeout.
|
|
|
|
*
|
|
|
|
* The default value can be changed by using {@link Page.setDefaultTimeout}
|
|
|
|
*
|
|
|
|
* @defaultValue `30000` (30 seconds)
|
|
|
|
*/
|
2020-04-28 14:35:43 +00:00
|
|
|
timeout?: number;
|
|
|
|
}
|
|
|
|
|
2020-11-03 10:39:31 +00:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
|
|
|
export interface PageBinding {
|
|
|
|
name: string;
|
|
|
|
pptrFunction: Function;
|
|
|
|
}
|
|
|
|
|
2022-08-10 21:34:29 +00:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
|
|
|
export interface IsolatedWorldChart {
|
|
|
|
[key: string]: IsolatedWorld;
|
|
|
|
[MAIN_WORLD]: IsolatedWorld;
|
|
|
|
[PUPPETEER_WORLD]: IsolatedWorld;
|
|
|
|
}
|
|
|
|
|
2020-07-02 15:13:22 +00:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
*/
|
2022-08-09 13:17:42 +00:00
|
|
|
export class IsolatedWorld {
|
2022-06-13 09:16:25 +00:00
|
|
|
#frame: Frame;
|
2022-08-26 10:55:30 +00:00
|
|
|
#document?: ElementHandle<Document>;
|
2022-09-01 15:09:57 +00:00
|
|
|
#context = createDeferredPromise<ExecutionContext>();
|
2022-06-13 09:16:25 +00:00
|
|
|
#detached = false;
|
2020-04-28 14:35:43 +00:00
|
|
|
|
2022-06-13 09:16:25 +00:00
|
|
|
// Set of bindings that have been registered in the current context.
|
|
|
|
#ctxBindings = new Set<string>();
|
|
|
|
|
|
|
|
// Contains mapping from functions that should be bound to Puppeteer functions.
|
|
|
|
#boundFunctions = new Map<string, Function>();
|
2022-09-15 06:22:20 +00:00
|
|
|
#taskManager = new TaskManager();
|
2022-09-13 12:06:40 +00:00
|
|
|
#puppeteerUtil = createDeferredPromise<JSHandle<PuppeteerUtil>>();
|
|
|
|
|
|
|
|
get puppeteerUtil(): Promise<JSHandle<PuppeteerUtil>> {
|
|
|
|
return this.#puppeteerUtil;
|
|
|
|
}
|
2020-04-28 14:35:43 +00:00
|
|
|
|
2022-09-15 06:22:20 +00:00
|
|
|
get taskManager(): TaskManager {
|
|
|
|
return this.#taskManager;
|
2022-06-13 09:16:25 +00:00
|
|
|
}
|
2020-04-28 14:35:43 +00:00
|
|
|
|
2022-06-13 09:16:25 +00:00
|
|
|
get _boundFunctions(): Map<string, Function> {
|
|
|
|
return this.#boundFunctions;
|
|
|
|
}
|
|
|
|
|
2022-06-15 10:42:21 +00:00
|
|
|
static #bindingIdentifier = (name: string, contextId: number) => {
|
|
|
|
return `${name}_${contextId}`;
|
|
|
|
};
|
2020-10-07 08:49:11 +00:00
|
|
|
|
2022-09-13 12:06:40 +00:00
|
|
|
constructor(frame: Frame) {
|
2021-10-28 09:25:49 +00:00
|
|
|
// Keep own reference to client because it might differ from the FrameManager's
|
|
|
|
// client for OOP iframes.
|
2022-06-13 09:16:25 +00:00
|
|
|
this.#frame = frame;
|
|
|
|
this.#client.on('Runtime.bindingCalled', this.#onBindingCalled);
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2022-08-24 15:04:54 +00:00
|
|
|
get #client(): CDPSession {
|
|
|
|
return this.#frame._client();
|
|
|
|
}
|
|
|
|
|
|
|
|
get #frameManager(): FrameManager {
|
|
|
|
return this.#frame._frameManager;
|
|
|
|
}
|
|
|
|
|
|
|
|
get #timeoutSettings(): TimeoutSettings {
|
|
|
|
return this.#frameManager.timeoutSettings;
|
|
|
|
}
|
|
|
|
|
2020-04-29 11:28:16 +00:00
|
|
|
frame(): Frame {
|
2022-06-13 09:16:25 +00:00
|
|
|
return this.#frame;
|
2019-01-22 22:55:33 +00:00
|
|
|
}
|
|
|
|
|
2022-08-09 11:29:12 +00:00
|
|
|
clearContext(): void {
|
2023-01-26 07:56:33 +00:00
|
|
|
// Only create a new promise if the old one was resolved.
|
|
|
|
if (this.#puppeteerUtil.resolved()) {
|
|
|
|
this.#puppeteerUtil = createDeferredPromise();
|
|
|
|
}
|
2022-08-26 10:55:30 +00:00
|
|
|
this.#document = undefined;
|
2022-09-01 15:09:57 +00:00
|
|
|
this.#context = createDeferredPromise();
|
2022-08-09 11:29:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
setContext(context: ExecutionContext): void {
|
2022-09-13 12:06:40 +00:00
|
|
|
this.#injectPuppeteerUtil(context);
|
2022-08-09 11:29:12 +00:00
|
|
|
this.#ctxBindings.clear();
|
2022-09-01 15:09:57 +00:00
|
|
|
this.#context.resolve(context);
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2022-09-13 12:06:40 +00:00
|
|
|
async #injectPuppeteerUtil(context: ExecutionContext): Promise<void> {
|
|
|
|
try {
|
|
|
|
this.#puppeteerUtil.resolve(
|
|
|
|
(await context.evaluateHandle(
|
|
|
|
`(() => {
|
2022-09-15 06:22:20 +00:00
|
|
|
const module = {};
|
|
|
|
${injectedSource}
|
|
|
|
return module.exports.default;
|
|
|
|
})()`
|
2022-09-13 12:06:40 +00:00
|
|
|
)) as JSHandle<PuppeteerUtil>
|
|
|
|
);
|
2022-09-15 08:53:01 +00:00
|
|
|
this.#taskManager.rerunAll();
|
2022-09-13 12:06:40 +00:00
|
|
|
} catch (error: unknown) {
|
|
|
|
debugError(error);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-08-09 11:29:12 +00:00
|
|
|
hasContext(): boolean {
|
2022-09-01 15:09:57 +00:00
|
|
|
return this.#context.resolved();
|
2019-04-11 20:26:18 +00:00
|
|
|
}
|
|
|
|
|
2020-04-28 14:35:43 +00:00
|
|
|
_detach(): void {
|
2022-06-13 09:16:25 +00:00
|
|
|
this.#detached = true;
|
|
|
|
this.#client.off('Runtime.bindingCalled', this.#onBindingCalled);
|
2022-09-15 06:22:20 +00:00
|
|
|
this.#taskManager.terminateAll(
|
|
|
|
new Error('waitForFunction failed: frame got detached.')
|
|
|
|
);
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2020-04-28 14:35:43 +00:00
|
|
|
executionContext(): Promise<ExecutionContext> {
|
2022-06-14 11:55:35 +00:00
|
|
|
if (this.#detached) {
|
2020-05-07 10:54:55 +00:00
|
|
|
throw new Error(
|
2022-06-13 09:16:25 +00:00
|
|
|
`Execution context is not available in detached frame "${this.#frame.url()}" (are you trying to evaluate?)`
|
2020-05-07 10:54:55 +00:00
|
|
|
);
|
2022-06-14 11:55:35 +00:00
|
|
|
}
|
2022-09-01 15:09:57 +00:00
|
|
|
if (this.#context === null) {
|
2022-05-25 13:34:11 +00:00
|
|
|
throw new Error(`Execution content promise is missing`);
|
2022-06-14 11:55:35 +00:00
|
|
|
}
|
2022-09-01 15:09:57 +00:00
|
|
|
return this.#context;
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
async evaluateHandle<
|
|
|
|
Params extends unknown[],
|
|
|
|
Func extends EvaluateFunc<Params> = EvaluateFunc<Params>
|
|
|
|
>(
|
|
|
|
pageFunction: Func | string,
|
2022-06-24 06:40:08 +00:00
|
|
|
...args: Params
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
): Promise<HandleFor<Awaited<ReturnType<Func>>>> {
|
2019-01-16 01:21:23 +00:00
|
|
|
const context = await this.executionContext();
|
|
|
|
return context.evaluateHandle(pageFunction, ...args);
|
|
|
|
}
|
|
|
|
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
async evaluate<
|
|
|
|
Params extends unknown[],
|
|
|
|
Func extends EvaluateFunc<Params> = EvaluateFunc<Params>
|
|
|
|
>(
|
|
|
|
pageFunction: Func | string,
|
2022-06-24 06:40:08 +00:00
|
|
|
...args: Params
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
): Promise<Awaited<ReturnType<Func>>> {
|
2019-01-16 01:21:23 +00:00
|
|
|
const context = await this.executionContext();
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
return context.evaluate(pageFunction, ...args);
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2022-07-06 07:05:37 +00:00
|
|
|
async $<Selector extends string>(
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
selector: Selector
|
2022-07-06 07:05:37 +00:00
|
|
|
): Promise<ElementHandle<NodeFor<Selector>> | null> {
|
2022-08-10 21:34:29 +00:00
|
|
|
const document = await this.document();
|
|
|
|
return document.$(selector);
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
}
|
|
|
|
|
2022-07-06 07:05:37 +00:00
|
|
|
async $$<Selector extends string>(
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
selector: Selector
|
2022-07-06 07:05:37 +00:00
|
|
|
): Promise<Array<ElementHandle<NodeFor<Selector>>>> {
|
2022-08-10 21:34:29 +00:00
|
|
|
const document = await this.document();
|
2022-07-06 07:05:37 +00:00
|
|
|
return document.$$(selector);
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2022-08-10 21:34:29 +00:00
|
|
|
async document(): Promise<ElementHandle<Document>> {
|
2022-08-26 10:55:30 +00:00
|
|
|
if (this.#document) {
|
|
|
|
return this.#document;
|
2022-06-14 11:55:35 +00:00
|
|
|
}
|
2022-08-26 10:55:30 +00:00
|
|
|
const context = await this.executionContext();
|
|
|
|
this.#document = await context.evaluateHandle(() => {
|
|
|
|
return document;
|
2019-01-16 01:21:23 +00:00
|
|
|
});
|
2022-08-26 10:55:30 +00:00
|
|
|
return this.#document;
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2022-07-06 07:05:37 +00:00
|
|
|
async $x(expression: string): Promise<Array<ElementHandle<Node>>> {
|
2022-08-10 21:34:29 +00:00
|
|
|
const document = await this.document();
|
|
|
|
return document.$x(expression);
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
async $eval<
|
2022-07-06 07:05:37 +00:00
|
|
|
Selector extends string,
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
Params extends unknown[],
|
|
|
|
Func extends EvaluateFunc<
|
2022-07-06 07:05:37 +00:00
|
|
|
[ElementHandle<NodeFor<Selector>>, ...Params]
|
|
|
|
> = EvaluateFunc<[ElementHandle<NodeFor<Selector>>, ...Params]>
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
>(
|
|
|
|
selector: Selector,
|
|
|
|
pageFunction: Func | string,
|
2022-06-24 06:40:08 +00:00
|
|
|
...args: Params
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
): Promise<Awaited<ReturnType<Func>>> {
|
2022-08-10 21:34:29 +00:00
|
|
|
const document = await this.document();
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
return document.$eval(selector, pageFunction, ...args);
|
|
|
|
}
|
|
|
|
|
|
|
|
async $$eval<
|
2022-07-06 07:05:37 +00:00
|
|
|
Selector extends string,
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
Params extends unknown[],
|
|
|
|
Func extends EvaluateFunc<
|
2022-07-06 07:05:37 +00:00
|
|
|
[Array<NodeFor<Selector>>, ...Params]
|
|
|
|
> = EvaluateFunc<[Array<NodeFor<Selector>>, ...Params]>
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
>(
|
|
|
|
selector: Selector,
|
|
|
|
pageFunction: Func | string,
|
2022-06-24 06:40:08 +00:00
|
|
|
...args: Params
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
): Promise<Awaited<ReturnType<Func>>> {
|
2022-08-10 21:34:29 +00:00
|
|
|
const document = await this.document();
|
|
|
|
return document.$$eval(selector, pageFunction, ...args);
|
|
|
|
}
|
|
|
|
|
2020-04-28 14:35:43 +00:00
|
|
|
async content(): Promise<string> {
|
2019-01-16 01:21:23 +00:00
|
|
|
return await this.evaluate(() => {
|
|
|
|
let retVal = '';
|
2022-06-14 11:55:35 +00:00
|
|
|
if (document.doctype) {
|
2019-01-16 01:21:23 +00:00
|
|
|
retVal = new XMLSerializer().serializeToString(document.doctype);
|
2022-06-14 11:55:35 +00:00
|
|
|
}
|
|
|
|
if (document.documentElement) {
|
2019-01-16 01:21:23 +00:00
|
|
|
retVal += document.documentElement.outerHTML;
|
2022-06-14 11:55:35 +00:00
|
|
|
}
|
2019-01-16 01:21:23 +00:00
|
|
|
return retVal;
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2020-05-07 10:54:55 +00:00
|
|
|
async setContent(
|
|
|
|
html: string,
|
|
|
|
options: {
|
|
|
|
timeout?: number;
|
|
|
|
waitUntil?: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[];
|
|
|
|
} = {}
|
|
|
|
): Promise<void> {
|
2019-01-16 01:21:23 +00:00
|
|
|
const {
|
|
|
|
waitUntil = ['load'],
|
2022-06-13 09:16:25 +00:00
|
|
|
timeout = this.#timeoutSettings.navigationTimeout(),
|
2019-01-16 01:21:23 +00:00
|
|
|
} = options;
|
|
|
|
// We rely upon the fact that document.open() will reset frame lifecycle with "init"
|
|
|
|
// lifecycle event. @see https://crrev.com/608658
|
feat!: type inference for evaluation types (#8547)
This PR greatly improves the types within Puppeteer:
- **Almost everything** is auto-deduced.
- Parameters don't need to be specified in the function. They are deduced from the spread.
- Return types don't need to be specified. They are deduced from the function. (More on this below)
- Selections based on tag names correctly deduce element type, similar to TypeScript's mechanism for `getElementByTagName`.
- [**BREAKING CHANGE**] We've removed the ability to declare return types in type arguments for the following reasons:
1. Setting them will indubitably break auto-deduction.
2. You can just use `as ...` in TypeScript to coerce the correct type (given it makes sense).
- [**BREAKING CHANGE**] `waitFor` is officially gone.
To migrate to these changes, there are only four things you may need to change:
- If you set a return type using the `ReturnType` type parameter, remove it and use `as ...` and `HandleFor` (if necessary).
⛔ `evaluate<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluate(a, b) => {...}, a, b)) as ReturnType`
⛔ `evaluateHandle<ReturnType>(a: number, b: number) => {...}, a, b)`
✅ `(await evaluateHandle(a, b) => {...}, a, b)) as HandleFor<ReturnType>`
- If you set any type parameters in the *parameters* of an evaluation function, remove them.
⛔ `evaluate(a: number, b: number) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
- If you set any type parameters in the method's declaration, remove them.
⛔ `evaluate<(a: number, b: number) => void>((a, b) => {...}, a, b)`
✅ `evaluate(a, b) => {...}, a, b)`
2022-06-23 09:29:46 +00:00
|
|
|
await this.evaluate(html => {
|
2019-01-16 01:21:23 +00:00
|
|
|
document.open();
|
2019-05-22 18:21:45 +00:00
|
|
|
document.write(html);
|
2019-01-16 01:21:23 +00:00
|
|
|
document.close();
|
2019-05-22 18:21:45 +00:00
|
|
|
}, html);
|
2020-05-07 10:54:55 +00:00
|
|
|
const watcher = new LifecycleWatcher(
|
2022-06-13 09:16:25 +00:00
|
|
|
this.#frameManager,
|
|
|
|
this.#frame,
|
2020-05-07 10:54:55 +00:00
|
|
|
waitUntil,
|
|
|
|
timeout
|
|
|
|
);
|
2019-01-16 01:21:23 +00:00
|
|
|
const error = await Promise.race([
|
|
|
|
watcher.timeoutOrTerminationPromise(),
|
|
|
|
watcher.lifecyclePromise(),
|
|
|
|
]);
|
|
|
|
watcher.dispose();
|
2022-06-14 11:55:35 +00:00
|
|
|
if (error) {
|
|
|
|
throw error;
|
|
|
|
}
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2020-05-07 10:54:55 +00:00
|
|
|
async click(
|
|
|
|
selector: string,
|
2022-06-22 13:25:44 +00:00
|
|
|
options: {delay?: number; button?: MouseButton; clickCount?: number}
|
2020-05-07 10:54:55 +00:00
|
|
|
): Promise<void> {
|
2019-01-16 01:21:23 +00:00
|
|
|
const handle = await this.$(selector);
|
2022-05-31 14:34:16 +00:00
|
|
|
assert(handle, `No element found for selector: ${selector}`);
|
|
|
|
await handle.click(options);
|
|
|
|
await handle.dispose();
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2020-04-28 14:35:43 +00:00
|
|
|
async focus(selector: string): Promise<void> {
|
2019-01-16 01:21:23 +00:00
|
|
|
const handle = await this.$(selector);
|
2022-05-31 14:34:16 +00:00
|
|
|
assert(handle, `No element found for selector: ${selector}`);
|
|
|
|
await handle.focus();
|
|
|
|
await handle.dispose();
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2020-04-28 14:35:43 +00:00
|
|
|
async hover(selector: string): Promise<void> {
|
2019-01-16 01:21:23 +00:00
|
|
|
const handle = await this.$(selector);
|
2022-05-31 14:34:16 +00:00
|
|
|
assert(handle, `No element found for selector: ${selector}`);
|
|
|
|
await handle.hover();
|
|
|
|
await handle.dispose();
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2020-04-28 14:35:43 +00:00
|
|
|
async select(selector: string, ...values: string[]): Promise<string[]> {
|
2019-09-04 22:19:34 +00:00
|
|
|
const handle = await this.$(selector);
|
2022-05-31 14:34:16 +00:00
|
|
|
assert(handle, `No element found for selector: ${selector}`);
|
|
|
|
const result = await handle.select(...values);
|
|
|
|
await handle.dispose();
|
2019-09-04 22:19:34 +00:00
|
|
|
return result;
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2020-04-28 14:35:43 +00:00
|
|
|
async tap(selector: string): Promise<void> {
|
2019-01-16 01:21:23 +00:00
|
|
|
const handle = await this.$(selector);
|
2022-05-31 14:34:16 +00:00
|
|
|
assert(handle, `No element found for selector: ${selector}`);
|
|
|
|
await handle.tap();
|
|
|
|
await handle.dispose();
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2020-05-07 10:54:55 +00:00
|
|
|
async type(
|
|
|
|
selector: string,
|
|
|
|
text: string,
|
2022-06-22 13:25:44 +00:00
|
|
|
options?: {delay: number}
|
2020-05-07 10:54:55 +00:00
|
|
|
): Promise<void> {
|
2019-01-16 01:21:23 +00:00
|
|
|
const handle = await this.$(selector);
|
2022-05-31 14:34:16 +00:00
|
|
|
assert(handle, `No element found for selector: ${selector}`);
|
|
|
|
await handle.type(text, options);
|
|
|
|
await handle.dispose();
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|
|
|
|
|
2020-10-07 08:49:11 +00:00
|
|
|
// If multiple waitFor are set up asynchronously, we need to wait for the
|
|
|
|
// first one to set up the binding in the page before running the others.
|
2022-06-13 09:16:25 +00:00
|
|
|
#settingUpBinding: Promise<void> | null = null;
|
|
|
|
|
|
|
|
async _addBindingToContext(
|
2020-11-03 10:39:31 +00:00
|
|
|
context: ExecutionContext,
|
|
|
|
name: string
|
|
|
|
): Promise<void> {
|
2020-10-07 08:49:11 +00:00
|
|
|
// Previous operation added the binding so we are done.
|
2020-11-03 10:39:31 +00:00
|
|
|
if (
|
2022-06-13 09:16:25 +00:00
|
|
|
this.#ctxBindings.has(
|
2022-08-09 13:17:42 +00:00
|
|
|
IsolatedWorld.#bindingIdentifier(name, context._contextId)
|
2020-11-03 10:39:31 +00:00
|
|
|
)
|
|
|
|
) {
|
|
|
|
return;
|
|
|
|
}
|
2020-10-07 08:49:11 +00:00
|
|
|
// Wait for other operation to finish
|
2022-06-13 09:16:25 +00:00
|
|
|
if (this.#settingUpBinding) {
|
|
|
|
await this.#settingUpBinding;
|
|
|
|
return this._addBindingToContext(context, name);
|
2020-10-07 08:49:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
const bind = async (name: string) => {
|
2022-06-14 11:16:21 +00:00
|
|
|
const expression = pageBindingInitString('internal', name);
|
2020-10-07 08:49:11 +00:00
|
|
|
try {
|
2021-01-25 12:01:59 +00:00
|
|
|
// TODO: In theory, it would be enough to call this just once
|
2020-10-07 08:49:11 +00:00
|
|
|
await context._client.send('Runtime.addBinding', {
|
|
|
|
name,
|
2021-01-25 12:01:59 +00:00
|
|
|
executionContextName: context._contextName,
|
2020-10-07 08:49:11 +00:00
|
|
|
});
|
|
|
|
await context.evaluate(expression);
|
|
|
|
} catch (error) {
|
|
|
|
// We could have tried to evaluate in a context which was already
|
|
|
|
// destroyed. This happens, for example, if the page is navigated while
|
|
|
|
// we are trying to add the binding
|
2022-09-15 06:22:20 +00:00
|
|
|
if (error instanceof Error) {
|
|
|
|
// Destroyed context.
|
|
|
|
if (error.message.includes('Execution context was destroyed')) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Missing context.
|
|
|
|
if (error.message.includes('Cannot find context with specified id')) {
|
|
|
|
return;
|
|
|
|
}
|
2020-10-07 08:49:11 +00:00
|
|
|
}
|
2022-09-15 06:22:20 +00:00
|
|
|
|
|
|
|
debugError(error);
|
|
|
|
return;
|
2020-10-07 08:49:11 +00:00
|
|
|
}
|
2022-06-13 09:16:25 +00:00
|
|
|
this.#ctxBindings.add(
|
2022-08-09 13:17:42 +00:00
|
|
|
IsolatedWorld.#bindingIdentifier(name, context._contextId)
|
2020-11-03 10:39:31 +00:00
|
|
|
);
|
2020-10-07 08:49:11 +00:00
|
|
|
};
|
|
|
|
|
2022-06-13 09:16:25 +00:00
|
|
|
this.#settingUpBinding = bind(name);
|
|
|
|
await this.#settingUpBinding;
|
|
|
|
this.#settingUpBinding = null;
|
2020-10-07 08:49:11 +00:00
|
|
|
}
|
|
|
|
|
2022-06-13 09:16:25 +00:00
|
|
|
#onBindingCalled = async (
|
2020-10-07 08:49:11 +00:00
|
|
|
event: Protocol.Runtime.BindingCalledEvent
|
2022-06-13 09:16:25 +00:00
|
|
|
): Promise<void> => {
|
2022-06-22 13:25:44 +00:00
|
|
|
let payload: {type: string; name: string; seq: number; args: unknown[]};
|
2022-08-09 11:29:12 +00:00
|
|
|
if (!this.hasContext()) {
|
2022-06-14 11:55:35 +00:00
|
|
|
return;
|
|
|
|
}
|
2020-11-03 10:39:31 +00:00
|
|
|
const context = await this.executionContext();
|
2020-10-23 10:45:47 +00:00
|
|
|
try {
|
|
|
|
payload = JSON.parse(event.payload);
|
|
|
|
} catch {
|
|
|
|
// The binding was either called by something in the page or it was
|
|
|
|
// called before our wrapper was initialized.
|
|
|
|
return;
|
|
|
|
}
|
2022-06-22 13:25:44 +00:00
|
|
|
const {type, name, seq, args} = payload;
|
2020-11-03 10:39:31 +00:00
|
|
|
if (
|
|
|
|
type !== 'internal' ||
|
2022-06-13 09:16:25 +00:00
|
|
|
!this.#ctxBindings.has(
|
2022-08-09 13:17:42 +00:00
|
|
|
IsolatedWorld.#bindingIdentifier(name, context._contextId)
|
2020-11-03 10:39:31 +00:00
|
|
|
)
|
2022-06-14 11:55:35 +00:00
|
|
|
) {
|
2020-11-03 10:39:31 +00:00
|
|
|
return;
|
2022-06-14 11:55:35 +00:00
|
|
|
}
|
|
|
|
if (context._contextId !== event.executionContextId) {
|
|
|
|
return;
|
|
|
|
}
|
2020-10-07 08:49:11 +00:00
|
|
|
try {
|
2022-05-25 13:34:11 +00:00
|
|
|
const fn = this._boundFunctions.get(name);
|
|
|
|
if (!fn) {
|
|
|
|
throw new Error(`Bound function $name is not found`);
|
|
|
|
}
|
|
|
|
const result = await fn(...args);
|
2022-09-15 06:22:20 +00:00
|
|
|
await context.evaluate(
|
|
|
|
(name: string, seq: number, result: unknown) => {
|
|
|
|
// @ts-expect-error Code is evaluated in a different context.
|
|
|
|
const callbacks = self[name].callbacks;
|
|
|
|
callbacks.get(seq).resolve(result);
|
|
|
|
callbacks.delete(seq);
|
|
|
|
},
|
|
|
|
name,
|
|
|
|
seq,
|
|
|
|
result
|
|
|
|
);
|
2020-10-07 08:49:11 +00:00
|
|
|
} catch (error) {
|
|
|
|
// The WaitTask may already have been resolved by timing out, or the
|
2023-01-13 17:03:21 +00:00
|
|
|
// execution context may have been destroyed.
|
2020-10-07 08:49:11 +00:00
|
|
|
// In both caes, the promises above are rejected with a protocol error.
|
|
|
|
// We can safely ignores these, as the WaitTask is re-installed in
|
|
|
|
// the next execution context if needed.
|
2022-06-14 11:55:35 +00:00
|
|
|
if ((error as Error).message.includes('Protocol error')) {
|
|
|
|
return;
|
|
|
|
}
|
2020-10-07 08:49:11 +00:00
|
|
|
debugError(error);
|
|
|
|
}
|
2022-06-13 09:16:25 +00:00
|
|
|
};
|
2020-10-07 08:49:11 +00:00
|
|
|
|
2022-06-13 09:16:25 +00:00
|
|
|
async _waitForSelectorInPage(
|
2020-09-23 14:02:22 +00:00
|
|
|
queryOne: Function,
|
2022-08-26 10:55:30 +00:00
|
|
|
root: ElementHandle<Node> | undefined,
|
2020-09-23 14:02:22 +00:00
|
|
|
selector: string,
|
2020-11-03 10:39:31 +00:00
|
|
|
options: WaitForSelectorOptions,
|
2022-09-21 08:16:54 +00:00
|
|
|
bindings = new Map<string, (...args: never[]) => unknown>()
|
2022-08-26 10:55:30 +00:00
|
|
|
): Promise<JSHandle<unknown> | null> {
|
2019-01-16 01:21:23 +00:00
|
|
|
const {
|
2020-09-21 13:47:33 +00:00
|
|
|
visible: waitForVisible = false,
|
|
|
|
hidden: waitForHidden = false,
|
2022-06-13 09:16:25 +00:00
|
|
|
timeout = this.#timeoutSettings.timeout(),
|
2019-01-16 01:21:23 +00:00
|
|
|
} = options;
|
2022-09-15 06:22:20 +00:00
|
|
|
|
|
|
|
try {
|
|
|
|
const handle = await this.waitForFunction(
|
|
|
|
async (PuppeteerUtil, query, selector, root, visible) => {
|
|
|
|
if (!PuppeteerUtil) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
const node = (await PuppeteerUtil.createFunction(query)(
|
|
|
|
root || document,
|
2022-09-15 11:12:13 +00:00
|
|
|
selector,
|
|
|
|
PuppeteerUtil
|
2022-09-15 06:22:20 +00:00
|
|
|
)) as Node | null;
|
|
|
|
return PuppeteerUtil.checkVisibility(node, visible);
|
|
|
|
},
|
|
|
|
{
|
|
|
|
bindings,
|
|
|
|
polling: waitForVisible || waitForHidden ? 'raf' : 'mutation',
|
|
|
|
root,
|
|
|
|
timeout,
|
|
|
|
},
|
2023-01-26 07:56:33 +00:00
|
|
|
LazyArg.create(() => {
|
|
|
|
return this.puppeteerUtil;
|
2022-09-15 06:22:20 +00:00
|
|
|
}),
|
|
|
|
queryOne.toString(),
|
|
|
|
selector,
|
|
|
|
root,
|
|
|
|
waitForVisible ? true : waitForHidden ? false : undefined
|
|
|
|
);
|
|
|
|
const elementHandle = handle.asElement();
|
|
|
|
if (!elementHandle) {
|
|
|
|
await handle.dispose();
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
return elementHandle;
|
|
|
|
} catch (error) {
|
|
|
|
if (!isErrorLike(error)) {
|
|
|
|
throw error;
|
|
|
|
}
|
|
|
|
error.message = `Waiting for selector \`${selector}\` failed: ${error.message}`;
|
|
|
|
throw error;
|
2020-09-21 13:47:33 +00:00
|
|
|
}
|
2022-09-15 06:22:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
waitForFunction<
|
|
|
|
Params extends unknown[],
|
2023-01-26 07:56:33 +00:00
|
|
|
Func extends EvaluateFunc<Params> = EvaluateFunc<Params>
|
2022-09-15 06:22:20 +00:00
|
|
|
>(
|
|
|
|
pageFunction: Func | string,
|
|
|
|
options: {
|
|
|
|
polling?: 'raf' | 'mutation' | number;
|
|
|
|
timeout?: number;
|
|
|
|
root?: ElementHandle<Node>;
|
2022-09-21 08:16:54 +00:00
|
|
|
bindings?: Map<string, (...args: never[]) => unknown>;
|
2022-09-15 06:22:20 +00:00
|
|
|
} = {},
|
|
|
|
...args: Params
|
|
|
|
): Promise<HandleFor<Awaited<ReturnType<Func>>>> {
|
|
|
|
const {
|
|
|
|
polling = 'raf',
|
|
|
|
timeout = this.#timeoutSettings.timeout(),
|
|
|
|
bindings,
|
2022-08-26 10:55:30 +00:00
|
|
|
root,
|
2022-09-15 06:22:20 +00:00
|
|
|
} = options;
|
|
|
|
if (typeof polling === 'number' && polling < 0) {
|
|
|
|
throw new Error('Cannot poll with non-positive interval');
|
|
|
|
}
|
|
|
|
const waitTask = new WaitTask(
|
|
|
|
this,
|
|
|
|
{
|
|
|
|
bindings,
|
|
|
|
polling,
|
|
|
|
root,
|
|
|
|
timeout,
|
|
|
|
},
|
|
|
|
pageFunction as unknown as
|
|
|
|
| ((...args: unknown[]) => Promise<Awaited<ReturnType<Func>>>)
|
|
|
|
| string,
|
|
|
|
...args
|
|
|
|
);
|
|
|
|
return waitTask.result;
|
2020-09-21 13:47:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
async title(): Promise<string> {
|
2022-06-15 10:42:21 +00:00
|
|
|
return this.evaluate(() => {
|
|
|
|
return document.title;
|
|
|
|
});
|
2020-09-21 13:47:33 +00:00
|
|
|
}
|
2022-08-09 12:55:18 +00:00
|
|
|
|
|
|
|
async adoptBackendNode(
|
|
|
|
backendNodeId?: Protocol.DOM.BackendNodeId
|
|
|
|
): Promise<JSHandle<Node>> {
|
|
|
|
const executionContext = await this.executionContext();
|
|
|
|
const {object} = await this.#client.send('DOM.resolveNode', {
|
|
|
|
backendNodeId: backendNodeId,
|
|
|
|
executionContextId: executionContext._contextId,
|
|
|
|
});
|
|
|
|
return createJSHandle(executionContext, object) as JSHandle<Node>;
|
|
|
|
}
|
|
|
|
|
|
|
|
async adoptHandle<T extends JSHandle<Node>>(handle: T): Promise<T> {
|
|
|
|
const executionContext = await this.executionContext();
|
|
|
|
assert(
|
|
|
|
handle.executionContext() !== executionContext,
|
|
|
|
'Cannot adopt handle that already belongs to this execution context'
|
|
|
|
);
|
|
|
|
const nodeInfo = await this.#client.send('DOM.describeNode', {
|
2022-08-11 09:45:35 +00:00
|
|
|
objectId: handle.remoteObject().objectId,
|
2022-08-09 12:55:18 +00:00
|
|
|
});
|
|
|
|
return (await this.adoptBackendNode(nodeInfo.node.backendNodeId)) as T;
|
|
|
|
}
|
2022-08-26 10:55:30 +00:00
|
|
|
|
|
|
|
async transferHandle<T extends JSHandle<Node>>(handle: T): Promise<T> {
|
|
|
|
const result = await this.adoptHandle(handle);
|
|
|
|
await handle.dispose();
|
|
|
|
return result;
|
|
|
|
}
|
2019-01-16 01:21:23 +00:00
|
|
|
}
|