Stabilize simulator lifecycle teardown

Author: DjDeveloperr

server/src/api/routes.rs

@@ -546,7 +546,7 @@ async fn boot_simulator(
     State(state): State<AppState>,
     Path(udid): Path<String>,
 ) -> Result<Json<Value>, AppError> {
-    state.registry.remove(&udid);
+    forget_lifecycle_session(&state, &udid);
     let action_udid = udid.clone();
     run_bridge_action(state.clone(), move |bridge| {
         bridge.boot_simulator(&action_udid)
@@ -559,25 +559,33 @@ async fn shutdown_simulator(
     State(state): State<AppState>,
     Path(udid): Path<String>,
 ) -> Result<Json<Value>, AppError> {
+    forget_lifecycle_session(&state, &udid);
     let action_udid = udid.clone();
     run_bridge_action(state.clone(), move |bridge| {
         bridge.shutdown_simulator(&action_udid)
     })
     .await?;
-    state.registry.remove(&udid);
     simulator_payload(state, udid).await
 }
 
 async fn erase_simulator(
     State(state): State<AppState>,
     Path(udid): Path<String>,
 ) -> Result<Json<Value>, AppError> {
-    state.registry.remove(&udid);
+    forget_lifecycle_session(&state, &udid);
     let action_udid = udid.clone();
     run_bridge_action(state, move |bridge| bridge.erase_simulator(&action_udid)).await?;
     Ok(json(json_value!({ "ok": true })))
 }
 
+fn forget_lifecycle_session(state: &AppState, udid: &str) {
+    // SimulatorKit can reset the server-side connection if a cached private
+    // display session is destructed while CoreSimulator is booting, shutting
+    // down, or erasing the same device. Detach it from the registry without
+    // running Objective-C teardown on the lifecycle response path.
+    state.registry.forget(udid);
+}
+
 async fn install_app(
     State(state): State<AppState>,
     Path(udid): Path<String>,

server/src/simulators/registry.rs

@@ -44,6 +44,12 @@ impl<T: Clone> SessionStore<T> {
     fn remove(&self, key: &str) {
         self.sessions.lock().unwrap().remove(key);
     }
+
+    fn forget(&self, key: &str) {
+        if let Some(value) = self.sessions.lock().unwrap().remove(key) {
+            std::mem::forget(value);
+        }
+    }
 }
 
 #[derive(Clone)]
@@ -106,6 +112,10 @@ impl<T: Clone + Send + 'static> SessionRegistry<T> {
     pub fn remove(&self, udid: &str) {
         self.store.remove(udid);
     }
+
+    pub fn forget(&self, udid: &str) {
+        self.store.forget(udid);
+    }
 }
 
 impl SessionRegistry<SimulatorSession> {