@crawlee/browser 4.0.0-beta.20 → 4.0.0-beta.200

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.
@@ -1,8 +1,21 @@
1
- import { BasicCrawler, BLOCKED_STATUS_CODES as DEFAULT_BLOCKED_STATUS_CODES, Configuration, ContextPipeline, cookieStringToToughCookie, enqueueLinks, EVENT_SESSION_RETIRED, handleRequestTimeout, RequestState, resolveBaseUrlForEnqueueLinksFiltering, SessionError, tryAbsoluteURL, validators, } from '@crawlee/basic';
2
- import { BrowserPool } from '@crawlee/browser-pool';
3
- import { CLOUDFLARE_RETRY_CSS_SELECTORS, RETRY_CSS_SELECTORS, sleep } from '@crawlee/utils';
4
- import ow from 'ow';
5
- import { tryCancel } from '@apify/timeout';
1
+ import { BasicCrawler, browserPoolCookieToToughCookie, ContextPipeline, cookieStringToToughCookie, EnqueueStrategy, NavigationSkippedError, OwnedOrInjected, remainingNavigationWindowMillis, RequestState, RequestThrottledError, resolveBaseUrlForEnqueueLinksFiltering, SessionError, toughCookieToBrowserPoolCookie, validators, } from '@crawlee/basic';
2
+ import { assertBrowserPoolNotConfigured, CLOUDFLARE_RETRY_CSS_SELECTORS, parseArgument, RETRY_CSS_SELECTORS, schemas, tryAbsoluteURL, } from '@crawlee/utils/internal';
3
+ import { sleep } from '@crawlee/utils';
4
+ import { z } from 'zod';
5
+ import { addTimeoutToPromise, TimeoutError, tryCancel } from '@apify/timeout';
6
+ const COOKIES_BEFORE_HOOKS = Symbol('cookiesBeforeHooks');
7
+ const readContextField = (ctx, key) => ctx[key];
8
+ /**
9
+ * Whether an error thrown by `page.goto()` is a navigation timeout - either our own {@link TimeoutError}
10
+ * or the driver's, which Playwright/Puppeteer report with their own class and a `Timeout ... exceeded` message
11
+ * naming the raw millisecond value rather than the configured window.
12
+ */
13
+ function isNavigationTimeoutError(error) {
14
+ return (error instanceof TimeoutError ||
15
+ error?.name === 'TimeoutError' ||
16
+ error?.constructor?.name === 'TimeoutError' ||
17
+ /timeout.*exceeded/i.test(error?.message ?? ''));
18
+ }
6
19
  /**
7
20
  * Provides a simple framework for parallel crawling of web pages
8
21
  * using headless browsers with [Puppeteer](https://github.com/puppeteer/puppeteer)
@@ -15,118 +28,126 @@ import { tryCancel } from '@apify/timeout';
15
28
  * If the target website doesn't need JavaScript, we should consider using the {@link CheerioCrawler},
16
29
  * which downloads the pages using raw HTTP requests and is about 10x faster.
17
30
  *
18
- * The source URLs are represented by the {@link Request} objects that are fed from the {@link RequestList} or {@link RequestQueue} instances
19
- * provided by the {@link BrowserCrawlerOptions.requestList|`requestList`} or {@link BrowserCrawlerOptions.requestQueue|`requestQueue`}
20
- * constructor options, respectively. If neither `requestList` nor `requestQueue` options are provided,
31
+ * The source URLs are represented by the {@link Request} objects that are fed from the
32
+ * {@link IRequestManager|request manager} provided via the {@link BrowserCrawlerOptions.requestManager|`requestManager`}
33
+ * constructor option (a {@link RequestQueue} is itself a request manager). If no `requestManager` is provided,
21
34
  * the crawler will open the default request queue either when the {@link BrowserCrawler.addRequests|`crawler.addRequests()`} function is called,
22
35
  * or if `requests` parameter (representing the initial requests) of the {@link BrowserCrawler.run|`crawler.run()`} function is provided.
23
36
  *
24
- * If both {@link BrowserCrawlerOptions.requestList|`requestList`} and {@link BrowserCrawlerOptions.requestQueue|`requestQueue`} options are used,
25
- * the instance first processes URLs from the {@link RequestList} and automatically enqueues all of them
26
- * to the {@link RequestQueue} before it starts their processing. This ensures that a single URL is not crawled multiple times.
37
+ * To read from a read-only source such as a {@link RequestList} while still being able to enqueue new requests,
38
+ * combine it with a queue into a {@link RequestManagerTandem} via {@link IRequestLoader.toTandem|`requestLoader.toTandem()`}
39
+ * and pass the result as `requestManager`.
40
+ *
41
+ * > The {@link BrowserCrawlerOptions.requestList|`requestList`} and {@link BrowserCrawlerOptions.requestQueue|`requestQueue`}
42
+ * > options are deprecated; they are still accepted and folded into a single `requestManager` for back-compat.
27
43
  *
28
44
  * The crawler finishes when there are no more {@link Request} objects to crawl.
29
45
  *
30
46
  * `BrowserCrawler` opens a new browser page (i.e. tab or window) for each {@link Request} object to crawl
31
47
  * and then calls the function provided by user as the {@link BrowserCrawlerOptions.requestHandler|`requestHandler`} option.
32
48
  *
33
- * New pages are only opened when there is enough free CPU and memory available,
34
- * using the functionality provided by the {@link AutoscaledPool} class.
35
- * All {@link AutoscaledPool} configuration options can be passed to the {@link BrowserCrawlerOptions.autoscaledPoolOptions|`autoscaledPoolOptions`}
36
- * parameter of the `BrowserCrawler` constructor.
37
- * For user convenience, the {@link AutoscaledPoolOptions.minConcurrency|`minConcurrency`} and
38
- * {@link AutoscaledPoolOptions.maxConcurrency|`maxConcurrency`} options of the
39
- * underlying {@link AutoscaledPool} constructor are available directly in the `BrowserCrawler` constructor.
49
+ * New pages are only opened when there is enough free CPU and memory available, as judged by the crawler's
50
+ * {@link ConcurrencySystem}.
51
+ * Concurrency is tuned via the `minConcurrency`, `maxConcurrency` and `maxRequestsPerMinute` options of the
52
+ * `BrowserCrawler` constructor, or, for finer control, by injecting a pre-configured
53
+ * {@link ConcurrencySystem|`concurrencySystem`}.
40
54
  *
41
55
  * > *NOTE:* the pool of browser instances is internally managed by the {@link BrowserPool} class.
42
56
  *
43
57
  * @category Crawlers
44
58
  */
45
59
  export class BrowserCrawler extends BasicCrawler {
46
- config;
60
+ /** Backs the {@link BrowserCrawler.browserPool|`browserPool`} getter. */
61
+ #browserPoolDep;
47
62
  /**
48
- * A reference to the underlying {@link BrowserPool} class that manages the crawler's browsers.
63
+ * A reference to the underlying browser pool that manages the crawler's browsers. Typed as
64
+ * {@link IBrowserPool} so custom implementations can be plugged in via the `browserPool` constructor option.
49
65
  */
50
- browserPool;
51
- launchContext;
66
+ get browserPool() {
67
+ return this.#browserPoolDep.value;
68
+ }
52
69
  ignoreShadowRoots;
53
70
  ignoreIframes;
54
- navigationTimeoutMillis;
55
- preNavigationHooks;
56
- postNavigationHooks;
57
- persistCookiesPerSession;
71
+ #navigationTimeoutMillis;
72
+ #preNavigationHooks;
73
+ #postNavigationHooks;
74
+ #saveResponseCookies;
75
+ /**
76
+ * @internal
77
+ */
58
78
  static optionsShape = {
59
79
  ...BasicCrawler.optionsShape,
60
- navigationTimeoutSecs: ow.optional.number.greaterThan(0),
61
- preNavigationHooks: ow.optional.array,
62
- postNavigationHooks: ow.optional.array,
63
- launchContext: ow.optional.object,
64
- headless: ow.optional.any(ow.boolean, ow.string),
65
- browserPoolOptions: ow.object,
66
- sessionPoolOptions: ow.optional.object,
67
- persistCookiesPerSession: ow.optional.boolean,
68
- useSessionPool: ow.optional.boolean,
69
- proxyConfiguration: ow.optional.object.validate(validators.proxyConfiguration),
80
+ navigationTimeoutSecs: schemas.anyNumber
81
+ .refine((value) => value > 0, 'Expected a number greater than 0')
82
+ .default(60),
83
+ preNavigationHooks: schemas.anyArray.default(() => []),
84
+ postNavigationHooks: schemas.anyArray.default(() => []),
85
+ browserPool: validators.browserPool.optional(),
86
+ browserPoolBuilder: schemas.anyFunction.optional(),
87
+ remoteBrowser: schemas.anyObject.optional(),
88
+ saveResponseCookies: z.boolean().default(true),
89
+ proxyConfiguration: validators.proxyConfiguration.optional(),
90
+ ignoreIframes: z.boolean().default(false),
91
+ ignoreShadowRoots: z.boolean().default(false),
70
92
  };
93
+ /** @internal */
94
+ static optionsSchema = z.strictObject(BrowserCrawler.optionsShape);
71
95
  /**
72
96
  * All `BrowserCrawler` parameters are passed via an options object.
97
+ * @internal
73
98
  */
74
- constructor(options, config = Configuration.getGlobalConfig()) {
75
- ow(options, 'BrowserCrawlerOptions', ow.object.exactShape(BrowserCrawler.optionsShape));
76
- const { navigationTimeoutSecs = 60, persistCookiesPerSession, launchContext = {}, browserPoolOptions, preNavigationHooks = [], postNavigationHooks = [], headless, ignoreIframes = false, ignoreShadowRoots = false, contextPipelineBuilder, extendContext, proxyConfiguration, ...basicCrawlerOptions } = options;
99
+ constructor(options) {
100
+ const { navigationTimeoutSecs, saveResponseCookies, browserPool, remoteBrowser, preNavigationHooks, postNavigationHooks, ignoreIframes, ignoreShadowRoots, contextPipelineBuilder, browserPoolBuilder, extendContext, ...basicCrawlerOptions } = parseArgument(options, BrowserCrawler.optionsSchema, 'BrowserCrawlerOptions');
101
+ if (browserPool) {
102
+ assertBrowserPoolNotConfigured(new.target.name, { remoteBrowser });
103
+ }
104
+ const skipGuard = (action) => async (ctx) => ctx.request.skipNavigation ? {} : ((await action(ctx)) ?? {});
77
105
  super({
78
106
  ...basicCrawlerOptions,
79
- contextPipelineBuilder: () => contextPipelineBuilder()
80
- .compose({ action: this.performNavigation.bind(this) })
81
- .compose({ action: this.handleBlockedRequestByContent.bind(this) })
82
- .compose({ action: this.restoreRequestState.bind(this) }),
83
- extendContext: extendContext,
84
- }, config);
85
- this.config = config;
86
- // Cookies should be persisted per session only if session pool is used
87
- if (!this.useSessionPool && persistCookiesPerSession) {
88
- throw new Error('You cannot use "persistCookiesPerSession" without "useSessionPool" set to true.');
89
- }
90
- this.launchContext = launchContext;
91
- this.navigationTimeoutMillis = navigationTimeoutSecs * 1000;
92
- this.proxyConfiguration = proxyConfiguration;
93
- this.preNavigationHooks = preNavigationHooks;
94
- this.postNavigationHooks = postNavigationHooks;
107
+ contextPipelineBuilder: () => {
108
+ // A single navigation window covers the pre-navigation hooks, the navigation, and the
109
+ // post-navigation hooks: the whole phase shares one `navigationTimeoutSecs` budget, so a slow
110
+ // hook eats into the same window the navigation uses. The navigation itself is bounded by
111
+ // capping its `gotoOptions.timeout` to the remaining budget.
112
+ const windowGuard = (step) => skipGuard(async (ctx) => {
113
+ const remaining = remainingNavigationWindowMillis(ctx, this.#navigationTimeoutMillis);
114
+ if (remaining <= 0) {
115
+ throw new TimeoutError(`Navigation timed out after ${this.#navigationTimeoutMillis / 1000} seconds.`);
116
+ }
117
+ return addTimeoutToPromise(async () => step(ctx), remaining, `Navigation timed out after ${this.#navigationTimeoutMillis / 1000} seconds.`);
118
+ });
119
+ let pipeline = contextPipelineBuilder().compose(this.prepareNavigation.bind(this));
120
+ for (const hook of this.#preNavigationHooks) {
121
+ pipeline = pipeline.compose(windowGuard(hook));
122
+ }
123
+ pipeline = pipeline.compose(skipGuard(this.navigate.bind(this)));
124
+ for (const hook of this.#postNavigationHooks) {
125
+ pipeline = pipeline.compose(windowGuard(hook));
126
+ }
127
+ return pipeline
128
+ .compose(skipGuard(this.finalizeNavigation.bind(this)))
129
+ .compose(this.handleBlockedRequestByContent.bind(this))
130
+ .compose(this.restoreRequestState.bind(this));
131
+ },
132
+ extendContext,
133
+ });
134
+ this.#navigationTimeoutMillis = navigationTimeoutSecs * 1000;
135
+ // The public option hooks are extension-aware; internal storage uses the base context type
136
+ // (the pipeline composes hooks against the concrete context, which does not statically carry
137
+ // `ContextExtension`). The extension members are present at runtime regardless.
138
+ this.#preNavigationHooks = preNavigationHooks;
139
+ this.#postNavigationHooks = postNavigationHooks;
95
140
  this.ignoreIframes = ignoreIframes;
96
141
  this.ignoreShadowRoots = ignoreShadowRoots;
97
- if (headless != null) {
98
- this.launchContext.launchOptions ??= {};
99
- this.launchContext.launchOptions.headless = headless;
100
- }
101
- if (this.useSessionPool) {
102
- this.persistCookiesPerSession = persistCookiesPerSession !== undefined ? persistCookiesPerSession : true;
103
- }
104
- else {
105
- this.persistCookiesPerSession = false;
106
- }
107
- if (launchContext?.userAgent) {
108
- if (browserPoolOptions.useFingerprints)
109
- this.log.info('Custom user agent provided, disabling automatic browser fingerprint injection!');
110
- browserPoolOptions.useFingerprints = false;
111
- }
112
- const { preLaunchHooks = [], postLaunchHooks = [], ...rest } = browserPoolOptions;
113
- this.browserPool = new BrowserPool({
114
- ...rest,
115
- preLaunchHooks: [this._extendLaunchContext.bind(this), ...preLaunchHooks],
116
- postLaunchHooks: [this._maybeAddSessionRetiredListener.bind(this), ...postLaunchHooks],
117
- });
142
+ this.#saveResponseCookies = saveResponseCookies;
143
+ this.#browserPoolDep = OwnedOrInjected.resolve(browserPool, () => browserPoolBuilder(remoteBrowser));
144
+ }
145
+ /** @internal */
146
+ getNavigationTimeoutMillis() {
147
+ return this.#navigationTimeoutMillis;
118
148
  }
119
149
  buildContextPipeline() {
120
- return ContextPipeline.create().compose({
121
- action: this.preparePage.bind(this),
122
- cleanup: async (context) => {
123
- context.registerDeferredCleanup(async () => {
124
- await context.page
125
- .close()
126
- .catch((error) => this.log.debug('Error while closing page', { error }));
127
- });
128
- },
129
- });
150
+ return ContextPipeline.create().compose(this.preparePage.bind(this));
130
151
  }
131
152
  async containsSelectors(page, selectors) {
132
153
  const foundSelectors = (await Promise.all(selectors.map((selector) => page.$(selector))))
@@ -137,12 +158,6 @@ export class BrowserCrawler extends BasicCrawler {
137
158
  }
138
159
  async isRequestBlocked(crawlingContext) {
139
160
  const { page, response } = crawlingContext;
140
- const blockedStatusCodes =
141
- // eslint-disable-next-line dot-notation
142
- (this.sessionPool?.['blockedStatusCodes'].length ?? 0) > 0
143
- ? // eslint-disable-next-line dot-notation
144
- this.sessionPool['blockedStatusCodes']
145
- : DEFAULT_BLOCKED_STATUS_CODES;
146
161
  // Cloudflare specific heuristic - wait 5 seconds if we get a 403 for the JS challenge to load / resolve.
147
162
  if ((await this.containsSelectors(page, CLOUDFLARE_RETRY_CSS_SELECTORS)) && response?.status() === 403) {
148
163
  await sleep(5000);
@@ -153,117 +168,173 @@ export class BrowserCrawler extends BasicCrawler {
153
168
  return `Cloudflare challenge failed, found selectors: ${foundSelectors.join(', ')}`;
154
169
  }
155
170
  const foundSelectors = await this.containsSelectors(page, RETRY_CSS_SELECTORS);
156
- const blockedStatusCode = blockedStatusCodes.find((x) => x === (response?.status() ?? 0));
171
+ const statusCode = response?.status() ?? 0;
157
172
  if (foundSelectors)
158
173
  return `Found selectors: ${foundSelectors.join(', ')}`;
159
- if (blockedStatusCode)
160
- return `Received blocked status code: ${blockedStatusCode}`;
174
+ if (this.blockedStatusCodes.has(statusCode))
175
+ return `Received blocked status code: ${statusCode}`;
161
176
  return false;
162
177
  }
163
- async preparePage(crawlingContext) {
164
- const newPageOptions = {
178
+ async preparePage(crawlingContext, onCleanup) {
179
+ const page = await this.browserPool.newPage({
165
180
  id: crawlingContext.id,
166
- };
167
- const useIncognitoPages = this.launchContext?.useIncognitoPages;
168
- if (crawlingContext.session?.proxyInfo) {
169
- const proxyInfo = crawlingContext.session.proxyInfo;
170
- crawlingContext.proxyInfo = proxyInfo;
171
- newPageOptions.proxyUrl = proxyInfo?.url;
172
- newPageOptions.proxyTier = proxyInfo?.proxyTier;
173
- if (proxyInfo?.ignoreTlsErrors) {
174
- /**
175
- * @see https://playwright.dev/docs/api/class-browser/#browser-new-context
176
- * @see https://github.com/puppeteer/puppeteer/blob/main/docs/api.md
177
- */
178
- newPageOptions.pageOptions = {
179
- ignoreHTTPSErrors: true,
180
- acceptInsecureCerts: true,
181
- };
182
- }
183
- }
184
- const page = (await this.browserPool.newPage(newPageOptions));
181
+ session: crawlingContext.session,
182
+ });
185
183
  tryCancel();
186
- const browserControllerInstance = this.browserPool.getBrowserControllerByPage(page);
187
- const contextEnqueueLinks = crawlingContext.enqueueLinks;
188
- const session = useIncognitoPages
189
- ? crawlingContext.session
190
- : browserControllerInstance.launchContext.session;
184
+ onCleanup(() => {
185
+ crawlingContext.registerDeferredCleanup(async () => {
186
+ const error = !crawlingContext.session.isUsable()
187
+ ? new SessionError('Session is no longer usable')
188
+ : undefined;
189
+ await this.browserPool
190
+ .closePage(page, { error })
191
+ .catch((closeError) => this.log.debug('Error while closing page', { error: closeError }));
192
+ });
193
+ });
194
+ const addRequests = crawlingContext.addRequests;
195
+ const extractLinks = async (options) => {
196
+ return extractUrlsFromPage(page, options?.selector ?? 'a', options?.baseUrl ?? crawlingContext.request.loadedUrl ?? crawlingContext.request.url);
197
+ };
191
198
  return {
192
199
  page,
193
200
  get response() {
194
201
  throw new Error("The `response` property is not available. This might mean that you're trying to access it before navigation or that navigation resulted in `null` (this should only happen with `about:` URLs)");
195
202
  },
196
- browserController: browserControllerInstance,
197
- session,
198
- proxyInfo: session?.proxyInfo,
199
- enqueueLinks: async (enqueueOptions = {}) => {
200
- return (await browserCrawlerEnqueueLinks({
201
- options: { ...enqueueOptions, limit: this.calculateEnqueuedRequestLimit(enqueueOptions?.limit) },
202
- page,
203
- requestQueue: await this.getRequestQueue(),
204
- robotsTxtFile: await this.getRobotsTxtFileForUrl(crawlingContext.request.url),
205
- onSkippedRequest: this.handleSkippedRequest,
206
- originalRequestUrl: crawlingContext.request.url,
203
+ get gotoOptions() {
204
+ throw new Error('The `gotoOptions` property is not available until `prepareNavigation` runs.');
205
+ },
206
+ extractLinks,
207
+ enqueueLinks: async (options = {}) => {
208
+ const baseUrl = resolveBaseUrlForEnqueueLinksFiltering({
209
+ enqueueStrategy: options.strategy,
207
210
  finalRequestUrl: crawlingContext.request.loadedUrl,
208
- enqueueLinks: contextEnqueueLinks,
209
- })); // TODO make this type safe
211
+ originalRequestUrl: crawlingContext.request.url,
212
+ userProvidedBaseUrl: options.baseUrl,
213
+ });
214
+ const urls = await extractLinks(options);
215
+ return addRequests(urls, {
216
+ ...options,
217
+ baseUrl,
218
+ strategy: options.strategy ?? EnqueueStrategy.SameHostname,
219
+ });
210
220
  },
211
221
  };
212
222
  }
213
- async performNavigation(crawlingContext) {
223
+ async prepareNavigation(crawlingContext) {
214
224
  if (crawlingContext.request.skipNavigation) {
215
225
  return {
216
226
  request: new Proxy(crawlingContext.request, {
217
227
  get(target, propertyName, receiver) {
218
228
  if (propertyName === 'loadedUrl') {
219
- throw new Error('The `request.loadedUrl` property is not available - `skipNavigation` was used');
229
+ throw new NavigationSkippedError('The `request.loadedUrl` property is not available - `skipNavigation` was used');
220
230
  }
221
231
  return Reflect.get(target, propertyName, receiver);
222
232
  },
223
233
  }),
224
234
  get response() {
225
- throw new Error('The `response` property is not available - `skipNavigation` was used');
235
+ throw new NavigationSkippedError('The `response` property is not available - `skipNavigation` was used');
226
236
  },
227
237
  };
228
238
  }
229
- const gotoOptions = { timeout: this.navigationTimeoutMillis };
230
- const preNavigationHooksCookies = this._getCookieHeaderFromRequest(crawlingContext.request);
231
239
  crawlingContext.request.state = RequestState.BEFORE_NAV;
232
- await this._executeHooks(this.preNavigationHooks, crawlingContext, gotoOptions);
240
+ return {
241
+ // Default to the full navigation timeout so a pre-navigation hook can read it; `navigate` narrows it
242
+ // to the remaining shared window unless a hook overrode it (see there).
243
+ gotoOptions: { timeout: this.#navigationTimeoutMillis },
244
+ [COOKIES_BEFORE_HOOKS]: this.getCookieHeaderFromRequest(crawlingContext.request),
245
+ };
246
+ }
247
+ // oxlint-disable-next-line crawlee/prefer-private-fields -- patched by @crawlee/otel
248
+ async navigate(crawlingContext) {
233
249
  tryCancel();
234
- const postNavigationHooksCookies = this._getCookieHeaderFromRequest(crawlingContext.request);
235
- await this._applyCookies(crawlingContext, preNavigationHooksCookies, postNavigationHooksCookies);
250
+ const gotoOptions = crawlingContext.gotoOptions;
251
+ const remaining = remainingNavigationWindowMillis(crawlingContext, this.#navigationTimeoutMillis);
252
+ if (remaining <= 0) {
253
+ throw new TimeoutError(`Navigation timed out after ${this.#navigationTimeoutMillis / 1000} seconds.`);
254
+ }
255
+ // If a hook left the default `navigationTimeoutMillis` in place, bound the goto to whatever is left of the
256
+ // shared navigation window. If it overrode the value - including `0`, Playwright's "no timeout" - honour
257
+ // that verbatim as the goto's own timeout. The driver enforces this natively (so a timed-out goto is
258
+ // aborted, not left lingering) and `handleNavigationTimeout` turns its error into our own message.
259
+ const gotoTimeout = gotoOptions;
260
+ if (gotoTimeout.timeout === this.#navigationTimeoutMillis) {
261
+ gotoTimeout.timeout = remaining;
262
+ }
263
+ const cookiesBeforeHooks = readContextField(crawlingContext, COOKIES_BEFORE_HOOKS);
264
+ const cookiesAfterHooks = this.getCookieHeaderFromRequest(crawlingContext.request);
265
+ await this.applyCookies(crawlingContext, cookiesBeforeHooks, cookiesAfterHooks);
236
266
  let response;
237
267
  try {
238
- response = (await this._navigationHandler(crawlingContext, gotoOptions)) ?? undefined;
268
+ response = (await this.navigationHandler(crawlingContext, gotoOptions)) ?? undefined;
239
269
  }
240
270
  catch (error) {
241
- await this._handleNavigationTimeout(crawlingContext, error);
271
+ await this.handleNavigationTimeout(crawlingContext, error);
242
272
  crawlingContext.request.state = RequestState.ERROR;
243
- this._throwIfProxyError(error);
273
+ this.throwIfProxyError(error);
244
274
  throw error;
245
275
  }
246
276
  tryCancel();
247
277
  crawlingContext.request.state = RequestState.AFTER_NAV;
248
- await this._executeHooks(this.postNavigationHooks, crawlingContext, gotoOptions);
278
+ return { response };
279
+ }
280
+ async finalizeNavigation(crawlingContext) {
281
+ tryCancel();
282
+ let response;
283
+ try {
284
+ response = crawlingContext.response;
285
+ }
286
+ catch {
287
+ // `preparePage` installs a throwing getter for `response`; reaching this branch means
288
+ // navigation produced no response and no hook overrode it. Treat as undefined.
289
+ }
249
290
  await this.processResponse(response, crawlingContext);
250
291
  tryCancel();
251
- // save cookies
252
- // TODO: Should we save the cookies also after/only the handle page?
253
- if (this.persistCookiesPerSession) {
254
- const cookies = await crawlingContext.browserController.getCookies(crawlingContext.page);
255
- tryCancel();
256
- crawlingContext.session?.setCookies(cookies, crawlingContext.request.loadedUrl);
292
+ // Persist cookies from the navigation response before the user handler runs.
293
+ // Cookies set during `requestHandler` are saved again afterwards.
294
+ await this.persistCookiesFromPage(crawlingContext);
295
+ return { request: crawlingContext.request };
296
+ }
297
+ /**
298
+ * Copies cookies from the live browser page into the session cookie jar.
299
+ */
300
+ async persistCookiesFromPage(crawlingContext) {
301
+ if (!this.#saveResponseCookies || !crawlingContext.session) {
302
+ return;
257
303
  }
258
- if (response !== undefined) {
259
- return {
260
- request: crawlingContext.request,
261
- response,
262
- };
304
+ const { cookies } = await this.browserPool.extractPageState(crawlingContext.page);
305
+ tryCancel();
306
+ // Prefer the live page URL — the handler may have navigated after the initial load.
307
+ const url = (await crawlingContext.page.url()) || crawlingContext.request.loadedUrl || crawlingContext.request.url;
308
+ for (const cookie of cookies) {
309
+ try {
310
+ await crawlingContext.session.cookieJar.setCookie(browserPoolCookieToToughCookie(cookie), url, {
311
+ ignoreError: false,
312
+ });
313
+ }
314
+ catch (e) {
315
+ this.log.debug(`Could not set cookie: ${e.message}`);
316
+ }
317
+ }
318
+ }
319
+ /**
320
+ * Runs the user request handler, then re-reads browser cookies so login flows /
321
+ * `page.setCookie` / XHR `Set-Cookie` updates are stored for later requests.
322
+ * @internal
323
+ */
324
+ async runRequestHandler(crawlingContext) {
325
+ try {
326
+ await super.runRequestHandler(crawlingContext);
327
+ }
328
+ finally {
329
+ if (!crawlingContext.request.skipNavigation) {
330
+ try {
331
+ await this.persistCookiesFromPage(crawlingContext);
332
+ }
333
+ catch {
334
+ // Page may already be closed on some failure paths; ignore.
335
+ }
336
+ }
263
337
  }
264
- return {
265
- request: crawlingContext.request,
266
- };
267
338
  }
268
339
  async handleBlockedRequestByContent(crawlingContext) {
269
340
  if (this.retryOnBlocked) {
@@ -277,41 +348,64 @@ export class BrowserCrawler extends BasicCrawler {
277
348
  crawlingContext.request.state = RequestState.REQUEST_HANDLER;
278
349
  return {};
279
350
  }
280
- async _applyCookies({ session, request, page, browserController }, preHooksCookies, postHooksCookies) {
281
- const sessionCookie = session?.getCookies(request.url) ?? [];
351
+ async applyCookies({ session, request, page }, preHooksCookies, postHooksCookies) {
352
+ const sessionCookie = session
353
+ ? (await session.cookieJar.getCookies(request.url)).map(toughCookieToBrowserPoolCookie)
354
+ : [];
282
355
  const parsedPreHooksCookies = preHooksCookies.split(/ *; */).map((c) => cookieStringToToughCookie(c));
283
356
  const parsedPostHooksCookies = postHooksCookies.split(/ *; */).map((c) => cookieStringToToughCookie(c));
284
- await browserController.setCookies(page, [...sessionCookie, ...parsedPreHooksCookies, ...parsedPostHooksCookies]
357
+ const cookies = [...sessionCookie, ...parsedPreHooksCookies, ...parsedPostHooksCookies]
285
358
  .filter((c) => typeof c !== 'undefined' && c !== null)
286
- .map((c) => ({ ...c, url: c.domain ? undefined : request.url })));
359
+ .map((c) => ({ ...c, url: c.domain ? undefined : request.url }));
360
+ await this.browserPool.injectPageState(page, { cookies });
287
361
  }
288
362
  /**
289
- * Marks session bad in case of navigation timeout.
363
+ * Marks session bad on navigation timeout, and stops in-flight page loading on any navigation error.
290
364
  */
291
- async _handleNavigationTimeout(crawlingContext, error) {
292
- const { session } = crawlingContext;
293
- if (error && error.constructor.name === 'TimeoutError') {
294
- handleRequestTimeout({ session, errorMessage: error.message });
365
+ async handleNavigationTimeout(crawlingContext, error) {
366
+ const { session, page } = crawlingContext;
367
+ // Fire-and-forget: no user code will run on this page after a failed navigation.
368
+ // Swallow rejections: the page may already be detached.
369
+ void page.evaluate(() => window.stop()).catch(() => { });
370
+ if (isNavigationTimeoutError(error)) {
371
+ session?.markBad();
372
+ // The driver was handed the remaining window (usually shorter than `navigationTimeoutSecs` once the
373
+ // hooks have run), so it names that value in its own error; report the configured window instead.
374
+ throw new TimeoutError(`Navigation timed out after ${this.#navigationTimeoutMillis / 1000} seconds.`);
295
375
  }
296
- await crawlingContext.page.close();
297
376
  }
298
377
  /**
299
378
  * Transforms proxy-related errors to `SessionError`.
300
379
  */
301
- _throwIfProxyError(error) {
380
+ throwIfProxyError(error) {
302
381
  if (this.isProxyError(error)) {
303
- throw new SessionError(this._getMessageFromError(error));
382
+ throw new SessionError(this.getMessageFromError(error));
304
383
  }
305
384
  }
306
385
  async processResponse(response, crawlingContext) {
307
386
  const { session, request, page } = crawlingContext;
308
387
  if (typeof response === 'object' && typeof response.status === 'function') {
309
388
  const status = response.status();
310
- this.stats.registerStatusCode(status);
389
+ this.statistics.registerStatusCode(status);
390
+ // Ahead of the error-status throw below: a 429 the user opted into treating as an error is still a
391
+ // rate limit the domain should back off from.
392
+ if (status === 429) {
393
+ // Both drivers lower-case header names and join duplicates, so a plain lookup is enough.
394
+ const retryAfter = response.headers?.()['retry-after'];
395
+ if (this.recordDomainRateLimit(crawlingContext.request.url, retryAfter)) {
396
+ throw new RequestThrottledError(`${crawlingContext.request.url} responded with 429.`);
397
+ }
398
+ }
399
+ if (this.isErrorStatusCode(status)) {
400
+ if (this.additionalHttpErrorStatusCodes.has(status)) {
401
+ throw new Error(`${status} - Error status code was set by user.`);
402
+ }
403
+ throw new Error(`${status} - Internal Server Error`);
404
+ }
311
405
  }
312
406
  if (this.sessionPool && response && session) {
313
407
  if (typeof response === 'object' && typeof response.status === 'function') {
314
- this._throwOnBlockedRequest(session, response.status());
408
+ this.throwOnBlockedRequest(response.status());
315
409
  }
316
410
  else {
317
411
  this.log.debug('Got a malformed Browser response.', { request, response });
@@ -319,83 +413,18 @@ export class BrowserCrawler extends BasicCrawler {
319
413
  }
320
414
  request.loadedUrl = await page.url();
321
415
  }
322
- async _extendLaunchContext(_pageId, launchContext) {
323
- const launchContextExtends = {};
324
- if (this.sessionPool) {
325
- launchContextExtends.session = await this.sessionPool.newSession({
326
- proxyInfo: await this.proxyConfiguration?.newProxyInfo({
327
- // cannot pass a request here, since session is created on browser launch
328
- }),
329
- });
330
- }
331
- if (!launchContext.proxyUrl && launchContextExtends.session?.proxyInfo) {
332
- const proxyInfo = launchContextExtends.session.proxyInfo;
333
- launchContext.proxyUrl = proxyInfo?.url;
334
- launchContextExtends.proxyInfo = proxyInfo;
335
- // Disable SSL verification for MITM proxies
336
- if (proxyInfo?.ignoreTlsErrors) {
337
- /**
338
- * @see https://playwright.dev/docs/api/class-browser/#browser-new-context
339
- * @see https://github.com/puppeteer/puppeteer/blob/main/docs/api.md
340
- */
341
- launchContext.launchOptions.ignoreHTTPSErrors = true;
342
- launchContext.launchOptions.acceptInsecureCerts = true;
343
- }
344
- }
345
- launchContext.extend(launchContextExtends);
346
- }
347
- _maybeAddSessionRetiredListener(_pageId, browserController) {
348
- if (this.sessionPool) {
349
- const listener = (session) => {
350
- const { launchContext } = browserController;
351
- if (session.id === launchContext.session.id) {
352
- this.browserPool.retireBrowserController(browserController);
353
- }
354
- };
355
- this.sessionPool.on(EVENT_SESSION_RETIRED, listener);
356
- browserController.on("browserClosed" /* BROWSER_CONTROLLER_EVENTS.BROWSER_CLOSED */, () => {
357
- return this.sessionPool.removeListener(EVENT_SESSION_RETIRED, listener);
358
- });
359
- }
360
- }
361
416
  /**
362
- * Function for cleaning up after all requests are processed.
363
- * @ignore
417
+ * Closes the browsers of a pool the crawler owns, so a finished run leaves none behind. The pool itself is
418
+ * crawler-lifetime and survives — destroying it here would hand a repeated `run()` a dead pool.
364
419
  */
365
420
  async teardown() {
366
- await this.browserPool.destroy();
421
+ await this.#browserPoolDep.ifOwned((pool) => pool.releaseAllBrowsers());
367
422
  await super.teardown();
368
423
  }
369
- }
370
- /** @internal */
371
- function containsEnqueueLinks(options) {
372
- return !!options.enqueueLinks;
373
- }
374
- /** @internal */
375
- export async function browserCrawlerEnqueueLinks(options) {
376
- const { options: enqueueLinksOptions, finalRequestUrl, originalRequestUrl, page } = options;
377
- const baseUrl = resolveBaseUrlForEnqueueLinksFiltering({
378
- enqueueStrategy: enqueueLinksOptions?.strategy,
379
- finalRequestUrl,
380
- originalRequestUrl,
381
- userProvidedBaseUrl: enqueueLinksOptions?.baseUrl,
382
- });
383
- const urls = await extractUrlsFromPage(page, enqueueLinksOptions?.selector ?? 'a', enqueueLinksOptions?.baseUrl ?? finalRequestUrl ?? originalRequestUrl);
384
- if (containsEnqueueLinks(options)) {
385
- return options.enqueueLinks({
386
- urls,
387
- baseUrl,
388
- ...enqueueLinksOptions,
389
- });
424
+ async destroy() {
425
+ await super.destroy();
426
+ await this.#browserPoolDep.ifOwned((pool) => pool.destroy());
390
427
  }
391
- return enqueueLinks({
392
- requestQueue: options.requestQueue,
393
- robotsTxtFile: options.robotsTxtFile,
394
- onSkippedRequest: options.onSkippedRequest,
395
- urls,
396
- baseUrl,
397
- ...enqueueLinksOptions,
398
- });
399
428
  }
400
429
  /**
401
430
  * Extracts URLs from a given page.
@@ -422,4 +451,3 @@ page, selector, baseUrl) {
422
451
  })
423
452
  .filter((href) => !!href);
424
453
  }
425
- //# sourceMappingURL=browser-crawler.js.map