serve-sim 0.1.45 → 0.1.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serve-sim",
-  "version": "0.1.45",
+  "version": "0.1.46",
   "type": "module",
   "author": {
     "name": "Evan Bacon",
@@ -35,6 +35,7 @@
     "src/camera-helper.ts",
     "src/middleware.ts",
     "src/native.ts",
+    "src/simctl.ts",
     "src/state.ts",
     "Sources/SimCameraInjector/SimCameraInjector.m",
     "Sources/SimCameraInjector/SimCam*.h",
@@ -48,6 +49,8 @@
     "dist/native/serve-sim-native.node",
     "Package.swift",
     "Sources/SimNative/*.swift",
+    "Sources/SimNativeSupport/*.swift",
+    "Tests/SimNativeSupportTests/*.swift",
     "Sources/SimNative/build.sh"
   ],
   "exports": {

package/src/middleware.ts

@@ -32,6 +32,7 @@ import {
 import { createExecUpgradeHandler, type UiRequestHandler } from "./exec-ws";
 import { UI_OPTIONS, getUiStatus, normalizeUiValue, setUiOption } from "./ui-settings";
 import type { PreviewInitialState } from "./preview-initial-state";
+import { simctlBootStatusArguments } from "./simctl";
 
 type SimReq = IncomingMessage;
 type SimRes = ServerResponse;
@@ -769,7 +770,10 @@ export async function startDeviceInProcess(udid: string, port: number, base: str
   // `simctl boot` errors when already booted — ignore and let bootstatus confirm.
   await new Promise<void>((resolve) => execFile("xcrun", ["simctl", "boot", udid], () => resolve()));
   const ready = await new Promise<boolean>((resolve) => {
-    execFile("xcrun", ["simctl", "bootstatus", udid, "-b"], { timeout: 180_000 }, (err) => resolve(!err));
+    // Boot was already requested above. Passing `-b` redundantly can remain
+    // blocked on Xcode 27 even after `simctl list` reports Booted, so only
+    // monitor the transition already in progress.
+    execFile("xcrun", simctlBootStatusArguments(udid), { timeout: 180_000 }, (err) => resolve(!err));
   });
   if (!ready) {
     // bootstatus can exit non-zero even when the device is actually ready;

package/src/native.ts

@@ -33,9 +33,9 @@ interface SimHIDHandle {
 }
 
 interface SimCaptureHandle {
-  start(): void;
-  stop(): void;
-  subscribe(codec: number, onFrame: RawFrameCallback): Promise<() => void>;
+  start(): Promise<void>;
+  stop(): Promise<void>;
+  subscribe(codec: number, onFrame: RawFrameCallback): Promise<() => void | Promise<void>>;
 }
 
 interface NativeAddon {
@@ -196,18 +196,18 @@ export class NativeCapture {
     this.handle = new (load().SimCapture)(udid);
   }
 
-  /** Begin capturing. Throws if the device isn't booted. */
-  start(): void {
-    this.handle.start();
+  /** Begin capturing. Rejects if the device isn't booted. */
+  start(): Promise<void> {
+    return this.handle.start();
   }
 
-  subscribeMjpeg(onFrame: (frame: MjpegFrame) => Promise<void>): Promise<() => void> {
+  subscribeMjpeg(onFrame: (frame: MjpegFrame) => Promise<void>): Promise<() => void | Promise<void>> {
     return this.handle.subscribe(CODEC_MJPEG, (data, width, height, _flags) => {
       return onFrame({ data, width, height });
     });
   }
 
-  subscribeAvcc(onFrame: (frame: AvccFrame) => Promise<void>): Promise<() => void> {
+  subscribeAvcc(onFrame: (frame: AvccFrame) => Promise<void>): Promise<() => void | Promise<void>> {
     return this.handle.subscribe(CODEC_AVCC, (data, width, height, flags) => {
       return onFrame({
         data,
@@ -220,8 +220,8 @@ export class NativeCapture {
   }
 
   /** Halt frame production. Full teardown happens when this object is GC'd. */
-  stop(): void {
-    this.handle.stop();
+  stop(): Promise<void> {
+    return this.handle.stop();
   }
 }
 

package/src/simctl.ts

@@ -0,0 +1,11 @@
+/**
+ * Arguments for monitoring a boot that serve-sim has already requested.
+ *
+ * `-b` means "boot if needed". Keeping it out is intentional: after a separate
+ * `simctl boot`, Xcode 27 can leave the redundant boot-and-monitor form blocked
+ * even though the device is already Booted. This form only monitors the boot
+ * transition that serve-sim requested.
+ */
+export function simctlBootStatusArguments(udid: string): [string, string, string] {
+  return ["simctl", "bootstatus", udid];
+}