arn-browser 0.1.5 → 0.1.7

package/src/utility/{launchBrowser.js → playwright/pwLaunch.js}

@@ -17,11 +17,11 @@ import { newInjectedContext, FingerprintInjector } from "fingerprint-injector";
 import { FingerprintGenerator } from "fingerprint-generator";
 
 // Internal Utilities
-import { getMultiloginToken } from "./multilogin_token_manager.js";
-import { deleteDirectoryWithRetries } from "./deleteDirectory.js";
+import { getMultiloginToken } from "../mlx_token.js";
+import { deleteDirectoryWithRetries } from "../deleteDirectory.js";
 
 // Human Cursor - for human-like mouse movements
-import { createCursor } from "../human-cursor/index.js";
+import { createCursor } from "./human-cursor/index.js";
 
 // Camoufox Special
 import { launchOptions } from "camoufox-js";
@@ -40,8 +40,17 @@ const detectedOs = osMap[process.platform] || "windows";
 const MULTILOGIN_LAUNCHER_URL = "https://launcher.mlx.yt:45001";
 const MULTILOGIN_FOLDER_ID = "bad9e7e1-cfab-4c8d-bd19-91aa82929711";
 
-const BASE_PROFILE_DIR = path.join(os.homedir(), ".arn-browser", "browser_profiles");
-if (!fs.existsSync(BASE_PROFILE_DIR)) fs.mkdirSync(BASE_PROFILE_DIR, { recursive: true });
+const ARN_BROWSER_DIR = path.join(os.homedir(), ".arn-browser");
+const BASE_PROFILE_DIR = path.join(ARN_BROWSER_DIR, "profiles", "pw");
+const PERSISTENT_DIR = path.join(BASE_PROFILE_DIR, "persistent");
+const TEMP_DIR = path.join(BASE_PROFILE_DIR, "temp");
+
+if (!fs.existsSync(PERSISTENT_DIR)) fs.mkdirSync(PERSISTENT_DIR, { recursive: true });
+if (!fs.existsSync(TEMP_DIR)) fs.mkdirSync(TEMP_DIR, { recursive: true });
+
+// Module-level log flags (set per-launch via launchBrowser options)
+let _launchLogs = false;
+let _cleanupLogs = false;
 
 // ==========================================================================
 // 2. HELPER FUNCTIONS
@@ -62,42 +71,34 @@ function resolveProfilePath(nameOrPath, browserName) {
 	else if (prefix.includes("camoufox")) prefix = "camoufox";
 
 	const folderName = `${prefix}_${nameOrPath}`;
-	return path.join(BASE_PROFILE_DIR, folderName);
+	return path.join(PERSISTENT_DIR, folderName);
 }
 
 /**
  * Locates binaries for manual browsers (Brave).
+ * Uses ~/.arn-browser/browsers/{browser}/{executable}
  */
 function getBinaryPath(browserName) {
 	const isWindows = process.platform === "win32";
-	const homeDir = os.homedir();
+	const browsersDir = path.join(ARN_BROWSER_DIR, "browsers");
 
-	let binaryPath = "";
+	const binaryMap = {
+		brave: isWindows
+			? path.join(browsersDir, "brave", "brave.exe")
+			: path.join(browsersDir, "brave", "brave"),
+	};
 
-	if (browserName === "brave") {
-		if (isWindows) {
-			// Windows: Standard custom install path in Downloads
-			binaryPath = path.join(homeDir, "Downloads", "brave", "brave.exe");
-		} else {
-			// Linux: Primary check in .cache (common for script installs)
-			const cachePath = path.join(homeDir, ".cache", "brave", "brave");
-			const downloadsPath = path.join(homeDir, "Downloads", "brave", "brave");
-
-			if (fs.existsSync(cachePath)) {
-				binaryPath = cachePath;
-			} else if (fs.existsSync(downloadsPath)) {
-				binaryPath = downloadsPath;
-			} else {
-				// Default to cache path for the error message if neither is found
-				binaryPath = cachePath;
-			}
-		}
+	const binaryPath = binaryMap[browserName];
+	if (!binaryPath) {
+		throw new Error(
+			`░░░░░ [LaunchBrowser] Unknown browser for getBinaryPath: ${browserName}`
+		);
 	}
 
-	if (!binaryPath || !fs.existsSync(binaryPath)) {
+	if (!fs.existsSync(binaryPath)) {
 		throw new Error(
-			`░░ [LaunchBrowser] Binary not found for ${browserName} at: ${binaryPath}\n` +
-			`   Linux checked: ~/.cache/brave/brave AND ~/Downloads/brave/brave`
+			`░░░░░ [LaunchBrowser] ${browserName} binary not found at: ${binaryPath}\n` +
+			`   Run "node bin/cli.js install" to install browsers.`
 		);
 	}
 
@@ -105,60 +106,125 @@ function getBinaryPath(browserName) {
 }
 
 /**
- * Write or update _profile_meta.json inside a profile directory.
- * Tracks creation time, last use, and auto-deletion schedule.
+ * Gets the executable path for Playwright-managed browsers (Chromium, Firefox).
+ * Uses ~/.arn-browser/browsers/{browser}/{executable}
  */
-function writeProfileMeta(profileDir, deleteAfterMinutes) {
-	fs.mkdirSync(profileDir, { recursive: true });
-	const metaPath = path.join(profileDir, "_profile_meta.json");
+function getPlaywrightExePath(browserName) {
+	const isWindows = process.platform === "win32";
+	const browsersDir = path.join(ARN_BROWSER_DIR, "browsers");
+
+	const binaryMap = {
+		chromium: isWindows
+			? path.join(browsersDir, "chromium", "chrome.exe")
+			: path.join(browsersDir, "chromium", "chrome"),
+		firefox: isWindows
+			? path.join(browsersDir, "firefox", "firefox.exe")
+			: path.join(browsersDir, "firefox", "firefox"),
+	};
 
-	let meta = {};
-	if (fs.existsSync(metaPath)) {
-		try { meta = JSON.parse(fs.readFileSync(metaPath, "utf-8")); } catch (e) { meta = {}; }
-	} else {
-		meta.created_at = new Date().toISOString();
+	const binaryPath = binaryMap[browserName];
+	if (!binaryPath) {
+		throw new Error(
+			`░░░░░ [LaunchBrowser] Unknown browser: ${browserName}`
+		);
+	}
+
+	if (!fs.existsSync(binaryPath)) {
+		throw new Error(
+			`░░░░░ [LaunchBrowser] ${browserName} binary not found at: ${binaryPath}\n` +
+			`   Run "node bin/cli.js install" to install browsers.`
+		);
 	}
 
-	meta.last_used_at = new Date().toISOString();
-	meta.delete_after_minutes = deleteAfterMinutes || null;
-	fs.writeFileSync(metaPath, JSON.stringify(meta, null, 2), "utf-8");
+	return binaryPath;
 }
 
+const PROFILE_META_FILE = "_profile_meta.json";
+
 /**
- * Scan all profiles in BASE_PROFILE_DIR and delete expired ones
- * based on their _profile_meta.json metadata.
+ * Writes or updates the profile metadata file in a profile directory.
+ * On first creation: sets all fields.
+ * On subsequent launches: only updates `last_launched_at`.
  */
-function cleanUpProfiles(cleanup_logs = false) {
-	if (!fs.existsSync(BASE_PROFILE_DIR)) return;
-
-	const now = Date.now();
+function writeProfileMeta(dirPath, type, cleanupMinutes) {
 	try {
-		const entries = fs.readdirSync(BASE_PROFILE_DIR);
-		for (const entry of entries) {
-			const profileDir = path.join(BASE_PROFILE_DIR, entry);
-			try {
-				if (!fs.statSync(profileDir).isDirectory()) continue;
-
-				const metaPath = path.join(profileDir, "_profile_meta.json");
-				if (!fs.existsSync(metaPath)) continue; // No metadata = skip
-
-				const meta = JSON.parse(fs.readFileSync(metaPath, "utf-8"));
-				if (!meta.delete_after_minutes || meta.delete_after_minutes <= 0) continue;
+		const metaPath = path.join(dirPath, PROFILE_META_FILE);
+		const now = new Date().toISOString();
+
+		if (fs.existsSync(metaPath)) {
+			// Update last_launched_at only
+			const existing = JSON.parse(fs.readFileSync(metaPath, "utf-8"));
+			existing.last_launched_at = now;
+			fs.writeFileSync(metaPath, JSON.stringify(existing, null, 2), "utf-8");
+		} else {
+			// Create new meta
+			const meta = {
+				type,
+				created_at: now,
+				last_launched_at: now,
+				cleanup_minutes: cleanupMinutes,
+			};
+			fs.writeFileSync(metaPath, JSON.stringify(meta, null, 2), "utf-8");
+		}
+	} catch (e) {
+		// Non-critical — don't break the launch
+	}
+}
 
-				const lastUsed = new Date(meta.last_used_at).getTime();
-				const expiresAt = lastUsed + meta.delete_after_minutes * 60 * 1000;
+/**
+ * Scans both persistent and temp profile directories.
+ * Deletes profiles whose `_profile_meta.json` indicates they are expired.
+ * Skips the profile currently being launched (skipPath).
+ */
+function cleanUpProfiles(skipPath) {
+	const now = Date.now();
 
-				if (now > expiresAt) {
-					if (cleanup_logs) console.log(`░░ [Cleanup] Deleting expired profile: ${entry}`);
-					deleteDirectoryWithRetries(profileDir);
+	function scanDir(dir) {
+		if (!fs.existsSync(dir)) return;
+		try {
+			const folders = fs.readdirSync(dir);
+			for (const folder of folders) {
+				const folderPath = path.join(dir, folder);
+				try {
+					const stats = fs.statSync(folderPath);
+					if (!stats.isDirectory()) continue;
+
+					// Skip the profile being launched right now
+					if (skipPath && path.resolve(folderPath) === path.resolve(skipPath)) continue;
+
+					const metaPath = path.join(folderPath, PROFILE_META_FILE);
+					if (!fs.existsSync(metaPath)) {
+						// Legacy temp profile without meta — use mtime, default 15 min
+						if (dir === TEMP_DIR && now - stats.mtimeMs > 15 * 60 * 1000) {
+							if (_cleanupLogs) console.log(`░░░░░ [Cleanup] Deleting legacy temp profile: ${folder}`);
+							deleteDirectoryWithRetries(folderPath);
+						}
+						continue;
+					}
+
+					const meta = JSON.parse(fs.readFileSync(metaPath, "utf-8"));
+					const cleanupMs = meta.cleanup_minutes;
+
+					// Skip if cleanup is disabled (null or 0)
+					if (!cleanupMs || cleanupMs <= 0) continue;
+
+					const lastLaunch = new Date(meta.last_launched_at).getTime();
+					if (now - lastLaunch > cleanupMs * 60 * 1000) {
+						if (_cleanupLogs) console.log(`░░░░░ [Cleanup] Deleting expired ${meta.type} profile: ${folder} (last launched ${Math.round((now - lastLaunch) / 60000)} mins ago)`);
+						deleteDirectoryWithRetries(folderPath);
+					}
+				} catch (e) {
+					// Ignore per-folder errors (locks, permission, corrupted meta)
 				}
-			} catch (e) {
-				// Ignore errors for individual profiles
 			}
+		} catch (err) {
+			console.error("Cleanup scan error:", err);
 		}
-	} catch (err) {
-		console.error("Cleanup Error:", err);
 	}
+
+	if (_cleanupLogs) console.log("░░░░░ [Cleanup] Scanning for expired profiles...");
+	scanDir(PERSISTENT_DIR);
+	scanDir(TEMP_DIR);
 }
 
 /**
@@ -198,7 +264,7 @@ function getFingerprintConfig(browserType, screenOptions = null) {
 // 3. MAIN LAUNCHER ENTRY POINT
 // ==========================================================================
 
-export async function launchBrowser({
+export async function pwLaunch({
 	// Common
 	timezoneId = null,
 	proxy,
@@ -230,21 +296,23 @@ export async function launchBrowser({
 	try {
 		if (custom_profile_path) throw new Error("Please use profile_path");
 
-		// ====== Centralized Path Resolution ======
-		const isNamed = !!profile_path;
-		const resolvedPath = resolveProfilePath(profile_path, which_browser);
-		const activePath = resolvedPath || path.join(BASE_PROFILE_DIR, crypto.randomUUID());
+		// Set module-level log flags
+		_launchLogs = launch_logs;
+		_cleanupLogs = cleanup_logs;
 
-		// Write/update metadata for all profiles
-		// For unnamed profiles: use provided cleanupMinutes, or default to 15 min
-		// (safety net — if process crashes before closeBrowser, cleanup catches it)
-		writeProfileMeta(activePath, isNamed ? cleanupMinutes : (cleanupMinutes || 15));
+		// Resolve path using the browser type to ensure prefixes
+		const fullPath = resolveProfilePath(profile_path, which_browser);
 
-		// Run cleanup (scans all profiles, deletes expired ones)
-		cleanUpProfiles(cleanup_logs);
+		// Calculate effective cleanup minutes:
+		// Persistent: user value if > 0, otherwise null (never clean)
+		// Temp: user value if > 0, otherwise 15 min default
+		const isPersistent = !!profile_path;
+		const effectiveCleanupMinutes = cleanupMinutes > 0
+			? cleanupMinutes
+			: (isPersistent ? null : 15);
 
-		// Only delete on close for unnamed (throwaway) profiles
-		const dirToDelete = isNamed ? null : activePath;
+		// Run cleanup scan — skips the profile being launched
+		cleanUpProfiles(fullPath);
 
 		let browserInstance;
 
@@ -259,53 +327,45 @@ export async function launchBrowser({
 			case "chromium":
 			case "chrome":
 				browserInstance = await chromiumLauncher({
-					activePath,
-					isPersistent: isNamed,
-					dirToDelete,
-					launch_logs,
+					profilePath: fullPath,
 					proxy,
 					timezoneId,
 					CapSolver,
 					humanize_options: effectiveHumanizeOptions,
 					spoof_fingerprint,
+					cleanupMinutes: effectiveCleanupMinutes,
 				});
 				break;
 			case "firefox":
 				browserInstance = await firefoxLauncher({
-					activePath,
-					isPersistent: isNamed,
-					dirToDelete,
-					launch_logs,
+					profilePath: fullPath,
 					proxy,
 					timezoneId,
 					humanize_options: effectiveHumanizeOptions,
 					spoof_fingerprint,
+					cleanupMinutes: effectiveCleanupMinutes,
 				});
 				break;
 			case "brave":
 			case "braveLauncher":
 				browserInstance = await braveLauncher({
-					activePath,
-					isPersistent: isNamed,
-					dirToDelete,
-					launch_logs,
+					profilePath: fullPath,
 					proxy,
 					timezoneId,
 					CapSolver,
 					humanize_options: effectiveHumanizeOptions,
 					spoof_fingerprint,
+					cleanupMinutes: effectiveCleanupMinutes,
 				});
 				break;
 			case "camoufox":
 				// Camoufox already has its own humanize in camoufox_options
 				browserInstance = await camoufoxLauncher({
-					activePath,
-					isPersistent: isNamed,
-					dirToDelete,
-					launch_logs,
+					profilePath: fullPath,
 					proxy,
 					timezoneId,
 					camoufox_options,
+					cleanupMinutes: effectiveCleanupMinutes,
 					// Spoof Fingerprint not needed for Camoufox
 				});
 				break;
@@ -314,7 +374,6 @@ export async function launchBrowser({
 					proxy,
 					multilogin_options,
 					humanize_options: effectiveHumanizeOptions,
-					launch_logs,
 					// Spoof Fingerprint not needed for Multilogin
 				});
 				break;
@@ -324,7 +383,7 @@ export async function launchBrowser({
 
 		return browserInstance;
 	} catch (error) {
-		console.error("░░ [LaunchBrowser] Critical Error:", error.message || error);
+		console.error("░░░░░ [LaunchBrowser] Critical Error:", error.message || error);
 		return { browser: null, context: null, page: null, isBrowserRunning: () => false, closeBrowser: async () => false, launchError: error };
 	}
 }
@@ -332,9 +391,14 @@ export async function launchBrowser({
 // ==========================================================================
 // 4. ENGINE: CHROMIUM
 // ==========================================================================
-async function chromiumLauncher({ activePath, isPersistent, dirToDelete, launch_logs, proxy, timezoneId, CapSolver, humanize_options, spoof_fingerprint }) {
+async function chromiumLauncher({ profilePath, proxy, timezoneId, CapSolver, humanize_options, spoof_fingerprint, cleanupMinutes }) {
+	const isPersistent = !!profilePath;
 
-	if (launch_logs) console.log(`░░ Starting Chromium [${isPersistent ? "Persistent" : "Temp"}]: ${activePath}`);
+	// 1. Determine Path (Temp needs it for fingerprint storage, Persistent needs it for data)
+	const activePath = isPersistent ? profilePath : path.join(TEMP_DIR, crypto.randomUUID());
+	if (!fs.existsSync(activePath)) fs.mkdirSync(activePath, { recursive: true });
+	writeProfileMeta(activePath, isPersistent ? "persistent" : "temp", cleanupMinutes);
+	if (_launchLogs) console.log(`░░░░░ Starting Chromium [${isPersistent ? "Persistent" : "Temp"}]: ${activePath}`);
 
 	// 2. Define Args
 	const args = [
@@ -370,7 +434,7 @@ async function chromiumLauncher({ activePath, isPersistent, dirToDelete, launch_
 	const ignoreDefaultArgs = ["--enable-automation"];
 
 	if (CapSolver) {
-		const extPath = path.resolve(`./utility/browser-fingerprint/CapSolver`);
+		const extPath = path.resolve(`./src/utility/browser-fingerprint/CapSolver`);
 		args.push(`--disable-extensions-except=${extPath}`, `--load-extension=${extPath}`);
 	}
 
@@ -391,6 +455,7 @@ async function chromiumLauncher({ activePath, isPersistent, dirToDelete, launch_
 			// Launch standard browser (not persistent context)
 			const browser = await chromium.launch({
 				headless: false,
+				executablePath: getPlaywrightExePath("chromium"),
 				proxy: proxyObj,
 				args: args,
 				ignoreDefaultArgs: ignoreDefaultArgs,
@@ -414,8 +479,8 @@ async function chromiumLauncher({ activePath, isPersistent, dirToDelete, launch_
 
 			const page = context.pages()[0] || (await context.newPage());
 
-			// Pass dirToDelete so the temp folder gets deleted on close
-			return createBrowserController(browser, context, page, dirToDelete, humanize_options, launch_logs);
+			// Pass 'activePath' so the temp folder (containing fingerprint.json) gets deleted on close
+			return createBrowserController(browser, context, page, activePath, humanize_options);
 		} catch (err) {
 			console.error("Chromium Temp Launch Error:", err);
 			throw err;
@@ -432,6 +497,7 @@ async function chromiumLauncher({ activePath, isPersistent, dirToDelete, launch_
 			// Logic: Native Persistent Launch. No fingerprint-injector.
 			const context = await chromium.launchPersistentContext(activePath, {
 				headless: false,
+				executablePath: getPlaywrightExePath("chromium"),
 				proxy: proxyObj,
 				args: args,
 				timezoneId: tz,
@@ -444,7 +510,7 @@ async function chromiumLauncher({ activePath, isPersistent, dirToDelete, launch_
 
 			const page = context.pages()[0];
 
-			return createBrowserController(context, context, page, dirToDelete, humanize_options, launch_logs);
+			return createBrowserController(context, context, page, null, humanize_options);
 		} catch (err) {
 			console.error("Chromium Persistent Launch Error:", err);
 			throw err;
@@ -455,9 +521,14 @@ async function chromiumLauncher({ activePath, isPersistent, dirToDelete, launch_
 // ==========================================================================
 // 5. ENGINE: FIREFOX
 // ==========================================================================
-async function firefoxLauncher({ activePath, isPersistent, dirToDelete, launch_logs, proxy, timezoneId, humanize_options, spoof_fingerprint }) {
+async function firefoxLauncher({ profilePath, proxy, timezoneId, humanize_options, spoof_fingerprint, cleanupMinutes }) {
+	const isPersistent = !!profilePath;
 
-	if (launch_logs) console.log(`░░ Starting Firefox [${isPersistent ? "Persistent" : "Temp"}]: ${activePath}`);
+	// 1. Determine Path
+	const activePath = isPersistent ? profilePath : path.join(TEMP_DIR, crypto.randomUUID());
+	if (!fs.existsSync(activePath)) fs.mkdirSync(activePath, { recursive: true });
+	writeProfileMeta(activePath, isPersistent ? "persistent" : "temp", cleanupMinutes);
+	if (_launchLogs) console.log(`░░░░░ Starting Firefox [${isPersistent ? "Persistent" : "Temp"}]: ${activePath}`);
 
 	const proxyObj = formatProxy(proxy);
 	const tz = timezoneId || undefined;
@@ -482,6 +553,7 @@ async function firefoxLauncher({ activePath, isPersistent, dirToDelete, launch_l
 
 			const browser = await firefox.launch({
 				headless: false,
+				executablePath: getPlaywrightExePath("firefox"),
 				proxy: proxyObj,
 				ignoreDefaultArgs: ["--enable-automation"],
 				firefoxUserPrefs: firefoxUserPrefs,
@@ -506,8 +578,8 @@ async function firefoxLauncher({ activePath, isPersistent, dirToDelete, launch_l
 
 			const page = context.pages()[0] || (await context.newPage());
 
-			// Pass dirToDelete so the temp folder gets deleted on close
-			return createBrowserController(browser, context, page, dirToDelete, humanize_options, launch_logs);
+			// Pass 'activePath' to delete temp folder later
+			return createBrowserController(browser, context, page, activePath, humanize_options);
 		} catch (err) {
 			console.error("Firefox Temp Launch Error:", err);
 			throw err;
@@ -523,6 +595,7 @@ async function firefoxLauncher({ activePath, isPersistent, dirToDelete, launch_l
 
 			const context = await firefox.launchPersistentContext(activePath, {
 				headless: false,
+				executablePath: getPlaywrightExePath("firefox"),
 				proxy: proxyObj,
 				timezoneId: tz,
 				ignoreDefaultArgs: ["--enable-automation"],
@@ -535,7 +608,7 @@ async function firefoxLauncher({ activePath, isPersistent, dirToDelete, launch_l
 
 			const page = context.pages()[0];
 
-			return createBrowserController(context, context, page, dirToDelete, humanize_options, launch_logs);
+			return createBrowserController(context, context, page, null, humanize_options);
 		} catch (err) {
 			console.error("Firefox Persistent Launch Error:", err);
 			throw err;
@@ -546,10 +619,13 @@ async function firefoxLauncher({ activePath, isPersistent, dirToDelete, launch_l
 // ==========================================================================
 // 6. ENGINE: BRAVE
 // ==========================================================================
-async function braveLauncher({ activePath, isPersistent, dirToDelete, launch_logs, proxy, CapSolver, timezoneId, humanize_options, spoof_fingerprint }) {
+async function braveLauncher({ profilePath, proxy, CapSolver, timezoneId, humanize_options, spoof_fingerprint, cleanupMinutes }) {
+	const isPersistent = !!profilePath;
+	const activePath = isPersistent ? profilePath : path.join(TEMP_DIR, crypto.randomUUID());
 
-	if (launch_logs) console.log(`░░ Starting Brave: ${activePath}`);
+	if (_launchLogs) console.log(`░░░░░ Starting Brave: ${activePath}`);
 	fs.mkdirSync(activePath, { recursive: true });
+	writeProfileMeta(activePath, isPersistent ? "persistent" : "temp", cleanupMinutes);
 
 	// ======================================================
 	// Persist spoof_fingerprint setting for persistent profiles
@@ -563,12 +639,12 @@ async function braveLauncher({ activePath, isPersistent, dirToDelete, launch_log
 			// Load saved settings from first launch
 			const savedSettings = JSON.parse(fs.readFileSync(settingsFilePath, "utf-8"));
 			effectiveSpoofFingerprint = savedSettings.spoof_fingerprint;
-			if (launch_logs) console.log(`░░ Using saved spoof_fingerprint: ${JSON.stringify(effectiveSpoofFingerprint)} (ignoring current: ${JSON.stringify(spoof_fingerprint)})`);
+			if (_launchLogs) console.log(`░░░░░ Using saved spoof_fingerprint: ${JSON.stringify(effectiveSpoofFingerprint)} (ignoring current: ${JSON.stringify(spoof_fingerprint)})`);
 		} else {
 			// First launch - save the current setting
 			const settings = { spoof_fingerprint: spoof_fingerprint };
 			fs.writeFileSync(settingsFilePath, JSON.stringify(settings, null, 2), "utf-8");
-			if (launch_logs) console.log(`░░ Saved spoof_fingerprint setting: ${JSON.stringify(spoof_fingerprint)}`);
+			if (_launchLogs) console.log(`░░░░░ Saved spoof_fingerprint setting: ${JSON.stringify(spoof_fingerprint)}`);
 		}
 	}
 
@@ -592,7 +668,7 @@ async function braveLauncher({ activePath, isPersistent, dirToDelete, launch_log
 
 		if (isPersistent) {
 			fs.writeFileSync(fingerprintFilePath, JSON.stringify(fingerprintData, null, 2), "utf-8");
-			if (launch_logs) console.log("░░ Generated and saved new fingerprint for Brave");
+			if (_launchLogs) console.log("░░░░░ Generated and saved new fingerprint for Brave");
 		}
 	}
 
@@ -616,7 +692,7 @@ async function braveLauncher({ activePath, isPersistent, dirToDelete, launch_log
 		prefs.brave.sidebar.sidebar_show_option = 3;
 		fs.writeFileSync(prefsFilePath, JSON.stringify(prefs, null, 2), "utf-8");
 	} catch (e) {
-		if (launch_logs) console.warn("░░ Could not modify Brave preferences:", e.message);
+		console.warn("░░░░░ Could not modify Brave preferences:", e.message);
 	}
 
 	const args = [
@@ -656,7 +732,7 @@ async function braveLauncher({ activePath, isPersistent, dirToDelete, launch_log
 	];
 	const ignoreDefaultArgs = ["--enable-automation"];
 	if (CapSolver) {
-		const extPath = path.resolve(`./utility/browser-fingerprint/CapSolver`);
+		const extPath = path.resolve(`./src/utility/browser-fingerprint/CapSolver`);
 		args.push(`--load-extension=${extPath}`);
 	}
 
@@ -703,11 +779,11 @@ async function braveLauncher({ activePath, isPersistent, dirToDelete, launch_log
 
 
 	// ======================================================
-	// FIX: Close Extra Tabs (Brave Dashboard / Restore)
+	// ░░░░░ FIX: Close Extra Tabs (Brave Dashboard / Restore)
 	// ======================================================
 	const pages = context.pages();
 	if (pages.length > 1) {
-		if (launch_logs) console.log(`░░ Found ${pages.length} tabs open in Brave. Closing extras...`);
+		if (_launchLogs) console.log(`░░░░░ Found ${pages.length} tabs open in Brave. Closing extras...`);
 		// Close all tabs except the last one (which is usually the fresh active one)
 		for (let i = 0; i < pages.length - 1; i++) {
 			await pages[i].close();
@@ -715,17 +791,21 @@ async function braveLauncher({ activePath, isPersistent, dirToDelete, launch_log
 	}
 	const page = context.pages()[0];
 
+	const dirToDelete = isPersistent ? null : activePath;
 	// Return the remaining open page (context.pages() might change, so we grab index 0 after cleanup)
-	return createBrowserController(context, context, page, dirToDelete, humanize_options, launch_logs);
+	return createBrowserController(context, context, page, dirToDelete, humanize_options);
 }
 
 // ==========================================================================
 // 7. ENGINE: CAMOUFOX
 // ==========================================================================
-async function camoufoxLauncher({ activePath, isPersistent, dirToDelete, launch_logs, proxy, timezoneId, camoufox_options = {} }) {
+async function camoufoxLauncher({ profilePath, proxy, timezoneId, camoufox_options = {}, cleanupMinutes }) {
+	const isPersistent = !!profilePath;
+	const activePath = isPersistent ? profilePath : path.join(TEMP_DIR, crypto.randomUUID());
 
-	if (launch_logs) console.log(`░░ Starting camoufoxJs: ${activePath}`);
+	if (_launchLogs) console.log(`░░░░░ Starting camoufoxJs: ${activePath}`);
 	fs.mkdirSync(activePath, { recursive: true });
+	writeProfileMeta(activePath, isPersistent ? "persistent" : "temp", cleanupMinutes);
 
 	const proxyObj = formatProxy(proxy);
 	const tz = timezoneId || undefined;
@@ -790,7 +870,7 @@ async function camoufoxLauncher({ activePath, isPersistent, dirToDelete, launch_
 		// Save persistent config
 		if (isPersistent) {
 			fs.writeFileSync(fingerprintFilePath, JSON.stringify(launchConfig, null, 2), "utf-8");
-			if (launch_logs) console.log("░░ Generated and saved new launch config for Camoufox");
+			if (_launchLogs) console.log("░░░░░ Generated and saved new launch config for Camoufox");
 		}
 	}
 
@@ -808,13 +888,14 @@ async function camoufoxLauncher({ activePath, isPersistent, dirToDelete, launch_
 		// Removed viewport: null, handled by Camoufox args
 	});
 
-	return createBrowserController(context, context, context.pages()[0], dirToDelete, null, launch_logs);
+	const dirToDelete = isPersistent ? null : activePath;
+	return createBrowserController(context, context, context.pages()[0], dirToDelete);
 }
 
 // ==========================================================================
 // 8. ENGINE: MULTILOGIN
 // ==========================================================================
-async function multiloginLauncher({ proxy, multilogin_options = {}, humanize_options = null, launch_logs = false }) {
+async function multiloginLauncher({ proxy, multilogin_options = {}, humanize_options = null }) {
 	// Destructure defaults from multilogin_options
 	const {
 		profileId = null,
@@ -826,7 +907,7 @@ async function multiloginLauncher({ proxy, multilogin_options = {}, humanize_opt
 	} = multilogin_options;
 
 	if (profileId) {
-		return await launchExistingMultiloginProfile(profileId, humanize_options, launch_logs);
+		return await launchExistingMultiloginProfile(profileId, humanize_options);
 	} else {
 		return await launchQuickMultiloginProfile({
 			os_type,
@@ -835,12 +916,11 @@ async function multiloginLauncher({ proxy, multilogin_options = {}, humanize_opt
 			media_masking,
 			audio_masking,
 			humanize_options,
-			launch_logs,
 		});
 	}
 }
 
-async function launchExistingMultiloginProfile(profileId, humanize_options = null, launch_logs = false) {
+async function launchExistingMultiloginProfile(profileId, humanize_options = null) {
 	const startUrl = `${MULTILOGIN_LAUNCHER_URL}/api/v2/profile/f/${MULTILOGIN_FOLDER_ID}/p/${profileId}/start?automation_type=playwright&headless_mode=false`;
 	let browser, context, page;
 
@@ -854,7 +934,7 @@ async function launchExistingMultiloginProfile(profileId, humanize_options = nul
 		if (response.status === 400) {
 			const errorJson = await response.json().catch(() => null);
 			if (errorJson?.status?.error_code === "PROFILE_ALREADY_RUNNING") {
-				if (launch_logs) console.log(`░░ Profile ${profileId} is running. Restarting...`);
+				if (_launchLogs) console.log(`░░░░░ Profile ${profileId} is running. Restarting...`);
 				await stopMultiloginProfile(profileId);
 				await sleep(5000);
 				response = await fetch(startUrl, {
@@ -874,7 +954,7 @@ async function launchExistingMultiloginProfile(profileId, humanize_options = nul
 
 		const data = await response.json();
 		const port = data.data.port;
-		if (launch_logs) console.log(`░░ Multilogin Profile ${profileId} started on port ${port}`);
+		if (_launchLogs) console.log(`░░░░░ Multilogin Profile ${profileId} started on port ${port}`);
 
 		browser = await chromium.connectOverCDP(`http://localhost:${port}`);
 		context = browser.contexts()[0];
@@ -900,7 +980,7 @@ async function launchExistingMultiloginProfile(profileId, humanize_options = nul
 	}
 }
 
-async function launchQuickMultiloginProfile({ os_type, proxy, canvas_noise, media_masking, audio_masking, humanize_options = null, launch_logs = false }) {
+async function launchQuickMultiloginProfile({ os_type, proxy, canvas_noise, media_masking, audio_masking, humanize_options = null }) {
 	const createUrl = `${MULTILOGIN_LAUNCHER_URL}/api/v3/profile/quick`;
 	let browser, context, page, profileId;
 
@@ -948,7 +1028,7 @@ async function launchQuickMultiloginProfile({ os_type, proxy, canvas_noise, medi
 
 		profileId = json.data.id;
 		const port = json.data.port;
-		if (launch_logs) console.log(`░░ Quick Profile Created: ${profileId} on port ${port}`);
+		if (_launchLogs) console.log(`░░░░░ Quick Profile Created: ${profileId} on port ${port}`);
 
 		browser = await chromium.connectOverCDP(`http://localhost:${port}`);
 		context = browser.contexts()[0];
@@ -988,7 +1068,7 @@ async function stopMultiloginProfile(profileId) {
 			}
 			throw new Error(txt);
 		}
-		if (launch_logs) console.log(`░░ Profile ${profileId} stopped.`);
+		if (_launchLogs) console.log(`░░░░░ Profile ${profileId} stopped.`);
 		return { error: null };
 	} catch (err) {
 		console.error(`Error stopping ${profileId}:`, err);
@@ -1034,7 +1114,7 @@ function formatProxy(proxy) {
 	return p;
 }
 
-function createBrowserController(browser, context, page, dirToDelete = null, humanize_options = null, launch_logs = false) {
+function createBrowserController(browser, context, page, dirToDelete = null, humanize_options = null) {
 	// Apply human cursor if options provided
 	let humanPage = page;
 	if (humanize_options && page) {
@@ -1043,7 +1123,7 @@ function createBrowserController(browser, context, page, dirToDelete = null, hum
 
 	const closeBrowser = async () => {
 		try {
-			if (launch_logs) console.log("░░ Closing browser session...");
+			if (_launchLogs) console.log("░░░░░ Closing browser session...");
 			if (context) await context.close();
 			if (browser && typeof browser.close === "function" && browser !== context) {
 				try {
@@ -1051,8 +1131,12 @@ function createBrowserController(browser, context, page, dirToDelete = null, hum
 				} catch (e) { }
 			}
 			if (dirToDelete) {
-				if (launch_logs) console.log(`░░ Deleting temp profile: ${dirToDelete}`);
-				await deleteDirectoryWithRetries(dirToDelete);
+				if (dirToDelete.includes("persistent")) {
+					console.warn(`░░░░░  Safety Block: Attempted to delete persistent profile: ${dirToDelete}`);
+				} else {
+					if (_launchLogs) console.log(`░░░░░  Deleting temp profile: ${dirToDelete}`);
+					await deleteDirectoryWithRetries(dirToDelete);
+				}
 			}
 			return true;
 		} catch (err) {