@crawlee/browser-pool 3.0.0-beta.7 → 3.0.0-beta.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +77 -130
- package/abstract-classes/browser-controller.d.ts +4 -60
- package/abstract-classes/browser-controller.d.ts.map +1 -1
- package/abstract-classes/browser-controller.js.map +1 -1
- package/abstract-classes/browser-plugin.d.ts +4 -3
- package/abstract-classes/browser-plugin.d.ts.map +1 -1
- package/abstract-classes/browser-plugin.js.map +1 -1
- package/browser-pool.d.ts +19 -19
- package/browser-pool.d.ts.map +1 -1
- package/browser-pool.js +31 -24
- package/browser-pool.js.map +1 -1
- package/fingerprinting/hooks.d.ts +4 -4
- package/fingerprinting/hooks.d.ts.map +1 -1
- package/fingerprinting/hooks.js +12 -12
- package/fingerprinting/hooks.js.map +1 -1
- package/fingerprinting/types.d.ts +1 -1
- package/fingerprinting/types.d.ts.map +1 -1
- package/fingerprinting/utils.d.ts +2 -2
- package/fingerprinting/utils.d.ts.map +1 -1
- package/fingerprinting/utils.js.map +1 -1
- package/index.d.ts +7 -5
- package/index.d.ts.map +1 -1
- package/index.js +4 -4
- package/launch-context.d.ts +4 -4
- package/launch-context.d.ts.map +1 -1
- package/launch-context.js +9 -1
- package/launch-context.js.map +1 -1
- package/package.json +15 -12
- package/playwright/browser.d.ts +5 -1
- package/playwright/browser.d.ts.map +1 -1
- package/playwright/browser.js +13 -0
- package/playwright/browser.js.map +1 -1
- package/playwright/playwright-controller.d.ts +2 -1
- package/playwright/playwright-controller.d.ts.map +1 -1
- package/playwright/playwright-controller.js.map +1 -1
- package/playwright/playwright-plugin.d.ts +2 -2
- package/playwright/playwright-plugin.d.ts.map +1 -1
- package/puppeteer/puppeteer-controller.d.ts +2 -1
- package/puppeteer/puppeteer-controller.d.ts.map +1 -1
- package/puppeteer/puppeteer-controller.js +3 -3
- package/puppeteer/puppeteer-controller.js.map +1 -1
- package/puppeteer/puppeteer-plugin.d.ts +3 -3
- package/puppeteer/puppeteer-plugin.d.ts.map +1 -1
- package/puppeteer/puppeteer-plugin.js +13 -9
- package/puppeteer/puppeteer-plugin.js.map +1 -1
- package/tsconfig.build.tsbuildinfo +1 -1
package/browser-pool.js
CHANGED
|
@@ -8,6 +8,7 @@ const ow_1 = tslib_1.__importDefault(require("ow"));
|
|
|
8
8
|
const tiny_typed_emitter_1 = require("tiny-typed-emitter");
|
|
9
9
|
const timeout_1 = require("@apify/timeout");
|
|
10
10
|
const fingerprint_injector_1 = require("fingerprint-injector");
|
|
11
|
+
const fingerprint_generator_1 = require("fingerprint-generator");
|
|
11
12
|
const quick_lru_1 = tslib_1.__importDefault(require("quick-lru"));
|
|
12
13
|
const logger_1 = require("./logger");
|
|
13
14
|
const hooks_1 = require("./fingerprinting/hooks");
|
|
@@ -24,11 +25,11 @@ const BROWSER_KILLER_INTERVAL_MILLIS = 10 * 1000;
|
|
|
24
25
|
*
|
|
25
26
|
* **Example:**
|
|
26
27
|
* ```js
|
|
27
|
-
*
|
|
28
|
-
*
|
|
28
|
+
* import { BrowserPool, PlaywrightPlugin } from '@crawlee/browser-pool';
|
|
29
|
+
* import playwright from 'playwright';
|
|
29
30
|
*
|
|
30
31
|
* const browserPool = new BrowserPool({
|
|
31
|
-
* browserPlugins: [
|
|
32
|
+
* browserPlugins: [new PlaywrightPlugin(playwright.chromium)],
|
|
32
33
|
* preLaunchHooks: [(pageId, launchContext) => {
|
|
33
34
|
* // do something before a browser gets launched
|
|
34
35
|
* launchContext.launchOptions.headless = false;
|
|
@@ -99,7 +100,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
99
100
|
writable: true,
|
|
100
101
|
value: void 0
|
|
101
102
|
});
|
|
102
|
-
Object.defineProperty(this, "
|
|
103
|
+
Object.defineProperty(this, "fingerprintOptions", {
|
|
103
104
|
enumerable: true,
|
|
104
105
|
configurable: true,
|
|
105
106
|
writable: true,
|
|
@@ -183,7 +184,6 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
183
184
|
writable: true,
|
|
184
185
|
value: void 0
|
|
185
186
|
});
|
|
186
|
-
// fingerprintGenerator?: FingerprintGenerator; // FIXME revert once we migrate to the new fingerprint suite
|
|
187
187
|
Object.defineProperty(this, "fingerprintGenerator", {
|
|
188
188
|
enumerable: true,
|
|
189
189
|
configurable: true,
|
|
@@ -222,16 +222,26 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
222
222
|
prePageCloseHooks: ow_1.default.optional.array,
|
|
223
223
|
postPageCloseHooks: ow_1.default.optional.array,
|
|
224
224
|
useFingerprints: ow_1.default.optional.boolean,
|
|
225
|
-
|
|
225
|
+
fingerprintOptions: ow_1.default.optional.object,
|
|
226
226
|
}));
|
|
227
|
-
const { browserPlugins, maxOpenPagesPerBrowser = 20, retireBrowserAfterPageCount = 100, operationTimeoutSecs = 15, closeInactiveBrowserAfterSecs = 300, preLaunchHooks = [], postLaunchHooks = [], prePageCreateHooks = [], postPageCreateHooks = [], prePageCloseHooks = [], postPageCloseHooks = [], useFingerprints = true,
|
|
227
|
+
const { browserPlugins, maxOpenPagesPerBrowser = 20, retireBrowserAfterPageCount = 100, operationTimeoutSecs = 15, closeInactiveBrowserAfterSecs = 300, preLaunchHooks = [], postLaunchHooks = [], prePageCreateHooks = [], postPageCreateHooks = [], prePageCloseHooks = [], postPageCloseHooks = [], useFingerprints = true, fingerprintOptions = {}, } = options;
|
|
228
|
+
const firstPluginConstructor = browserPlugins[0].constructor;
|
|
229
|
+
for (let i = 1; i < browserPlugins.length; i++) {
|
|
230
|
+
const providedPlugin = browserPlugins[i];
|
|
231
|
+
if (!(providedPlugin instanceof firstPluginConstructor)) {
|
|
232
|
+
const firstPluginName = firstPluginConstructor.name;
|
|
233
|
+
const providedPluginName = providedPlugin.constructor.name;
|
|
234
|
+
// eslint-disable-next-line max-len
|
|
235
|
+
throw new Error(`Browser plugin at index ${i} (${providedPluginName}) is not an instance of the same plugin as the first plugin provided (${firstPluginName}).`);
|
|
236
|
+
}
|
|
237
|
+
}
|
|
228
238
|
this.browserPlugins = browserPlugins;
|
|
229
239
|
this.maxOpenPagesPerBrowser = maxOpenPagesPerBrowser;
|
|
230
240
|
this.retireBrowserAfterPageCount = retireBrowserAfterPageCount;
|
|
231
241
|
this.operationTimeoutMillis = operationTimeoutSecs * 1000;
|
|
232
242
|
this.closeInactiveBrowserAfterMillis = closeInactiveBrowserAfterSecs * 1000;
|
|
233
243
|
this.useFingerprints = useFingerprints;
|
|
234
|
-
this.
|
|
244
|
+
this.fingerprintOptions = fingerprintOptions;
|
|
235
245
|
// hooks
|
|
236
246
|
this.preLaunchHooks = preLaunchHooks;
|
|
237
247
|
this.postLaunchHooks = postLaunchHooks;
|
|
@@ -257,7 +267,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
257
267
|
if (browserPlugin && !this.browserPlugins.includes(browserPlugin)) {
|
|
258
268
|
throw new Error('Provided browserPlugin is not one of the plugins used by BrowserPool.');
|
|
259
269
|
}
|
|
260
|
-
// Limiter is necessary - https://github.com/apify/apify-
|
|
270
|
+
// Limiter is necessary - https://github.com/apify/apify-ts/issues/1126
|
|
261
271
|
return this.limiter(async () => {
|
|
262
272
|
let browserController = this._pickBrowserWithFreeCapacity(browserPlugin);
|
|
263
273
|
if (!browserController)
|
|
@@ -293,12 +303,11 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
293
303
|
* new PlaywrightPlugin(playwright.chromium),
|
|
294
304
|
* new PlaywrightPlugin(playwright.firefox),
|
|
295
305
|
* new PlaywrightPlugin(playwright.webkit),
|
|
296
|
-
* new PuppeteerPlugin(puppeteer),
|
|
297
306
|
* ]
|
|
298
307
|
* });
|
|
299
308
|
*
|
|
300
309
|
* const pages = await browserPool.newPageWithEachPlugin();
|
|
301
|
-
* const [chromiumPage, firefoxPage, webkitPage
|
|
310
|
+
* const [chromiumPage, firefoxPage, webkitPage] = pages;
|
|
302
311
|
* ```
|
|
303
312
|
*/
|
|
304
313
|
async newPageWithEachPlugin(optionsList = []) {
|
|
@@ -346,7 +355,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
346
355
|
return this.pageIds.get(page);
|
|
347
356
|
}
|
|
348
357
|
async _createPageForBrowser(pageId, browserController, pageOptions = {}, proxyUrl) {
|
|
349
|
-
//
|
|
358
|
+
// This is needed for concurrent newPage calls to wait for the browser launch.
|
|
350
359
|
// It's not ideal though, we need to come up with a better API.
|
|
351
360
|
// eslint-disable-next-line dot-notation -- accessing private property
|
|
352
361
|
await browserController['isActivePromise'];
|
|
@@ -364,8 +373,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
364
373
|
this.pages.set(pageId, page);
|
|
365
374
|
this.pageIds.set(page, pageId);
|
|
366
375
|
this.pageToBrowserController.set(page, browserController);
|
|
367
|
-
//
|
|
368
|
-
// will not get retired soon enough. Not sure if it's a problem, let's monitor it.
|
|
376
|
+
// if you synchronously trigger a lot of page launches, browser will not get retired soon enough. Not sure if it's a problem, let's monitor it.
|
|
369
377
|
if (browserController.totalPages >= this.retireBrowserAfterPageCount) {
|
|
370
378
|
this.retireBrowserController(browserController);
|
|
371
379
|
}
|
|
@@ -377,7 +385,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
377
385
|
}
|
|
378
386
|
await this._executeHooks(this.postPageCreateHooks, page, browserController);
|
|
379
387
|
(0, timeout_1.tryCancel)();
|
|
380
|
-
this.emit("pageCreated" /* BROWSER_POOL_EVENTS.PAGE_CREATED */, page);
|
|
388
|
+
this.emit("pageCreated" /* BROWSER_POOL_EVENTS.PAGE_CREATED */, page);
|
|
381
389
|
return page;
|
|
382
390
|
}
|
|
383
391
|
/**
|
|
@@ -546,20 +554,18 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
546
554
|
// might fail with "Protocol error (Target.closeTarget): Target closed."
|
|
547
555
|
setTimeout(() => {
|
|
548
556
|
logger_1.log.debug('Closing retired browser because it has no active pages', { id: browserController.id });
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
557
|
+
browserController.close().finally(() => {
|
|
558
|
+
this.retiredBrowserControllers.delete(browserController);
|
|
559
|
+
});
|
|
552
560
|
}, PAGE_CLOSE_KILL_TIMEOUT_MILLIS);
|
|
553
561
|
}
|
|
554
562
|
}
|
|
555
563
|
_initializeFingerprinting() {
|
|
556
|
-
const {
|
|
557
|
-
|
|
558
|
-
const FingerprintGenerator = require('fingerprint-generator');
|
|
559
|
-
this.fingerprintGenerator = new FingerprintGenerator(this.fingerprintsOptions.fingerprintGeneratorOptions);
|
|
564
|
+
const { useFingerprintCache = true, fingerprintCacheSize = 10000 } = this.fingerprintOptions;
|
|
565
|
+
this.fingerprintGenerator = new fingerprint_generator_1.FingerprintGenerator(this.fingerprintOptions.fingerprintGeneratorOptions);
|
|
560
566
|
this.fingerprintInjector = new fingerprint_injector_1.FingerprintInjector();
|
|
561
|
-
if (
|
|
562
|
-
this.fingerprintCache = new quick_lru_1.default({ maxSize:
|
|
567
|
+
if (useFingerprintCache) {
|
|
568
|
+
this.fingerprintCache = new quick_lru_1.default({ maxSize: fingerprintCacheSize });
|
|
563
569
|
}
|
|
564
570
|
this._addFingerprintHooks();
|
|
565
571
|
}
|
|
@@ -576,6 +582,7 @@ class BrowserPool extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
576
582
|
];
|
|
577
583
|
this.postPageCreateHooks = [
|
|
578
584
|
(0, hooks_1.createPostPageCreateHook)(this.fingerprintInjector),
|
|
585
|
+
...this.postPageCreateHooks,
|
|
579
586
|
];
|
|
580
587
|
}
|
|
581
588
|
}
|
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":";;;;AAAA,8DAA6B;AAC7B,mCAAgC;AAChC,oDAAoB;AACpB,2DAAkD;AAClD,4CAAgE;AAChE,+DAA2D;AAE3D,iEAA6D;AAC7D,kEAAiC;AAKjC,qCAA+B;AAE/B,kDAA2H;AAE3H,MAAM,8BAA8B,GAAG,IAAI,CAAC;AAC5C,MAAM,8BAA8B,GAAG,EAAE,GAAG,IAAI,CAAC;AA6LjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,MAAa,WAOX,SAAQ,iCAAoE;IA+B1E,YAAY,OAA6F;QACrG,KAAK,EAAE,CAAC;QA/BZ;;;;;WAA+B;QAC/B;;;;;WAA+B;QAC/B;;;;;WAAoC;QACpC;;;;;WAA+B;QAC/B;;;;;WAAwC;QACxC;;;;;WAA0B;QAC1B;;;;;WAAuC;QACvC;;;;;WAAqD;QACrD;;;;;WAA2D;QAC3D;;;;;WAA8E;QAC9E;;;;;WAA+E;QAC/E;;;;;WAA2E;QAC3E;;;;;WAAiE;QACjE;;;;mBAAc,CAAC;WAAC;QAChB;;;;mBAAQ,IAAI,GAAG,EAAsB;WAAC;QACtC;;;;mBAAU,IAAI,OAAO,EAAsB;WAAC;QAC5C;;;;mBAA2B,IAAI,GAAG,EAA2B;WAAC;QAC9D;;;;mBAA4B,IAAI,GAAG,EAA2B;WAAC;QAC/D;;;;mBAA0B,IAAI,OAAO,EAAuC;WAAC;QAC7E;;;;;WAA0C;QAC1C;;;;;WAA4C;QAC5C;;;;;WAAmE;QAEnE;;;;mBAAiC,WAAW,CACxC,GAAG,EAAE,CAAC,IAAI,CAAC,6BAA6B,EAAE,EAC1C,8BAA8B,CACjC;WAAC;QAEF;;;;mBAAkB,IAAA,iBAAM,EAAC,CAAC,CAAC;WAAC;QAKxB,IAAI,CAAC,qBAAsB,CAAC,KAAK,EAAE,CAAC;QAEpC,IAAA,YAAE,EAAC,OAAO,EAAE,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC;YAC7B,cAAc,EAAE,YAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YACrC,sBAAsB,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;YAC1C,2BAA2B,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;YAC/C,oBAAoB,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;YACxC,6BAA6B,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;YACjD,cAAc,EAAE,YAAE,CAAC,QAAQ,CAAC,KAAK;YACjC,eAAe,EAAE,YAAE,CAAC,QAAQ,CAAC,KAAK;YAClC,kBAAkB,EAAE,YAAE,CAAC,QAAQ,CAAC,KAAK;YACrC,mBAAmB,EAAE,YAAE,CAAC,QAAQ,CAAC,KAAK;YACtC,iBAAiB,EAAE,YAAE,CAAC,QAAQ,CAAC,KAAK;YACpC,kBAAkB,EAAE,YAAE,CAAC,QAAQ,CAAC,KAAK;YACrC,eAAe,EAAE,YAAE,CAAC,QAAQ,CAAC,OAAO;YACpC,kBAAkB,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;SACzC,CAAC,CAAC,CAAC;QAEJ,MAAM,EACF,cAAc,EACd,sBAAsB,GAAG,EAAE,EAC3B,2BAA2B,GAAG,GAAG,EACjC,oBAAoB,GAAG,EAAE,EACzB,6BAA6B,GAAG,GAAG,EACnC,cAAc,GAAG,EAAE,EACnB,eAAe,GAAG,EAAE,EACpB,kBAAkB,GAAG,EAAE,EACvB,mBAAmB,GAAG,EAAE,EACxB,iBAAiB,GAAG,EAAE,EACtB,kBAAkB,GAAG,EAAE,EACvB,eAAe,GAAG,IAAI,EACtB,kBAAkB,GAAG,EAAE,GAC1B,GAAG,OAAO,CAAC;QAEZ,MAAM,sBAAsB,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,WAAmC,CAAC;QAErF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC5C,MAAM,cAAc,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAEzC,IAAI,CAAC,CAAC,cAAc,YAAY,sBAAsB,CAAC,EAAE;gBACrD,MAAM,eAAe,GAAG,sBAAsB,CAAC,IAAI,CAAC;gBACpD,MAAM,kBAAkB,GAAI,cAAgC,CAAC,WAAW,CAAC,IAAI,CAAC;gBAE9E,mCAAmC;gBACnC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,KAAK,kBAAkB,yEAAyE,eAAe,IAAI,CAAC,CAAC;aACpK;SACJ;QAED,IAAI,CAAC,cAAc,GAAG,cAA2C,CAAC;QAClE,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,2BAA2B,GAAG,2BAA2B,CAAC;QAC/D,IAAI,CAAC,sBAAsB,GAAG,oBAAoB,GAAG,IAAI,CAAC;QAC1D,IAAI,CAAC,+BAA+B,GAAG,6BAA6B,GAAG,IAAI,CAAC;QAC5E,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAE7C,QAAQ;QACR,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAE7C,iBAAiB;QACjB,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,IAAI,CAAC,yBAAyB,EAAE,CAAC;SACpC;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,OAAO,CAAC,UAA0E,EAAE;QACtF,MAAM,EACF,EAAE,GAAG,IAAA,eAAM,GAAE,EACb,WAAW,EACX,aAAa,GAAG,IAAI,CAAC,kBAAkB,EAAE,EACzC,QAAQ,GACX,GAAG,OAAO,CAAC;QAEZ,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;SAC1D;QAED,IAAI,aAAa,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAC/D,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;SAC5F;QAED,uEAAuE;QACvE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC3B,IAAI,iBAAiB,GAAG,IAAI,CAAC,4BAA4B,CAAC,aAAa,CAAC,CAAC;YACzE,IAAI,CAAC,iBAAiB;gBAAE,iBAAiB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YAC7F,IAAA,mBAAS,GAAE,CAAC;YAEZ,OAAO,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,iBAAiB,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QACpF,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB,CAAC,UAAsF,EAAE;QAC9G,MAAM,EACF,EAAE,GAAG,IAAA,eAAM,GAAE,EACb,WAAW,EACX,aAAa,EACb,aAAa,GAAG,IAAI,CAAC,kBAAkB,EAAE,GAC5C,GAAG,OAAO,CAAC;QAEZ,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;SAC1D;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC,CAAC;QAC1F,IAAA,mBAAS,GAAE,CAAC;QACZ,OAAO,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC1E,CAAC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,KAAK,CAAC,qBAAqB,CACvB,cAAuG,EAAE;QAEzG,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,GAAG,EAAE,EAAE;YAChE,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,GAAG,WAAW;gBACd,aAAa;aAChB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACrC,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,0BAA0B,CAAC,IAAgB;QACvC,OAAO,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,EAAU;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,IAAgB;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAC/B,MAAc,EACd,iBAA0C,EAC1C,cAA2B,EAAiB,EAC5C,QAAiB;QAEjB,8EAA8E;QAC9E,+DAA+D;QAC/D,sEAAsE;QACtE,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QAC3C,IAAA,mBAAS,GAAE,CAAC;QAEZ,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;QAErG,IAAI,gBAAgB,EAAE;YAClB,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,qBAAqB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;SACnG;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;QAC/F,IAAA,mBAAS,GAAE,CAAC;QAEZ,IAAI,IAAgB,CAAC;QAErB,IAAI;YACA,IAAI,GAAG,MAAM,IAAA,6BAAmB,EAC5B,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,gBAAgB,CAAC,EACjD,IAAI,CAAC,sBAAsB,EAC3B,wCAAwC,CAC7B,CAAC;YAChB,IAAA,mBAAS,GAAE,CAAC;YAEZ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC/B,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAE1D,+IAA+I;YAC/I,IAAI,iBAAiB,CAAC,UAAU,IAAI,IAAI,CAAC,2BAA2B,EAAE;gBAClE,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;aACnD;YAED,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;SACjC;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,uCAAuC,iBAAiB,CAAC,EAAE,WAAY,GAAa,CAAC,OAAO,GAAG,CAAC,CAAC;SACpH;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5E,IAAA,mBAAS,GAAE,CAAC;QAEZ,IAAI,CAAC,IAAI,uDAAmC,IAAI,CAAC,CAAC;QAElD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,uBAAuB,CAAC,iBAA0C;QAC9D,MAAM,sBAAsB,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACrF,IAAI,sBAAsB;YAAE,OAAO;QAEnC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,6DAAsC,iBAAiB,CAAC,CAAC;QAClE,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC5D,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,IAAgB;QAChC,MAAM,iBAAiB,GAAG,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;QAChE,IAAI,iBAAiB;YAAE,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;IAC3E,CAAC;IAED;;;OAGG;IACH,iBAAiB;QACb,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjD,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,gBAAgB;QAClB,MAAM,WAAW,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACrD,MAAM,QAAQ,GAAG,CAAC,GAAG,WAAW,CAAC;aAC5B,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;aAC3C,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QAE7C,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QACT,aAAa,CAAC,IAAI,CAAC,qBAAsB,CAAC,CAAC;QAC3C,IAAI,CAAC,qBAAqB,GAAG,SAAS,CAAC;QAEvC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE9B,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;IAEO,SAAS;QACb,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAC;QACtC,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,CAAC;QAEvC,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC9B,CAAC;IAEO,yBAAyB;QAC7B,OAAO,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,wBAAwB,EAAE,GAAG,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAC1F,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,OAA6D;QACtG,MAAM,EACF,aAAa,EACb,aAAa,GAChB,GAAG,OAAO,CAAC;QAEZ,MAAM,iBAAiB,GAAG,aAAa,CAAC,gBAAgB,EAA6B,CAAC;QACtF,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAErD,MAAM,aAAa,GAAG,aAAa,CAAC,mBAAmB,CAAC;YACpD,EAAE,EAAE,MAAM;YACV,aAAa;SAChB,CAAC,CAAC;QAEH,IAAI;YACA,sEAAsE;YACtE,kEAAkE;YAClE,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;YACrE,IAAA,mBAAS,GAAE,CAAC;YACZ,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YAC1D,IAAA,mBAAS,GAAE,CAAC;YACZ,iBAAiB,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;SAC3D;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACxD,MAAM,GAAG,CAAC;SACb;QAED,YAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,EAAE,EAAE,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;QAEjE,IAAI;YACA,oEAAoE;YACpE,uDAAuD;YACvD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;SAC7E;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACxD,iBAAiB,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACzC,YAAG,CAAC,KAAK,CACL,kEAAkE,QAAQ,CAAC,OAAO,EAAE,EACpF,EAAE,EAAE,EAAE,iBAAiB,CAAC,EAAE,EAAE,CAC/B,CAAC;YACN,CAAC,CAAC,CAAC;YACH,MAAM,GAAG,CAAC;SACb;QAED,IAAA,mBAAS,GAAE,CAAC;QACZ,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,+DAAuC,iBAAiB,CAAC,CAAC;QAEnE,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACK,kBAAkB;QACtB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;QAClE,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC;IAEO,4BAA4B,CAAC,aAA4B;QAC7D,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,wBAAwB,EAAE;YACpD,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,sBAAsB,CAAC;YACzE,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,KAAK,aAAa,CAAC;YACnE,IAAI,WAAW,IAAI,eAAe,EAAE;gBAChC,OAAO,UAAU,CAAC;aACrB;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEO,KAAK,CAAC,6BAA6B;QACvC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QAEtC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,yBAAyB,EAAE;YACrD,MAAM,yBAAyB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC,gBAAgB,CAAC;YAC3E,MAAM,aAAa,GAAG,yBAAyB,IAAI,IAAI,CAAC,+BAA+B,CAAC;YACxF,MAAM,cAAc,GAAG,UAAU,CAAC,WAAW,KAAK,CAAC,CAAC;YAEpD,IAAI,aAAa,IAAI,cAAc,EAAE;gBACjC,MAAM,EAAE,EAAE,EAAE,GAAG,UAAU,CAAC;gBAC1B,YAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC9C,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAClD,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAC7B;SACJ;QAED,IAAI,gBAAgB,CAAC,MAAM,EAAE;YACzB,YAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE;gBAClC,KAAK,EAAE,gBAAgB,CAAC,MAAM;gBAC9B,gBAAgB;aACnB,CAAC,CAAC;SACN;IACL,CAAC;IAEO,kBAAkB,CAAC,IAAgB;QACvC,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC;QACrC,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QAClE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAE,CAAC;QAErC,IAAI,CAAC,KAAK,GAAG,KAAK,EAAE,GAAG,IAAe,EAAE,EAAE;YACtC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAE1E,MAAM,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC;iBACpC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;gBAClB,YAAG,CAAC,KAAK,CAAC,gCAAgC,GAAG,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3F,CAAC,CAAC,CAAC;YAEP,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;YAE7E,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC1B,IAAI,CAAC,+BAA+B,CAAC,iBAAiB,CAAC,CAAC;YAExD,IAAI,CAAC,IAAI,qDAAkC,IAAI,CAAC,CAAC;QACrD,CAAC,CAAC;IACN,CAAC;IAED,8DAA8D;IACtD,KAAK,CAAC,aAAa,CAAC,KAAsC,EAAE,GAAG,IAAe;QAClF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;SACvB;IACL,CAAC;IAEO,+BAA+B,CAAC,iBAA0C;QAC9E,IAAI,iBAAiB,CAAC,WAAW,KAAK,CAAC,IAAI,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;YAC9F,gDAAgD;YAChD,wEAAwE;YACxE,UAAU,CAAC,GAAG,EAAE;gBACZ,YAAG,CAAC,KAAK,CAAC,wDAAwD,EAAE,EAAE,EAAE,EAAE,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;gBAClG,iBAAiB,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;oBACnC,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;gBAC7D,CAAC,CAAC,CAAC;YACP,CAAC,EAAE,8BAA8B,CAAC,CAAC;SACtC;IACL,CAAC;IAEO,yBAAyB;QAC7B,MAAM,EAAE,mBAAmB,GAAG,IAAI,EAAE,oBAAoB,GAAG,KAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAC9F,IAAI,CAAC,oBAAoB,GAAG,IAAI,4CAAoB,CAAC,IAAI,CAAC,kBAAkB,CAAC,2BAA2B,CAAC,CAAC;QAC1G,IAAI,CAAC,mBAAmB,GAAG,IAAI,0CAAmB,EAAE,CAAC;QAErD,IAAI,mBAAmB,EAAE;YACrB,IAAI,CAAC,gBAAgB,GAAG,IAAI,mBAAQ,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;SAC3E;QAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAChC,CAAC;IAEO,oBAAoB;QACxB,IAAI,CAAC,cAAc,GAAG;YAClB,GAAG,IAAI,CAAC,cAAc;YACtB,oDAAoD;YACpD,8FAA8F;YAC9F,IAAA,sCAA8B,EAAC,IAAI,CAAC;SACvC,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG;YACtB,IAAA,+BAAuB,GAAE;YACzB,GAAG,IAAI,CAAC,kBAAkB;SAC7B,CAAC;QACF,IAAI,CAAC,mBAAmB,GAAG;YACvB,IAAA,gCAAwB,EAAC,IAAI,CAAC,mBAAoB,CAAC;YACnD,GAAG,IAAI,CAAC,mBAAmB;SAC9B,CAAC;IACN,CAAC;CACJ;AA7gBD,kCA6gBC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { FingerprintInjector } from 'fingerprint-injector';
|
|
2
|
-
import { BrowserPool } from '..';
|
|
3
|
-
import { BrowserController } from '../abstract-classes/browser-controller';
|
|
4
|
-
import { LaunchContext } from '../launch-context';
|
|
1
|
+
import type { FingerprintInjector } from 'fingerprint-injector';
|
|
2
|
+
import type { BrowserPool } from '..';
|
|
3
|
+
import type { BrowserController } from '../abstract-classes/browser-controller';
|
|
4
|
+
import type { LaunchContext } from '../launch-context';
|
|
5
5
|
/**
|
|
6
6
|
* @internal
|
|
7
7
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/fingerprinting/hooks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/fingerprinting/hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAEtC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,aAS3E,MAAM,iBAAiB,aAAa,UAgCxD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,cAClB,MAAM,qBAAqB,iBAAiB,eAAe,GAAG,KAAG,IAAI,CAYzF;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,mBAAmB,EAAE,mBAAmB,UACzD,GAAG,qBAAqB,iBAAiB,KAAG,QAAQ,IAAI,CAAC,CA0BhF"}
|
package/fingerprinting/hooks.js
CHANGED
|
@@ -7,29 +7,29 @@ const utils_1 = require("./utils");
|
|
|
7
7
|
* @internal
|
|
8
8
|
*/
|
|
9
9
|
function createFingerprintPreLaunchHook(browserPool) {
|
|
10
|
-
const { fingerprintGenerator, fingerprintCache,
|
|
10
|
+
const { fingerprintGenerator, fingerprintCache, fingerprintOptions: { fingerprintGeneratorOptions, }, } = browserPool;
|
|
11
11
|
return (_pageId, launchContext) => {
|
|
12
|
-
const { useIncognitoPages
|
|
13
|
-
|
|
12
|
+
const { useIncognitoPages } = launchContext;
|
|
13
|
+
const cacheKey = launchContext.session?.id ?? launchContext.proxyUrl;
|
|
14
14
|
const { launchOptions } = launchContext;
|
|
15
15
|
// If no options are passed we try to pass best default options as possible to match browser and OS.
|
|
16
16
|
const fingerprintGeneratorFinalOptions = fingerprintGeneratorOptions || (0, utils_1.getGeneratorDefaultOptions)(launchContext);
|
|
17
17
|
let fingerprint;
|
|
18
|
-
if (
|
|
19
|
-
fingerprint = fingerprintCache.get(
|
|
18
|
+
if (cacheKey && fingerprintCache?.has(cacheKey)) {
|
|
19
|
+
fingerprint = fingerprintCache.get(cacheKey);
|
|
20
20
|
}
|
|
21
|
-
else if (
|
|
22
|
-
fingerprint = fingerprintGenerator.getFingerprint(fingerprintGeneratorFinalOptions)
|
|
23
|
-
fingerprintCache?.set(
|
|
21
|
+
else if (cacheKey) {
|
|
22
|
+
fingerprint = fingerprintGenerator.getFingerprint(fingerprintGeneratorFinalOptions);
|
|
23
|
+
fingerprintCache?.set(cacheKey, fingerprint);
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
|
-
fingerprint = fingerprintGenerator.getFingerprint(fingerprintGeneratorFinalOptions)
|
|
26
|
+
fingerprint = fingerprintGenerator.getFingerprint(fingerprintGeneratorFinalOptions);
|
|
27
27
|
}
|
|
28
28
|
launchContext.extend({ fingerprint });
|
|
29
29
|
if (useIncognitoPages) {
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
|
-
const { userAgent, screen } = fingerprint;
|
|
32
|
+
const { navigator: { userAgent }, screen } = fingerprint.fingerprint;
|
|
33
33
|
launchOptions.userAgent = userAgent;
|
|
34
34
|
launchOptions.viewport = {
|
|
35
35
|
width: screen.width,
|
|
@@ -44,9 +44,9 @@ exports.createFingerprintPreLaunchHook = createFingerprintPreLaunchHook;
|
|
|
44
44
|
function createPrePageCreateHook() {
|
|
45
45
|
return (_pageId, browserController, pageOptions) => {
|
|
46
46
|
const { launchContext, browserPlugin } = browserController;
|
|
47
|
-
const fingerprint = launchContext.fingerprint;
|
|
47
|
+
const { fingerprint } = launchContext.fingerprint;
|
|
48
48
|
if (launchContext.useIncognitoPages && browserPlugin instanceof __1.PlaywrightPlugin && pageOptions) {
|
|
49
|
-
pageOptions.userAgent = fingerprint.userAgent;
|
|
49
|
+
pageOptions.userAgent = fingerprint.navigator.userAgent;
|
|
50
50
|
pageOptions.viewport = {
|
|
51
51
|
width: fingerprint.screen.width,
|
|
52
52
|
height: fingerprint.screen.height,
|
|
@@ -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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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Fingerprint } from 'fingerprint-
|
|
1
|
+
import type { BrowserFingerprintWithHeaders as Fingerprint } from 'fingerprint-generator';
|
|
2
2
|
export interface FingerprintGenerator {
|
|
3
3
|
getFingerprint: (fingerprintGeneratorOptions?: FingerprintGeneratorOptions) => GetFingerprintReturn;
|
|
4
4
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fingerprinting/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fingerprinting/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,IAAI,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAE1F,MAAM,WAAW,oBAAoB;IACjC,cAAc,EAAE,CAAC,2BAA2B,CAAC,EAAE,2BAA2B,KAAK,oBAAoB,CAAC;CACvG;AAED,oBAAY,oBAAoB,GAAG;IAC/B,WAAW,EAAE,WAAW,CAAC;CAC5B,CAAA;AAED,oBAAY,2BAA2B,GAAG;IACtC,QAAQ,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,EAAE,CAAC;IAClD,gBAAgB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC1C,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAA;AAED,0BAAkB,WAAW;IACzB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,MAAM,WAAW;CACpB;AAED,oBAAY,oBAAoB,GAAG;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAA;AAED,0BAAkB,oBAAoB;IAClC,KAAK,UAAU;IACf,KAAK,UAAU;IACf,OAAO,YAAY;CACtB;AAED,0BAAkB,cAAc;IAC5B,MAAM,WAAW;IACjB,OAAO,YAAY;CACtB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LaunchContext } from '../launch-context';
|
|
2
|
-
import { FingerprintGeneratorOptions } from './types';
|
|
1
|
+
import type { LaunchContext } from '../launch-context';
|
|
2
|
+
import type { FingerprintGeneratorOptions } from './types';
|
|
3
3
|
export declare const getGeneratorDefaultOptions: (launchContext: LaunchContext) => FingerprintGeneratorOptions;
|
|
4
4
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fingerprinting/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fingerprinting/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAG3D,eAAO,MAAM,0BAA0B,kBAAmB,aAAa,KAAG,2BAWzE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/fingerprinting/utils.ts"],"names":[],"mappings":";;;AAAA,0BAAuD;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/fingerprinting/utils.ts"],"names":[],"mappings":";;;AAAA,0BAAuD;AAMhD,MAAM,0BAA0B,GAAG,CAAC,aAA4B,EAA+B,EAAE;IACpG,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,aAAa,CAAC;IAEvD,MAAM,OAAO,GAAG;QACZ,OAAO,EAAE,wCAAwB;QACjC,OAAO,EAAE,CAAC,OAAO,CAAC;QAClB,QAAQ,EAAE,CAAC,cAAc,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QACxD,gBAAgB,EAAE,CAAC,kBAAkB,EAAE,CAAC;KAC3C,CAAC;IAEF,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAXW,QAAA,0BAA0B,8BAWrC;AAEF,MAAM,cAAc,GAAG,CAAC,aAA4B,EAAE,aAAkB,EAAe,EAAE;IACrF,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAClC,IAAI,WAAW,CAAC;IAEhB,IAAI,aAAa,YAAY,oBAAgB,EAAE;QAC3C,WAAW,GAAG,OAAO,CAAC,IAAK,EAAE,CAAC;KACjC;IAAC,IAAI,aAAa,YAAY,mBAAe,EAAE;QAC5C,WAAW,GAAG,aAAa,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;KAC1D;IAED,QAAQ,WAAW,EAAE;QACjB,KAAK,QAAQ;YACT,yCAA0B;QAC9B,KAAK,SAAS;YACV,2CAA2B;QAC/B;YACI,yCAA0B;KACjC;AACL,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,GAAyB,EAAE;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,QAAQ,QAAQ,EAAE;QACd,KAAK,OAAO;YACR,oCAAoC;YACpC,oDAAoC;QACxC,KAAK,QAAQ;YACT,gDAAkC;QACtC;YACI,mCAAmC;YACnC,gDAAkC;KACzC;AACL,CAAC,CAAC"}
|
package/index.d.ts
CHANGED
|
@@ -4,15 +4,15 @@
|
|
|
4
4
|
*
|
|
5
5
|
* **Example:**
|
|
6
6
|
* ```js
|
|
7
|
-
*
|
|
7
|
+
* import {
|
|
8
8
|
* BrowserPool,
|
|
9
9
|
* PuppeteerPlugin,
|
|
10
10
|
* PlaywrightPlugin
|
|
11
|
-
* }
|
|
11
|
+
* } from '@crawlee/browser-pool';
|
|
12
12
|
// @ts-ignore optional peer dependency
|
|
13
|
-
*
|
|
13
|
+
* import puppeteer from 'puppeteer';
|
|
14
14
|
// @ts-ignore optional peer dependency
|
|
15
|
-
*
|
|
15
|
+
* import playwright from 'playwright';
|
|
16
16
|
*
|
|
17
17
|
* const browserPool = new BrowserPool({
|
|
18
18
|
* browserPlugins: [
|
|
@@ -29,9 +29,11 @@ export * from './playwright/playwright-plugin';
|
|
|
29
29
|
export * from './puppeteer/puppeteer-plugin';
|
|
30
30
|
export * from './events';
|
|
31
31
|
export { BrowserName, DeviceCategory, OperatingSystemsName, } from './fingerprinting/types';
|
|
32
|
-
export type { BrowserController, BrowserControllerEvents,
|
|
32
|
+
export type { BrowserController, BrowserControllerEvents, } from './abstract-classes/browser-controller';
|
|
33
33
|
export type { CommonPage, BrowserPlugin, BrowserPluginOptions, CreateLaunchContextOptions, } from './abstract-classes/browser-plugin';
|
|
34
34
|
export type { LaunchContext, LaunchContextOptions, } from './launch-context';
|
|
35
35
|
export type { BrowserSpecification, FingerprintGenerator, FingerprintGeneratorOptions, GetFingerprintReturn, } from './fingerprinting/types';
|
|
36
36
|
export type { InferBrowserPluginArray } from './utils';
|
|
37
|
+
export type { PuppeteerController, } from './puppeteer/puppeteer-controller';
|
|
38
|
+
export type { PlaywrightController, } from './playwright/playwright-controller';
|
|
37
39
|
//# sourceMappingURL=index.d.ts.map
|
package/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,UAAU,CAAC;AACzB,OAAO,EACH,WAAW,EACX,cAAc,EACd,oBAAoB,GACvB,MAAM,wBAAwB,CAAC;AAGhC,YAAY,EACR,iBAAiB,EACjB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,UAAU,CAAC;AACzB,OAAO,EACH,WAAW,EACX,cAAc,EACd,oBAAoB,GACvB,MAAM,wBAAwB,CAAC;AAGhC,YAAY,EACR,iBAAiB,EACjB,uBAAuB,GAC1B,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACR,UAAU,EACV,aAAa,EACb,oBAAoB,EACpB,0BAA0B,GAC7B,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EACR,aAAa,EACb,oBAAoB,GACvB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACR,oBAAoB,EACpB,oBAAoB,EACpB,2BAA2B,EAC3B,oBAAoB,GACvB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AACvD,YAAY,EACR,mBAAmB,GACtB,MAAM,kCAAkC,CAAC;AAC1C,YAAY,EACR,oBAAoB,GACvB,MAAM,oCAAoC,CAAC"}
|
package/index.js
CHANGED
|
@@ -8,13 +8,13 @@ const tslib_1 = require("tslib");
|
|
|
8
8
|
*
|
|
9
9
|
* **Example:**
|
|
10
10
|
* ```js
|
|
11
|
-
*
|
|
11
|
+
* import {
|
|
12
12
|
* BrowserPool,
|
|
13
13
|
* PuppeteerPlugin,
|
|
14
14
|
* PlaywrightPlugin
|
|
15
|
-
* }
|
|
16
|
-
*
|
|
17
|
-
*
|
|
15
|
+
* } from '@crawlee/browser-pool';
|
|
16
|
+
* import puppeteer from 'puppeteer';
|
|
17
|
+
* import playwright from 'playwright';
|
|
18
18
|
*
|
|
19
19
|
* const browserPool = new BrowserPool({
|
|
20
20
|
* browserPlugins: [
|
package/launch-context.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { BrowserFingerprintWithHeaders } from 'fingerprint-generator';
|
|
2
2
|
import type { BrowserPlugin, CommonBrowser, CommonLibrary } from './abstract-classes/browser-plugin';
|
|
3
|
-
import { UnwrapPromise } from './utils';
|
|
3
|
+
import type { UnwrapPromise } from './utils';
|
|
4
4
|
/**
|
|
5
5
|
* `LaunchContext` holds information about the launched browser. It's useful
|
|
6
6
|
* to retrieve the `launchOptions`, the proxy the browser was launched with
|
|
@@ -44,8 +44,8 @@ export declare class LaunchContext<Library extends CommonLibrary = CommonLibrary
|
|
|
44
44
|
userDataDir: string;
|
|
45
45
|
private _proxyUrl?;
|
|
46
46
|
private readonly _reservedFieldNames;
|
|
47
|
-
fingerprint?:
|
|
48
|
-
[K:
|
|
47
|
+
fingerprint?: BrowserFingerprintWithHeaders;
|
|
48
|
+
[K: PropertyKey]: unknown;
|
|
49
49
|
constructor(options: LaunchContextOptions<Library, LibraryOptions, LaunchResult, NewPageOptions, NewPageResult>);
|
|
50
50
|
/**
|
|
51
51
|
* Extend the launch context with any extra fields.
|
package/launch-context.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-context.d.ts","sourceRoot":"","sources":["../src/launch-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"launch-context.d.ts","sourceRoot":"","sources":["../src/launch-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACrG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EACjD,YAAY,SAAS,aAAa,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EACjF,cAAc,GAAG,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EACvD,aAAa,GAAG,aAAa,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;IAElE;;;;;OAKG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,aAAa,EAAE,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;IACnG;;;OAGG;IACH,aAAa,EAAE,cAAc,CAAC;IAC9B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,aAAa,CACtB,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EACjD,YAAY,SAAS,aAAa,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EACjF,cAAc,GAAG,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EACvD,aAAa,GAAG,aAAa,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;IAElE,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;IACnG,aAAa,EAAE,cAAc,CAAC;IAC9B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAwC;IAE5E,WAAW,CAAC,EAAE,6BAA6B,CAAC;IAC5C,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;gBAEd,OAAO,EAAE,oBAAoB,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,CAAC;IAmB/G;;;;;;OAMG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI;IAU/D;;;OAGG;IACH,IAAI,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAYnC;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;CACJ"}
|
package/launch-context.js
CHANGED
|
@@ -81,7 +81,15 @@ class LaunchContext {
|
|
|
81
81
|
* Use `undefined` to unset existing proxy URL.
|
|
82
82
|
*/
|
|
83
83
|
set proxyUrl(url) {
|
|
84
|
-
|
|
84
|
+
if (!url) {
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
const urlInstance = new URL(url);
|
|
88
|
+
urlInstance.pathname = '/';
|
|
89
|
+
urlInstance.search = '';
|
|
90
|
+
urlInstance.hash = '';
|
|
91
|
+
// https://www.chromium.org/developers/design-documents/network-settings/#command-line-options-for-proxy-settings
|
|
92
|
+
this._proxyUrl = urlInstance.href.slice(0, -1);
|
|
85
93
|
}
|
|
86
94
|
/**
|
|
87
95
|
* Returns the proxy URL of the browser.
|
package/launch-context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-context.js","sourceRoot":"","sources":["../src/launch-context.ts"],"names":[],"mappings":";;;AA8CA,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"launch-context.js","sourceRoot":"","sources":["../src/launch-context.ts"],"names":[],"mappings":";;;AA8CA,MAAa,aAAa;IAmBtB,YAAY,OAAmG;QAZ/G;;;;;WAAY;QACZ;;;;;WAAmG;QACnG;;;;;WAA8B;QAC9B;;;;;WAA2B;QAC3B;;;;;WAAoB;QAEpB;;;;;WAA2B;QAC3B;;;;mBAAuC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;WAAC;QAE5E;;;;;WAA4C;QAIxC,MAAM,EACF,EAAE,EACF,aAAa,EACb,aAAa,EACb,QAAQ,EACR,iBAAiB,EACjB,WAAW,GAAG,EAAE,GACnB,GAAG,OAAO,CAAC;QAEZ,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,IAAI,KAAK,CAAC;QACpD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAE/B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAyC,MAAS;QACpD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC5C,IAAI,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACxC,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,0BAA0B,CAAC,CAAC;aAC3F;iBAAM;gBACH,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;aACjC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACH,IAAI,QAAQ,CAAC,GAAuB;QAChC,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QACjC,WAAW,CAAC,QAAQ,GAAG,GAAG,CAAC;QAC3B,WAAW,CAAC,MAAM,GAAG,EAAE,CAAC;QACxB,WAAW,CAAC,IAAI,GAAG,EAAE,CAAC;QAEtB,iHAAiH;QACjH,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;CACJ;AA/ED,sCA+EC"}
|
package/package.json
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@crawlee/browser-pool",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.72",
|
|
4
4
|
"description": "Rotate multiple browsers using popular automation libraries such as Playwright or Puppeteer.",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=16.0.0"
|
|
7
7
|
},
|
|
8
|
-
"main": "index.js",
|
|
9
|
-
"module": "index.mjs",
|
|
10
|
-
"types": "index.d.ts",
|
|
8
|
+
"main": "./index.js",
|
|
9
|
+
"module": "./index.mjs",
|
|
10
|
+
"types": "./index.d.ts",
|
|
11
11
|
"exports": {
|
|
12
12
|
".": {
|
|
13
13
|
"import": "./index.mjs",
|
|
14
|
-
"require": "./index.js"
|
|
15
|
-
|
|
14
|
+
"require": "./index.js",
|
|
15
|
+
"types": "./index.d.ts"
|
|
16
|
+
},
|
|
17
|
+
"./package.json": "./package.json"
|
|
16
18
|
},
|
|
17
19
|
"author": {
|
|
18
20
|
"name": "Apify",
|
|
@@ -34,22 +36,23 @@
|
|
|
34
36
|
"copy": "ts-node -T ../../scripts/copy.ts"
|
|
35
37
|
},
|
|
36
38
|
"dependencies": {
|
|
37
|
-
"@apify/log": "^
|
|
38
|
-
"@apify/timeout": "^0.
|
|
39
|
-
"
|
|
40
|
-
"fingerprint-
|
|
39
|
+
"@apify/log": "^2.0.0",
|
|
40
|
+
"@apify/timeout": "^0.3.0",
|
|
41
|
+
"@crawlee/types": "^3.0.0-beta.72",
|
|
42
|
+
"fingerprint-generator": "^2.0.0-dev.5",
|
|
43
|
+
"fingerprint-injector": "^2.0.0-dev.5",
|
|
41
44
|
"lodash.merge": "^4.6.2",
|
|
42
45
|
"nanoid": "^3.3.4",
|
|
43
46
|
"ow": "^0.28.1",
|
|
44
47
|
"p-limit": "^3.1.0",
|
|
45
|
-
"quick-lru": "^5.1.1",
|
|
46
48
|
"proxy-chain": "^2.0.1",
|
|
49
|
+
"quick-lru": "^5.1.1",
|
|
47
50
|
"tiny-typed-emitter": "^2.1.0",
|
|
48
51
|
"tslib": "^2.4.0"
|
|
49
52
|
},
|
|
50
53
|
"peerDependencies": {
|
|
51
54
|
"playwright": "^1.21.1",
|
|
52
|
-
"puppeteer": ">= 9.x <=
|
|
55
|
+
"puppeteer": ">= 9.x <= 14.x"
|
|
53
56
|
},
|
|
54
57
|
"peerDependenciesMeta": {
|
|
55
58
|
"playwright": {
|
package/playwright/browser.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { EventEmitter } from 'node:events';
|
|
3
3
|
// @ts-ignore optional peer dependency
|
|
4
|
-
import type { BrowserContext, Browser as PlaywrightBrowser } from 'playwright';
|
|
4
|
+
import type { BrowserContext, BrowserType, Browser as PlaywrightBrowser } from 'playwright';
|
|
5
5
|
export interface BrowserOptions {
|
|
6
6
|
browserContext: BrowserContext;
|
|
7
7
|
version: string;
|
|
@@ -13,11 +13,15 @@ export declare class Browser extends EventEmitter implements PlaywrightBrowser {
|
|
|
13
13
|
private _browserContext;
|
|
14
14
|
private _version;
|
|
15
15
|
private _isConnected;
|
|
16
|
+
private _browserType?;
|
|
16
17
|
constructor(options: BrowserOptions);
|
|
17
18
|
close(): Promise<void>;
|
|
18
19
|
contexts(): BrowserContext[];
|
|
19
20
|
isConnected(): boolean;
|
|
20
21
|
version(): string;
|
|
22
|
+
/** @internal */
|
|
23
|
+
_setBrowserType(browserType: BrowserType): void;
|
|
24
|
+
browserType(): BrowserType;
|
|
21
25
|
newPage(...args: Parameters<BrowserContext['newPage']>): ReturnType<BrowserContext['newPage']>;
|
|
22
26
|
newContext(): Promise<never>;
|
|
23
27
|
newBrowserCDPSession(): Promise<never>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../src/playwright/browser.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../src/playwright/browser.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE5F,MAAM,WAAW,cAAc;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,OAAQ,SAAQ,YAAa,YAAW,iBAAiB;IAClE,OAAO,CAAC,eAAe,CAAiB;IAExC,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,YAAY,CAAC,CAAc;gBAEvB,OAAO,EAAE,cAAc;IAc7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,QAAQ,IAAI,cAAc,EAAE;IAI5B,WAAW,IAAI,OAAO;IAItB,OAAO,IAAI,MAAM;IAIjB,gBAAgB;IAChB,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAI/C,WAAW,IAAI,WAAW;IAIpB,OAAO,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAI9F,UAAU,IAAI,OAAO,CAAC,KAAK,CAAC;IAI5B,oBAAoB,IAAI,OAAO,CAAC,KAAK,CAAC;IAItC,YAAY,IAAI,OAAO,CAAC,KAAK,CAAC;IAI9B,WAAW,IAAI,OAAO,CAAC,KAAK,CAAC;CAGtC"}
|
package/playwright/browser.js
CHANGED
|
@@ -26,6 +26,12 @@ class Browser extends node_events_1.EventEmitter {
|
|
|
26
26
|
writable: true,
|
|
27
27
|
value: true
|
|
28
28
|
});
|
|
29
|
+
Object.defineProperty(this, "_browserType", {
|
|
30
|
+
enumerable: true,
|
|
31
|
+
configurable: true,
|
|
32
|
+
writable: true,
|
|
33
|
+
value: void 0
|
|
34
|
+
});
|
|
29
35
|
const { browserContext, version } = options;
|
|
30
36
|
this._browserContext = browserContext;
|
|
31
37
|
this._version = version;
|
|
@@ -46,6 +52,13 @@ class Browser extends node_events_1.EventEmitter {
|
|
|
46
52
|
version() {
|
|
47
53
|
return this._version;
|
|
48
54
|
}
|
|
55
|
+
/** @internal */
|
|
56
|
+
_setBrowserType(browserType) {
|
|
57
|
+
this._browserType = browserType;
|
|
58
|
+
}
|
|
59
|
+
browserType() {
|
|
60
|
+
return this._browserType;
|
|
61
|
+
}
|
|
49
62
|
async newPage(...args) {
|
|
50
63
|
return this._browserContext.newPage(...args);
|
|
51
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/playwright/browser.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAQ3C;;GAEG;AACH,MAAa,OAAQ,SAAQ,0BAAY;
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/playwright/browser.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAQ3C;;GAEG;AACH,MAAa,OAAQ,SAAQ,0BAAY;IAQrC,YAAY,OAAuB;QAC/B,KAAK,EAAE,CAAC;QARZ;;;;;WAAwC;QAExC;;;;;WAAyB;QAEzB;;;;mBAAuB,IAAI;WAAC;QAC5B;;;;;WAAmC;QAK/B,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5C,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;QAEtC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAExB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YACpC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IACvC,CAAC;IAED,QAAQ;QACJ,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAClC,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,gBAAgB;IAChB,eAAe,CAAC,WAAwB;QACpC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IACpC,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,YAAa,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAG,IAA2C;QACxD,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,oBAAoB;QACtB,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;IAC5F,CAAC;IAED,KAAK,CAAC,YAAY;QACd,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,CAAC,WAAW;QACb,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACnF,CAAC;CACJ;AAlED,0BAkEC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// @ts-ignore optional peer dependency
|
|
2
2
|
import type { Browser, BrowserType, Page } from 'playwright';
|
|
3
|
-
import {
|
|
3
|
+
import type { Cookie } from '@crawlee/types';
|
|
4
|
+
import { BrowserController } from '../abstract-classes/browser-controller';
|
|
4
5
|
export declare class PlaywrightController extends BrowserController<BrowserType, Parameters<BrowserType['launch']>[0], Browser> {
|
|
5
6
|
normalizeProxyOptions(proxyUrl: string | undefined, pageOptions: any): Record<string, unknown>;
|
|
6
7
|
protected _newPage(contextOptions?: Parameters<Browser['newPage']>[0]): Promise<Page>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-controller.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAE7D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"playwright-controller.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAG3E,qBAAa,oBAAqB,SAAQ,iBAAiB,CAAC,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;IACnH,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;cAmB9E,QAAQ,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cA0C3E,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;cAIvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAKpD,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAItE"}
|