unprint 0.18.32 → 0.18.34

package/package.json

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

package/src/app.js

@@ -1268,7 +1268,10 @@ async function getBrowserInstance(scope, options, useProxy = false) {
 async function closeAllBrowsers() {
 	const closingClients = Array.from(clients.values());
 
-	await Promise.all(closingClients.map(async (client) => client.browser.close()));
+	await Promise.all(closingClients.map(async (client) => {
+		await client.context.close();
+		await client.browser.close();
+	}));
 
 	events.emit('browserClose', {
 		keys: closingClients.map((client) => client.key),
@@ -1281,7 +1284,8 @@ async function closeAllBrowsers() {
 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
+		// 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.browser.close();
 
 		events.emit('browserClose', {
@@ -1408,7 +1412,7 @@ async function browserRequest(url, customOptions = {}) {
 
 			await closeBrowser(client, options);
 
-			return {
+			return curateResponse({
 				ok: false,
 				status,
 				statusText,
@@ -1416,7 +1420,7 @@ async function browserRequest(url, customOptions = {}) {
 				cookies: curateCookies(res, customOptions),
 				response: res,
 				res,
-			};
+			}, data, options, { url, customOptions });
 		}
 
 		events.emit('requestSuccess', feedbackBase);
@@ -1572,6 +1576,10 @@ async function request(url, body, customOptions = {}, method = 'GET', redirects
 		return request(newUrl, body, options, method, redirects + 1);
 	}
 
+	const data = options.interface === 'fetch'
+		? await res.text()
+		: await res.body.text();
+
 	if (!(status >= 200 && status < 300)) {
 		handleError(new Error(`HTTP response from ${url} not OK (${status} ${res.statusText})`), 'HTTP_NOT_OK');
 
@@ -1581,7 +1589,7 @@ async function request(url, body, customOptions = {}, method = 'GET', redirects
 			statusText: res.statusText,
 		});
 
-		return {
+		return curateResponse({
 			ok: false,
 			status,
 			statusText: res.statusText,
@@ -1589,13 +1597,9 @@ async function request(url, body, customOptions = {}, method = 'GET', redirects
 			cookies: curateCookies(res, customOptions),
 			response: res,
 			res,
-		};
+		}, data, options, { url, customOptions });
 	}
 
-	const data = options.interface === 'fetch'
-		? await res.text()
-		: await res.body.text();
-
 	events.emit('requestSuccess', {
 		...feedbackBase,
 		status,