@expo/simulator-launcher 27.3.0 → 27.4.1

package/README.md

@@ -15,11 +15,11 @@ exec bunx @expo/simulator-launcher@latest start
 - `start`: run one orphan serve-sim for the configured devices. Its default device becomes ready
   first; additional devices warm in the background. Argent and agent-device prestart on the default.
 - `claim ENGINE [DEVICE]`: reserve one job and return its selected device plus the existing server's
-  identity, port and credentials. Engines: `serve-sim`, `agent-device`, `argent`.
+  identity, port and credentials. Engines: `serve-sim`, `agent-device`, `argent`, `appium`.
   No DEVICE means the first configured device. Claim does not boot the selected device or wait for
   its tool. Build-tools privately adopts that device on the existing serve-sim port.
 - `prepare-tools`: continue the consumed claim after adoption. Keep global Argent, reuse the default
-  agent-device runner or prepare a runner for the selected device.
+  agent-device runner or prepare a runner for the selected device. Appium waits for old XCTest cleanup.
 - `stop`: permanently end warmup for this boot and wait for all owned resources to be cleaned up.
 
 ```sh
@@ -66,6 +66,7 @@ serializes updates; an abandoned lock fails closed. This private format requires
   and app actions. Job-time version and authentication checks remain authoritative.
 - Agent-device prestarts on the default device only. A secondary claim prepares its runner after
   adoption and old-runner cleanup finish. One device-independent Argent server is reused for the claimed device.
+  Appium waits for unused tools to stop before starting its own WDA.
 - Warmup downloads/extracts the latest stable Expo Go once and reuses it for the second device.
   Each initial device gets a preinstall attempt; ordinary failures warn. Claim prevents new
   preinstalls. `prepare-tools` waits for an install still running on the claimed device and

package/dist/index.js

@@ -15,13 +15,54 @@ async function claimAsync(bootUuid, engine, requestedDevice) {
     if (!input.success) {
         throw new Error(`Invalid Simulator session request. Choose ${state_1.ClaimInputSchema.shape.engine.options.join(', ')} and an optional device name or UDID.`);
     }
+    // Startup and handoff share the worker's existing claim timeout.
+    const startedAt = Date.now();
+    const deadline = startedAt + 420_000;
+    let lastWaitLogAt;
+    let controller;
+    const ready = await (0, state_1.waitForLauncherStateAsync)(bootUuid, state => {
+        if (state?.status === 'stopping' || state?.status === 'disabled' || state?.error) {
+            throw new Error(`Simulator preparation was interrupted; cleanup may still be running.${state.error ? ` ${state.error}` : ''}`);
+        }
+        if (!state ||
+            (state.status !== 'starting' && state.status !== 'ready') ||
+            state.controllerPid === undefined) {
+            throw new Error('No warm Simulator session is available to claim on this VM.');
+        }
+        if (controller &&
+            (state.controllerPid !== controller.controllerPid ||
+                (controller.controllerStartTime !== undefined &&
+                    state.controllerStartTime !== controller.controllerStartTime))) {
+            throw new Error('The Simulator launcher returned a different session or engine.');
+        }
+        controller = state;
+        if (state.status === 'starting') {
+            const now = Date.now();
+            if (lastWaitLogAt === undefined || now - lastWaitLogAt >= 30_000) {
+                process.stderr.write(`Warm Simulator is still starting; waiting (${Math.floor((now - startedAt) / 1_000)}s elapsed, 420s limit).\n`);
+                lastWaitLogAt = now;
+            }
+        }
+        return state.status === 'ready';
+    }, deadline - Date.now());
+    const prepared = state_1.WarmSessionInfoSchema.parse(ready);
     const acquired = await (0, state_1.updateLauncherStateAsync)(bootUuid, state => {
         if (state?.status !== 'ready') {
             throw new Error('No warm Simulator session is available to claim on this VM.');
         }
+        if (state.controllerPid !== prepared.controllerPid ||
+            state.controllerStartTime !== prepared.controllerStartTime) {
+            throw new Error('The Simulator launcher returned a different session or engine.');
+        }
+        if (Date.now() >= deadline) {
+            throw new Error('Timed out waiting for the Simulator launcher; cleanup may still be running.');
+        }
         state_1.WarmSessionInfoSchema.parse(state);
         return { ...state, ...input.data, status: 'claiming' };
     });
+    if (lastWaitLogAt !== undefined) {
+        process.stderr.write(`Warm Simulator became ready after waiting ${Math.floor((Date.now() - startedAt) / 1_000)}s.\n`);
+    }
     const claimed = await (0, state_1.waitForLauncherStateAsync)(bootUuid, state => {
         if (!state || state.status === 'stopping' || state.status === 'disabled') {
             throw new Error(`Simulator preparation was interrupted; cleanup may still be running.${state?.error ? ` ${state.error}` : ''}`);
@@ -32,7 +73,7 @@ async function claimAsync(bootUuid, engine, requestedDevice) {
             throw new Error('The Simulator launcher returned a different session or engine.');
         }
         return state.status === 'claimed';
-    }, 420_000);
+    }, Math.max(0, deadline - Date.now()));
     const { device } = state_1.WarmSessionInfoSchema.parse(claimed);
     if (requestedDevice &&
         device.name !== requestedDevice &&
@@ -439,7 +480,8 @@ function createWarmSimulatorSession({ signal: parentSignal, throwIfStoppingAsync
             // runs in the background but is joined before teardown.
             startSimulatorsSetupAsync([info.device.udid], Promise.resolve()).catch(() => { });
             const tool = warmTools.find(tool => tool.name === engine);
-            if (tool?.name === 'agent-device' && !startedTools.has(tool)) {
+            // In particular, Appium cannot start WDA until old XCTest retirement succeeded.
+            if (engine === 'appium' || (tool?.name === 'agent-device' && !startedTools.has(tool))) {
                 const results = await toolRetirement;
                 const failed = results.find(result => result.status === 'rejected');
                 if (failed?.status === 'rejected') {
@@ -1538,7 +1580,7 @@ exports.WarmServerSchema = zod_1.z.object({
 });
 const ToolServerSchema = exports.WarmServerSchema.pick({ pid: true, port: true, token: true });
 exports.ClaimInputSchema = zod_1.z.object({
-    engine: zod_1.z.enum(['serve-sim', 'agent-device', 'argent']),
+    engine: zod_1.z.enum(['serve-sim', 'agent-device', 'argent', 'appium']),
     requestedDevice: NonBlankStringSchema.optional(),
 });
 /** The Expo Go this launcher installed on `udid` and never launched. */
@@ -18076,7 +18118,7 @@ module.exports = exports.default;
 /***/ 8330:
 /***/ ((module) => {
 
-module.exports = {"rE":"27.3.0"};
+module.exports = {"rE":"27.4.1"};
 
 /***/ })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/simulator-launcher",
-  "version": "27.3.0",
+  "version": "27.4.1",
   "description": "Launch and claim Simulator sessions on EAS workers",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
@@ -34,5 +34,5 @@
     "typescript": "^6.0.3",
     "zod": "^4.3.5"
   },
-  "gitHead": "bc25602d655eb5d5e3f3174836e13b567cae919d"
+  "gitHead": "3263ecfa369459437d7b5180564a796192f1189a"
 }