@mentra/engine 3.1.0-beta.169 → 3.1.0-beta.171

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mentra/engine",
3
- "version": "3.1.0-beta.169",
3
+ "version": "3.1.0-beta.171",
4
4
  "description": "Mentra Engine — miniapp registry, WebView bridge, and miniapp store",
5
5
  "main": "build/index.js",
6
6
  "react-native": "src/index.ts",
@@ -97,11 +97,11 @@
97
97
  "registry": "https://registry.npmjs.org/"
98
98
  },
99
99
  "dependencies": {
100
- "@mentra/bluetooth-sdk": "3.1.0-beta.169",
101
- "@mentra/cloud-client": "3.1.0-beta.169",
102
- "@mentra/cloud-protocol": "3.1.0-beta.169",
103
- "@mentra/crust": "3.1.0-beta.169",
104
- "@mentra/miniapp": "3.1.0-beta.169",
100
+ "@mentra/bluetooth-sdk": "3.1.0-beta.171",
101
+ "@mentra/cloud-client": "3.1.0-beta.171",
102
+ "@mentra/cloud-protocol": "3.1.0-beta.171",
103
+ "@mentra/crust": "3.1.0-beta.171",
104
+ "@mentra/miniapp": "3.1.0-beta.171",
105
105
  "buffer": "^6.0.3",
106
106
  "events": "^3.3.0",
107
107
  "react-native-marked": "8.1.1",
@@ -12,9 +12,9 @@ export interface EngineReleaseMetadata {
12
12
  export const ENGINE_RELEASE_METADATA: Readonly<EngineReleaseMetadata> = Object.freeze({
13
13
  "schemaVersion": 1,
14
14
  "familyBaseVersion": "3.1.0",
15
- "releaseIdentity": "3.1.0-beta.169",
16
- "releaseSetId": "mentra-3.1.0-beta.169",
17
- "sourceCommit": "c3ad979a600aa6a879e2d41e73b46f2faa0467de",
18
- "otaManifestUrl": "https://github.com/Mentra-Community/MentraOS/releases/download/mentra-builds-v3.1.0/mentra-live-ota-3.1.0-beta.169.json",
19
- "otaManifestSha256": "f1b503b8e740d4a5ee9a816ed402bae6cce9821b8895409bebe6a1c506027b7f"
15
+ "releaseIdentity": "3.1.0-beta.171",
16
+ "releaseSetId": "mentra-3.1.0-beta.171",
17
+ "sourceCommit": "ea4baf4f6b2372c5cf3e6984759ccf40a4a8d94c",
18
+ "otaManifestUrl": "https://github.com/Mentra-Community/MentraOS/releases/download/mentra-builds-v3.1.0/mentra-live-ota-3.1.0-beta.171.json",
19
+ "otaManifestSha256": "b1a66cd2040a5c87b343cd94616398d8e2d37293786cc852dd4ff9049491e4a2"
20
20
  })
@@ -70,6 +70,20 @@ const DEFAULT_THEME: MentraLiveOtaFlowTheme = {
70
70
  }
71
71
 
72
72
  const ENGLISH_COPY: Record<string, string> = {
73
+ "ota:downloadingToPhone": "Downloading update to phone...",
74
+ "ota:startingGlassesHotspot": "Starting glasses hotspot...",
75
+ "ota:connectingPhoneToGlasses": "Connecting phone to glasses...",
76
+ "ota:startingHotspotUpdate": "Starting update...",
77
+ "ota:transferringToGlasses": "Transferring update to glasses...",
78
+ "ota:installingOnGlasses": "Installing update on glasses...",
79
+ "ota:componentApk": "Glasses software",
80
+ "ota:componentMtk": "System firmware",
81
+ "ota:componentBes": "Bluetooth firmware",
82
+ "ota:updateFile": "File {{current}} of {{total}} · {{component}}",
83
+ "ota:updatePart": "Update {{current}} of {{total}} · {{component}}",
84
+ "ota:phoneFileProgress": "Each file downloads separately. Progress is for the current file.",
85
+ "ota:transferFileProgress": "Progress is for this file’s transfer from your phone.",
86
+
73
87
  "common:continue": "Continue",
74
88
  "common:done": "Done",
75
89
  "ota:checkingForUpdates": "Checking for updates",
@@ -125,6 +139,12 @@ const ENGLISH_COPY: Record<string, string> = {
125
139
  "Your glasses restarted with new firmware. One more step: they'll now continue to the required version.",
126
140
  }
127
141
 
142
+ const componentCopyKey = {
143
+ apk: "ota:componentApk",
144
+ mtk: "ota:componentMtk",
145
+ bes: "ota:componentBes",
146
+ } as const
147
+
128
148
  function defaultTranslate(key: string, options?: Record<string, string>): string {
129
149
  let value = ENGLISH_COPY[key] ?? key
130
150
  for (const [name, replacement] of Object.entries(options ?? {})) {
@@ -374,28 +394,65 @@ function OtaFlowContent({
374
394
  }
375
395
 
376
396
  if (state.screen === "starting" || state.screen === "preparing_hotspot") {
377
- const title =
397
+ const title = translate(
378
398
  state.hotspotPhase === "downloading"
379
- ? "Downloading update to phone..."
399
+ ? "ota:downloadingToPhone"
380
400
  : state.hotspotPhase === "starting_hotspot"
381
- ? "Starting glasses hotspot..."
401
+ ? "ota:startingGlassesHotspot"
382
402
  : state.hotspotPhase === "joining_hotspot"
383
- ? "Connecting phone to glasses..."
384
- : "Starting update..."
403
+ ? "ota:connectingPhoneToGlasses"
404
+ : "ota:startingHotspotUpdate",
405
+ )
406
+ const artifact = state.hotspotPhase === "downloading" ? state.hotspotArtifact : null
385
407
  return (
386
408
  <FlowPage colors={colors} icon="download" title={title}>
409
+ {artifact ? (
410
+ <BodyText colors={colors}>
411
+ {translate("ota:updateFile", {
412
+ current: String(artifact.index + 1),
413
+ total: String(artifact.totalCount),
414
+ component: translate(componentCopyKey[artifact.kind]),
415
+ })}
416
+ </BodyText>
417
+ ) : null}
387
418
  {state.hotspotPhase === "downloading" && state.hotspotArtifactPercent !== null ? (
388
419
  <PercentText colors={colors} percent={state.hotspotArtifactPercent} />
389
420
  ) : null}
390
421
  <ActivityIndicator size="large" color={colors.foreground} />
422
+ {state.hotspotPhase === "downloading" ? (
423
+ <BodyText colors={colors}>{translate("ota:phoneFileProgress")}</BodyText>
424
+ ) : null}
391
425
  <BodyText colors={colors}>Do not disconnect your glasses</BodyText>
392
426
  </FlowPage>
393
427
  )
394
428
  }
395
429
 
396
430
  if (state.screen === "updating") {
431
+ const hotspot = state.transport === "hotspot"
432
+ const title = hotspot
433
+ ? translate(state.phase === "download" ? "ota:transferringToGlasses" : "ota:installingOnGlasses")
434
+ : state.phase === "download"
435
+ ? "Downloading..."
436
+ : "Installing..."
437
+ const component = state.step ? translate(componentCopyKey[state.step]) : null
438
+ const hasStepCount =
439
+ state.currentStep !== null &&
440
+ state.totalSteps !== null &&
441
+ state.currentStep > 0 &&
442
+ state.currentStep <= state.totalSteps
397
443
  return (
398
- <FlowPage colors={colors} icon="download" title={state.phase === "download" ? "Downloading..." : "Installing..."}>
444
+ <FlowPage colors={colors} icon="download" title={title}>
445
+ {hotspot && component ? (
446
+ <BodyText colors={colors}>
447
+ {hasStepCount
448
+ ? translate("ota:updatePart", {
449
+ current: String(state.currentStep),
450
+ total: String(state.totalSteps),
451
+ component,
452
+ })
453
+ : component}
454
+ </BodyText>
455
+ ) : null}
399
456
  {state.installingApkOnly ? (
400
457
  <ActivityIndicator size="large" color={colors.foreground} />
401
458
  ) : (
@@ -409,6 +466,9 @@ function OtaFlowContent({
409
466
  </>
410
467
  )}
411
468
  <BodyText colors={colors}>Do not disconnect your glasses</BodyText>
469
+ {hotspot && state.phase === "download" ? (
470
+ <BodyText colors={colors}>{translate("ota:transferFileProgress")}</BodyText>
471
+ ) : null}
412
472
  {state.versionChange && state.phase === "install" ? (
413
473
  <BodyText colors={colors}>{translate("ota:downgradeDuration")}</BodyText>
414
474
  ) : null}
@@ -82,6 +82,11 @@ export type MentraLiveOtaState = {
82
82
  hotspotSupported: boolean
83
83
  hotspotPhase: MentraLiveOtaHotspotPhase
84
84
  hotspotArtifactPercent: number | null
85
+ /**
86
+ * Current phone download context. Index is zero-based; percent applies to this file only.
87
+ * Optional for source compatibility; this hook returns null when no file is active.
88
+ */
89
+ hotspotArtifact?: {kind: MentraLiveOtaStep; index: number; totalCount: number} | null
85
90
  phase: MentraLiveOtaInstallPhase | null
86
91
  step: MentraLiveOtaStep | null
87
92
  currentStep: number | null
@@ -624,6 +629,7 @@ export function useMentraLiveOta(options: UseMentraLiveOtaOptions = {}): MentraL
624
629
  hotspotSupported,
625
630
  hotspotPhase: "idle",
626
631
  hotspotArtifactPercent: null,
632
+ hotspotArtifact: null,
627
633
  phase: null,
628
634
  step: null,
629
635
  currentStep: null,
@@ -678,6 +684,7 @@ export function useMentraLiveOta(options: UseMentraLiveOtaOptions = {}): MentraL
678
684
  hotspotSupported,
679
685
  hotspotPhase: "idle",
680
686
  hotspotArtifactPercent: null,
687
+ hotspotArtifact: null,
681
688
  phase: null,
682
689
  step: null,
683
690
  currentStep: null,
@@ -732,6 +739,7 @@ export function useMentraLiveOta(options: UseMentraLiveOtaOptions = {}): MentraL
732
739
  }
733
740
  : null
734
741
  const totalSteps = installSnapshot.otaStatus?.totalSteps ?? null
742
+ const artifact = installSnapshot.hotspotArtifact
735
743
  const changelogs = screen === "complete" ? releaseChangelogsForActiveChain() : []
736
744
  return {
737
745
  screen,
@@ -747,6 +755,7 @@ export function useMentraLiveOta(options: UseMentraLiveOtaOptions = {}): MentraL
747
755
  hotspotSupported,
748
756
  hotspotPhase: installSnapshot.hotspotPhase,
749
757
  hotspotArtifactPercent: installSnapshot.hotspotArtifactPercent,
758
+ hotspotArtifact: artifact ? {kind: artifact.kind, index: artifact.index, totalCount: artifact.totalCount} : null,
750
759
  phase: installSnapshot.otaStatus?.phase ?? installSnapshot.otaProgress?.stage ?? null,
751
760
  step: installSnapshot.otaStatus?.stepType ?? null,
752
761
  currentStep: installSnapshot.otaStatus?.currentStep ?? null,
@@ -139,6 +139,16 @@ export async function prepareArtifacts(
139
139
  const prepared: PreparedOtaArtifact[] = []
140
140
  for (let index = 0; index < plan.length; index++) {
141
141
  const entry = plan[index]
142
+ // Announce each file before cache verification or native download callbacks,
143
+ // so the previous file's 100% cannot linger under the next file's label.
144
+ onProgress?.({
145
+ kind: entry.kind,
146
+ index,
147
+ totalCount: plan.length,
148
+ artifactPercent: 0,
149
+ bytesWritten: 0,
150
+ contentLength: 0,
151
+ })
142
152
 
143
153
  const cachedPath = `${directory}/${entry.sha256}`
144
154
  if (await RNFS.exists(cachedPath)) {
@@ -22,6 +22,7 @@ import GlobalEventEmitter from "../utils/GlobalEventEmitter"
22
22
  import {isGlassesConnected, useGlassesStore} from "../stores/glasses"
23
23
  import {resolveOtaManifestUrl} from "./otaManifestUrl"
24
24
  import {hotspotOtaTransport, type HotspotOtaPhase} from "./HotspotOtaTransport"
25
+ import type {OtaArtifactDownloadProgress} from "./OtaArtifactDownloader"
25
26
  import type {OtaCheckCurrentGlassesResult} from "./OtaUpdateCheckService"
26
27
  import {deriveDisplayState, type DisplayState} from "./otaDisplayState"
27
28
  import {
@@ -139,8 +140,10 @@ function latestPercentForStuck(otaStatus: OtaStatus | null, otaProgress: OtaProg
139
140
  * reply that cancels the fallback.
140
141
  */
141
142
  function hasRecoveringOtaReply(otaStatus: OtaStatus | null, otaProgress: OtaProgress | null): boolean {
142
- if (otaProgress) return true
143
- return !!otaStatus && otaStatus.status !== "idle"
143
+ // OtaService projects status into legacy progress too: idle becomes STARTED.
144
+ // Neither that projection nor progress retained across reboot proves activity.
145
+ if (otaStatus) return otaStatus.status !== "idle"
146
+ return !!otaProgress
144
147
  }
145
148
 
146
149
  /** Read model the host progress screen renders from. */
@@ -171,6 +174,7 @@ export interface OtaInstallSnapshot {
171
174
  /** Pre-ota_start phone staging/join state for a hotspot attempt. */
172
175
  hotspotPhase: HotspotOtaPhase
173
176
  hotspotArtifactPercent: number | null
177
+ hotspotArtifact: OtaArtifactDownloadProgress | null
174
178
  /** Transport selected from the checked glasses capabilities and Wi-Fi state. */
175
179
  transport: "wifi" | "hotspot"
176
180
  }
@@ -189,6 +193,7 @@ class OtaInstallCoordinator {
189
193
  private hotspotManifestUrl: string | null = null
190
194
  private hotspotPhase: HotspotOtaPhase = "idle"
191
195
  private hotspotArtifactPercent: number | null = null
196
+ private hotspotArtifact: OtaArtifactDownloadProgress | null = null
192
197
 
193
198
  // Genuinely session-local state (was component state/refs).
194
199
  private errorMsg = ""
@@ -303,6 +308,7 @@ class OtaInstallCoordinator {
303
308
  this.hotspotManifestUrl = null
304
309
  this.hotspotPhase = "idle"
305
310
  this.hotspotArtifactPercent = null
311
+ this.hotspotArtifact = null
306
312
  return this.selectedTransport
307
313
  }
308
314
 
@@ -510,6 +516,7 @@ class OtaInstallCoordinator {
510
516
  versionChangePhase: this.deriveVersionChangePhase(connected),
511
517
  hotspotPhase: this.hotspotPhase,
512
518
  hotspotArtifactPercent: this.hotspotArtifactPercent,
519
+ hotspotArtifact: this.hotspotArtifact ? {...this.hotspotArtifact} : null,
513
520
  transport: this.selectedTransport,
514
521
  }
515
522
  }
@@ -1501,7 +1508,9 @@ class OtaInstallCoordinator {
1501
1508
  }
1502
1509
  this.hotspotManifestUrl = await hotspotOtaTransport.prepare(this.preparedCheckResult, (progress) => {
1503
1510
  this.hotspotPhase = progress.phase
1504
- this.hotspotArtifactPercent = progress.artifact?.artifactPercent ?? null
1511
+ this.hotspotArtifact = progress.artifact ? {...progress.artifact} : null
1512
+ this.hotspotArtifactPercent =
1513
+ progress.artifact && progress.artifact.contentLength > 0 ? progress.artifact.artifactPercent : null
1505
1514
  this.emitInternalChange()
1506
1515
  })
1507
1516
  }
@@ -1581,6 +1590,7 @@ class OtaInstallCoordinator {
1581
1590
  this.hotspotManifestUrl = null
1582
1591
  this.hotspotPhase = "idle"
1583
1592
  this.hotspotArtifactPercent = null
1593
+ this.hotspotArtifact = null
1584
1594
  this.emitInternalChange()
1585
1595
  }
1586
1596