@crawlee/browser-pool 3.10.1-beta.5 → 3.10.1-beta.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/abstract-classes/browser-controller.d.ts.map +1 -1
- package/abstract-classes/browser-controller.js +0 -43
- package/abstract-classes/browser-controller.js.map +1 -1
- package/abstract-classes/browser-plugin.d.ts.map +1 -1
- package/abstract-classes/browser-plugin.js +0 -27
- package/abstract-classes/browser-plugin.js.map +1 -1
- package/anonymize-proxy.d.ts.map +1 -1
- package/anonymize-proxy.js +2 -8
- package/anonymize-proxy.js.map +1 -1
- package/browser-pool.d.ts +5 -5
- package/browser-pool.d.ts.map +1 -1
- package/browser-pool.js +19 -25
- package/browser-pool.js.map +1 -1
- package/fingerprinting/hooks.d.ts.map +1 -1
- package/fingerprinting/hooks.js +2 -2
- package/fingerprinting/hooks.js.map +1 -1
- package/fingerprinting/types.d.ts +29 -29
- package/fingerprinting/types.d.ts.map +1 -1
- package/fingerprinting/utils.js.map +1 -1
- package/package.json +4 -4
- package/playwright/playwright-controller.d.ts.map +1 -1
- package/playwright/playwright-controller.js +3 -1
- package/playwright/playwright-controller.js.map +1 -1
- package/playwright/playwright-plugin.d.ts.map +1 -1
- package/playwright/playwright-plugin.js +10 -7
- package/playwright/playwright-plugin.js.map +1 -1
- package/puppeteer/puppeteer-controller.d.ts.map +1 -1
- package/puppeteer/puppeteer-controller.js +1 -1
- package/puppeteer/puppeteer-controller.js.map +1 -1
- package/puppeteer/puppeteer-plugin.d.ts.map +1 -1
- package/puppeteer/puppeteer-plugin.js +15 -7
- package/puppeteer/puppeteer-plugin.js.map +1 -1
- package/tab-as-a-container/background.js +37 -21
- package/tab-as-a-container/content.js +37 -18
- package/tab-as-a-container/manifest.json +2 -6
- package/tsconfig.build.tsbuildinfo +1 -1
- package/utils.d.ts +3 -1
- package/utils.d.ts.map +1 -1
- package/abstract-classes/utils.d.ts +0 -2
- package/abstract-classes/utils.d.ts.map +0 -1
- package/abstract-classes/utils.js +0 -8
- package/abstract-classes/utils.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@crawlee/browser-pool",
|
|
3
|
-
"version": "3.10.1-beta.
|
|
3
|
+
"version": "3.10.1-beta.7",
|
|
4
4
|
"description": "Rotate multiple browsers using popular automation libraries such as Playwright or Puppeteer.",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=16.0.0"
|
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@apify/log": "^2.4.0",
|
|
40
40
|
"@apify/timeout": "^0.3.0",
|
|
41
|
-
"@crawlee/core": "3.10.1-beta.
|
|
42
|
-
"@crawlee/types": "3.10.1-beta.
|
|
41
|
+
"@crawlee/core": "3.10.1-beta.7",
|
|
42
|
+
"@crawlee/types": "3.10.1-beta.7",
|
|
43
43
|
"fingerprint-generator": "^2.0.6",
|
|
44
44
|
"fingerprint-injector": "^2.0.5",
|
|
45
45
|
"lodash.merge": "^4.6.2",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "9ec0a7a7bf9a5e9fedc3a224fbd3349642f5e1c6"
|
|
74
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-controller.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-controller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAG7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAK/C,qBAAa,oBAAqB,SAAQ,iBAAiB,
|
|
1
|
+
{"version":3,"file":"playwright-controller.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-controller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAG7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAK/C,qBAAa,oBAAqB,SAAQ,iBAAiB,CACvD,WAAW,EACX,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EACxC,OAAO,CACV;IACG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;cAmB9E,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cA8F/E,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;cAIvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;cAKtB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAwB1C,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB5E"}
|
|
@@ -24,7 +24,9 @@ class PlaywrightController extends browser_controller_1.BrowserController {
|
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
26
|
async _newPage(contextOptions) {
|
|
27
|
-
if (contextOptions !== undefined &&
|
|
27
|
+
if (contextOptions !== undefined &&
|
|
28
|
+
!this.launchContext.useIncognitoPages &&
|
|
29
|
+
!this.launchContext.experimentalContainers) {
|
|
28
30
|
throw new Error('A new page can be created with provided context only when using incognito pages or experimental containers.');
|
|
29
31
|
}
|
|
30
32
|
let close = async () => { };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-controller.js","sourceRoot":"","sources":["../../src/playwright/playwright-controller.ts"],"names":[],"mappings":";;;AAAA,4CAA2C;AAK3C,+EAA2E;AAC3E,wDAAyD;AAGzD,MAAM,MAAM,GAAG,IAAI,OAAO,EAAgB,CAAC;AAC3C,MAAM,YAAY,GAAG,CAAC,KAAsB,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC;AAE9D,MAAa,oBAAqB,SAAQ,
|
|
1
|
+
{"version":3,"file":"playwright-controller.js","sourceRoot":"","sources":["../../src/playwright/playwright-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-plugin.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,IAAI,iBAAiB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAK5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"playwright-plugin.d.ts","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,IAAI,iBAAiB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAK5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAkB/C,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;cAEnE,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkJ9F,OAAO,CAAC,oBAAoB;IAS5B,SAAS,CAAC,iBAAiB,IAAI,iBAAiB,CAC5C,WAAW,EACX,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EACxC,iBAAiB,CACpB;cAIe,wBAAwB,CAAC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlG,SAAS,CAAC,uBAAuB,IAAI,OAAO;CAI/C"}
|
|
@@ -16,7 +16,10 @@ const logger_1 = require("../logger");
|
|
|
16
16
|
const proxy_server_1 = require("../proxy-server");
|
|
17
17
|
const getFreePort = async () => {
|
|
18
18
|
return new Promise((resolve, reject) => {
|
|
19
|
-
const server = net_1.default
|
|
19
|
+
const server = net_1.default
|
|
20
|
+
.createServer()
|
|
21
|
+
.once('error', reject)
|
|
22
|
+
.listen(() => {
|
|
20
23
|
resolve(server.address().port);
|
|
21
24
|
server.close();
|
|
22
25
|
});
|
|
@@ -42,8 +45,8 @@ class PlaywrightPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
42
45
|
});
|
|
43
46
|
}
|
|
44
47
|
async _launch(launchContext) {
|
|
45
|
-
const { launchOptions, useIncognitoPages, proxyUrl
|
|
46
|
-
let { userDataDir
|
|
48
|
+
const { launchOptions, useIncognitoPages, proxyUrl } = launchContext;
|
|
49
|
+
let { userDataDir } = launchContext;
|
|
47
50
|
let browser;
|
|
48
51
|
// Required for the `proxy` context option to work.
|
|
49
52
|
launchOptions.proxy = {
|
|
@@ -76,9 +79,7 @@ class PlaywrightPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
76
79
|
const experimentalContainers = launchContext.experimentalContainers && this.library.name() !== 'webkit';
|
|
77
80
|
let firefoxPort;
|
|
78
81
|
if (experimentalContainers) {
|
|
79
|
-
launchOptions.args = [
|
|
80
|
-
...(launchOptions.args ?? []),
|
|
81
|
-
];
|
|
82
|
+
launchOptions.args = [...(launchOptions.args ?? [])];
|
|
82
83
|
// Use native headless mode so we can load an extension
|
|
83
84
|
if (launchOptions.headless && this.library.name() === 'chromium') {
|
|
84
85
|
launchOptions.args.push('--headless=chrome');
|
|
@@ -102,7 +103,9 @@ class PlaywrightPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
102
103
|
fs_1.default.writeFileSync(path_1.default.join(userDataDir, 'user.js'), prefsRaw);
|
|
103
104
|
}
|
|
104
105
|
}
|
|
105
|
-
const browserContext = await this.library
|
|
106
|
+
const browserContext = await this.library
|
|
107
|
+
.launchPersistentContext(userDataDir, launchOptions)
|
|
108
|
+
.catch((error) => {
|
|
106
109
|
return this._throwOnFailedLaunch(launchContext, error);
|
|
107
110
|
});
|
|
108
111
|
browserContext.once('close', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-plugin.js","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":";;;;AAAA,oDAAoB;AACpB,sDAAsB;AACtB,oDAAoB;AACpB,wDAAwB;AAIxB,6DAAwD;AACxD,6DAAmG;AACnG,mEAA+D;AAE/D,uEAAmE;AACnE,wDAAyD;AACzD,sEAA2E;AAE3E,sCAAgC;AAChC,kDAAuD;AAGvD,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;IAC3B,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,MAAM,GAAG,aAAG,
|
|
1
|
+
{"version":3,"file":"playwright-plugin.js","sourceRoot":"","sources":["../../src/playwright/playwright-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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,WAAW,CAAC;AACvC,OAAO,KAAK,KAAK,cAAc,MAAM,WAAW,CAAC;AAEjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAI3E,MAAM,WAAW,uBAAwB,SAAQ,cAAc,CAAC,qBAAqB;IACjF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAID,qBAAa,mBAAoB,SAAQ,iBAAiB,CACtD,OAAO,SAAS,EAChB,cAAc,CAAC,sBAAsB,EACrC,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B;IACG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;cAiB9E,QAAQ,CAAC,cAAc,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;
|
|
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,WAAW,CAAC;AACvC,OAAO,KAAK,KAAK,cAAc,MAAM,WAAW,CAAC;AAEjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAI3E,MAAM,WAAW,uBAAwB,SAAQ,cAAc,CAAC,qBAAqB;IACjF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAID,qBAAa,mBAAoB,SAAQ,iBAAiB,CACtD,OAAO,SAAS,EAChB,cAAc,CAAC,sBAAsB,EACrC,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B;IACG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;cAiB9E,QAAQ,CAAC,cAAc,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;cA4EhF,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;cAIvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;cAuBtB,WAAW,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAIzD,WAAW,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAG3F"}
|
|
@@ -41,7 +41,7 @@ class PuppeteerController extends browser_controller_1.BrowserController {
|
|
|
41
41
|
const { CdpBrowser } = await import('puppeteer');
|
|
42
42
|
const oldPuppeteerVersion = !CdpBrowser || 'createIncognitoBrowserContext' in CdpBrowser.prototype;
|
|
43
43
|
const method = oldPuppeteerVersion ? 'createIncognitoBrowserContext' : 'createBrowserContext';
|
|
44
|
-
const context = await this.browser[method](contextOptions);
|
|
44
|
+
const context = (await this.browser[method](contextOptions));
|
|
45
45
|
(0, timeout_1.tryCancel)();
|
|
46
46
|
const page = await context.newPage();
|
|
47
47
|
(0, timeout_1.tryCancel)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer-controller.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-controller.ts"],"names":[],"mappings":";;;AAAA,4CAA2C;AAK3C,+EAA2E;AAC3E,wDAAyD;AACzD,sCAAgC;AAOhC,MAAM,2BAA2B,GAAG,IAAI,CAAC;AAEzC,MAAa,mBAAoB,SAAQ,sCAKxC;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,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,cAAwC;QAC7D,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"puppeteer-controller.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMvD,qBAAa,eAAgB,SAAQ,aAAa,CAC9C,OAAO,SAAS,EAChB,cAAc,CAAC,sBAAsB,EACrC,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B;cACmB,OAAO,CACnB,aAAa,EAAE,aAAa,
|
|
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,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMvD,qBAAa,eAAgB,SAAQ,aAAa,CAC9C,OAAO,SAAS,EAChB,cAAc,CAAC,sBAAsB,EACrC,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B;cACmB,OAAO,CACnB,aAAa,EAAE,aAAa,CACxB,OAAO,SAAS,EAChB,cAAc,CAAC,sBAAsB,EACrC,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B,GACF,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;IAgKlC,SAAS,CAAC,iBAAiB,IAAI,iBAAiB,CAC5C,OAAO,SAAS,EAChB,cAAc,CAAC,sBAAsB,EACrC,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B;cAIe,wBAAwB,CACpC,cAAc,EAAE,aAAa,CACzB,OAAO,SAAS,EAChB,cAAc,CAAC,sBAAsB,EACrC,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,sBAAsB,EACrC,cAAc,CAAC,OAAO,EACtB,uBAAuB,CAC1B,GACF,OAAO;CAGb"}
|
|
@@ -20,7 +20,7 @@ class PuppeteerPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
20
20
|
catch {
|
|
21
21
|
// ignore
|
|
22
22
|
}
|
|
23
|
-
const { launchOptions, userDataDir, useIncognitoPages, experimentalContainers, proxyUrl
|
|
23
|
+
const { launchOptions, userDataDir, useIncognitoPages, experimentalContainers, proxyUrl } = launchContext;
|
|
24
24
|
if (experimentalContainers) {
|
|
25
25
|
throw new Error('Experimental containers are only available with Playwright');
|
|
26
26
|
}
|
|
@@ -75,8 +75,16 @@ class PuppeteerPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
75
75
|
logger_1.log.exception(error, 'Failed to retrieve page from target.');
|
|
76
76
|
}
|
|
77
77
|
});
|
|
78
|
-
const boundMethods = [
|
|
79
|
-
|
|
78
|
+
const boundMethods = [
|
|
79
|
+
'newPage',
|
|
80
|
+
'close',
|
|
81
|
+
'userAgent',
|
|
82
|
+
'createIncognitoBrowserContext',
|
|
83
|
+
'createBrowserContext',
|
|
84
|
+
'version',
|
|
85
|
+
'on',
|
|
86
|
+
'process',
|
|
87
|
+
].reduce((map, method) => {
|
|
80
88
|
map[method] = browser[method]?.bind(browser);
|
|
81
89
|
return map;
|
|
82
90
|
}, {});
|
|
@@ -84,14 +92,14 @@ class PuppeteerPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
84
92
|
browser = new Proxy(browser, {
|
|
85
93
|
get: (target, property, receiver) => {
|
|
86
94
|
if (property === 'newPage') {
|
|
87
|
-
return
|
|
95
|
+
return async (...args) => {
|
|
88
96
|
let page;
|
|
89
97
|
if (useIncognitoPages) {
|
|
90
98
|
const [anonymizedProxyUrl, close] = await (0, anonymize_proxy_1.anonymizeProxySugar)(proxyUrl);
|
|
91
99
|
try {
|
|
92
|
-
const context = await browser[method]({
|
|
100
|
+
const context = (await browser[method]({
|
|
93
101
|
proxyServer: anonymizedProxyUrl ?? proxyUrl,
|
|
94
|
-
});
|
|
102
|
+
}));
|
|
95
103
|
page = await context.newPage(...args);
|
|
96
104
|
if (anonymizedProxyUrl) {
|
|
97
105
|
page.on('close', async () => {
|
|
@@ -124,7 +132,7 @@ class PuppeteerPlugin extends browser_plugin_1.BrowserPlugin {
|
|
|
124
132
|
}
|
|
125
133
|
*/
|
|
126
134
|
return page;
|
|
127
|
-
}
|
|
135
|
+
};
|
|
128
136
|
}
|
|
129
137
|
if (property in boundMethods) {
|
|
130
138
|
return boundMethods[property];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer-plugin.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AAOvC,iEAA6D;AAE7D,uEAAmE;AACnE,wDAAyD;AAEzD,sCAAgC;AAChC,oCAAgC;AAEhC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAE3C,MAAa,eAAgB,SAAQ,8BAKpC;IACa,KAAK,CAAC,OAAO,CACnB,
|
|
1
|
+
{"version":3,"file":"puppeteer-plugin.js","sourceRoot":"","sources":["../../src/puppeteer/puppeteer-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,14 +95,18 @@ chrome.webRequest.onBeforeSendHeaders.addListener(
|
|
|
95
95
|
if (header.name.toLowerCase() === 'cookie') {
|
|
96
96
|
const id = keyFromTabId(getOpenerId(details.tabId));
|
|
97
97
|
|
|
98
|
-
const fixedCookies = header.value
|
|
98
|
+
const fixedCookies = header.value
|
|
99
|
+
.split('; ')
|
|
100
|
+
.filter((x) => x.startsWith(id))
|
|
101
|
+
.map((x) => x.slice(id.length))
|
|
102
|
+
.join('; ');
|
|
99
103
|
header.value = fixedCookies;
|
|
100
104
|
}
|
|
101
105
|
|
|
102
106
|
// Sometimes Chrome makes a request on a ghost tab.
|
|
103
107
|
// We don't want these in order to prevent cluttering cookies.
|
|
104
108
|
// Yes, `webNavigation.onComitted` is emitted and `webNavigation.onCreatedNavigationTarget` is not.
|
|
105
|
-
if (header.name.toLowerCase() === 'purpose' && header.value === 'prefetch' && !
|
|
109
|
+
if (header.name.toLowerCase() === 'purpose' && header.value === 'prefetch' && !counter.has(details.tabId)) {
|
|
106
110
|
// eslint-disable-next-line no-console
|
|
107
111
|
console.log(details);
|
|
108
112
|
return {
|
|
@@ -111,7 +115,7 @@ chrome.webRequest.onBeforeSendHeaders.addListener(
|
|
|
111
115
|
}
|
|
112
116
|
|
|
113
117
|
// This one is for Firefox
|
|
114
|
-
if (header.name.toLowerCase() === 'x-moz' && header.value === 'prefetch' && !
|
|
118
|
+
if (header.name.toLowerCase() === 'x-moz' && header.value === 'prefetch' && !counter.has(details.tabId)) {
|
|
115
119
|
// eslint-disable-next-line no-console
|
|
116
120
|
console.log(details);
|
|
117
121
|
return {
|
|
@@ -134,7 +138,9 @@ chrome.webRequest.onBeforeSendHeaders.addListener(
|
|
|
134
138
|
}
|
|
135
139
|
|
|
136
140
|
return {
|
|
137
|
-
requestHeaders: details.requestHeaders.filter(
|
|
141
|
+
requestHeaders: details.requestHeaders.filter(
|
|
142
|
+
(header) => header.name.toLowerCase() !== 'cookie' || header.value !== '',
|
|
143
|
+
),
|
|
138
144
|
};
|
|
139
145
|
},
|
|
140
146
|
{ urls: ['<all_urls>'] },
|
|
@@ -152,13 +158,15 @@ chrome.webRequest.onHeadersReceived.addListener(
|
|
|
152
158
|
|
|
153
159
|
const openerId = getOpenerId(details.tabId);
|
|
154
160
|
|
|
155
|
-
header.value = parts
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
161
|
+
header.value = parts
|
|
162
|
+
.map((part) => {
|
|
163
|
+
const equalsIndex = part.indexOf('=');
|
|
164
|
+
if (equalsIndex === -1) {
|
|
165
|
+
return `${keyFromTabId(openerId)}=${part.trimStart()}`;
|
|
166
|
+
}
|
|
167
|
+
return keyFromTabId(openerId) + part.trimStart();
|
|
168
|
+
})
|
|
169
|
+
.join('\n');
|
|
162
170
|
}
|
|
163
171
|
}
|
|
164
172
|
|
|
@@ -187,13 +195,17 @@ chrome.tabs.onRemoved.addListener(async (tabId) => {
|
|
|
187
195
|
const id = keyFromTabId(opener);
|
|
188
196
|
|
|
189
197
|
chrome.cookies.getAll({}, async (cookies) => {
|
|
190
|
-
await Promise.allSettled(
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
198
|
+
await Promise.allSettled(
|
|
199
|
+
cookies
|
|
200
|
+
.filter((cookie) => cookie.name.startsWith(id))
|
|
201
|
+
.map((cookie) => {
|
|
202
|
+
return chrome.cookies.remove({
|
|
203
|
+
name: cookie.name,
|
|
204
|
+
url: getCookieURL(cookie),
|
|
205
|
+
storeId: cookie.storeId,
|
|
206
|
+
});
|
|
207
|
+
}),
|
|
208
|
+
);
|
|
197
209
|
});
|
|
198
210
|
});
|
|
199
211
|
|
|
@@ -246,7 +258,7 @@ const getNextLocalhostIp = (openerId) => {
|
|
|
246
258
|
}
|
|
247
259
|
|
|
248
260
|
// [127.0.0.1 - 127.255.255.254] = 1 * 255 * 255 * 254 = 16 516 350
|
|
249
|
-
while (localhostIpCache.length >=
|
|
261
|
+
while (localhostIpCache.length >= 1 * 255 * 255 * 254) {
|
|
250
262
|
localhostIpCache.delete(localhostIpCache.keys().next().value);
|
|
251
263
|
}
|
|
252
264
|
|
|
@@ -341,7 +353,9 @@ const onCompleted = async (details) => {
|
|
|
341
353
|
// Different protocols are required, otherwise `onCompleted` won't be emitted.
|
|
342
354
|
const result = await routes[route](details, body);
|
|
343
355
|
if (result !== undefined) {
|
|
344
|
-
await chrome.tabs.update(details.tabId, {
|
|
356
|
+
await chrome.tabs.update(details.tabId, {
|
|
357
|
+
url: `about:blank#${encodeURIComponent(JSON.stringify(result))}`,
|
|
358
|
+
});
|
|
345
359
|
}
|
|
346
360
|
}
|
|
347
361
|
} catch {
|
|
@@ -400,7 +414,9 @@ chrome.webNavigation.onCompleted.addListener(onCompleted);
|
|
|
400
414
|
|
|
401
415
|
window.totallyRandomString = true;
|
|
402
416
|
|
|
403
|
-
const code = "'use strict'; const tabId = '${getOpenerId(
|
|
417
|
+
const code = "'use strict'; const tabId = '${getOpenerId(
|
|
418
|
+
details.tabId,
|
|
419
|
+
)}'; (() => {\\n" + ${JSON.stringify(contentText)} + "\\n})();\\n";
|
|
404
420
|
${executeCodeInPageContext}
|
|
405
421
|
})();
|
|
406
422
|
`,
|
|
@@ -177,7 +177,9 @@ const FakeStorage = class Storage {
|
|
|
177
177
|
}
|
|
178
178
|
|
|
179
179
|
if (arguments.length === 0) {
|
|
180
|
-
throw fixStack(
|
|
180
|
+
throw fixStack(
|
|
181
|
+
new TypeError(`Failed to execute 'key' on 'Storage': 1 argument required, but only 0 present.`),
|
|
182
|
+
);
|
|
181
183
|
}
|
|
182
184
|
|
|
183
185
|
index = NumberIsFinite(index) ? index : 0;
|
|
@@ -208,7 +210,9 @@ const FakeStorage = class Storage {
|
|
|
208
210
|
}
|
|
209
211
|
|
|
210
212
|
if (arguments.length === 0) {
|
|
211
|
-
throw fixStack(
|
|
213
|
+
throw fixStack(
|
|
214
|
+
new TypeError(`Failed to execute 'getItem' on 'Storage': 1 argument required, but only 0 present.`),
|
|
215
|
+
);
|
|
212
216
|
}
|
|
213
217
|
|
|
214
218
|
return StoragePrototype.getItem.call(priv.storage, priv.prefix + key);
|
|
@@ -221,7 +225,9 @@ const FakeStorage = class Storage {
|
|
|
221
225
|
}
|
|
222
226
|
|
|
223
227
|
if (arguments.length === 0) {
|
|
224
|
-
throw fixStack(
|
|
228
|
+
throw fixStack(
|
|
229
|
+
new TypeError(`Failed to execute 'removeItem' on 'Storage': 1 argument required, but only 0 present.`),
|
|
230
|
+
);
|
|
225
231
|
}
|
|
226
232
|
|
|
227
233
|
StoragePrototype.removeItem.call(priv.storage, priv.prefix + key);
|
|
@@ -234,7 +240,11 @@ const FakeStorage = class Storage {
|
|
|
234
240
|
}
|
|
235
241
|
|
|
236
242
|
if (arguments.length === 0 || arguments.length === 1) {
|
|
237
|
-
throw fixStack(
|
|
243
|
+
throw fixStack(
|
|
244
|
+
new TypeError(
|
|
245
|
+
`Failed to execute 'setItem' on 'Storage': 2 arguments required, but only ${arguments.length} present.`,
|
|
246
|
+
),
|
|
247
|
+
);
|
|
238
248
|
}
|
|
239
249
|
|
|
240
250
|
StoragePrototype.setItem.call(priv.storage, priv.prefix + key, value);
|
|
@@ -257,7 +267,9 @@ const createStorage = ({ storage, prefix }) => {
|
|
|
257
267
|
// getPrototypeOf: (target) => {},
|
|
258
268
|
defineProperty: (target, key, descriptor) => {
|
|
259
269
|
if ('set' in descriptor || 'get' in descriptor) {
|
|
260
|
-
throw fixStack(
|
|
270
|
+
throw fixStack(
|
|
271
|
+
new TypeError(`Failed to set a named property on 'Storage': Accessor properties are not allowed.`),
|
|
272
|
+
);
|
|
261
273
|
}
|
|
262
274
|
|
|
263
275
|
FakeStoragePrototype.setItem.call(target, key, descriptor.value);
|
|
@@ -363,17 +375,18 @@ const createStorage = ({ storage, prefix }) => {
|
|
|
363
375
|
|
|
364
376
|
const toHide = new WeakMap();
|
|
365
377
|
for (const Type of [Function, Object, Array]) {
|
|
366
|
-
const create = (fallback) =>
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
378
|
+
const create = (fallback) =>
|
|
379
|
+
function () {
|
|
380
|
+
if (this instanceof FakeStorage) {
|
|
381
|
+
return '[object Storage]';
|
|
382
|
+
}
|
|
370
383
|
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
384
|
+
if (WeakMapPrototype.has.call(toHide, this)) {
|
|
385
|
+
return `function ${WeakMapPrototype.get.call(toHide, this)}() { [native code] }`;
|
|
386
|
+
}
|
|
374
387
|
|
|
375
|
-
|
|
376
|
-
|
|
388
|
+
return fallback.call(this);
|
|
389
|
+
};
|
|
377
390
|
|
|
378
391
|
const toString = create(Type.prototype.toString);
|
|
379
392
|
const toLocaleString = create(Type.prototype.toLocaleString);
|
|
@@ -400,8 +413,12 @@ try {
|
|
|
400
413
|
const fakeLocalStorage = createStorage({ storage: sessionStorage, prefix: 'l.' });
|
|
401
414
|
const fakeSessionStorage = createStorage({ storage: sessionStorage, prefix: 's.' });
|
|
402
415
|
|
|
403
|
-
const getLocalStorage = function localStorage() {
|
|
404
|
-
|
|
416
|
+
const getLocalStorage = function localStorage() {
|
|
417
|
+
return fakeLocalStorage;
|
|
418
|
+
};
|
|
419
|
+
const getSessionStorage = function sessionStorage() {
|
|
420
|
+
return fakeSessionStorage;
|
|
421
|
+
};
|
|
405
422
|
|
|
406
423
|
WeakMapPrototype.set.call(toHide, FakeStorage, 'Storage');
|
|
407
424
|
WeakMapPrototype.set.call(toHide, FakeStoragePrototype.key, 'key');
|
|
@@ -450,7 +467,9 @@ try {
|
|
|
450
467
|
const getCookie = function cookie() {
|
|
451
468
|
try {
|
|
452
469
|
const cookies = StringSplitSafe(realGetCookie.call(this), '; ');
|
|
453
|
-
const filtered = ArrayPrototype.filter.call(cookies, (cookie) =>
|
|
470
|
+
const filtered = ArrayPrototype.filter.call(cookies, (cookie) =>
|
|
471
|
+
StringPrototype.startsWith.call(cookie, tabPrefix),
|
|
472
|
+
);
|
|
454
473
|
const mapped = ArrayPrototype.map.call(filtered, (cookie) => {
|
|
455
474
|
const result = StringPrototype.slice.call(cookie, tabPrefix.length);
|
|
456
475
|
|
|
@@ -472,7 +491,7 @@ try {
|
|
|
472
491
|
|
|
473
492
|
const delimiterIndex = StringPrototype.indexOf.call(cookieString, ';');
|
|
474
493
|
const equalsIndex = StringPrototype.indexOf.call(cookieString, '=');
|
|
475
|
-
if (
|
|
494
|
+
if (equalsIndex === -1 || (delimiterIndex !== -1 && equalsIndex > delimiterIndex)) {
|
|
476
495
|
cookieString = `=${cookieString}`;
|
|
477
496
|
}
|
|
478
497
|
|
|
@@ -3,9 +3,7 @@
|
|
|
3
3
|
"name": "Tab as a Container",
|
|
4
4
|
"version": "1.0.0",
|
|
5
5
|
"background": {
|
|
6
|
-
"scripts": [
|
|
7
|
-
"background.js"
|
|
8
|
-
],
|
|
6
|
+
"scripts": ["background.js"],
|
|
9
7
|
"persistent": true
|
|
10
8
|
},
|
|
11
9
|
"permissions": [
|
|
@@ -18,8 +16,6 @@
|
|
|
18
16
|
"proxy",
|
|
19
17
|
"<all_urls>"
|
|
20
18
|
],
|
|
21
|
-
"web_accessible_resources": [
|
|
22
|
-
"content.js"
|
|
23
|
-
],
|
|
19
|
+
"web_accessible_resources": ["content.js"],
|
|
24
20
|
"incognito": "not_allowed"
|
|
25
21
|
}
|