arn-browser 0.1.30 → 0.1.31

package/package.json

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

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

@@ -208,14 +208,7 @@ export async function startProxyServer({
 		proxy2: createHostMatcher([...PROXY_2_HOSTS, "proxy.multilogin.com", "multilogin.com"]),
 	};
 
-	// 2. Port
-	const selectedPort = await findAvailablePort(50001, 50010);
-	if (!selectedPort) {
-		console.error("░░ Critical Error: No available ports.");
-		return null;
-	}
-
-	// 3. Build URLs
+	// 2. Build URLs
 	const buildURL = (data) => {
 		if (!data) return null; // Returns null if no config
 		const { type = "http", host, port, user, pass } = data;
@@ -230,7 +223,7 @@ export async function startProxyServer({
 		p2: buildURL(PROXY_2_DATA),
 	};
 
-	// 4. Fetch Details (Simplified Logic)
+	// 3. Fetch Details (Simplified Logic)
 	// We pass the URL (or null). The function handles the "Local" logic.
 	const [defaultDetails, p1Details, p2Details] = await Promise.all([
 		fetchProxyDetails(upstreamProxies.default, ip2LocationKey, retryDelayMs),
@@ -243,7 +236,7 @@ export async function startProxyServer({
 	if (upstreamProxies.p1 && !p1Details) { console.warn("░░ Warning: PROXY_1 configured but unreachable."); return null; }
 	if (upstreamProxies.p2 && !p2Details) { console.warn("░░ Warning: PROXY_2 configured but unreachable."); return null; }
 
-	// 5. Stats
+	// 4. Stats
 	const stats = {
 		DEFAULT_PROXY: { request: 0, srcTx: 0, srcRx: 0, trgTx: 0, trgRx: 0 },
 		NO_PROXY: { request: 0, srcTx: 0, srcRx: 0, trgTx: 0, trgRx: 0 },
@@ -261,72 +254,105 @@ export async function startProxyServer({
 	const connectionMap = {}; // Maps connectionId -> { type: "..." }
 	let serverRunning = false;
 
-	// 6. Server
-	const server = new ProxyChain.Server({
-		port: selectedPort,
-		host: "127.0.0.1",
-		verbose: debug,
-		prepareRequestFunction: ({ hostname, connectionId }) => {
-			let proxyType = "DEFAULT_PROXY";
-			let upstreamUrl = upstreamProxies.default;
-			let isCustomResponse = false;
-			let customResponseData = null;
-
-			// Logic to determine Proxy Type
-			if (matchers.noProxy(hostname)) {
-				// A. Direct
-				proxyType = "NO_PROXY";
-				upstreamUrl = null;
-			} else if (matchers.proxy1(hostname) && upstreamProxies.p1) {
-				// C1. Proxy 1
-				proxyType = "PROXY_1";
-				upstreamUrl = upstreamProxies.p1;
-			} else if (matchers.proxy2(hostname) && upstreamProxies.p2) {
-				// C2. Proxy 2
-				proxyType = "PROXY_2";
-				upstreamUrl = upstreamProxies.p2;
-			}
+	// 5. Create server and bind with retry (handles race conditions between concurrent processes)
+	const PORT_RANGE_START = 50001;
+	const PORT_RANGE_END = 50200;
+	const MAX_BIND_RETRIES = 10;
 
-			// B. IP Check Interception (Overrules standard routing for specific domain)
-			if (hostname === "ip.bablosoft.com") {
-				isCustomResponse = true;
-				// Inherit the proxyType determined above to fetch the correct IP details
-				// (e.g. if it matched PROXY_1 matchers, we show PROXY_1 IP)
-				let displayedIP;
-				if (proxyType === "PROXY_1") displayedIP = p1Details?.ip;
-				else if (proxyType === "PROXY_2") displayedIP = p2Details?.ip;
-				else if (proxyType === "NO_PROXY") displayedIP = "127.0.0.1";
-				else displayedIP = defaultDetails?.ip;
-
-				customResponseData = {
-					statusCode: 200,
-					headers: { "Content-Type": "text/plain", Connection: "close" },
-					body: displayedIP || "Unknown IP",
-				};
-			}
+	let selectedPort = null;
+	let server = null;
+
+	for (let attempt = 1; attempt <= MAX_BIND_RETRIES; attempt++) {
+		const candidatePort = await findAvailablePort(PORT_RANGE_START, PORT_RANGE_END);
+		if (!candidatePort) {
+			console.error("░░ Critical Error: No available ports in range " + PORT_RANGE_START + "-" + PORT_RANGE_END);
+			return null;
+		}
 
-			// Record Stats
-			connectionMap[connectionId] = { type: proxyType, hostname: hostname };
-			if (host_stats && hostname) {
-				// Ensure the type exists in map (it should, but safety first)
-				if (!hostStatsMap[proxyType]) hostStatsMap[proxyType] = {};
-				if (!hostStatsMap[proxyType][hostname]) {
-					hostStatsMap[proxyType][hostname] = { req: 0, srcTx: 0, srcRx: 0, trgTx: 0, trgRx: 0 };
+		server = new ProxyChain.Server({
+			port: candidatePort,
+			host: "127.0.0.1",
+			verbose: debug,
+			prepareRequestFunction: ({ hostname, connectionId }) => {
+				let proxyType = "DEFAULT_PROXY";
+				let upstreamUrl = upstreamProxies.default;
+				let isCustomResponse = false;
+				let customResponseData = null;
+
+				// Logic to determine Proxy Type
+				if (matchers.noProxy(hostname)) {
+					// A. Direct
+					proxyType = "NO_PROXY";
+					upstreamUrl = null;
+				} else if (matchers.proxy1(hostname) && upstreamProxies.p1) {
+					// C1. Proxy 1
+					proxyType = "PROXY_1";
+					upstreamUrl = upstreamProxies.p1;
+				} else if (matchers.proxy2(hostname) && upstreamProxies.p2) {
+					// C2. Proxy 2
+					proxyType = "PROXY_2";
+					upstreamUrl = upstreamProxies.p2;
+				}
+
+				// B. IP Check Interception (Overrules standard routing for specific domain)
+				if (hostname === "ip.bablosoft.com") {
+					isCustomResponse = true;
+					let displayedIP;
+					if (proxyType === "PROXY_1") displayedIP = p1Details?.ip;
+					else if (proxyType === "PROXY_2") displayedIP = p2Details?.ip;
+					else if (proxyType === "NO_PROXY") displayedIP = "127.0.0.1";
+					else displayedIP = defaultDetails?.ip;
+
+					customResponseData = {
+						statusCode: 200,
+						headers: { "Content-Type": "text/plain", Connection: "close" },
+						body: displayedIP || "Unknown IP",
+					};
 				}
-				hostStatsMap[proxyType][hostname].req++;
-			}
 
-			// Return Decision
-			if (isCustomResponse) {
-				return { customResponseFunction: () => customResponseData };
+				// Record Stats
+				connectionMap[connectionId] = { type: proxyType, hostname: hostname };
+				if (host_stats && hostname) {
+					if (!hostStatsMap[proxyType]) hostStatsMap[proxyType] = {};
+					if (!hostStatsMap[proxyType][hostname]) {
+						hostStatsMap[proxyType][hostname] = { req: 0, srcTx: 0, srcRx: 0, trgTx: 0, trgRx: 0 };
+					}
+					hostStatsMap[proxyType][hostname].req++;
+				}
+
+				// Return Decision
+				if (isCustomResponse) {
+					return { customResponseFunction: () => customResponseData };
+				}
+
+				return {
+					upstreamProxyUrl: upstreamUrl,
+					requestAuthentication: false,
+				};
+			},
+		});
+
+		try {
+			await server.listen();
+			selectedPort = candidatePort;
+			serverRunning = true;
+			console.log(`░░ Local Proxy Started: http://127.0.0.1:${selectedPort}`);
+			break; // Successfully bound — exit retry loop
+		} catch (err) {
+			if (err.code === "EADDRINUSE" && attempt < MAX_BIND_RETRIES) {
+				console.warn(`░░ Port ${candidatePort} taken (race), retrying... (${attempt}/${MAX_BIND_RETRIES})`);
+				await sleep(50 + Math.random() * 100); // Small random delay to de-sync concurrent processes
+				continue;
 			}
+			console.error("░░ Failed to start proxy server:", err);
+			return null;
+		}
+	}
 
-			return {
-				upstreamProxyUrl: upstreamUrl,
-				requestAuthentication: false, // Auto-handle upstream auth via URL
-			};
-		},
-	});
+	if (!selectedPort || !server) {
+		console.error("░░ Critical Error: Could not bind to any port after " + MAX_BIND_RETRIES + " attempts.");
+		return null;
+	}
 
 	server.on("connectionClosed", ({ connectionId, stats: connStats }) => {
 		const connectionInfo = connectionMap[connectionId];
@@ -355,15 +381,6 @@ export async function startProxyServer({
 		delete connectionMap[connectionId];
 	});
 
-	try {
-		await server.listen();
-		serverRunning = true;
-		console.log(`░░ Local Proxy Started: http://127.0.0.1:${selectedPort}`);
-	} catch (err) {
-		console.error("░░ Failed to start proxy server:", err);
-		return null;
-	}
-
 	const formatBytes = (bytes) => {
 		if (bytes < 1024) return bytes + " B";
 		if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(2) + " KB";

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

@@ -142,6 +142,9 @@ function sanitizeResponseHeaders(headers, logger, url) {
 		}
 	}
 
+	// Always ensure CORS header is present, even if server never sent it
+	cleaned["access-control-allow-origin"] = "*";
+
 	if (logger && stripped.length) console.log(`[stripGot] Response stripped ${stripped.length} headers: [${stripped.join(", ")}] → ${url}`);
 	return cleaned;
 }