enhance device validation and configuration

tech-sushant · tech-sushant · commit 50f5273660ba · 2025-09-19T01:19:13.000+05:30
diff --git a/src/lib/device-cache.ts b/src/lib/device-cache.ts
@@ -25,7 +25,7 @@ const URLS: Record<BrowserStackProducts, string> = {
   [BrowserStackProducts.APP_AUTOMATE]:
     "https://www.browserstack.com/list-of-browsers-and-platforms/app_automate.json",
   [BrowserStackProducts.SELENIUM_AUTOMATE]:
-    "https://www.browserstack.com/list-of-browsers-and-platforms/selenium_app_automate.json",
+    "https://www.browserstack.com/list-of-browsers-and-platforms/automate.json",
   [BrowserStackProducts.PLAYWRIGHT_AUTOMATE]:
     "https://www.browserstack.com/list-of-browsers-and-platforms/playwright.json",
 };
diff --git a/src/lib/version-resolver.ts b/src/lib/version-resolver.ts
@@ -47,3 +47,71 @@ export function resolveVersion(requested: string, available: string[]): string {
   // final fallback
   return uniq[0];
 }
+
+export function resolveVersionWithFuzzy(
+  requested: string,
+  available: string[],
+): string {
+  // strip duplicates & sort
+  const uniq = Array.from(new Set(available));
+
+  // pick min/max
+  if (requested === "latest" || requested === "oldest") {
+    // try numeric
+    const nums = uniq
+      .map((v) => ({ v, n: parseFloat(v) }))
+      .filter((x) => !isNaN(x.n))
+      .sort((a, b) => a.n - b.n);
+    if (nums.length) {
+      return requested === "latest" ? nums[nums.length - 1].v : nums[0].v;
+    }
+    // fallback lex
+    const lex = uniq.slice().sort();
+    return requested === "latest" ? lex[lex.length - 1] : lex[0];
+  }
+
+  // exact match?
+  if (uniq.includes(requested)) {
+    return requested;
+  }
+
+  // Try major version matching (e.g., "14" matches "14.0", "14.1", etc.)
+  const reqNum = parseFloat(requested);
+  if (!isNaN(reqNum)) {
+    const majorVersionMatches = uniq.filter((v) => {
+      const vNum = parseFloat(v);
+      return !isNaN(vNum) && Math.floor(vNum) === Math.floor(reqNum);
+    });
+
+    if (majorVersionMatches.length > 0) {
+      // If multiple matches, prefer the most common format or latest
+      const exactMatch = majorVersionMatches.find(
+        (v) => v === `${Math.floor(reqNum)}.0`,
+      );
+      if (exactMatch) {
+        return exactMatch;
+      }
+      // Return the first match (usually the most common format)
+      return majorVersionMatches[0];
+    }
+  }
+
+  // Fuzzy matching: find the closest version
+  const reqNumForFuzzy = parseFloat(requested);
+  if (!isNaN(reqNumForFuzzy)) {
+    const numericVersions = uniq
+      .map((v) => ({ v, n: parseFloat(v) }))
+      .filter((x) => !isNaN(x.n))
+      .sort(
+        (a, b) =>
+          Math.abs(a.n - reqNumForFuzzy) - Math.abs(b.n - reqNumForFuzzy),
+      );
+
+    if (numericVersions.length > 0) {
+      return numericVersions[0].v;
+    }
+  }
+
+  // Fallback: return the first available version
+  return uniq[0];
+}
diff --git a/src/tools/appautomate-utils/appium-sdk/constants.ts b/src/tools/appautomate-utils/appium-sdk/constants.ts
@@ -75,7 +75,9 @@ export const SETUP_APP_AUTOMATE_SCHEMA = {
       ]),
     )
     .max(3)
-    .default([[AppSDKSupportedPlatformEnum.android, 'Samsung Galaxy S24', 'latest']])
+    .default([
+      [AppSDKSupportedPlatformEnum.android, "Samsung Galaxy S24", "latest"],
+    ])
     .describe(
       "Preferred input: 1-3 tuples describing target mobile devices. Example: [['android', 'Samsung Galaxy S24', '14'], ['ios', 'iPhone 15', '17']]",
     ),
@@ -92,7 +94,6 @@ export const SETUP_APP_AUTOMATE_SCHEMA = {
     .describe("Project name for organizing test runs on BrowserStack."),
 };
 
-// Legacy schema for backward compatibility
 export const SETUP_APP_AUTOMATE_SCHEMA_LEGACY = {
   detectedFramework: z
     .nativeEnum(AppSDKSupportedFrameworkEnum)
diff --git a/src/tools/appautomate-utils/appium-sdk/handler.ts b/src/tools/appautomate-utils/appium-sdk/handler.ts
@@ -13,7 +13,7 @@ import {
   generateAppBrowserStackYMLInstructions,
 } from "./index.js";
 
-import { validateDevices } from "../../sdk-utils/common/device-validator.js";
+import { validateAppAutomateDevices } from "../../sdk-utils/common/device-validator.js";
 
 import {
   AppSDKSupportedLanguage,
@@ -46,12 +46,13 @@ export async function setupAppAutomateHandler(
   validateSupportforAppAutomate(framework, language, testingFramework);
 
   // Use default mobile devices when array is empty
-  const devices = inputDevices.length === 0 
-    ? [['android', 'Samsung Galaxy S24', 'latest']] // Default mobile device for App Automate
-    : inputDevices;
+  const devices =
+    inputDevices.length === 0
+      ? [["android", "Samsung Galaxy S24", "latest"]]
+      : inputDevices;
 
   // Validate devices against real BrowserStack device data
-  const validatedEnvironments = await validateDevices(devices, framework);
+  const validatedEnvironments = await validateAppAutomateDevices(devices);
 
   // Extract platforms for backward compatibility (if needed)
   const platforms = validatedEnvironments.map((env) => env.platform);
diff --git a/src/tools/appautomate-utils/native-execution/constants.ts b/src/tools/appautomate-utils/native-execution/constants.ts
@@ -29,9 +29,9 @@ export const RUN_APP_AUTOMATE_SCHEMA = {
         "If in other directory, provide existing test file path",
     ),
   devices: z
-    .array(z.string())
+    .array(z.array(z.string()))
     .describe(
-      "List of devices to run the test on, e.g., ['Samsung Galaxy S20-10.0', 'iPhone 12 Pro-16.0'].",
+      "List of devices to run the test on, e.g., [['android', 'Samsung Galaxy S20', '10.0'], ['ios', 'iPhone 12 Pro', '16.0']].",
     ),
   project: z
     .string()
diff --git a/src/tools/appautomate.ts b/src/tools/appautomate.ts
@@ -176,7 +176,7 @@ async function runAppTestsOnBrowserStack(
     testSuitePath?: string;
     browserstackAppUrl?: string;
     browserstackTestSuiteUrl?: string;
-    devices: string[];
+    devices: Array<Array<string>>;
     project: string;
     detectedAutomationFramework: string;
   },
@@ -223,10 +223,16 @@ async function runAppTestsOnBrowserStack(
           logger.info(`Test suite uploaded. URL: ${test_suite_url}`);
         }
 
+        // Convert array format to string format for Espresso
+        const deviceStrings = args.devices.map((device) => {
+          const [, deviceName, osVersion] = device;
+          return `${deviceName}-${osVersion}`;
+        });
+
         const build_id = await triggerEspressoBuild(
           app_url,
           test_suite_url,
-          args.devices,
+          deviceStrings,
           args.project,
         );
 
@@ -268,10 +274,16 @@ async function runAppTestsOnBrowserStack(
           logger.info(`Test suite uploaded. URL: ${test_suite_url}`);
         }
 
+        // Convert array format to string format for XCUITest
+        const deviceStrings = args.devices.map((device) => {
+          const [, deviceName, osVersion] = device;
+          return `${deviceName}-${osVersion}`;
+        });
+
         const build_id = await triggerXcuiBuild(
           app_url,
           test_suite_url,
-          args.devices,
+          deviceStrings,
           args.project,
           config,
         );
diff --git a/src/tools/sdk-utils/bstack/configUtils.ts b/src/tools/sdk-utils/bstack/configUtils.ts
@@ -1,27 +1,27 @@
 import { ValidatedEnvironment } from "../common/device-validator.js";
 
-export function generateBrowserStackYMLInstructions(
-  config: {
-    validatedEnvironments?: ValidatedEnvironment[];
-    platforms?: string[];
-    enablePercy?: boolean;
-    projectName: string;
-  }
-): string {
+export function generateBrowserStackYMLInstructions(config: {
+  validatedEnvironments?: ValidatedEnvironment[];
+  platforms?: string[];
+  enablePercy?: boolean;
+  projectName: string;
+}): string {
   const enablePercy = config.enablePercy || false;
   const projectName = config.projectName;
 
   // Generate platform configurations using the utility function
   const platformConfigs = generatePlatformConfigs(config);
 
   // Determine build name and step title
-  const buildName = config.validatedEnvironments && config.validatedEnvironments.length > 0
-    ? `${projectName}-Build`
-    : "Sample-Build";
+  const buildName =
+    config.validatedEnvironments && config.validatedEnvironments.length > 0
+      ? `${projectName}-Build`
+      : "Sample-Build";
 
-  const stepTitle = config.validatedEnvironments && config.validatedEnvironments.length > 0
-    ? "Create a browserstack.yml file in the project root with your validated device configurations:"
-    : "Create a browserstack.yml file in the project root. The file should be in the following format:";
+  const stepTitle =
+    config.validatedEnvironments && config.validatedEnvironments.length > 0
+      ? "Create a browserstack.yml file in the project root with your validated device configurations:"
+      : "Create a browserstack.yml file in the project root. The file should be in the following format:";
 
   let ymlContent = `
 # ======================
@@ -139,6 +139,6 @@ function generatePlatformConfigs(config: {
     browserName: chrome
     browserVersion: latest`;
   }
-  
+
   return "";
 }
diff --git a/src/tools/sdk-utils/common/device-validator.ts b/src/tools/sdk-utils/common/device-validator.ts
diff --git a/src/tools/sdk-utils/common/schema.ts b/src/tools/sdk-utils/common/schema.ts
diff --git a/src/tools/sdk-utils/percy-bstack/handler.ts b/src/tools/sdk-utils/percy-bstack/handler.ts
