arn-browser 0.1.16 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "arn-browser",
-	"version": "0.1.16",
+	"version": "0.1.18",
 	"description": "A lightweight, browser autmation helper.",
 	"main": "src/index.js",
 	"types": "src/index.d.ts",

package/src/utility/mlx_token.js

@@ -3,18 +3,12 @@
 import crypto from "crypto";
 import { arn, query } from "arn-knexjs";
 
-// Module-level cache for credentials (fetched once per process)
-let _credentials = null;
-
 /**
  * Loads Multilogin credentials from the database.
- * Queries `api_multilogin_token` for a single row where `status = 1`.
- * Results are cached in-memory so the DB is only hit once per process.
+ * Always reads fresh from DB (no in-memory cache) to support multiple processes.
  * @returns {Promise<{id: string, email: string, password: string, workspace_id: string, data: object}>}
  */
 async function loadCredentials() {
-	if (_credentials) return _credentials;
-
 	const { data: [row] = [], error } = await arn.single(
 		query("api_multilogin_token").select("*").where({ status: 1 }).orderByRaw("random()").limit(1)
 	);
@@ -23,13 +17,10 @@ async function loadCredentials() {
 		throw new Error("[TokenManager] No active Multilogin credentials found (status = 1).");
 	}
 
-	_credentials = row;
-	return _credentials;
+	return row;
 }
 
-async function saveTokens(tokens) {
-	const creds = await loadCredentials();
-
+async function saveTokens(creds, tokens) {
 	await arn.single(
 		query("api_multilogin_token")
 			.update({
@@ -39,18 +30,6 @@ async function saveTokens(tokens) {
 	);
 }
 
-async function loadTokens() {
-	try {
-		const creds = await loadCredentials();
-		if (!creds.data || Object.keys(creds.data).length === 0) {
-			return null;
-		}
-		return creds.data;
-	} catch (err) {
-		return null;
-	}
-}
-
 function isJwtExpired(token) {
 	if (!token) return true;
 	try {
@@ -62,9 +41,7 @@ function isJwtExpired(token) {
 	}
 }
 
-async function loginAndSaveTokens() {
-	const creds = await loadCredentials();
-
+async function loginAndSaveTokens(creds) {
 	const passwordHash = crypto.createHash("md5").update(creds.password).digest("hex");
 	const data = {
 		email: creds.email,
@@ -85,7 +62,7 @@ async function loginAndSaveTokens() {
 	const json = await res.json();
 	const { token, refresh_token } = json.data;
 
-	await saveTokens({
+	await saveTokens(creds, {
 		token,
 		refresh_token,
 		email: creds.email,
@@ -96,9 +73,7 @@ async function loginAndSaveTokens() {
 	return { token, refresh_token };
 }
 
-async function refreshAndSaveTokens(refresh_token) {
-	const creds = await loadCredentials();
-
+async function refreshAndSaveTokens(creds, refresh_token) {
 	const data = {
 		email: creds.email,
 		refresh_token: refresh_token,
@@ -119,7 +94,7 @@ async function refreshAndSaveTokens(refresh_token) {
 	const json = await res.json();
 	const { token, refresh_token: new_refresh } = json.data;
 
-	await saveTokens({
+	await saveTokens(creds, {
 		token,
 		refresh_token: new_refresh,
 		email: creds.email,
@@ -131,7 +106,8 @@ async function refreshAndSaveTokens(refresh_token) {
 }
 
 async function getMultiloginToken() {
-	let tokens = await loadTokens();
+	const creds = await loadCredentials();
+	const tokens = creds.data && Object.keys(creds.data).length > 0 ? creds.data : null;
 
 	if (tokens && tokens.token && !isJwtExpired(tokens.token)) {
 		return tokens.token;
@@ -139,14 +115,14 @@ async function getMultiloginToken() {
 
 	if (tokens && tokens.refresh_token) {
 		try {
-			const { token } = await refreshAndSaveTokens(tokens.refresh_token);
+			const { token } = await refreshAndSaveTokens(creds, tokens.refresh_token);
 			return token;
 		} catch (err) {
 			console.warn("[REFRESH FAILED] Will login again:", err.message);
 		}
 	}
 
-	const { token } = await loginAndSaveTokens();
+	const { token } = await loginAndSaveTokens(creds);
 	return token;
 }
 

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

@@ -90,11 +90,13 @@ async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl
 		mainUrl = url;
 	}
 
+	const viaProxy = proxyAgent ? " via Proxy" : "";
+
 	// Check if the response is cached
 	if (useCache) {
 		const cachedResponse = globalCache.get(mainUrl);
 		if (cachedResponse) {
-			if (logger === "info") console.log(`Serving from globalCache: ${mainUrl}`);
+			if (logger === "info") console.log(`Serving from globalCache${viaProxy}: ${mainUrl}`);
 			return cachedResponse;
 		}
 	}
@@ -121,9 +123,9 @@ async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl
 				headers: response.headers,
 				body: responseBody,
 			});
-			if (logger === "info") console.log(`Success (cached): ${mainUrl}`);
+			if (logger === "info") console.log(`Success (cached${viaProxy}): ${mainUrl}`);
 		} else {
-			if (logger === "info") console.log(`Success (not cached): ${mainUrl}`);
+			if (logger === "info") console.log(`Success (not cached${viaProxy}): ${mainUrl}`);
 		}
 
 		return {
@@ -183,7 +185,15 @@ export async function pwRoute({
 	// --- SETUP: Merge Defaults for skipGotPatterns ---
 	// Always skip custom fetch for Cloudflare challenges (let browser handle it)
 	const defaultSkipPatterns = [];
-	const finalSkipPatterns = [...defaultSkipPatterns, ...skipGotPatterns];
+	// 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;
+		})
+	);
 
 	// Initialize ad blocking AdBlockEngine if enabled and not already loaded
 	if (blockAds && !AdBlockEngine) {
@@ -329,9 +339,12 @@ export async function pwRoute({
 		// ============================================================
 		// Group 6: Resource Interception (Custom Fetch/Cache)
 		// ============================================================
-		if (useGot && interceptedResourceTypes.includes(resourceType)) {
-			// Check against the merged list (defaults + user input)
-			const shouldSkipGot = finalSkipPatterns.some((pattern) => url.includes(pattern));
+		if (useGot && 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);
+			} catch {}
 
 			if (!shouldSkipGot) {
 				const requestHeaders = request.headers();

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

@@ -90,11 +90,13 @@ async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl
 		mainUrl = url;
 	}
 
+	const viaProxy = proxyAgent ? " via Proxy" : "";
+
 	// Check if the response is cached
 	if (useCache) {
 		const cachedResponse = globalCache.get(mainUrl);
 		if (cachedResponse) {
-			if (logger === "info") console.log(`Serving from globalCache: ${mainUrl}`);
+			if (logger === "info") console.log(`Serving from globalCache${viaProxy}: ${mainUrl}`);
 			return cachedResponse;
 		}
 	}
@@ -121,9 +123,9 @@ async function fetchWithClient(useCache, url, requestHeaders, method, useFullUrl
 				headers: response.headers,
 				body: responseBody,
 			});
-			if (logger === "info") console.log(`Success (cached): ${mainUrl}`);
+			if (logger === "info") console.log(`Success (cached${viaProxy}): ${mainUrl}`);
 		} else {
-			if (logger === "info") console.log(`Success (not cached): ${mainUrl}`);
+			if (logger === "info") console.log(`Success (not cached${viaProxy}): ${mainUrl}`);
 		}
 
 		return {
@@ -180,7 +182,15 @@ export async function ppRoute({
 	// --- SETUP: Merge Defaults for skipGotPatterns ---
 	// Always skip custom fetch for Cloudflare challenges (let browser handle it)
 	const defaultSkipPatterns = [];
-	const finalSkipPatterns = [...defaultSkipPatterns, ...skipGotPatterns];
+	// 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;
+		})
+	);
 
 	// Initialize ad blocking AdBlockEngine if enabled and not already loaded
 	if (blockAds && !AdBlockEngine) {
@@ -332,9 +342,12 @@ export async function ppRoute({
 		// ============================================================
 		// Group 6: Resource Interception (Custom Fetch/Cache)
 		// ============================================================
-		if (useGot && interceptedResourceTypes.includes(resourceType)) {
-			// Check against the merged list (defaults + user input)
-			const shouldSkipGot = finalSkipPatterns.some((pattern) => url.includes(pattern));
+		if (useGot && 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);
+			} catch {}
 
 			if (!shouldSkipGot) {
 				const requestHeaders = request.headers();