@mentra/engine 0.1.0-dev.1 → 3.1.0-beta.103

package/build/services/OtaInstallCoordinator.js

@@ -17,13 +17,13 @@
  * state written mid-pass queues a follow-up pass — the same way a setState
  * during React effects scheduled a re-render after the current effect batch.
  */
-import BluetoothSdk from "@mentra/bluetooth-sdk/internal";
+import BluetoothSdk from "@mentra/bluetooth-sdk";
 import GlobalEventEmitter from "../utils/GlobalEventEmitter";
 import { isGlassesConnected, useGlassesStore } from "../stores/glasses";
 import { resolveOtaManifestUrl } from "./otaManifestUrl";
 import { hotspotOtaTransport } from "./HotspotOtaTransport";
 import { deriveDisplayState } from "./otaDisplayState";
-import { BES_CONTINUE_LOCKOUT_MS, DOWNLOAD_STUCK_TIMEOUT_MS, GLOBAL_OTA_TIMEOUT_MS, LEGACY_APK_COMPLETION_SETTLE_MS, LEGACY_BES_CONTINUE_LOCKOUT_MS, LEGACY_DOWNLOAD_STUCK_TIMEOUT_MS, LEGACY_GLOBAL_OTA_TIMEOUT_MS, LEGACY_MTK_INSTALL_TIMEOUT_MS, LEGACY_MTK_SIM_CAP_PERCENT, LEGACY_MTK_SIM_FLOOR_PERCENT, LEGACY_MTK_SIM_TICK_MS, LEGACY_MTK_STALL_DETECT_MS, LEGACY_MTK_STALL_ZONE_MAX_PERCENT, LEGACY_MTK_STALL_ZONE_MIN_PERCENT, LEGACY_PING_INTERVAL_MS, LEGACY_PROGRESS_TIMEOUT_MS, LEGACY_RETRY_INTERVAL_MS, MAX_RETRIES, MTK_INSTALL_TIMEOUT_MS, OtaProgressMessages, PING_INTERVAL_MS, PROGRESS_TIMEOUT_MS, QUERY_REPLY_TIMEOUT_MS, RETRY_INTERVAL_MS, isLegacyShapedOtaSession, isLegacyShapedOtaStatus, selectOtaProtocolProfile, } from "./otaInstallPolicy";
+import { BES_CONTINUE_LOCKOUT_MS, BES_RESTART_TIMEOUT_MS, DOWNLOAD_STUCK_TIMEOUT_MS, GLOBAL_OTA_TIMEOUT_MS, LEGACY_APK_COMPLETION_SETTLE_MS, LEGACY_BES_CONTINUE_LOCKOUT_MS, LEGACY_BES_RESTART_TIMEOUT_MS, LEGACY_DOWNLOAD_STUCK_TIMEOUT_MS, LEGACY_GLOBAL_OTA_TIMEOUT_MS, LEGACY_MTK_INSTALL_TIMEOUT_MS, LEGACY_MTK_SIM_CAP_PERCENT, LEGACY_MTK_SIM_FLOOR_PERCENT, LEGACY_MTK_SIM_TICK_MS, LEGACY_MTK_STALL_DETECT_MS, LEGACY_MTK_STALL_ZONE_MAX_PERCENT, LEGACY_MTK_STALL_ZONE_MIN_PERCENT, LEGACY_PING_INTERVAL_MS, LEGACY_PROGRESS_TIMEOUT_MS, LEGACY_RETRY_INTERVAL_MS, MAX_RETRIES, MTK_INSTALL_TIMEOUT_MS, OtaProgressMessages, PING_INTERVAL_MS, PROGRESS_TIMEOUT_MS, QUERY_REPLY_TIMEOUT_MS, RETRY_INTERVAL_MS, isLegacyShapedOtaSession, isLegacyShapedOtaStatus, selectOtaProtocolProfile, } from "./otaInstallPolicy";
 function isTerminalForWatchdog(d) {
     return d === "complete" || d === "failed" || d === "restarting";
 }
@@ -156,6 +156,7 @@ class OtaInstallCoordinator {
     pingInterval = null;
     queryReplyTimeout = null;
     continueLockoutTimer = null;
+    restartRecoveryTimeout = null;
     legacyApkSettleTimer = null;
     mtkStallDetectTimer = null;
     mtkSimTickTimer = null;
@@ -306,7 +307,7 @@ class OtaInstallCoordinator {
                     void this.sendOtaStartWithWatchdogs();
                 }
                 else {
-                    void BluetoothSdk.sendOtaQueryStatus().catch(() => { });
+                    void BluetoothSdk.queryOtaStatus().catch(() => { });
                     this.armQueryReplyFallback("retry");
                 }
             }
@@ -349,16 +350,17 @@ class OtaInstallCoordinator {
      * stays in the screen): clear the selected update, and after an APK step
      * clear the stale build number so the next check re-reads version_info.
      */
-    finish() {
+    async finish() {
         if (this.otaStartOwnership?.outcome !== "pending") {
             this.otaStartOwnership = null;
         }
         useGlassesStore.getState().setOtaUpdateAvailable(null);
         if (this.apkStepSeen) {
-            BluetoothSdk.updateGlasses({ buildNumber: "" });
             useGlassesStore.getState().setGlassesInfo({ buildNumber: "" });
         }
-        void this.teardownHotspotTransport();
+        // The post-install check needs internet again. Do not let callers leave the
+        // terminal screen while Android still owns the no-internet hotspot route.
+        await this.teardownHotspotTransport();
     }
     /**
      * Abandon an interrupted session (the super-mode skip): terminal cleanup
@@ -366,8 +368,8 @@ class OtaInstallCoordinator {
      * deriveDisplayState doesn't resurrect the stale install when the host
      * navigates away and back through /ota routes.
      */
-    discard() {
-        this.finish();
+    async discard() {
+        await this.finish();
         const store = useGlassesStore.getState();
         store.setOtaStatus(null);
         store.setOtaProgress(null);
@@ -403,6 +405,7 @@ class OtaInstallCoordinator {
             versionChangePhase: this.deriveVersionChangePhase(connected),
             hotspotPhase: this.hotspotPhase,
             hotspotArtifactPercent: this.hotspotArtifactPercent,
+            transport: this.selectedTransport,
         };
     }
     /**
@@ -848,12 +851,24 @@ class OtaInstallCoordinator {
         // (15s unified, 35s for legacy-shaped sessions — WP 8C-f).
         if (displayStateChanged && displayState === "restarting") {
             this.clearContinueLockoutTimer();
+            this.clearRestartRecoveryTimeout();
             const lockoutMs = legacySession ? LEGACY_BES_CONTINUE_LOCKOUT_MS : BES_CONTINUE_LOCKOUT_MS;
+            const restartTimeoutMs = legacySession ? LEGACY_BES_RESTART_TIMEOUT_MS : BES_RESTART_TIMEOUT_MS;
             this.setContinueButtonDisabled(true);
             this.continueLockoutTimer = setTimeout(() => {
                 this.continueLockoutTimer = null;
                 this.setContinueButtonDisabled(false);
             }, lockoutMs);
+            this.restartRecoveryTimeout = setTimeout(() => {
+                this.restartRecoveryTimeout = null;
+                if (this.computeDisplayStateNow() !== "restarting")
+                    return;
+                console.log(`[OTA_PROGRESS] watchdog: glasses did not finish restarting in ${restartTimeoutMs}ms`);
+                this.setErrorMsg(OtaProgressMessages.restartTimeout);
+            }, restartTimeoutMs);
+        }
+        else if (displayStateChanged) {
+            this.clearRestartRecoveryTimeout();
         }
         // Legacy MTK install stall simulation (WP 8C-e): display-only. The simulation
         // timers only ever touch the projected snapshot percent — they never feed back
@@ -908,7 +923,7 @@ class OtaInstallCoordinator {
         if (this.otaStartOwnership?.outcome === "pending") {
             void this.sendOtaStartWithWatchdogs();
         }
-        void BluetoothSdk.sendOtaQueryStatus();
+        void BluetoothSdk.queryOtaStatus().catch(() => { });
         this.armQueryReplyFallback("reconnect");
         return true;
     }
@@ -946,7 +961,7 @@ class OtaInstallCoordinator {
         if (noSessionYet) {
             if (!isIdleStatus && this.otaStartOwnership?.outcome === "acknowledged") {
                 console.log("[OTA_PROGRESS] initial mount, acknowledged session has no cached status — reconciling");
-                void BluetoothSdk.sendOtaQueryStatus().catch(() => { });
+                void BluetoothSdk.queryOtaStatus().catch(() => { });
                 this.armQueryReplyFallback("initial-mount");
                 return;
             }
@@ -961,7 +976,7 @@ class OtaInstallCoordinator {
         }
         else {
             console.log("[OTA_PROGRESS] initial mount, session exists, sending ota_query_status");
-            void BluetoothSdk.sendOtaQueryStatus();
+            void BluetoothSdk.queryOtaStatus().catch(() => { });
             this.armQueryReplyFallback("initial-mount");
         }
     }
@@ -988,7 +1003,7 @@ class OtaInstallCoordinator {
         this.clearProgressTimeout();
         this.onFirstActivity();
         this.onFirstNonZeroProgress();
-        void BluetoothSdk.sendOtaQueryStatus();
+        void BluetoothSdk.queryOtaStatus().catch(() => { });
         useGlassesStore.getState().setMtkUpdatedThisSession(true);
     };
     // --- legacy (< 37) compatibility, ported from progress-legacy.tsx (WP 8C) ---
@@ -1148,7 +1163,7 @@ class OtaInstallCoordinator {
         const s = useGlassesStore.getState().otaStatus;
         if (s?.stepType === "apk" && s.phase === "install" && s.status === "in_progress") {
             this.apkInstallPollInFlight = true;
-            void BluetoothSdk.sendOtaQueryStatus()
+            void BluetoothSdk.queryOtaStatus()
                 .catch(() => { })
                 .finally(() => {
                 this.apkInstallPollInFlight = false;
@@ -1290,6 +1305,9 @@ class OtaInstallCoordinator {
                 otaVersionUrl = this.hotspotManifestUrl;
                 this.maybeArmStuckWatchdog();
             }
+            if (!otaVersionUrl) {
+                throw new Error("OTA is disabled because this build has no immutable manifest pin");
+            }
             console.log(`[OTA_PROGRESS] sending ota_start with ${this.selectedTransport} manifest URL: ${otaVersionUrl}`);
             nativeStartAttempted = true;
             await BluetoothSdk.startOtaUpdate(otaVersionUrl);
@@ -1449,6 +1467,12 @@ class OtaInstallCoordinator {
             this.continueLockoutTimer = null;
         }
     }
+    clearRestartRecoveryTimeout() {
+        if (this.restartRecoveryTimeout) {
+            clearTimeout(this.restartRecoveryTimeout);
+            this.restartRecoveryTimeout = null;
+        }
+    }
     clearLegacyApkSettleTimer() {
         if (this.legacyApkSettleTimer) {
             clearTimeout(this.legacyApkSettleTimer);
@@ -1484,6 +1508,7 @@ class OtaInstallCoordinator {
         this.clearPingInterval();
         this.clearLegacyApkSettleTimer();
         this.clearMtkSimulationTimers();
+        this.clearRestartRecoveryTimeout();
     }
 }
 /** Singleton — one install session machine per app process (matches the single progress screen). */