Merge branch 'browserstack:main' into main

Author: pushkarbw

src/lib/device-cache.ts

@@ -34,37 +34,41 @@ export async function getDevicesAndBrowsers(
     fs.mkdirSync(CACHE_DIR, { recursive: true });
   }
 
-  let cache: any = {};
+  let cache: Record<string, any> = {};
 
+  // Load existing cache
   if (fs.existsSync(CACHE_FILE)) {
-    const stats = fs.statSync(CACHE_FILE);
-    if (Date.now() - stats.mtimeMs < TTL_MS) {
-      try {
-        cache = JSON.parse(fs.readFileSync(CACHE_FILE, "utf8"));
-        if (cache[type]) {
-          return cache[type];
-        }
-      } catch (error) {
-        console.error("Error parsing cache file:", error);
-        // Continue with fetching fresh data
-      }
+    try {
+      cache = JSON.parse(fs.readFileSync(CACHE_FILE, "utf8"));
+    } catch (err) {
+      console.error("Error parsing cache file:", err);
+      cache = {};
+    }
+
+    // Check per-product TTL
+    const cachedEntry = cache[type];
+    if (cachedEntry?.timestamp && Date.now() - cachedEntry.timestamp < TTL_MS) {
+      return cachedEntry.data;
     }
   }
 
+  // Fetch fresh data from BrowserStack
   const liveRes = await apiClient.get({ url: URLS[type], raise_error: false });
-
   if (!liveRes.ok) {
     throw new Error(
-      `Failed to fetch configuration from BrowserStack : ${type}=${liveRes.statusText}`,
+      `Failed to fetch configuration from BrowserStack: ${type} = ${liveRes.statusText}`,
     );
   }
 
-  cache = {
-    [type]: liveRes.data,
+  // Save to cache with timestamp and data directly under product key
+  cache[type] = {
+    timestamp: Date.now(),
+    data: liveRes.data,
   };
-  fs.writeFileSync(CACHE_FILE, JSON.stringify(cache), "utf8");
 
-  return cache[type];
+  fs.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf8");
+
+  return liveRes.data;
 }
 
 // Rate limiter for started event (3H)

src/lib/inmemory-store.ts

@@ -1 +1,2 @@
 export const signedUrlMap = new Map<string, object>();
+export const testFilePathsMap = new Map<string, string[]>();

src/lib/utils.ts

@@ -1,5 +1,7 @@
 import sharp from "sharp";
 import type { ApiResponse } from "./apiClient.js";
+import { BrowserStackConfig } from "./types.js";
+import { getBrowserStackAuth } from "./get-auth.js";
 
 export function sanitizeUrlParam(param: string): string {
   // Remove any characters that could be used for command injection
@@ -38,3 +40,25 @@ export async function assertOkResponse(
     );
   }
 }
+
+export async function fetchFromBrowserStackAPI(
+  url: string,
+  config: BrowserStackConfig,
+): Promise<any> {
+  const authString = getBrowserStackAuth(config);
+  const auth = Buffer.from(authString).toString("base64");
+
+  const res = await fetch(url, {
+    headers: {
+      Authorization: `Basic ${auth}`,
+    },
+  });
+
+  if (!res.ok) {
+    throw new Error(
+      `Failed to fetch from ${url}: ${res.status} ${res.statusText}`,
+    );
+  }
+
+  return res.json();
+}

src/server-factory.ts

@@ -7,6 +7,7 @@ const require = createRequire(import.meta.url);
 const packageJson = require("../package.json");
 import logger from "./logger.js";
 import addSDKTools from "./tools/bstack-sdk.js";
+import addPercyTools from "./tools/percy-sdk.js";
 import addBrowserLiveTools from "./tools/live.js";
 import addAccessibilityTools from "./tools/accessibility.js";
 import addTestManagementTools from "./tools/testmanagement.js";
@@ -15,8 +16,10 @@ import addFailureLogsTools from "./tools/get-failure-logs.js";
 import addAutomateTools from "./tools/automate.js";
 import addSelfHealTools from "./tools/selfheal.js";
 import addAppLiveTools from "./tools/applive.js";
+import addBuildInsightsTools from "./tools/build-insights.js";
 import { setupOnInitialized } from "./oninitialized.js";
 import { BrowserStackConfig } from "./lib/types.js";
+import addRCATools from "./tools/rca-agent.js";
 
 /**
  * Wrapper class for BrowserStack MCP Server
@@ -48,13 +51,16 @@ export class BrowserStackMcpServer {
     const toolAdders = [
       addAccessibilityTools,
       addSDKTools,
+      addPercyTools,
       addAppLiveTools,
       addBrowserLiveTools,
       addTestManagementTools,
       addAppAutomationTools,
       addFailureLogsTools,
       addAutomateTools,
       addSelfHealTools,
+      addBuildInsightsTools,
+      addRCATools,
     ];
 
     toolAdders.forEach((adder) => {

src/tools/add-percy-snapshots.ts

@@ -0,0 +1,32 @@
+import { testFilePathsMap } from "../lib/inmemory-store.js";
+import { updateFileAndStep } from "./percy-snapshot-utils/utils.js";
+import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import { percyWebSetupInstructions } from "../tools/sdk-utils/percy-web/handler.js";
+
+export async function updateTestsWithPercyCommands(args: {
+  uuid: string;
+  index: number;
+}): Promise<CallToolResult> {
+  const { uuid, index } = args;
+  const filePaths = testFilePathsMap.get(uuid);
+
+  if (!filePaths) {
+    throw new Error(`No test files found in memory for UUID: ${uuid}`);
+  }
+
+  if (index < 0 || index >= filePaths.length) {
+    throw new Error(
+      `Invalid index: ${index}. There are ${filePaths.length} files for UUID: ${uuid}`,
+    );
+  }
+  const result = await updateFileAndStep(
+    filePaths[index],
+    index,
+    filePaths.length,
+    percyWebSetupInstructions,
+  );
+
+  return {
+    content: result,
+  };
+}