serve-sim 0.1.49 → 0.1.50-beta.145.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serve-sim",
-  "version": "0.1.49",
+  "version": "0.1.50-beta.145.1",
   "type": "module",
   "author": {
     "name": "Evan Bacon",

package/src/device-session.ts

@@ -28,6 +28,7 @@ import {
   Orientation,
   axDescribeAsync,
   axFrontmostAsync,
+  duoHidHelperPath,
   type MjpegFrame,
 } from "./native";
 import { createReadStream } from "fs";
@@ -311,7 +312,7 @@ export class DeviceSession {
         if (!this.dependencies?.createDuoMonitor) {
           void warnDeviceHubInput(this.udid).then((shadowed) => { this.deviceHubShadowed = shadowed; });
         }
-        const createMonitor = this.dependencies?.createDuoMonitor ?? ((udid, onState) => new DuoStateMonitor(udid, onState));
+        const createMonitor = this.dependencies?.createDuoMonitor ?? ((udid, onState) => new DuoStateMonitor(udid, onState, { duoHelper: duoHidHelperPath }));
         this.duoMonitor = createMonitor(this.udid, (state) => {
           void this.followDuoState(state).catch((error) => {
             console.error("[duo] State update failed:", error);

package/src/duo-state.ts

@@ -2,9 +2,9 @@ import { execFile, spawn, type ChildProcess } from "node:child_process";
 import type { SimulatorOrientation } from "./client/types";
 import { simctlArguments } from "./simctl";
 
+/** One `angle <degrees>` line from `serve-sim-duo-hid watch-angle`. */
 export function parseHingeSample(line: string): number | null {
-  if (!/AngleValid:Y\b/.test(line)) return null;
-  const match = /\bAngle:\s*(-?[\d.]+)°/.exec(line);
+  const match = /^angle (\d+(?:\.\d+)?)$/.exec(line.trim());
   const angle = match ? Number(match[1]) : NaN;
   return Number.isFinite(angle) && angle >= 0 && angle <= 180 ? angle : null;
 }
@@ -40,6 +40,18 @@ export interface DuoState {
   orientations: Partial<Record<"cover" | "inner", SimulatorOrientation>>;
 }
 
+export interface DuoStateMonitorOptions {
+  /**
+   * Path of the guest helper (`serve-sim-duo-hid`). Resolved when the hinge
+   * reader starts; if it throws, the hinge stays unknown and the rest of the
+   * monitor keeps running.
+   */
+  duoHelper: () => string;
+  /** Process launchers; tests substitute fakes. */
+  spawn?: typeof spawn;
+  execFile?: typeof execFile;
+}
+
 /** One shared monitor per device session; phones never start these processes. */
 export class DuoStateMonitor {
   private stopped = false;
@@ -51,8 +63,17 @@ export class DuoStateMonitor {
   private retry?: ReturnType<typeof setTimeout>;
   private poll?: ReturnType<typeof setTimeout>;
   private state: DuoState = { orientations: {} };
+  private hingeFailureLogged = false;
+  private readonly spawn: typeof spawn;
+  private readonly execFile: typeof execFile;
 
-  constructor(private readonly udid: string, private readonly onState: (state: DuoState) => void) {
+  constructor(
+    private readonly udid: string,
+    private readonly onState: (state: DuoState) => void,
+    private readonly options: DuoStateMonitorOptions,
+  ) {
+    this.spawn = options.spawn ?? spawn;
+    this.execFile = options.execFile ?? execFile;
     this.watchPanels();
     this.watchHinge();
     this.refreshOrientation();
@@ -61,7 +82,7 @@ export class DuoStateMonitor {
   refreshOrientation(): void {
     if (this.stopped || this.enumeration) return;
     if (this.poll) clearTimeout(this.poll);
-    this.enumeration = execFile("/usr/bin/xcrun", simctlArguments(["io", this.udid, "enumerate"]),
+    this.enumeration = this.execFile("/usr/bin/xcrun", simctlArguments(["io", this.udid, "enumerate"]),
       { timeout: 3000, maxBuffer: 1024 * 1024 }, (error, stdout) => {
         this.enumeration = undefined;
         if (this.stopped) return;
@@ -89,7 +110,7 @@ export class DuoStateMonitor {
       this.onState(this.state);
       this.refreshOrientation();
     };
-    const child = spawn("/usr/bin/xcrun", simctlArguments(["spawn", this.udid, "log", "stream", "--style", "compact", "--predicate", predicate]), { stdio: ["ignore", "pipe", "ignore"] });
+    const child = this.spawn("/usr/bin/xcrun", simctlArguments(["spawn", this.udid, "log", "stream", "--style", "compact", "--predicate", predicate]), { stdio: ["ignore", "pipe", "ignore"] });
     this.panelMonitor = child;
     let pending = "";
     child.stdout.setEncoding("utf8");
@@ -103,7 +124,7 @@ export class DuoStateMonitor {
       }
     });
     // Seed from this boot's most recent transition, then let live events win.
-    this.panelSeed = execFile("/usr/bin/xcrun", simctlArguments(["spawn", this.udid, "log", "show", "--last", "boot", "--style", "compact", "--predicate", predicate]),
+    this.panelSeed = this.execFile("/usr/bin/xcrun", simctlArguments(["spawn", this.udid, "log", "show", "--last", "boot", "--style", "compact", "--predicate", predicate]),
       { timeout: 10000, maxBuffer: 4 * 1024 * 1024 }, (error, stdout) => {
         this.panelSeed = undefined;
         if (!error && !liveSample) {
@@ -122,10 +143,25 @@ export class DuoStateMonitor {
 
   private watchHinge(): void {
     if (this.stopped) return;
-    const child = spawn("/usr/bin/xcrun", ["devicectl", "device", "motion", "hinge-angle", "--device", this.udid,
-      "--session-timeout", "60", "--timeout", "65", "--change-threshold", "0.5"], { stdio: ["ignore", "pipe", "ignore"] });
+    let duoHelper: string;
+    try {
+      duoHelper = this.options.duoHelper();
+    } catch (error) {
+      console.error(`[duo] Hinge reader unavailable: ${error instanceof Error ? error.message : String(error)}`);
+      return;
+    }
+    // Read inside the guest from CoreMotion, the source UIKit's UIHinge reads,
+    // so the hinge doesn't depend on devicectl: `devicectl device motion` is
+    // missing from devicectl 651.13.5 (Xcode 27.1 27A9275) and later.
+    // stdin stays open: the reader exits when it closes.
+    const child = this.spawn("/usr/bin/xcrun", simctlArguments(["spawn", this.udid, duoHelper, "watch-angle"]),
+      { stdio: ["pipe", "pipe", "pipe"] });
     this.monitor = child;
     let pending = "";
+    let stderr = "";
+    child.stdin.on("error", () => {});
+    child.stderr.setEncoding("utf8");
+    child.stderr.on("data", (chunk: string) => { stderr = (stderr + chunk).slice(-1024); });
     child.stdout.setEncoding("utf8");
     child.stdout.on("data", (chunk: string) => {
       pending += chunk;
@@ -140,9 +176,16 @@ export class DuoStateMonitor {
       }
     });
     child.on("error", () => {}); // close also fires for failed spawns; retry there.
-    child.once("close", () => {
+    child.once("close", (code, signal) => {
       if (this.monitor === child) this.monitor = undefined;
       if (this.stopped) return;
+      // A reader that keeps failing would otherwise leave the hinge unknown
+      // without a trace; say why once per session.
+      if (!this.hingeFailureLogged) {
+        this.hingeFailureLogged = true;
+        const reason = stderr.trim() || (signal ? `signal ${signal}` : `exit code ${code}`);
+        console.error(`[duo] Hinge reader stopped (${reason}); retrying.`);
+      }
       this.retry = setTimeout(() => this.watchHinge(), 1000);
       this.retry.unref();
     });
@@ -155,6 +198,7 @@ export class DuoStateMonitor {
     this.panelSeed?.kill();
     clearTimeout(this.retry);
     clearTimeout(this.poll);
+    this.monitor?.stdin?.end();
     this.monitor?.kill();
     this.enumeration?.kill();
   }

package/src/native.ts

@@ -164,6 +164,11 @@ function resolveAddon(): string {
   );
 }
 
+/** The guest-side Duo helper (`simctl spawn`): HID commands and the hinge reader. */
+export function duoHidHelperPath(): string {
+  return join(dirname(resolveAddon()), "..", "simduo", "serve-sim-duo-hid");
+}
+
 let addon: NativeAddon | undefined;
 function load(): NativeAddon {
   if (!addon) {
@@ -184,7 +189,7 @@ export class NativeHid {
   private readonly keys: KeySequencer;
 
   constructor(udid: string) {
-    this.handle = new (load().SimHID)(udid, join(dirname(resolveAddon()), "..", "simduo", "serve-sim-duo-hid"));
+    this.handle = new (load().SimHID)(udid, duoHidHelperPath());
     this.keys = new KeySequencer(this.handle);
   }