@crawlee/browser-pool 3.0.0-beta.8 → 3.0.1-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/README.md +75 -133
- 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 +17 -16
- 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 +4 -3
- package/fingerprinting/utils.js.map +1 -1
- package/index.d.ts +12 -9
- package/index.d.ts.map +1 -1
- package/index.js +17 -5
- package/index.js.map +1 -1
- package/index.mjs +6 -0
- 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 +17 -14
- package/playwright/{browser.d.ts → playwright-browser.d.ts} +7 -3
- package/playwright/playwright-browser.d.ts.map +1 -0
- package/playwright/{browser.js → playwright-browser.js} +17 -4
- package/playwright/playwright-browser.js.map +1 -0
- 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/playwright/playwright-plugin.js +2 -2
- package/playwright/playwright-plugin.js.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/playwright/browser.d.ts.map +0 -1
- package/playwright/browser.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@crawlee/browser-pool",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.1-beta.0",
|
|
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",
|
|
@@ -22,10 +24,10 @@
|
|
|
22
24
|
"license": "Apache-2.0",
|
|
23
25
|
"repository": {
|
|
24
26
|
"type": "git",
|
|
25
|
-
"url": "https://github.com/apify/
|
|
27
|
+
"url": "https://github.com/apify/crawlee"
|
|
26
28
|
},
|
|
27
29
|
"bugs": {
|
|
28
|
-
"url": "https://github.com/apify/
|
|
30
|
+
"url": "https://github.com/apify/crawlee/issues"
|
|
29
31
|
},
|
|
30
32
|
"scripts": {
|
|
31
33
|
"build": "npm run clean && npm run compile && npm run copy && node copy-definitions.mjs",
|
|
@@ -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.1-beta.0",
|
|
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": {
|
|
@@ -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
|
|
4
|
+
import type { BrowserContext, BrowserType, Browser } from 'playwright';
|
|
5
5
|
export interface BrowserOptions {
|
|
6
6
|
browserContext: BrowserContext;
|
|
7
7
|
version: string;
|
|
@@ -9,19 +9,23 @@ export interface BrowserOptions {
|
|
|
9
9
|
/**
|
|
10
10
|
* Browser wrapper created to have consistent API with persistent and non-persistent contexts.
|
|
11
11
|
*/
|
|
12
|
-
export declare class
|
|
12
|
+
export declare class PlaywrightBrowser extends EventEmitter implements Browser {
|
|
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>;
|
|
24
28
|
startTracing(): Promise<never>;
|
|
25
29
|
stopTracing(): Promise<never>;
|
|
26
30
|
}
|
|
27
|
-
//# sourceMappingURL=browser.d.ts.map
|
|
31
|
+
//# sourceMappingURL=playwright-browser.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"playwright-browser.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-browser.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAEvE,MAAM,WAAW,cAAc;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,YAAa,YAAW,OAAO;IAClE,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAS;IACzB,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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.PlaywrightBrowser = void 0;
|
|
4
4
|
const node_events_1 = require("node:events");
|
|
5
5
|
/**
|
|
6
6
|
* Browser wrapper created to have consistent API with persistent and non-persistent contexts.
|
|
7
7
|
*/
|
|
8
|
-
class
|
|
8
|
+
class PlaywrightBrowser extends node_events_1.EventEmitter {
|
|
9
9
|
constructor(options) {
|
|
10
10
|
super();
|
|
11
11
|
Object.defineProperty(this, "_browserContext", {
|
|
@@ -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
|
}
|
|
@@ -62,5 +75,5 @@ class Browser extends node_events_1.EventEmitter {
|
|
|
62
75
|
throw new Error('Function `stopTracing()` is not available in incognito mode');
|
|
63
76
|
}
|
|
64
77
|
}
|
|
65
|
-
exports.
|
|
66
|
-
//# sourceMappingURL=browser.js.map
|
|
78
|
+
exports.PlaywrightBrowser = PlaywrightBrowser;
|
|
79
|
+
//# sourceMappingURL=playwright-browser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"playwright-browser.js","sourceRoot":"","sources":["../../src/playwright/playwright-browser.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAQ3C;;GAEG;AACH,MAAa,iBAAkB,SAAQ,0BAAY;IAM/C,YAAY,OAAuB;QAC/B,KAAK,EAAE,CAAC;QANZ;;;;;WAAwC;QACxC;;;;;WAAyB;QACzB;;;;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;AAhED,8CAgEC"}
|
|
@@ -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"}
|
|
@@ -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,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PlaywrightPlugin = void 0;
|
|
4
|
-
const
|
|
4
|
+
const playwright_browser_1 = require("./playwright-browser");
|
|
5
5
|
const playwright_controller_1 = require("./playwright-controller");
|
|
6
6
|
const browser_plugin_1 = require("../abstract-classes/browser-plugin");
|
|
7
7
|
const logger_1 = require("../logger");
|
|
@@ -56,7 +56,7 @@ class PlaywrightPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
56
56
|
logger_1.log.exception(error, 'Failed to close browser.');
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
|
-
browser = new
|
|
59
|
+
browser = new playwright_browser_1.PlaywrightBrowser({ browserContext, version: this._browserVersion });
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-plugin.js","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"playwright-plugin.js","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import type { Cookie } from '@crawlee/types';
|
|
1
2
|
import type Puppeteer from './puppeteer-proxy-per-page';
|
|
2
|
-
import { BrowserController
|
|
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,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"puppeteer-controller.d.ts","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-controller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,SAAS,MAAM,4BAA4B,CAAC;AACxD,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"}
|
|
@@ -84,7 +84,7 @@ class PuppeteerController extends browser_controller_1.BrowserController {
|
|
|
84
84
|
async _kill() {
|
|
85
85
|
const browserProcess = this.browser.process();
|
|
86
86
|
if (!browserProcess) {
|
|
87
|
-
|
|
87
|
+
logger_1.log.debug('Browser was connected using the `puppeteer.connect` method no browser to kill.');
|
|
88
88
|
return;
|
|
89
89
|
}
|
|
90
90
|
const timeout = setTimeout(() => {
|
|
@@ -97,8 +97,8 @@ class PuppeteerController extends browser_controller_1.BrowserController {
|
|
|
97
97
|
await this.browser.close();
|
|
98
98
|
clearTimeout(timeout);
|
|
99
99
|
}
|
|
100
|
-
catch (
|
|
101
|
-
|
|
100
|
+
catch (error) {
|
|
101
|
+
logger_1.log.debug('Browser was already killed.', { error });
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
104
|
_getCookies(page) {
|
|
@@ -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":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
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>;
|
|
9
9
|
protected _addProxyToLaunchOptions(launchContext: LaunchContext<typeof Puppeteer>): Promise<void>;
|
|
10
|
-
protected _isChromiumBasedBrowser(
|
|
10
|
+
protected _isChromiumBasedBrowser(_launchContext: LaunchContext<typeof Puppeteer>): boolean;
|
|
11
11
|
}
|
|
12
12
|
//# sourceMappingURL=puppeteer-plugin.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer-plugin.d.ts","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"puppeteer-plugin.d.ts","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":"AAEA,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;IAmIzF,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,cAAc,EAAE,aAAa,CAAC,OAAO,SAAS,CAAC,GAAG,OAAO;CAG9F"}
|
|
@@ -58,9 +58,13 @@ class PuppeteerPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
58
58
|
logger_1.log.exception(error, 'Failed to retrieve page from target.');
|
|
59
59
|
}
|
|
60
60
|
});
|
|
61
|
-
const
|
|
61
|
+
const boundMethods = ['newPage', 'close', 'userAgent', 'createIncognitoBrowserContext', 'version']
|
|
62
|
+
.reduce((map, method) => {
|
|
63
|
+
map[method] = browser[method]?.bind(browser);
|
|
64
|
+
return map;
|
|
65
|
+
}, {});
|
|
62
66
|
browser = new Proxy(browser, {
|
|
63
|
-
get: (target, property) => {
|
|
67
|
+
get: (target, property, receiver) => {
|
|
64
68
|
if (property === 'newPage') {
|
|
65
69
|
return (async (...args) => {
|
|
66
70
|
let page;
|
|
@@ -83,7 +87,7 @@ class PuppeteerPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
83
87
|
}
|
|
84
88
|
}
|
|
85
89
|
else {
|
|
86
|
-
page = await newPage(...args);
|
|
90
|
+
page = await boundMethods.newPage(...args);
|
|
87
91
|
}
|
|
88
92
|
/*
|
|
89
93
|
// DO NOT USE YET! DOING SO DISABLES CACHE WHICH IS 50% PERFORMANCE HIT!
|
|
@@ -104,7 +108,10 @@ class PuppeteerPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
104
108
|
return page;
|
|
105
109
|
});
|
|
106
110
|
}
|
|
107
|
-
|
|
111
|
+
if (property in boundMethods) {
|
|
112
|
+
return boundMethods[property];
|
|
113
|
+
}
|
|
114
|
+
return Reflect.get(target, property, receiver);
|
|
108
115
|
},
|
|
109
116
|
});
|
|
110
117
|
return browser;
|
|
@@ -140,11 +147,8 @@ class PuppeteerPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
140
147
|
}
|
|
141
148
|
*/
|
|
142
149
|
}
|
|
143
|
-
_isChromiumBasedBrowser(
|
|
144
|
-
|
|
145
|
-
// @ts-expect-error cannot find .product on this.library
|
|
146
|
-
const browserName = launchOptions.product || this.library.product;
|
|
147
|
-
return browserName === 'chrome';
|
|
150
|
+
_isChromiumBasedBrowser(_launchContext) {
|
|
151
|
+
return true;
|
|
148
152
|
}
|
|
149
153
|
}
|
|
150
154
|
exports.PuppeteerPlugin = PuppeteerPlugin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer-plugin.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"puppeteer-plugin.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":"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"}
|