Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions src/config.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,49 @@
// List of supported BrowserStack Local option names (as per SDK)
const BROWSERSTACK_LOCAL_OPTION_KEYS = [
"proxyHost",
"proxyPort",
"proxyUser",
"proxyPass",
"useCaCertificate",
"localProxyHost",
"localProxyPort",
"localProxyUser",
"localProxyPass",
"pacFile",
"force",
"forceLocal",
"onlyAutomate",
"verbose",
"logFile",
"binarypath",
"f",
"excludeHosts",
];

// Build browserstackLocalOptions from individual env vars
const browserstackLocalOptions: Record<string, any> = {};
for (const key of BROWSERSTACK_LOCAL_OPTION_KEYS) {
// Env var name: BROWSERSTACK_LOCAL_OPTION_<UPPERCASE_KEY>
const envVar = process.env[`BROWSERSTACK_LOCAL_OPTION_${key.toUpperCase()}`];
if (envVar !== undefined) {
browserstackLocalOptions[key] = envVar;
}
}

export class Config {
constructor(
public readonly browserstackUsername: string,
public readonly browserstackAccessKey: string,
public readonly DEV_MODE: boolean,
public readonly browserstackLocalOptions: Record<string, any>,
) {}
}

const config = new Config(
process.env.BROWSERSTACK_USERNAME!,
process.env.BROWSERSTACK_ACCESS_KEY!,
process.env.DEV_MODE === "true",
browserstackLocalOptions,
);

export default config;
12 changes: 5 additions & 7 deletions src/lib/local.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,19 @@ export async function ensureLocalBinarySetup(
const localBinary = new Local();
await killExistingBrowserStackLocalProcesses();

const requestBody: {
key: string;
username: string;
localIdentifier?: string;
} = {
// Use a single options object from config and extend with required fields
const bsLocalArgs: Record<string, any> = {
...(config.browserstackLocalOptions || {}),
key: config.browserstackAccessKey,
username: config.browserstackUsername,
};

if (localIdentifier) {
requestBody.localIdentifier = localIdentifier;
bsLocalArgs.localIdentifier = localIdentifier;
}

return await new Promise((resolve, reject) => {
localBinary.start(requestBody, (error?: Error) => {
localBinary.start(bsLocalArgs, (error?: Error) => {
if (error) {
logger.error(
`Unable to start BrowserStack Local... please check your credentials and try again. Error: ${error}`,
Expand Down