arn-browser 0.1.44 → 0.1.46

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "arn-browser",
-	"version": "0.1.44",
+	"version": "0.1.46",
 	"description": "A lightweight, browser autmation helper.",
 	"main": "src/index.js",
 	"types": "src/index.d.ts",
@@ -12,8 +12,8 @@
 		"test": "test"
 	},
 	"dependencies": {
-		"@aws-sdk/client-ec2": "^3.1015.0",
-		"@ghostery/adblocker": "^2.13.0",
+		"@aws-sdk/client-ec2": "^3.1053.0",
+		"@ghostery/adblocker": "^2.17.3",
 		"arn-knexjs": "^0.0.6",
 		"camoufox-js": "^0.10.2",
 		"devtools-detector": "^2.0.25",
@@ -24,8 +24,8 @@
 		"node-cache": "^5.1.2",
 		"node-fetch": "^3.3.2",
 		"playwright-core": "1.42.1",
-		"proxy-chain": "^2.6.0",
-		"puppeteer-core": "^24.40.0",
+		"proxy-chain": "^3.0.0",
+		"puppeteer-core": "^25.0.4",
 		"randomstring": "^1.3.1",
 		"socks-proxy-agent": "^10.0.0",
 		"speakeasy": "^2.0.0",
@@ -44,4 +44,4 @@
 	"author": "ARNDESK",
 	"license": "ISC",
 	"type": "module"
-}
+}

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

@@ -62,6 +62,12 @@ export interface PwRouteOptions {
 	 * Playwright network stack will be used instead.
 	 */
 	skipGotPatterns?: string[];
+
+	/**
+	 * Intercept XHR/Fetch requests.
+	 * Can be boolean (true/false) or a custom proxy string/object used only for XHR/Fetch requests.
+	 */
+	xhr?: boolean | string | { type?: string; host: string; port: number; user?: string; pass?: string } | null;
 }
 
 /**

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

@@ -7,6 +7,67 @@ import { SocksProxyAgent } from "socks-proxy-agent";
 import NodeCache from "node-cache";
 
 let AdBlockEngine;
+const routeConfigs = new WeakMap();
+
+const DEFAULTS = {
+	logger: false,
+	blockAds: true,
+	blockImage: true,
+	useGot: false,
+	useFullUrl: true,
+	useCache: true,
+	stripGotHeaders: true,
+	stripGotLogger: false,
+	proxy: null,
+	m4w_send_on_post: null,
+	m4w_send_on_message: null,
+	allowImagePatterns: [],
+	skipGotPatterns: [],
+	xhr: false,
+};
+
+/**
+ * Helper to update derived configuration values from active user options.
+ */
+function updateDerivedConfig(config) {
+	// 1. Defaults/merges for allowImagePatterns
+	const allowImagePatterns = config.allowImagePatterns || [];
+	config.finalImagePatterns = ["cdn-cgi/challenge-platform", ...allowImagePatterns];
+
+	// 2. Defaults/merges for skipGotPatterns
+	const skipGotPatterns = config.skipGotPatterns || [];
+	config.finalSkipHosts = new Set(
+		skipGotPatterns.map((entry) => {
+			try {
+				if (entry.includes("://")) return new URL(entry).hostname;
+			} catch {}
+			return entry;
+		})
+	);
+
+	// 3. Proxies
+	config.proxyUrl = formatProxyUrl(config.proxy);
+	config.proxyAgent = createProxyAgent(config.proxyUrl);
+
+	// Support for separate XHR proxy
+	if (config.xhr && typeof config.xhr !== "boolean") {
+		config.xhrProxyUrl = formatProxyUrl(config.xhr);
+		config.xhrProxyAgent = createProxyAgent(config.xhrProxyUrl);
+	} else {
+		config.xhrProxyUrl = null;
+		config.xhrProxyAgent = null;
+	}
+
+	// 4. Intercepted resource types
+	const types = ["stylesheet", "script", "font"];
+	if (!config.blockImage) {
+		types.push("image");
+	}
+	if (config.xhr) {
+		types.push("xhr", "fetch");
+	}
+	config.interceptedResourceTypes = types;
+}
 
 // Create a NodeCache instance for caching responses
 // This helps reduce bandwidth usage and speed up repeated requests
@@ -238,71 +299,59 @@ async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl
  * @param {Object} options.m4w_send_on_message - Custom handler data for Doublelist messages
  * @param {Array<string>} options.allowImagePatterns - Array of strings/patterns. If a URL contains any of these, it will NOT be blocked even if blockImage is true.
  * @param {Array<string>} options.skipGotPatterns - Array of strings/patterns. If a URL contains any of these, it will skip the custom Superagent fetch.
+ * @param {boolean|string|Object|null} options.xhr - Enable XHR/Fetch request interception, optionally using a custom proxy just for XHR/Fetch
  */
-export async function pwRoute({
-	context = null,
-	page = null,
-	logger = false,
-	blockAds = true,
-	blockImage = true,
-	useGot = false,
-	useFullUrl = true,
-	useCache = true,
-	stripGotHeaders = true,
-	stripGotLogger = false,
-	proxy = null,
-	m4w_send_on_post = null,
-	m4w_send_on_message = null,
-	allowImagePatterns = [], // Default empty, merged inside
-	skipGotPatterns = [], // Default empty, merged inside
-}) {
+export async function pwRoute(options = {}) {
+	const context = options.context || null;
+	const page = options.page || null;
+
 	// Validation: Ensure we have a target to attach the route to
 	if (!context && !page) {
 		throw new Error("Either context or page must be provided.");
 	}
 	const contextOrPage = context ? context : page;
 
-	// --- SETUP: Merge Defaults for allowImagePatterns ---
-	// Always allow Cloudflare challenge platform images
-	const defaultAllowedPatterns = ["cdn-cgi/challenge-platform"];
-	const finalImagePatterns = [...defaultAllowedPatterns, ...allowImagePatterns];
-
-	// --- SETUP: Merge Defaults for skipGotPatterns ---
-	// Always skip custom fetch for Cloudflare challenges (let browser handle it)
-	const defaultSkipPatterns = [];
-	// Normalize: if entry contains "://", extract hostname. Otherwise keep as-is (assumed to be a hostname).
-	const finalSkipHosts = new Set(
-		[...defaultSkipPatterns, ...skipGotPatterns].map((entry) => {
-			try {
-				if (entry.includes("://")) return new URL(entry).hostname;
-			} catch {}
-			return entry;
-		})
-	);
+	// Check if we already have a route config for this context/page
+	let config = routeConfigs.get(contextOrPage);
+	if (config) {
+		// Update the existing configuration with new options!
+		Object.assign(config, options);
+		updateDerivedConfig(config);
+
+		// Handle ad blocking initialization if newly enabled
+		if (config.blockAds && !AdBlockEngine) {
+			AdBlockEngine = await FiltersEngine.fromPrebuiltAdsAndTracking(fetch);
+			if (!AdBlockEngine) {
+				throw new Error("Failed to initialize AdBlockEngine.");
+			}
+		}
+		return;
+	}
+
+	// First time registration:
+	config = {
+		...DEFAULTS,
+		...options,
+	};
+	routeConfigs.set(contextOrPage, config);
+	updateDerivedConfig(config);
 
 	// Initialize ad blocking AdBlockEngine if enabled and not already loaded
-	if (blockAds && !AdBlockEngine) {
-		// console.log("Initializing AdBlockEngine..............................");
+	if (config.blockAds && !AdBlockEngine) {
 		AdBlockEngine = await FiltersEngine.fromPrebuiltAdsAndTracking(fetch);
 		if (!AdBlockEngine) {
 			throw new Error("Failed to initialize AdBlockEngine.");
 		}
 	}
 
-	// Define resource types to intercept for custom fetching (useGot)
-	const interceptedResourceTypes = ["stylesheet", "script", "font"];
-
-	// Create proxy agent once (reused for all requests in this route)
-	const proxyUrl = formatProxyUrl(proxy);
-	const proxyAgent = createProxyAgent(proxyUrl);
-
-	// If images are NOT blocked, we generally want to intercept/cache them too.
-	if (!blockImage) {
-		interceptedResourceTypes.push("image");
-	}
-
 	// Set up the global route interception
 	await contextOrPage.route("**/*", async (route, request) => {
+		const currentConfig = routeConfigs.get(contextOrPage);
+		if (!currentConfig) {
+			await route.continue();
+			return;
+		}
+
 		const url = request.url();
 		const method = request.method();
 		const resourceType = request.resourceType();
@@ -310,9 +359,9 @@ export async function pwRoute({
 		// ============================================================
 		// Group 1: Image Blocking
 		// ============================================================
-		if (blockImage && resourceType === "image") {
+		if (currentConfig.blockImage && resourceType === "image") {
 			// Check against the merged list (defaults + user input)
-			const isAllowed = finalImagePatterns.some((pattern) => url.includes(pattern));
+			const isAllowed = currentConfig.finalImagePatterns.some((pattern) => url.includes(pattern));
 
 			if (!isAllowed) {
 				route.abort();
@@ -323,7 +372,7 @@ export async function pwRoute({
 		// ============================================================
 		// Group 2: Ad Blocking
 		// ============================================================
-		if (blockAds && AdBlockEngine) {
+		if (currentConfig.blockAds && AdBlockEngine) {
 			const adsBlockResult = AdBlockEngine.match(
 				Request.fromRawDetails({
 					url: url,
@@ -347,23 +396,23 @@ export async function pwRoute({
 		// ============================================================
 		// Group 4: m4w_send_on_message Handling (Doublelist API)
 		// ============================================================
-		if (m4w_send_on_message && url.includes("api.doublelist.com/api/messages") && method === "POST") {
+		if (currentConfig.m4w_send_on_message && url.includes("api.doublelist.com/api/messages") && method === "POST") {
 			const headers = request.headers();
 			const postData = request.postData();
 			const urlParams = new URLSearchParams(postData);
 			const messageJSON = decodeURIComponent(urlParams.get("messageJSON"));
 			const parsedMessageJSON = JSON.parse(messageJSON);
 
-			m4w_send_on_message.sender_id = parsedMessageJSON.sender_id;
+			currentConfig.m4w_send_on_message.sender_id = parsedMessageJSON.sender_id;
 			const authorizationHeader = headers["authorization"];
-			m4w_send_on_message.token_value = authorizationHeader.replace("Bearer ", "");
+			currentConfig.m4w_send_on_message.token_value = authorizationHeader.replace("Bearer ", "");
 
 			console.log("posts_send_message Blocked (Data Extracted)");
 			route.abort();
 			return;
 		}
 
-		if (m4w_send_on_message && url.includes("https://doublelist.com/posts_send_message/")) {
+		if (currentConfig.m4w_send_on_message && url.includes("https://doublelist.com/posts_send_message/")) {
 			console.log("posts_send_message Blocked");
 			route.abort();
 			return;
@@ -372,23 +421,23 @@ export async function pwRoute({
 		// ============================================================
 		// Group 5: m4w_send_on_post Handling (Doublelist API)
 		// ============================================================
-		if (m4w_send_on_post && url.includes("api.doublelist.com/api/messages") && method === "POST") {
+		if (currentConfig.m4w_send_on_post && url.includes("api.doublelist.com/api/messages") && method === "POST") {
 			if (
-				m4w_send_on_post.current_post_id &&
-				m4w_send_on_post.current_post_id !== m4w_send_on_post.last_post_id &&
-				m4w_send_on_post.current_send_to &&
-				m4w_send_on_post.current_send_to != m4w_send_on_post.last_send_to
+				currentConfig.m4w_send_on_post.current_post_id &&
+				currentConfig.m4w_send_on_post.current_post_id !== currentConfig.m4w_send_on_post.last_post_id &&
+				currentConfig.m4w_send_on_post.current_send_to &&
+				currentConfig.m4w_send_on_post.current_send_to != currentConfig.m4w_send_on_post.last_send_to
 			) {
-				m4w_send_on_post.last_send_to = m4w_send_on_post.current_send_to;
-				m4w_send_on_post.last_post_id = m4w_send_on_post.current_post_id;
+				currentConfig.m4w_send_on_post.last_send_to = currentConfig.m4w_send_on_post.current_send_to;
+				currentConfig.m4w_send_on_post.last_post_id = currentConfig.m4w_send_on_post.current_post_id;
 
 				let postData = request.postData();
 				const urlParams = new URLSearchParams(postData);
 				const messageJSON = decodeURIComponent(urlParams.get("messageJSON"));
 				let parsedMessageJSON = JSON.parse(messageJSON);
 
-				parsedMessageJSON.chat_user = m4w_send_on_post.current_send_to;
-				parsedMessageJSON.post_id = m4w_send_on_post.current_post_id;
+				parsedMessageJSON.chat_user = currentConfig.m4w_send_on_post.current_send_to;
+				parsedMessageJSON.post_id = currentConfig.m4w_send_on_post.current_post_id;
 
 				urlParams.set("messageJSON", JSON.stringify(parsedMessageJSON));
 				const final_postData = urlParams.toString();
@@ -404,13 +453,13 @@ export async function pwRoute({
 			}
 		}
 
-		if (m4w_send_on_post && url.includes("https://doublelist.com/posts_send_message/")) {
+		if (currentConfig.m4w_send_on_post && url.includes("https://doublelist.com/posts_send_message/")) {
 			console.log("posts_send_message Blocked");
 			await route.abort();
 			return;
 		}
 
-		if (m4w_send_on_post && url.includes("doublelist.com/messages/")) {
+		if (currentConfig.m4w_send_on_post && url.includes("doublelist.com/messages/")) {
 			console.log("doublelist.com/messages/ Redirected");
 			await route.fulfill({
 				status: 302,
@@ -424,27 +473,32 @@ export async function pwRoute({
 		// ============================================================
 		// Group 6: Resource Interception (Custom Fetch/Cache)
 		// ============================================================
-		if (useGot && interceptedResourceTypes.includes(resourceType) && !url.startsWith("data:")) {
+		if (currentConfig.useGot && currentConfig.interceptedResourceTypes.includes(resourceType) && !url.startsWith("data:")) {
 			// Check against the normalized host list (defaults + user input)
 			let shouldSkipGot = false;
 			try {
-				shouldSkipGot = finalSkipHosts.has(new URL(url).hostname);
+				shouldSkipGot = currentConfig.finalSkipHosts.has(new URL(url).hostname);
 			} catch {}
 
 			if (!shouldSkipGot) {
 				const requestHeaders = request.headers();
 				const requestMethod = request.method();
 
+				const isXhrOrFetch = resourceType === "xhr" || resourceType === "fetch";
+				const agentToUse = (isXhrOrFetch && currentConfig.xhrProxyAgent)
+					? currentConfig.xhrProxyAgent
+					: currentConfig.proxyAgent;
+
 				const response = await fetchWithClient(
-					useCache,
+					currentConfig.useCache,
 					url,
 					requestHeaders,
 					requestMethod,
-					useFullUrl,
-					logger,
-					proxyAgent,
-					stripGotHeaders,
-					stripGotLogger
+					currentConfig.useFullUrl,
+					currentConfig.logger,
+					agentToUse,
+					currentConfig.stripGotHeaders,
+					currentConfig.stripGotLogger
 				);
 
 				if (response) {
@@ -455,7 +509,7 @@ export async function pwRoute({
 					});
 					return;
 				} else {
-					if (logger) console.log("Continuing with normal request (fetchWithClient returned null):", url);
+					if (currentConfig.logger) console.log("Continuing with normal request (fetchWithClient returned null):", url);
 					await route.continue();
 					return;
 				}

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

@@ -1,4 +1,4 @@
-import ProxyChain from "proxy-chain";
+import { Server } from "proxy-chain";
 import net from "net";
 import https from "https";
 import http from "http";
@@ -269,7 +269,7 @@ export async function startProxyServer({
 			return null;
 		}
 
-		server = new ProxyChain.Server({
+		server = new Server({
 			port: candidatePort,
 			host: "127.0.0.1",
 			verbose: debug,

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

@@ -59,6 +59,12 @@ export interface PpRouteOptions {
 	 * Playwright network stack will be used instead.
 	 */
 	skipGotPatterns?: string[];
+
+	/**
+	 * Intercept XHR/Fetch requests.
+	 * Can be boolean (true/false) or a custom proxy string/object used only for XHR/Fetch requests.
+	 */
+	xhr?: boolean | string | { type?: string; host: string; port: number; user?: string; pass?: string } | null;
 }
 
 /**

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

@@ -7,6 +7,67 @@ import { SocksProxyAgent } from "socks-proxy-agent";
 import NodeCache from "node-cache";
 
 let AdBlockEngine;
+const routeConfigs = new WeakMap();
+
+const DEFAULTS = {
+	logger: false,
+	blockAds: true,
+	blockImage: true,
+	useGot: false,
+	useFullUrl: true,
+	useCache: true,
+	stripGotHeaders: true,
+	stripGotLogger: false,
+	proxy: null,
+	m4w_send_on_post: null,
+	m4w_send_on_message: null,
+	allowImagePatterns: [],
+	skipGotPatterns: [],
+	xhr: false,
+};
+
+/**
+ * Helper to update derived configuration values from active user options.
+ */
+function updateDerivedConfig(config) {
+	// 1. Defaults/merges for allowImagePatterns
+	const allowImagePatterns = config.allowImagePatterns || [];
+	config.finalImagePatterns = ["cdn-cgi/challenge-platform", ...allowImagePatterns];
+
+	// 2. Defaults/merges for skipGotPatterns
+	const skipGotPatterns = config.skipGotPatterns || [];
+	config.finalSkipHosts = new Set(
+		skipGotPatterns.map((entry) => {
+			try {
+				if (entry.includes("://")) return new URL(entry).hostname;
+			} catch {}
+			return entry;
+		})
+	);
+
+	// 3. Proxies
+	config.proxyUrl = formatProxyUrl(config.proxy);
+	config.proxyAgent = createProxyAgent(config.proxyUrl);
+
+	// Support for separate XHR proxy
+	if (config.xhr && typeof config.xhr !== "boolean") {
+		config.xhrProxyUrl = formatProxyUrl(config.xhr);
+		config.xhrProxyAgent = createProxyAgent(config.xhrProxyUrl);
+	} else {
+		config.xhrProxyUrl = null;
+		config.xhrProxyAgent = null;
+	}
+
+	// 4. Intercepted resource types
+	const types = ["stylesheet", "script", "font"];
+	if (!config.blockImage) {
+		types.push("image");
+	}
+	if (config.xhr) {
+		types.push("xhr", "fetch");
+	}
+	config.interceptedResourceTypes = types;
+}
 
 // Create a NodeCache instance for caching responses
 // This helps reduce bandwidth usage and speed up repeated requests
@@ -240,67 +301,50 @@ async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl
  * @param {Object} options.m4w_send_on_message - Custom handler data for Doublelist messages
  * @param {Array<string>} options.allowImagePatterns - Array of strings/patterns. If a URL contains any of these, it will NOT be blocked even if blockImage is true.
  * @param {Array<string>} options.skipGotPatterns - Array of strings/patterns. If a URL contains any of these, it will skip the custom Superagent fetch.
+ * @param {boolean|string|Object|null} options.xhr - Enable XHR/Fetch request interception, optionally using a custom proxy just for XHR/Fetch
  */
-export async function ppRoute({
-	page = null,
-	logger = false,
-	blockAds = true,
-	blockImage = true,
-	useGot = false,
-	useFullUrl = true,
-	useCache = true,
-	stripGotHeaders = true,
-	stripGotLogger = false,
-	proxy = null,
-	m4w_send_on_post = null,
-	m4w_send_on_message = null,
-	allowImagePatterns = [], // Default empty, merged inside
-	skipGotPatterns = [], // Default empty, merged inside
-}) {
+export async function ppRoute(options = {}) {
+	const page = options.page || null;
+
 	// Validation: Ensure we have a page
 	if (!page) {
 		throw new Error("A Puppeteer page must be provided.");
 	}
+	const contextOrPage = page;
+
+	// Check if we already have a route config for this context/page
+	let config = routeConfigs.get(contextOrPage);
+	if (config) {
+		// Update the existing configuration with new options!
+		Object.assign(config, options);
+		updateDerivedConfig(config);
+
+		// Handle ad blocking initialization if newly enabled
+		if (config.blockAds && !AdBlockEngine) {
+			AdBlockEngine = await FiltersEngine.fromPrebuiltAdsAndTracking(fetch);
+			if (!AdBlockEngine) {
+				throw new Error("Failed to initialize AdBlockEngine.");
+			}
+		}
+		return;
+	}
 
-	// --- SETUP: Merge Defaults for allowImagePatterns ---
-	// Always allow Cloudflare challenge platform images
-	const defaultAllowedPatterns = ["cdn-cgi/challenge-platform"];
-	const finalImagePatterns = [...defaultAllowedPatterns, ...allowImagePatterns];
-
-	// --- SETUP: Merge Defaults for skipGotPatterns ---
-	// Always skip custom fetch for Cloudflare challenges (let browser handle it)
-	const defaultSkipPatterns = [];
-	// Normalize: if entry contains "://", extract hostname. Otherwise keep as-is (assumed to be a hostname).
-	const finalSkipHosts = new Set(
-		[...defaultSkipPatterns, ...skipGotPatterns].map((entry) => {
-			try {
-				if (entry.includes("://")) return new URL(entry).hostname;
-			} catch {}
-			return entry;
-		})
-	);
+	// First time registration:
+	config = {
+		...DEFAULTS,
+		...options,
+	};
+	routeConfigs.set(contextOrPage, config);
+	updateDerivedConfig(config);
 
 	// Initialize ad blocking AdBlockEngine if enabled and not already loaded
-	if (blockAds && !AdBlockEngine) {
-		// console.log("Initializing AdBlockEngine..............................");
+	if (config.blockAds && !AdBlockEngine) {
 		AdBlockEngine = await FiltersEngine.fromPrebuiltAdsAndTracking(fetch);
 		if (!AdBlockEngine) {
 			throw new Error("Failed to initialize AdBlockEngine.");
 		}
 	}
 
-	// Define resource types to intercept for custom fetching (useGot)
-	const interceptedResourceTypes = ["stylesheet", "script", "font"];
-
-	// Create proxy agent once (reused for all requests in this route)
-	const proxyUrl = formatProxyUrl(proxy);
-	const proxyAgent = createProxyAgent(proxyUrl);
-
-	// If images are NOT blocked, we generally want to intercept/cache them too.
-	if (!blockImage) {
-		interceptedResourceTypes.push("image");
-	}
-
 	// Enable request interception in Puppeteer
 	await page.setRequestInterception(true);
 
@@ -309,6 +353,12 @@ export async function ppRoute({
 		// Puppeteer best practice: do not handle request if already handled
 		if (request.isInterceptResolutionHandled()) return;
 
+		const currentConfig = routeConfigs.get(contextOrPage);
+		if (!currentConfig) {
+			await request.continue();
+			return;
+		}
+
 		const url = request.url();
 		const method = request.method();
 		const resourceType = request.resourceType();
@@ -316,9 +366,9 @@ export async function ppRoute({
 		// ============================================================
 		// Group 1: Image Blocking
 		// ============================================================
-		if (blockImage && resourceType === "image") {
+		if (currentConfig.blockImage && resourceType === "image") {
 			// Check against the merged list (defaults + user input)
-			const isAllowed = finalImagePatterns.some((pattern) => url.includes(pattern));
+			const isAllowed = currentConfig.finalImagePatterns.some((pattern) => url.includes(pattern));
 
 			if (!isAllowed) {
 				await request.abort();
@@ -329,7 +379,7 @@ export async function ppRoute({
 		// ============================================================
 		// Group 2: Ad Blocking
 		// ============================================================
-		if (blockAds && AdBlockEngine) {
+		if (currentConfig.blockAds && AdBlockEngine) {
 			const adsBlockResult = AdBlockEngine.match(
 				Request.fromRawDetails({
 					url: url,
@@ -353,23 +403,23 @@ export async function ppRoute({
 		// ============================================================
 		// Group 4: m4w_send_on_message Handling (Doublelist API)
 		// ============================================================
-		if (m4w_send_on_message && url.includes("api.doublelist.com/api/messages") && method === "POST") {
+		if (currentConfig.m4w_send_on_message && url.includes("api.doublelist.com/api/messages") && method === "POST") {
 			const headers = request.headers();
 			const postData = request.postData();
 			const urlParams = new URLSearchParams(postData);
 			const messageJSON = decodeURIComponent(urlParams.get("messageJSON"));
 			const parsedMessageJSON = JSON.parse(messageJSON);
 
-			m4w_send_on_message.sender_id = parsedMessageJSON.sender_id;
+			currentConfig.m4w_send_on_message.sender_id = parsedMessageJSON.sender_id;
 			const authorizationHeader = headers["authorization"];
-			m4w_send_on_message.token_value = authorizationHeader.replace("Bearer ", "");
+			currentConfig.m4w_send_on_message.token_value = authorizationHeader.replace("Bearer ", "");
 
 			console.log("posts_send_message Blocked (Data Extracted)");
 			await request.abort();
 			return;
 		}
 
-		if (m4w_send_on_message && url.includes("https://doublelist.com/posts_send_message/")) {
+		if (currentConfig.m4w_send_on_message && url.includes("https://doublelist.com/posts_send_message/")) {
 			console.log("posts_send_message Blocked");
 			await request.abort();
 			return;
@@ -378,23 +428,23 @@ export async function ppRoute({
 		// ============================================================
 		// Group 5: m4w_send_on_post Handling (Doublelist API)
 		// ============================================================
-		if (m4w_send_on_post && url.includes("api.doublelist.com/api/messages") && method === "POST") {
+		if (currentConfig.m4w_send_on_post && url.includes("api.doublelist.com/api/messages") && method === "POST") {
 			if (
-				m4w_send_on_post.current_post_id &&
-				m4w_send_on_post.current_post_id !== m4w_send_on_post.last_post_id &&
-				m4w_send_on_post.current_send_to &&
-				m4w_send_on_post.current_send_to != m4w_send_on_post.last_send_to
+				currentConfig.m4w_send_on_post.current_post_id &&
+				currentConfig.m4w_send_on_post.current_post_id !== currentConfig.m4w_send_on_post.last_post_id &&
+				currentConfig.m4w_send_on_post.current_send_to &&
+				currentConfig.m4w_send_on_post.current_send_to != currentConfig.m4w_send_on_post.last_send_to
 			) {
-				m4w_send_on_post.last_send_to = m4w_send_on_post.current_send_to;
-				m4w_send_on_post.last_post_id = m4w_send_on_post.current_post_id;
+				currentConfig.m4w_send_on_post.last_send_to = currentConfig.m4w_send_on_post.current_send_to;
+				currentConfig.m4w_send_on_post.last_post_id = currentConfig.m4w_send_on_post.current_post_id;
 
 				let postData = request.postData();
 				const urlParams = new URLSearchParams(postData);
 				const messageJSON = decodeURIComponent(urlParams.get("messageJSON"));
 				let parsedMessageJSON = JSON.parse(messageJSON);
 
-				parsedMessageJSON.chat_user = m4w_send_on_post.current_send_to;
-				parsedMessageJSON.post_id = m4w_send_on_post.current_post_id;
+				parsedMessageJSON.chat_user = currentConfig.m4w_send_on_post.current_send_to;
+				parsedMessageJSON.post_id = currentConfig.m4w_send_on_post.current_post_id;
 
 				urlParams.set("messageJSON", JSON.stringify(parsedMessageJSON));
 				const final_postData = urlParams.toString();
@@ -410,13 +460,13 @@ export async function ppRoute({
 			}
 		}
 
-		if (m4w_send_on_post && url.includes("https://doublelist.com/posts_send_message/")) {
+		if (currentConfig.m4w_send_on_post && url.includes("https://doublelist.com/posts_send_message/")) {
 			console.log("posts_send_message Blocked");
 			await request.abort();
 			return;
 		}
 
-		if (m4w_send_on_post && url.includes("doublelist.com/messages/")) {
+		if (currentConfig.m4w_send_on_post && url.includes("doublelist.com/messages/")) {
 			console.log("doublelist.com/messages/ Redirected");
 			await request.respond({
 				status: 302,
@@ -430,27 +480,32 @@ export async function ppRoute({
 		// ============================================================
 		// Group 6: Resource Interception (Custom Fetch/Cache)
 		// ============================================================
-		if (useGot && interceptedResourceTypes.includes(resourceType) && !url.startsWith("data:")) {
+		if (currentConfig.useGot && currentConfig.interceptedResourceTypes.includes(resourceType) && !url.startsWith("data:")) {
 			// Check against the normalized host list (defaults + user input)
 			let shouldSkipGot = false;
 			try {
-				shouldSkipGot = finalSkipHosts.has(new URL(url).hostname);
+				shouldSkipGot = currentConfig.finalSkipHosts.has(new URL(url).hostname);
 			} catch {}
 
 			if (!shouldSkipGot) {
 				const requestHeaders = request.headers();
 				const requestMethod = request.method();
 
+				const isXhrOrFetch = resourceType === "xhr" || resourceType === "fetch";
+				const agentToUse = (isXhrOrFetch && currentConfig.xhrProxyAgent)
+					? currentConfig.xhrProxyAgent
+					: currentConfig.proxyAgent;
+
 				const response = await fetchWithClient(
-					useCache,
+					currentConfig.useCache,
 					url,
 					requestHeaders,
 					requestMethod,
-					useFullUrl,
-					logger,
-					proxyAgent,
-					stripGotHeaders,
-					stripGotLogger
+					currentConfig.useFullUrl,
+					currentConfig.logger,
+					agentToUse,
+					currentConfig.stripGotHeaders,
+					currentConfig.stripGotLogger
 				);
 
 				if (response) {
@@ -461,7 +516,7 @@ export async function ppRoute({
 					});
 					return;
 				} else {
-					if (logger) console.log("Continuing with normal request (fetchWithClient returned null):", url);
+					if (currentConfig.logger) console.log("Continuing with normal request (fetchWithClient returned null):", url);
 					await request.continue();
 					return;
 				}