fix: race condition waiting for wda on simulator

.github/workflows/ios-simulator-test.yml

@@ -34,7 +34,6 @@ jobs:
     - name: Download iOS ${{ matrix.ios_version }} runtime
       run: |
         xcodebuild -downloadPlatform iOS -buildVersion ${{ matrix.build_version }}
-      continue-on-error: true
 
     - name: Set up Go
       uses: actions/setup-go@v5

devices/common.go

@@ -39,33 +39,29 @@ type ControllableDevice interface {
 // and returns them as a slice of ControllableDevice.
 func GetAllControllableDevices() ([]ControllableDevice, error) {
 	var allDevices []ControllableDevice
-	var errs []error
 
-	// Get Android devices
+	// get Android devices
 	androidDevices, err := GetAndroidDevices() // Assumes this now returns []ControllableDevice
 	if err != nil {
-		// Log or collect error, decide if it's fatal or if we continue
 		utils.Verbose("Warning: Failed to get Android devices: %v", err)
-		errs = append(errs, fmt.Errorf("android: %w", err))
 	} else {
 		allDevices = append(allDevices, androidDevices...)
 	}
 
-	// Get iOS real devices
+	// get iOS real devices
 	iosDevices, err := ListIOSDevices()
 	if err != nil {
 		utils.Verbose("Warning: Failed to get iOS real devices: %v", err)
-		errs = append(errs, fmt.Errorf("ios real: %w", err))
 	} else {
 		for _, device := range iosDevices {
 			allDevices = append(allDevices, &device)
 		}
 	}
 
+	// get iOS simulator devices
 	sims, err := GetBootedSimulators()
 	if err != nil {
 		utils.Verbose("Warning: Failed to get iOS simulators: %v", err)
-		errs = append(errs, fmt.Errorf("ios simulator: %w", err))
 	} else {
 		for _, sim := range sims {
 			allDevices = append(allDevices, &SimulatorDevice{

devices/ios.go

@@ -267,7 +267,7 @@
 			}
 
 			// wait 1 second after pressing home, so we make sure wda is in the background
 			d.wdaClient.PressButton("HOME")
 			time.Sleep(1 * time.Second)
 
 			utils.Verbose("WebDriverAgent started")
@@ -304,7 +304,7 @@
 	if err != nil {
 		return goios.DeviceEntry{}, fmt.Errorf("could not connect to RSD: %w", err)
 	}
 	defer rsdService.Close()
 
 	rsdProvider, err := rsdService.Handshake()
 	if err != nil {
@@ -366,30 +366,6 @@
 	return device, nil
 }
 
-// Legacy function kept for compatibility - now just calls the method
-func getEnhancedDevice(udid string) (goios.DeviceEntry, error) {
-	device, err := goios.GetDevice(udid)
-	if err != nil {
-		return goios.DeviceEntry{}, fmt.Errorf("device not found: %s: %w", udid, err)
-	}
-
-	// Fallback to HTTP API only - no access to tunnel manager from standalone function
-	info, err := tunnel.TunnelInfoForDevice(device.Properties.SerialNumber, "localhost", 60105)
-	if err == nil {
-		device.UserspaceTUNPort = info.UserspaceTUNPort
-		device.UserspaceTUNHost = "localhost"
-		device.UserspaceTUN = info.UserspaceTUN
-		device, err = deviceWithRsdProvider(device, udid, info.Address, info.RsdPort)
-		if err != nil {
-			utils.Verbose("failed to get device with RSD provider: %v", err)
-		}
-	} else {
-		utils.Verbose("failed to get tunnel info for device %s: %v", udid, err)
-	}
-
-	return device, nil
-}
-
 func (d IOSDevice) LaunchApp(bundleID string) error {
 	if bundleID == "" {
 		return fmt.Errorf("bundleID cannot be empty")
@@ -406,7 +382,7 @@
 	if err != nil {
 		return fmt.Errorf("processcontrol failed: %w", err)
 	}
 	defer pControl.Close()
 
 	opts := map[string]any{}
 	args := []interface{}{}
@@ -437,7 +413,7 @@
 	if err != nil {
 		return fmt.Errorf("processcontrol failed: %w", err)
 	}
 	defer pControl.Close()
 
 	svc, err := installationproxy.New(device)
 	if err != nil {

devices/simulator.go

@@ -205,13 +205,13 @@
 }
 
 func (s SimulatorDevice) WaitUntilAppExists(bundleID string) error {
-	installedApps, err := s.ListInstalledApps()
-	if err != nil {
-		return fmt.Errorf("failed to list installed apps: %v", err)
-	}
-
 	startTime := time.Now()
 	for {
+		installedApps, err := s.ListInstalledApps()
+		if err != nil {
+			return fmt.Errorf("failed to list installed apps: %v", err)
+		}
+
 		_, ok := installedApps[bundleID]
 		if ok {
 			return nil
@@ -232,13 +232,13 @@
 	if err != nil {
 		return "", fmt.Errorf("failed to create temp file: %v", err)
 	}
 	tmpFile.Close()
 
 	log.Printf("Downloading WebDriverAgent to: %s", tmpFile.Name())
 
 	err = utils.DownloadFile(url, tmpFile.Name())
 	if err != nil {
 		os.Remove(tmpFile.Name())
 		return "", fmt.Errorf("failed to download WebDriverAgent: %v", err)
 	}
 
@@ -252,7 +252,7 @@
 		return fmt.Errorf("failed to download WebDriverAgent: %v", err)
 	}
 
 	defer os.Remove(file)
 
 	log.Printf("Downloaded WebDriverAgent to %s", file)
 
@@ -261,7 +261,7 @@
 		return fmt.Errorf("failed to unzip WebDriverAgent: %v", err)
 	}
 
 	defer os.RemoveAll(dir)
 	log.Printf("Unzipped WebDriverAgent to %s", dir)
 
 	err = InstallApp(s.UDID, dir+"/WebDriverAgentRunner-Runner.app")

test/simctl.ts

@@ -55,8 +55,8 @@ export function waitForSimulatorReady(simulatorId: string, timeout: number = 300
       const stdout = execSync(`xcrun simctl list devices | grep "${simulatorId}"`, 
         { encoding: 'utf8' });
       if (stdout.includes('(Booted)')) {
-        // Give it a bit more time to fully initialize
-        execSync('sleep 2');
+        // see if we can interact with status_bar, gets us closer to a functioning simulator
+        execSync(`xcrun simctl status_bar "${simulatorId}" list`);
         return;
       }
     } catch (error) {

test/simulator.ts

@@ -94,9 +94,7 @@ describe('iOS Simulator Tests', () => {
   });
 });
 
-// Screenshot test helper functions with descriptive English names
-
-function mobilecli(args: string, description: string): void {
+function mobilecli(args: string): void {
   const mobilecliBinary = path.join(__dirname, '..', 'mobilecli');
   const command = `${mobilecliBinary} ${args}`;
 
@@ -107,7 +105,7 @@ function mobilecli(args: string, description: string): void {
       stdio: ['pipe', 'pipe', 'pipe']
     });
   } catch (error: any) {
-    console.log(`${description} command failed: ${command}`);
+    console.log(`Command failed: ${command}`);
     if (error.stderr) {
       console.log(`Error stderr: ${error.stderr}`);
     }
@@ -122,10 +120,7 @@ function mobilecli(args: string, description: string): void {
 }
 
 function takeScreenshot(simulatorId: string, screenshotPath: string): void {
-  mobilecli(
-    `screenshot --device ${simulatorId} --format png --output ${screenshotPath}`,
-    'Screenshot'
-  );
+  mobilecli(`screenshot --device ${simulatorId} --format png --output ${screenshotPath}`);
 }
 
 function verifyScreenshotFileWasCreated(screenshotPath: string): void {
@@ -142,9 +137,6 @@ function verifyScreenshotFileHasValidContent(screenshotPath: string): void {
 }
 
 function openUrl(simulatorId: string, url: string): void {
-  mobilecli(
-    `url "${url}" --device ${simulatorId}`,
-    'URL'
-  );
+  mobilecli(`url "${url}" --device ${simulatorId}`);
 }