@crawlee/browser-pool 3.0.0-beta.5 → 3.0.0-beta.50
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 +67 -71
- package/abstract-classes/browser-controller.d.ts +3 -3
- package/abstract-classes/browser-controller.d.ts.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 +17 -16
- package/browser-pool.d.ts.map +1 -1
- package/browser-pool.js +14 -16
- 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 +4 -4
- 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 +14 -12
- 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.map +1 -1
- package/puppeteer/puppeteer-plugin.d.ts +2 -2
- package/puppeteer/puppeteer-plugin.d.ts.map +1 -1
- package/tsconfig.build.tsbuildinfo +1 -1
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: [
|
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.50",
|
|
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,22 @@
|
|
|
34
36
|
"copy": "ts-node -T ../../scripts/copy.ts"
|
|
35
37
|
},
|
|
36
38
|
"dependencies": {
|
|
37
|
-
"@apify/log": "^
|
|
38
|
-
"@apify/timeout": "^0.
|
|
39
|
-
"fingerprint-generator": "^
|
|
40
|
-
"fingerprint-injector": "^
|
|
39
|
+
"@apify/log": "^2.0.0",
|
|
40
|
+
"@apify/timeout": "^0.3.0",
|
|
41
|
+
"fingerprint-generator": "^2.0.0-dev.3",
|
|
42
|
+
"fingerprint-injector": "^2.0.0-dev.3",
|
|
41
43
|
"lodash.merge": "^4.6.2",
|
|
42
44
|
"nanoid": "^3.3.4",
|
|
43
45
|
"ow": "^0.28.1",
|
|
44
46
|
"p-limit": "^3.1.0",
|
|
45
|
-
"quick-lru": "^5.1.1",
|
|
46
47
|
"proxy-chain": "^2.0.1",
|
|
48
|
+
"quick-lru": "^5.1.1",
|
|
47
49
|
"tiny-typed-emitter": "^2.1.0",
|
|
48
50
|
"tslib": "^2.4.0"
|
|
49
51
|
},
|
|
50
52
|
"peerDependencies": {
|
|
51
53
|
"playwright": "^1.21.1",
|
|
52
|
-
"puppeteer": ">= 9.x <=
|
|
54
|
+
"puppeteer": ">= 9.x <= 14.x"
|
|
53
55
|
},
|
|
54
56
|
"peerDependenciesMeta": {
|
|
55
57
|
"playwright": {
|
|
@@ -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 '../abstract-classes/browser-controller';
|
|
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,wCAAwC,CAAC;AACrE,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-controller.js","sourceRoot":"","sources":["../../src/playwright/playwright-controller.ts"],"names":[],"mappings":";;;AACA,4CAA2C;
|
|
1
|
+
{"version":3,"file":"playwright-controller.js","sourceRoot":"","sources":["../../src/playwright/playwright-controller.ts"],"names":[],"mappings":";;;AACA,4CAA2C;AAE3C,+EAA2E;AAC3E,wDAAyD;AAEzD,MAAa,oBAAqB,SAAQ,sCAA6E;IACnH,qBAAqB,CAAC,QAA4B,EAAE,WAAgB;QAChE,IAAI,CAAC,QAAQ,EAAE;YACX,OAAO,EAAE,CAAC;SACb;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAElD,OAAO;YACH,KAAK,EAAE;gBACH,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,QAAQ;gBACR,QAAQ;gBACR,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM;aACrC;SACJ,CAAC;IACN,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,cAAkD;QACvE,IAAI,cAAc,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE;YACvE,MAAM,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAAC;SACvG;QAED,gEAAgE;QAChE,IAAI,KAAK,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;QAC3B,IAAI,cAAc,EAAE,KAAK,EAAE;YACvB,MAAM,CAAC,kBAAkB,EAAE,UAAU,CAAC,GAAG,MAAM,IAAA,qCAAmB,EAC9D,cAAc,CAAC,KAAK,CAAC,MAAM,EAC3B,cAAc,CAAC,KAAK,CAAC,QAAQ,EAC7B,cAAc,CAAC,KAAK,CAAC,QAAQ,CAChC,CAAC;YAEF,IAAI,kBAAkB,EAAE;gBACpB,cAAc,CAAC,KAAK,GAAG;oBACnB,MAAM,EAAE,kBAAkB;oBAC1B,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,MAAM;iBACtC,CAAC;aACL;YAED,KAAK,GAAG,UAAU,CAAC;SACtB;QAED,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACxD,IAAA,mBAAS,GAAE,CAAC;YAEZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;gBAC1B,IAAI,CAAC,WAAW,EAAE,CAAC;gBAEnB,MAAM,KAAK,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,KAAK,EAAE,CAAC;YAEd,MAAM,KAAK,CAAC;SACf;IACL,CAAC;IAES,KAAK,CAAC,MAAM;QAClB,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;IAES,KAAK,CAAC,KAAK;QACjB,wDAAwD;QACxD,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,uFAAuF;IACvH,CAAC;IAES,WAAW,CAAC,IAAU;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC/B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAES,WAAW,CAAC,IAAU,EAAE,OAAiB;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC/B,OAAO,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;CACJ;AAhFD,oDAgFC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// @ts-ignore optional peer dependency
|
|
2
2
|
import type { Browser as PlaywrightBrowser, BrowserType } from 'playwright';
|
|
3
|
-
import { BrowserController } from '../abstract-classes/browser-controller';
|
|
3
|
+
import type { BrowserController } from '../abstract-classes/browser-controller';
|
|
4
4
|
import { BrowserPlugin } from '../abstract-classes/browser-plugin';
|
|
5
|
-
import { LaunchContext } from '../launch-context';
|
|
5
|
+
import type { LaunchContext } from '../launch-context';
|
|
6
6
|
export declare class PlaywrightPlugin extends BrowserPlugin<BrowserType, Parameters<BrowserType['launch']>[0], PlaywrightBrowser> {
|
|
7
7
|
private _browserVersion?;
|
|
8
8
|
protected _launch(launchContext: LaunchContext<BrowserType>): Promise<PlaywrightBrowser>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-plugin.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,IAAI,iBAAiB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"playwright-plugin.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,IAAI,iBAAiB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAKvD,qBAAa,gBAAiB,SAAQ,aAAa,CAAC,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC;IACrH,OAAO,CAAC,eAAe,CAAC,CAAS;cAEjB,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA+D9F,SAAS,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC;cAItG,wBAAwB,CAAC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlG,SAAS,CAAC,uBAAuB,IAAI,OAAO;CAI/C"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type Puppeteer from './puppeteer-proxy-per-page';
|
|
2
|
-
import {
|
|
2
|
+
import type { Cookie } from '../abstract-classes/browser-controller';
|
|
3
|
+
import { BrowserController } from '../abstract-classes/browser-controller';
|
|
3
4
|
export declare class PuppeteerController extends BrowserController<typeof Puppeteer> {
|
|
4
5
|
normalizeProxyOptions(proxyUrl: string | undefined, pageOptions: any): Record<string, unknown>;
|
|
5
6
|
protected _newPage(contextOptions?: Puppeteer.ContextOptions): Promise<Puppeteer.Page>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer-controller.d.ts","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-controller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"puppeteer-controller.d.ts","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-controller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,4BAA4B,CAAC;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAM3E,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,OAAO,SAAS,CAAC;IACxE,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;cAiB9E,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;cAuE5E,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;cAIvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBtC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9D,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAGhF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer-controller.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-controller.ts"],"names":[],"mappings":";;;AAAA,4CAA2C;
|
|
1
|
+
{"version":3,"file":"puppeteer-controller.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-controller.ts"],"names":[],"mappings":";;;AAAA,4CAA2C;AAG3C,+EAA2E;AAC3E,sCAAgC;AAChC,wDAAyD;AAEzD,MAAM,2BAA2B,GAAG,IAAI,CAAC;AAEzC,MAAa,mBAAoB,SAAQ,sCAAmC;IACxE,qBAAqB,CAAC,QAA4B,EAAE,WAAgB;QAChE,IAAI,CAAC,QAAQ,EAAE;YACX,OAAO,EAAE,CAAC;SACb;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAElD,OAAO;YACH,WAAW,EAAE,GAAG,CAAC,MAAM;YACvB,aAAa,EAAE,QAAQ;YACvB,aAAa,EAAE,QAAQ;YACvB,eAAe,EAAE,WAAW,EAAE,eAAe;SAChD,CAAC;IACN,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,cAAyC;QAC9D,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAAC;aACvG;YAED,gEAAgE;YAChE,IAAI,KAAK,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;YAC3B,IAAI,cAAc,CAAC,WAAW,EAAE;gBAC5B,MAAM,CAAC,kBAAkB,EAAE,UAAU,CAAC,GAAG,MAAM,IAAA,qCAAmB,EAC9D,cAAc,CAAC,WAAW,EAC1B,cAAc,CAAC,aAAa,EAC5B,cAAc,CAAC,aAAa,CAC/B,CAAC;gBAEF,IAAI,kBAAkB,EAAE;oBACpB,cAAc,CAAC,WAAW,GAAG,kBAAkB,CAAC;oBAChD,OAAO,cAAc,CAAC,aAAa,CAAC;oBACpC,OAAO,cAAc,CAAC,aAAa,CAAC;iBACvC;gBAED,KAAK,GAAG,UAAU,CAAC;aACtB;YAED,IAAI;gBACA,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAC;gBACjF,IAAA,mBAAS,GAAE,CAAC;gBACZ,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;gBACrC,IAAA,mBAAS,GAAE,CAAC;gBAEZ;;;;;;;;;kBASE;gBAEF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;oBAC1B,IAAI,CAAC,WAAW,EAAE,CAAC;oBAEnB,IAAI;wBACA,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;qBACzB;oBAAC,OAAO,KAAU,EAAE;wBACjB,YAAG,CAAC,SAAS,CAAC,KAAK,EAAE,0BAA0B,CAAC,CAAC;qBACpD;4BAAS;wBACN,MAAM,KAAK,EAAE,CAAC;qBACjB;gBACL,CAAC,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC;aACf;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,KAAK,EAAE,CAAC;gBAEd,MAAM,KAAK,CAAC;aACf;SACJ;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC1C,IAAA,mBAAS,GAAE,CAAC;QAEZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YACpB,IAAI,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,KAAK,CAAC,MAAM;QAClB,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;IAES,KAAK,CAAC,KAAK;QACjB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAE9C,IAAI,CAAC,cAAc,EAAE;YACjB,2FAA2F;YAC3F,OAAO;SACV;QAED,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,uDAAuD;YACvD,0EAA0E;YAC1E,6DAA6D;YAC7D,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC,EAAE,2BAA2B,CAAC,CAAC;QAEhC,IAAI;YACA,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAC3B,YAAY,CAAC,OAAO,CAAC,CAAC;SACzB;QAAC,OAAO,CAAC,EAAE;YACR,wCAAwC;SAC3C;IACL,CAAC;IAES,WAAW,CAAC,IAAoB;QACtC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAES,WAAW,CAAC,IAAoB,EAAE,OAAiB;QACzD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC;IACtC,CAAC;CACJ;AA3HD,kDA2HC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type Puppeteer from './puppeteer-proxy-per-page';
|
|
2
2
|
import type { Browser } from './puppeteer-proxy-per-page';
|
|
3
|
-
import { BrowserController } from '../abstract-classes/browser-controller';
|
|
3
|
+
import type { BrowserController } from '../abstract-classes/browser-controller';
|
|
4
4
|
import { BrowserPlugin } from '../abstract-classes/browser-plugin';
|
|
5
|
-
import { LaunchContext } from '../launch-context';
|
|
5
|
+
import type { LaunchContext } from '../launch-context';
|
|
6
6
|
export declare class PuppeteerPlugin extends BrowserPlugin<typeof Puppeteer> {
|
|
7
7
|
protected _launch(launchContext: LaunchContext<typeof Puppeteer>): Promise<Browser>;
|
|
8
8
|
protected _createController(): BrowserController<typeof Puppeteer>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer-plugin.d.ts","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,4BAA4B,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAA0B,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"puppeteer-plugin.d.ts","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,4BAA4B,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAA0B,MAAM,4BAA4B,CAAC;AAClF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAQvD,qBAAa,eAAgB,SAAQ,aAAa,CAAC,OAAO,SAAS,CAAC;cAChD,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,OAAO,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IA2HzF,SAAS,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,OAAO,SAAS,CAAC;cAIlD,wBAAwB,CACpC,aAAa,EAAE,aAAa,CAAC,OAAO,SAAS,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC;IA8BhB,SAAS,CAAC,uBAAuB,CAAC,aAAa,EAAE,aAAa,CAAC,OAAO,SAAS,CAAC,GAAG,OAAO;CAM7F"}
|