Handle transient CoreSimulator hierarchy errors

Author: DjDeveloperr

server/src/api/routes.rs

@@ -495,13 +495,12 @@ async fn accessibility_tree(
                         fallback_reason,
                     )))
                 }
-                Err(inspector_error) => {
+                Err(_inspector_error) => {
                     let available_sources = available_sources_with_native_ax(Some(&session));
                     match state.registry.bridge().accessibility_snapshot(&udid, None) {
-                        Ok(native_snapshot) => Ok(json(attach_tree_metadata(
+                        Ok(native_snapshot) => Ok(json(attach_available_sources(
                             native_snapshot,
                             &available_sources,
-                            Some(inspector_error),
                         ))),
                         Err(native_ax_error) => Ok(json(empty_accessibility_tree(
                             SOURCE_NATIVE_AX,
@@ -512,13 +511,12 @@ async fn accessibility_tree(
                 }
             }
         }
-        Err(inspector_error) => {
+        Err(_inspector_error) => {
             let available_sources = available_sources_with_native_ax(None);
             match state.registry.bridge().accessibility_snapshot(&udid, None) {
-                Ok(native_snapshot) => Ok(json(attach_tree_metadata(
+                Ok(native_snapshot) => Ok(json(attach_available_sources(
                     native_snapshot,
                     &available_sources,
-                    Some(inspector_error),
                 ))),
                 Err(native_ax_error) => Ok(json(empty_accessibility_tree(
                     SOURCE_NATIVE_AX,
@@ -990,12 +988,20 @@ fn empty_accessibility_tree(
 }
 
 fn suppress_native_ax_translation_error(message: &str) -> Option<String> {
-    if message.contains("No translation object returned for simulator") {
+    if message.contains("No translation object returned for simulator")
+        || is_core_simulator_service_mismatch(message)
+    {
         return None;
     }
     Some(message.to_owned())
 }
 
+fn is_core_simulator_service_mismatch(message: &str) -> bool {
+    message.contains("CoreSimulator.framework was changed while the process was running")
+        || message.contains("Service version")
+            && message.contains("does not match expected service version")
+}
+
 fn attach_tree_metadata(
     mut snapshot: Value,
     available_sources: &[String],

server/src/native/bridge.rs

@@ -4,6 +4,7 @@ use serde::de::Error as DeError;
 use serde::{Deserialize, Serialize};
 use std::ffi::{c_void, CStr, CString};
 use std::ptr;
+use std::time::Duration;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Simulator {
@@ -254,11 +255,13 @@ impl NativeBridge {
         point: Option<(f64, f64)>,
     ) -> Result<serde_json::Value, AppError> {
         let udid = CString::new(udid).map_err(|e| AppError::bad_request(e.to_string()))?;
-        let json = unsafe {
-            let mut error = ptr::null_mut();
-            let raw =
-                ffi::xcw_native_accessibility_snapshot(udid.as_ptr(), false, 0.0, 0.0, &mut error);
-            string_from_raw(raw, error)?
+        let json = match native_accessibility_snapshot_json(&udid) {
+            Ok(json) => json,
+            Err(error) if is_core_simulator_service_mismatch(&error.to_string()) => {
+                std::thread::sleep(Duration::from_millis(250));
+                native_accessibility_snapshot_json(&udid)?
+            }
+            Err(error) => return Err(error),
         };
         let snapshot: serde_json::Value =
             serde_json::from_str(&json).map_err(|e| AppError::internal(e.to_string()))?;
@@ -613,6 +616,21 @@ impl Drop for NativeSession {
     }
 }
 
+fn native_accessibility_snapshot_json(udid: &CString) -> Result<String, AppError> {
+    unsafe {
+        let mut error = ptr::null_mut();
+        let raw =
+            ffi::xcw_native_accessibility_snapshot(udid.as_ptr(), false, 0.0, 0.0, &mut error);
+        string_from_raw(raw, error)
+    }
+}
+
+fn is_core_simulator_service_mismatch(message: &str) -> bool {
+    message.contains("CoreSimulator.framework was changed while the process was running")
+        || message.contains("Service version")
+            && message.contains("does not match expected service version")
+}
+
 fn accessibility_snapshot_at_point(
     snapshot: serde_json::Value,
     x: f64,