arn-browser 0.1.48 → 0.1.50

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "arn-browser",
-	"version": "0.1.48",
+	"version": "0.1.50",
 	"description": "A lightweight, browser autmation helper.",
 	"main": "src/index.js",
 	"types": "src/index.d.ts",
@@ -14,7 +14,7 @@
 	"dependencies": {
 		"@aws-sdk/client-ec2": "^3.1053.0",
 		"@ghostery/adblocker": "^2.17.3",
-		"arn-knexjs": "^0.0.6",
+		"arn-knexjs": "^0.0.7",
 		"camoufox-js": "^0.10.2",
 		"devtools-detector": "^2.0.25",
 		"dotenv": "^17.2.3",
@@ -44,4 +44,4 @@
 	"author": "ARNDESK",
 	"license": "ISC",
 	"type": "module"
-}
+}

package/src/utility/playwright/routes/pwRoute.d.ts

@@ -63,6 +63,13 @@ export interface PwRouteOptions {
 	 */
 	skipGotPatterns?: string[];
 
+	/**
+	 * Array of hostnames to block. All request types to matching hosts are aborted.
+	 * - Exact match: "ads.example.com" blocks only that exact hostname.
+	 * - Substring match: "%google%" blocks any hostname containing "google".
+	 */
+	blockHosts?: string[];
+
 	/**
 	 * Intercept XHR/Fetch requests.
 	 * Can be boolean (true/false) or a custom proxy string/object used only for XHR/Fetch requests.

package/src/utility/playwright/routes/pwRoute.js

@@ -23,6 +23,7 @@ const DEFAULTS = {
 	m4w_send_on_message: null,
 	allowImagePatterns: [],
 	skipGotPatterns: [],
+	blockHosts: [],
 	xhr: false,
 };
 
@@ -30,6 +31,20 @@ const DEFAULTS = {
  * Helper to update derived configuration values from active user options.
  */
 function updateDerivedConfig(config) {
+	// 0. Defaults/merges for blockHosts
+	const blockHosts = config.blockHosts || [];
+	config.finalBlockHostsExact = new Set();
+	config.finalBlockHostsContains = [];
+	for (const pattern of blockHosts) {
+		if (pattern.startsWith("%") && pattern.endsWith("%") && pattern.length > 2) {
+			// %pattern% → substring match against hostname
+			config.finalBlockHostsContains.push(pattern.slice(1, -1).toLowerCase());
+		} else {
+			// exact match against hostname
+			config.finalBlockHostsExact.add(pattern.toLowerCase());
+		}
+	}
+
 	// 1. Defaults/merges for allowImagePatterns
 	const allowImagePatterns = config.allowImagePatterns || [];
 	config.finalImagePatterns = ["cdn-cgi/challenge-platform", ...allowImagePatterns];
@@ -376,6 +391,22 @@ export async function pwRoute(options = {}) {
 		const method = request.method();
 		const resourceType = request.resourceType();
 
+		// ============================================================
+		// Group 0: Host Blocking (blockHosts)
+		// ============================================================
+		if (currentConfig.finalBlockHostsExact.size > 0 || currentConfig.finalBlockHostsContains.length > 0) {
+			try {
+				const hostname = new URL(url).hostname.toLowerCase();
+				if (
+					currentConfig.finalBlockHostsExact.has(hostname) ||
+					currentConfig.finalBlockHostsContains.some((p) => hostname.includes(p))
+				) {
+					route.abort();
+					return;
+				}
+			} catch {}
+		}
+
 		// ============================================================
 		// Group 1: Image Blocking
 		// ============================================================

package/src/utility/proxy-utility/proxy-helper.js

@@ -56,7 +56,8 @@ export async function get_multilogin_proxy({
 
 		// 2. Prepare Data (sanitize region: spaces → underscores)
 		const sanitizedRegion = region ? region.toLowerCase().replace(/ /g, '_') : region;
-		const data = { country, sessionType, protocol, region: sanitizedRegion, city, IPTTL, count: 1 };
+		const finalCountry = (country && country.toLowerCase() === "ww") ? "any" : country;
+		const data = { country: finalCountry, sessionType, protocol, region: sanitizedRegion, city, IPTTL, count: 1 };
 		Object.keys(data).forEach((k) => (data[k] === "" || data[k] === 0 || data[k] == null) && delete data[k]);
 
 		// 3. Setup Timeout

package/src/utility/puppeteer/routes/ppRoute.d.ts

@@ -60,6 +60,13 @@ export interface PpRouteOptions {
 	 */
 	skipGotPatterns?: string[];
 
+	/**
+	 * Array of hostnames to block. All request types to matching hosts are aborted.
+	 * - Exact match: "ads.example.com" blocks only that exact hostname.
+	 * - Substring match: "%google%" blocks any hostname containing "google".
+	 */
+	blockHosts?: string[];
+
 	/**
 	 * Intercept XHR/Fetch requests.
 	 * Can be boolean (true/false) or a custom proxy string/object used only for XHR/Fetch requests.

package/src/utility/puppeteer/routes/ppRoute.js

@@ -23,6 +23,7 @@ const DEFAULTS = {
 	m4w_send_on_message: null,
 	allowImagePatterns: [],
 	skipGotPatterns: [],
+	blockHosts: [],
 	xhr: false,
 };
 
@@ -30,6 +31,20 @@ const DEFAULTS = {
  * Helper to update derived configuration values from active user options.
  */
 function updateDerivedConfig(config) {
+	// 0. Defaults/merges for blockHosts
+	const blockHosts = config.blockHosts || [];
+	config.finalBlockHostsExact = new Set();
+	config.finalBlockHostsContains = [];
+	for (const pattern of blockHosts) {
+		if (pattern.startsWith("%") && pattern.endsWith("%") && pattern.length > 2) {
+			// %pattern% → substring match against hostname
+			config.finalBlockHostsContains.push(pattern.slice(1, -1).toLowerCase());
+		} else {
+			// exact match against hostname
+			config.finalBlockHostsExact.add(pattern.toLowerCase());
+		}
+	}
+
 	// 1. Defaults/merges for allowImagePatterns
 	const allowImagePatterns = config.allowImagePatterns || [];
 	config.finalImagePatterns = ["cdn-cgi/challenge-platform", ...allowImagePatterns];
@@ -383,6 +398,22 @@ export async function ppRoute(options = {}) {
 		const method = request.method();
 		const resourceType = request.resourceType();
 
+		// ============================================================
+		// Group 0: Host Blocking (blockHosts)
+		// ============================================================
+		if (currentConfig.finalBlockHostsExact.size > 0 || currentConfig.finalBlockHostsContains.length > 0) {
+			try {
+				const hostname = new URL(url).hostname.toLowerCase();
+				if (
+					currentConfig.finalBlockHostsExact.has(hostname) ||
+					currentConfig.finalBlockHostsContains.some((p) => hostname.includes(p))
+				) {
+					await request.abort();
+					return;
+				}
+			} catch {}
+		}
+
 		// ============================================================
 		// Group 1: Image Blocking
 		// ============================================================