@mentra/engine 3.2.0-dev.158 → 3.2.0-dev.161

package/src/services/OtaUpdateCheckService.ts

@@ -32,6 +32,16 @@ export interface MtkPatch {
   sha256?: string
 }
 
+export interface MtkFullOta {
+  start_firmware?: never
+  end_firmware: string
+  url: string
+  sha256: string
+  size: number
+}
+
+export type MtkUpdate = MtkPatch | MtkFullOta
+
 export interface BesFirmware {
   version: string
   url: string
@@ -44,6 +54,7 @@ export interface VersionJson {
     [packageName: string]: VersionInfo
   }
   mtk_patches?: MtkPatch[]
+  mtk_full_ota?: MtkFullOta
   bes_firmware?: BesFirmware
   versionCode?: number
   versionName?: string
@@ -58,7 +69,8 @@ export interface OtaCheckResult {
   updateAvailable: boolean
   latestVersionInfo: VersionInfo | null
   updates: string[]
-  mtkPatch: MtkPatch | null
+  /** Selected MTK artifact: exact-base incremental, otherwise a newer full OTA. */
+  mtkPatch: MtkUpdate | null
   besVersion: string | null
   /** True when the pending APK step installs an OLDER build than the glasses currently run. */
   isApkDowngrade: boolean
@@ -254,17 +266,45 @@ export function findMatchingMtkPatch(
 
   return (
     patches.find((patch) => {
-      if (patch.start_firmware === currentVersion) {
-        return true
-      }
-      const serverDate = patch.start_firmware.includes("_")
-        ? patch.start_firmware.split("_").pop()
-        : patch.start_firmware
-      return serverDate === currentVersion
+      return normalizeMtkVersion(patch.start_firmware) === normalizeMtkVersion(currentVersion)
     }) || null
   )
 }
 
+function normalizeMtkVersion(version: string): string {
+  return version.trim().split("_").pop() ?? ""
+}
+
+/** Full OTAs are not rollback packages. Unknown versions must not grant eligibility. */
+export function selectMtkUpdate(
+  manifest: VersionJson | undefined,
+  currentVersion: string | undefined,
+): MtkUpdate | null {
+  const patch = findMatchingMtkPatch(manifest?.mtk_patches, currentVersion)
+  if (patch) return patch
+  const full = manifest?.mtk_full_ota
+  if (!full || !currentVersion || typeof full.end_firmware !== "string") return null
+  const current = normalizeMtkVersion(currentVersion)
+  const target = normalizeMtkVersion(full.end_firmware)
+  const versionPattern = /^\d{8}(?:\.\d{1,9})?$/
+  if (!versionPattern.test(current) || !versionPattern.test(target)) return null
+  const [currentDate, currentRevision = 0] = current.split(".").map(Number)
+  const [targetDate, targetRevision = 0] = target.split(".").map(Number)
+  if (targetDate < currentDate || (targetDate === currentDate && targetRevision <= currentRevision)) return null
+  if (
+    full.start_firmware !== undefined ||
+    typeof full.url !== "string" ||
+    !/^https?:\/\/[^/\s]+\//.test(full.url) ||
+    typeof full.sha256 !== "string" ||
+    !/^[a-fA-F0-9]{64}$/.test(full.sha256) ||
+    !Number.isSafeInteger(full.size) ||
+    full.size <= 0 ||
+    full.size > 1024 * 1024 * 1024
+  )
+    return null
+  return full
+}
+
 export function checkBesUpdate(besFirmware: BesFirmware | undefined, currentVersion: string | undefined): boolean {
   if (!besFirmware) {
     return false
@@ -360,7 +400,7 @@ export async function checkForOtaUpdate(
       `OTA: APK update available: ${apkUpdateAvailable} (current: ${currentBuildNumber}, direction: ${apkDirection ?? "none"})`,
     )
 
-    const mtkPatch = findMatchingMtkPatch(versionJson?.mtk_patches, currentMtkVersion)
+    const mtkPatch = selectMtkUpdate(versionJson, currentMtkVersion)
     const mtkUpdateAvailable = mtkPatch !== null
     if (!currentMtkVersion && versionJson?.mtk_patches?.length) {
       console.log(`OTA: MTK current version unknown - skipping MTK patch check`)

package/src/services/otaLegacyMapping.ts

@@ -8,6 +8,7 @@ export type NormalizedOtaStatusEvent = {
   step_type: string
   phase: "download" | "install"
   step_percent: number
+  bytes_downloaded?: number
   overall_percent: number
   status: string
   error_message?: string
@@ -21,6 +22,7 @@ export function normalizeOtaStatusEvent(event: Record<string, unknown>): Normali
   const e = event as Record<string, any>
   const phase: "download" | "install" = e?.phase === "install" ? "install" : "download"
   const err = e?.error_message ?? e?.errorMessage
+  const bytes = e?.bytes_downloaded ?? e?.bytesDownloaded
   return {
     session_id: String(e?.session_id ?? e?.sessionId ?? ""),
     total_steps: Number(e?.total_steps ?? e?.totalSteps ?? 0),
@@ -28,6 +30,7 @@ export function normalizeOtaStatusEvent(event: Record<string, unknown>): Normali
     step_type: String(e?.step_type ?? e?.stepType ?? "apk"),
     phase,
     step_percent: Number(e?.step_percent ?? e?.stepPercent ?? 0),
+    bytes_downloaded: Number.isSafeInteger(bytes) && bytes >= 0 ? bytes : undefined,
     overall_percent: Number(e?.overall_percent ?? e?.overallPercent ?? 0),
     status: String(e?.status ?? "idle"),
     error_message: err == null || err === "" ? undefined : String(err),
@@ -42,6 +45,7 @@ export function otaStatusFromNormalized(n: NormalizedOtaStatusEvent): OtaStatus
     stepType: n.step_type as OtaStatus["stepType"],
     phase: n.phase,
     stepPercent: n.step_percent,
+    bytesDownloaded: n.bytes_downloaded,
     overallPercent: n.overall_percent,
     status: n.status as OtaStatus["status"],
     error: n.error_message,
@@ -63,7 +67,7 @@ export function legacyOtaProgressFromOtaStatusEvent(
     stage: n.phase === "install" ? "install" : "download",
     status: st,
     progress: Math.round(raw),
-    bytesDownloaded: 0,
+    bytesDownloaded: n.bytes_downloaded ?? 0,
     totalBytes: 0,
     currentUpdate: n.step_type || "apk",
     errorMessage: n.error_message,