@mentra/engine 3.2.0-dev.213 → 3.2.0-dev.214

package/src/services/PhoneCameraFovCoordinator.ts

@@ -12,6 +12,7 @@ interface OverrideEntry {
   fov: number
   roiPosition: "center" | "bottom" | "top"
   order: number
+  releasing?: boolean
 }
 
 let leaseCounter = 0
@@ -41,6 +42,11 @@ export class PhoneCameraFovCoordinator {
 
   constructor(private readonly legacyRestartSettleMs = LEGACY_CAMERA_RESTART_SETTLE_MS) {}
 
+  /** Capture a barrier for FOV work already submitted, excluding future requests. */
+  whenSettled(): Promise<void> {
+    return this.queue.then(() => undefined)
+  }
+
   /** Report-safe FOV ownership snapshot for incident diagnostics. */
   getDiagnosticSnapshot(): Record<string, unknown> {
     return {
@@ -114,6 +120,11 @@ export class PhoneCameraFovCoordinator {
       if (!leaseId) return
       const entry = [...this.overrides.values()].find((candidate) => candidate.leaseId === leaseId)
       if (!entry) return
+      if (entry.releasing) {
+        const owner = [...this.overrides.entries()].find(([, candidate]) => candidate === entry)![0]
+        await this.releaseOverride(owner)
+        return
+      }
       await BluetoothSdk.setCameraFovOverride({
         leaseId,
         fov: entry.fov,
@@ -124,56 +135,69 @@ export class PhoneCameraFovCoordinator {
     })
   }
 
-  releaseForApp(packageName: string): Promise<void> {
+  releaseForApp(packageName: string, cameraCleanup: Promise<void> = Promise.resolve()): Promise<void> {
+    // Reserve the queue slot now, before waiting for capture teardown. A respawn
+    // must not install a new crop that this old incarnation's cleanup releases.
     return this.enqueue(async () => {
-      const removed = this.overrides.get(packageName)
-      if (!removed) return
-      if (removed.leaseId !== this.effectiveLeaseId) {
-        this.overrides.delete(packageName)
-        return
-      }
+      await cameraCleanup
+      await this.releaseOverride(packageName)
+    })
+  }
 
-      const next = [...this.overrides.entries()]
-        .filter(([candidatePackage]) => candidatePackage !== packageName)
-        .map(([, entry]) => entry)
-        .sort((a, b) => b.order - a.order)[0]
-      if (this.legacyMode) {
-        if (next) {
-          await this.applyLegacyFov({fov: next.fov, roiPosition: next.roiPosition})
-          this.overrides.delete(packageName)
-          this.effectiveLeaseId = next.leaseId
-        } else {
-          // Legacy commands are one-way and have no lease-release protocol.
-          // Ask native to replay its unchanged persistent base setting, then
-          // probe the modern override path again for the next ownership cycle.
-          await BluetoothSdk.restoreLegacyCameraFov()
-          await this.waitForLegacyCameraRestart()
-          this.overrides.delete(packageName)
-          this.clearRefresh()
-          this.effectiveLeaseId = undefined
-          this.legacyMode = false
-        }
-        return
-      }
+  private async releaseOverride(packageName: string): Promise<void> {
+    const removed = this.overrides.get(packageName)
+    if (!removed) return
+    if (removed.leaseId !== this.effectiveLeaseId) {
+      this.overrides.delete(packageName)
+      return
+    }
+
+    // A failed release must not renew the closing owner's lease forever. Keep
+    // enough identity to retry on reconnect, but let ASG's existing TTL restore
+    // the saved crop if the phone cannot complete cleanup (including camera_busy).
+    removed.releasing = true
+    this.clearRefresh()
+
+    const next = [...this.overrides.entries()]
+      .filter(([candidatePackage, entry]) => candidatePackage !== packageName && !entry.releasing)
+      .map(([, entry]) => entry)
+      .sort((a, b) => b.order - a.order)[0]
+    if (this.legacyMode) {
       if (next) {
-        await BluetoothSdk.setCameraFovOverride({
-          leaseId: next.leaseId,
-          fov: next.fov,
-          roiPosition: next.roiPosition,
-          ttlMs: CAMERA_FOV_OVERRIDE_TTL_MS,
-        })
-        // Commit phone-side ownership only after ASG accepted the replacement. On failure the
-        // closing app remains effective here, allowing unregister/reconnect cleanup to retry.
+        await this.applyLegacyFov({fov: next.fov, roiPosition: next.roiPosition})
         this.overrides.delete(packageName)
         this.effectiveLeaseId = next.leaseId
-        this.scheduleRefresh()
       } else {
-        await BluetoothSdk.releaseCameraFovOverride(removed.leaseId)
+        // Legacy commands are one-way and have no lease-release protocol.
+        // Ask native to replay its unchanged persistent base setting, then
+        // probe the modern override path again for the next ownership cycle.
+        await BluetoothSdk.restoreLegacyCameraFov()
+        await this.waitForLegacyCameraRestart()
         this.overrides.delete(packageName)
         this.clearRefresh()
         this.effectiveLeaseId = undefined
+        this.legacyMode = false
       }
-    })
+      return
+    }
+    if (next) {
+      await BluetoothSdk.setCameraFovOverride({
+        leaseId: next.leaseId,
+        fov: next.fov,
+        roiPosition: next.roiPosition,
+        ttlMs: CAMERA_FOV_OVERRIDE_TTL_MS,
+      })
+      // Commit phone-side ownership only after ASG accepted the replacement. On failure the
+      // closing app remains effective here, allowing unregister/reconnect cleanup to retry.
+      this.overrides.delete(packageName)
+      this.effectiveLeaseId = next.leaseId
+      this.scheduleRefresh()
+    } else {
+      await BluetoothSdk.releaseCameraFovOverride(removed.leaseId)
+      this.overrides.delete(packageName)
+      this.clearRefresh()
+      this.effectiveLeaseId = undefined
+    }
   }
 
   private scheduleRefresh(): void {
@@ -185,7 +209,7 @@ export class PhoneCameraFovCoordinator {
       void this.enqueue(async () => {
         if (this.effectiveLeaseId !== leaseId) return
         const entry = [...this.overrides.values()].find((candidate) => candidate.leaseId === leaseId)
-        if (!entry) return
+        if (!entry || entry.releasing) return
         await BluetoothSdk.setCameraFovOverride({
           leaseId,
           fov: entry.fov,

package/src/services/PhoneStreamCoordinator.ts

@@ -36,6 +36,7 @@
 import BluetoothSdk from "@mentra/bluetooth-sdk/internal"
 import type {StreamResolvedConfig, StreamStartRequest, StreamStatusEvent} from "@mentra/bluetooth-sdk/internal"
 import {isGlassesConnected} from "./GlassesReadiness"
+import {phoneCameraFovCoordinator} from "./PhoneCameraFovCoordinator"
 import {useGlassesStore} from "../stores/glasses"
 
 import {slimStreamStatusEvent, streamStatusSignature} from "./slimStreamStatus"
@@ -210,6 +211,7 @@ export class PhoneStreamCoordinator {
   private idCounter = 0
   private readonly timings: TimingConfig
   private readonly linkSource: GlassesLinkSource
+  private readonly pendingCameraChanges: () => Promise<void>
   private unsubscribeLink: (() => void) | null = null
   private suspended: SuspendedState | null = null
   /**
@@ -233,9 +235,13 @@ export class PhoneStreamCoordinator {
   /** Send full resolvedConfig only once per stream session. */
   private resolvedConfigForwarded = false
 
-  constructor(timings: CoordinatorTimings = {}, deps: {linkSource?: GlassesLinkSource} = {}) {
+  constructor(
+    timings: CoordinatorTimings = {},
+    deps: {linkSource?: GlassesLinkSource; pendingCameraChanges?: () => Promise<void>} = {},
+  ) {
     this.timings = {...DEFAULT_TIMINGS, ...timings}
     this.linkSource = deps.linkSource ?? storeLinkSource
+    this.pendingCameraChanges = deps.pendingCameraChanges ?? (() => phoneCameraFovCoordinator.whenSettled())
   }
 
   /**
@@ -322,7 +328,12 @@ export class PhoneStreamCoordinator {
       throw new StreamConflictError("STREAM_URL_REQUIRED", "streamUrl is required")
     }
     this.assertGlassesConnected()
+    // Capture before entering the stream queue: a later FOV release may itself
+    // await stop(), and must not become a circular dependency of this start.
+    const cameraReady = this.pendingCameraChanges()
     return this.runExclusive(async () => {
+      await cameraReady
+      this.assertGlassesConnected()
       if (this.current) {
         throw new StreamConflictError(
           "STREAM_ALREADY_ACTIVE",
@@ -365,6 +376,7 @@ export class PhoneStreamCoordinator {
   }
 
   async startManaged(packageName: string, opts: StartManagedOptions): Promise<ManagedStartResult> {
+    const cameraReady = this.pendingCameraChanges()
     const startupStartedAtMs = Date.now()
     // streamId doesn't exist yet — it's minted a few lines below, once we
     // know this is a fresh provision rather than a join onto an existing one.
@@ -383,6 +395,8 @@ export class PhoneStreamCoordinator {
       | {kind: "fresh"; entry: ManagedEntry}
 
     const decision = await this.runExclusive(async (): Promise<JoinDecision> => {
+      await cameraReady
+      this.assertGlassesConnected()
       if (this.current && this.current.kind === "unmanaged") {
         throw new StreamConflictError(
           "STREAM_ALREADY_ACTIVE",

package/src/services/slimStreamStatus.ts

@@ -26,6 +26,7 @@ export function slimStreamStatusEvent(
   if (event.sid) slim.sid = event.sid
   if (typeof event.revision === "number") slim.revision = event.revision
   if (typeof event.terminal === "boolean") slim.terminal = event.terminal
+  if ("willRetry" in event && typeof event.willRetry === "boolean") slim.willRetry = event.willRetry
   if (event.errorDetails) slim.errorDetails = event.errorDetails
   if (event.kind === "reconnect") {
     if ("reason" in event) slim.reason = event.reason