@mentra/engine 3.2.0-dev.226 → 3.2.0-dev.232

package/build/services/LocalMiniappRuntime.js

@@ -8,6 +8,7 @@
  * This runtime handles request dispatch, stream fan-out, and lifecycle
  * management (connect/disconnect/ping).
  */
+import { acquireGlassesHotspot } from "./GlassesHotspotLease";
 import { AppState, Linking } from "react-native";
 import Share from "react-native-share";
 import * as Battery from "expo-battery";
@@ -46,7 +47,7 @@ import { miniappLauncher } from "./MiniappLauncher";
 import { ISLAND_SETTINGS_KEYS, } from "../runtime/config";
 import { getAnalytics, getMiniappConfiguration, getUiSeams, isFeatureEnabled } from "../runtime/bootstrap";
 import { invokeScanQrSeam } from "../runtime/scanQrSeam";
-import { normalizeStreamAudioConfig, normalizeStreamVideoConfig, resolveCaptureAudio } from "../runtime/streamConfig";
+import { normalizeStreamAudioConfig, normalizeStreamVideoConfig, normalizeCaptureAudio, resolveCaptureAudio, } from "../runtime/streamConfig";
 import { toLanguageHint } from "@mentra/cloud-protocol/languages";
 import { buildMiniappManifestSnapshot } from "../utils/miniappDiagnostics";
 import ttsModelManager from "./TTSModelManager";
@@ -774,13 +775,14 @@ class LocalMiniappRuntime {
         // remain active for another subscriber; a rejected FOV release then stops
         // renewing the departed owner's lease and ASG restores it once idle.
         const cameraCleanup = Promise.allSettled([
+            this.leaveMeetingForApp(packageName),
             phonePhotoCoordinator.stopWarmUpForApp(packageName),
             phoneStreamCoordinator.stop(packageName),
             phoneVideoCoordinator.stopForApp(packageName),
         ]).then((results) => {
             for (const result of results) {
                 if (result.status === "rejected") {
-                    console.warn(`${LOG_TAG}: failed to stop camera consumer for ${packageName} on unregister`, result.reason);
+                    console.warn(`${LOG_TAG}: failed to stop miniapp resource for ${packageName} on unregister`, result.reason);
                 }
             }
         });
@@ -808,9 +810,6 @@ class LocalMiniappRuntime {
         // Tear down this app's blob state: abort in-flight uploads + close readers
         // so a crashed/closed miniapp doesn't leak partial files or file handles.
         this.blobStore.onAppGone(packageName);
-        void acsMeetingService.leaveIfOwner(packageName).catch((error) => {
-            console.warn(`${LOG_TAG}: failed to leave ACS meeting for ${packageName} on unregister`, error);
-        });
         // Detach the per-app nav event forwarder but leave the native nav session
         // running. The user may have just closed the mini-app UI and will reopen
         // it; stopping the session here would kill an active trip mid-route.
@@ -3083,13 +3082,18 @@ class LocalMiniappRuntime {
             return;
         }
         try {
+            if (payload.ingest === "whip" && !(await permissions.check(PermissionFeatures.LOCAL_WIFI))) {
+                if (!(await permissions.request(PermissionFeatures.LOCAL_WIFI))) {
+                    throw new Error("Nearby devices permission is required to join the glasses hotspot");
+                }
+            }
             const result = await streaming.startManaged(packageName, {
                 restreamDestinations: payload.restreamDestinations,
                 video: normalizeStreamVideoConfig(payload.video),
                 audio: normalizeStreamAudioConfig(payload.audio),
                 sound: payload.sound,
                 ingest: payload.ingest,
-                captureAudio: resolveCaptureAudio(payload.captureAudio, resolveAcsAudioSource().source),
+                captureAudio: normalizeCaptureAudio(payload.captureAudio),
             });
             this.sendResult(packageName, requestId, true, result);
         }
@@ -3107,12 +3111,26 @@ class LocalMiniappRuntime {
     }
     ensureMeetingStateBridge() {
         acsMeetingService.setStateHandler((owner, state) => {
+            const attempt = this.softapAttempt;
+            // While a replacement waits for cleanup, native events still describe its predecessor.
+            if (attempt?.packageName === owner && !attempt.ownsResources)
+                return;
             this.sendToMiniapp(owner, {
                 type: MiniappResponseType.MEETING_STATE,
                 ...state,
             });
         });
     }
+    /** Startup owns the hotspot before ACS has an owner. Closing the app must retire both. */
+    async leaveMeetingForApp(packageName) {
+        const attempt = this.softapAttempt;
+        if (attempt?.packageName === packageName) {
+            await this.retireSoftapAttempt({ attempt });
+        }
+        else {
+            await acsMeetingService.leaveIfOwner(packageName);
+        }
+    }
     async handleMeetingJoin(packageName, payload, requestId) {
         this.ensureMeetingStateBridge();
         // A meeting puts the glasses camera and mic in front of remote strangers; it
@@ -3319,7 +3337,8 @@ class LocalMiniappRuntime {
             return;
         }
         attempt.progress = progress;
-        const current = acsMeetingService.getState();
+        // A reservation waiting behind another call must not inherit that call's connected state.
+        const current = attempt.transport ? acsMeetingService.getState() : { state: "connecting", muted: false };
         this.sendToMiniapp(attempt.packageName, {
             type: MiniappResponseType.MEETING_STATE,
             ...current,
@@ -3347,6 +3366,7 @@ class LocalMiniappRuntime {
     async runSoftapAttempt(attempt, previous, args) {
         const packageName = attempt.packageName;
         if (previous) {
+            this.narrateSoftapPreflight(attempt, "Finishing the previous call’s cleanup…");
             softapTrace("softap_join_superseding", {
                 previousAttempt: previous.id,
                 previousAgeMs: Date.now() - previous.startedAt,
@@ -3371,6 +3391,7 @@ class LocalMiniappRuntime {
             softapTraceFailure("softap_join_refused", { packageName, reason: cleanupError });
             throw new Error(`Previous call cleanup failed: ${cleanupError}. Power-cycle the glasses hotspot and try again.`);
         }
+        attempt.releaseHotspot = acquireGlassesHotspot();
         attempt.ownsResources = true;
         this.narrateSoftapPreflight(attempt, "Checking the Nearby devices permission…");
         const permissionStartedAt = Date.now();
@@ -3401,12 +3422,13 @@ class LocalMiniappRuntime {
                 setHotspotState: async (enabled) => {
                     const status = await BluetoothSdk.setHotspotState(enabled);
                     if (status.state === "enabled") {
-                        return { state: status.state, ssid: status.ssid, password: status.password };
+                        return { state: status.state, ssid: status.ssid, password: status.password, localIp: status.localIp };
                     }
                     return { state: status.state };
                 },
-                joinScopedNetwork: (ssid, passphrase) => acsMeetingService.joinScopedNetwork(ssid, passphrase),
+                joinScopedNetwork: (ssid, passphrase, gateway) => acsMeetingService.joinScopedNetwork(ssid, passphrase, gateway),
                 leaveScopedNetwork: () => acsMeetingService.leaveScopedNetwork(),
+                cancelScopedNetworkJoin: () => acsMeetingService.cancelScopedNetworkJoin(),
                 probeGateway: async () => {
                     const verdict = await acsMeetingService.probeScopedGateway();
                     // No native probe means no verdict, and the orchestrator must not read that as "down".
@@ -3657,7 +3679,7 @@ class LocalMiniappRuntime {
         // Teams configuration problem.
         const defaultNetworkStartedAt = Date.now();
         try {
-            const network = await acsMeetingService.awaitValidatedDefaultNetwork();
+            const network = await acsMeetingService.awaitDefaultNetworkAfterHotspot();
             softapTrace("softap_teardown_step", {
                 attempt: attempt.id,
                 step: "awaitValidatedDefaultNetwork",
@@ -3732,6 +3754,8 @@ class LocalMiniappRuntime {
             failures: failures.join("; "),
             endRefused: Boolean(endFailure),
         });
+        attempt.releaseHotspot?.();
+        attempt.releaseHotspot = undefined;
         if (endFailure)
             throw endFailure;
     }
@@ -3852,7 +3876,7 @@ class LocalMiniappRuntime {
     }
     async handleMeetingUpdateVideoSource(packageName, payload, requestId) {
         const videoSource = payload.videoSource;
-        const whepUrl = videoSource?.type === "whep" ? videoSource.url ?? "" : "";
+        const whepUrl = videoSource?.type === "whep" ? (videoSource.url ?? "") : "";
         if (!whepUrl) {
             this.sendResult(packageName, requestId, false, undefined, {
                 code: MiniappErrorCode.INVALID_ARGUMENT,