apify 2.1.1-beta.2 → 2.1.1-beta.20

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.
Files changed (48) hide show
  1. package/README.md +1 -1
  2. package/build/actor.d.ts.map +1 -1
  3. package/build/actor.js +3 -2
  4. package/build/actor.js.map +1 -1
  5. package/build/apify.d.ts +1 -2
  6. package/build/apify.d.ts.map +1 -1
  7. package/build/apify.js +3 -2
  8. package/build/apify.js.map +1 -1
  9. package/build/browser_launchers/browser_launcher.d.ts.map +1 -1
  10. package/build/browser_launchers/browser_launcher.js.map +1 -1
  11. package/build/browser_launchers/playwright_launcher.d.ts +1 -2
  12. package/build/browser_launchers/playwright_launcher.d.ts.map +1 -1
  13. package/build/browser_launchers/playwright_launcher.js.map +1 -1
  14. package/build/browser_launchers/puppeteer_launcher.d.ts.map +1 -1
  15. package/build/browser_launchers/puppeteer_launcher.js.map +1 -1
  16. package/build/crawlers/basic_crawler.d.ts +8 -0
  17. package/build/crawlers/basic_crawler.d.ts.map +1 -1
  18. package/build/crawlers/basic_crawler.js +11 -1
  19. package/build/crawlers/basic_crawler.js.map +1 -1
  20. package/build/crawlers/browser_crawler.d.ts +11 -7
  21. package/build/crawlers/browser_crawler.d.ts.map +1 -1
  22. package/build/crawlers/browser_crawler.js +31 -7
  23. package/build/crawlers/browser_crawler.js.map +1 -1
  24. package/build/crawlers/cheerio_crawler.d.ts +2 -2
  25. package/build/crawlers/cheerio_crawler.d.ts.map +1 -1
  26. package/build/crawlers/cheerio_crawler.js +6 -4
  27. package/build/crawlers/cheerio_crawler.js.map +1 -1
  28. package/build/crawlers/crawler_utils.d.ts +3 -3
  29. package/build/crawlers/crawler_utils.d.ts.map +1 -1
  30. package/build/crawlers/crawler_utils.js +9 -6
  31. package/build/crawlers/crawler_utils.js.map +1 -1
  32. package/build/crawlers/playwright_crawler.d.ts +5 -6
  33. package/build/crawlers/playwright_crawler.js +1 -1
  34. package/build/crawlers/playwright_crawler.js.map +1 -1
  35. package/build/crawlers/puppeteer_crawler.d.ts +3 -3
  36. package/build/crawlers/puppeteer_crawler.js +1 -1
  37. package/build/crawlers/puppeteer_crawler.js.map +1 -1
  38. package/build/crawlers/statistics.d.ts +1 -1
  39. package/build/crawlers/statistics.d.ts.map +1 -1
  40. package/build/enqueue_links/enqueue_links.d.ts +1 -2
  41. package/build/main.d.ts +1 -2
  42. package/build/playwright_utils.d.ts +3 -5
  43. package/build/storages/dataset.d.ts +1 -1
  44. package/build/storages/dataset.d.ts.map +1 -1
  45. package/build/tsconfig.tsbuildinfo +1 -1
  46. package/build/utils.js +1 -1
  47. package/build/utils.js.map +1 -1
  48. package/package.json +11 -10
@@ -161,7 +161,7 @@ const CHEERIO_OPTIMIZED_AUTOSCALED_POOL_OPTIONS = {
161
161
  * If set to true, SSL certificate errors will be ignored.
162
162
  * @property {ProxyConfiguration} [proxyConfiguration]
163
163
  * If set, `CheerioCrawler` will be configured for all connections to use
164
- * [Apify Proxy](https://my.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
164
+ * [Apify Proxy](https://console.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
165
165
  * For more information, see the [documentation](https://docs.apify.com/proxy).
166
166
  * @property {HandleFailedRequest} [handleFailedRequestFunction]
167
167
  * A function to handle requests that failed more than `option.maxRequestRetries` times.
@@ -609,10 +609,12 @@ class CheerioCrawler extends basic_crawler_1.BasicCrawler {
609
609
  _applySessionCookie({ request, session }, requestAsBrowserOptions) {
610
610
  const userCookie = request.headers.Cookie ?? request.headers.cookie;
611
611
  const sessionCookie = session.getCookieString(request.url);
612
+ const mergedCookies = (0, crawler_utils_1.mergeCookies)(request.url, [sessionCookie, userCookie]);
612
613
  // merge cookies from all possible sources
613
- requestAsBrowserOptions.headers = {
614
- Cookie: (0, crawler_utils_1.mergeCookies)(request.url, [sessionCookie, userCookie]),
615
- };
614
+ if (mergedCookies) {
615
+ requestAsBrowserOptions.headers ?? (requestAsBrowserOptions.headers = {});
616
+ requestAsBrowserOptions.headers.Cookie = mergedCookies;
617
+ }
616
618
  }
617
619
  /**
618
620
  * Encodes and parses response according to the provided content type
@@ -1 +1 @@
1
- {"version":3,"file":"cheerio_crawler.js","sourceRoot":"","sources":["../../src/crawlers/cheerio_crawler.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cheerio_crawler.js","sourceRoot":"","sources":["../../src/crawlers/cheerio_crawler.js"],"names":[],"mappings":"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"}
@@ -24,11 +24,11 @@ export function throwOnBlockedRequest(session: Session, statusCode: number): voi
24
24
  export function mergeCookies(url: string, sourceCookies: string[]): string;
25
25
  /**
26
26
  * @param {string} url
27
- * @param {string} cookieString1
28
- * @param {string} cookieString2
27
+ * @param {string} [cookieString1='']
28
+ * @param {string} [cookieString2='']
29
29
  * @return {string}
30
30
  * @private
31
31
  */
32
- export function diffCookies(url: string, cookieString1: string, cookieString2: string): string;
32
+ export function diffCookies(url: string, cookieString1?: string | undefined, cookieString2?: string | undefined): string;
33
33
  import { Session } from "../session_pool/session";
34
34
  //# sourceMappingURL=crawler_utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"crawler_utils.d.ts","sourceRoot":"","sources":["../../src/crawlers/crawler_utils.js"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,8CAJW,OAAO,gBACP,MAAM,QAQhB;AAED;;;;;GAKG;AACH,+CAJW,OAAO,cACP,MAAM,QAShB;AAED;;;;;;;;GAQG;AACH,kCALW,MAAM,iBACN,MAAM,EAAE,GACP,MAAM,CAyBjB;AAED;;;;;;GAMG;AACH,iCANW,MAAM,iBACN,MAAM,iBACN,MAAM,GACL,MAAM,CAkBjB"}
1
+ {"version":3,"file":"crawler_utils.d.ts","sourceRoot":"","sources":["../../src/crawlers/crawler_utils.js"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,8CAJW,OAAO,gBACP,MAAM,QAQhB;AAED;;;;;GAKG;AACH,+CAJW,OAAO,cACP,MAAM,QAShB;AAED;;;;;;;;GAQG;AACH,kCALW,MAAM,iBACN,MAAM,EAAE,GACP,MAAM,CAyBjB;AAED;;;;;;GAMG;AACH,iCANW,MAAM,2EAGL,MAAM,CAsBjB"}
@@ -62,17 +62,20 @@ function mergeCookies(url, sourceCookies) {
62
62
  exports.mergeCookies = mergeCookies;
63
63
  /**
64
64
  * @param {string} url
65
- * @param {string} cookieString1
66
- * @param {string} cookieString2
65
+ * @param {string} [cookieString1='']
66
+ * @param {string} [cookieString2='']
67
67
  * @return {string}
68
68
  * @private
69
69
  */
70
- function diffCookies(url, cookieString1, cookieString2) {
71
- if (cookieString1 === cookieString2) {
70
+ function diffCookies(url, cookieString1 = '', cookieString2 = '') {
71
+ if (cookieString1 === cookieString2 || !cookieString2) {
72
72
  return '';
73
73
  }
74
- const cookies1 = cookieString1.split(/ *; */).map((cookie) => tough_cookie_1.Cookie.parse(cookie));
75
- const cookies2 = cookieString2.split(/ *; */).map((cookie) => tough_cookie_1.Cookie.parse(cookie));
74
+ if (!cookieString1) {
75
+ return cookieString2;
76
+ }
77
+ const cookies1 = cookieString1.split(/ *; */).filter((item) => Boolean(item)).map((cookie) => tough_cookie_1.Cookie.parse(cookie));
78
+ const cookies2 = cookieString2.split(/ *; */).filter((item) => Boolean(item)).map((cookie) => tough_cookie_1.Cookie.parse(cookie));
76
79
  const added = cookies2.filter((newCookie) => {
77
80
  return !cookies1.find((oldCookie) => newCookie.toString() === oldCookie.toString());
78
81
  });
@@ -1 +1 @@
1
- {"version":3,"file":"crawler_utils.js","sourceRoot":"","sources":["../../src/crawlers/crawler_utils.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"crawler_utils.js","sourceRoot":"","sources":["../../src/crawlers/crawler_utils.js"],"names":[],"mappings":"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"}
@@ -12,7 +12,7 @@ export type PlaywrightGotoOptions = {
12
12
  * - `'load'` - consider operation to be finished when the `load` event is fired.
13
13
  * - `'networkidle'` - consider operation to be finished when there are no network connections for at least `500` ms.
14
14
  */
15
- waitUntil?: "load" | "domcontentloaded" | "networkidle" | undefined;
15
+ waitUntil?: "domcontentloaded" | "load" | "networkidle" | undefined;
16
16
  /**
17
17
  * Referer header value. If provided it will take preference over the referer header value set by page.setExtraHTTPHeaders(headers).
18
18
  */
@@ -129,14 +129,14 @@ export type PlaywrightCrawlerOptions = {
129
129
  * Custom options passed to the underlying [`BrowserPool`](https://github.com/apify/browser-pool#BrowserPool) constructor.
130
130
  * You can tweak those to fine-tune browser management.
131
131
  */
132
- browserPoolOptions?: BrowserPoolOptions<import("browser-pool/dist/abstract-classes/browser-plugin").BrowserPlugin<import("browser-pool/dist/abstract-classes/browser-plugin").CommonLibrary, unknown, import("browser-pool/dist/abstract-classes/browser-plugin").CommonBrowser, unknown, import("browser-pool/dist/abstract-classes/browser-plugin").CommonPage>> | undefined;
132
+ browserPoolOptions?: BrowserPoolOptions<import("browser-pool").BrowserPlugin<import("browser-pool/dist/abstract-classes/browser-plugin").CommonLibrary, unknown, import("browser-pool/dist/abstract-classes/browser-plugin").CommonBrowser, unknown, import("browser-pool/dist/abstract-classes/browser-plugin").CommonPage>> | undefined;
133
133
  /**
134
134
  * Automatically saves cookies to Session. Works only if Session Pool is used.
135
135
  */
136
136
  persistCookiesPerSession?: boolean | undefined;
137
137
  /**
138
138
  * If set, `PlaywrightCrawler` will be configured for all connections to use
139
- * [Apify Proxy](https://my.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
139
+ * [Apify Proxy](https://console.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
140
140
  * For more information, see the [documentation](https://docs.apify.com/proxy).
141
141
  */
142
142
  proxyConfiguration?: ProxyConfiguration | undefined;
@@ -310,7 +310,7 @@ export type PlaywrightCrawlerOptions = {
310
310
  * Automatically saves cookies to Session. Works only if Session Pool is used.
311
311
  * @property {ProxyConfiguration} [proxyConfiguration]
312
312
  * If set, `PlaywrightCrawler` will be configured for all connections to use
313
- * [Apify Proxy](https://my.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
313
+ * [Apify Proxy](https://console.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
314
314
  * For more information, see the [documentation](https://docs.apify.com/proxy).
315
315
  * @property {RequestList} [requestList]
316
316
  * Static list of URLs to be processed.
@@ -433,8 +433,7 @@ declare class PlaywrightCrawler extends BrowserCrawler {
433
433
  constructor(options: PlaywrightCrawlerOptions);
434
434
  launchContext: PlaywrightLaunchContext;
435
435
  }
436
- // @ts-ignore optional peer dependency
437
- import { Page } from "playwright/types/types";
436
+ import { Page } from "playwright-core";
438
437
  import { BrowserCrawlingContext } from "./browser_crawler";
439
438
  import { CrawlingContext } from "./basic_crawler";
440
439
  import { HandleFailedRequest } from "./basic_crawler";
@@ -128,7 +128,7 @@ const playwright_utils_1 = require("../playwright_utils");
128
128
  * Automatically saves cookies to Session. Works only if Session Pool is used.
129
129
  * @property {ProxyConfiguration} [proxyConfiguration]
130
130
  * If set, `PlaywrightCrawler` will be configured for all connections to use
131
- * [Apify Proxy](https://my.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
131
+ * [Apify Proxy](https://console.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
132
132
  * For more information, see the [documentation](https://docs.apify.com/proxy).
133
133
  * @property {RequestList} [requestList]
134
134
  * Static list of URLs to be processed.
@@ -1 +1 @@
1
- {"version":3,"file":"playwright_crawler.js","sourceRoot":"","sources":["../../src/crawlers/playwright_crawler.js"],"names":[],"mappings":";;;AAAA,yDAAoB;AAKpB,kFAAuG;AACvG,qFAA2E;AAS3E,iFAAiF;AAEjF,0DAAmD;AAEnD;;;;;;;;;;;;;GAaG;AACH;;;;;GAKG;AACH;;;;GAIG;AACH;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0HG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmFG;AACH,MAAM,iBAAkB,SAAQ,yBAAc;IAY1C;;;OAGG;IACH,YAAY,OAAO;QACf,IAAA,YAAE,EAAC,OAAO,EAAE,0BAA0B,EAAE,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAC;QAE9F,MAAM,EACF,aAAa,GAAG,EAAE,EAClB,kBAAkB,GAAG,EAAE,EACvB,GAAG,qBAAqB,EAC3B,GAAG,OAAO,CAAC;QAEZ,IAAI,aAAa,CAAC,QAAQ,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,sFAAsF;kBAChG,iDAAiD,CAAC,CAAC;SAC5D;QACD,MAAM,kBAAkB,GAAG,IAAI,wCAAkB,CAAC,aAAa,CAAC,CAAC;QAEjE,kBAAkB,CAAC,cAAc,GAAG;YAChC,kBAAkB,CAAC,mBAAmB,EAAE;SAC3C,CAAC;QAEF,KAAK,CAAC;YACF,GAAG,qBAAqB;YACxB,kBAAkB;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,kBAAkB,CAAC,eAAe,EAAE,WAAW;QACjD,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,2GAA2G,CAAC,CAAC;YACjI,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;SAC1D;QACD,OAAO,IAAA,+BAAY,EAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACpF,CAAC;;AAvDD;;;GAGG;AACI;;;;WAAe;QAClB,GAAG,yBAAc,CAAC,YAAY;QAC9B,kBAAkB,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;QACtC,QAAQ,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;QAC5B,aAAa,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;KACpC;GAAA;AAiDL,kBAAe,iBAAiB,CAAC"}
1
+ {"version":3,"file":"playwright_crawler.js","sourceRoot":"","sources":["../../src/crawlers/playwright_crawler.js"],"names":[],"mappings":";;;AAAA,yDAAoB;AAKpB,kFAAuG;AACvG,qFAA2E;AAS3E,iFAAiF;AAEjF,0DAAmD;AAEnD;;;;;;;;;;;;;GAaG;AACH;;;;;GAKG;AACH;;;;GAIG;AACH;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0HG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmFG;AACH,MAAM,iBAAkB,SAAQ,yBAAc;IAY1C;;;OAGG;IACH,YAAY,OAAO;QACf,IAAA,YAAE,EAAC,OAAO,EAAE,0BAA0B,EAAE,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAC;QAE9F,MAAM,EACF,aAAa,GAAG,EAAE,EAClB,kBAAkB,GAAG,EAAE,EACvB,GAAG,qBAAqB,EAC3B,GAAG,OAAO,CAAC;QAEZ,IAAI,aAAa,CAAC,QAAQ,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,sFAAsF;kBAChG,iDAAiD,CAAC,CAAC;SAC5D;QACD,MAAM,kBAAkB,GAAG,IAAI,wCAAkB,CAAC,aAAa,CAAC,CAAC;QAEjE,kBAAkB,CAAC,cAAc,GAAG;YAChC,kBAAkB,CAAC,mBAAmB,EAAE;SAC3C,CAAC;QAEF,KAAK,CAAC;YACF,GAAG,qBAAqB;YACxB,kBAAkB;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,kBAAkB,CAAC,eAAe,EAAE,WAAW;QACjD,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,2GAA2G,CAAC,CAAC;YACjI,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;SAC1D;QACD,OAAO,IAAA,+BAAY,EAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACpF,CAAC;;AAvDD;;;GAGG;AACI;;;;WAAe;QAClB,GAAG,yBAAc,CAAC,YAAY;QAC9B,kBAAkB,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;QACtC,QAAQ,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;QAC5B,aAAa,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;KACpC;GAAC;AAiDN,kBAAe,iBAAiB,CAAC"}
@@ -85,14 +85,14 @@ export type PuppeteerCrawlerOptions = {
85
85
  * Custom options passed to the underlying [`BrowserPool`](https://github.com/apify/browser-pool#BrowserPool) constructor.
86
86
  * You can tweak those to fine-tune browser management.
87
87
  */
88
- browserPoolOptions?: BrowserPoolOptions<import("browser-pool/dist/abstract-classes/browser-plugin").BrowserPlugin<import("browser-pool/dist/abstract-classes/browser-plugin").CommonLibrary, unknown, import("browser-pool/dist/abstract-classes/browser-plugin").CommonBrowser, unknown, import("browser-pool/dist/abstract-classes/browser-plugin").CommonPage>> | undefined;
88
+ browserPoolOptions?: BrowserPoolOptions<import("browser-pool").BrowserPlugin<import("browser-pool/dist/abstract-classes/browser-plugin").CommonLibrary, unknown, import("browser-pool/dist/abstract-classes/browser-plugin").CommonBrowser, unknown, import("browser-pool/dist/abstract-classes/browser-plugin").CommonPage>> | undefined;
89
89
  /**
90
90
  * Automatically saves cookies to Session. Works only if Session Pool is used.
91
91
  */
92
92
  persistCookiesPerSession?: boolean | undefined;
93
93
  /**
94
94
  * If set, `PuppeteerCrawler` will be configured for all connections to use
95
- * [Apify Proxy](https://my.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
95
+ * [Apify Proxy](https://console.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
96
96
  * For more information, see the [documentation](https://docs.apify.com/proxy).
97
97
  */
98
98
  proxyConfiguration?: ProxyConfiguration | undefined;
@@ -259,7 +259,7 @@ export type PuppeteerCrawlerOptions = {
259
259
  * Automatically saves cookies to Session. Works only if Session Pool is used.
260
260
  * @property {ProxyConfiguration} [proxyConfiguration]
261
261
  * If set, `PuppeteerCrawler` will be configured for all connections to use
262
- * [Apify Proxy](https://my.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
262
+ * [Apify Proxy](https://console.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
263
263
  * For more information, see the [documentation](https://docs.apify.com/proxy).
264
264
  * @property {Array<PuppeteerHook>} [preNavigationHooks]
265
265
  * Async functions that are sequentially evaluated before the navigation. Good for setting additional cookies
@@ -92,7 +92,7 @@ const browser_crawler_1 = (0, tslib_1.__importDefault)(require("./browser_crawle
92
92
  * Automatically saves cookies to Session. Works only if Session Pool is used.
93
93
  * @property {ProxyConfiguration} [proxyConfiguration]
94
94
  * If set, `PuppeteerCrawler` will be configured for all connections to use
95
- * [Apify Proxy](https://my.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
95
+ * [Apify Proxy](https://console.apify.com/proxy) or your own Proxy URLs provided and rotated according to the configuration.
96
96
  * For more information, see the [documentation](https://docs.apify.com/proxy).
97
97
  * @property {Array<PuppeteerHook>} [preNavigationHooks]
98
98
  * Async functions that are sequentially evaluated before the navigation. Good for setting additional cookies
@@ -1 +1 @@
1
- {"version":3,"file":"puppeteer_crawler.js","sourceRoot":"","sources":["../../src/crawlers/puppeteer_crawler.js"],"names":[],"mappings":";;;AAAA,yDAAoB;AAEpB,wDAAkD;AAClD,8EAAuD;AAEvD,kFAAkF;AAClF,gFAAoG;AAEpG,qFAA2E;AAS3E,iFAAiF;AAEjF;;;;;GAKG;AACH;;;;GAIG;AACH;;;;GAIG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6HG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkFG;AACH,MAAM,gBAAiB,SAAQ,yBAAc;IAWzC;;;MAGE;IACF,YAAY,OAAO,GAAG,EAAE;QACpB,IAAA,YAAE,EAAC,OAAO,EAAE,yBAAyB,EAAE,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC;QAE5F,MAAM,EACF,aAAa,GAAG,EAAE,EAAE,qDAAqD;QACzE,kBAAkB,GAAG,EAAE,EACvB,kBAAkB,EAClB,GAAG,qBAAqB,EAC3B,GAAG,OAAO,CAAC;QAEZ,MAAM,EACF,OAAO,GAAG,KAAK,GAClB,GAAG,aAAa,CAAC;QAElB,IAAI,aAAa,CAAC,QAAQ,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,oFAAoF;kBAC9F,gDAAgD,CAAC,CAAC;SAC3D;QACD,MAAM,iBAAiB,GAAG,IAAI,sCAAiB,CAAC,aAAa,CAAC,CAAC;QAE/D,kBAAkB,CAAC,cAAc,GAAG;YAChC,iBAAiB,CAAC,mBAAmB,EAAE;SAC1C,CAAC;QAEF,KAAK,CAAC;YACF,GAAG,qBAAqB;YACxB,kBAAkB;YAClB,kBAAkB;SACrB,CAAC,CAAC;QAEH,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,EAAE;gBACtE,8EAA8E;gBAC9E,mDAAmD;gBACnD,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,GAAG,iBAAiB,CAAC,cAAc,CAAC;gBACjF,MAAM,IAAA,iBAAqB,EAAC,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;SACN;QAED,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,kBAAkB,CAAC,eAAe,EAAE,WAAW;QACjD,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,iHAAiH,CAAC,CAAC;YAEvI,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;SAC1D;QACD,OAAO,IAAA,8BAAY,EAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACpF,CAAC;;AAtED;;;GAGG;AACI;;;;WAAe;QAClB,GAAG,yBAAc,CAAC,YAAY;QAC9B,kBAAkB,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;QACtC,aAAa,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;KACpC;GAAA;AAiEL,kBAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"puppeteer_crawler.js","sourceRoot":"","sources":["../../src/crawlers/puppeteer_crawler.js"],"names":[],"mappings":";;;AAAA,yDAAoB;AAEpB,wDAAkD;AAClD,8EAAuD;AAEvD,kFAAkF;AAClF,gFAAoG;AAEpG,qFAA2E;AAS3E,iFAAiF;AAEjF;;;;;GAKG;AACH;;;;GAIG;AACH;;;;GAIG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6HG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkFG;AACH,MAAM,gBAAiB,SAAQ,yBAAc;IAWzC;;;MAGE;IACF,YAAY,OAAO,GAAG,EAAE;QACpB,IAAA,YAAE,EAAC,OAAO,EAAE,yBAAyB,EAAE,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC;QAE5F,MAAM,EACF,aAAa,GAAG,EAAE,EAAE,qDAAqD;QACzE,kBAAkB,GAAG,EAAE,EACvB,kBAAkB,EAClB,GAAG,qBAAqB,EAC3B,GAAG,OAAO,CAAC;QAEZ,MAAM,EACF,OAAO,GAAG,KAAK,GAClB,GAAG,aAAa,CAAC;QAElB,IAAI,aAAa,CAAC,QAAQ,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,oFAAoF;kBAC9F,gDAAgD,CAAC,CAAC;SAC3D;QACD,MAAM,iBAAiB,GAAG,IAAI,sCAAiB,CAAC,aAAa,CAAC,CAAC;QAE/D,kBAAkB,CAAC,cAAc,GAAG;YAChC,iBAAiB,CAAC,mBAAmB,EAAE;SAC1C,CAAC;QAEF,KAAK,CAAC;YACF,GAAG,qBAAqB;YACxB,kBAAkB;YAClB,kBAAkB;SACrB,CAAC,CAAC;QAEH,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,EAAE;gBACtE,8EAA8E;gBAC9E,mDAAmD;gBACnD,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,GAAG,iBAAiB,CAAC,cAAc,CAAC;gBACjF,MAAM,IAAA,iBAAqB,EAAC,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;SACN;QAED,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,kBAAkB,CAAC,eAAe,EAAE,WAAW;QACjD,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,iHAAiH,CAAC,CAAC;YAEvI,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;SAC1D;QACD,OAAO,IAAA,8BAAY,EAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACpF,CAAC;;AAtED;;;GAGG;AACI;;;;WAAe;QAClB,GAAG,yBAAc,CAAC,YAAY;QAC9B,kBAAkB,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;QACtC,aAAa,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;KACpC;GAAC;AAiEN,kBAAe,gBAAgB,CAAC"}
@@ -131,7 +131,7 @@ declare class Statistics {
131
131
  * displaying the current state in predefined intervals
132
132
  */
133
133
  startCapturing(): Promise<void>;
134
- logInterval: NodeJS.Timeout | null | undefined;
134
+ logInterval: NodeJS.Timer | null | undefined;
135
135
  /**
136
136
  * Stops logging and remove event listeners, then persist
137
137
  */
@@ -1 +1 @@
1
- {"version":3,"file":"statistics.d.ts","sourceRoot":"","sources":["../../src/crawlers/statistics.js"],"names":[],"mappings":";;;;;;;;;2BAsVc,MAAM,EAAE;aACR,MAAM;oCACN,MAAM;sCACN,MAAM;+BACN,MAAM;6BACN,MAAM;gCACN,MAAM;mBACN,MAAM;0BACN,MAAM;+BACN,MAAM;sBACN,MAAM;;;;;;sBAON,MAAM;oBACN,MAAM;qBACN,MAAM;6BACN,MAAM;+BACN,MAAM;8BACN,MAAM;8BACN,MAAM;sCACN,MAAM;wCACN,MAAM;sBACN,IAAI,GAAC,MAAM,GAAC,IAAI;uBAChB,IAAI,GAAC,MAAM,GAAC,IAAI;0BAChB,MAAM;sBACN,IAAI,GAAC,MAAM,GAAC,IAAI;;AApV9B;;;;;;;;;;;;;;;;GAgBG;AACH;IACI;;;OAGG;IACH,qDA6BC;IAlBG,kCAAqD;IACrD,0BAA+C;IAC/C,mBAA4B;IAC5B,0EAAyB;IAEzB,WAAyB;IACzB,wBAA0D;IAC1D,8BAA4C;IAC5C,6BAA+B;IAE/B;;;OAGG;IACH,2BAAmC;IAMvC;;OAEG;IACH,cAsBC;IArBG;;;;;;;;;;;;;;kBAcC;IAID,kCAA+B;IAKnC;;;;;OAKG;IACH,aAHW,MAAM,GAAC,MAAM,QAQvB;IAED;;;;;OAKG;IACH,cAHW,MAAM,GAAC,MAAM,QAavB;IAED;;;;;OAKG;IACH,YAHW,MAAM,GAAC,MAAM,QAUvB;IAED;;OAEG;IACH;;;;;;;;MAmBC;IAED;;;OAGG;IACH,gCAiBC;IANG,+CAK0B;IAG9B;;OAEG;IACH,+BAMC;IAED;;;;;OAKG;IACH,qCALW,GAAG,QAWb;IAED;;OAEG;IACH,8BASC;IAED;;;;;OAKG;IACH,gDAsCC;IAED;;;;OAIG;IACH,4BAQC;IAED;;;;;OAKG;IACH,UAFa,uBAAuB,GAAG,cAAc,CAgBpD;CACJ;;;;AA9TD;;GAEG;AACH;IAEQ,yBAAqB;IACrB,aAAa;IAGjB,cAGC;IAED,iBAGC;IAFG,mCAAiD;IAIrD,qBAEC;CACJ"}
1
+ {"version":3,"file":"statistics.d.ts","sourceRoot":"","sources":["../../src/crawlers/statistics.js"],"names":[],"mappings":";;;;;;;;;2BAsVc,MAAM,EAAE;aACR,MAAM;oCACN,MAAM;sCACN,MAAM;+BACN,MAAM;6BACN,MAAM;gCACN,MAAM;mBACN,MAAM;0BACN,MAAM;+BACN,MAAM;sBACN,MAAM;;;;;;sBAON,MAAM;oBACN,MAAM;qBACN,MAAM;6BACN,MAAM;+BACN,MAAM;8BACN,MAAM;8BACN,MAAM;sCACN,MAAM;wCACN,MAAM;sBACN,IAAI,GAAC,MAAM,GAAC,IAAI;uBAChB,IAAI,GAAC,MAAM,GAAC,IAAI;0BAChB,MAAM;sBACN,IAAI,GAAC,MAAM,GAAC,IAAI;;AApV9B;;;;;;;;;;;;;;;;GAgBG;AACH;IACI;;;OAGG;IACH,qDA6BC;IAlBG,kCAAqD;IACrD,0BAA+C;IAC/C,mBAA4B;IAC5B,0EAAyB;IAEzB,WAAyB;IACzB,wBAA0D;IAC1D,8BAA4C;IAC5C,6BAA+B;IAE/B;;;OAGG;IACH,2BAAmC;IAMvC;;OAEG;IACH,cAsBC;IArBG;;;;;;;;;;;;;;kBAcC;IAID,kCAA+B;IAKnC;;;;;OAKG;IACH,aAHW,MAAM,GAAC,MAAM,QAQvB;IAED;;;;;OAKG;IACH,cAHW,MAAM,GAAC,MAAM,QAavB;IAED;;;;;OAKG;IACH,YAHW,MAAM,GAAC,MAAM,QAUvB;IAED;;OAEG;IACH;;;;;;;;MAmBC;IAED;;;OAGG;IACH,gCAiBC;IANG,6CAK0B;IAG9B;;OAEG;IACH,+BAMC;IAED;;;;;OAKG;IACH,qCALW,GAAG,QAWb;IAED;;OAEG;IACH,8BASC;IAED;;;;;OAKG;IACH,gDAsCC;IAED;;;;OAIG;IACH,4BAQC;IAED;;;;;OAKG;IACH,UAFa,uBAAuB,GAAG,cAAc,CAgBpD;CACJ;;;;AA9TD;;GAEG;AACH;IAEQ,yBAAqB;IACrB,aAAa;IAGjB,cAGC;IAED,iBAGC;IAFG,mCAAiD;IAIrD,qBAEC;CACJ"}
@@ -109,8 +109,7 @@ export function extractUrlsFromPage(page: PuppeteerPage | PlaywrightPage, select
109
109
  export function extractUrlsFromCheerio($: (any | any), selector: string, baseUrl: string): string[];
110
110
  // @ts-ignore optional peer dependency
111
111
  import { Page as PuppeteerPage } from "puppeteer";
112
- // @ts-ignore optional peer dependency
113
- import { Page as PlaywrightPage } from "playwright/types/types";
112
+ import { Page as PlaywrightPage } from "playwright-core";
114
113
  import { RequestQueue } from "../storages/request_queue";
115
114
  import { RequestTransform } from "./shared";
116
115
  import { QueueOperationInfo } from "../storages/request_queue";
package/build/main.d.ts CHANGED
@@ -109,8 +109,7 @@ declare const exportedUtils: {
109
109
  } | undefined) => Promise<void>;
110
110
  };
111
111
  playwright: {
112
- // @ts-ignore optional peer dependency
113
- gotoExtended: (page: import("playwright").Page, request: Request, gotoOptions?: import("./playwright_utils").DirectNavigationOptions | undefined) => Promise<import("playwright").Response | null>;
112
+ gotoExtended: (page: import("playwright-core").Page, request: Request, gotoOptions?: import("./playwright_utils").DirectNavigationOptions | undefined) => Promise<import("playwright-core").Response | null>;
114
113
  };
115
114
  social: {
116
115
  emailsFromText: (text: string) => string[];
@@ -16,15 +16,13 @@ export type DirectNavigationOptions = {
16
16
  * - `'load'` - consider operation to be finished when the `load` event is fired.
17
17
  * - `'networkidle'` - consider operation to be finished when there are no network connections for at least `500` ms.
18
18
  */
19
- waitUntil?: "load" | "domcontentloaded" | "networkidle" | undefined;
19
+ waitUntil?: "domcontentloaded" | "load" | "networkidle" | undefined;
20
20
  /**
21
21
  * Referer header value. If provided it will take preference over the referer header value set by page.setExtraHTTPHeaders(headers).
22
22
  */
23
23
  referer?: string | undefined;
24
24
  };
25
- // @ts-ignore optional peer dependency
26
- import { Page } from "playwright/types/types";
25
+ import { Page } from "playwright-core";
27
26
  import Request from "./request";
28
- // @ts-ignore optional peer dependency
29
- import { Response } from "playwright/types/types";
27
+ import { Response } from "playwright-core";
30
28
  //# sourceMappingURL=playwright_utils.d.ts.map
@@ -67,7 +67,7 @@ export class Dataset {
67
67
  id: string;
68
68
  name: string | undefined;
69
69
  isLocal: boolean;
70
- client: import("@apify/storage-local/dist/resource_clients/dataset").DatasetClient | import("apify-client").DatasetClient;
70
+ client: import("@apify/storage-local/dist/resource_clients/dataset").DatasetClient | import("apify-client").DatasetClient<Record<string | number, unknown>>;
71
71
  log: import("@apify/log/log").Log;
72
72
  /**
73
73
  * Stores an object or an array of objects to the dataset.
@@ -1 +1 @@
1
- {"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../src/storages/dataset.js"],"names":[],"mappings":"AAcA,oDAAqD;AACrD,sCAAuC;AAchC,yDALI,MAAM,+BAEJ,MAAM,CAuBlB;AAeM,mCALI,MAAM,MAAM,CAAC,cACb,MAAM,GACJ,MAAM,MAAM,CAAC,CA6BzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH;IACI;;;;;;OAMG;IACH;QAL2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACkB,MAAM,EAA7C,WAAW,GAAC,iBAAiB;QACZ,OAAO,EAAxB,OAAO;OAQjB;IALG,WAAoB;IACpB,yBAAwB;IACxB,iBAA8B;IAC9B,0HAA6C;IAC7C,kCAA2C;IAG/C;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,eAJW,MAAM,GAAC,MAAM,MAAM,CAAC,GAEnB,QAAQ,IAAI,CAAC,CAsBxB;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACH;;;;;;;;;oBAFY,QAAQ,cAAc,CAAC,CAWlC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,WAFa,QAAQ,MAAM,CAAC,CAI3B;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,kBATW,eAAe;;;;gDAOd,QAAQ,IAAI,CAAC,CAkBxB;IAED;;;;;;;;;;;;;OAaG;IACH,cARW,aAAa;;;;oBAMZ,QAAQ,MAAM,MAAM,CAAC,CAAC,CAejC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,iBATW,cAAc,QACd,MAAM;;;;oBAML,QAAQ,MAAM,CAAC,CAqB1B;IAED;;;;;OAKG;IACH,QAFY,QAAQ,IAAI,CAAC,CAMxB;CACJ;AAwBM;;;gBALM,QAAQ,OAAO,CAAC,CAc5B;AA8BM,+BARI,MAAM,GAEJ,QAAQ,IAAI,CAAC,CAUzB;;;;;WAIa,MAAM,MAAM,CAAC;;;;WACb,MAAM;;;;YACN,MAAM;;;;WACN,MAAM;;;;WACN,MAAM;;;;;qCAOT,MAAM,SACN,MAAM,KACJ,MAAM;;;;mCAOR,MAAM,SACN,MAAM,KACJ,MAAM;;;;oCAMR,MAAM,QACN,MAAM,SACN,MAAM,KACJ,MAAM"}
1
+ {"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../src/storages/dataset.js"],"names":[],"mappings":"AAcA,oDAAqD;AACrD,sCAAuC;AAchC,yDALI,MAAM,+BAEJ,MAAM,CAuBlB;AAeM,mCALI,MAAM,MAAM,CAAC,cACb,MAAM,GACJ,MAAM,MAAM,CAAC,CA6BzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH;IACI;;;;;;OAMG;IACH;QAL2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACkB,MAAM,EAA7C,WAAW,GAAC,iBAAiB;QACZ,OAAO,EAAxB,OAAO;OAQjB;IALG,WAAoB;IACpB,yBAAwB;IACxB,iBAA8B;IAC9B,4JAA6C;IAC7C,kCAA2C;IAG/C;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,eAJW,MAAM,GAAC,MAAM,MAAM,CAAC,GAEnB,QAAQ,IAAI,CAAC,CAsBxB;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACH;;;;;;;;;oBAFY,QAAQ,cAAc,CAAC,CAWlC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,WAFa,QAAQ,MAAM,CAAC,CAI3B;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,kBATW,eAAe;;;;gDAOd,QAAQ,IAAI,CAAC,CAkBxB;IAED;;;;;;;;;;;;;OAaG;IACH,cARW,aAAa;;;;oBAMZ,QAAQ,MAAM,MAAM,CAAC,CAAC,CAejC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,iBATW,cAAc,QACd,MAAM;;;;oBAML,QAAQ,MAAM,CAAC,CAqB1B;IAED;;;;;OAKG;IACH,QAFY,QAAQ,IAAI,CAAC,CAMxB;CACJ;AAwBM;;;gBALM,QAAQ,OAAO,CAAC,CAc5B;AA8BM,+BARI,MAAM,GAEJ,QAAQ,IAAI,CAAC,CAUzB;;;;;WAIa,MAAM,MAAM,CAAC;;;;WACb,MAAM;;;;YACN,MAAM;;;;WACN,MAAM;;;;WACN,MAAM;;;;;qCAOT,MAAM,SACN,MAAM,KACJ,MAAM;;;;mCAOR,MAAM,SACN,MAAM,KACJ,MAAM;;;;oCAMR,MAAM,QACN,MAAM,SACN,MAAM,KACJ,MAAM"}