arn-browser 0.1.6 → 0.1.8

package/bin/cli.js

@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+
+/**
+ * @file CLI for arn-browser
+ * @description Provides `npx arn-browser install` to download browser binaries.
+ *
+ * Usage:
+ *   npx arn-browser install     - Install all browser binaries (Brave, Camoufox, Chromium, Firefox)
+ *   npx arn-browser help        - Show help
+ */
+
+const command = process.argv[2];
+
+function showHelp() {
+	console.log(`
+  arn-browser CLI
+
+  Usage:
+    npx arn-browser <command>
+
+  Commands:
+    install     Download and install browser binaries (Brave, Camoufox, Chromium, Firefox)
+    help        Show this help message
+	`);
+}
+
+switch (command) {
+	case "install": {
+		const { installBrowsers } = await import("./install.js");
+		await installBrowsers();
+		break;
+	}
+	case "help":
+	case "--help":
+	case "-h":
+	case undefined:
+		showHelp();
+		break;
+	default:
+		console.error(`Unknown command: "${command}"`);
+		showHelp();
+		process.exit(1);
+}

package/bin/install.js

@@ -0,0 +1,420 @@
+/**
+ * @file install.js
+ * @description Cross-platform browser installer for arn-browser.
+ * Downloads and extracts Brave, Camoufox, and optionally Chromium to ~/.cache/
+ *
+ * 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";
+
+// ==========================================================================
+// CONFIGURATION URLS
+// ==========================================================================
+// 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.87.192/brave-browser-1.87.192-linux-amd64.zip",
+		arm64: "https://github.com/brave/brave-browser/releases/download/v1.87.192/brave-browser-1.87.192-linux-arm64.zip",
+	},
+	darwin: {
+		arm64: "https://github.com/brave/brave-browser/releases/download/v1.87.192/Brave-Browser-arm64.dmg",
+	},
+	win32: {
+		x64: "https://github.com/brave/brave-browser/releases/download/v1.87.192/brave-v1.87.192-win32-x64.zip",
+	}
+};
+
+const CAM_URLS = {
+	linux: {
+		x64: "https://github.com/daijro/camoufox/releases/download/v135.0.1-beta.24/camoufox-135.0.1-beta.24-lin.x86_64.zip",
+		arm64: "https://github.com/daijro/camoufox/releases/download/v135.0.1-beta.24/camoufox-135.0.1-beta.24-lin.arm64.zip",
+	},
+	darwin: {
+		arm64: "https://github.com/daijro/camoufox/releases/download/v135.0.1-beta.24/camoufox-135.0.1-beta.24-mac.arm64.zip",
+	},
+	win32: {
+		x64: "https://github.com/daijro/camoufox/releases/download/v135.0.1-beta.24/camoufox-135.0.1-beta.24-win.x86_64.zip",
+	}
+};
+
+// 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" };
+
+// ==========================================================================
+// PATHS
+// ==========================================================================
+
+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");
+
+// ==========================================================================
+// HELPERS
+// ==========================================================================
+
+function getArch() {
+	const arch = os.arch(); // "x64", "arm64", etc.
+	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"];
+	let value = bytes;
+	let unit = 0;
+	while (value >= 1024 && unit < units.length - 1) {
+		value /= 1024;
+		unit += 1;
+	}
+	return `${value.toFixed(value >= 100 || unit === 0 ? 0 : 1)} ${units[unit]}`;
+}
+
+function formatEta(seconds) {
+	if (!Number.isFinite(seconds) || seconds < 0) return "--:--";
+	const mins = Math.floor(seconds / 60);
+	const secs = Math.floor(seconds % 60);
+	return `${String(mins).padStart(2, "0")}:${String(secs).padStart(2, "0")}`;
+}
+
+function printProgress(label, downloaded, total, startMs) {
+	const elapsedSec = Math.max((Date.now() - startMs) / 1000, 0.001);
+	const speed = downloaded / elapsedSec;
+	if (total > 0) {
+		const percent = ((downloaded / total) * 100).toFixed(1);
+		const etaSec = (total - downloaded) / Math.max(speed, 1);
+		process.stdout.write(
+			`\r   ${label}: ${percent}% (${formatBytes(downloaded)}/${formatBytes(total)}) ${formatBytes(speed)}/s ETA ${formatEta(etaSec)}`
+		);
+		return;
+	}
+	process.stdout.write(`\r   ${label}: ${formatBytes(downloaded)} ${formatBytes(speed)}/s`);
+}
+
+async function downloadFile(url, destPath, label) {
+	const fetch = (await import("node-fetch")).default;
+
+	const response = await fetch(url, { redirect: "follow" });
+	if (!response.ok) throw new Error(`Failed to download ${url}: ${response.status}`);
+	if (!response.body) throw new Error(`No response body for ${url}`);
+
+	const totalBytes = Number(response.headers.get("content-length")) || 0;
+	const fileStream = createWriteStream(destPath);
+	const startMs = Date.now();
+	let downloaded = 0;
+	let lastPrint = 0;
+
+	await new Promise((resolve, reject) => {
+		response.body.on("data", (chunk) => {
+			downloaded += chunk.length;
+			const now = Date.now();
+			if (now - lastPrint >= 200) {
+				printProgress(label, downloaded, totalBytes, startMs);
+				lastPrint = now;
+			}
+		});
+
+		response.body.on("error", reject);
+		fileStream.on("error", reject);
+		fileStream.on("finish", resolve);
+		response.body.pipe(fileStream);
+	});
+
+	printProgress(label, downloaded, totalBytes, startMs);
+	process.stdout.write("\n");
+}
+
+/**
+ * Cross-platform unzip.
+ */
+function unzipFile(zipPath, destDir) {
+	const isWindows = process.platform === "win32";
+
+	if (isWindows) {
+		execSync(`powershell -Command "Expand-Archive -Force -Path '${zipPath}' -DestinationPath '${destDir}'"`, { stdio: "inherit" });
+	} else {
+		execSync(`unzip -qo "${zipPath}" -d "${destDir}"`, { stdio: "inherit" });
+	}
+}
+
+/**
+ * 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;
+
+	const files = findFiles(dirPath, filename);
+	for (const f of files) {
+		fs.chmodSync(f, 0o755);
+	}
+}
+
+/**
+ * Recursively find files by name.
+ */
+function findFiles(dir, name) {
+	const results = [];
+	if (!fs.existsSync(dir)) return results;
+
+	const entries = fs.readdirSync(dir, { withFileTypes: true });
+	for (const entry of entries) {
+		const fullPath = path.join(dir, entry.name);
+		if (entry.isDirectory()) {
+			results.push(...findFiles(fullPath, name));
+		} else if (entry.name === name) {
+			results.push(fullPath);
+		}
+	}
+	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
+// ==========================================================================
+
+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) {
+		console.log(`⚠️  Camoufox not available for ${osName} ${arch}`);
+		return;
+	}
+
+	// Clean previous install
+	rmDir(CAM_DIR);
+
+	const zipPath = path.join(TEMP_DIR, "camoufox.zip");
+
+	console.log("⬇️  Downloading Camoufox...");
+	await downloadFile(url, zipPath, "Camoufox");
+
+	fs.mkdirSync(CAM_DIR, { recursive: true });
+
+	console.log(`📦 Extracting Camoufox to ${CAM_DIR}...`);
+	unzipFile(zipPath, CAM_DIR);
+
+	// Set executable permissions (Linux/Mac)
+	setExecutable(CAM_DIR, "camoufox");
+	setExecutable(CAM_DIR, "camoufox-bin");
+
+	// Create version.json
+	const versionFile = path.join(CAM_DIR, "version.json");
+	if (!fs.existsSync(versionFile)) {
+		fs.writeFileSync(versionFile, JSON.stringify(CAM_VERSION, null, 2), "utf-8");
+	}
+
+	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 });
+
+	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.`);
+	}
+
+	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;
+	}
+
+	// Clean previous install
+	rmDir(FIREFOX_DIR);
+
+	const ext = url.endsWith(".dmg") ? ".dmg" : ".zip";
+	const dlPath = path.join(TEMP_DIR, `firefox${ext}`);
+
+	console.log("⬇️  Downloading Firefox...");
+	await downloadFile(url, dlPath, "Firefox");
+
+	fs.mkdirSync(FIREFOX_DIR, { recursive: true });
+
+	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.`);
+	}
+
+	console.log("✅ Firefox installed!");
+}
+
+// ==========================================================================
+// MAIN
+// ==========================================================================
+
+export async function installBrowsers() {
+	const arch = getArch();
+	const osName = process.platform;
+
+	console.log(`\n🚀 arn-browser: Installing browser binaries`);
+	console.log(`   Platform: ${osName} | Architecture: ${arch}\n`);
+
+	// 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);
+	} finally {
+		// Cleanup temp directory
+		rmDir(TEMP_DIR);
+	}
+
+	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`);
+}

package/package.json

@@ -1,11 +1,12 @@
 {
 	"name": "arn-browser",
-	"version": "0.1.6",
+	"version": "0.1.8",
 	"description": "A lightweight, browser autmation helper.",
 	"main": "src/index.js",
 	"types": "src/index.d.ts",
 	"files": [
-		"src"
+		"src",
+		"bin"
 	],
 	"directories": {
 		"test": "test"
@@ -21,13 +22,17 @@
 		"https-proxy-agent": "^7.0.6",
 		"node-cache": "^5.1.2",
 		"node-fetch": "^3.3.2",
-		"playwright": "^1.57.0",
+		"playwright": "^1.42.1",
 		"proxy-chain": "^2.6.0",
+		"puppeteer-core": "^24.38.0",
 		"randomstring": "^1.3.1",
 		"socks-proxy-agent": "^8.0.5",
 		"speakeasy": "^2.0.0",
 		"superagent": "^10.2.3"
 	},
+	"bin": {
+		"arn-browser": "bin/cli.js"
+	},
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},

package/src/index.d.ts

@@ -2,18 +2,28 @@
 
 export * from "./utility/proxy-utility/custom-proxy";
 export * from "./utility/proxy-utility/proxy-chain";
-export * from "./all_routes/routeWithSuperagent";
+export * from "./utility/playwright/routes/pwRoute";
+export * from "./utility/puppeteer/routes/ppRoute";
 export {
     type CamoufoxOptions,
     type MultiloginOptions,
-    type LaunchOptions,
-    type BrowserController,
-    launchBrowser
+    type PwLaunchOptions as LaunchOptions, // Keeping backward compatibility if needed, though we should probably switch them out in tests
+    type PwBrowserController as BrowserController,
+    pwLaunch
     // ProxyConfig is excluded - already exported from "./utility/proxy-utility/proxy-chain"
-} from "./utility/launchBrowser";
+} from "./utility/playwright/pwLaunch";
 export * from "./utility/proxy-utility/proxy-helper";
 
 export * from "./others/totp-generator";
 
-export * from "./utility/playwright-helper";
+export * from "./utility/playwright/playwright-helper";
+
+export {
+    type PpLaunchOptions as LaunchPuppeteerOptions,
+    type PpBrowserController as PuppeteerController,
+    type PpBrowserControllerSuccess as PuppeteerControllerSuccess,
+    type PpBrowserControllerError as PuppeteerControllerError,
+    type PpMultiloginOptions as PuppeteerMultiloginOptions,
+    ppLaunch
+} from "./utility/puppeteer/ppLaunch";
 //

package/src/index.js

@@ -1,8 +1,7 @@
-// Export the browser launcher (and any other exports from launchBrowser.js)
-export * from "./utility/launchBrowser.js";
+export * from "./utility/playwright/pwLaunch.js";
 
 // Export the routing/request interception logic
-export * from "./all_routes/routeWithSuperagent.js";
+export * from "./utility/playwright/routes/pwRoute.js";
 
 export * from "./utility/proxy-utility/proxy-chain.js";
 
@@ -12,4 +11,8 @@ export * from "./utility/proxy-utility/proxy-helper.js";
 
 export * from "./others/totp-generator.js";
 
-export * from "./utility/playwright-helper.js";
+export * from "./utility/playwright/playwright-helper.js";
+
+export * from "./utility/puppeteer/ppLaunch.js";
+
+export * from "./utility/puppeteer/routes/ppRoute.js";

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)) {