arn-browser 0.1.3 → 0.1.4

package/package.json

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

package/src/utility/proxy-utility/proxy-chain.d.ts

@@ -114,7 +114,7 @@ export interface ProxyServerController {
 	getProxyStats: () => Record<string, TrafficStats>;
 
 	/** Returns formatted statistics for hostnames per proxy channel */
-	getHostStats: () => Record<string, Record<string, number>>;
+	getHostStats: () => Record<string, Record<string, TrafficStats>>;
 }
 
 /**

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

@@ -182,7 +182,7 @@ export async function startProxyServer({
 }) {
 	// 1. Matchers
 	const matchers = {
-		noProxy: createHostMatcher([...NO_PROXY_HOSTS, "brave.com", "gvt1.com"]),
+		noProxy: createHostMatcher([...NO_PROXY_HOSTS, "%brave.com%", "%gvt1.com%"]),
 		proxy1: createHostMatcher([...PROXY_1_HOSTS, "proxy.multilogin.com", "multilogin.com"]),
 		proxy2: createHostMatcher([...PROXY_2_HOSTS, "proxy.multilogin.com", "multilogin.com"]),
 	};
@@ -284,11 +284,14 @@ export async function startProxyServer({
 			}
 
 			// Record Stats
-			connectionMap[connectionId] = { type: proxyType };
+			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] = {};
-				hostStatsMap[proxyType][hostname] = (hostStatsMap[proxyType][hostname] || 0) + 1;
+				if (!hostStatsMap[proxyType][hostname]) {
+					hostStatsMap[proxyType][hostname] = { req: 0, Tx: 0, Rx: 0 };
+				}
+				hostStatsMap[proxyType][hostname].req++;
 			}
 
 			// Return Decision
@@ -305,13 +308,18 @@ export async function startProxyServer({
 
 	server.on("connectionClosed", ({ connectionId, stats: connStats }) => {
 		const connectionInfo = connectionMap[connectionId];
-		if (connectionInfo && proxy_stats) {
-			const { type } = connectionInfo;
-			if (stats[type]) {
+		if (connectionInfo) {
+			const { type, hostname } = connectionInfo;
+			if (proxy_stats && stats[type]) {
 				stats[type].request++;
 				stats[type].Tx += connStats.srcTxBytes;
 				stats[type].Rx += connStats.srcRxBytes;
 			}
+			// Update host stats with Tx/Rx on connection close
+			if (host_stats && hostname && hostStatsMap[type] && hostStatsMap[type][hostname]) {
+				hostStatsMap[type][hostname].Tx += connStats.srcTxBytes;
+				hostStatsMap[type][hostname].Rx += connStats.srcRxBytes;
+			}
 		}
 		delete connectionMap[connectionId];
 	});
@@ -344,9 +352,13 @@ export async function startProxyServer({
 		// Iterate over each proxy category
 		for (const [type, hosts] of Object.entries(hostStatsMap)) {
 			const sortedHosts = Object.entries(hosts)
-				.sort((a, b) => b[1] - a[1]) // Sort by count descending
-				.reduce((acc, [host, count]) => {
-					acc[host] = count;
+				.sort((a, b) => b[1].req - a[1].req) // Sort by request count descending
+				.reduce((acc, [host, hostData]) => {
+					acc[host] = {
+						req: hostData.req,
+						Tx: formatBytes(hostData.Tx) + " MB",
+						Rx: formatBytes(hostData.Rx) + " MB",
+					};
 					return acc;
 				}, {});