arn-browser 0.1.5 → 0.1.7

package/src/utility/{multilogin_token_manager.js → mlx_token.js}

@@ -1,61 +1,51 @@
-// multilogin_token_manager.js
+// mlx_token.js
 
 import crypto from "crypto";
 import { arn, query } from "arn-knexjs";
 
-// Environment variables for Multilogin
-const MULTILOGIN_EMAIL = process.env.MULTILOGIN_EMAIL;
-const MULTILOGIN_PASSWORD = process.env.MULTILOGIN_PASSWORD;
-const MULTILOGIN_WORKSPACE_ID = process.env.MULTILOGIN_WORKSPACE_ID;
-const MULTILOGIN_ROW_ID = process.env.MULTILOGIN_ROW_ID;
+// Module-level cache for credentials (fetched once per process)
+let _credentials = null;
 
 /**
- * Validates that all required environment variables are set.
+ * 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.
+ * @returns {Promise<{id: string, email: string, password: string, workspace_id: string, data: object}>}
  */
-function validateEnv() {
-	const required = {
-		MULTILOGIN_EMAIL,
-		MULTILOGIN_PASSWORD,
-		MULTILOGIN_WORKSPACE_ID,
-		MULTILOGIN_ROW_ID,
-	};
+async function loadCredentials() {
+	if (_credentials) return _credentials;
 
-	const missing = Object.entries(required)
-		.filter(([, value]) => !value)
-		.map(([key]) => key);
+	const { data: [row] = [], error } = await arn.single(
+		query("api_multilogin_token").select("*").where({ status: 1 }).orderByRaw("random()").limit(1)
+	);
 
-	if (missing.length > 0) {
-		throw new Error(`[TokenManager] Missing environment variables: ${missing.join(", ")}`);
+	if (error || !row) {
+		throw new Error("[TokenManager] No active Multilogin credentials found (status = 1).");
 	}
+
+	_credentials = row;
+	return _credentials;
 }
 
 async function saveTokens(tokens) {
-	validateEnv();
+	const creds = await loadCredentials();
 
 	await arn.single(
 		query("api_multilogin_token")
 			.update({
 				data: JSON.stringify(tokens, null, 2),
 			})
-			.where({ id: MULTILOGIN_ROW_ID })
+			.where({ id: creds.id })
 	);
 }
 
 async function loadTokens() {
 	try {
-		validateEnv();
-
-		const { data: [data] = [], error } = await arn.single(
-			query("api_multilogin_token").select("*").where({ id: MULTILOGIN_ROW_ID }).limit(1)
-		);
-		if (error) {
-			console.error("Error loading tokens:", error);
-			return null;
-		}
-		if (!data || !data.data) {
+		const creds = await loadCredentials();
+		if (!creds.data || Object.keys(creds.data).length === 0) {
 			return null;
 		}
-		return data.data;
+		return creds.data;
 	} catch (err) {
 		return null;
 	}
@@ -73,11 +63,11 @@ function isJwtExpired(token) {
 }
 
 async function loginAndSaveTokens() {
-	validateEnv();
+	const creds = await loadCredentials();
 
-	const passwordHash = crypto.createHash("md5").update(MULTILOGIN_PASSWORD).digest("hex");
+	const passwordHash = crypto.createHash("md5").update(creds.password).digest("hex");
 	const data = {
-		email: MULTILOGIN_EMAIL,
+		email: creds.email,
 		password: passwordHash,
 	};
 
@@ -98,8 +88,8 @@ async function loginAndSaveTokens() {
 	await saveTokens({
 		token,
 		refresh_token,
-		email: MULTILOGIN_EMAIL,
-		workspace_id: MULTILOGIN_WORKSPACE_ID,
+		email: creds.email,
+		workspace_id: creds.workspace_id,
 	});
 
 	console.log("[LOGIN] Tokens updated and saved.");
@@ -107,12 +97,12 @@ async function loginAndSaveTokens() {
 }
 
 async function refreshAndSaveTokens(refresh_token) {
-	validateEnv();
+	const creds = await loadCredentials();
 
 	const data = {
-		email: MULTILOGIN_EMAIL,
+		email: creds.email,
 		refresh_token: refresh_token,
-		workspace_id: MULTILOGIN_WORKSPACE_ID,
+		workspace_id: creds.workspace_id,
 	};
 
 	const res = await fetch("https://api.multilogin.com/user/refresh_token", {
@@ -132,8 +122,8 @@ async function refreshAndSaveTokens(refresh_token) {
 	await saveTokens({
 		token,
 		refresh_token: new_refresh,
-		email: MULTILOGIN_EMAIL,
-		workspace_id: MULTILOGIN_WORKSPACE_ID,
+		email: creds.email,
+		workspace_id: creds.workspace_id,
 	});
 
 	console.log("[REFRESH] Tokens refreshed and saved.");
@@ -141,7 +131,6 @@ async function refreshAndSaveTokens(refresh_token) {
 }
 
 async function getMultiloginToken() {
-	validateEnv();
 	let tokens = await loadTokens();
 
 	if (tokens && tokens.token && !isJwtExpired(tokens.token)) {

package/src/utility/{launchBrowser.d.ts → playwright/pwLaunch.d.ts}

@@ -1,6 +1,6 @@
 import { Browser, BrowserContext, Page } from "playwright";
 import type { FingerprintGeneratorOptions } from "fingerprint-generator";
-import type { HumanPage, CreateCursorOptions } from "../human-cursor/index";
+import type { HumanPage, CreateCursorOptions } from "./human-cursor/index";
 type Screen = FingerprintGeneratorOptions["screen"];
 /**
  * Proxy configuration object.
@@ -119,7 +119,7 @@ export interface MultiloginOptions {
 /**
  * Options for launching the browser.
  */
-export interface LaunchOptions {
+export interface PwLaunchOptions {
 	// ========================================================================
 	// 1. GENERAL & NETWORK
 	// ========================================================================
@@ -141,7 +141,15 @@ export interface LaunchOptions {
 
 	/**
 	 * Which browser engine to launch.
-	 * Default: "chromium"
+	 *
+	 * - `"chromium"`: Playwright's bundled Chromium
+	 * - `"chrome"`: Alias for Chromium
+	 * - `"firefox"`: Playwright's bundled Firefox
+	 * - `"brave"`: Brave Browser (requires local binary)
+	 * - `"camoufox"`: Camoufox anti-detect Firefox (requires local binary)
+	 * - `"multilogin"`: Multilogin anti-detect browser (via API)
+	 *
+	 * Default: `"chromium"`
 	 */
 	which_browser?: "chromium" | "chrome" | "firefox" | "brave" | "braveLauncher" | "camoufox" | "multilogin";
 
@@ -150,23 +158,22 @@ export interface LaunchOptions {
 	// ========================================================================
 
 	/**
-	 * Path to a browser profile.
+	 * Path to a persistent profile.
 	 * - If absolute path: Uses that path exactly (no prefix added).
-	 * - If folder name: Creates inside `~/.arn-browser/browser_profiles/` with a browser prefix (e.g., `brave_myProfile`).
-	 * - If null: Creates a temporary, random profile that is deleted on browser close.
-	 *
-	 * When combined with `cleanupMinutes`, named profiles can be auto-deleted
-	 * after a period of inactivity (based on `_profile_meta.json`).
+	 * - If folder name: Creates inside `~/.arn-browser/pw/persistent/` AND adds a browser prefix (e.g., `brave_myProfile`).
+	 * - If null: Creates a temporary, random profile in `~/.arn-browser/pw/temp/`.
 	 */
 	profile_path?: string | null;
 
 	/**
-	 * Auto-delete schedule for named profiles (in minutes).
-	 * - `0` or not set: Profile is permanent (never auto-deleted).
-	 * - `> 0`: Profile is auto-deleted after this many minutes of inactivity.
-	 *   The inactivity timer resets on each launch.
-	 * - Only applies to named profiles (with `profile_path`).
-	 *   Unnamed profiles are always deleted on close regardless.
+	 * Auto-cleanup profiles after X minutes since last launch.
+	 *
+	 * **Persistent profiles:** Cleaned after X minutes since last launch. Default: 0 (never clean).
+	 * **Temp profiles:** Default: 15 minutes if not specified.
+	 *
+	 * Each profile stores a `_profile_meta.json` with `created_at`, `last_launched_at`,
+	 * and `cleanup_minutes`. The profile currently being launched is always skipped during cleanup.
+	 *
 	 * Default: 0
 	 */
 	cleanupMinutes?: number;
@@ -232,7 +239,7 @@ export interface LaunchOptions {
 	humanize_options?: HumanizeOptions;
 
 	// ========================================================================
-	// 7. LOGGING
+	// 6. LOGGING
 	// ========================================================================
 
 	/**
@@ -294,9 +301,9 @@ export interface BrowserControllerError {
  * The object returned by launchBrowser.
  * Check launchError to discriminate between success and failure states.
  */
-export type BrowserController = BrowserControllerSuccess | BrowserControllerError;
+export type PwBrowserController = BrowserControllerSuccess | BrowserControllerError;
 
 /**
  * Launches a browser based on the provided options.
  */
-export function launchBrowser(options: LaunchOptions): Promise<BrowserController>;
+export function pwLaunch(options?: PwLaunchOptions): Promise<PwBrowserController>;