@crawlee/playwright 4.0.0-beta.15 → 4.0.0-beta.151
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +14 -14
- package/index.d.ts +2 -2
- package/index.js +1 -1
- package/internals/adaptive-playwright-crawler.d.ts +116 -63
- package/internals/adaptive-playwright-crawler.js +320 -266
- package/internals/enqueue-links/click-elements.d.ts +36 -64
- package/internals/enqueue-links/click-elements.js +65 -67
- package/internals/playwright-browser-pool.d.ts +71 -0
- package/internals/playwright-browser-pool.js +61 -0
- package/internals/playwright-crawler.d.ts +180 -125
- package/internals/playwright-crawler.js +68 -63
- package/internals/playwright-launcher.d.ts +32 -18
- package/internals/playwright-launcher.js +23 -17
- package/internals/utils/playwright-utils.d.ts +54 -41
- package/internals/utils/playwright-utils.js +110 -121
- package/internals/utils/rendering-type-prediction.d.ts +25 -11
- package/internals/utils/rendering-type-prediction.js +81 -27
- package/package.json +14 -18
- package/index.d.ts.map +0 -1
- package/index.js.map +0 -1
- package/internals/adaptive-playwright-crawler.d.ts.map +0 -1
- package/internals/adaptive-playwright-crawler.js.map +0 -1
- package/internals/enqueue-links/click-elements.d.ts.map +0 -1
- package/internals/enqueue-links/click-elements.js.map +0 -1
- package/internals/playwright-crawler.d.ts.map +0 -1
- package/internals/playwright-crawler.js.map +0 -1
- package/internals/playwright-launcher.d.ts.map +0 -1
- package/internals/playwright-launcher.js.map +0 -1
- package/internals/utils/playwright-utils.d.ts.map +0 -1
- package/internals/utils/playwright-utils.js.map +0 -1
- package/internals/utils/rendering-type-prediction.d.ts.map +0 -1
- package/internals/utils/rendering-type-prediction.js.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { IRequestManager, RequestTransform, SkippedRequestCallback, UrlPatternInput } from '@crawlee/browser';
|
|
2
2
|
import type { BatchAddRequestsResult, Dictionary } from '@crawlee/types';
|
|
3
3
|
// @ts-ignore optional peer dependency or compatibility with es2022
|
|
4
4
|
import type { Page } from 'playwright';
|
|
@@ -9,9 +9,9 @@ export interface EnqueueLinksByClickingElementsOptions {
|
|
|
9
9
|
*/
|
|
10
10
|
page: Page;
|
|
11
11
|
/**
|
|
12
|
-
* A request
|
|
12
|
+
* * A request manager to which the URLs will be enqueued.
|
|
13
13
|
*/
|
|
14
|
-
|
|
14
|
+
requestManager: IRequestManager;
|
|
15
15
|
/**
|
|
16
16
|
* A CSS selector matching elements to be clicked on. Unlike in {@link enqueueLinks}, there is no default
|
|
17
17
|
* value. This is to prevent suboptimal use of this function by using it too broadly.
|
|
@@ -26,82 +26,50 @@ export interface EnqueueLinksByClickingElementsOptions {
|
|
|
26
26
|
*/
|
|
27
27
|
clickOptions?: ClickOptions;
|
|
28
28
|
/**
|
|
29
|
-
* An array of
|
|
30
|
-
* containing glob pattern strings matching the URLs to be enqueued.
|
|
29
|
+
* An array of URL patterns that URLs must match to be enqueued.
|
|
31
30
|
*
|
|
32
|
-
*
|
|
33
|
-
* All remaining keys will be used as request options for the corresponding enqueued {@link Request} objects.
|
|
34
|
-
*
|
|
35
|
-
* The matching is always case-insensitive.
|
|
36
|
-
* If you need case-sensitive matching, use `regexps` property directly.
|
|
37
|
-
*
|
|
38
|
-
* If `globs` is an empty array or `undefined`, then the function
|
|
39
|
-
* enqueues all the intercepted navigation requests produced by the page
|
|
40
|
-
* after clicking on elements matching the provided CSS selector.
|
|
41
|
-
*/
|
|
42
|
-
globs?: GlobInput[];
|
|
43
|
-
/**
|
|
44
|
-
* An array of glob pattern strings, regexp patterns or plain objects
|
|
45
|
-
* containing patterns matching URLs that will **never** be enqueued.
|
|
46
|
-
*
|
|
47
|
-
* The plain objects must include either the `glob` property or the `regexp` property.
|
|
31
|
+
* Accepts glob pattern strings, `{ glob: string }` objects, `RegExp` instances, or `{ regexp: RegExp }` objects.
|
|
48
32
|
*
|
|
49
33
|
* Glob matching is always case-insensitive.
|
|
50
|
-
* If you need case-sensitive matching,
|
|
51
|
-
*/
|
|
52
|
-
exclude?: readonly (GlobInput | RegExpInput)[];
|
|
53
|
-
/**
|
|
54
|
-
* An array of regular expressions or plain objects
|
|
55
|
-
* containing regular expressions matching the URLs to be enqueued.
|
|
34
|
+
* If you need case-sensitive matching, use a `RegExp`.
|
|
56
35
|
*
|
|
57
|
-
*
|
|
58
|
-
* All remaining keys will be used as request options for the corresponding enqueued {@link Request} objects.
|
|
59
|
-
*
|
|
60
|
-
* If `regexps` is an empty array or `undefined`, then the function
|
|
36
|
+
* If `include` is an empty array or `undefined`, then the function
|
|
61
37
|
* enqueues all the intercepted navigation requests produced by the page
|
|
62
38
|
* after clicking on elements matching the provided CSS selector.
|
|
63
39
|
*/
|
|
64
|
-
|
|
40
|
+
include?: UrlPatternInput[];
|
|
65
41
|
/**
|
|
66
|
-
*
|
|
67
|
-
* Please use `globs` or `regexps` instead.
|
|
68
|
-
*
|
|
69
|
-
* An array of {@link PseudoUrl} strings or plain objects
|
|
70
|
-
* containing {@link PseudoUrl} strings matching the URLs to be enqueued.
|
|
42
|
+
* An array of URL patterns. Matching URLs will **not** be enqueued.
|
|
71
43
|
*
|
|
72
|
-
*
|
|
73
|
-
* All remaining keys will be used as request options for the corresponding enqueued {@link Request} objects.
|
|
44
|
+
* Accepts glob pattern strings, `{ glob: string }` objects, `RegExp` instances, or `{ regexp: RegExp }` objects.
|
|
74
45
|
*
|
|
75
|
-
*
|
|
76
|
-
* If you need case-sensitive matching, use `
|
|
77
|
-
*
|
|
78
|
-
* If `pseudoUrls` is an empty array or `undefined`, then the function
|
|
79
|
-
* enqueues all the intercepted navigation requests produced by the page
|
|
80
|
-
* after clicking on elements matching the provided CSS selector.
|
|
81
|
-
*
|
|
82
|
-
* @deprecated prefer using `globs` or `regexps` instead
|
|
46
|
+
* Glob matching is always case-insensitive.
|
|
47
|
+
* If you need case-sensitive matching, use a `RegExp`.
|
|
83
48
|
*/
|
|
84
|
-
|
|
49
|
+
exclude?: readonly UrlPatternInput[];
|
|
85
50
|
/**
|
|
86
|
-
*
|
|
87
|
-
* to remove
|
|
88
|
-
* when you need to enqueue multiple `Requests` to the queue that share the same URL,
|
|
89
|
-
* or to dynamically update or create `userData`.
|
|
90
|
-
*
|
|
91
|
-
* For example: by adding `useExtendedUniqueKey: true` to the `request` object, `uniqueKey` will be computed from
|
|
92
|
-
* a combination of `url`, `method` and `payload` which enables crawling of websites that navigate using form submits
|
|
93
|
-
* (POST requests).
|
|
51
|
+
* After request options are filtered by `include`/`exclude` patterns,
|
|
52
|
+
* this function can be used to remove them or modify their contents such as `userData`, `payload` or, most importantly
|
|
53
|
+
* `uniqueKey`. This is useful when you need to enqueue multiple `Requests` to the queue that share the same URL,
|
|
54
|
+
* but differ in methods or payloads, or to dynamically update or create `userData`.
|
|
94
55
|
*
|
|
95
56
|
* **Example:**
|
|
96
57
|
* ```javascript
|
|
97
58
|
* {
|
|
98
59
|
* transformRequestFunction: (request) => {
|
|
99
60
|
* request.userData.foo = 'bar';
|
|
100
|
-
* request.useExtendedUniqueKey = true;
|
|
101
61
|
* return request;
|
|
102
62
|
* }
|
|
103
63
|
* }
|
|
104
64
|
* ```
|
|
65
|
+
*
|
|
66
|
+
* Note that `transformRequestFunction` has the highest priority and can overwrite
|
|
67
|
+
* the global `label` option.
|
|
68
|
+
*
|
|
69
|
+
* The function receives a {@link RequestOptions} object and can return either:
|
|
70
|
+
* - The modified {@link RequestOptions} object
|
|
71
|
+
* - `'unchanged'` to keep the original options as-is
|
|
72
|
+
* - A falsy value or `'skip'` to exclude the request from the queue
|
|
105
73
|
*/
|
|
106
74
|
transformRequestFunction?: RequestTransform;
|
|
107
75
|
/**
|
|
@@ -141,6 +109,12 @@ export interface EnqueueLinksByClickingElementsOptions {
|
|
|
141
109
|
* @default false
|
|
142
110
|
*/
|
|
143
111
|
skipNavigation?: boolean;
|
|
112
|
+
/**
|
|
113
|
+
* When a request is skipped for some reason, you can use this callback to act on it.
|
|
114
|
+
* This is fired for requests skipped because they don't match enqueueLinks filters
|
|
115
|
+
* or because they were removed by `transformRequestFunction`.
|
|
116
|
+
*/
|
|
117
|
+
onSkippedRequest?: SkippedRequestCallback;
|
|
144
118
|
}
|
|
145
119
|
/**
|
|
146
120
|
* The function finds elements matching a specific CSS selector in a Playwright page,
|
|
@@ -151,8 +125,7 @@ export interface EnqueueLinksByClickingElementsOptions {
|
|
|
151
125
|
* in `href` elements, but rather navigations are triggered in click handlers.
|
|
152
126
|
* If you're looking to find URLs in `href` attributes of the page, see {@link enqueueLinks}.
|
|
153
127
|
*
|
|
154
|
-
* Optionally, the function allows you to filter the target links' URLs using an array of
|
|
155
|
-
* and override settings of the enqueued {@link Request} objects.
|
|
128
|
+
* Optionally, the function allows you to filter the target links' URLs using an array of glob or regexp patterns.
|
|
156
129
|
*
|
|
157
130
|
* **IMPORTANT**: To be able to do this, this function uses various mutations on the page,
|
|
158
131
|
* such as changing the Z-index of elements being clicked and their visibility. Therefore,
|
|
@@ -172,11 +145,11 @@ export interface EnqueueLinksByClickingElementsOptions {
|
|
|
172
145
|
* ```javascript
|
|
173
146
|
* await playwrightUtils.enqueueLinksByClickingElements({
|
|
174
147
|
* page,
|
|
175
|
-
*
|
|
148
|
+
* requestManager,
|
|
176
149
|
* selector: 'a.product-detail',
|
|
177
|
-
*
|
|
178
|
-
* 'https://www.example.com/handbags
|
|
179
|
-
* 'https://www.example.com/purses
|
|
150
|
+
* include: [
|
|
151
|
+
* 'https://www.example.com/handbags/*',
|
|
152
|
+
* 'https://www.example.com/purses/*',
|
|
180
153
|
* ],
|
|
181
154
|
* });
|
|
182
155
|
* ```
|
|
@@ -210,4 +183,3 @@ export declare function clickElementsAndInterceptNavigationRequests(options: Cli
|
|
|
210
183
|
*/
|
|
211
184
|
export declare function clickElements(page: Page, selector: string, clickOptions?: ClickOptions): Promise<void>;
|
|
212
185
|
export {};
|
|
213
|
-
//# sourceMappingURL=click-elements.d.ts.map
|
|
@@ -1,9 +1,25 @@
|
|
|
1
1
|
import { URL } from 'node:url';
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
import
|
|
2
|
+
import { applyRequestTransform, constructUrlPatternObjects, createRequestOptions, createSkippedRequestArgs, filterRequestOptionsByPatterns, urlPatternSchema, Request as CrawleeRequest, serviceLocator, } from '@crawlee/browser';
|
|
3
|
+
import { parseArgument, schemas } from '@crawlee/utils/internal';
|
|
4
|
+
import { z } from 'zod';
|
|
5
5
|
const STARTING_Z_INDEX = 2147400000;
|
|
6
|
-
const
|
|
6
|
+
const getLog = () => serviceLocator.getChildLog('Playwright Click Elements');
|
|
7
|
+
const enqueueLinksByClickingElementsOptionsSchema = z.strictObject({
|
|
8
|
+
page: schemas.objectWithKeys(['goto', 'evaluate']),
|
|
9
|
+
requestManager: schemas.objectWithKeys(['fetchNextRequest', 'addRequestsBatched']),
|
|
10
|
+
selector: z.string(),
|
|
11
|
+
userData: schemas.anyObject.optional(),
|
|
12
|
+
clickOptions: schemas.anyObject.optional(),
|
|
13
|
+
include: schemas.arrayOf(urlPatternSchema, 'URL patterns').optional(),
|
|
14
|
+
exclude: schemas.arrayOf(urlPatternSchema, 'URL patterns').optional(),
|
|
15
|
+
transformRequestFunction: schemas.anyFunction.optional(),
|
|
16
|
+
waitForPageIdleSecs: schemas.anyNumber.default(1),
|
|
17
|
+
maxWaitForPageIdleSecs: schemas.anyNumber.default(5),
|
|
18
|
+
label: z.string().optional(),
|
|
19
|
+
forefront: z.boolean().optional(),
|
|
20
|
+
skipNavigation: z.boolean().optional(),
|
|
21
|
+
onSkippedRequest: schemas.anyFunction.optional(),
|
|
22
|
+
});
|
|
7
23
|
/**
|
|
8
24
|
* The function finds elements matching a specific CSS selector in a Playwright page,
|
|
9
25
|
* clicks all those elements using a mouse move and a left mouse button click and intercepts
|
|
@@ -13,8 +29,7 @@ const log = log_.child({ prefix: 'Playwright Click Elements' });
|
|
|
13
29
|
* in `href` elements, but rather navigations are triggered in click handlers.
|
|
14
30
|
* If you're looking to find URLs in `href` attributes of the page, see {@link enqueueLinks}.
|
|
15
31
|
*
|
|
16
|
-
* Optionally, the function allows you to filter the target links' URLs using an array of
|
|
17
|
-
* and override settings of the enqueued {@link Request} objects.
|
|
32
|
+
* Optionally, the function allows you to filter the target links' URLs using an array of glob or regexp patterns.
|
|
18
33
|
*
|
|
19
34
|
* **IMPORTANT**: To be able to do this, this function uses various mutations on the page,
|
|
20
35
|
* such as changing the Z-index of elements being clicked and their visibility. Therefore,
|
|
@@ -34,11 +49,11 @@ const log = log_.child({ prefix: 'Playwright Click Elements' });
|
|
|
34
49
|
* ```javascript
|
|
35
50
|
* await playwrightUtils.enqueueLinksByClickingElements({
|
|
36
51
|
* page,
|
|
37
|
-
*
|
|
52
|
+
* requestManager,
|
|
38
53
|
* selector: 'a.product-detail',
|
|
39
|
-
*
|
|
40
|
-
* 'https://www.example.com/handbags
|
|
41
|
-
* 'https://www.example.com/purses
|
|
54
|
+
* include: [
|
|
55
|
+
* 'https://www.example.com/handbags/*',
|
|
56
|
+
* 'https://www.example.com/purses/*',
|
|
42
57
|
* ],
|
|
43
58
|
* });
|
|
44
59
|
* ```
|
|
@@ -46,48 +61,13 @@ const log = log_.child({ prefix: 'Playwright Click Elements' });
|
|
|
46
61
|
* @returns Promise that resolves to {@link BatchAddRequestsResult} object.
|
|
47
62
|
*/
|
|
48
63
|
export async function enqueueLinksByClickingElements(options) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
requestQueue: ow.object.hasKeys('fetchNextRequest', 'addRequest'),
|
|
52
|
-
selector: ow.string,
|
|
53
|
-
userData: ow.optional.object,
|
|
54
|
-
clickOptions: ow.optional.object.hasKeys('clickCount', 'delay'),
|
|
55
|
-
pseudoUrls: ow.optional.array.ofType(ow.any(ow.string, ow.object.hasKeys('purl'))),
|
|
56
|
-
globs: ow.optional.array.ofType(ow.any(ow.string, ow.object.hasKeys('glob'))),
|
|
57
|
-
regexps: ow.optional.array.ofType(ow.any(ow.regExp, ow.object.hasKeys('regexp'))),
|
|
58
|
-
exclude: ow.optional.array.ofType(ow.any(ow.string, ow.regExp, ow.object.hasKeys('glob'), ow.object.hasKeys('regexp'))),
|
|
59
|
-
transformRequestFunction: ow.optional.function,
|
|
60
|
-
waitForPageIdleSecs: ow.optional.number,
|
|
61
|
-
maxWaitForPageIdleSecs: ow.optional.number,
|
|
62
|
-
label: ow.optional.string,
|
|
63
|
-
forefront: ow.optional.boolean,
|
|
64
|
-
skipNavigation: ow.optional.boolean,
|
|
65
|
-
}));
|
|
66
|
-
const { page, requestQueue, selector, clickOptions, pseudoUrls, globs, regexps, transformRequestFunction, waitForPageIdleSecs = 1, maxWaitForPageIdleSecs = 5, forefront, exclude, } = options;
|
|
64
|
+
const parsedOptions = parseArgument(options, enqueueLinksByClickingElementsOptionsSchema, 'EnqueueLinksByClickingElementsOptions');
|
|
65
|
+
const { page, requestManager, selector, clickOptions, include, exclude, transformRequestFunction, waitForPageIdleSecs, maxWaitForPageIdleSecs, forefront, onSkippedRequest, } = parsedOptions;
|
|
67
66
|
const waitForPageIdleMillis = waitForPageIdleSecs * 1000;
|
|
68
67
|
const maxWaitForPageIdleMillis = maxWaitForPageIdleSecs * 1000;
|
|
69
|
-
const
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
for (const excl of exclude) {
|
|
73
|
-
if (typeof excl === 'string' || 'glob' in excl) {
|
|
74
|
-
urlExcludePatternObjects.push(...constructGlobObjectsFromGlobs([excl]));
|
|
75
|
-
}
|
|
76
|
-
else if (excl instanceof RegExp || 'regexp' in excl) {
|
|
77
|
-
urlExcludePatternObjects.push(...constructRegExpObjectsFromRegExps([excl]));
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
if (pseudoUrls?.length) {
|
|
82
|
-
log.deprecated('`pseudoUrls` option is deprecated, use `globs` or `regexps` instead');
|
|
83
|
-
urlPatternObjects.push(...constructRegExpObjectsFromPseudoUrls(pseudoUrls));
|
|
84
|
-
}
|
|
85
|
-
if (globs?.length) {
|
|
86
|
-
urlPatternObjects.push(...constructGlobObjectsFromGlobs(globs));
|
|
87
|
-
}
|
|
88
|
-
if (regexps?.length) {
|
|
89
|
-
urlPatternObjects.push(...constructRegExpObjectsFromRegExps(regexps));
|
|
90
|
-
}
|
|
68
|
+
const hasOnSkippedRequest = onSkippedRequest !== undefined;
|
|
69
|
+
const urlExcludePatternObjects = exclude?.length ? constructUrlPatternObjects(exclude) : [];
|
|
70
|
+
const urlPatternObjects = include?.length ? constructUrlPatternObjects(include) : [];
|
|
91
71
|
const interceptedRequests = await clickElementsAndInterceptNavigationRequests({
|
|
92
72
|
page,
|
|
93
73
|
selector,
|
|
@@ -95,12 +75,21 @@ export async function enqueueLinksByClickingElements(options) {
|
|
|
95
75
|
maxWaitForPageIdleMillis,
|
|
96
76
|
clickOptions,
|
|
97
77
|
});
|
|
98
|
-
|
|
78
|
+
const requestOptions = createRequestOptions(interceptedRequests, parsedOptions);
|
|
79
|
+
const skippedByFilters = [];
|
|
80
|
+
let filteredOptions = filterRequestOptionsByPatterns(requestOptions, urlPatternObjects.length > 0 ? urlPatternObjects : undefined, urlExcludePatternObjects, undefined, hasOnSkippedRequest ? (opts) => skippedByFilters.push(opts) : undefined);
|
|
81
|
+
if (onSkippedRequest && skippedByFilters.length > 0) {
|
|
82
|
+
await Promise.all(skippedByFilters.map(async (opts) => onSkippedRequest(createSkippedRequestArgs(opts, 'filters'))));
|
|
83
|
+
}
|
|
99
84
|
if (transformRequestFunction) {
|
|
100
|
-
|
|
85
|
+
const skippedByTransform = [];
|
|
86
|
+
filteredOptions = applyRequestTransform(filteredOptions, transformRequestFunction, hasOnSkippedRequest ? (r) => skippedByTransform.push(r) : undefined);
|
|
87
|
+
if (onSkippedRequest && skippedByTransform.length > 0) {
|
|
88
|
+
await Promise.all(skippedByTransform.map(async (r) => onSkippedRequest(createSkippedRequestArgs(r, 'transform'))));
|
|
89
|
+
}
|
|
101
90
|
}
|
|
102
|
-
const requests =
|
|
103
|
-
const { addedRequests } = await
|
|
91
|
+
const requests = filteredOptions.map((opts) => new CrawleeRequest(opts));
|
|
92
|
+
const { addedRequests } = await requestManager.addRequestsBatched(requests, { forefront });
|
|
104
93
|
return { processedRequests: addedRequests, unprocessedRequests: [] };
|
|
105
94
|
}
|
|
106
95
|
/**
|
|
@@ -126,7 +115,7 @@ export async function clickElementsAndInterceptNavigationRequests(options) {
|
|
|
126
115
|
await restoreHistoryNavigationAndSaveCapturedUrls(page, uniqueRequests);
|
|
127
116
|
// browser.off(BrowserEmittedEvents.TargetCreated, onTargetCreated);
|
|
128
117
|
page.off('framenavigated', onFrameNavigated);
|
|
129
|
-
await context.unroute('
|
|
118
|
+
await context.unroute('**', onInterceptedRequest);
|
|
130
119
|
const serializedRequests = Array.from(uniqueRequests);
|
|
131
120
|
return serializedRequests.map((r) => JSON.parse(r));
|
|
132
121
|
}
|
|
@@ -162,7 +151,9 @@ function createTargetCreatedHandler(requests) {
|
|
|
162
151
|
await popup.close();
|
|
163
152
|
}
|
|
164
153
|
catch (err) {
|
|
165
|
-
|
|
154
|
+
getLog().debug('enqueueLinksByClickingElements: Could not close spawned page.', {
|
|
155
|
+
error: err.stack,
|
|
156
|
+
});
|
|
166
157
|
}
|
|
167
158
|
};
|
|
168
159
|
}
|
|
@@ -170,7 +161,16 @@ function createTargetCreatedHandler(requests) {
|
|
|
170
161
|
* @ignore
|
|
171
162
|
*/
|
|
172
163
|
function isTopFrameNavigationRequest(page, req) {
|
|
173
|
-
|
|
164
|
+
try {
|
|
165
|
+
return req.isNavigationRequest() && req.frame() === page.mainFrame();
|
|
166
|
+
}
|
|
167
|
+
catch {
|
|
168
|
+
// `req.frame()` throws when the owning frame is unavailable - e.g. the request was
|
|
169
|
+
// issued by a service worker, or before/after its frame existed (see #3216). Such a
|
|
170
|
+
// request is not a top-frame navigation, so swallow the throw and let it pass through
|
|
171
|
+
// instead of crashing the route handler (which would leave the route unhandled).
|
|
172
|
+
return false;
|
|
173
|
+
}
|
|
174
174
|
}
|
|
175
175
|
/**
|
|
176
176
|
* @ignore
|
|
@@ -235,7 +235,7 @@ function updateElementCssToEnableMouseClick(el, zIndex) {
|
|
|
235
235
|
*/
|
|
236
236
|
export async function clickElements(page, selector, clickOptions) {
|
|
237
237
|
const elementHandles = await page.$$(selector);
|
|
238
|
-
|
|
238
|
+
getLog().debug(`enqueueLinksByClickingElements: There are ${elementHandles.length} elements to click.`);
|
|
239
239
|
let clickedElementsCount = 0;
|
|
240
240
|
let zIndex = STARTING_Z_INDEX;
|
|
241
241
|
let shouldLogWarning = true;
|
|
@@ -248,15 +248,15 @@ export async function clickElements(page, selector, clickOptions) {
|
|
|
248
248
|
catch (err) {
|
|
249
249
|
const e = err;
|
|
250
250
|
if (shouldLogWarning && e.stack.includes('is detached from document')) {
|
|
251
|
-
|
|
251
|
+
getLog().warning(`An element with selector ${selector} that you're trying to click has been removed from the page. ` +
|
|
252
252
|
'This was probably caused by an earlier click which triggered some JavaScript on the page that caused it to change. ' +
|
|
253
253
|
'If you\'re trying to enqueue pagination links, we suggest using the "next" button, if available and going one by one.');
|
|
254
254
|
shouldLogWarning = false;
|
|
255
255
|
}
|
|
256
|
-
|
|
256
|
+
getLog().debug('enqueueLinksByClickingElements: Click failed.', { stack: e.stack });
|
|
257
257
|
}
|
|
258
258
|
}
|
|
259
|
-
|
|
259
|
+
getLog().debug(`enqueueLinksByClickingElements: Successfully clicked ${clickedElementsCount} elements out of ${elementHandles.length}`);
|
|
260
260
|
}
|
|
261
261
|
/**
|
|
262
262
|
* This function tracks whether any requests, frame navigations or targets were emitted
|
|
@@ -275,8 +275,6 @@ export async function clickElements(page, selector, clickOptions) {
|
|
|
275
275
|
async function waitForPageIdle({ page, waitForPageIdleMillis, maxWaitForPageIdleMillis, }) {
|
|
276
276
|
return new Promise((resolve) => {
|
|
277
277
|
let timeout;
|
|
278
|
-
let maxTimeout;
|
|
279
|
-
page.on('popup', activityHandler);
|
|
280
278
|
function activityHandler() {
|
|
281
279
|
clearTimeout(timeout);
|
|
282
280
|
timeout = setTimeout(() => {
|
|
@@ -285,7 +283,7 @@ async function waitForPageIdle({ page, waitForPageIdleMillis, maxWaitForPageIdle
|
|
|
285
283
|
}, waitForPageIdleMillis);
|
|
286
284
|
}
|
|
287
285
|
function maxTimeoutHandler() {
|
|
288
|
-
|
|
286
|
+
getLog().debug(`enqueueLinksByClickingElements: Page still showed activity after ${maxWaitForPageIdleMillis}ms. ` +
|
|
289
287
|
'This is probably due to the website itself dispatching requests, but some links may also have been missed.');
|
|
290
288
|
finish();
|
|
291
289
|
}
|
|
@@ -293,7 +291,8 @@ async function waitForPageIdle({ page, waitForPageIdleMillis, maxWaitForPageIdle
|
|
|
293
291
|
page.off('request', activityHandler).off('framenavigated', activityHandler).off('popup', activityHandler);
|
|
294
292
|
resolve();
|
|
295
293
|
}
|
|
296
|
-
maxTimeout = setTimeout(maxTimeoutHandler, maxWaitForPageIdleMillis);
|
|
294
|
+
const maxTimeout = setTimeout(maxTimeoutHandler, maxWaitForPageIdleMillis);
|
|
295
|
+
page.on('popup', activityHandler);
|
|
297
296
|
activityHandler(); // We call this once manually in case there would be no requests at all.
|
|
298
297
|
page.on('request', activityHandler);
|
|
299
298
|
page.on('framenavigated', activityHandler);
|
|
@@ -316,8 +315,7 @@ async function restoreHistoryNavigationAndSaveCapturedUrls(page, requests) {
|
|
|
316
315
|
requests.add(JSON.stringify({ url }));
|
|
317
316
|
}
|
|
318
317
|
catch (err) {
|
|
319
|
-
|
|
318
|
+
getLog().debug('enqueueLinksByClickingElements: Failed to ', { error: err.stack });
|
|
320
319
|
}
|
|
321
320
|
});
|
|
322
321
|
}
|
|
323
|
-
//# sourceMappingURL=click-elements.js.map
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import type { Configuration } from '@crawlee/browser';
|
|
2
|
+
import type { BrowserPool, BrowserPoolHooks, BrowserPoolOptions, PlaywrightPlugin, RemoteBrowserPool, RemoteBrowserPoolOptions } from '@crawlee/browser-pool';
|
|
3
|
+
// @ts-ignore optional peer dependency or compatibility with es2022
|
|
4
|
+
import type { Page } from 'playwright';
|
|
5
|
+
import type { PlaywrightLaunchContext } from './playwright-launcher.js';
|
|
6
|
+
/** A {@link BrowserPool} of Playwright browsers, as built by {@link playwrightBrowserPool}. */
|
|
7
|
+
export type PlaywrightBrowserPool = BrowserPool<{
|
|
8
|
+
browserPlugins: [PlaywrightPlugin];
|
|
9
|
+
}, [PlaywrightPlugin]>;
|
|
10
|
+
export interface PlaywrightBrowserPoolOptions extends Omit<BrowserPoolOptions, 'browserPlugins'>, BrowserPoolHooks<ReturnType<PlaywrightPlugin['createController']>, ReturnType<PlaywrightPlugin['createLaunchContext']>, Page> {
|
|
11
|
+
/** How to launch the browser: which Playwright browser type, proxy, user data dir, ... */
|
|
12
|
+
launchContext?: PlaywrightLaunchContext;
|
|
13
|
+
/**
|
|
14
|
+
* Whether to run the browser in headless mode. Shorthand for `launchContext.launchOptions.headless`.
|
|
15
|
+
* Defaults to `true`, and can also be set via {@link Configuration}.
|
|
16
|
+
*/
|
|
17
|
+
headless?: boolean;
|
|
18
|
+
/** Configuration to read the browser defaults from. Defaults to the global configuration. */
|
|
19
|
+
configuration?: Configuration;
|
|
20
|
+
}
|
|
21
|
+
export interface RemotePlaywrightBrowserPoolOptions extends Pick<PlaywrightBrowserPoolOptions, 'launchContext' | 'headless' | 'configuration'>, Omit<RemoteBrowserPoolOptions, 'browserPlugins'> {
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Builds a {@link BrowserPool} of Playwright browsers to pass to a {@link PlaywrightCrawler} as its
|
|
25
|
+
* {@link BrowserCrawlerOptions.browserPool|`browserPool`}.
|
|
26
|
+
*
|
|
27
|
+
* It accepts every {@link BrowserPoolOptions|`BrowserPool` option} plus the crawler's own `launchContext` and
|
|
28
|
+
* `headless`, and derives the browser plugin from them - so a pool built here always matches the crawler it is
|
|
29
|
+
* given to, and configuring one never means assembling a {@link PlaywrightPlugin} by hand.
|
|
30
|
+
*
|
|
31
|
+
* **Example usage:**
|
|
32
|
+
*
|
|
33
|
+
* ```javascript
|
|
34
|
+
* const crawler = new PlaywrightCrawler({
|
|
35
|
+
* browserPool: playwrightBrowserPool({
|
|
36
|
+
* maxOpenPagesPerBrowser: 1,
|
|
37
|
+
* launchContext: { launcher: firefox },
|
|
38
|
+
* }),
|
|
39
|
+
* requestHandler: async ({ page }) => { ... },
|
|
40
|
+
* });
|
|
41
|
+
* ```
|
|
42
|
+
*
|
|
43
|
+
* The returned pool is *not* torn down by the crawler, which is what makes it shareable between crawlers.
|
|
44
|
+
*
|
|
45
|
+
* @category Browser management
|
|
46
|
+
*/
|
|
47
|
+
export declare function playwrightBrowserPool(options?: PlaywrightBrowserPoolOptions): PlaywrightBrowserPool;
|
|
48
|
+
/**
|
|
49
|
+
* The {@link RemoteBrowserPool} counterpart of {@link playwrightBrowserPool}: connects to a remote browser
|
|
50
|
+
* service (Browserbase, Browserless, Steel, ...) with a Playwright plugin derived from `launchContext`.
|
|
51
|
+
*
|
|
52
|
+
* A {@link PlaywrightCrawler} accepts the same connection details directly via
|
|
53
|
+
* {@link BrowserCrawlerOptions.remoteBrowser|`remoteBrowser`}; reach for this factory when you also need to
|
|
54
|
+
* tune the wrapping pool, or to share one remote pool between crawlers.
|
|
55
|
+
*
|
|
56
|
+
* **Example usage:**
|
|
57
|
+
*
|
|
58
|
+
* ```javascript
|
|
59
|
+
* const crawler = new PlaywrightCrawler({
|
|
60
|
+
* browserPool: remotePlaywrightBrowserPool({
|
|
61
|
+
* endpoint: 'wss://production-sfo.browserless.io?token=xxx',
|
|
62
|
+
* maxOpenBrowsers: 2,
|
|
63
|
+
* browserPoolOptions: { useFingerprints: false },
|
|
64
|
+
* }),
|
|
65
|
+
* requestHandler: async ({ page }) => { ... },
|
|
66
|
+
* });
|
|
67
|
+
* ```
|
|
68
|
+
*
|
|
69
|
+
* @category Browser management
|
|
70
|
+
*/
|
|
71
|
+
export declare function remotePlaywrightBrowserPool(options: RemotePlaywrightBrowserPoolOptions): RemoteBrowserPool<Page>;
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { PlaywrightLauncher } from './playwright-launcher.js';
|
|
2
|
+
/**
|
|
3
|
+
* Builds a {@link BrowserPool} of Playwright browsers to pass to a {@link PlaywrightCrawler} as its
|
|
4
|
+
* {@link BrowserCrawlerOptions.browserPool|`browserPool`}.
|
|
5
|
+
*
|
|
6
|
+
* It accepts every {@link BrowserPoolOptions|`BrowserPool` option} plus the crawler's own `launchContext` and
|
|
7
|
+
* `headless`, and derives the browser plugin from them - so a pool built here always matches the crawler it is
|
|
8
|
+
* given to, and configuring one never means assembling a {@link PlaywrightPlugin} by hand.
|
|
9
|
+
*
|
|
10
|
+
* **Example usage:**
|
|
11
|
+
*
|
|
12
|
+
* ```javascript
|
|
13
|
+
* const crawler = new PlaywrightCrawler({
|
|
14
|
+
* browserPool: playwrightBrowserPool({
|
|
15
|
+
* maxOpenPagesPerBrowser: 1,
|
|
16
|
+
* launchContext: { launcher: firefox },
|
|
17
|
+
* }),
|
|
18
|
+
* requestHandler: async ({ page }) => { ... },
|
|
19
|
+
* });
|
|
20
|
+
* ```
|
|
21
|
+
*
|
|
22
|
+
* The returned pool is *not* torn down by the crawler, which is what makes it shareable between crawlers.
|
|
23
|
+
*
|
|
24
|
+
* @category Browser management
|
|
25
|
+
*/
|
|
26
|
+
export function playwrightBrowserPool(options = {}) {
|
|
27
|
+
const { launchContext, headless, configuration, ...poolOptions } = options;
|
|
28
|
+
return playwrightLauncher(launchContext, headless, configuration).createBrowserPool(poolOptions);
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* The {@link RemoteBrowserPool} counterpart of {@link playwrightBrowserPool}: connects to a remote browser
|
|
32
|
+
* service (Browserbase, Browserless, Steel, ...) with a Playwright plugin derived from `launchContext`.
|
|
33
|
+
*
|
|
34
|
+
* A {@link PlaywrightCrawler} accepts the same connection details directly via
|
|
35
|
+
* {@link BrowserCrawlerOptions.remoteBrowser|`remoteBrowser`}; reach for this factory when you also need to
|
|
36
|
+
* tune the wrapping pool, or to share one remote pool between crawlers.
|
|
37
|
+
*
|
|
38
|
+
* **Example usage:**
|
|
39
|
+
*
|
|
40
|
+
* ```javascript
|
|
41
|
+
* const crawler = new PlaywrightCrawler({
|
|
42
|
+
* browserPool: remotePlaywrightBrowserPool({
|
|
43
|
+
* endpoint: 'wss://production-sfo.browserless.io?token=xxx',
|
|
44
|
+
* maxOpenBrowsers: 2,
|
|
45
|
+
* browserPoolOptions: { useFingerprints: false },
|
|
46
|
+
* }),
|
|
47
|
+
* requestHandler: async ({ page }) => { ... },
|
|
48
|
+
* });
|
|
49
|
+
* ```
|
|
50
|
+
*
|
|
51
|
+
* @category Browser management
|
|
52
|
+
*/
|
|
53
|
+
export function remotePlaywrightBrowserPool(options) {
|
|
54
|
+
const { launchContext, headless, configuration, ...remoteOptions } = options;
|
|
55
|
+
return playwrightLauncher(launchContext, headless, configuration).createRemoteBrowserPool(remoteOptions);
|
|
56
|
+
}
|
|
57
|
+
function playwrightLauncher(launchContext = {}, headless, configuration) {
|
|
58
|
+
return new PlaywrightLauncher(headless == null
|
|
59
|
+
? launchContext
|
|
60
|
+
: { ...launchContext, launchOptions: { ...launchContext.launchOptions, headless } }, configuration);
|
|
61
|
+
}
|