unprint 0.19.16 → 0.19.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unprint",
-  "version": "0.19.16",
+  "version": "0.19.18",
   "description": "Simplify common web scraping tasks while staying in control of the data.",
   "main": "src/app.js",
   "scripts": {

package/src/app.js

@@ -1225,6 +1225,10 @@ async function getBrowserContext(browser, options, useProxy) {
 				server: `${options.proxy.host}:${options.proxy.port}`,
 			},
 		}),
+		extraHTTPHeaders: {
+			...options.headers,
+			cookie: getCookie(options),
+		},
 	});
 }
 
@@ -1259,10 +1263,11 @@ async function getBrowserInstance(scope, options, useProxy = false, useRemote =
 		: chromium.launch({
 			headless: true,
 			...options.browser,
-		})).then(async (browser) => {
-			const context = await getBrowserContext(browser, options, useProxy);
+		})).then(async (browser) => { // eslint-disable-line arrow-body-style
+			// legacy
+			// const context = await getBrowserContext(browser, options, useProxy);
 
-			return { browser, context };
+			return { browser };
 		});
 
 	const client = {
@@ -1281,12 +1286,13 @@ async function getBrowserInstance(scope, options, useProxy = false, useRemote =
 	}
 
 	try {
-		const { browser, context } = await launchers;
+		// const { browser, context } = await launchers;
+		const { browser } = await launchers;
 
-		context.setDefaultNavigationTimeout(options.timeout);
+		// context.setDefaultNavigationTimeout(options.timeout);
 
 		client.browser = browser;
-		client.context = context;
+		// client.context = context;
 	} catch (error) {
 		clients.delete(scopeKey);
 
@@ -1304,7 +1310,7 @@ async function closeAllBrowsers() {
 	const closingClients = Array.from(clients.values());
 
 	await Promise.all(closingClients.map(async (client) => {
-		await client.context.close();
+		await client.context?.close();
 		await client.browser.close();
 
 		clients.delete(client.key);
@@ -1322,7 +1328,7 @@ async function closeBrowser(client, options = {}) {
 	if (options.client === null // this browser is single-use
 		|| (client.retired && client.active === 0)) { // this browser is retired to minimize garbage build-up
 		// this browser won't be reused, browser close DOES NOT automatically close context https://github.com/microsoft/playwright/issues/15163
-		await client.context.close();
+		await client.context?.close();
 		await client.browser.close();
 
 		clients.delete(client.key);
@@ -1432,19 +1438,18 @@ async function browserRequest(url, customOptions = {}) {
 
 		client.active += 1;
 
-		const page = await client.context.newPage();
-
-		await page.setExtraHTTPHeaders(curateHeaders({
-			'user-agent': options.browserUserAgent || options.userAgent,
-			...options.headers,
-			cookie: getCookie(options),
-		}, options));
+		const context = await getBrowserContext(client.browser, options, useProxy);
+		const page = await context.newPage();
 
 		const res = await page.goto(url, {
 			...options.page,
 		}).catch((error) => error);
 
 		if (res instanceof Error) {
+			await context.close();
+			await page.close();
+			await closeBrowser(client, options);
+
 			return {
 				ok: false,
 				status: null,
@@ -1469,6 +1474,8 @@ async function browserRequest(url, customOptions = {}) {
 
 			client.active -= 1;
 
+			await page.close();
+			await context.close();
 			await closeBrowser(client, options);
 
 			return curateResponse({
@@ -1494,6 +1501,8 @@ async function browserRequest(url, customOptions = {}) {
 			} catch (error) {
 				client.active -= 1;
 
+				await page.close();
+				await context.close();
 				await closeBrowser(client, options);
 
 				events.emit('controlError', {
@@ -1519,6 +1528,7 @@ async function browserRequest(url, customOptions = {}) {
 		const data = await page.content();
 
 		await page.close();
+		await context.close();
 
 		events.emit('requestSuccess', {
 			...feedbackBase,