arn-browser 0.0.4 → 0.0.6

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

@@ -12,51 +12,14 @@ import {
 } from "@aws-sdk/client-ec2";
 import { SocksProxyAgent } from "socks-proxy-agent";
 import { setTimeout as sleep } from "timers/promises";
-import fs from "fs";
-import path from "path";
-import { pathToFileURL } from "url";
 import https from "https";
 import http from "http";
-
-// Global configuration cache
-let config = null;
+import { arn, query } from "arn-knexjs";
 
 // ==========================================
 // SECTION 1: CONFIGURATION & UTILITIES
 // ==========================================
 
-/**
- * Dynamically loads 'browser_automation_env.js' from the user's project root.
- * This replaces the static import of 'arn' and 'query'.
- */
-async function loadUserConfig() {
-	if (config) return config;
-
-	try {
-		const projectRoot = process.cwd();
-		// Adjust path if your structure is different (e.g., just "utility" or "../utility")
-		const envPath = path.join(projectRoot, "utility", "browser_automation_env.js");
-
-		if (!fs.existsSync(envPath)) {
-			throw new Error(`Could not find configuration file at: ${envPath}`);
-		}
-
-		const envUrl = pathToFileURL(envPath).href;
-		const userEnv = await import(envUrl);
-
-		// Validate required exports
-		if (!userEnv.arn || !userEnv.query) {
-			throw new Error("[AWS Manager] 'browser_automation_env.js' is missing 'arn' or 'query' exports.");
-		}
-
-		config = userEnv;
-		return config;
-	} catch (error) {
-		console.error("❌ Config Error:", error.message);
-		throw error;
-	}
-}
-
 /**
  * Native Node.js implementation of an HTTP GET request to replace Superagent.
  * Supports custom agents (SOCKS/HTTP).
@@ -109,8 +72,6 @@ function nativeGet(url, agent = null, timeout = 5000) {
  * @returns {Promise<object>} - Returns { ec2Client, instanceId, elasticIpName }.
  */
 async function fetchAwsClientAndInstanceId({ instance_name }) {
-	const { arn, query } = await loadUserConfig();
-
 	const { data: [data] = [], error } = await arn.single(
 		query("api_aws_proxy_account").select("*").where({ instance_name }).limit(1)
 	);
@@ -400,7 +361,6 @@ export async function DeleteUnassociatedElasticIPs({ instance_name }) {
  * Stops the instance and releases IPs.
  */
 export async function resetServersAndIp() {
-	const { arn, query } = await loadUserConfig();
 	const thirtyMinutesAgo = new Date(new Date().getTime() - 25 * 60000).toISOString();
 
 	const { data, error } = await arn.single(
@@ -440,8 +400,6 @@ export async function resetServersAndIp() {
  * Updates the database to indicate the server is currently being used (status: 1).
  */
 async function keepServerAlivetoDB({ instance_name }) {
-	const { arn, query } = await loadUserConfig();
-
 	const { error: updateError } = await arn.single(
 		query("api_aws_proxy_account")
 			.update({
@@ -460,8 +418,6 @@ async function keepServerAlivetoDB({ instance_name }) {
  * Tracks usage statistics for a specific IP address in the database.
  */
 async function updateProxyToDB({ instance_name, ip_address }) {
-	const { arn, query } = await loadUserConfig();
-
 	// 1. Get Account ID
 	let { data: [accountData] = [], error: accountError } = await arn.single(
 		query("api_aws_proxy_account").select("id").where({ instance_name }).limit(1)

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

@@ -70,7 +70,7 @@ export function get_multilogin_proxy(options?: MultiloginProxyOptions): Promise<
 
 /**
  * Generates a PacketStream proxy object with a random session ID.
- * Credentials are loaded dynamically from 'browser_automation_env.js'.
+ * Credentials are loaded from environment variables (PACKETSTREAM_USER, PACKETSTREAM_PASS_KEY, PACKETSTREAM_HOST, PACKETSTREAM_PORT).
  * @returns The proxy object.
  */
 export function get_packetstream_proxy(): Promise<ProxyObject>;

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

@@ -1,57 +1,36 @@
 import { setTimeout as sleep } from "timers/promises";
 import randomstring from "randomstring";
-import fs from "fs";
-import path from "path";
-import { pathToFileURL } from "url";
 import { getMultiloginToken } from "../multilogin_token_manager.js";
-// Assuming fetchAwsProxy is in the same directory or adjust path accordingly
 import { getActiveProxyWithStartStop as fetchAwsProxy } from "./custom-proxy.js";
+import { arn, query } from "arn-knexjs";
 
-// Global configuration cache
-let config = null;
+// Environment variables for PacketStream
+const PACKETSTREAM_USER = process.env.PACKETSTREAM_USER;
+const PACKETSTREAM_PASS_KEY = process.env.PACKETSTREAM_PASS_KEY;
+const PACKETSTREAM_HOST = process.env.PACKETSTREAM_HOST;
+const PACKETSTREAM_PORT = process.env.PACKETSTREAM_PORT;
 
 // ==========================================
 // SECTION 1: CONFIGURATION & UTILITIES
 // ==========================================
 
 /**
- * Dynamically loads 'browser_automation_env.js' from the user's project root.
+ * Validates PacketStream environment variables are set.
  */
-async function loadUserConfig() {
-	if (config) return config;
-
-	try {
-		const projectRoot = process.cwd();
-		const envPath = path.join(projectRoot, "utility", "browser_automation_env.js");
-
-		if (!fs.existsSync(envPath)) {
-			throw new Error(`Could not find configuration file at: ${envPath}`);
-		}
-
-		const envUrl = pathToFileURL(envPath).href;
-		const userEnv = await import(envUrl);
-
-		// Validate required exports
-		const requiredKeys = [
-			"arn",
-			"query",
-			"PACKETSTREAM_USER",
-			"PACKETSTREAM_PASS_KEY",
-			"PACKETSTREAM_HOST",
-			"PACKETSTREAM_PORT",
-		];
-
-		const missing = requiredKeys.filter((key) => !userEnv[key]);
+function validatePacketStreamEnv() {
+	const required = {
+		PACKETSTREAM_USER,
+		PACKETSTREAM_PASS_KEY,
+		PACKETSTREAM_HOST,
+		PACKETSTREAM_PORT,
+	};
 
-		if (missing.length > 0) {
-			throw new Error(`[Proxy Manager] 'browser_automation_env.js' is missing exports: ${missing.join(", ")}`);
-		}
+	const missing = Object.entries(required)
+		.filter(([, value]) => !value)
+		.map(([key]) => key);
 
-		config = userEnv;
-		return config;
-	} catch (error) {
-		console.error("❌ Config Error:", error.message);
-		throw error;
+	if (missing.length > 0) {
+		throw new Error(`[Proxy Manager] Missing environment variables: ${missing.join(", ")}`);
 	}
 }
 
@@ -147,8 +126,8 @@ export async function get_multilogin_proxy({
  * Generates a PacketStream proxy object with a random session ID using credentials from config.
  */
 export async function get_packetstream_proxy() {
-	// 1. Load config dynamically
-	const { PACKETSTREAM_USER, PACKETSTREAM_PASS_KEY, PACKETSTREAM_HOST, PACKETSTREAM_PORT } = await loadUserConfig();
+	// 1. Validate environment variables
+	validatePacketStreamEnv();
 
 	// 2. Generate Random Session ID
 	const proxy_session_id = randomstring.generate({
@@ -176,8 +155,6 @@ export async function get_packetstream_proxy() {
 // ==========================================
 
 export async function get_x_proxy({ provider }) {
-	const { arn, query } = await loadUserConfig();
-
 	const { data: [proxyInstance] = [], error: getProxy_error } = await arn.single(
 		query("x_accounts_proxy")
 			.update({

package/rowser_automation_env.js

@@ -1,32 +0,0 @@
-// utility/browser_automation_env.js
-
-// 1. Import your existing database connection/client here
-import { arn, query } from "./customApiClient.js";
-
-// 2. Multilogin Credentials
-const MULTILOGIN_EMAIL = "arndesk1@gmail.com";
-const MULTILOGIN_PASSWORD = "Xq#u.@994E5Ezum";
-const MULTILOGIN_WORKSPACE_ID = "bad9e7e1-cfab-4c8d-bd19-91aa82929711";
-
-// 3. Database Row ID for token storage
-const ROW_ID = "088e930f-e009-4ee8-bb79-4f677c2b7307";
-
-// 4. PacketStream Credentials
-const PACKETSTREAM_USER = "mauraiz55";
-// This is the static part of the password before the "_country" flags
-const PACKETSTREAM_PASS_KEY = "hygsm2irLAT8DwNE_country-UnitedStates_session";
-const PACKETSTREAM_HOST = "209.38.173.242"; // or "proxy.packetstream.io"
-const PACKETSTREAM_PORT = 31112;
-
-export {
-	arn,
-	query,
-	MULTILOGIN_EMAIL,
-	MULTILOGIN_PASSWORD,
-	MULTILOGIN_WORKSPACE_ID,
-	ROW_ID,
-	PACKETSTREAM_USER,
-	PACKETSTREAM_PASS_KEY,
-	PACKETSTREAM_HOST,
-	PACKETSTREAM_PORT,
-};