arn-browser 0.1.30 → 0.1.32

package/bin/cli.js

@@ -2,10 +2,10 @@
 
 /**
  * @file CLI for arn-browser
- * @description Provides `npx arn-browser install` to download browser binaries.
+ * @description Provides `npx arn-browser install` to download Camoufox and scan OS browsers.
  *
  * Usage:
- *   npx arn-browser install     - Install all browser binaries (Brave, Camoufox, Chromium, Firefox)
+ *   npx arn-browser install     - Install Camoufox, clean stale folders, scan OS browsers
  *   npx arn-browser help        - Show help
  */
 
@@ -19,8 +19,12 @@ function showHelp() {
     npx arn-browser <command>
 
   Commands:
-    install     Download and install browser binaries (Brave, Camoufox, Chromium, Firefox)
+    install     Install Camoufox, clean up old browser folders, and scan for OS-installed browsers
     help        Show this help message
+
+  Note:
+    Chrome, Chromium, Firefox, and Brave are detected from your OS installation.
+    Only Camoufox needs to be downloaded via this installer.
 	`);
 }
 

package/bin/install.js

@@ -1,44 +1,24 @@
 /**
  * @file install.js
  * @description Cross-platform browser installer for arn-browser.
- * Downloads and extracts Brave, Camoufox, and optionally Chromium to ~/.cache/
+ * Downloads and extracts Camoufox to ~/.cache/camoufox
+ * Cleans up stale browser folders from previous versions.
+ * Scans for OS-installed browsers and reports status.
  *
  * Works on Linux, macOS, and Windows.
  */
 
-// ==========================================================================
-// INSTALL TOGGLES — set to false to skip a browser
-// ==========================================================================
-const INSTALL_BRAVE = true;
-const INSTALL_CAMOUFOX = true;
-const INSTALL_CHROMIUM = true;
-const INSTALL_FIREFOX = true;
-
 import fs from "fs";
 import path from "path";
 import os from "os";
 import { execSync } from "child_process";
 import { createWriteStream } from "fs";
 
+import { checkBrowserAvailability } from "../src/utility/playwright/findBrowserPath.js";
+
 // ==========================================================================
-// CONFIGURATION URLS
+// CONFIGURATION
 // ==========================================================================
-// OS identifiers used in our dictionaries
-// process.platform: 'win32', 'darwin', 'linux'
-// os.arch(): 'x64', 'arm64'
-
-const BRAVE_URLS = {
-	linux: {
-		x64: "https://github.com/brave/brave-browser/releases/download/v1.88.134/brave-browser-1.88.134-linux-amd64.zip",
-		arm64: "https://github.com/brave/brave-browser/releases/download/v1.88.134/brave-browser-1.88.134-linux-arm64.zip",
-	},
-	darwin: {
-		arm64: "https://github.com/brave/brave-browser/releases/download/v1.88.134/Brave-Browser-arm64.dmg",
-	},
-	win32: {
-		x64: "https://github.com/brave/brave-browser/releases/download/v1.88.134/brave-v1.88.134-win32-x64.zip",
-	}
-};
 
 const CAM_URLS = {
 	linux: {
@@ -53,42 +33,6 @@ const CAM_URLS = {
 	}
 };
 
-// Chromium x64 uses Chrome for Testing (CFT) URLs with browserVersion.
-// Chromium arm64 uses legacy revision-based URLs.
-// CDN: cdn.playwright.dev
-const CHROMIUM_REVISION = "1214";
-const CHROMIUM_BROWSER_VERSION = "146.0.7680.31";
-
-const CHROMIUM_URLS = {
-	linux: {
-		x64: `https://cdn.playwright.dev/builds/cft/${CHROMIUM_BROWSER_VERSION}/linux64/chrome-linux64.zip`,
-
-		arm64: `https://cdn.playwright.dev/dbazure/download/playwright/builds/chromium/${CHROMIUM_REVISION}/chromium-linux-arm64.zip`,
-	},
-	darwin: {
-		arm64: `https://cdn.playwright.dev/builds/cft/${CHROMIUM_BROWSER_VERSION}/mac-arm64/chrome-mac-arm64.zip`,
-	},
-	win32: {
-		x64: `https://cdn.playwright.dev/builds/cft/${CHROMIUM_BROWSER_VERSION}/win64/chrome-win64.zip`,
-	}
-};
-
-// Firefox uses revision-based URLs on the new CDN.
-const FIREFOX_REVISION = "1509";
-
-const FIREFOX_URLS = {
-	linux: {
-		x64: `https://cdn.playwright.dev/dbazure/download/playwright/builds/firefox/${FIREFOX_REVISION}/firefox-ubuntu-22.04.zip`,
-		arm64: `https://cdn.playwright.dev/dbazure/download/playwright/builds/firefox/${FIREFOX_REVISION}/firefox-ubuntu-22.04-arm64.zip`,
-	},
-	darwin: {
-		arm64: `https://cdn.playwright.dev/dbazure/download/playwright/builds/firefox/${FIREFOX_REVISION}/firefox-mac-arm64.zip`,
-	},
-	win32: {
-		x64: `https://cdn.playwright.dev/dbazure/download/playwright/builds/firefox/${FIREFOX_REVISION}/firefox-win64.zip`,
-	}
-};
-
 const CAM_VERSION = { version: "135.0.1", release: "beta.24" };
 
 // ==========================================================================
@@ -96,25 +40,26 @@ const CAM_VERSION = { version: "135.0.1", release: "beta.24" };
 // ==========================================================================
 
 const ARN_BROWSERS_DIR = path.join(os.homedir(), ".arn-browser", "browsers");
-const BRAVE_DIR = path.join(ARN_BROWSERS_DIR, "brave");
-const CHROMIUM_DIR = path.join(ARN_BROWSERS_DIR, "chromium");
-const FIREFOX_DIR = path.join(ARN_BROWSERS_DIR, "firefox");
 const CAM_DIR = path.join(os.homedir(), ".cache", "camoufox");
 const TEMP_DIR = path.join(os.tmpdir(), "arn-browser-install");
 
+// Stale folders from previous versions that downloaded browsers
+const STALE_BROWSER_DIRS = [
+	path.join(ARN_BROWSERS_DIR, "brave"),
+	path.join(ARN_BROWSERS_DIR, "chromium"),
+	path.join(ARN_BROWSERS_DIR, "firefox"),
+];
+
 // ==========================================================================
 // HELPERS
 // ==========================================================================
 
 function getArch() {
-	const arch = os.arch(); // "x64", "arm64", etc.
+	const arch = os.arch();
 	if (arch === "x64" || arch === "arm64") return arch;
 	throw new Error(`❌ Unsupported architecture: ${arch}`);
 }
 
-/**
- * Download a file with redirect following (GitHub releases use 302 redirects).
- */
 function formatBytes(bytes) {
 	if (!Number.isFinite(bytes) || bytes < 0) return "0 B";
 	const units = ["B", "KB", "MB", "GB", "TB"];
@@ -181,9 +126,6 @@ async function downloadFile(url, destPath, label) {
 	process.stdout.write("\n");
 }
 
-/**
- * Cross-platform unzip.
- */
 function unzipFile(zipPath, destDir) {
 	const isWindows = process.platform === "win32";
 
@@ -194,38 +136,12 @@ function unzipFile(zipPath, destDir) {
 	}
 }
 
-/**
- * If the extracted zip contains a single top-level directory,
- * move its contents up to destDir (flatten).
- */
-function flattenExtract(destDir) {
-	const entries = fs.readdirSync(destDir, { withFileTypes: true });
-	if (entries.length === 1 && entries[0].isDirectory()) {
-		const subDir = path.join(destDir, entries[0].name);
-		// Rename subfolder to a temp name to avoid name collisions
-		// (e.g. firefox/firefox where the dir and executable share a name)
-		const tmpDir = subDir + "__tmp";
-		fs.renameSync(subDir, tmpDir);
-		const subEntries = fs.readdirSync(tmpDir);
-		for (const item of subEntries) {
-			fs.renameSync(path.join(tmpDir, item), path.join(destDir, item));
-		}
-		fs.rmdirSync(tmpDir);
-	}
-}
-
-/**
- * Recursively delete a directory.
- */
 function rmDir(dirPath) {
 	if (fs.existsSync(dirPath)) {
 		fs.rmSync(dirPath, { recursive: true, force: true });
 	}
 }
 
-/**
- * Set executable permission (no-op on Windows).
- */
 function setExecutable(dirPath, filename) {
 	if (process.platform === "win32") return;
 
@@ -235,9 +151,6 @@ function setExecutable(dirPath, filename) {
 	}
 }
 
-/**
- * Recursively find files by name.
- */
 function findFiles(dir, name) {
 	const results = [];
 	if (!fs.existsSync(dir)) return results;
@@ -254,48 +167,15 @@ function findFiles(dir, name) {
 	return results;
 }
 
-/**
- * Helper to get the correct URL for the current platform and architecture.
- */
 function getDownloadUrl(urlMap, osName, arch) {
 	if (!urlMap[osName]) return null;
 	return urlMap[osName][arch] || null;
 }
 
-
 // ==========================================================================
-// BROWSER INSTALLERS
+// CAMOUFOX INSTALLER
 // ==========================================================================
 
-async function installBrave(osName, arch) {
-	const url = getDownloadUrl(BRAVE_URLS, osName, arch);
-	if (!url) {
-		console.log(`⚠️  Brave not available for ${osName} ${arch}`);
-		return;
-	}
-
-	// Clean previous install
-	rmDir(BRAVE_DIR);
-
-	const ext = url.endsWith(".dmg") ? ".dmg" : ".zip";
-	const dlPath = path.join(TEMP_DIR, `brave${ext}`);
-
-	console.log("⬇️  Downloading Brave...");
-	await downloadFile(url, dlPath, "Brave");
-
-	fs.mkdirSync(BRAVE_DIR, { recursive: true });
-
-	console.log(`📦 Extracting Brave to ${BRAVE_DIR}...`);
-	if (ext === ".zip") {
-		unzipFile(dlPath, BRAVE_DIR);
-		flattenExtract(BRAVE_DIR);
-	} else if (ext === ".dmg") {
-		console.log(`⚠️  Brave downloaded as DMG to ${dlPath}. Automatic extraction of DMG is not fully supported in this script. Recommend manual installation.`);
-	}
-
-	console.log("✅ Brave installed!");
-}
-
 async function installCamoufox(osName, arch) {
 	const url = getDownloadUrl(CAM_URLS, osName, arch);
 	if (!url) {
@@ -329,62 +209,53 @@ async function installCamoufox(osName, arch) {
 	console.log("✅ Camoufox installed!");
 }
 
-async function installChromium(osName, arch) {
-	const url = getDownloadUrl(CHROMIUM_URLS, osName, arch);
-	if (!url) {
-		console.log(`⚠️  Chromium not available for ${osName} ${arch}`);
-		return;
-	}
-
-	// Clean previous install
-	rmDir(CHROMIUM_DIR);
-
-	const ext = url.endsWith(".dmg") ? ".dmg" : ".zip";
-	const dlPath = path.join(TEMP_DIR, `chromium${ext}`);
-
-	console.log("⬇️  Downloading Chromium...");
-	await downloadFile(url, dlPath, "Chromium");
-
-	fs.mkdirSync(CHROMIUM_DIR, { recursive: true });
+// ==========================================================================
+// STALE FOLDER CLEANUP
+// ==========================================================================
 
-	console.log(`📦 Extracting Chromium to ${CHROMIUM_DIR}...`);
-	if (ext === ".zip") {
-		unzipFile(dlPath, CHROMIUM_DIR);
-		flattenExtract(CHROMIUM_DIR);
-	} else {
-		console.log(`⚠️  Chromium downloaded as DMG to ${dlPath}. Manual extraction required.`);
+function cleanupStaleBrowserFolders() {
+	let cleaned = false;
+	for (const dir of STALE_BROWSER_DIRS) {
+		if (fs.existsSync(dir)) {
+			console.log(`🗑️  Removing stale browser folder: ${dir}`);
+			rmDir(dir);
+			cleaned = true;
+		}
 	}
 
-	console.log("✅ Chromium installed!");
-}
-
-async function installFirefox(osName, arch) {
-	const url = getDownloadUrl(FIREFOX_URLS, osName, arch);
-	if (!url) {
-		console.log(`⚠️  Firefox not available for ${osName} ${arch}`);
-		return;
+	// Also clean up the parent browsers dir if it's now empty
+	if (fs.existsSync(ARN_BROWSERS_DIR)) {
+		try {
+			const remaining = fs.readdirSync(ARN_BROWSERS_DIR);
+			if (remaining.length === 0) {
+				fs.rmdirSync(ARN_BROWSERS_DIR);
+			}
+		} catch {
+			// Non-critical
+		}
 	}
 
-	// Clean previous install
-	rmDir(FIREFOX_DIR);
-
-	const ext = url.endsWith(".dmg") ? ".dmg" : ".zip";
-	const dlPath = path.join(TEMP_DIR, `firefox${ext}`);
+	if (!cleaned) {
+		console.log("   No stale browser folders found.");
+	}
+}
 
-	console.log("⬇️  Downloading Firefox...");
-	await downloadFile(url, dlPath, "Firefox");
+// ==========================================================================
+// OS BROWSER SCAN
+// ==========================================================================
 
-	fs.mkdirSync(FIREFOX_DIR, { recursive: true });
+function scanOsBrowsers() {
+	console.log("\n🔍 Scanning for OS-installed browsers...\n");
 
-	console.log(`📦 Extracting Firefox to ${FIREFOX_DIR}...`);
-	if (ext === ".zip") {
-		unzipFile(dlPath, FIREFOX_DIR);
-		flattenExtract(FIREFOX_DIR);
-	} else {
-		console.log(`⚠️  Firefox downloaded as DMG to ${dlPath}. Manual extraction required.`);
+	const browsers = ["chrome", "chromium", "firefox", "brave"];
+	for (const name of browsers) {
+		const result = checkBrowserAvailability(name);
+		if (result.found) {
+			console.log(`   ✅ ${name.padEnd(10)} → ${result.path}`);
+		} else {
+			console.log(`   ❌ ${name.padEnd(10)} → Not found`);
+		}
 	}
-
-	console.log("✅ Firefox installed!");
 }
 
 // ==========================================================================
@@ -398,23 +269,26 @@ export async function installBrowsers() {
 	console.log(`\n🚀 arn-browser: Installing browser binaries`);
 	console.log(`   Platform: ${osName} | Architecture: ${arch}\n`);
 
-	// Prepare temp directory
+	// 1. Clean up stale browser folders from previous versions
+	console.log("🧹 Cleaning up old downloaded browser folders...");
+	cleanupStaleBrowserFolders();
+
+	// 2. Prepare temp directory
 	fs.mkdirSync(TEMP_DIR, { recursive: true });
 
 	try {
-		if (INSTALL_BRAVE) await installBrave(osName, arch);
-		if (INSTALL_CAMOUFOX) await installCamoufox(osName, arch);
-		if (INSTALL_CHROMIUM) await installChromium(osName, arch);
-		if (INSTALL_FIREFOX) await installFirefox(osName, arch);
+		// 3. Install Camoufox
+		await installCamoufox(osName, arch);
 	} finally {
 		// Cleanup temp directory
 		rmDir(TEMP_DIR);
 	}
 
+	// 4. Scan for OS-installed browsers
+	scanOsBrowsers();
+
 	console.log(`\n🎉 Done!`);
-	console.log(`   Brave:    ${BRAVE_DIR}`);
 	console.log(`   Camoufox: ${CAM_DIR}`);
-	console.log(`   Chromium: ${CHROMIUM_DIR}`);
-	console.log(`   Firefox:  ${FIREFOX_DIR}`);
-	console.log(`   Version:  ${CAM_DIR}/version.json\n`);
+	console.log(`   Version:  ${CAM_DIR}/version.json`);
+	console.log(`\n   Other browsers (Chrome, Chromium, Firefox, Brave) use your OS installation.\n`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "arn-browser",
-	"version": "0.1.30",
+	"version": "0.1.32",
 	"description": "A lightweight, browser autmation helper.",
 	"main": "src/index.js",
 	"types": "src/index.d.ts",
@@ -16,6 +16,7 @@
 		"@ghostery/adblocker": "^2.13.0",
 		"arn-knexjs": "^0.0.3",
 		"camoufox-js": "^0.9.3",
+		"devtools-detector": "^2.0.25",
 		"dotenv": "^17.2.3",
 		"fingerprint-generator": "^2.1.78",
 		"fingerprint-injector": "^2.1.78",

package/src/utility/playwright/findBrowserPath.js

@@ -0,0 +1,211 @@
+/**
+ * @file findBrowserPath.js
+ * @description Cross-platform utility to find OS-installed browser executables.
+ * Supports: chrome, chromium, firefox, brave
+ * Works on: Linux (x64/arm64), macOS (arm64), Windows (x64)
+ */
+
+import { execSync } from "child_process";
+import fs from "fs";
+import path from "path";
+
+// ==========================================================================
+// KNOWN BINARY PATHS PER PLATFORM
+// ==========================================================================
+
+const BROWSER_PATHS = {
+	chrome: {
+		linux: [
+			"google-chrome-stable",
+			"google-chrome",
+			"/opt/google/chrome/google-chrome",
+			"/usr/bin/google-chrome-stable",
+			"/usr/bin/google-chrome",
+		],
+		darwin: [
+			"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+		],
+		win32: [
+			path.join(process.env.PROGRAMFILES || "C:\\Program Files", "Google", "Chrome", "Application", "chrome.exe"),
+			path.join(process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)", "Google", "Chrome", "Application", "chrome.exe"),
+			path.join(process.env.LOCALAPPDATA || "", "Google", "Chrome", "Application", "chrome.exe"),
+		],
+	},
+	chromium: {
+		linux: [
+			"chromium-browser",
+			"chromium",
+			"/usr/bin/chromium-browser",
+			"/usr/bin/chromium",
+			"/snap/bin/chromium",
+		],
+		darwin: [
+			"/Applications/Chromium.app/Contents/MacOS/Chromium",
+		],
+		win32: [
+			path.join(process.env.PROGRAMFILES || "C:\\Program Files", "Chromium", "Application", "chrome.exe"),
+			path.join(process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)", "Chromium", "Application", "chrome.exe"),
+			path.join(process.env.LOCALAPPDATA || "", "Chromium", "Application", "chrome.exe"),
+		],
+	},
+	firefox: {
+		linux: [
+			"firefox",
+			"/usr/bin/firefox",
+			"/snap/bin/firefox",
+			"/usr/lib/firefox/firefox",
+		],
+		darwin: [
+			"/Applications/Firefox.app/Contents/MacOS/firefox",
+		],
+		win32: [
+			path.join(process.env.PROGRAMFILES || "C:\\Program Files", "Mozilla Firefox", "firefox.exe"),
+			path.join(process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)", "Mozilla Firefox", "firefox.exe"),
+		],
+	},
+	brave: {
+		linux: [
+			"brave-browser",
+			"brave-browser-stable",
+			"/opt/brave.com/brave/brave-browser",
+			"/usr/bin/brave-browser",
+			"/usr/bin/brave-browser-stable",
+			"/snap/bin/brave",
+		],
+		darwin: [
+			"/Applications/Brave Browser.app/Contents/MacOS/Brave Browser",
+		],
+		win32: [
+			path.join(process.env.PROGRAMFILES || "C:\\Program Files", "BraveSoftware", "Brave-Browser", "Application", "brave.exe"),
+			path.join(process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)", "BraveSoftware", "Brave-Browser", "Application", "brave.exe"),
+			path.join(process.env.LOCALAPPDATA || "", "BraveSoftware", "Brave-Browser", "Application", "brave.exe"),
+		],
+	},
+};
+
+// Friendly display names for error messages
+const BROWSER_DISPLAY_NAMES = {
+	chrome: "Google Chrome",
+	chromium: "Chromium",
+	firefox: "Mozilla Firefox",
+	brave: "Brave Browser",
+};
+
+// Install hints per platform
+const INSTALL_HINTS = {
+	chrome: {
+		linux: "sudo apt install google-chrome-stable  OR  download from https://www.google.com/chrome/",
+		darwin: "Download from https://www.google.com/chrome/",
+		win32: "Download from https://www.google.com/chrome/",
+	},
+	chromium: {
+		linux: "sudo apt install chromium-browser  OR  sudo snap install chromium",
+		darwin: "brew install --cask chromium  OR  download from https://www.chromium.org/",
+		win32: "Download from https://www.chromium.org/getting-involved/download-chromium/",
+	},
+	firefox: {
+		linux: "sudo apt install firefox  OR  sudo snap install firefox",
+		darwin: "brew install --cask firefox  OR  download from https://www.mozilla.org/firefox/",
+		win32: "Download from https://www.mozilla.org/firefox/",
+	},
+	brave: {
+		linux: "See https://brave.com/linux/  OR  sudo apt install brave-browser",
+		darwin: "brew install --cask brave-browser  OR  download from https://brave.com/",
+		win32: "Download from https://brave.com/",
+	},
+};
+
+// ==========================================================================
+// DETECTION LOGIC
+// ==========================================================================
+
+/**
+ * Try to resolve a command name using `which` (Unix) or `where` (Windows).
+ * Returns the absolute path if found, null otherwise.
+ */
+function resolveFromPath(command) {
+	const isWindows = process.platform === "win32";
+	try {
+		const cmd = isWindows ? `where "${command}"` : `which "${command}"`;
+		const result = execSync(cmd, { stdio: ["pipe", "pipe", "pipe"], encoding: "utf-8" }).trim();
+		// `where` on Windows may return multiple lines — take the first
+		const firstLine = result.split("\n")[0].trim();
+		if (firstLine && fs.existsSync(firstLine)) {
+			return firstLine;
+		}
+	} catch {
+		// Command not found in PATH
+	}
+	return null;
+}
+
+/**
+ * Find the OS-installed executable path for a given browser.
+ *
+ * @param {string} browserName - One of: "chrome", "chromium", "firefox", "brave"
+ * @returns {string} Absolute path to the browser executable
+ * @throws {Error} If the browser is not found on the system
+ */
+export function findBrowserPath(browserName) {
+	const name = browserName.toLowerCase();
+	const candidates = BROWSER_PATHS[name];
+
+	if (!candidates) {
+		throw new Error(
+			`❌ [findBrowserPath] Unknown browser: "${browserName}"\n` +
+			`   Supported: chrome, chromium, firefox, brave`
+		);
+	}
+
+	const platform = process.platform; // 'linux', 'darwin', 'win32'
+	const paths = candidates[platform];
+
+	if (!paths || paths.length === 0) {
+		throw new Error(
+			`❌ [findBrowserPath] ${BROWSER_DISPLAY_NAMES[name]} is not supported on platform: ${platform}`
+		);
+	}
+
+	// Strategy 1: Try PATH lookup first (works for short names like "google-chrome", "firefox")
+	for (const candidate of paths) {
+		// If it's not an absolute path, try resolving from PATH
+		if (!path.isAbsolute(candidate)) {
+			const resolved = resolveFromPath(candidate);
+			if (resolved) return resolved;
+		}
+	}
+
+	// Strategy 2: Check known absolute paths
+	for (const candidate of paths) {
+		if (path.isAbsolute(candidate) && fs.existsSync(candidate)) {
+			return candidate;
+		}
+	}
+
+	// Not found — throw descriptive error
+	const displayName = BROWSER_DISPLAY_NAMES[name];
+	const hint = INSTALL_HINTS[name]?.[platform] || `Install ${displayName} from its official website.`;
+
+	throw new Error(
+		`❌ [findBrowserPath] ${displayName} not found on this system.\n` +
+		`   Platform: ${platform}\n` +
+		`   Searched: ${paths.filter(p => path.isAbsolute(p)).join(", ") || "(PATH lookup only)"}\n\n` +
+		`   To install:\n` +
+		`   ${hint}`
+	);
+}
+
+/**
+ * Check if a browser is available without throwing.
+ *
+ * @param {string} browserName - One of: "chrome", "chromium", "firefox", "brave"
+ * @returns {{ found: boolean, path: string|null, error: string|null }}
+ */
+export function checkBrowserAvailability(browserName) {
+	try {
+		const p = findBrowserPath(browserName);
+		return { found: true, path: p, error: null };
+	} catch (err) {
+		return { found: false, path: null, error: err.message };
+	}
+}