Merge pull request #100 from tech-sushant/proxy-agent

feat: implement HTTPS agent support in ApiClient for proxy and CA certificate

Author: Vishalan

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserstack/mcp-server",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "description": "BrowserStack's Official MCP Server",
   "main": "dist/index.js",
   "repository": {

package.json

@@ -1,4 +1,9 @@
 import axios, { AxiosRequestConfig, AxiosResponse } from "axios";
+import httpsProxyAgentPkg from "https-proxy-agent";
+const { HttpsProxyAgent } = httpsProxyAgentPkg;
+import * as https from "https";
+import * as fs from "fs";
+import config from "../config.js";
 
 type RequestOptions = {
   url: string;
@@ -54,15 +59,52 @@ class ApiResponse<T = any> {
   }
 }
 
+// Utility to create HTTPS agent if needed (proxy/CA)
+function getAxiosAgent(): AxiosRequestConfig["httpsAgent"] | undefined {
+  const proxyHost = config.browserstackLocalOptions.proxyHost;
+  const proxyPort = config.browserstackLocalOptions.proxyPort;
+  const caCertPath = config.browserstackLocalOptions.useCaCertificate;
+
+  // If both proxy host and port are defined
+  if (proxyHost && proxyPort) {
+    const proxyUrl = `http://${proxyHost}:${proxyPort}`;
+    if (caCertPath && fs.existsSync(caCertPath)) {
+      // Proxy + CA cert
+      const ca = fs.readFileSync(caCertPath);
+      return new HttpsProxyAgent({
+        host: proxyHost,
+        port: Number(proxyPort),
+        ca,
+        rejectUnauthorized: false, // Set to true if you want strict SSL
+      });
+    } else {
+      // Proxy only
+      return new HttpsProxyAgent(proxyUrl);
+    }
+  } else if (caCertPath && fs.existsSync(caCertPath)) {
+    // CA only
+    return new https.Agent({
+      ca: fs.readFileSync(caCertPath),
+      rejectUnauthorized: false, // Set to true for strict SSL
+    });
+  }
+  // Default agent (no proxy, no CA)
+  return undefined;
+}
+
 class ApiClient {
   private instance = axios.create();
 
+  private get axiosAgent() {
+    return getAxiosAgent();
+  }
+
   private async requestWrapper<T>(
-    fn: () => Promise<AxiosResponse<T>>,
+    fn: (agent: AxiosRequestConfig["httpsAgent"]) => Promise<AxiosResponse<T>>,
     raise_error: boolean = true,
   ): Promise<ApiResponse<T>> {
     try {
-      const res = await fn();
+      const res = await fn(this.axiosAgent);
       return new ApiResponse<T>(res);
     } catch (error: any) {
       if (error.response && !raise_error) {
@@ -79,7 +121,8 @@ class ApiClient {
     raise_error = true,
   }: RequestOptions): Promise<ApiResponse<T>> {
     return this.requestWrapper<T>(
-      () => this.instance.get<T>(url, { headers, params }),
+      (agent) =>
+        this.instance.get<T>(url, { headers, params, httpsAgent: agent }),
       raise_error,
     );
   }
@@ -91,7 +134,8 @@ class ApiClient {
     raise_error = true,
   }: RequestOptions): Promise<ApiResponse<T>> {
     return this.requestWrapper<T>(
-      () => this.instance.post<T>(url, body, { headers }),
+      (agent) =>
+        this.instance.post<T>(url, body, { headers, httpsAgent: agent }),
       raise_error,
     );
   }
@@ -103,7 +147,8 @@ class ApiClient {
     raise_error = true,
   }: RequestOptions): Promise<ApiResponse<T>> {
     return this.requestWrapper<T>(
-      () => this.instance.put<T>(url, body, { headers }),
+      (agent) =>
+        this.instance.put<T>(url, body, { headers, httpsAgent: agent }),
       raise_error,
     );
   }
@@ -115,7 +160,8 @@ class ApiClient {
     raise_error = true,
   }: RequestOptions): Promise<ApiResponse<T>> {
     return this.requestWrapper<T>(
-      () => this.instance.patch<T>(url, body, { headers }),
+      (agent) =>
+        this.instance.patch<T>(url, body, { headers, httpsAgent: agent }),
       raise_error,
     );
   }
@@ -127,7 +173,8 @@ class ApiClient {
     raise_error = true,
   }: RequestOptions): Promise<ApiResponse<T>> {
     return this.requestWrapper<T>(
-      () => this.instance.delete<T>(url, { headers, params }),
+      (agent) =>
+        this.instance.delete<T>(url, { headers, params, httpsAgent: agent }),
       raise_error,
     );
   }

src/lib/apiClient.ts

@@ -1,9 +1,10 @@
 import { pino } from "pino";
 
-let logger: any;
+// 1. The actual logger instance, swapped out as needed
+let currentLogger: any;
 
 if (process.env.NODE_ENV === "development") {
-  logger = pino({
+  currentLogger = pino({
     level: "debug",
     transport: {
       targets: [
@@ -23,8 +24,8 @@ if (process.env.NODE_ENV === "development") {
     },
   });
 } else {
-  // NULL logger
-  logger = pino({
+  // Null logger (logs go to /dev/null or NUL)
+  currentLogger = pino({
     level: "info",
     transport: {
       target: "pino/file",
@@ -35,12 +36,24 @@ if (process.env.NODE_ENV === "development") {
   });
 }
 
-/**
- * Set a custom logger instance
- * @param customLogger - The logger instance to use
- */
+// 2. Proxy logger: always delegates to the currentLogger
+const logger: any = new Proxy(
+  {},
+  {
+    get(_target, prop) {
+      // Forward function calls to currentLogger
+      if (typeof currentLogger[prop] === "function") {
+        return (...args: any[]) => currentLogger[prop](...args);
+      }
+      // Forward property gets
+      return currentLogger[prop];
+    },
+  },
+);
+
+// 3. Setter to update the logger instance everywhere
 export function setLogger(customLogger: any): void {
-  logger = customLogger;
+  currentLogger = customLogger;
 }
 
 export default logger;