@crawlee/browser-pool 4.0.0-beta.67 → 4.0.0-beta.68
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/abstract-classes/browser-plugin.d.ts +29 -1
- package/abstract-classes/browser-plugin.d.ts.map +1 -1
- package/abstract-classes/browser-plugin.js +58 -3
- package/abstract-classes/browser-plugin.js.map +1 -1
- package/browser-pool.d.ts +10 -0
- package/browser-pool.d.ts.map +1 -1
- package/browser-pool.js +22 -0
- package/browser-pool.js.map +1 -1
- package/fingerprinting/hooks.d.ts.map +1 -1
- package/fingerprinting/hooks.js +7 -0
- package/fingerprinting/hooks.js.map +1 -1
- package/index.d.ts +3 -0
- package/index.d.ts.map +1 -1
- package/index.js +2 -0
- package/index.js.map +1 -1
- package/launch-context.d.ts +13 -0
- package/launch-context.d.ts.map +1 -1
- package/launch-context.js +9 -1
- package/launch-context.js.map +1 -1
- package/package.json +4 -4
- package/playwright/playwright-browser.d.ts.map +1 -1
- package/playwright/playwright-browser.js.map +1 -1
- package/playwright/playwright-controller.d.ts.map +1 -1
- package/playwright/playwright-controller.js +4 -0
- package/playwright/playwright-controller.js.map +1 -1
- package/playwright/playwright-plugin.d.ts +6 -0
- package/playwright/playwright-plugin.d.ts.map +1 -1
- package/playwright/playwright-plugin.js +23 -0
- package/playwright/playwright-plugin.js.map +1 -1
- package/puppeteer/puppeteer-plugin.d.ts +3 -0
- package/puppeteer/puppeteer-plugin.d.ts.map +1 -1
- package/puppeteer/puppeteer-plugin.js +77 -44
- package/puppeteer/puppeteer-plugin.js.map +1 -1
- package/remote-browser-pool.d.ts +173 -0
- package/remote-browser-pool.d.ts.map +1 -0
- package/remote-browser-pool.js +192 -0
- package/remote-browser-pool.js.map +1 -0
- package/remote-browser-provider.d.ts +84 -0
- package/remote-browser-provider.d.ts.map +1 -0
- package/remote-browser-provider.js +68 -0
- package/remote-browser-provider.js.map +1 -0
- package/utils.d.ts +7 -0
- package/utils.d.ts.map +1 -1
- package/utils.js +19 -0
- package/utils.js.map +1 -1
|
@@ -29,6 +29,10 @@ export class PlaywrightController extends BrowserController {
|
|
|
29
29
|
...this.launchContext.launchOptions,
|
|
30
30
|
...contextOptions,
|
|
31
31
|
};
|
|
32
|
+
// Remote browsers handle their own proxy — don't inject local proxy settings into context
|
|
33
|
+
if (this.launchContext.isRemote) {
|
|
34
|
+
delete contextOptions?.proxy;
|
|
35
|
+
}
|
|
32
36
|
if (contextOptions?.proxy) {
|
|
33
37
|
const [anonymizedProxyUrl, closeProxy] = await anonymizeProxySugar(contextOptions.proxy.server, contextOptions.proxy.username, contextOptions.proxy.password, { ignoreProxyCertificate: this.launchContext.ignoreProxyCertificate });
|
|
34
38
|
if (anonymizedProxyUrl) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-controller.js","sourceRoot":"","sources":["../../src/playwright/playwright-controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D,MAAM,OAAO,oBAAqB,SAAQ,iBAIzC;IACG,qBAAqB,CAAC,QAA4B,EAAE,WAAgB;QAChE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;QACd,CAAC;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,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,IAAI,EAAE;gBACtC,QAAQ;gBACR,QAAQ;gBACR,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM;aACrC;SACJ,CAAC;IACN,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,cAAsD;QAC3E,IAAI,cAAc,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC;YACxE,MAAM,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAAC;QACxG,CAAC;QAED,IAAI,KAAK,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;QAE3B,IAAI,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC;YACvC,6DAA6D;YAC7D,cAAc,GAAG;gBACb,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa;gBACnC,GAAG,cAAc;aACpB,CAAC;YAEF,IAAI,cAAc,EAAE,KAAK,EAAE,CAAC;gBACxB,MAAM,CAAC,kBAAkB,EAAE,UAAU,CAAC,GAAG,MAAM,mBAAmB,CAC9D,cAAc,CAAC,KAAK,CAAC,MAAM,EAC3B,cAAc,CAAC,KAAK,CAAC,QAAQ,EAC7B,cAAc,CAAC,KAAK,CAAC,QAAQ,EAC7B,EAAE,sBAAsB,EAAE,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,CACxE,CAAC;gBAEF,IAAI,kBAAkB,EAAE,CAAC;oBACrB,cAAc,CAAC,KAAK,GAAG;wBACnB,MAAM,EAAE,kBAAkB;wBAC1B,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,MAAM;qBACtC,CAAC;gBACN,CAAC;gBAED,KAAK,GAAG,UAAU,CAAC;YACvB,CAAC;QACL,CAAC;QAED,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAExD,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,SAAS,EAAE,CAAC;YAEZ,OAAO,IAAI,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,KAAK,EAAE,CAAC;YAEd,MAAM,KAAK,CAAC;QAChB,CAAC;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,KAAK,CAAC,WAAW,CAAC,IAAU;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC/B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,IAAU,EAAE,OAAiB;QACrD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC/B,OAAO,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;CACJ"}
|
|
1
|
+
{"version":3,"file":"playwright-controller.js","sourceRoot":"","sources":["../../src/playwright/playwright-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,17 @@ import type { Browser as PlaywrightBrowser, BrowserType } from 'playwright';
|
|
|
3
3
|
import { BrowserPlugin } from '../abstract-classes/browser-plugin.js';
|
|
4
4
|
import type { createProxyServerForContainers } from '../container-proxy-server.js';
|
|
5
5
|
import type { LaunchContext } from '../launch-context.js';
|
|
6
|
+
import type { RemoteConnection, RemoteConnectionParameters } from '../remote-browser-pool.js';
|
|
6
7
|
import type { SafeParameters } from '../utils.js';
|
|
7
8
|
import { PlaywrightController } from './playwright-controller.js';
|
|
8
9
|
export declare class PlaywrightPlugin extends BrowserPlugin<BrowserType, SafeParameters<BrowserType['launch']>[0], PlaywrightBrowser> {
|
|
9
10
|
private _browserVersion?;
|
|
10
11
|
_containerProxyServer?: Awaited<ReturnType<typeof createProxyServerForContainers>>;
|
|
12
|
+
/**
|
|
13
|
+
* Playwright remote connections only support incognito pages — `connect()` / `connectOverCDP()` don't
|
|
14
|
+
* accept persistent contexts. Force it on (and inform the user) when wired for a remote connection.
|
|
15
|
+
*/
|
|
16
|
+
useRemoteConnection(connection: RemoteConnection, parameters?: RemoteConnectionParameters): void;
|
|
11
17
|
protected _launch(launchContext: LaunchContext<BrowserType>): Promise<PlaywrightBrowser>;
|
|
12
18
|
private _throwOnFailedLaunch;
|
|
13
19
|
createController(): PlaywrightController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-plugin.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,IAAI,iBAAiB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAEtE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,qBAAa,gBAAiB,SAAQ,aAAa,CAC/C,WAAW,EACX,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EACxC,iBAAiB,CACpB;IACG,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,8BAA8B,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"playwright-plugin.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,IAAI,iBAAiB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAEtE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,qBAAa,gBAAiB,SAAQ,aAAa,CAC/C,WAAW,EACX,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EACxC,iBAAiB,CACpB;IACG,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,8BAA8B,CAAC,CAAC,CAAC;IAEnF;;;OAGG;IACM,mBAAmB,CAAC,UAAU,EAAE,gBAAgB,EAAE,UAAU,GAAE,0BAA+B,GAAG,IAAI;cAY7F,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA6F9F,OAAO,CAAC,oBAAoB;IASnB,gBAAgB,IAAI,oBAAoB;cAIjC,wBAAwB,CAAC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlG,SAAS,CAAC,uBAAuB,IAAI,OAAO;CAI/C"}
|
|
@@ -7,7 +7,30 @@ import { PlaywrightController } from './playwright-controller.js';
|
|
|
7
7
|
export class PlaywrightPlugin extends BrowserPlugin {
|
|
8
8
|
_browserVersion;
|
|
9
9
|
_containerProxyServer;
|
|
10
|
+
/**
|
|
11
|
+
* Playwright remote connections only support incognito pages — `connect()` / `connectOverCDP()` don't
|
|
12
|
+
* accept persistent contexts. Force it on (and inform the user) when wired for a remote connection.
|
|
13
|
+
*/
|
|
14
|
+
useRemoteConnection(connection, parameters = {}) {
|
|
15
|
+
super.useRemoteConnection(connection, parameters);
|
|
16
|
+
if (!this.useIncognitoPages) {
|
|
17
|
+
this.log.info('Remote Playwright connection — useIncognitoPages forced to true. ' +
|
|
18
|
+
'Pages will not share cookies/storage between each other; use the SessionPool for shared state.');
|
|
19
|
+
}
|
|
20
|
+
this.useIncognitoPages = true;
|
|
21
|
+
}
|
|
10
22
|
async _launch(launchContext) {
|
|
23
|
+
if (this.remoteConnection) {
|
|
24
|
+
return this._connectToRemoteBrowser(launchContext, async (url) => {
|
|
25
|
+
const connectOptions = (this.remoteConnectionParameters?.connectOptions ?? {});
|
|
26
|
+
if (this.remoteConnectionParameters?.protocol === 'playwright') {
|
|
27
|
+
this.log.info('Connecting to remote browser via connect (Playwright WebSocket).');
|
|
28
|
+
return this.library.connect(url, connectOptions);
|
|
29
|
+
}
|
|
30
|
+
this.log.info('Connecting to remote browser via connectOverCDP.');
|
|
31
|
+
return this.library.connectOverCDP(url, connectOptions);
|
|
32
|
+
});
|
|
33
|
+
}
|
|
11
34
|
const { launchOptions, useIncognitoPages, userDataDir, proxyUrl } = launchContext;
|
|
12
35
|
let browser;
|
|
13
36
|
// Required for the `proxy` context option to work.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-plugin.js","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"playwright-plugin.js","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,12 @@ import type Puppeteer from 'puppeteer';
|
|
|
4
4
|
import type * as PuppeteerTypes from 'puppeteer';
|
|
5
5
|
import { BrowserPlugin } from '../abstract-classes/browser-plugin.js';
|
|
6
6
|
import type { LaunchContext } from '../launch-context.js';
|
|
7
|
+
import type { RemoteConnection, RemoteConnectionParameters } from '../remote-browser-pool.js';
|
|
7
8
|
import type { PuppeteerNewPageOptions } from './puppeteer-controller.js';
|
|
8
9
|
import { PuppeteerController } from './puppeteer-controller.js';
|
|
9
10
|
export declare class PuppeteerPlugin extends BrowserPlugin<typeof Puppeteer, PuppeteerTypes.LaunchOptions, PuppeteerTypes.Browser, PuppeteerNewPageOptions> {
|
|
11
|
+
/** Pages share cookies/storage on the remote browser (Puppeteer defaults to non-incognito). */
|
|
12
|
+
useRemoteConnection(connection: RemoteConnection, parameters?: RemoteConnectionParameters): void;
|
|
10
13
|
protected _launch(launchContext: LaunchContext<typeof Puppeteer, PuppeteerTypes.LaunchOptions, PuppeteerTypes.Browser, PuppeteerNewPageOptions>): Promise<PuppeteerTypes.Browser>;
|
|
11
14
|
createController(): PuppeteerController;
|
|
12
15
|
protected _addProxyToLaunchOptions(_launchContext: LaunchContext<typeof Puppeteer, PuppeteerTypes.LaunchOptions, PuppeteerTypes.Browser, PuppeteerNewPageOptions>): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer-plugin.d.ts","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,KAAK,cAAc,MAAM,WAAW,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAEtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"puppeteer-plugin.d.ts","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,KAAK,cAAc,MAAM,WAAW,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAEtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAE9F,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAIhE,qBAAa,eAAgB,SAAQ,aAAa,CAC9C,OAAO,SAAS,EAChB,cAAc,CAAC,aAAa,EAC5B,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B;IACG,+FAA+F;IACtF,mBAAmB,CAAC,UAAU,EAAE,gBAAgB,EAAE,UAAU,GAAE,0BAA+B,GAAG,IAAI;cAW7F,OAAO,CACnB,aAAa,EAAE,aAAa,CACxB,OAAO,SAAS,EAChB,cAAc,CAAC,aAAa,EAC5B,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B,GACF,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;IAiMzB,gBAAgB,IAAI,mBAAmB;cAIhC,wBAAwB,CACpC,cAAc,EAAE,aAAa,CACzB,OAAO,SAAS,EAChB,cAAc,CAAC,aAAa,EAC5B,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B,GACF,OAAO,CAAC,IAAI,CAAC;IA4BhB,SAAS,CAAC,uBAAuB,CAC7B,cAAc,EAAE,aAAa,CACzB,OAAO,SAAS,EAChB,cAAc,CAAC,aAAa,EAC5B,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B,GACF,OAAO;CAGb"}
|
|
@@ -5,6 +5,14 @@ import { noop } from '../utils.js';
|
|
|
5
5
|
import { PuppeteerController } from './puppeteer-controller.js';
|
|
6
6
|
const PROXY_SERVER_ARG = '--proxy-server=';
|
|
7
7
|
export class PuppeteerPlugin extends BrowserPlugin {
|
|
8
|
+
/** Pages share cookies/storage on the remote browser (Puppeteer defaults to non-incognito). */
|
|
9
|
+
useRemoteConnection(connection, parameters = {}) {
|
|
10
|
+
super.useRemoteConnection(connection, parameters);
|
|
11
|
+
if (!this.useIncognitoPages) {
|
|
12
|
+
this.log.info('Remote Puppeteer connection — pages will share cookies and storage on the remote ' +
|
|
13
|
+
'browser instance (useIncognitoPages defaults to false).');
|
|
14
|
+
}
|
|
15
|
+
}
|
|
8
16
|
async _launch(launchContext) {
|
|
9
17
|
let oldPuppeteerVersion = false;
|
|
10
18
|
try {
|
|
@@ -16,50 +24,60 @@ export class PuppeteerPlugin extends BrowserPlugin {
|
|
|
16
24
|
catch {
|
|
17
25
|
// ignore
|
|
18
26
|
}
|
|
19
|
-
const {
|
|
20
|
-
if (experimentalContainers) {
|
|
21
|
-
throw new Error('Experimental containers are only available with Playwright');
|
|
22
|
-
}
|
|
23
|
-
launchOptions.userDataDir = launchOptions.userDataDir ?? userDataDir;
|
|
24
|
-
if (launchOptions.headless === false) {
|
|
25
|
-
if (Array.isArray(launchOptions.args)) {
|
|
26
|
-
launchOptions.args.push('--disable-site-isolation-trials');
|
|
27
|
-
}
|
|
28
|
-
else {
|
|
29
|
-
launchOptions.args = ['--disable-site-isolation-trials'];
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
if (launchOptions.headless === true && oldPuppeteerVersion) {
|
|
33
|
-
launchOptions.headless = 'new';
|
|
34
|
-
}
|
|
27
|
+
const { useIncognitoPages, proxyUrl, ignoreProxyCertificate } = launchContext;
|
|
35
28
|
let browser;
|
|
36
|
-
{
|
|
37
|
-
|
|
38
|
-
|
|
29
|
+
if (this.remoteConnection) {
|
|
30
|
+
browser = await this._connectToRemoteBrowser(launchContext, async (url) => {
|
|
31
|
+
const connectOptions = this.remoteConnectionParameters?.connectOptions ?? {};
|
|
32
|
+
this.log.info('Connecting to remote browser via connect (CDP).');
|
|
33
|
+
return this.library.connect({ ...connectOptions, browserWSEndpoint: url });
|
|
39
34
|
});
|
|
40
|
-
|
|
41
|
-
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
const { launchOptions, userDataDir, experimentalContainers } = launchContext;
|
|
38
|
+
if (experimentalContainers) {
|
|
39
|
+
throw new Error('Experimental containers are only available with Playwright');
|
|
40
|
+
}
|
|
41
|
+
launchOptions.userDataDir = launchOptions.userDataDir ?? userDataDir;
|
|
42
|
+
if (launchOptions.headless === false) {
|
|
42
43
|
if (Array.isArray(launchOptions.args)) {
|
|
43
|
-
launchOptions.args.push(
|
|
44
|
+
launchOptions.args.push('--disable-site-isolation-trials');
|
|
44
45
|
}
|
|
45
46
|
else {
|
|
46
|
-
launchOptions.args = [
|
|
47
|
+
launchOptions.args = ['--disable-site-isolation-trials'];
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
if (anonymizedProxyUrl) {
|
|
52
|
-
browser.on('disconnected', async () => {
|
|
53
|
-
await close();
|
|
54
|
-
});
|
|
55
|
-
}
|
|
50
|
+
if (launchOptions.headless === true && oldPuppeteerVersion) {
|
|
51
|
+
launchOptions.headless = 'new';
|
|
56
52
|
}
|
|
57
|
-
|
|
58
|
-
await
|
|
59
|
-
|
|
53
|
+
{
|
|
54
|
+
const [anonymizedProxyUrl, close] = await anonymizeProxySugar(proxyUrl, undefined, undefined, {
|
|
55
|
+
ignoreProxyCertificate: launchContext.ignoreProxyCertificate,
|
|
56
|
+
});
|
|
57
|
+
if (proxyUrl) {
|
|
58
|
+
const proxyArg = `${PROXY_SERVER_ARG}${anonymizedProxyUrl ?? proxyUrl}`;
|
|
59
|
+
if (Array.isArray(launchOptions.args)) {
|
|
60
|
+
launchOptions.args.push(proxyArg);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
launchOptions.args = [proxyArg];
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
try {
|
|
67
|
+
browser = await this.library.launch(launchOptions);
|
|
68
|
+
if (anonymizedProxyUrl) {
|
|
69
|
+
browser.on('disconnected', async () => {
|
|
70
|
+
await close();
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
await close();
|
|
76
|
+
this._throwAugmentedLaunchError(error, launchContext.launchOptions?.executablePath, '`apify/actor-node-puppeteer-chrome`', "Try installing a browser, if it's missing, by running `npx @puppeteer/browsers install chromium --path [path]` and pointing `executablePath` to the downloaded executable (https://pptr.dev/browsers-api)");
|
|
77
|
+
}
|
|
60
78
|
}
|
|
61
79
|
}
|
|
62
|
-
|
|
80
|
+
const targetCreatedHandler = async (target) => {
|
|
63
81
|
try {
|
|
64
82
|
const page = await target.page();
|
|
65
83
|
if (page) {
|
|
@@ -72,7 +90,14 @@ export class PuppeteerPlugin extends BrowserPlugin {
|
|
|
72
90
|
catch (error) {
|
|
73
91
|
this.log.exception(error, 'Failed to retrieve page from target.');
|
|
74
92
|
}
|
|
75
|
-
}
|
|
93
|
+
};
|
|
94
|
+
browser.on('targetcreated', targetCreatedHandler);
|
|
95
|
+
// Clean up the listener when a remote browser disconnects to prevent leaks
|
|
96
|
+
if (this.remoteConnection) {
|
|
97
|
+
browser.once('disconnected', () => {
|
|
98
|
+
browser.off('targetcreated', targetCreatedHandler);
|
|
99
|
+
});
|
|
100
|
+
}
|
|
76
101
|
const boundMethods = [
|
|
77
102
|
'newPage',
|
|
78
103
|
'close',
|
|
@@ -94,22 +119,30 @@ export class PuppeteerPlugin extends BrowserPlugin {
|
|
|
94
119
|
return async (...args) => {
|
|
95
120
|
let page;
|
|
96
121
|
if (useIncognitoPages) {
|
|
97
|
-
|
|
122
|
+
// Skip proxy setup for remote connections — proxy is managed by the remote service.
|
|
123
|
+
const effectiveProxyUrl = this.remoteConnection ? undefined : proxyUrl;
|
|
124
|
+
const [anonymizedProxyUrl, close] = effectiveProxyUrl
|
|
125
|
+
? await anonymizeProxySugar(effectiveProxyUrl, undefined, undefined, {
|
|
126
|
+
ignoreProxyCertificate,
|
|
127
|
+
})
|
|
128
|
+
: [undefined, noop];
|
|
129
|
+
const proxyServer = anonymizedProxyUrl ?? effectiveProxyUrl;
|
|
130
|
+
const contextOptions = proxyServer ? { proxyServer } : {};
|
|
131
|
+
const context = (await browser[method](contextOptions));
|
|
98
132
|
try {
|
|
99
|
-
const context = (await browser[method]({
|
|
100
|
-
proxyServer: anonymizedProxyUrl ?? proxyUrl,
|
|
101
|
-
}));
|
|
102
133
|
page = await context.newPage(...args);
|
|
103
|
-
if (anonymizedProxyUrl) {
|
|
104
|
-
page.on('close', async () => {
|
|
105
|
-
await close();
|
|
106
|
-
});
|
|
107
|
-
}
|
|
108
134
|
}
|
|
109
135
|
catch (error) {
|
|
136
|
+
await context.close().catch(noop);
|
|
110
137
|
await close();
|
|
111
138
|
throw error;
|
|
112
139
|
}
|
|
140
|
+
page.once('close', async () => {
|
|
141
|
+
if (anonymizedProxyUrl) {
|
|
142
|
+
await close();
|
|
143
|
+
}
|
|
144
|
+
await context.close().catch(noop);
|
|
145
|
+
});
|
|
113
146
|
}
|
|
114
147
|
else {
|
|
115
148
|
page = await boundMethods.newPage(...args);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer-plugin.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAM5C,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"puppeteer-plugin.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
import type { IBrowserPool, NewPageOptions, PageState } from '@crawlee/types';
|
|
2
|
+
import type { BrowserPlugin } from './abstract-classes/browser-plugin.js';
|
|
3
|
+
import { BrowserPool } from './browser-pool.js';
|
|
4
|
+
import type { BrowserPoolHooks, BrowserPoolOptions } from './browser-pool.js';
|
|
5
|
+
import { RemoteBrowserProvider } from './remote-browser-provider.js';
|
|
6
|
+
/**
|
|
7
|
+
* The result of resolving a remote browser endpoint: the URL to connect to plus an optional opaque
|
|
8
|
+
* `context` object that is handed back to `release`.
|
|
9
|
+
*/
|
|
10
|
+
export interface ResolvedRemoteEndpoint {
|
|
11
|
+
/** The browser endpoint URL to connect to. */
|
|
12
|
+
url: string;
|
|
13
|
+
/** Opaque metadata passed back to `release()` — e.g. session IDs, API tokens. */
|
|
14
|
+
context?: Record<string, unknown>;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* A remote browser endpoint: either a static URL string, or a function called once per browser launch
|
|
18
|
+
* that returns a URL (optionally with a `context` for `release`).
|
|
19
|
+
*
|
|
20
|
+
* The function receives the `proxyUrl` resolved by Crawlee's proxy configuration for the launch, so it
|
|
21
|
+
* can forward it to the remote service's proxy API.
|
|
22
|
+
*/
|
|
23
|
+
export type RemoteBrowserEndpoint = string | ((options?: {
|
|
24
|
+
proxyUrl?: string;
|
|
25
|
+
}) => string | ResolvedRemoteEndpoint | Promise<string | ResolvedRemoteEndpoint>);
|
|
26
|
+
/**
|
|
27
|
+
* The bridge a {@link RemoteBrowserPool} injects into a {@link BrowserPlugin} so the plugin can
|
|
28
|
+
* connect to a remote browser without owning any remote-session policy.
|
|
29
|
+
*
|
|
30
|
+
* The plugin only knows how to make the library-specific `connect()` call; everything else — resolving
|
|
31
|
+
* the endpoint, calling the user's `release()`, and guaranteeing release fires at most once — lives in
|
|
32
|
+
* the pool. The plugin calls {@link RemoteConnection.resolve|resolve} before connecting, stores the
|
|
33
|
+
* returned `token` on its launch context, and the controller later calls
|
|
34
|
+
* {@link RemoteConnection.release|release} with that token when the browser closes.
|
|
35
|
+
*
|
|
36
|
+
* @internal
|
|
37
|
+
*/
|
|
38
|
+
export interface RemoteConnection {
|
|
39
|
+
/** Resolves the endpoint for a single browser launch. The `token` identifies the session for release. */
|
|
40
|
+
resolve(options?: {
|
|
41
|
+
proxyUrl?: string;
|
|
42
|
+
}): Promise<{
|
|
43
|
+
url: string;
|
|
44
|
+
token: number;
|
|
45
|
+
}>;
|
|
46
|
+
/** Releases the remote session for `token`. Idempotent — safe to call from both `close()` and `kill()`. */
|
|
47
|
+
release(token: number): Promise<void>;
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Per-plugin remote connection parameters, passed to {@link BrowserPlugin.useRemoteConnection}.
|
|
51
|
+
* The endpoint is supplied per-launch via {@link RemoteConnection}; these are the static connect()
|
|
52
|
+
* parameters (protocol, headers, timeouts, …).
|
|
53
|
+
*/
|
|
54
|
+
export interface RemoteConnectionParameters {
|
|
55
|
+
/**
|
|
56
|
+
* Playwright only: which protocol to connect with. `'cdp'` uses `connectOverCDP()` (the default),
|
|
57
|
+
// @ts-ignore optional peer dependency or compatibility with es2022
|
|
58
|
+
* `'playwright'` uses `connect()` (Playwright's own WebSocket protocol). Ignored by Puppeteer.
|
|
59
|
+
*/
|
|
60
|
+
protocol?: 'cdp' | 'playwright';
|
|
61
|
+
/** Extra options forwarded to the library `connect()` / `connectOverCDP()` call (endpoint excluded). */
|
|
62
|
+
connectOptions?: Record<string, unknown>;
|
|
63
|
+
}
|
|
64
|
+
export interface RemoteBrowserPoolOptions {
|
|
65
|
+
/**
|
|
66
|
+
* The browser plugin(s) used to connect to the remote service — e.g. `new PlaywrightPlugin(playwright.chromium)`
|
|
67
|
+
* or `new PuppeteerPlugin(puppeteer)`. The pool configures them for remote connection; do not set a local
|
|
68
|
+
* `launchOptions` on them.
|
|
69
|
+
*/
|
|
70
|
+
browserPlugins: BrowserPlugin[];
|
|
71
|
+
/**
|
|
72
|
+
* The remote browser endpoint: a static URL, a function returning one per launch, or a
|
|
73
|
+
* {@link RemoteBrowserProvider} instance encapsulating a session create/release lifecycle.
|
|
74
|
+
*/
|
|
75
|
+
endpoint: RemoteBrowserEndpoint | RemoteBrowserProvider<any>;
|
|
76
|
+
/**
|
|
77
|
+
* Cleanup callback invoked when a browser closes, crashes, or the pool is destroyed. Receives the
|
|
78
|
+
* `context` returned by a function endpoint. Errors are caught and logged. Ignored when `endpoint`
|
|
79
|
+
* is a {@link RemoteBrowserProvider} (its own `release()` is used instead).
|
|
80
|
+
*/
|
|
81
|
+
release?: (info: {
|
|
82
|
+
endpoint: string;
|
|
83
|
+
context?: Record<string, unknown>;
|
|
84
|
+
}) => unknown;
|
|
85
|
+
/**
|
|
86
|
+
* Maximum number of remote browsers open at once. When reached, {@link RemoteBrowserPool.newPage|newPage}
|
|
87
|
+
* waits for a browser to close before connecting a new one. Set it to your service's concurrent-session limit
|
|
88
|
+
* to avoid `429` errors. Defaults to the {@link RemoteBrowserProvider.maxOpenBrowsers|provider's value}, or
|
|
89
|
+
* `Infinity`.
|
|
90
|
+
*/
|
|
91
|
+
maxOpenBrowsers?: number;
|
|
92
|
+
/** Static connect() parameters (Playwright protocol selection, headers, timeouts, …). */
|
|
93
|
+
connection?: RemoteConnectionParameters;
|
|
94
|
+
/** Extra {@link BrowserPool} options (lifecycle hooks, page limits, fingerprinting, …). */
|
|
95
|
+
browserPoolOptions?: Omit<BrowserPoolOptions, 'browserPlugins'> & BrowserPoolHooks<any, any, any>;
|
|
96
|
+
/** Fallback poll interval (ms) while waiting for a free browser slot. The wait is event-driven; this only bounds it. @default 500 */
|
|
97
|
+
slotPollIntervalMillis?: number;
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* The remote-connection configuration a browser crawler accepts on its `remoteBrowser` option. It is the
|
|
101
|
+
* {@link RemoteBrowserPoolOptions} a user supplies *minus* the parts the crawler provides itself — the
|
|
102
|
+
* `browserPlugins` (the crawler builds the correct one for its browser) and `browserPoolOptions` (taken from
|
|
103
|
+
* the crawler's own `browserPoolOptions`). This is what makes the crawler path both terse and mismatch-proof.
|
|
104
|
+
*/
|
|
105
|
+
export type CrawlerRemoteBrowserOptions = Omit<RemoteBrowserPoolOptions, 'browserPlugins' | 'browserPoolOptions'>;
|
|
106
|
+
/**
|
|
107
|
+
* An {@link IBrowserPool} implementation for remote browser services.
|
|
108
|
+
*
|
|
109
|
+
* Unlike configuring a remote browser through a crawler's `launchContext`, this pool is the single owner
|
|
110
|
+
* of all remote-session concerns:
|
|
111
|
+
* - **endpoint resolution** — static URL, per-launch function, or {@link RemoteBrowserProvider};
|
|
112
|
+
* - **release lifecycle** — `release()` fires exactly once per session on close/crash/teardown (no leaks,
|
|
113
|
+
* no double-release);
|
|
114
|
+
* - **concurrency** — {@link RemoteBrowserPoolOptions.maxOpenBrowsers|maxOpenBrowsers} is enforced inside
|
|
115
|
+
* {@link RemoteBrowserPool.newPage|newPage}, which waits for a free slot rather than overshooting.
|
|
116
|
+
*
|
|
117
|
+
* The wrapped {@link BrowserPool} and its plugin only perform the library-specific `connect()` call.
|
|
118
|
+
*
|
|
119
|
+
* Pass an instance as the crawler's `browserPool` option:
|
|
120
|
+
*
|
|
121
|
+
* ```typescript
|
|
122
|
+
* import { PlaywrightPlugin, RemoteBrowserPool } from '@crawlee/browser-pool';
|
|
123
|
+
* import { PlaywrightCrawler } from 'crawlee';
|
|
124
|
+
// @ts-ignore optional peer dependency or compatibility with es2022
|
|
125
|
+
* import playwright from 'playwright';
|
|
126
|
+
*
|
|
127
|
+
* const browserPool = new RemoteBrowserPool({
|
|
128
|
+
* browserPlugins: [new PlaywrightPlugin(playwright.chromium)],
|
|
129
|
+
* endpoint: 'wss://production-sfo.browserless.io?token=xxx',
|
|
130
|
+
* maxOpenBrowsers: 2,
|
|
131
|
+
* });
|
|
132
|
+
*
|
|
133
|
+
* const crawler = new PlaywrightCrawler({ browserPool });
|
|
134
|
+
* ```
|
|
135
|
+
*
|
|
136
|
+
* @category Browser management
|
|
137
|
+
*/
|
|
138
|
+
export declare class RemoteBrowserPool<Page = unknown> implements IBrowserPool<Page> {
|
|
139
|
+
/** The wrapped pool that performs the remote connections and serves pages. */
|
|
140
|
+
readonly browserPool: BrowserPool;
|
|
141
|
+
/** The wrapped pool viewed through the {@link IBrowserPool} contract (the bare type widens pages to `never`). */
|
|
142
|
+
private readonly pool;
|
|
143
|
+
private readonly registry;
|
|
144
|
+
private readonly slotPollIntervalMillis;
|
|
145
|
+
private readonly log;
|
|
146
|
+
/** Shared by all `newPage` callers waiting for a free slot, so they don't each register their own listeners. */
|
|
147
|
+
private _capacityChange?;
|
|
148
|
+
constructor(options: RemoteBrowserPoolOptions);
|
|
149
|
+
/** Maximum number of remote browsers that may be open at the same time. */
|
|
150
|
+
get maxOpenBrowsers(): number;
|
|
151
|
+
set maxOpenBrowsers(value: number);
|
|
152
|
+
/**
|
|
153
|
+
* Opens a new page, waiting first until {@link RemoteBrowserPoolOptions.maxOpenBrowsers|maxOpenBrowsers}
|
|
154
|
+
* allows it (either a new browser slot is free, or an active browser still has page capacity).
|
|
155
|
+
*/
|
|
156
|
+
newPage(options?: NewPageOptions): Promise<Page>;
|
|
157
|
+
closePage(page: Page, options?: {
|
|
158
|
+
error?: Error;
|
|
159
|
+
}): Promise<void>;
|
|
160
|
+
extractPageState(page: Page): Promise<PageState>;
|
|
161
|
+
injectPageState(page: Page, state: PageState): Promise<void>;
|
|
162
|
+
/** Closes all browsers, releases any still-open remote sessions, and tears down the wrapped pool. */
|
|
163
|
+
destroy(): Promise<void>;
|
|
164
|
+
/** Resolves once the wrapped pool can serve another page without exceeding `maxOpenBrowsers`. */
|
|
165
|
+
private _waitForFreeSlot;
|
|
166
|
+
/**
|
|
167
|
+
* Resolves on the next browser-retired / page-closed event, or after `slotPollIntervalMillis`. All
|
|
168
|
+
* concurrently-waiting `newPage` calls share a single promise (and a single pair of event listeners)
|
|
169
|
+
* per tick, so a fleet of saturated callers doesn't fan out into N listener pairs on the pool.
|
|
170
|
+
*/
|
|
171
|
+
private _nextCapacityChange;
|
|
172
|
+
}
|
|
173
|
+
//# sourceMappingURL=remote-browser-pool.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-browser-pool.d.ts","sourceRoot":"","sources":["../src/remote-browser-pool.ts"],"names":[],"mappings":"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"}
|