Harden JS API integration cleanup

Author: DjDeveloperr

scripts/integration/js-api.mjs

@@ -276,14 +276,17 @@ async function main() {
       ),
     { phase: phaseSimulatorLifecycle },
   );
+  await measuredStep("close JS API session", () => closeSession(), {
+    phase: phaseSimulatorLifecycle,
+  });
   await measuredStep(
     "shutdown simulator",
     () => shutdownSimulatorIfNeeded(simulatorUDID),
     { phase: phaseSimulatorLifecycle },
   );
   await measuredStep(
     "erase simulator",
-    () => runJson(simdeck, ["erase", simulatorUDID]),
+    () => eraseSimulatorReliably(simulatorUDID),
     {
       phase: phaseSimulatorLifecycle,
     },
@@ -542,7 +545,10 @@ function preapproveFixtureUrlScheme() {
 
 function shutdownSimulatorIfNeeded(udid) {
   try {
-    return runJson(simdeck, ["shutdown", udid]);
+    runText("xcrun", ["simctl", "shutdown", udid], {
+      timeoutMs: 180_000,
+    });
+    return { ok: true, udid, action: "shutdown" };
   } catch (error) {
     if (String(error?.message ?? error).includes("current state: Shutdown")) {
       return { ok: true, udid, alreadyShutdown: true };
@@ -551,6 +557,27 @@ function shutdownSimulatorIfNeeded(udid) {
   }
 }
 
+function eraseSimulatorReliably(udid) {
+  return retrySync(
+    () => {
+      shutdownSimulatorIfNeeded(udid);
+      runText("xcrun", ["simctl", "erase", udid], {
+        timeoutMs: 180_000,
+      });
+      return { ok: true, udid, action: "erase" };
+    },
+    "erase simulator",
+    3,
+    3_000,
+  );
+}
+
+function closeSession() {
+  session?.close();
+  session = null;
+  return { ok: true };
+}
+
 function assertRoots(payload, label) {
   assertJson(payload, label);
   if (!Array.isArray(payload.roots) || payload.roots.length === 0) {
@@ -720,7 +747,7 @@ function openSimulatorApp(udid) {
 
 function cleanup() {
   try {
-    session?.close();
+    closeSession();
   } catch {}
   if (simulatorUDID && !keepSimulator) {
     spawnSync("xcrun", ["simctl", "shutdown", simulatorUDID], {