unprint 0.18.18 → 0.18.21

package/package.json

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

package/src/app.js

@@ -369,6 +369,15 @@ function prefixUrl(urlPath, originUrl, customOptions) {
 		return null;
 	}
 
+	if (/^http/.test(urlPath)) {
+		// this is already a complete URL
+		return urlPath;
+	}
+
+	if (!originUrl) {
+		return null;
+	}
+
 	const options = {
 		protocol: 'https',
 		...customOptions,
@@ -378,7 +387,7 @@ function prefixUrl(urlPath, originUrl, customOptions) {
 
 	try {
 		return new URL(urlPath, origin).href;
-	} catch {
+	} catch (_error) {
 		return null;
 	}
 }
@@ -1230,7 +1239,15 @@ async function getBrowserInstance(scope, options, useProxy = false) {
 }
 
 async function closeAllBrowsers() {
-	await Promise.all(Array.from(clients.values()).map(async (client) => client.browser.close()));
+	const closingClients = Array.from(clients.values);
+
+	await Promise.all(closingClients.map(async (client) => client.browser.close()));
+
+	events.emit('browser', {
+		action: 'close',
+		keys: closingClients.map((client) => client.key),
+		active: closingClients.reduce((acc, client) => acc + (client.active || 0), 0),
+	});
 }
 
 async function closeBrowser(client, options) {
@@ -1238,6 +1255,12 @@ async function closeBrowser(client, options) {
 		|| (client.retired && client.active === 0)) { // this browser is retired to minimize garbage build-up
 		// this browser won't be reused
 		await client.browser.close();
+
+		events.emit('browser', {
+			action: 'close',
+			keys: [client.key],
+			active: client.active,
+		});
 	}
 }
 
@@ -1301,6 +1324,12 @@ async function browserRequest(url, customOptions = {}) {
 	return limiter.schedule(async () => {
 		const client = await getBrowserInstance(options.client, options, agent instanceof undici.ProxyAgent);
 
+		events.emit('browser', {
+			action: 'open',
+			keys: [client.key],
+			active: client.active,
+		});
+
 		client.active += 1;
 
 		const page = await client.context.newPage();