2019-01-15 04:34:50 +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';
|
2023-02-09 17:04:06 +00:00
|
|
|
import {JSHandle} from '../api/JSHandle.js';
|
2022-08-17 12:39:41 +00:00
|
|
|
import {assert} from '../util/assert.js';
|
2022-06-22 13:25:44 +00:00
|
|
|
import {CDPSession} from './Connection.js';
|
2023-02-09 17:04:06 +00:00
|
|
|
import type {CDPElementHandle} from './ElementHandle.js';
|
2022-06-22 13:25:44 +00:00
|
|
|
import {ExecutionContext} from './ExecutionContext.js';
|
2023-02-13 19:25:07 +00:00
|
|
|
import {EvaluateFuncWith, HandleFor, HandleOr} from './types.js';
|
2022-08-11 09:45:35 +00:00
|
|
|
import {createJSHandle, releaseObject, valueFromRemoteObject} from './util.js';
|
2022-04-27 21:00:07 +00:00
|
|
|
|
2022-07-06 07:05:37 +00:00
|
|
|
declare const __JSHandleSymbol: unique symbol;
|
|
|
|
|
2021-04-06 08:58:01 +00:00
|
|
|
/**
|
2023-02-09 17:04:06 +00:00
|
|
|
* @internal
|
2021-04-06 08:58:01 +00:00
|
|
|
*/
|
2023-02-09 17:04:06 +00:00
|
|
|
export class CDPJSHandle<T> extends JSHandle<T> {
|
2022-07-06 07:05:37 +00:00
|
|
|
/**
|
|
|
|
* Used for nominally typing {@link JSHandle}.
|
|
|
|
*/
|
|
|
|
[__JSHandleSymbol]?: T;
|
|
|
|
|
2022-06-13 09:16:25 +00:00
|
|
|
#disposed = false;
|
|
|
|
#context: ExecutionContext;
|
|
|
|
#remoteObject: Protocol.Runtime.RemoteObject;
|
|
|
|
|
2023-02-09 17:04:06 +00:00
|
|
|
override get disposed(): boolean {
|
2022-06-13 09:16:25 +00:00
|
|
|
return this.#disposed;
|
|
|
|
}
|
|
|
|
|
2020-05-07 10:54:55 +00:00
|
|
|
constructor(
|
|
|
|
context: ExecutionContext,
|
|
|
|
remoteObject: Protocol.Runtime.RemoteObject
|
|
|
|
) {
|
2023-02-09 17:04:06 +00:00
|
|
|
super();
|
2022-06-13 09:16:25 +00:00
|
|
|
this.#context = context;
|
|
|
|
this.#remoteObject = remoteObject;
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
|
2023-02-09 17:04:06 +00:00
|
|
|
override executionContext(): ExecutionContext {
|
2022-06-13 09:16:25 +00:00
|
|
|
return this.#context;
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
|
2023-02-09 17:04:06 +00:00
|
|
|
override get client(): CDPSession {
|
|
|
|
return this.#context._client;
|
|
|
|
}
|
|
|
|
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* @see {@link ExecutionContext.evaluate} for more details.
|
2020-06-22 15:21:57 +00:00
|
|
|
*/
|
2023-02-09 17:04:06 +00:00
|
|
|
override async evaluate<
|
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[],
|
2023-02-13 19:25:07 +00:00
|
|
|
Func extends EvaluateFuncWith<T, Params> = EvaluateFuncWith<T, 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
|
|
|
>(
|
|
|
|
pageFunction: Func | string,
|
2022-06-24 06:40:08 +00:00
|
|
|
...args: Params
|
2023-02-13 19:25:07 +00:00
|
|
|
): Promise<Awaited<ReturnType<Func>>> {
|
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 await this.executionContext().evaluate(pageFunction, this, ...args);
|
2019-09-04 22:19:34 +00:00
|
|
|
}
|
|
|
|
|
2020-06-22 15:21:57 +00:00
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* @see {@link ExecutionContext.evaluateHandle} for more details.
|
2020-06-22 15:21:57 +00:00
|
|
|
*/
|
2023-02-09 17:04:06 +00:00
|
|
|
override async evaluateHandle<
|
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[],
|
2023-02-13 19:25:07 +00:00
|
|
|
Func extends EvaluateFuncWith<T, Params> = EvaluateFuncWith<T, 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
|
|
|
>(
|
2022-06-27 08:57:31 +00:00
|
|
|
pageFunction: Func | string,
|
2022-06-24 06:40:08 +00:00
|
|
|
...args: Params
|
2023-02-13 19:25:07 +00:00
|
|
|
): Promise<HandleFor<Awaited<ReturnType<Func>>>> {
|
2020-05-07 10:54:55 +00:00
|
|
|
return await this.executionContext().evaluateHandle(
|
|
|
|
pageFunction,
|
|
|
|
this,
|
|
|
|
...args
|
|
|
|
);
|
2019-09-04 22:19:34 +00:00
|
|
|
}
|
|
|
|
|
2023-02-09 17:04:06 +00:00
|
|
|
override async getProperty<K extends keyof T>(
|
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
|
|
|
propertyName: HandleOr<K>
|
|
|
|
): Promise<HandleFor<T[K]>>;
|
2023-02-09 17:04:06 +00:00
|
|
|
override async getProperty(propertyName: string): Promise<JSHandle<unknown>>;
|
|
|
|
override async getProperty<K extends keyof T>(
|
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
|
|
|
propertyName: HandleOr<K>
|
|
|
|
): Promise<HandleFor<T[K]>> {
|
2022-08-11 09:45:35 +00:00
|
|
|
return this.evaluateHandle((object, propertyName) => {
|
2022-12-19 14:26:58 +00:00
|
|
|
return object[propertyName as K];
|
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
|
|
|
}, propertyName);
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
|
2023-02-09 17:04:06 +00:00
|
|
|
override async getProperties(): Promise<Map<string, JSHandle>> {
|
2022-06-13 09:16:25 +00:00
|
|
|
assert(this.#remoteObject.objectId);
|
2022-08-11 09:45:35 +00:00
|
|
|
// We use Runtime.getProperties rather than iterative building because the
|
|
|
|
// iterative approach might create a distorted snapshot.
|
2022-08-25 15:00:35 +00:00
|
|
|
const response = await this.client.send('Runtime.getProperties', {
|
2022-06-13 09:16:25 +00:00
|
|
|
objectId: this.#remoteObject.objectId,
|
2020-05-07 10:54:55 +00:00
|
|
|
ownProperties: true,
|
2019-01-15 04:34:50 +00:00
|
|
|
});
|
2020-04-21 11:11:06 +00:00
|
|
|
const result = new Map<string, JSHandle>();
|
2019-01-15 04:34:50 +00:00
|
|
|
for (const property of response.result) {
|
2022-06-14 11:55:35 +00:00
|
|
|
if (!property.enumerable || !property.value) {
|
|
|
|
continue;
|
|
|
|
}
|
2022-06-27 07:24:23 +00:00
|
|
|
result.set(property.name, createJSHandle(this.#context, property.value));
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2023-02-09 17:04:06 +00:00
|
|
|
override async jsonValue(): Promise<T> {
|
2022-08-11 09:45:35 +00:00
|
|
|
if (!this.#remoteObject.objectId) {
|
|
|
|
return valueFromRemoteObject(this.#remoteObject);
|
|
|
|
}
|
|
|
|
const value = await this.evaluate(object => {
|
|
|
|
return object;
|
|
|
|
});
|
|
|
|
if (value === undefined) {
|
|
|
|
throw new Error('Could not serialize referenced object');
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
2022-08-11 09:45:35 +00:00
|
|
|
return value;
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
|
2020-06-25 14:49:35 +00:00
|
|
|
/**
|
2022-08-11 09:45:35 +00:00
|
|
|
* @returns Either `null` or the handle itself if the handle is an
|
|
|
|
* instance of {@link ElementHandle}.
|
2020-06-25 14:49:35 +00:00
|
|
|
*/
|
2023-02-09 17:04:06 +00:00
|
|
|
override asElement(): CDPElementHandle<Node> | null {
|
2019-01-15 04:34:50 +00:00
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
2023-02-09 17:04:06 +00:00
|
|
|
override async dispose(): Promise<void> {
|
2022-06-14 11:55:35 +00:00
|
|
|
if (this.#disposed) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-13 09:16:25 +00:00
|
|
|
this.#disposed = true;
|
2022-08-25 15:00:35 +00:00
|
|
|
await releaseObject(this.client, this.#remoteObject);
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
|
2023-02-09 17:04:06 +00:00
|
|
|
override toString(): string {
|
2022-08-11 09:45:35 +00:00
|
|
|
if (!this.#remoteObject.objectId) {
|
|
|
|
return 'JSHandle:' + valueFromRemoteObject(this.#remoteObject);
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
2022-08-11 09:45:35 +00:00
|
|
|
const type = this.#remoteObject.subtype || this.#remoteObject.type;
|
|
|
|
return 'JSHandle@' + type;
|
2022-07-07 13:04:28 +00:00
|
|
|
}
|
|
|
|
|
2023-02-09 17:04:06 +00:00
|
|
|
override remoteObject(): Protocol.Runtime.RemoteObject {
|
2022-07-07 13:04:28 +00:00
|
|
|
return this.#remoteObject;
|
2019-01-15 04:34:50 +00:00
|
|
|
}
|
|
|
|
}
|