apify 2.0.8-beta.6 → 2.1.0-beta.0

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 (217) hide show
  1. package/README.md +3 -0
  2. package/{types → build}/actor.d.ts +1 -0
  3. package/build/actor.d.ts.map +1 -0
  4. package/build/actor.js +13 -12
  5. package/build/actor.js.map +1 -0
  6. package/{types → build}/apify.d.ts +3 -0
  7. package/build/apify.d.ts.map +1 -0
  8. package/build/apify.js +4 -2
  9. package/build/apify.js.map +1 -0
  10. package/{types → build}/autoscaling/autoscaled_pool.d.ts +1 -0
  11. package/build/autoscaling/autoscaled_pool.d.ts.map +1 -0
  12. package/build/autoscaling/autoscaled_pool.js +6 -4
  13. package/build/autoscaling/autoscaled_pool.js.map +1 -0
  14. package/{types → build}/autoscaling/snapshotter.d.ts +1 -0
  15. package/build/autoscaling/snapshotter.d.ts.map +1 -0
  16. package/build/autoscaling/snapshotter.js +7 -5
  17. package/build/autoscaling/snapshotter.js.map +1 -0
  18. package/{types → build}/autoscaling/system_status.d.ts +1 -0
  19. package/build/autoscaling/system_status.d.ts.map +1 -0
  20. package/build/autoscaling/system_status.js +4 -2
  21. package/build/autoscaling/system_status.js.map +1 -0
  22. package/{types → build}/browser_launchers/browser_launcher.d.ts +5 -0
  23. package/build/browser_launchers/browser_launcher.d.ts.map +1 -0
  24. package/build/browser_launchers/browser_launcher.js +15 -8
  25. package/build/browser_launchers/browser_launcher.js.map +1 -0
  26. package/{types → build}/browser_launchers/browser_plugin.d.ts +1 -0
  27. package/build/browser_launchers/browser_plugin.d.ts.map +1 -0
  28. package/build/browser_launchers/browser_plugin.js +1 -0
  29. package/build/browser_launchers/browser_plugin.js.map +1 -0
  30. package/{types → build}/browser_launchers/playwright_launcher.d.ts +6 -0
  31. package/build/browser_launchers/playwright_launcher.d.ts.map +1 -0
  32. package/build/browser_launchers/playwright_launcher.js +13 -6
  33. package/build/browser_launchers/playwright_launcher.js.map +1 -0
  34. package/{types → build}/browser_launchers/puppeteer_launcher.d.ts +1 -0
  35. package/build/browser_launchers/puppeteer_launcher.d.ts.map +1 -0
  36. package/build/browser_launchers/puppeteer_launcher.js +17 -10
  37. package/build/browser_launchers/puppeteer_launcher.js.map +1 -0
  38. package/{types → build}/cache_container.d.ts +1 -0
  39. package/build/cache_container.d.ts.map +1 -0
  40. package/build/cache_container.js +1 -0
  41. package/build/cache_container.js.map +1 -0
  42. package/{types → build}/configuration.d.ts +1 -0
  43. package/build/configuration.d.ts.map +1 -0
  44. package/build/configuration.js +88 -65
  45. package/build/configuration.js.map +1 -0
  46. package/{types → build}/constants.d.ts +1 -0
  47. package/build/constants.d.ts.map +1 -0
  48. package/build/constants.js +1 -0
  49. package/build/constants.js.map +1 -0
  50. package/{types → build}/crawlers/basic_crawler.d.ts +1 -0
  51. package/build/crawlers/basic_crawler.d.ts.map +1 -0
  52. package/build/crawlers/basic_crawler.js +35 -28
  53. package/build/crawlers/basic_crawler.js.map +1 -0
  54. package/{types → build}/crawlers/browser_crawler.d.ts +1 -0
  55. package/build/crawlers/browser_crawler.d.ts.map +1 -0
  56. package/build/crawlers/browser_crawler.js +26 -19
  57. package/build/crawlers/browser_crawler.js.map +1 -0
  58. package/{types → build}/crawlers/cheerio_crawler.d.ts +1 -0
  59. package/build/crawlers/cheerio_crawler.d.ts.map +1 -0
  60. package/build/crawlers/cheerio_crawler.js +41 -34
  61. package/build/crawlers/cheerio_crawler.js.map +1 -0
  62. package/{types → build}/crawlers/crawler_extension.d.ts +1 -0
  63. package/build/crawlers/crawler_extension.d.ts.map +1 -0
  64. package/build/crawlers/crawler_extension.js +3 -1
  65. package/build/crawlers/crawler_extension.js.map +1 -0
  66. package/{types → build}/crawlers/crawler_utils.d.ts +1 -0
  67. package/build/crawlers/crawler_utils.d.ts.map +1 -0
  68. package/build/crawlers/crawler_utils.js +1 -0
  69. package/build/crawlers/crawler_utils.js.map +1 -0
  70. package/{types → build}/crawlers/playwright_crawler.d.ts +2 -0
  71. package/build/crawlers/playwright_crawler.d.ts.map +1 -0
  72. package/build/crawlers/playwright_crawler.js +15 -8
  73. package/build/crawlers/playwright_crawler.js.map +1 -0
  74. package/{types → build}/crawlers/puppeteer_crawler.d.ts +1 -0
  75. package/build/crawlers/puppeteer_crawler.d.ts.map +1 -0
  76. package/build/crawlers/puppeteer_crawler.js +15 -8
  77. package/build/crawlers/puppeteer_crawler.js.map +1 -0
  78. package/{types → build}/crawlers/statistics.d.ts +1 -0
  79. package/build/crawlers/statistics.d.ts.map +1 -0
  80. package/build/crawlers/statistics.js +5 -3
  81. package/build/crawlers/statistics.js.map +1 -0
  82. package/{types → build}/enqueue_links/click_elements.d.ts +1 -0
  83. package/build/enqueue_links/click_elements.d.ts.map +1 -0
  84. package/build/enqueue_links/click_elements.js +4 -2
  85. package/build/enqueue_links/click_elements.js.map +1 -0
  86. package/{types → build}/enqueue_links/enqueue_links.d.ts +2 -0
  87. package/build/enqueue_links/enqueue_links.d.ts.map +1 -0
  88. package/build/enqueue_links/enqueue_links.js +4 -2
  89. package/build/enqueue_links/enqueue_links.js.map +1 -0
  90. package/{types → build}/enqueue_links/shared.d.ts +1 -0
  91. package/build/enqueue_links/shared.d.ts.map +1 -0
  92. package/build/enqueue_links/shared.js +6 -4
  93. package/build/enqueue_links/shared.js.map +1 -0
  94. package/{types → build}/errors.d.ts +1 -0
  95. package/build/errors.d.ts.map +1 -0
  96. package/build/errors.js +1 -0
  97. package/build/errors.js.map +1 -0
  98. package/{types → build}/events.d.ts +1 -0
  99. package/build/events.d.ts.map +1 -0
  100. package/build/events.js +5 -3
  101. package/build/events.js.map +1 -0
  102. package/{types → build}/index.d.ts +1 -0
  103. package/build/index.d.ts.map +1 -0
  104. package/build/index.js +4 -12
  105. package/build/index.js.map +1 -0
  106. package/{types → build}/main.d.ts +3 -1
  107. package/build/main.d.ts.map +1 -0
  108. package/build/main.js +11 -9
  109. package/build/main.js.map +1 -0
  110. package/{types → build}/playwright_utils.d.ts +3 -3
  111. package/build/playwright_utils.d.ts.map +1 -0
  112. package/build/playwright_utils.js +25 -18
  113. package/build/playwright_utils.js.map +1 -0
  114. package/{types → build}/proxy_configuration.d.ts +1 -0
  115. package/build/proxy_configuration.d.ts.map +1 -0
  116. package/build/proxy_configuration.js +8 -2
  117. package/build/proxy_configuration.js.map +1 -0
  118. package/{types → build}/pseudo_url.d.ts +1 -0
  119. package/build/pseudo_url.d.ts.map +1 -0
  120. package/build/pseudo_url.js +7 -5
  121. package/build/pseudo_url.js.map +1 -0
  122. package/{types → build}/puppeteer_request_interception.d.ts +1 -0
  123. package/build/puppeteer_request_interception.d.ts.map +1 -0
  124. package/build/puppeteer_request_interception.js +15 -7
  125. package/build/puppeteer_request_interception.js.map +1 -0
  126. package/{types → build}/puppeteer_utils.d.ts +1 -0
  127. package/build/puppeteer_utils.d.ts.map +1 -0
  128. package/build/puppeteer_utils.js +23 -19
  129. package/build/puppeteer_utils.js.map +1 -0
  130. package/{types → build}/request.d.ts +1 -0
  131. package/build/request.d.ts.map +1 -0
  132. package/build/request.js +8 -6
  133. package/build/request.js.map +1 -0
  134. package/{types → build}/request_list.d.ts +17 -3
  135. package/build/request_list.d.ts.map +1 -0
  136. package/build/request_list.js +36 -16
  137. package/build/request_list.js.map +1 -0
  138. package/{types → build}/serialization.d.ts +1 -0
  139. package/build/serialization.d.ts.map +1 -0
  140. package/build/serialization.js +14 -12
  141. package/build/serialization.js.map +1 -0
  142. package/{types → build}/session_pool/errors.d.ts +1 -0
  143. package/build/session_pool/errors.d.ts.map +1 -0
  144. package/build/session_pool/errors.js +1 -0
  145. package/build/session_pool/errors.js.map +1 -0
  146. package/{types → build}/session_pool/events.d.ts +1 -0
  147. package/build/session_pool/events.d.ts.map +1 -0
  148. package/build/session_pool/events.js +1 -0
  149. package/build/session_pool/events.js.map +1 -0
  150. package/{types → build}/session_pool/session.d.ts +1 -0
  151. package/build/session_pool/session.d.ts.map +1 -0
  152. package/build/session_pool/session.js +5 -3
  153. package/build/session_pool/session.js.map +1 -0
  154. package/{types → build}/session_pool/session_pool.d.ts +1 -0
  155. package/build/session_pool/session_pool.d.ts.map +1 -0
  156. package/build/session_pool/session_pool.js +5 -3
  157. package/build/session_pool/session_pool.js.map +1 -0
  158. package/{types → build}/session_pool/session_utils.d.ts +1 -0
  159. package/build/session_pool/session_utils.d.ts.map +1 -0
  160. package/build/session_pool/session_utils.js +1 -0
  161. package/build/session_pool/session_utils.js.map +1 -0
  162. package/{types → build}/stealth/hiding_tricks.d.ts +1 -0
  163. package/build/stealth/hiding_tricks.d.ts.map +1 -0
  164. package/build/stealth/hiding_tricks.js +1 -0
  165. package/build/stealth/hiding_tricks.js.map +1 -0
  166. package/{types → build}/stealth/stealth.d.ts +1 -0
  167. package/build/stealth/stealth.d.ts.map +1 -0
  168. package/build/stealth/stealth.js +6 -4
  169. package/build/stealth/stealth.js.map +1 -0
  170. package/{types → build}/storages/dataset.d.ts +1 -0
  171. package/build/storages/dataset.d.ts.map +1 -0
  172. package/build/storages/dataset.js +7 -5
  173. package/build/storages/dataset.js.map +1 -0
  174. package/{types → build}/storages/key_value_store.d.ts +1 -0
  175. package/build/storages/key_value_store.d.ts.map +1 -0
  176. package/build/storages/key_value_store.js +4 -2
  177. package/build/storages/key_value_store.js.map +1 -0
  178. package/{types → build}/storages/request_queue.d.ts +1 -0
  179. package/build/storages/request_queue.d.ts.map +1 -0
  180. package/build/storages/request_queue.js +7 -5
  181. package/build/storages/request_queue.js.map +1 -0
  182. package/{types → build}/storages/storage_manager.d.ts +1 -0
  183. package/build/storages/storage_manager.d.ts.map +1 -0
  184. package/build/storages/storage_manager.js +3 -1
  185. package/build/storages/storage_manager.js.map +1 -0
  186. package/build/tsconfig.tsbuildinfo +1 -0
  187. package/{types → build}/typedefs.d.ts +1 -0
  188. package/build/typedefs.d.ts.map +1 -0
  189. package/build/typedefs.js +1 -0
  190. package/build/typedefs.js.map +1 -0
  191. package/{types → build}/utils.d.ts +3 -0
  192. package/build/utils.d.ts.map +1 -0
  193. package/build/utils.js +104 -46
  194. package/build/utils.js.map +1 -0
  195. package/{types → build}/utils_log.d.ts +1 -0
  196. package/build/utils_log.d.ts.map +1 -0
  197. package/build/utils_log.js +3 -1
  198. package/build/utils_log.js.map +1 -0
  199. package/{types → build}/utils_request.d.ts +1 -0
  200. package/build/utils_request.d.ts.map +1 -0
  201. package/build/utils_request.js +5 -3
  202. package/build/utils_request.js.map +1 -0
  203. package/{types → build}/utils_social.d.ts +1 -0
  204. package/build/utils_social.d.ts.map +1 -0
  205. package/build/utils_social.js +23 -11
  206. package/build/utils_social.js.map +1 -0
  207. package/{types → build}/validators.d.ts +1 -0
  208. package/build/validators.d.ts.map +1 -0
  209. package/build/validators.js +3 -1
  210. package/build/validators.js.map +1 -0
  211. package/package.json +26 -29
  212. package/types/playwright/index.d.ts +0 -22
  213. package/types/playwright/types/protocol.d.ts +0 -17846
  214. package/types/playwright/types/structs.d.ts +0 -50
  215. package/types/playwright/types/types.d.ts +0 -13078
  216. package/types-apify/apify-http-request.d.ts +0 -8
  217. package/types-apify/ps-tree.d.ts +0 -4
@@ -1,3 +1,4 @@
1
1
  export default Apify;
2
2
  export * from "./main";
3
3
  import * as Apify from "./main";
4
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":""}
package/build/index.js CHANGED
@@ -1,15 +1,7 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
- }) : (function(o, m, k, k2) {
6
- if (k2 === undefined) k2 = k;
7
- o[k2] = m[k];
8
- }));
9
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
- };
12
2
  Object.defineProperty(exports, "__esModule", { value: true });
13
- const Apify = require("./main");
3
+ const tslib_1 = require("tslib");
4
+ const Apify = (0, tslib_1.__importStar)(require("./main"));
14
5
  exports.default = Apify;
15
- __exportStar(require("./main"), exports);
6
+ (0, tslib_1.__exportStar)(require("./main"), exports);
7
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";;;AAAA,2DAAgC;AAEhC,kBAAe,KAAK,CAAC;AACrB,sDAAuB"}
@@ -60,6 +60,7 @@ declare const exportedUtils: {
60
60
  waitSecs?: string | undefined;
61
61
  token?: string | undefined;
62
62
  }) => Promise<import("./typedefs").ActorRun>;
63
+ purgeLocalStorage: (folder?: string | undefined) => Promise<void>;
63
64
  } & {
64
65
  puppeteer: {
65
66
  // @ts-ignore optional peer dependency
@@ -108,6 +109,7 @@ declare const exportedUtils: {
108
109
  } | undefined) => Promise<void>;
109
110
  };
110
111
  playwright: {
112
+ // @ts-ignore optional peer dependency
111
113
  gotoExtended: (page: import("playwright").Page, request: Request, gotoOptions?: import("./playwright_utils").DirectNavigationOptions | undefined) => Promise<import("playwright").Response | null>;
112
114
  };
113
115
  social: {
@@ -135,7 +137,7 @@ declare const exportedUtils: {
135
137
  };
136
138
  import { enqueueLinks } from "./enqueue_links/enqueue_links";
137
139
  export { Apify, Configuration, main, getEnv, call, callTask, metamorph, getMemoryInfo, isAtHome, newClient, addWebhook, AutoscaledPool, BasicCrawler, CheerioCrawler, pushData, openDataset, events, initializeEvents, stopEvents, getValue, setValue, getInput, openKeyValueStore, launchPuppeteer, launchPlaywright, BrowserCrawler, PuppeteerCrawler, PlaywrightCrawler, PseudoUrl, Request, RequestList, openRequestList, openRequestQueue, openSessionPool, createProxyConfiguration, Session, exportedUtils as utils };
138
-
140
+ //# sourceMappingURL=main.d.ts.map
139
141
  export { ApifyEnv, EventTypes, UserFunc, AdhocWebhook, WebhookRun } from "./actor";
140
142
  export { AutoscaledPoolOptions } from "./autoscaling/autoscaled_pool";
141
143
  export { SnapshotterOptions } from "./autoscaling/snapshotter";
@@ -0,0 +1 @@
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOG"}
package/build/main.js CHANGED
@@ -1,8 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.utils = exports.Session = exports.createProxyConfiguration = exports.openSessionPool = exports.openRequestQueue = exports.openRequestList = exports.RequestList = exports.Request = exports.PseudoUrl = exports.PlaywrightCrawler = exports.PuppeteerCrawler = exports.BrowserCrawler = exports.launchPlaywright = exports.launchPuppeteer = exports.openKeyValueStore = exports.getInput = exports.setValue = exports.getValue = exports.stopEvents = exports.initializeEvents = exports.events = exports.openDataset = exports.pushData = exports.CheerioCrawler = exports.BasicCrawler = exports.AutoscaledPool = exports.addWebhook = exports.newClient = exports.isAtHome = exports.getMemoryInfo = exports.metamorph = exports.callTask = exports.call = exports.getEnv = exports.main = exports.Configuration = exports.Apify = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const events_1 = require("events");
5
- const utils_log_1 = require("./utils_log");
6
+ const utils_log_1 = (0, tslib_1.__importDefault)(require("./utils_log"));
6
7
  const actor_1 = require("./actor");
7
8
  Object.defineProperty(exports, "main", { enumerable: true, get: function () { return actor_1.main; } });
8
9
  Object.defineProperty(exports, "getEnv", { enumerable: true, get: function () { return actor_1.getEnv; } });
@@ -14,16 +15,16 @@ const apify_1 = require("./apify");
14
15
  Object.defineProperty(exports, "Apify", { enumerable: true, get: function () { return apify_1.Apify; } });
15
16
  const configuration_1 = require("./configuration");
16
17
  Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.Configuration; } });
17
- const autoscaled_pool_1 = require("./autoscaling/autoscaled_pool");
18
+ const autoscaled_pool_1 = (0, tslib_1.__importDefault)(require("./autoscaling/autoscaled_pool"));
18
19
  exports.AutoscaledPool = autoscaled_pool_1.default;
19
20
  const basic_crawler_1 = require("./crawlers/basic_crawler");
20
21
  Object.defineProperty(exports, "BasicCrawler", { enumerable: true, get: function () { return basic_crawler_1.BasicCrawler; } });
21
- const cheerio_crawler_1 = require("./crawlers/cheerio_crawler");
22
+ const cheerio_crawler_1 = (0, tslib_1.__importDefault)(require("./crawlers/cheerio_crawler"));
22
23
  exports.CheerioCrawler = cheerio_crawler_1.default;
23
24
  const dataset_1 = require("./storages/dataset");
24
25
  Object.defineProperty(exports, "pushData", { enumerable: true, get: function () { return dataset_1.pushData; } });
25
26
  Object.defineProperty(exports, "openDataset", { enumerable: true, get: function () { return dataset_1.openDataset; } });
26
- const events_2 = require("./events");
27
+ const events_2 = (0, tslib_1.__importStar)(require("./events"));
27
28
  exports.events = events_2.default;
28
29
  Object.defineProperty(exports, "initializeEvents", { enumerable: true, get: function () { return events_2.initializeEvents; } });
29
30
  Object.defineProperty(exports, "stopEvents", { enumerable: true, get: function () { return events_2.stopEvents; } });
@@ -36,13 +37,13 @@ const puppeteer_launcher_1 = require("./browser_launchers/puppeteer_launcher");
36
37
  Object.defineProperty(exports, "launchPuppeteer", { enumerable: true, get: function () { return puppeteer_launcher_1.launchPuppeteer; } });
37
38
  const playwright_launcher_1 = require("./browser_launchers/playwright_launcher");
38
39
  Object.defineProperty(exports, "launchPlaywright", { enumerable: true, get: function () { return playwright_launcher_1.launchPlaywright; } });
39
- const browser_crawler_1 = require("./crawlers/browser_crawler");
40
+ const browser_crawler_1 = (0, tslib_1.__importDefault)(require("./crawlers/browser_crawler"));
40
41
  exports.BrowserCrawler = browser_crawler_1.default;
41
- const puppeteer_crawler_1 = require("./crawlers/puppeteer_crawler");
42
+ const puppeteer_crawler_1 = (0, tslib_1.__importDefault)(require("./crawlers/puppeteer_crawler"));
42
43
  exports.PuppeteerCrawler = puppeteer_crawler_1.default;
43
- const playwright_crawler_1 = require("./crawlers/playwright_crawler");
44
+ const playwright_crawler_1 = (0, tslib_1.__importDefault)(require("./crawlers/playwright_crawler"));
44
45
  exports.PlaywrightCrawler = playwright_crawler_1.default;
45
- const request_1 = require("./request");
46
+ const request_1 = (0, tslib_1.__importDefault)(require("./request"));
46
47
  exports.Request = request_1.default;
47
48
  const request_list_1 = require("./request_list");
48
49
  Object.defineProperty(exports, "RequestList", { enumerable: true, get: function () { return request_list_1.RequestList; } });
@@ -59,7 +60,7 @@ const puppeteer_utils_1 = require("./puppeteer_utils");
59
60
  const playwright_utils_1 = require("./playwright_utils");
60
61
  const utils_social_1 = require("./utils_social");
61
62
  const enqueue_links_1 = require("./enqueue_links/enqueue_links");
62
- const pseudo_url_1 = require("./pseudo_url");
63
+ const pseudo_url_1 = (0, tslib_1.__importDefault)(require("./pseudo_url"));
63
64
  exports.PseudoUrl = pseudo_url_1.default;
64
65
  const utils_request_1 = require("./utils_request");
65
66
  const session_pool_1 = require("./session_pool/session_pool");
@@ -77,3 +78,4 @@ const exportedUtils = Object.assign(utils_1.publicUtils, {
77
78
  requestAsBrowser: utils_request_1.requestAsBrowser,
78
79
  });
79
80
  exports.utils = exportedUtils;
81
+ //# sourceMappingURL=main.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.js"],"names":[],"mappings":";;;;AAAA,mCAAsC;AACtC,yEAA8B;AAC9B,mCAA8E;AA6F1E,qFA7FK,YAAI,OA6FL;AACJ,uFA9FW,cAAM,OA8FX;AACN,qFA/FmB,YAAI,OA+FnB;AACJ,yFAhGyB,gBAAQ,OAgGzB;AACR,0FAjGmC,iBAAS,OAiGnC;AAIT,2FArG8C,kBAAU,OAqG9C;AApGd,mCAAgC;AA0F5B,sFA1FK,aAAK,OA0FL;AAzFT,mDAAgD;AA0F5C,8FA1FK,6BAAa,OA0FL;AAzFjB,iGAA2D;AAoGvD,yBApGG,yBAAc,CAoGH;AAnGlB,4DAAwD;AAqGpD,6FArGK,4BAAY,OAqGL;AApGhB,8FAAwD;AAsGpD,yBAtGG,yBAAc,CAsGH;AArGlB,gDAA2D;AAuGvD,yFAvGK,kBAAQ,OAuGL;AACR,4FAxGe,qBAAW,OAwGf;AAvGf,gEAAgE;AAyG5D,iBAzGG,gBAAM,CAyGH;AACN,iGA1Ga,yBAAgB,OA0Gb;AAChB,2FA3G+B,mBAAU,OA2G/B;AA1Gd,gEAA6F;AA4GzF,yFA5GK,0BAAQ,OA4GL;AACR,yFA7Ge,0BAAQ,OA6Gf;AACR,yFA9GyB,0BAAQ,OA8GzB;AACR,kGA/GmC,mCAAiB,OA+GnC;AA9GrB,+EAAyE;AAgHrE,gGAhHK,oCAAe,OAgHL;AA/GnB,iFAA2E;AAgHvE,iGAhHK,sCAAgB,OAgHL;AA/GpB,8FAAwD;AAgHpD,yBAhHG,yBAAc,CAgHH;AA/GlB,kGAA4D;AAgHxD,2BAhHG,2BAAgB,CAgHH;AA/GpB,oGAA8D;AAgH1D,4BAhHG,4BAAiB,CAgHH;AA/GrB,qEAAgC;AAmH5B,kBAnHG,iBAAO,CAmHH;AAlHX,iDAA8D;AAmH1D,4FAnHK,0BAAW,OAmHL;AACX,gGApHkB,8BAAe,OAoHlB;AAnHnB,+DAAiE;AAwH7D,yGAxHK,8CAAwB,OAwHL;AAvH5B,4DAA4D;AAmHxD,iGAnHK,gCAAgB,OAmHL;AAlHpB,mCAA0E;AAkFtE,0FAlFK,iBAAS,OAkFL;AAFT,8FAhFgB,qBAAa,OAgFhB;AACb,yFAjF+B,gBAAQ,OAiF/B;AAhFZ,uDAAmD;AACnD,yDAAqD;AACrD,iDAA6C;AAC7C,iEAA6D;AAC7D,2EAAqC;AAwGjC,oBAxGG,oBAAS,CAwGH;AAvGb,mDAAmD;AACnD,8DAA8D;AA6G1D,gGA7GK,8BAAe,OA6GL;AA5GnB,oDAAiD;AAgH7C,wFAhHK,iBAAO,OAgHL;AA9GX,oEAAoE;AACpE,qBAAY,CAAC,mBAAmB,GAAG,EAAE,CAAC;AAEtC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,mBAAW,EAAE;IAC7C,SAAS,EAAE,gCAAc;IACzB,UAAU,EAAE,kCAAe;IAC3B,MAAM,EAAE,0BAAW;IACnB,GAAG,EAAH,mBAAG;IACH,YAAY,EAAZ,4BAAY;IACZ,gBAAgB,EAAhB,gCAAgB;CACnB,CAAC,CAAC;AAsGkB,8BAAK"}
@@ -1,6 +1,3 @@
1
- /// <reference path="../types/playwright/index.d.ts" />
2
- /// <reference path="../types/playwright/types/types.d.ts" />
3
-
4
1
  export function gotoExtended(page: Page, request: Request, gotoOptions?: DirectNavigationOptions | undefined): Promise<(Response | null)>;
5
2
  export namespace playwrightUtils {
6
3
  export { gotoExtended };
@@ -25,6 +22,9 @@ export type DirectNavigationOptions = {
25
22
  */
26
23
  referer?: string | undefined;
27
24
  };
25
+ // @ts-ignore optional peer dependency
28
26
  import { Page } from "playwright/types/types";
29
27
  import Request from "./request";
28
+ // @ts-ignore optional peer dependency
30
29
  import { Response } from "playwright/types/types";
30
+ //# sourceMappingURL=playwright_utils.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"playwright_utils.d.ts","sourceRoot":"","sources":["../src/playwright_utils.js"],"names":[],"mappings":"AAyCO,mCATI,IAAI,WAEJ,OAAO,sDAEN,QAAQ,CAAC,QAAQ,GAAC,IAAI,CAAC,CAAC,CA8CnC"}
@@ -1,9 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.playwrightUtils = exports.gotoExtended = void 0;
4
- const ow_1 = require("ow");
5
- const _ = require("underscore");
6
- const utils_log_1 = require("./utils_log");
4
+ const tslib_1 = require("tslib");
5
+ const ow_1 = (0, tslib_1.__importDefault)(require("ow"));
6
+ const underscore_1 = (0, tslib_1.__importDefault)(require("underscore"));
7
+ const utils_log_1 = (0, tslib_1.__importDefault)(require("./utils_log"));
7
8
  const validators_1 = require("./validators");
8
9
  /**
9
10
  * @typedef {object} DirectNavigationOptions
@@ -47,26 +48,31 @@ const gotoExtended = async (page, request, gotoOptions = {}) => {
47
48
  }));
48
49
  (0, ow_1.default)(gotoOptions, ow_1.default.object);
49
50
  const { url, method, headers, payload } = request;
50
- if (method !== 'GET' || payload || !_.isEmpty(headers)) {
51
+ if (method !== 'GET' || payload || !underscore_1.default.isEmpty(headers)) {
51
52
  // This is not deprecated, we use it to log only once.
52
53
  utils_log_1.default.deprecated('Using other request methods than GET, rewriting headers and adding payloads has a high impact on performance '
53
54
  + 'in recent versions of Playwright. Use only when necessary.');
54
55
  let wasCalled = false;
55
- const interceptRequestHandler = (route) => {
56
- // We want to ensure that this won't get executed again in a case that there is a subsequent request
57
- // for example for some asset file link from main HTML.
58
- if (wasCalled) {
59
- return route.continue();
56
+ const interceptRequestHandler = async (route) => {
57
+ try {
58
+ // We want to ensure that this won't get executed again in a case that there is a subsequent request
59
+ // for example for some asset file link from main HTML.
60
+ if (wasCalled) {
61
+ return route.continue();
62
+ }
63
+ wasCalled = true;
64
+ const overrides = {};
65
+ if (method !== 'GET')
66
+ overrides.method = method;
67
+ if (payload)
68
+ overrides.postData = payload;
69
+ if (!underscore_1.default.isEmpty(headers))
70
+ overrides.headers = headers;
71
+ await route.continue(overrides);
72
+ }
73
+ catch (error) {
74
+ utils_log_1.default.debug('Error inside request interceptor', { error });
60
75
  }
61
- wasCalled = true;
62
- const overrides = {};
63
- if (method !== 'GET')
64
- overrides.method = method;
65
- if (payload)
66
- overrides.postData = payload;
67
- if (!_.isEmpty(headers))
68
- overrides.headers = headers;
69
- route.continue(overrides);
70
76
  };
71
77
  await page.route('**/*', interceptRequestHandler);
72
78
  }
@@ -96,3 +102,4 @@ exports.gotoExtended = gotoExtended;
96
102
  exports.playwrightUtils = {
97
103
  gotoExtended: exports.gotoExtended,
98
104
  };
105
+ //# sourceMappingURL=playwright_utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"playwright_utils.js","sourceRoot":"","sources":["../src/playwright_utils.js"],"names":[],"mappings":";;;;AAAA,yDAAoB;AACpB,yEAA2B;AAE3B,yEAA8B;AAC9B,6CAA0C;AAI1C;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;GAgBG;AACI,MAAM,YAAY,GAAG,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,GAAG,EAAE,EAAE,EAAE;IAClE,IAAA,YAAE,EAAC,IAAI,EAAE,YAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAU,CAAC,WAAW,CAAC,CAAC,CAAC;IACrD,IAAA,YAAE,EAAC,OAAO,EAAE,YAAE,CAAC,MAAM,CAAC,YAAY,CAAC;QAC/B,GAAG,EAAE,YAAE,CAAC,MAAM,CAAC,GAAG;QAClB,MAAM,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;QAC1B,OAAO,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;QAC3B,OAAO,EAAE,YAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAE,CAAC,MAAM,EAAE,YAAE,CAAC,MAAM,CAAC;KACjD,CAAC,CAAC,CAAC;IACJ,IAAA,YAAE,EAAC,WAAW,EAAE,YAAE,CAAC,MAAM,CAAC,CAAC;IAE3B,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAElD,IAAI,MAAM,KAAK,KAAK,IAAI,OAAO,IAAI,CAAC,oBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACpD,sDAAsD;QACtD,mBAAG,CAAC,UAAU,CAAC,+GAA+G;cACxH,4DAA4D,CAAC,CAAC;QACpE,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,MAAM,uBAAuB,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE;YAC5C,IAAI;gBACA,oGAAoG;gBACpG,uDAAuD;gBACvD,IAAI,SAAS,EAAE;oBACX,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;iBAC3B;gBAED,SAAS,GAAG,IAAI,CAAC;gBACjB,MAAM,SAAS,GAAG,EAAE,CAAC;gBAErB,IAAI,MAAM,KAAK,KAAK;oBAAE,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC;gBAChD,IAAI,OAAO;oBAAE,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC;gBAC1C,IAAI,CAAC,oBAAC,CAAC,OAAO,CAAC,OAAO,CAAC;oBAAE,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;gBACrD,MAAM,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;aACnC;YAAC,OAAO,KAAK,EAAE;gBACZ,mBAAG,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;aAC5D;QACL,CAAC,CAAC;QAEF,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;KACrD;IAED,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;AACvC,CAAC,CAAC;AAzCW,QAAA,YAAY,gBAyCvB;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACU,QAAA,eAAe,GAAG;IAC3B,YAAY,EAAZ,oBAAY;CACf,CAAC"}
@@ -408,3 +408,4 @@ export type ProxyInfo = {
408
408
  port: string;
409
409
  };
410
410
  import { Configuration } from "./configuration";
411
+ //# sourceMappingURL=proxy_configuration.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proxy_configuration.d.ts","sourceRoot":"","sources":["../src/proxy_configuration.js"],"names":[],"mappings":"AAeA;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH;IACI;;;;;OAKG;IACH,iGAoDC;IApBG,iBAAyB;IACzB,gCAAmC;IACnC,oCAAwB;IACxB,oCAAwB;IACxB,gCAAgB;IAChB,2BAA2B;IAC3B,oBAA0B;IAC1B,6BAA8B;IAC9B,oEAAoC;IACpC,wBAA6D;IAC7D,kCAA6D;IAC7D,sBAAoB;IACpB,0BAA6B;IAUjC;;;;;;;;;OASG;IACH,cAFa,QAAQ,IAAI,CAAC,CAQzB;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,uDAFY,SAAS,CAkBpB;IAED;;;;;;;;;;;;OAYG;IACH,iDAHY,MAAM,CAgBjB;IAED;;;;;;;OAOG;IACH,wDALY,MAAM,CAyBjB;IAED;;;;;;;OAOG;IACH,iCALa,QAAQ,IAAI,CAAC,CAsBzB;IAED;;;;;;;;;OASG;IACH,0BALa,QAAQ,IAAI,CAAC,CAgBzB;IAED;;;;;;;OAOG;IACH,0BALY,QAAQ;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC,CAoB/E;IAED;;;;;;;OAOG;IACH,4DALa,MAAM,CAkBlB;IAED;;;;;;OAMG;IACH,kFASC;IAED;;;;;;OAMG;IACH,2CALW,KAAK,QAOf;IAED;;;;;;;OAOG;IACH,8CANW,MAAM,SACN,MAAM,QAOhB;IAED;;;;;OAKG;IACH,mEAEC;IAED;;;;;OAKG;IACH,qDAIC;IAED;;;;;OAKG;IACH,mDAEC;CACJ;AA2CM,6GALM,QAAQ,kBAAkB,GAAC,SAAS,CAAC,CAiBjD;qDA9gBU,MAAM,GAAC,MAAM,KACX,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAuEL,MAAM;;;;;YAEN,MAAM,EAAE;;;;;;;;;;;;;;;;;cAYR,MAAM;;;;cAIN,MAAM;;;;UAEN,MAAM"}
@@ -1,12 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createProxyConfiguration = exports.ProxyConfiguration = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const consts_1 = require("@apify/consts");
5
- const ow_1 = require("ow");
6
+ const ow_1 = (0, tslib_1.__importDefault)(require("ow"));
6
7
  const constants_1 = require("./constants");
7
8
  const utils_1 = require("./utils");
8
9
  const utils_request_1 = require("./utils_request");
9
- const utils_log_1 = require("./utils_log");
10
+ const utils_log_1 = (0, tslib_1.__importDefault)(require("./utils_log"));
10
11
  const configuration_1 = require("./configuration");
11
12
  // CONSTANTS
12
13
  const PROTOCOL = 'http';
@@ -183,6 +184,10 @@ class ProxyConfiguration {
183
184
  this.log = utils_log_1.default.child({ prefix: 'ProxyConfiguration' });
184
185
  this.config = config;
185
186
  this.isManInTheMiddle = false;
187
+ if (proxyUrls && proxyUrls.some((url) => url.includes('apify.com'))) {
188
+ this.log.warning('Some Apify proxy features may work incorrectly. Please consider setting up Apify properties instead of `proxyUrls`.\n'
189
+ + 'See https://sdk.apify.com/docs/guides/proxy-management#apify-proxy-configuration');
190
+ }
186
191
  }
187
192
  /**
188
193
  * Loads proxy password if token is provided and checks access to Apify Proxy and provided proxy groups
@@ -509,3 +514,4 @@ const createProxyConfiguration = async (proxyConfigurationOptions = {}) => {
509
514
  return proxyConfiguration;
510
515
  };
511
516
  exports.createProxyConfiguration = createProxyConfiguration;
517
+ //# sourceMappingURL=proxy_configuration.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proxy_configuration.js","sourceRoot":"","sources":["../src/proxy_configuration.js"],"names":[],"mappings":"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"}
@@ -83,3 +83,4 @@ declare class PseudoUrl {
83
83
  }
84
84
  import { RequestOptions } from "./request";
85
85
  import Request from "./request";
86
+ //# sourceMappingURL=pseudo_url.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pseudo_url.d.ts","sourceRoot":"","sources":["../src/pseudo_url.js"],"names":[],"mappings":";AAmDA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH;IACI;;;;;;;;OAQG;IACH,kBARW,CAAC,MAAM,GAAC,MAAM,CAAC,oBAIf,cAAc,EAiBxB;IARO,cAAiB;IAOrB,gCAAsC;IAG1C;;;;;OAKG;IACH,aAHW,MAAM,GACL,OAAO,CAIlB;IAED;;;;;;;;;OASG;IACH,0BAHW,CAAC,MAAM;YAAQ,MAAM;KAAI,CAAC,GACzB,OAAO,CAOlB;CACJ"}
@@ -1,9 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const ow_1 = require("ow");
4
- const _ = require("underscore");
5
- const utils_log_1 = require("./utils_log");
6
- const request_1 = require("./request"); // eslint-disable-line import/named,no-unused-vars
3
+ const tslib_1 = require("tslib");
4
+ const ow_1 = (0, tslib_1.__importDefault)(require("ow"));
5
+ const underscore_1 = (0, tslib_1.__importDefault)(require("underscore"));
6
+ const utils_log_1 = (0, tslib_1.__importDefault)(require("./utils_log"));
7
+ const request_1 = (0, tslib_1.__importDefault)(require("./request")); // eslint-disable-line import/named,no-unused-vars
7
8
  /**
8
9
  * Parses PURL into Regex string.
9
10
  * @ignore
@@ -129,7 +130,7 @@ class PseudoUrl {
129
130
  * @return {boolean} Returns `true` if given URL matches pseudo-URL.
130
131
  */
131
132
  matches(url) {
132
- return _.isString(url) && url.match(this.regex) !== null;
133
+ return underscore_1.default.isString(url) && url.match(this.regex) !== null;
133
134
  }
134
135
  /**
135
136
  * Creates a Request object from a provided `requestTemplate` and a given URL
@@ -149,3 +150,4 @@ class PseudoUrl {
149
150
  }
150
151
  }
151
152
  exports.default = PseudoUrl;
153
+ //# sourceMappingURL=pseudo_url.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pseudo_url.js","sourceRoot":"","sources":["../src/pseudo_url.js"],"names":[],"mappings":";;;AAAA,yDAAoB;AACpB,yEAA2B;AAC3B,yEAA8B;AAC9B,qEAAoD,CAAC,kDAAkD;AAEvG;;;GAGG;AACH,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,EAAE;IACvB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,WAAW,mCAAmC,CAAC,CAAC;IAEpH,IAAI,KAAK,GAAG,GAAG,CAAC;IAEhB,IAAI;QACA,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACzC,MAAM,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAEjC,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,YAAY,KAAK,CAAC,EAAE;gBACpC,iCAAiC;gBACjC,4DAA4D;gBAC5D,KAAK,IAAI,GAAG,CAAC;aAChB;iBAAM,IAAI,EAAE,KAAK,GAAG,IAAI,YAAY,GAAG,CAAC,IAAI,EAAE,YAAY,KAAK,CAAC,EAAE;gBAC/D,2BAA2B;gBAC3B,KAAK,IAAI,GAAG,CAAC;aAChB;iBAAM,IAAI,YAAY,GAAG,CAAC,EAAE;gBACzB,2BAA2B;gBAC3B,KAAK,IAAI,EAAE,CAAC;aACf;iBAAM;gBACH,kDAAkD;gBAClD,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC9B,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,GAAG,CAAC,EAAE;oBACzF,qCAAqC;oBACrC,KAAK,IAAI,EAAE,CAAC;iBACf;qBAAM;oBACH,iCAAiC;oBACjC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;oBACpE,KAAK,IAAI,MAAM,GAAG,EAAE,CAAC;iBACxB;aACJ;SACJ;QACD,KAAK,IAAI,GAAG,CAAC;KAChB;IAAC,OAAO,GAAG,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC;KAC1D;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,MAAM,SAAS;IACX;;;;;;;;OAQG;IACH,YAAY,IAAI,EAAE,eAAe,GAAG,EAAE;QAClC,IAAA,YAAE,EAAC,IAAI,EAAE,YAAE,CAAC,GAAG,CAAC,YAAE,CAAC,MAAM,EAAE,YAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QACvC,IAAA,YAAE,EAAC,eAAe,EAAE,YAAE,CAAC,MAAM,CAAC,CAAC;QAE/B,IAAI,IAAI,YAAY,MAAM,EAAE;YACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;SACrB;aAAM;YACH,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;YAC9B,mBAAG,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;SACvC;QAED,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,GAAG;QACP,OAAO,oBAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;IAC7D,CAAC;IAED;;;;;;;;;OASG;IACH,aAAa,CAAC,UAAU;QACpB,MAAM,KAAK,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;QAChF,KAAK,CAAC,QAAQ,GAAG,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QACzE,MAAM,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,eAAe,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,0DAA0D;QACjH,OAAO,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;CACJ;AAED,kBAAe,SAAS,CAAC"}
@@ -3,3 +3,4 @@ export function removeInterceptRequestHandler(page: Page, handler: InterceptHand
3
3
  export type InterceptHandler = (request: any) => any;
4
4
  // @ts-ignore optional peer dependency
5
5
  import { Page } from "puppeteer";
6
+ //# sourceMappingURL=puppeteer_request_interception.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"puppeteer_request_interception.d.ts","sourceRoot":"","sources":["../src/puppeteer_request_interception.js"],"names":[],"mappings":"AA2KO,iDAPI,IAAI,WAEJ,gBAAgB,GACf,QAAQ,IAAI,CAAC,CAsCxB;AAYM,oDAPI,IAAI,WAEJ,gBAAgB,GACf,QAAQ,IAAI,CAAC,CAmCxB"}
@@ -1,9 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.removeInterceptRequestHandler = exports.addInterceptRequestHandler = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const events_1 = require("events");
5
- const ow_1 = require("ow");
6
- const _ = require("underscore");
6
+ const ow_1 = (0, tslib_1.__importDefault)(require("ow"));
7
+ const underscore_1 = (0, tslib_1.__importDefault)(require("underscore"));
8
+ const utils_log_1 = (0, tslib_1.__importDefault)(require("./utils_log"));
7
9
  // We use weak maps here so that the content gets discarted after page gets closed.
8
10
  const pageInterceptRequestHandlersMap = new WeakMap(); // Maps page to an array of request interception handlers.
9
11
  const pageInterceptRequestMasterHandlerMap = new WeakMap(); // Maps page to master request interception handler.
@@ -77,11 +79,11 @@ const handleRequest = async (request, interceptRequestHandlers) => {
77
79
  const headers = browserifyHeaders({ ...accumulatedOverrides.headers, ...overrides.headers });
78
80
  Object.assign(accumulatedOverrides, overrides, { headers });
79
81
  };
80
- request.abort = _.wrap(request.abort.bind(request), (abort, ...args) => {
82
+ request.abort = underscore_1.default.wrap(request.abort.bind(request), (abort, ...args) => {
81
83
  wasAborted = true;
82
84
  return abort(...args);
83
85
  });
84
- request.respond = _.wrap(request.respond.bind(request), (respond, ...args) => {
86
+ request.respond = underscore_1.default.wrap(request.respond.bind(request), (respond, ...args) => {
85
87
  wasResponded = true;
86
88
  return respond(...args);
87
89
  });
@@ -209,10 +211,15 @@ const removeInterceptRequestHandler = async (page, handler) => {
209
211
  await disableRequestInterception(page);
210
212
  }
211
213
  else {
212
- const onDelete = () => {
214
+ const onDelete = async () => {
213
215
  if (interceptedRequestsInProgress.size === 0) {
214
- disableRequestInterception(page);
215
- interceptedRequestsInProgress.removeListener('delete', onDelete);
216
+ try {
217
+ await disableRequestInterception(page);
218
+ interceptedRequestsInProgress.removeListener('delete', onDelete);
219
+ }
220
+ catch (error) {
221
+ utils_log_1.default.debug('Error while disabling request interception', { error });
222
+ }
216
223
  }
217
224
  };
218
225
  interceptedRequestsInProgress.on('delete', onDelete);
@@ -225,3 +232,4 @@ async function disableRequestInterception(page) {
225
232
  const requestHandler = pageInterceptRequestMasterHandlerMap.get(page);
226
233
  page.removeListener('request', requestHandler);
227
234
  }
235
+ //# sourceMappingURL=puppeteer_request_interception.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"puppeteer_request_interception.js","sourceRoot":"","sources":["../src/puppeteer_request_interception.js"],"names":[],"mappings":"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"}
@@ -247,3 +247,4 @@ declare function saveSnapshot(page: Page, options?: {
247
247
  keyValueStoreName?: string | null | undefined;
248
248
  } | undefined): Promise<void>;
249
249
  export {};
250
+ //# sourceMappingURL=puppeteer_utils.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"puppeteer_utils.d.ts","sourceRoot":"","sources":["../src/puppeteer_utils.js"],"names":[],"mappings":"AAsVO,mCATI,IAAI,WAEJ,OAAO,sBAEN,QAAQ,CAAC,MAAS,IAAI,CAAC,CAAC,CA2CnC;AAsBM,qCAjBI,IAAI;;;;;;gBAaF,QAAQ,IAAI,CAAC,CA6FzB;;;;;;;;;;;;;;;;;UApda,IAAI;aACJ,OAAO;;8CAIV,oBAAoB,KAClB,YAAU;;AAOvB;;;;;;;;;;;;;;;;;GAiBG;AACH,kCAXW,IAAI,YAEJ,MAAM;;gBAML,YAAU,CAmBrB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,oCALW,IAAI,GAEH,YAAU,CAMrB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wCAJW,IAAI,GACH,YAAU,CAMrB;;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH,qCAbW,IAAI;;;gBAUH,QAAQ,IAAI,CAAC,CAkBxB;AAED;;;;GAIG;AACH,oFAQC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,sCAXW,IAAI;QAEG,MAAM;qBAEb,MAAM,CAAC,MAAM,GAAC,MAAM,CAAC,CAAC,GAGrB,QAAQ,IAAI,CAAC,CA+CxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,6CALW,MAAM;QACC,MAAM;IACZ,sBAAsB,CAiBjC;;;AA0KD;;;;;;;;;;;;;;;;;;GAkBG;AACH,oCAjBW,IAAI;;;;;;gBAaF,QAAQ,IAAI,CAAC,CAsCzB"}
@@ -1,20 +1,21 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.puppeteerUtils = exports.infiniteScroll = exports.gotoExtended = void 0;
4
- const fs = require("fs");
5
- const ow_1 = require("ow");
6
- const vm = require("vm");
7
- const util = require("util");
8
- const _ = require("underscore");
4
+ const tslib_1 = require("tslib");
5
+ const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
6
+ const ow_1 = (0, tslib_1.__importDefault)(require("ow"));
7
+ const vm_1 = (0, tslib_1.__importDefault)(require("vm"));
8
+ const util_1 = (0, tslib_1.__importDefault)(require("util"));
9
+ const underscore_1 = (0, tslib_1.__importDefault)(require("underscore"));
9
10
  const datastructures_1 = require("@apify/datastructures");
10
- const utils_log_1 = require("./utils_log");
11
+ const utils_log_1 = (0, tslib_1.__importDefault)(require("./utils_log"));
11
12
  const validators_1 = require("./validators");
12
13
  const click_elements_1 = require("./enqueue_links/click_elements");
13
14
  const puppeteer_request_interception_1 = require("./puppeteer_request_interception");
14
15
  const key_value_store_1 = require("./storages/key_value_store");
15
16
  const jqueryPath = require.resolve('jquery');
16
17
  const underscorePath = require.resolve('underscore');
17
- const readFilePromised = util.promisify(fs.readFile);
18
+ const readFilePromised = util_1.default.promisify(fs_1.default.readFile);
18
19
  const MAX_INJECT_FILE_CACHE_SIZE = 10;
19
20
  const DEFAULT_BLOCK_REQUEST_URL_PATTERNS = ['.css', '.jpg', '.jpeg', '.png', '.svg', '.gif', '.woff', '.pdf', '.zip'];
20
21
  /**
@@ -293,13 +294,13 @@ const compileScript = (scriptString, context = Object.create(null)) => {
293
294
  const funcString = `async ({ page, request }) => {${scriptString}}`;
294
295
  let func;
295
296
  try {
296
- func = vm.runInNewContext(funcString, context); // "Secure" the context by removing prototypes, unless custom context is provided.
297
+ func = vm_1.default.runInNewContext(funcString, context); // "Secure" the context by removing prototypes, unless custom context is provided.
297
298
  }
298
299
  catch (err) {
299
300
  utils_log_1.default.exception(err, 'Cannot compile script!');
300
301
  throw err;
301
302
  }
302
- if (!_.isFunction(func))
303
+ if (!underscore_1.default.isFunction(func))
303
304
  throw new Error('Compilation result is not a function!'); // This should not happen...
304
305
  return func;
305
306
  };
@@ -330,7 +331,7 @@ const gotoExtended = async (page, request, gotoOptions = {}) => {
330
331
  }));
331
332
  (0, ow_1.default)(gotoOptions, ow_1.default.object);
332
333
  const { url, method, headers, payload } = request;
333
- if (method !== 'GET' || payload || !_.isEmpty(headers)) {
334
+ if (method !== 'GET' || payload || !underscore_1.default.isEmpty(headers)) {
334
335
  // This is not deprecated, we use it to log only once.
335
336
  utils_log_1.default.deprecated('Using other request methods than GET, rewriting headers and adding payloads has a high impact on performance '
336
337
  + 'in recent versions of Puppeteer. Use only when necessary.');
@@ -347,7 +348,7 @@ const gotoExtended = async (page, request, gotoOptions = {}) => {
347
348
  overrides.method = method;
348
349
  if (payload)
349
350
  overrides.postData = payload;
350
- if (!_.isEmpty(headers))
351
+ if (!underscore_1.default.isEmpty(headers))
351
352
  overrides.headers = headers;
352
353
  await (0, puppeteer_request_interception_1.removeInterceptRequestHandler)(page, interceptRequestHandler);
353
354
  interceptedRequest.continue(overrides);
@@ -402,6 +403,11 @@ const infiniteScroll = async (page, options = {}) => {
402
403
  resourcesStats.newRequested++;
403
404
  }
404
405
  });
406
+ // Move mouse to the center of the page, so we can scroll up-down
407
+ const body = await page.$('body');
408
+ const boundingBox = await body.boundingBox();
409
+ await page.mouse.move(boundingBox.x + boundingBox.width / 2, // x
410
+ boundingBox.y + boundingBox.height / 2);
405
411
  const checkFinished = setInterval(() => {
406
412
  if (resourcesStats.oldRequested === resourcesStats.newRequested) {
407
413
  resourcesStats.matchNumber++;
@@ -423,10 +429,9 @@ const infiniteScroll = async (page, options = {}) => {
423
429
  }, CHECK_INTERVAL_MILLIS);
424
430
  const doScroll = async () => {
425
431
  /* istanbul ignore next */
426
- await page.evaluate(async (scrollHeightIfZero) => {
427
- const delta = document.body.scrollHeight === 0 ? scrollHeightIfZero : document.body.scrollHeight;
428
- window.scrollBy(0, delta);
429
- }, SCROLL_HEIGHT_IF_ZERO);
432
+ const bodyScrollHeight = await page.evaluate(() => document.body.scrollHeight);
433
+ const delta = bodyScrollHeight === 0 ? SCROLL_HEIGHT_IF_ZERO : bodyScrollHeight;
434
+ await page.mouse.wheel({ deltaY: delta });
430
435
  };
431
436
  const maybeClickButton = async () => {
432
437
  const button = await page.$(buttonSelector);
@@ -437,11 +442,9 @@ const infiniteScroll = async (page, options = {}) => {
437
442
  };
438
443
  while (!finished) {
439
444
  await doScroll();
440
- await page.waitForTimeout(50);
445
+ await page.waitForTimeout(250);
441
446
  if (scrollDownAndUp) {
442
- await page.evaluate(() => {
443
- window.scrollBy(0, -1000);
444
- });
447
+ await page.mouse.wheel({ deltaY: -1000 });
445
448
  }
446
449
  if (buttonSelector) {
447
450
  await maybeClickButton();
@@ -536,3 +539,4 @@ exports.puppeteerUtils = {
536
539
  infiniteScroll: exports.infiniteScroll,
537
540
  saveSnapshot,
538
541
  };
542
+ //# sourceMappingURL=puppeteer_utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"puppeteer_utils.js","sourceRoot":"","sources":["../src/puppeteer_utils.js"],"names":[],"mappings":"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"}
@@ -177,3 +177,4 @@ declare class Request {
177
177
  useExtendedUniqueKey: any;
178
178
  }): any;
179
179
  }
180
+ //# sourceMappingURL=request.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../src/request.js"],"names":[],"mappings":"AASA,kDAOC;;;;;;;;;SAyNa,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAvMpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AACH;IACI;;;OAGG;IACH,qBAHW,cAAc,EA8DxB;IApBG,QAAY;IACZ,YAAc;IACd,eAA0B;IAC1B,eAAqH;IACrH,eAAoB;IACpB,qCAAsB;IACtB,aAAsB;IACtB,gBAA4B;IAC5B,qBAAuC;IAGvC,qCAAqC;IACrC;YADkB,MAAM,GAAE,MAAM;MACH;IAC7B,kCAAkC;IAClC;YADkB,MAAM,GAAE,GAAG;MACE;IAG/B,eAEe;IAGnB;;;;;;;;;;;;;OAaG;IACH,iCAJW,CAAC,KAAK,GAAC,MAAM,CAAC;;yBAkCxB;IAED;;;;OAIG;IACH;;;;;;YAcC;CACJ"}
package/build/request.js CHANGED
@@ -1,15 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.hashPayload = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const utilities_1 = require("@apify/utilities");
5
- const crypto = require("crypto");
6
- const ow_1 = require("ow");
7
- const util = require("util");
8
- const utils_log_1 = require("./utils_log");
6
+ const crypto_1 = (0, tslib_1.__importDefault)(require("crypto"));
7
+ const ow_1 = (0, tslib_1.__importStar)(require("ow"));
8
+ const util_1 = (0, tslib_1.__importDefault)(require("util"));
9
+ const utils_log_1 = (0, tslib_1.__importDefault)(require("./utils_log"));
9
10
  // new properties on the Request object breaks serialization
10
11
  const log = utils_log_1.default.child({ prefix: 'Request' });
11
12
  function hashPayload(payload) {
12
- return crypto
13
+ return crypto_1.default
13
14
  .createHash('sha256')
14
15
  .update(payload)
15
16
  .digest('base64')
@@ -176,7 +177,7 @@ class Request {
176
177
  }
177
178
  else {
178
179
  try {
179
- message = util.inspect(errorOrMessage);
180
+ message = util_1.default.inspect(errorOrMessage);
180
181
  }
181
182
  catch (err) {
182
183
  message = 'Unable to extract any message from the received object.';
@@ -257,3 +258,4 @@ exports.default = Request;
257
258
  * properties. This is useful when making requests to the same URL that are differentiated by method
258
259
  * or payload, such as form submit navigations in browsers.
259
260
  */
261
+ //# sourceMappingURL=request.js.map