arn-browser 0.1.35 → 0.1.37

package/bin/install.js

@@ -41,7 +41,7 @@ const CAM_VERSION = { version: "135.0.1", release: "beta.24" };
 
 const ARN_BROWSERS_DIR = path.join(os.homedir(), ".arn-browser", "browsers");
 const CAM_DIR = path.join(os.homedir(), ".cache", "camoufox");
-const TEMP_DIR = path.join(os.tmpdir(), "arn-browser-install");
+const TEMP_DIR = path.join(os.tmpdir(), `arn-browser-install-${os.userInfo().username || 'default'}`);
 
 // Stale folders from previous versions that downloaded browsers
 const STALE_BROWSER_DIRS = [

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "arn-browser",
-	"version": "0.1.35",
+	"version": "0.1.37",
 	"description": "A lightweight, browser autmation helper.",
 	"main": "src/index.js",
 	"types": "src/index.d.ts",
@@ -14,8 +14,8 @@
 	"dependencies": {
 		"@aws-sdk/client-ec2": "^3.1015.0",
 		"@ghostery/adblocker": "^2.13.0",
-		"arn-knexjs": "^0.0.3",
-		"camoufox-js": "^0.9.3",
+		"arn-knexjs": "^0.0.6",
+		"camoufox-js": "^0.10.2",
 		"devtools-detector": "^2.0.25",
 		"dotenv": "^17.2.3",
 		"fingerprint-generator": "^2.1.78",
@@ -35,8 +35,7 @@
 		"arn-browser": "bin/cli.js"
 	},
 	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1",
-		"postinstall": "npm install playwright-core@1.42.1 --no-save"
+		"test": "echo \"Error: no test specified\" && exit 1"
 	},
 	"keywords": [
 		"browser",

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

@@ -4,38 +4,6 @@ import { Browser, BrowserContext, Page } from "playwright-core";
 // ROUTING & CACHE TYPES
 // ============================================================================
 
-/**
- * Supported browser resource types for interception.
- *
- * - `"document"` — HTML pages
- * - `"stylesheet"` — CSS files
- * - `"image"` — Images (png, jpg, svg, etc.)
- * - `"media"` — Audio/Video
- * - `"font"` — Web fonts (woff, woff2, ttf, etc.)
- * - `"script"` — JavaScript files
- * - `"xhr"` — XMLHttpRequest calls
- * - `"fetch"` — Fetch API calls
- */
-export type ResourceType = "document" | "stylesheet" | "image" | "media" | "font" | "script" | "xhr" | "fetch";
-
-/** Control object returned by pwRoute for runtime resource management */
-export interface RouteControl {
-	/**
-	 * Add a resource type to intercept via Superagent at runtime.
-	 *
-	 * Supported: `"document"` | `"stylesheet"` | `"image"` | `"media"` | `"font"` | `"script"` | `"xhr"` | `"fetch"`
-	 */
-	addResource(type: ResourceType): void;
-	/**
-	 * Remove a resource type from Superagent interception at runtime.
-	 *
-	 * Supported: `"document"` | `"stylesheet"` | `"image"` | `"media"` | `"font"` | `"script"` | `"xhr"` | `"fetch"`
-	 */
-	removeResource(type: ResourceType): void;
-	/** Get currently intercepted resource types */
-	getResources(): ResourceType[];
-}
-
 /**
  * Options for the pwRoute function.
  */
@@ -94,47 +62,12 @@ export interface PwRouteOptions {
 	 * Playwright network stack will be used instead.
 	 */
 	skipGotPatterns?: string[];
-
-	/**
-	 * Additional resource types to intercept via Superagent.
-	 * These are added on top of the defaults: `["stylesheet", "script", "font"]`
-	 *
-	 * - `"document"` — HTML pages
-	 * - `"stylesheet"` — CSS files
-	 * - `"image"` — Images (png, jpg, svg, etc.)
-	 * - `"media"` — Audio/Video
-	 * - `"font"` — Web fonts (woff, woff2, ttf, etc.)
-	 * - `"script"` — JavaScript files
-	 * - `"xhr"` — XMLHttpRequest calls
-	 * - `"fetch"` — Fetch API calls
-	 *
-	 * @example `gotAddResources: ["document", "xhr"]`
-	 */
-	gotAddResources?: ResourceType[];
-
-	/**
-	 * Resource types to exclude from Superagent interception.
-	 * These are removed from the defaults: `["stylesheet", "script", "font"]`
-	 *
-	 * - `"document"` — HTML pages
-	 * - `"stylesheet"` — CSS files
-	 * - `"image"` — Images (png, jpg, svg, etc.)
-	 * - `"media"` — Audio/Video
-	 * - `"font"` — Web fonts (woff, woff2, ttf, etc.)
-	 * - `"script"` — JavaScript files
-	 * - `"xhr"` — XMLHttpRequest calls
-	 * - `"fetch"` — Fetch API calls
-	 *
-	 * @example `gotRemoveResources: ["font"]`
-	 */
-	gotRemoveResources?: ResourceType[];
 }
 
 /**
  * Sets up request interception, caching, and ad-blocking on a Playwright page or context.
- * Returns a control object for runtime resource management.
  */
-export function pwRoute(options: PwRouteOptions): Promise<RouteControl>;
+export function pwRoute(options: PwRouteOptions): Promise<void>;
 
 /**
  * Starts logging cache statistics to the console at a set interval.

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

@@ -76,7 +76,7 @@ function createProxyAgent(proxyUrl) {
  * Only keeps essential headers needed for the server to respond correctly.
  * Everything else (cookies, auth, fingerprint hints, HTTP/2 pseudo-headers, etc.) is stripped.
  */
-function sanitizeRequestHeaders(headers, logger, url, resourceType) {
+function sanitizeRequestHeaders(headers, logger, url) {
 	// Allowlist of essential request headers to keep
 	const allowedHeaders = new Set([
 		"accept",
@@ -93,16 +93,6 @@ function sanitizeRequestHeaders(headers, logger, url, resourceType) {
 		"sec-fetch-site",
 	]);
 
-	// For document/xhr/fetch types, preserve session-critical headers
-	const sessionTypes = new Set(["document", "xhr", "fetch"]);
-	if (sessionTypes.has(resourceType)) {
-		allowedHeaders.add("cookie");
-		allowedHeaders.add("authorization");
-		allowedHeaders.add("origin");
-		allowedHeaders.add("content-type");
-		allowedHeaders.add("x-requested-with");
-	}
-
 	const cleaned = {};
 	const stripped = [];
 
@@ -170,7 +160,7 @@ function sanitizeResponseHeaders(headers, logger, url) {
  * @param {boolean} stripLogger - Whether to log stripped headers
  * @returns {Promise<Object>} - The response object containing status, headers, and body
  */
-async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl, logger, proxyAgent, stripHeaders, stripLogger, resourceType) {
+async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl, logger, proxyAgent, stripHeaders, stripLogger) {
 	// Determine the cache key based on configuration
 	let mainUrl = new URL(url).origin + new URL(url).pathname;
 	if (useFullUrl) {
@@ -190,7 +180,7 @@ async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl
 
 	try {
 		// Sanitize outgoing request headers if stripHeaders is enabled
-		const finalHeaders = stripHeaders ? sanitizeRequestHeaders(requestHeaders, stripLogger, url, resourceType) : requestHeaders;
+		const finalHeaders = stripHeaders ? sanitizeRequestHeaders(requestHeaders, stripLogger, url) : requestHeaders;
 
 		// Fetch the resource using superagent
 		// buffer(true) ensures we get the raw binary data (essential for images/fonts)
@@ -248,8 +238,6 @@ 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 {Array<string>} options.gotAddResources - Additional resource types to intercept via Superagent, e.g. ["document", "xhr", "fetch"]
- * @param {Array<string>} options.gotRemoveResources - Resource types to exclude from Superagent interception, e.g. ["font"]
  */
 export async function pwRoute({
 	context = null,
@@ -267,8 +255,6 @@ export async function pwRoute({
 	m4w_send_on_message = null,
 	allowImagePatterns = [], // Default empty, merged inside
 	skipGotPatterns = [], // Default empty, merged inside
-	gotAddResources = [], // Default empty, add to intercepted types
-	gotRemoveResources = [], // Default empty, remove from intercepted types
 }) {
 	// Validation: Ensure we have a target to attach the route to
 	if (!context && !page) {
@@ -303,25 +289,16 @@ export async function pwRoute({
 		}
 	}
 
-	// Supported resource types reference (for documentation)
-	// "document", "stylesheet", "image", "media", "font", "script",
-	// "texttrack", "xhr", "fetch", "eventsource", "websocket", "manifest", "other"
-
 	// Define resource types to intercept for custom fetching (useGot)
-	// Start with defaults, add user extras, then remove user exclusions
-	const defaultResourceTypes = ["stylesheet", "script", "font"];
-	const interceptedResourceTypes = new Set([...defaultResourceTypes, ...gotAddResources]);
-	for (const type of gotRemoveResources) {
-		interceptedResourceTypes.delete(type);
-	}
+	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 && !gotRemoveResources.includes("image")) {
-		interceptedResourceTypes.add("image");
+	if (!blockImage) {
+		interceptedResourceTypes.push("image");
 	}
 
 	// Set up the global route interception
@@ -447,7 +424,7 @@ export async function pwRoute({
 		// ============================================================
 		// Group 6: Resource Interception (Custom Fetch/Cache)
 		// ============================================================
-		if (useGot && interceptedResourceTypes.has(resourceType) && !url.startsWith("data:")) {
+		if (useGot && interceptedResourceTypes.includes(resourceType) && !url.startsWith("data:")) {
 			// Check against the normalized host list (defaults + user input)
 			let shouldSkipGot = false;
 			try {
@@ -467,8 +444,7 @@ export async function pwRoute({
 					logger,
 					proxyAgent,
 					stripGotHeaders,
-					stripGotLogger,
-					resourceType
+					stripGotLogger
 				);
 
 				if (response) {
@@ -492,20 +468,4 @@ export async function pwRoute({
 		await route.continue();
 		return;
 	});
-
-	// Return control object for runtime resource management
-	return {
-		/** Add a resource type to intercept via Superagent at runtime */
-		addResource(type) {
-			interceptedResourceTypes.add(type);
-		},
-		/** Remove a resource type from Superagent interception at runtime */
-		removeResource(type) {
-			interceptedResourceTypes.delete(type);
-		},
-		/** Get currently intercepted resource types */
-		getResources() {
-			return [...interceptedResourceTypes];
-		},
-	};
 }

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

@@ -4,38 +4,6 @@ import { Browser, Page } from "puppeteer-core";
 // ROUTING & CACHE TYPES
 // ============================================================================
 
-/**
- * Supported browser resource types for interception.
- *
- * - `"document"` — HTML pages
- * - `"stylesheet"` — CSS files
- * - `"image"` — Images (png, jpg, svg, etc.)
- * - `"media"` — Audio/Video
- * - `"font"` — Web fonts (woff, woff2, ttf, etc.)
- * - `"script"` — JavaScript files
- * - `"xhr"` — XMLHttpRequest calls
- * - `"fetch"` — Fetch API calls
- */
-export type ResourceType = "document" | "stylesheet" | "image" | "media" | "font" | "script" | "xhr" | "fetch";
-
-/** Control object returned by ppRoute for runtime resource management */
-export interface RouteControl {
-	/**
-	 * Add a resource type to intercept via Superagent at runtime.
-	 *
-	 * Supported: `"document"` | `"stylesheet"` | `"image"` | `"media"` | `"font"` | `"script"` | `"xhr"` | `"fetch"`
-	 */
-	addResource(type: ResourceType): void;
-	/**
-	 * Remove a resource type from Superagent interception at runtime.
-	 *
-	 * Supported: `"document"` | `"stylesheet"` | `"image"` | `"media"` | `"font"` | `"script"` | `"xhr"` | `"fetch"`
-	 */
-	removeResource(type: ResourceType): void;
-	/** Get currently intercepted resource types */
-	getResources(): ResourceType[];
-}
-
 /**
  * Options for the ppRoute function.
  */
@@ -91,47 +59,12 @@ export interface PpRouteOptions {
 	 * Playwright network stack will be used instead.
 	 */
 	skipGotPatterns?: string[];
-
-	/**
-	 * Additional resource types to intercept via Superagent.
-	 * These are added on top of the defaults: `["stylesheet", "script", "font"]`
-	 *
-	 * - `"document"` — HTML pages
-	 * - `"stylesheet"` — CSS files
-	 * - `"image"` — Images (png, jpg, svg, etc.)
-	 * - `"media"` — Audio/Video
-	 * - `"font"` — Web fonts (woff, woff2, ttf, etc.)
-	 * - `"script"` — JavaScript files
-	 * - `"xhr"` — XMLHttpRequest calls
-	 * - `"fetch"` — Fetch API calls
-	 *
-	 * @example `gotAddResources: ["document", "xhr"]`
-	 */
-	gotAddResources?: ResourceType[];
-
-	/**
-	 * Resource types to exclude from Superagent interception.
-	 * These are removed from the defaults: `["stylesheet", "script", "font"]`
-	 *
-	 * - `"document"` — HTML pages
-	 * - `"stylesheet"` — CSS files
-	 * - `"image"` — Images (png, jpg, svg, etc.)
-	 * - `"media"` — Audio/Video
-	 * - `"font"` — Web fonts (woff, woff2, ttf, etc.)
-	 * - `"script"` — JavaScript files
-	 * - `"xhr"` — XMLHttpRequest calls
-	 * - `"fetch"` — Fetch API calls
-	 *
-	 * @example `gotRemoveResources: ["font"]`
-	 */
-	gotRemoveResources?: ResourceType[];
 }
 
 /**
  * Sets up request interception, caching, and ad-blocking on a Puppeteer page.
- * Returns a control object for runtime resource management.
  */
-export function ppRoute(options: PpRouteOptions): Promise<RouteControl>;
+export function ppRoute(options: PpRouteOptions): Promise<void>;
 
 /**
  * Starts logging cache statistics to the console at a set interval.

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

@@ -76,7 +76,7 @@ function createProxyAgent(proxyUrl) {
  * Only keeps essential headers needed for the server to respond correctly.
  * Everything else (cookies, auth, fingerprint hints, HTTP/2 pseudo-headers, etc.) is stripped.
  */
-function sanitizeRequestHeaders(headers, logger, url, resourceType) {
+function sanitizeRequestHeaders(headers, logger, url) {
 	// Allowlist of essential request headers to keep
 	const allowedHeaders = new Set([
 		"accept",
@@ -93,16 +93,6 @@ function sanitizeRequestHeaders(headers, logger, url, resourceType) {
 		"sec-fetch-site",
 	]);
 
-	// For document/xhr/fetch types, preserve session-critical headers
-	const sessionTypes = new Set(["document", "xhr", "fetch"]);
-	if (sessionTypes.has(resourceType)) {
-		allowedHeaders.add("cookie");
-		allowedHeaders.add("authorization");
-		allowedHeaders.add("origin");
-		allowedHeaders.add("content-type");
-		allowedHeaders.add("x-requested-with");
-	}
-
 	const cleaned = {};
 	const stripped = [];
 
@@ -173,7 +163,7 @@ function sanitizeResponseHeaders(headers, logger, url) {
  * @param {boolean} stripLogger - Whether to log stripped headers
  * @returns {Promise<Object>} - The response object containing status, headers, and body
  */
-async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl, logger, proxyAgent, stripHeaders, stripLogger, resourceType) {
+async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl, logger, proxyAgent, stripHeaders, stripLogger) {
 	// Determine the cache key based on configuration
 	let mainUrl = new URL(url).origin + new URL(url).pathname;
 	if (useFullUrl) {
@@ -193,7 +183,7 @@ async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl
 
 	try {
 		// Sanitize outgoing request headers if stripHeaders is enabled
-		const finalHeaders = stripHeaders ? sanitizeRequestHeaders(requestHeaders, stripLogger, url, resourceType) : requestHeaders;
+		const finalHeaders = stripHeaders ? sanitizeRequestHeaders(requestHeaders, stripLogger, url) : requestHeaders;
 
 		// Fetch the resource using superagent
 		// buffer(true) ensures we get the raw binary data (essential for images/fonts)
@@ -250,8 +240,6 @@ 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 {Array<string>} options.gotAddResources - Additional resource types to intercept via Superagent, e.g. ["document", "xhr", "fetch"]
- * @param {Array<string>} options.gotRemoveResources - Resource types to exclude from Superagent interception, e.g. ["font"]
  */
 export async function ppRoute({
 	page = null,
@@ -268,8 +256,6 @@ export async function ppRoute({
 	m4w_send_on_message = null,
 	allowImagePatterns = [], // Default empty, merged inside
 	skipGotPatterns = [], // Default empty, merged inside
-	gotAddResources = [], // Default empty, add to intercepted types
-	gotRemoveResources = [], // Default empty, remove from intercepted types
 }) {
 	// Validation: Ensure we have a page
 	if (!page) {
@@ -303,25 +289,16 @@ export async function ppRoute({
 		}
 	}
 
-	// Supported resource types reference (for documentation)
-	// "document", "stylesheet", "image", "media", "font", "script",
-	// "texttrack", "xhr", "fetch", "eventsource", "websocket", "manifest", "other"
-
 	// Define resource types to intercept for custom fetching (useGot)
-	// Start with defaults, add user extras, then remove user exclusions
-	const defaultResourceTypes = ["stylesheet", "script", "font"];
-	const interceptedResourceTypes = new Set([...defaultResourceTypes, ...gotAddResources]);
-	for (const type of gotRemoveResources) {
-		interceptedResourceTypes.delete(type);
-	}
+	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 && !gotRemoveResources.includes("image")) {
-		interceptedResourceTypes.add("image");
+	if (!blockImage) {
+		interceptedResourceTypes.push("image");
 	}
 
 	// Enable request interception in Puppeteer
@@ -453,7 +430,7 @@ export async function ppRoute({
 		// ============================================================
 		// Group 6: Resource Interception (Custom Fetch/Cache)
 		// ============================================================
-		if (useGot && interceptedResourceTypes.has(resourceType) && !url.startsWith("data:")) {
+		if (useGot && interceptedResourceTypes.includes(resourceType) && !url.startsWith("data:")) {
 			// Check against the normalized host list (defaults + user input)
 			let shouldSkipGot = false;
 			try {
@@ -473,8 +450,7 @@ export async function ppRoute({
 					logger,
 					proxyAgent,
 					stripGotHeaders,
-					stripGotLogger,
-					resourceType
+					stripGotLogger
 				);
 
 				if (response) {
@@ -498,20 +474,4 @@ export async function ppRoute({
 		await request.continue();
 		return;
 	});
-
-	// Return control object for runtime resource management
-	return {
-		/** Add a resource type to intercept via Superagent at runtime */
-		addResource(type) {
-			interceptedResourceTypes.add(type);
-		},
-		/** Remove a resource type from Superagent interception at runtime */
-		removeResource(type) {
-			interceptedResourceTypes.delete(type);
-		},
-		/** Get currently intercepted resource types */
-		getResources() {
-			return [...interceptedResourceTypes];
-		},
-	};
 }