@glassly/engine 0.3.7-dev.906 → 0.3.7-dev.910

package/src/stores/apps.ts

@@ -217,6 +217,7 @@ function projectApps(previousState: AppStatusState, localApps: ClientApp[]): Cli
     DeviceTypes.NONE
   const capabilities = getModelCapabilities(defaultWearable)
   const devToolsEnabled = useSettingsStore.getState().getSetting(SETTINGS.dev_tools.key) === true
+  const persistScreenshots = useSettingsStore.getState().getSetting(SETTINGS.persist_miniapp_screenshots.key) !== false
   const hasPairedGlasses = useSettingsStore.getState().getSetting(SETTINGS.has_paired_glasses.key) === true
 
   // Single pass: dedupe → screenshot carry-over → compat → hidden, all into
@@ -246,7 +247,10 @@ function projectApps(previousState: AppStatusState, localApps: ClientApp[]): Cli
     .map((app) => {
       const next: ClientApp = {
         ...app,
-        screenshot: previousByPackage.get(app.packageName)?.screenshot ?? app.screenshot,
+        // The registry's screenshot is the one restored from disk; only an
+        // in-memory capture carries over when persistence is off.
+        screenshot:
+          previousByPackage.get(app.packageName)?.screenshot ?? (persistScreenshots ? app.screenshot : undefined),
         compatibility: HardwareCompatibility.checkCompatibility(app.hardwareRequirements, capabilities),
         // A registry source can force an app off the primary home screen.
         // Compose that gate with the user's persisted home-screen layout instead
@@ -543,7 +547,12 @@ export const useAppStatusStore = create<AppStatusState>((set, get) => ({
   },
 
   saveScreenshot: async (packageName: string, screenshot: string) => {
-    storage.save(`${packageName}_screenshot`, screenshot)
+    const key = `${packageName}_screenshot`
+    if (useSettingsStore.getState().getSetting(SETTINGS.persist_miniapp_screenshots.key) !== false) {
+      storage.save(key, screenshot)
+    } else {
+      storage.remove(key)
+    }
     set((s) => ({
       apps: s.apps.map((a) => (a.packageName === packageName ? {...a, screenshot} : a)),
     }))

package/src/stores/settings.ts

@@ -913,6 +913,16 @@ export const SETTINGS: Record<string, Setting> = {
     saveOnServer: false,
     persist: true,
   },
+  // Debug: keep each miniapp's switcher-card screenshot on disk so the card
+  // comes back after an app restart. Off keeps captures in memory only, for
+  // checking the capture path itself. Device-local, default on.
+  persist_miniapp_screenshots: {
+    key: "persist_miniapp_screenshots",
+    defaultValue: () => true,
+    writable: true,
+    saveOnServer: false,
+    persist: true,
+  },
   // Gesture-dots debug indicator: flash a glyph on the glasses when a touch
   // gesture is received while the display is empty. Works on any
   // scene-capable device, not only CFW. Device-local debug knob, default off.

package/src/types/capabilities/even-realities-g1.ts

@@ -68,4 +68,8 @@ export const evenRealitiesG1: Capabilities = {
 
   // OTA capabilities - G1 firmware updates are not driven by the ASG OTA flow
   hasOta: false,
+
+  // The app flashes the bundled Glassly CFW over MCUmgr SMP (see
+  // bluetooth-sdk/ios/Source/Resources/G1Firmware/README.md).
+  hasCustomFirmware: true,
 }

package/src/utils/display/index.ts

@@ -70,8 +70,8 @@ export {Z100_PROFILE, Z100_HYPHEN_WIDTH_PX, Z100_SPACE_WIDTH_PX} from "./profile
 // Mentra Nex Profile (a.k.a. Mentra Display)
 export {NEX_PROFILE, NEX_HYPHEN_WIDTH_PX, NEX_SPACE_WIDTH_PX} from "./profiles"
 
-// RayNeo iO Profile (stock subtitle page)
-export {RAYNEO_IO_PROFILE, RAYNEO_IO_HYPHEN_WIDTH_PX, RAYNEO_IO_SPACE_WIDTH_PX} from "./profiles"
+// RayNeo iO Profiles (stock subtitle page, Glassly CFW scene page)
+export {RAYNEO_IO_PROFILE, RAYNEO_IO_CFW_PROFILE, RAYNEO_IO_HYPHEN_WIDTH_PX, RAYNEO_IO_SPACE_WIDTH_PX} from "./profiles"
 
 // =============================================================================
 // Measurer - Pixel-accurate text measurement

package/src/utils/display/profiles/index.ts

@@ -27,5 +27,10 @@ export {G2_PROFILE, G2_HYPHEN_WIDTH_PX, G2_SPACE_WIDTH_PX} from "./g2"
 // Mentra Nex Profile (a.k.a. Mentra Display)
 export {NEX_PROFILE, NEX_HYPHEN_WIDTH_PX, NEX_SPACE_WIDTH_PX} from "./nex"
 
-// RayNeo iO Profile (stock subtitle page)
-export {RAYNEO_IO_PROFILE, RAYNEO_IO_HYPHEN_WIDTH_PX, RAYNEO_IO_SPACE_WIDTH_PX} from "./rayneo-io"
+// RayNeo iO Profiles (stock subtitle page, Glassly CFW scene page)
+export {
+  RAYNEO_IO_PROFILE,
+  RAYNEO_IO_CFW_PROFILE,
+  RAYNEO_IO_HYPHEN_WIDTH_PX,
+  RAYNEO_IO_SPACE_WIDTH_PX,
+} from "./rayneo-io"

package/src/utils/display/profiles/rayneo-io.ts

@@ -1,2 +1,7 @@
 // Moved into the SDK (@glassly/miniapp/display) so miniapps lay text out the way the host measures it; this path re-exports it for the engine.
-export {RAYNEO_IO_PROFILE, RAYNEO_IO_HYPHEN_WIDTH_PX, RAYNEO_IO_SPACE_WIDTH_PX} from "@glassly/miniapp/display"
+export {
+  RAYNEO_IO_PROFILE,
+  RAYNEO_IO_CFW_PROFILE,
+  RAYNEO_IO_HYPHEN_WIDTH_PX,
+  RAYNEO_IO_SPACE_WIDTH_PX,
+} from "@glassly/miniapp/display"

package/src/utils/display/scene/index.ts

@@ -24,7 +24,7 @@ export {resolveAnchors} from "./anchor"
 export type {DiffResult, DiffableElement} from "./differ"
 export {diffScene} from "./differ"
 export type {ProcessedScene} from "./process"
-export {processScene, profileLineHeightPx} from "./process"
+export {processScene, profileLineHeightPx, wrapsOnDevice} from "./process"
 export type {DegradedScene} from "./degrade"
 export {degradeScene} from "./degrade"
 export {SceneStore} from "./store"

package/src/utils/display/scene/process.ts

@@ -9,6 +9,7 @@
  */
 
 import {compileSvgPath} from "./svgPath"
+import {isUnsupportedScript} from "../measurer/script-detection"
 import {TextMeasurer} from "../measurer/TextMeasurer"
 import {TextWrapper} from "../wrapper/TextWrapper"
 import type {DisplayProfile} from "../profiles/types"
@@ -47,6 +48,18 @@ function clampBox(box: SceneBox, width: number, height: number): SceneBox | null
 
 const isFinite = (n: unknown): n is number => typeof n === "number" && Number.isFinite(n)
 
+/**
+ * Text the host cannot wrap: a script the measurer has no widths or break
+ * rules for (Thai has no spaces between words, for one). It is passed through
+ * unwrapped and the device's text engine lays it out in the box.
+ */
+export function wrapsOnDevice(text: string): boolean {
+  for (const char of text) {
+    if (isUnsupportedScript(char)) return true
+  }
+  return false
+}
+
 /** Integer points, or null when the count/values are invalid for the type. */
 function validPoints(el: SceneElementInput): ScenePoint[] | null {
   const raw = (el as {points?: unknown}).points
@@ -372,10 +385,11 @@ export function processScene(
     // Height clipping only applies with a CALIBRATED line height — otherwise
     // the firmware clips vertically in-box (legacy behavior).
     const style: SceneTextStyle = el.style ?? {}
-    if (style.font === "mono" || style.font === "builtin") {
-      // Grid text is laid out by the app (cols × rows) and builtin text by the
-      // glasses' own font engine; the host's proportional wrap metrics don't
-      // apply to either. Pass lines through and let the device clip.
+    if (style.font === "mono" || style.font === "builtin" || wrapsOnDevice(el.text ?? "")) {
+      // Grid text is laid out by the app (cols × rows), builtin text by the
+      // glasses' own font engine and unsupported scripts by the device's text
+      // engine; the host's proportional wrap metrics don't apply to any of
+      // them. Pass lines through and let the device wrap and clip.
       const monoText = el.text ?? ""
       out.push({
         id: el.id,
@@ -390,8 +404,9 @@ export function processScene(
       continue
     }
     const maxLines = lineHeight ? Math.max(1, Math.floor(clamped.h / lineHeight)) : profile.maxLines
+    const maxWidthPx = Math.max(1, clamped.w - 2 * (profile.textInsetPx ?? 0))
     const result = wrapper.wrap(el.text ?? "", {
-      maxWidthPx: clamped.w,
+      maxWidthPx,
       maxLines,
       ...(style.breakMode ? {breakMode: style.breakMode} : {}),
     })
@@ -402,12 +417,12 @@ export function processScene(
         // Trim the last line until it fits WITH the ellipsis appended —
         // otherwise the extra glyph can overflow the clamped box width.
         let last = lines[lines.length - 1]
-        while (last.length > 0 && !measurer.fitsInWidth(`${last}…`, clamped.w)) {
+        while (last.length > 0 && !measurer.fitsInWidth(`${last}…`, maxWidthPx)) {
           last = last.slice(0, -1)
         }
         // A box narrower than the ellipsis glyph itself gets an empty line —
         // never emit a line wider than the clamped box.
-        const ellipsized = last.length > 0 || measurer.fitsInWidth("…", clamped.w) ? `${last}…` : ""
+        const ellipsized = last.length > 0 || measurer.fitsInWidth("…", maxWidthPx) ? `${last}…` : ""
         lines = [...lines.slice(0, -1), ellipsized]
       }
     }