@crawlee/browser-pool 3.13.6-beta.0 → 4.0.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.
- package/abstract-classes/browser-controller.d.ts +4 -4
- package/abstract-classes/browser-controller.d.ts.map +1 -1
- package/abstract-classes/browser-controller.js +43 -117
- package/abstract-classes/browser-controller.js.map +1 -1
- package/abstract-classes/browser-plugin.d.ts +5 -16
- package/abstract-classes/browser-plugin.d.ts.map +1 -1
- package/abstract-classes/browser-plugin.js +19 -71
- package/abstract-classes/browser-plugin.js.map +1 -1
- package/anonymize-proxy.js +4 -8
- package/anonymize-proxy.js.map +1 -1
- package/browser-pool.d.ts +6 -6
- package/browser-pool.d.ts.map +1 -1
- package/browser-pool.js +77 -209
- package/browser-pool.js.map +1 -1
- package/container-proxy-server.js +3 -6
- package/container-proxy-server.js.map +1 -1
- package/events.js +4 -7
- package/events.js.map +1 -1
- package/fingerprinting/hooks.d.ts +3 -3
- package/fingerprinting/hooks.d.ts.map +1 -1
- package/fingerprinting/hooks.js +13 -18
- package/fingerprinting/hooks.js.map +1 -1
- package/fingerprinting/types.js +6 -9
- package/fingerprinting/types.js.map +1 -1
- package/fingerprinting/utils.d.ts +2 -2
- package/fingerprinting/utils.d.ts.map +1 -1
- package/fingerprinting/utils.js +9 -13
- package/fingerprinting/utils.js.map +1 -1
- package/index.d.ts +13 -13
- package/index.d.ts.map +1 -1
- package/index.js +11 -26
- package/index.js.map +1 -1
- package/launch-context.d.ts +2 -9
- package/launch-context.d.ts.map +1 -1
- package/launch-context.js +12 -73
- package/launch-context.js.map +1 -1
- package/logger.js +2 -6
- package/logger.js.map +1 -1
- package/package.json +19 -25
- package/playwright/playwright-browser.js +6 -30
- package/playwright/playwright-browser.js.map +1 -1
- package/playwright/playwright-controller.d.ts +2 -2
- package/playwright/playwright-controller.d.ts.map +1 -1
- package/playwright/playwright-controller.js +9 -75
- package/playwright/playwright-controller.js.map +1 -1
- package/playwright/playwright-plugin.d.ts +6 -6
- package/playwright/playwright-plugin.d.ts.map +1 -1
- package/playwright/playwright-plugin.js +19 -106
- package/playwright/playwright-plugin.js.map +1 -1
- package/proxy-server.js +3 -6
- package/proxy-server.js.map +1 -1
- package/puppeteer/puppeteer-controller.d.ts +1 -1
- package/puppeteer/puppeteer-controller.d.ts.map +1 -1
- package/puppeteer/puppeteer-controller.js +13 -17
- package/puppeteer/puppeteer-controller.js.map +1 -1
- package/puppeteer/puppeteer-plugin.d.ts +5 -5
- package/puppeteer/puppeteer-plugin.d.ts.map +1 -1
- package/puppeteer/puppeteer-plugin.js +16 -23
- package/puppeteer/puppeteer-plugin.js.map +1 -1
- package/tsconfig.build.tsbuildinfo +1 -1
- package/utils.d.ts +3 -3
- package/utils.d.ts.map +1 -1
- package/utils.js +1 -4
- package/utils.js.map +1 -1
- package/index.mjs +0 -19
- package/playwright/load-firefox-addon.d.ts +0 -2
- package/playwright/load-firefox-addon.d.ts.map +0 -1
- package/playwright/load-firefox-addon.js +0 -86
- package/playwright/load-firefox-addon.js.map +0 -1
- package/tab-as-a-container/background.js +0 -433
- package/tab-as-a-container/content.js +0 -611
- package/tab-as-a-container/manifest.json +0 -21
package/browser-pool.js
CHANGED
|
@@ -1,17 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const tiny_typed_emitter_1 = require("tiny-typed-emitter");
|
|
12
|
-
const timeout_1 = require("@apify/timeout");
|
|
13
|
-
const hooks_1 = require("./fingerprinting/hooks");
|
|
14
|
-
const logger_1 = require("./logger");
|
|
1
|
+
import { FingerprintGenerator } from 'fingerprint-generator';
|
|
2
|
+
import { FingerprintInjector } from 'fingerprint-injector';
|
|
3
|
+
import { nanoid } from 'nanoid';
|
|
4
|
+
import ow from 'ow';
|
|
5
|
+
import pLimit from 'p-limit';
|
|
6
|
+
import QuickLRU from 'quick-lru';
|
|
7
|
+
import { TypedEmitter } from 'tiny-typed-emitter';
|
|
8
|
+
import { addTimeoutToPromise, tryCancel } from '@apify/timeout';
|
|
9
|
+
import { createFingerprintPreLaunchHook, createPostPageCreateHook, createPrePageCreateHook, } from './fingerprinting/hooks.js';
|
|
10
|
+
import { log } from './logger.js';
|
|
15
11
|
const PAGE_CLOSE_KILL_TIMEOUT_MILLIS = 1000;
|
|
16
12
|
const BROWSER_KILLER_INTERVAL_MILLIS = 10 * 1000;
|
|
17
13
|
/**
|
|
@@ -61,175 +57,50 @@ const BROWSER_KILLER_INTERVAL_MILLIS = 10 * 1000;
|
|
|
61
57
|
* });
|
|
62
58
|
* ```
|
|
63
59
|
*/
|
|
64
|
-
class BrowserPool extends
|
|
60
|
+
export class BrowserPool extends TypedEmitter {
|
|
61
|
+
browserPlugins;
|
|
62
|
+
maxOpenPagesPerBrowser;
|
|
63
|
+
retireBrowserAfterPageCount;
|
|
64
|
+
operationTimeoutMillis;
|
|
65
|
+
closeInactiveBrowserAfterMillis;
|
|
66
|
+
useFingerprints;
|
|
67
|
+
fingerprintOptions;
|
|
68
|
+
preLaunchHooks;
|
|
69
|
+
postLaunchHooks;
|
|
70
|
+
prePageCreateHooks;
|
|
71
|
+
postPageCreateHooks;
|
|
72
|
+
prePageCloseHooks;
|
|
73
|
+
postPageCloseHooks;
|
|
74
|
+
pageCounter = 0;
|
|
75
|
+
pages = new Map();
|
|
76
|
+
pageIds = new WeakMap();
|
|
77
|
+
activeBrowserControllers = new Set();
|
|
78
|
+
retiredBrowserControllers = new Set();
|
|
79
|
+
pageToBrowserController = new WeakMap();
|
|
80
|
+
fingerprintInjector;
|
|
81
|
+
fingerprintGenerator;
|
|
82
|
+
fingerprintCache;
|
|
83
|
+
browserKillerInterval = setInterval(async () => this._closeInactiveRetiredBrowsers(), BROWSER_KILLER_INTERVAL_MILLIS);
|
|
84
|
+
browserRetireInterval;
|
|
85
|
+
limiter = pLimit(1);
|
|
65
86
|
constructor(options) {
|
|
66
87
|
super();
|
|
67
|
-
Object.defineProperty(this, "browserPlugins", {
|
|
68
|
-
enumerable: true,
|
|
69
|
-
configurable: true,
|
|
70
|
-
writable: true,
|
|
71
|
-
value: void 0
|
|
72
|
-
});
|
|
73
|
-
Object.defineProperty(this, "maxOpenPagesPerBrowser", {
|
|
74
|
-
enumerable: true,
|
|
75
|
-
configurable: true,
|
|
76
|
-
writable: true,
|
|
77
|
-
value: void 0
|
|
78
|
-
});
|
|
79
|
-
Object.defineProperty(this, "retireBrowserAfterPageCount", {
|
|
80
|
-
enumerable: true,
|
|
81
|
-
configurable: true,
|
|
82
|
-
writable: true,
|
|
83
|
-
value: void 0
|
|
84
|
-
});
|
|
85
|
-
Object.defineProperty(this, "operationTimeoutMillis", {
|
|
86
|
-
enumerable: true,
|
|
87
|
-
configurable: true,
|
|
88
|
-
writable: true,
|
|
89
|
-
value: void 0
|
|
90
|
-
});
|
|
91
|
-
Object.defineProperty(this, "closeInactiveBrowserAfterMillis", {
|
|
92
|
-
enumerable: true,
|
|
93
|
-
configurable: true,
|
|
94
|
-
writable: true,
|
|
95
|
-
value: void 0
|
|
96
|
-
});
|
|
97
|
-
Object.defineProperty(this, "useFingerprints", {
|
|
98
|
-
enumerable: true,
|
|
99
|
-
configurable: true,
|
|
100
|
-
writable: true,
|
|
101
|
-
value: void 0
|
|
102
|
-
});
|
|
103
|
-
Object.defineProperty(this, "fingerprintOptions", {
|
|
104
|
-
enumerable: true,
|
|
105
|
-
configurable: true,
|
|
106
|
-
writable: true,
|
|
107
|
-
value: void 0
|
|
108
|
-
});
|
|
109
|
-
Object.defineProperty(this, "preLaunchHooks", {
|
|
110
|
-
enumerable: true,
|
|
111
|
-
configurable: true,
|
|
112
|
-
writable: true,
|
|
113
|
-
value: void 0
|
|
114
|
-
});
|
|
115
|
-
Object.defineProperty(this, "postLaunchHooks", {
|
|
116
|
-
enumerable: true,
|
|
117
|
-
configurable: true,
|
|
118
|
-
writable: true,
|
|
119
|
-
value: void 0
|
|
120
|
-
});
|
|
121
|
-
Object.defineProperty(this, "prePageCreateHooks", {
|
|
122
|
-
enumerable: true,
|
|
123
|
-
configurable: true,
|
|
124
|
-
writable: true,
|
|
125
|
-
value: void 0
|
|
126
|
-
});
|
|
127
|
-
Object.defineProperty(this, "postPageCreateHooks", {
|
|
128
|
-
enumerable: true,
|
|
129
|
-
configurable: true,
|
|
130
|
-
writable: true,
|
|
131
|
-
value: void 0
|
|
132
|
-
});
|
|
133
|
-
Object.defineProperty(this, "prePageCloseHooks", {
|
|
134
|
-
enumerable: true,
|
|
135
|
-
configurable: true,
|
|
136
|
-
writable: true,
|
|
137
|
-
value: void 0
|
|
138
|
-
});
|
|
139
|
-
Object.defineProperty(this, "postPageCloseHooks", {
|
|
140
|
-
enumerable: true,
|
|
141
|
-
configurable: true,
|
|
142
|
-
writable: true,
|
|
143
|
-
value: void 0
|
|
144
|
-
});
|
|
145
|
-
Object.defineProperty(this, "pageCounter", {
|
|
146
|
-
enumerable: true,
|
|
147
|
-
configurable: true,
|
|
148
|
-
writable: true,
|
|
149
|
-
value: 0
|
|
150
|
-
});
|
|
151
|
-
Object.defineProperty(this, "pages", {
|
|
152
|
-
enumerable: true,
|
|
153
|
-
configurable: true,
|
|
154
|
-
writable: true,
|
|
155
|
-
value: new Map()
|
|
156
|
-
});
|
|
157
|
-
Object.defineProperty(this, "pageIds", {
|
|
158
|
-
enumerable: true,
|
|
159
|
-
configurable: true,
|
|
160
|
-
writable: true,
|
|
161
|
-
value: new WeakMap()
|
|
162
|
-
});
|
|
163
|
-
Object.defineProperty(this, "activeBrowserControllers", {
|
|
164
|
-
enumerable: true,
|
|
165
|
-
configurable: true,
|
|
166
|
-
writable: true,
|
|
167
|
-
value: new Set()
|
|
168
|
-
});
|
|
169
|
-
Object.defineProperty(this, "retiredBrowserControllers", {
|
|
170
|
-
enumerable: true,
|
|
171
|
-
configurable: true,
|
|
172
|
-
writable: true,
|
|
173
|
-
value: new Set()
|
|
174
|
-
});
|
|
175
|
-
Object.defineProperty(this, "pageToBrowserController", {
|
|
176
|
-
enumerable: true,
|
|
177
|
-
configurable: true,
|
|
178
|
-
writable: true,
|
|
179
|
-
value: new WeakMap()
|
|
180
|
-
});
|
|
181
|
-
Object.defineProperty(this, "fingerprintInjector", {
|
|
182
|
-
enumerable: true,
|
|
183
|
-
configurable: true,
|
|
184
|
-
writable: true,
|
|
185
|
-
value: void 0
|
|
186
|
-
});
|
|
187
|
-
Object.defineProperty(this, "fingerprintGenerator", {
|
|
188
|
-
enumerable: true,
|
|
189
|
-
configurable: true,
|
|
190
|
-
writable: true,
|
|
191
|
-
value: void 0
|
|
192
|
-
});
|
|
193
|
-
Object.defineProperty(this, "fingerprintCache", {
|
|
194
|
-
enumerable: true,
|
|
195
|
-
configurable: true,
|
|
196
|
-
writable: true,
|
|
197
|
-
value: void 0
|
|
198
|
-
});
|
|
199
|
-
Object.defineProperty(this, "browserKillerInterval", {
|
|
200
|
-
enumerable: true,
|
|
201
|
-
configurable: true,
|
|
202
|
-
writable: true,
|
|
203
|
-
value: setInterval(async () => this._closeInactiveRetiredBrowsers(), BROWSER_KILLER_INTERVAL_MILLIS)
|
|
204
|
-
});
|
|
205
|
-
Object.defineProperty(this, "browserRetireInterval", {
|
|
206
|
-
enumerable: true,
|
|
207
|
-
configurable: true,
|
|
208
|
-
writable: true,
|
|
209
|
-
value: void 0
|
|
210
|
-
});
|
|
211
|
-
Object.defineProperty(this, "limiter", {
|
|
212
|
-
enumerable: true,
|
|
213
|
-
configurable: true,
|
|
214
|
-
writable: true,
|
|
215
|
-
value: (0, p_limit_1.default)(1)
|
|
216
|
-
});
|
|
217
88
|
this.browserKillerInterval.unref();
|
|
218
|
-
(
|
|
219
|
-
browserPlugins:
|
|
220
|
-
maxOpenPagesPerBrowser:
|
|
221
|
-
retireBrowserAfterPageCount:
|
|
222
|
-
operationTimeoutSecs:
|
|
223
|
-
closeInactiveBrowserAfterSecs:
|
|
224
|
-
retireInactiveBrowserAfterSecs:
|
|
225
|
-
preLaunchHooks:
|
|
226
|
-
postLaunchHooks:
|
|
227
|
-
prePageCreateHooks:
|
|
228
|
-
postPageCreateHooks:
|
|
229
|
-
prePageCloseHooks:
|
|
230
|
-
postPageCloseHooks:
|
|
231
|
-
useFingerprints:
|
|
232
|
-
fingerprintOptions:
|
|
89
|
+
ow(options, ow.object.exactShape({
|
|
90
|
+
browserPlugins: ow.array.minLength(1),
|
|
91
|
+
maxOpenPagesPerBrowser: ow.optional.number,
|
|
92
|
+
retireBrowserAfterPageCount: ow.optional.number,
|
|
93
|
+
operationTimeoutSecs: ow.optional.number,
|
|
94
|
+
closeInactiveBrowserAfterSecs: ow.optional.number,
|
|
95
|
+
retireInactiveBrowserAfterSecs: ow.optional.number,
|
|
96
|
+
preLaunchHooks: ow.optional.array,
|
|
97
|
+
postLaunchHooks: ow.optional.array,
|
|
98
|
+
prePageCreateHooks: ow.optional.array,
|
|
99
|
+
postPageCreateHooks: ow.optional.array,
|
|
100
|
+
prePageCloseHooks: ow.optional.array,
|
|
101
|
+
postPageCloseHooks: ow.optional.array,
|
|
102
|
+
useFingerprints: ow.optional.boolean,
|
|
103
|
+
fingerprintOptions: ow.optional.object,
|
|
233
104
|
}));
|
|
234
105
|
const { browserPlugins, maxOpenPagesPerBrowser = 20, retireBrowserAfterPageCount = 100, operationTimeoutSecs = 15, closeInactiveBrowserAfterSecs = 300, retireInactiveBrowserAfterSecs = 10, preLaunchHooks = [], postLaunchHooks = [], prePageCreateHooks = [], postPageCreateHooks = [], prePageCloseHooks = [], postPageCloseHooks = [], useFingerprints = true, fingerprintOptions = {}, } = options;
|
|
235
106
|
const firstPluginConstructor = browserPlugins[0].constructor;
|
|
@@ -273,7 +144,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
273
144
|
* or their page limits have been exceeded.
|
|
274
145
|
*/
|
|
275
146
|
async newPage(options = {}) {
|
|
276
|
-
const { id =
|
|
147
|
+
const { id = nanoid(), pageOptions, browserPlugin = this._pickBrowserPlugin(), proxyUrl, proxyTier } = options;
|
|
277
148
|
if (this.pages.has(id)) {
|
|
278
149
|
throw new Error(`Page with ID: ${id} already exists.`);
|
|
279
150
|
}
|
|
@@ -285,7 +156,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
285
156
|
let browserController = this._pickBrowserWithFreeCapacity(browserPlugin, { proxyTier, proxyUrl });
|
|
286
157
|
if (!browserController)
|
|
287
158
|
browserController = await this._launchBrowser(id, { browserPlugin, proxyTier, proxyUrl });
|
|
288
|
-
|
|
159
|
+
tryCancel();
|
|
289
160
|
return await this._createPageForBrowser(id, browserController, pageOptions, proxyUrl);
|
|
290
161
|
});
|
|
291
162
|
}
|
|
@@ -295,12 +166,12 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
295
166
|
* configure the new browser.
|
|
296
167
|
*/
|
|
297
168
|
async newPageInNewBrowser(options = {}) {
|
|
298
|
-
const { id =
|
|
169
|
+
const { id = nanoid(), pageOptions, launchOptions, browserPlugin = this._pickBrowserPlugin() } = options;
|
|
299
170
|
if (this.pages.has(id)) {
|
|
300
171
|
throw new Error(`Page with ID: ${id} already exists.`);
|
|
301
172
|
}
|
|
302
173
|
const browserController = await this._launchBrowser(id, { launchOptions, browserPlugin });
|
|
303
|
-
|
|
174
|
+
tryCancel();
|
|
304
175
|
return await this._createPageForBrowser(id, browserController, pageOptions);
|
|
305
176
|
}
|
|
306
177
|
/**
|
|
@@ -372,19 +243,17 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
372
243
|
// It's not ideal though, we need to come up with a better API.
|
|
373
244
|
// eslint-disable-next-line dot-notation -- accessing private property
|
|
374
245
|
await browserController['isActivePromise'];
|
|
375
|
-
|
|
376
|
-
const finalPageOptions = browserController.launchContext.useIncognitoPages
|
|
377
|
-
? pageOptions
|
|
378
|
-
: undefined;
|
|
246
|
+
tryCancel();
|
|
247
|
+
const finalPageOptions = browserController.launchContext.useIncognitoPages ? pageOptions : undefined;
|
|
379
248
|
if (finalPageOptions) {
|
|
380
249
|
Object.assign(finalPageOptions, browserController.normalizeProxyOptions(proxyUrl, pageOptions));
|
|
381
250
|
}
|
|
382
251
|
await this._executeHooks(this.prePageCreateHooks, pageId, browserController, finalPageOptions);
|
|
383
|
-
|
|
252
|
+
tryCancel();
|
|
384
253
|
let page;
|
|
385
254
|
try {
|
|
386
|
-
page = (await
|
|
387
|
-
|
|
255
|
+
page = (await addTimeoutToPromise(async () => browserController.newPage(finalPageOptions), this.operationTimeoutMillis, 'browserController.newPage() timed out.'));
|
|
256
|
+
tryCancel();
|
|
388
257
|
this.pages.set(pageId, page);
|
|
389
258
|
this.pageIds.set(page, pageId);
|
|
390
259
|
this.pageToBrowserController.set(page, browserController);
|
|
@@ -399,7 +268,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
399
268
|
throw new Error(`browserController.newPage() failed: ${browserController.id}\nCause:${err.message}.`);
|
|
400
269
|
}
|
|
401
270
|
await this._executeHooks(this.postPageCreateHooks, page, browserController);
|
|
402
|
-
|
|
271
|
+
tryCancel();
|
|
403
272
|
this.emit("pageCreated" /* BROWSER_POOL_EVENTS.PAGE_CREATED */, page);
|
|
404
273
|
return page;
|
|
405
274
|
}
|
|
@@ -478,16 +347,16 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
478
347
|
// If the hooks or the launch fails, we need to delete the controller,
|
|
479
348
|
// because otherwise it would be stuck in limbo without a browser.
|
|
480
349
|
await this._executeHooks(this.preLaunchHooks, pageId, launchContext);
|
|
481
|
-
|
|
350
|
+
tryCancel();
|
|
482
351
|
const browser = await browserPlugin.launch(launchContext);
|
|
483
|
-
|
|
352
|
+
tryCancel();
|
|
484
353
|
browserController.assignBrowser(browser, launchContext);
|
|
485
354
|
}
|
|
486
355
|
catch (err) {
|
|
487
356
|
this.activeBrowserControllers.delete(browserController);
|
|
488
357
|
throw err;
|
|
489
358
|
}
|
|
490
|
-
|
|
359
|
+
log.debug('Launched new browser.', { id: browserController.id });
|
|
491
360
|
browserController.proxyTier = proxyTier;
|
|
492
361
|
browserController.proxyUrl = proxyUrl;
|
|
493
362
|
try {
|
|
@@ -498,13 +367,13 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
498
367
|
catch (err) {
|
|
499
368
|
this.activeBrowserControllers.delete(browserController);
|
|
500
369
|
browserController.close().catch((closeErr) => {
|
|
501
|
-
|
|
370
|
+
log.error(`Could not close browser whose post-launch hooks failed.\nCause:${closeErr.message}`, {
|
|
502
371
|
id: browserController.id,
|
|
503
372
|
});
|
|
504
373
|
});
|
|
505
374
|
throw err;
|
|
506
375
|
}
|
|
507
|
-
|
|
376
|
+
tryCancel();
|
|
508
377
|
browserController.activate();
|
|
509
378
|
this.emit("browserLaunched" /* BROWSER_POOL_EVENTS.BROWSER_LAUNCHED */, browserController);
|
|
510
379
|
return browserController;
|
|
@@ -540,14 +409,14 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
540
409
|
const isBrowserEmpty = controller.activePages === 0;
|
|
541
410
|
if (isBrowserIdle || isBrowserEmpty) {
|
|
542
411
|
const { id } = controller;
|
|
543
|
-
|
|
412
|
+
log.debug('Closing retired browser.', { id });
|
|
544
413
|
await controller.close();
|
|
545
414
|
this.retiredBrowserControllers.delete(controller);
|
|
546
415
|
closedBrowserIds.push(id);
|
|
547
416
|
}
|
|
548
417
|
}
|
|
549
418
|
if (closedBrowserIds.length) {
|
|
550
|
-
|
|
419
|
+
log.debug('Closed retired browsers.', {
|
|
551
420
|
count: closedBrowserIds.length,
|
|
552
421
|
closedBrowserIds,
|
|
553
422
|
});
|
|
@@ -560,7 +429,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
560
429
|
page.close = async (...args) => {
|
|
561
430
|
await this._executeHooks(this.prePageCloseHooks, page, browserController);
|
|
562
431
|
await originalPageClose.apply(page, args).catch((err) => {
|
|
563
|
-
|
|
432
|
+
log.debug(`Could not close page.\nCause:${err.message}`, { id: browserController.id });
|
|
564
433
|
});
|
|
565
434
|
await this._executeHooks(this.postPageCloseHooks, pageId, browserController);
|
|
566
435
|
this.pages.delete(pageId);
|
|
@@ -578,7 +447,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
578
447
|
// Run this with a delay, otherwise page.close()
|
|
579
448
|
// might fail with "Protocol error (Target.closeTarget): Target closed."
|
|
580
449
|
setTimeout(() => {
|
|
581
|
-
|
|
450
|
+
log.debug('Closing retired browser because it has no active pages', { id: browserController.id });
|
|
582
451
|
void browserController.close().finally(() => {
|
|
583
452
|
this.retiredBrowserControllers.delete(browserController);
|
|
584
453
|
});
|
|
@@ -586,11 +455,11 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
586
455
|
}
|
|
587
456
|
}
|
|
588
457
|
_initializeFingerprinting() {
|
|
589
|
-
const { useFingerprintCache = true, fingerprintCacheSize =
|
|
590
|
-
this.fingerprintGenerator = new
|
|
591
|
-
this.fingerprintInjector = new
|
|
458
|
+
const { useFingerprintCache = true, fingerprintCacheSize = 10_000 } = this.fingerprintOptions;
|
|
459
|
+
this.fingerprintGenerator = new FingerprintGenerator(this.fingerprintOptions.fingerprintGeneratorOptions);
|
|
460
|
+
this.fingerprintInjector = new FingerprintInjector();
|
|
592
461
|
if (useFingerprintCache) {
|
|
593
|
-
this.fingerprintCache = new
|
|
462
|
+
this.fingerprintCache = new QuickLRU({ maxSize: fingerprintCacheSize });
|
|
594
463
|
}
|
|
595
464
|
this._addFingerprintHooks();
|
|
596
465
|
}
|
|
@@ -599,11 +468,10 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
599
468
|
...this.preLaunchHooks,
|
|
600
469
|
// This is flipped because of the fingerprint cache.
|
|
601
470
|
// It is usual to generate proxy per browser and we want to know the proxyUrl for the caching.
|
|
602
|
-
|
|
471
|
+
createFingerprintPreLaunchHook(this),
|
|
603
472
|
];
|
|
604
|
-
this.prePageCreateHooks = [
|
|
605
|
-
this.postPageCreateHooks = [
|
|
473
|
+
this.prePageCreateHooks = [createPrePageCreateHook(), ...this.prePageCreateHooks];
|
|
474
|
+
this.postPageCreateHooks = [createPostPageCreateHook(this.fingerprintInjector), ...this.postPageCreateHooks];
|
|
606
475
|
}
|
|
607
476
|
}
|
|
608
|
-
exports.BrowserPool = BrowserPool;
|
|
609
477
|
//# sourceMappingURL=browser-pool.js.map
|
package/browser-pool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-pool.js","sourceRoot":"","sources":["../src/browser-pool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"browser-pool.js","sourceRoot":"","sources":["../src/browser-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createProxyServerForContainers = createProxyServerForContainers;
|
|
4
|
-
const proxy_chain_1 = require("proxy-chain");
|
|
1
|
+
import { Server as ProxyChainServer } from 'proxy-chain';
|
|
5
2
|
/**
|
|
6
3
|
* Creates a proxy server designed to handle requests from "container" instances.
|
|
7
4
|
* Each container instance is assigned to a different (but still localhost) IP address
|
|
8
5
|
* in order to work around authorization and to enable upstream.
|
|
9
6
|
* @internal
|
|
10
7
|
*/
|
|
11
|
-
async function createProxyServerForContainers(fallbackProxyUrl) {
|
|
8
|
+
export async function createProxyServerForContainers(fallbackProxyUrl) {
|
|
12
9
|
const ipToProxy = new Map();
|
|
13
|
-
const proxyServer = new
|
|
10
|
+
const proxyServer = new ProxyChainServer({
|
|
14
11
|
prepareRequestFunction({ request }) {
|
|
15
12
|
const prefix4to6 = '::ffff:';
|
|
16
13
|
const localAddress = request.socket.localAddress.startsWith(prefix4to6)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-proxy-server.js","sourceRoot":"","sources":["../src/container-proxy-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"container-proxy-server.js","sourceRoot":"","sources":["../src/container-proxy-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEzD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,gBAAyB;IAC1E,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE5C,MAAM,WAAW,GAAG,IAAI,gBAAgB,CAAC;QACrC,sBAAsB,CAAC,EAAE,OAAO,EAAE;YAC9B,MAAM,UAAU,GAAG,SAAS,CAAC;YAC7B,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,YAAa,CAAC,UAAU,CAAC,UAAU,CAAC;gBACpE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAa,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;gBACvD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAa,CAAC;YAEnC,MAAM,gBAAgB,GAAG,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAErD,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;gBACjC,IAAI,gBAAgB,EAAE,CAAC;oBACnB,OAAO;wBACH,gBAAgB,EAAE,gBAAgB;wBAClC,qBAAqB,EAAE,KAAK;qBAC/B,CAAC;gBACN,CAAC;gBAED,OAAO,CAAC,IAAI,CAAC,yBAAyB,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YAClF,CAAC;YAED,OAAO;gBACH,gBAAgB;gBAChB,qBAAqB,EAAE,KAAK;aAC/B,CAAC;QACN,CAAC;QACD,IAAI,EAAE,CAAC;KACV,CAAC,CAAC;IAEH,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;IAE3B,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAE3B,OAAO;QACH,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,SAAS;QACT,KAAK,CAAC,KAAK,CAAC,gBAAyB;YACjC,OAAO,WAAW,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAC/C,CAAC;KACJ,CAAC;AACN,CAAC"}
|
package/events.js
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.BROWSER_CONTROLLER_EVENTS = exports.BROWSER_POOL_EVENTS = void 0;
|
|
4
|
-
var BROWSER_POOL_EVENTS;
|
|
1
|
+
export var BROWSER_POOL_EVENTS;
|
|
5
2
|
(function (BROWSER_POOL_EVENTS) {
|
|
6
3
|
BROWSER_POOL_EVENTS["BROWSER_LAUNCHED"] = "browserLaunched";
|
|
7
4
|
BROWSER_POOL_EVENTS["BROWSER_RETIRED"] = "browserRetired";
|
|
8
5
|
BROWSER_POOL_EVENTS["BROWSER_CLOSED"] = "browserClosed";
|
|
9
6
|
BROWSER_POOL_EVENTS["PAGE_CREATED"] = "pageCreated";
|
|
10
7
|
BROWSER_POOL_EVENTS["PAGE_CLOSED"] = "pageClosed";
|
|
11
|
-
})(BROWSER_POOL_EVENTS || (
|
|
12
|
-
var BROWSER_CONTROLLER_EVENTS;
|
|
8
|
+
})(BROWSER_POOL_EVENTS || (BROWSER_POOL_EVENTS = {}));
|
|
9
|
+
export var BROWSER_CONTROLLER_EVENTS;
|
|
13
10
|
(function (BROWSER_CONTROLLER_EVENTS) {
|
|
14
11
|
BROWSER_CONTROLLER_EVENTS["BROWSER_CLOSED"] = "browserClosed";
|
|
15
|
-
})(BROWSER_CONTROLLER_EVENTS || (
|
|
12
|
+
})(BROWSER_CONTROLLER_EVENTS || (BROWSER_CONTROLLER_EVENTS = {}));
|
|
16
13
|
//# sourceMappingURL=events.js.map
|
package/events.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAkB,mBAOjB;AAPD,WAAkB,mBAAmB;IACjC,2DAAoC,CAAA;IACpC,yDAAkC,CAAA;IAClC,uDAAgC,CAAA;IAEhC,mDAA4B,CAAA;IAC5B,iDAA0B,CAAA;AAC9B,CAAC,EAPiB,mBAAmB,KAAnB,mBAAmB,QAOpC;AAED,MAAM,CAAN,IAAkB,yBAEjB;AAFD,WAAkB,yBAAyB;IACvC,6DAAgC,CAAA;AACpC,CAAC,EAFiB,yBAAyB,KAAzB,yBAAyB,QAE1C"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { FingerprintInjector } from 'fingerprint-injector';
|
|
2
|
-
import type { BrowserController } from '../abstract-classes/browser-controller';
|
|
3
|
-
import type { BrowserPool } from '../browser-pool';
|
|
4
|
-
import type { LaunchContext } from '../launch-context';
|
|
2
|
+
import type { BrowserController } from '../abstract-classes/browser-controller.js';
|
|
3
|
+
import type { BrowserPool } from '../browser-pool.js';
|
|
4
|
+
import type { LaunchContext } from '../launch-context.js';
|
|
5
5
|
/**
|
|
6
6
|
* @internal
|
|
7
7
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/fingerprinting/hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/fingerprinting/hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAK1D;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAOpF,SAAS,MAAM,EAAE,eAAe,aAAa,UAoCxD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,KAC3B,SAAS,MAAM,EAAE,mBAAmB,iBAAiB,EAAE,aAAa,GAAG,KAAG,IAAI,CAYzF;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,mBAAmB,EAAE,mBAAmB,IAC/D,MAAM,GAAG,EAAE,mBAAmB,iBAAiB,KAAG,OAAO,CAAC,IAAI,CAAC,CA0BhF"}
|
package/fingerprinting/hooks.js
CHANGED
|
@@ -1,22 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
exports.createPrePageCreateHook = createPrePageCreateHook;
|
|
5
|
-
exports.createPostPageCreateHook = createPostPageCreateHook;
|
|
6
|
-
const playwright_plugin_1 = require("../playwright/playwright-plugin");
|
|
7
|
-
const puppeteer_plugin_1 = require("../puppeteer/puppeteer-plugin");
|
|
8
|
-
const utils_1 = require("./utils");
|
|
1
|
+
import { PlaywrightPlugin } from '../playwright/playwright-plugin.js';
|
|
2
|
+
import { PuppeteerPlugin } from '../puppeteer/puppeteer-plugin.js';
|
|
3
|
+
import { getGeneratorDefaultOptions } from './utils.js';
|
|
9
4
|
/**
|
|
10
5
|
* @internal
|
|
11
6
|
*/
|
|
12
|
-
function createFingerprintPreLaunchHook(browserPool) {
|
|
7
|
+
export function createFingerprintPreLaunchHook(browserPool) {
|
|
13
8
|
const { fingerprintGenerator, fingerprintCache, fingerprintOptions: { fingerprintGeneratorOptions }, } = browserPool;
|
|
14
9
|
return (_pageId, launchContext) => {
|
|
15
10
|
const { useIncognitoPages } = launchContext;
|
|
16
11
|
const cacheKey = launchContext.session?.id ?? launchContext.proxyUrl;
|
|
17
12
|
const { launchOptions } = launchContext;
|
|
18
13
|
// If no options are passed we try to pass best default options as possible to match browser and OS.
|
|
19
|
-
const fingerprintGeneratorFinalOptions = fingerprintGeneratorOptions ||
|
|
14
|
+
const fingerprintGeneratorFinalOptions = fingerprintGeneratorOptions || getGeneratorDefaultOptions(launchContext);
|
|
20
15
|
let fingerprint;
|
|
21
16
|
if (cacheKey && fingerprintCache?.has(cacheKey)) {
|
|
22
17
|
fingerprint = fingerprintCache.get(cacheKey);
|
|
@@ -43,29 +38,29 @@ function createFingerprintPreLaunchHook(browserPool) {
|
|
|
43
38
|
/**
|
|
44
39
|
* @internal
|
|
45
40
|
*/
|
|
46
|
-
function createPrePageCreateHook() {
|
|
41
|
+
export function createPrePageCreateHook() {
|
|
47
42
|
return (_pageId, browserController, pageOptions) => {
|
|
48
43
|
const { launchContext, browserPlugin } = browserController;
|
|
49
44
|
const { fingerprint } = launchContext.fingerprint;
|
|
50
|
-
if (launchContext.useIncognitoPages && browserPlugin instanceof
|
|
51
|
-
pageOptions.userAgent
|
|
52
|
-
pageOptions.viewport
|
|
45
|
+
if (launchContext.useIncognitoPages && browserPlugin instanceof PlaywrightPlugin && pageOptions) {
|
|
46
|
+
pageOptions.userAgent ??= fingerprint.navigator.userAgent;
|
|
47
|
+
pageOptions.viewport ??= {
|
|
53
48
|
width: fingerprint.screen.width,
|
|
54
49
|
height: fingerprint.screen.height,
|
|
55
|
-
}
|
|
50
|
+
};
|
|
56
51
|
}
|
|
57
52
|
};
|
|
58
53
|
}
|
|
59
54
|
/**
|
|
60
55
|
* @internal
|
|
61
56
|
*/
|
|
62
|
-
function createPostPageCreateHook(fingerprintInjector) {
|
|
57
|
+
export function createPostPageCreateHook(fingerprintInjector) {
|
|
63
58
|
return async (page, browserController) => {
|
|
64
59
|
const { browserPlugin, launchContext } = browserController;
|
|
65
60
|
const fingerprint = launchContext.fingerprint;
|
|
66
61
|
// TODO this will require refactoring, we should use common API instead of branching based on plugin type,
|
|
67
62
|
// and there should be no public methods specific to some browser.
|
|
68
|
-
if (browserPlugin instanceof
|
|
63
|
+
if (browserPlugin instanceof PlaywrightPlugin) {
|
|
69
64
|
const { useIncognitoPages, isFingerprintInjected } = launchContext;
|
|
70
65
|
if (isFingerprintInjected) {
|
|
71
66
|
// If not incognitoPages are used we would add the injection script over and over which could cause memory leaks.
|
|
@@ -79,7 +74,7 @@ function createPostPageCreateHook(fingerprintInjector) {
|
|
|
79
74
|
launchContext.extend({ isFingerprintInjected: true });
|
|
80
75
|
}
|
|
81
76
|
}
|
|
82
|
-
else if (browserPlugin instanceof
|
|
77
|
+
else if (browserPlugin instanceof PuppeteerPlugin) {
|
|
83
78
|
await fingerprintInjector.attachFingerprintToPuppeteer(page, fingerprint);
|
|
84
79
|
}
|
|
85
80
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/fingerprinting/hooks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/fingerprinting/hooks.ts"],"names":[],"mappings":"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"}
|