@glassly/engine 0.3.5 → 0.3.6-dev.846

package/src/stores/settings.ts

@@ -3,8 +3,9 @@ import {AsyncResult, result as Res, Result} from "typesafe-ts"
 import {create} from "zustand"
 import {subscribeWithSelector} from "zustand/middleware"
 
+import {isScreenshotMode} from "../services/ScreenshotFixture"
 import {storage} from "../utils/storage"
-import {getBluetoothSettingKeysForDevice} from "./bluetoothSettingKeys"
+import {getBluetoothSettingKeysForDevice, nativeMenuApps} from "./bluetoothSettingKeys"
 import {useGlassesStore} from "./glasses"
 
 export {MENTRA_LIVE_SETTING_KEYS, getBluetoothSettingKeysForDevice} from "./bluetoothSettingKeys"
@@ -144,6 +145,8 @@ export const SETTINGS: Record<string, Setting> = {
   home_mirror: {
     key: "home_mirror",
     defaultValue: () => true,
+    // The store-screenshot build always shows the mirror under its fixture G2.
+    override: () => (isScreenshotMode() ? true : undefined),
     writable: true,
     saveOnServer: true,
     persist: true,
@@ -352,6 +355,13 @@ export const SETTINGS: Record<string, Setting> = {
     saveOnServer: false,
     persist: true,
   },
+  deepseek_api_key: {
+    key: "deepseek_api_key",
+    defaultValue: () => "",
+    writable: true,
+    saveOnServer: false,
+    persist: true,
+  },
   elevenlabs_api_key: {
     key: "elevenlabs_api_key",
     defaultValue: () => "",
@@ -831,6 +841,15 @@ export const SETTINGS: Record<string, Setting> = {
     saveOnServer: false,
     persist: true,
   },
+  // Apple Watch: draw the glasses' current frame behind the watch trackpad. Frames
+  // cross WatchConnectivity while the watch app is up, so it stays off unless asked for.
+  apple_watch_mirror: {
+    key: "apple_watch_mirror",
+    defaultValue: () => false,
+    writable: true,
+    saveOnServer: false,
+    persist: true,
+  },
   // Maximum rate at which display updates leave the phone for the glasses.
   // The Bluetooth SDK paces every scene frame and legacy layout to this,
   // coalescing faster updates last-wins; clears bypass it. No effect on G2
@@ -1577,6 +1596,29 @@ export const useSettingsStore = create<SettingsState>()(
           // desired value was applied so a transient failure retries on boot.
           if (migrationSucceeded) storage.save(CAMERA_FOV_MIGRATION_KEY, true)
         }
+
+        // Settings joined the Glasses Menu (the dashboard's glasses Settings
+        // page): add it once, last, to a menu the wearer already saved. An
+        // unsaved menu gets it from the default; a full one (10) is left alone.
+        const MENU_SETTINGS_MIGRATION_KEY = "migration:menu_apps_settings_v1"
+        const menuSettingsMigrationDone = storage.load<boolean>(MENU_SETTINGS_MIGRATION_KEY)
+        if (menuSettingsMigrationDone.is_error() || !menuSettingsMigrationDone.value) {
+          const menu = get().getSetting(SETTINGS.menu_apps.key) as Array<{packageName?: string}> | null
+          let menuMigrated = true
+          if (
+            Array.isArray(menu) &&
+            menu.length < 10 &&
+            !menu.some((item) => item?.packageName === "com.glassly.settings")
+          ) {
+            const next = [...menu, {packageName: "com.glassly.settings", name: "Settings"}]
+            const result = await get().setSetting(SETTINGS.menu_apps.key, next, true)
+            if (result.is_error()) {
+              console.log("SETTINGS: menu_apps Settings migration failed:", result.error)
+              menuMigrated = false
+            }
+          }
+          if (menuMigrated) storage.save(MENU_SETTINGS_MIGRATION_KEY, true)
+        }
       })
       loadAllSettingsInFlight = inFlight
       void Promise.resolve(inFlight).then((result) => {
@@ -1598,7 +1640,7 @@ export const useSettingsStore = create<SettingsState>()(
         if (key === SETTINGS.core_token.key && (typeof value !== "string" || value.trim().length === 0)) {
           continue
         }
-        bluetoothSettings[key] = value
+        bluetoothSettings[key] = key === SETTINGS.menu_apps.key ? nativeMenuApps(value) : value
       }
       return bluetoothSettings
     },

package/src/types/applet.ts

@@ -89,7 +89,7 @@ export interface DeclaredAction {
   visibility?: "public" | "system"
 }
 
-export type DeclaredWidgetSize = "XS" | "SM" | "MD" | "LG"
+export type DeclaredWidgetSize = "XS" | "XSM" | "SM" | "MD" | "LG"
 
 /** A dashboard widget a miniapp declares in `miniapp.json` and serves through `session.widgets`. */
 export interface DeclaredWidget {
@@ -97,6 +97,10 @@ export interface DeclaredWidget {
   name: string
   sizes: DeclaredWidgetSize[]
   defaultSize: DeclaredWidgetSize
+  /** Lists the `EX` size: a tap on the selected widget can expand it to the full screen. */
+  expandable: boolean
+  /** A tap expands it rather than activating the card: expandable, and the wearer left expansion on. */
+  expandOnTap: boolean
 }
 
 export interface ClientApp extends AppletInterface {

package/src/types/capabilities/rayneo-io.ts

@@ -32,6 +32,8 @@ export const rayneoIO: Capabilities = {
     fieldOfView: {horizontal: 30},
     maxTextLines: 5,
     adjustBrightness: true,
+    // Both drivers map these settings onto the launcher's three heights and two distances.
+    positionRange: {height: {min: 0, max: 8}, depth: {min: 1, max: 3}},
 
     // Scene display API — the Glassly CFW page canvas.
     width: 540,

package/src/types/enums.ts

@@ -18,4 +18,5 @@ export enum DeviceTypes {
 export enum ControllerTypes {
   R1 = "Even Realities R1",
   NEURAL_BAND = "Meta Neural Band",
+  APPLE_WATCH = "Apple Watch",
 }

package/src/utils/cloudClient/RnUdpAdapter.ts

@@ -14,6 +14,8 @@ type CloudUdpSocket = ReturnType<typeof dgram.createSocket> & {
   on(event: "message", cb: (msg: Uint8Array) => void): void
 }
 
+const SEND_FAILURE_WARN_INTERVAL_MS = 60_000
+
 export function createCloudUdpSocket(): UdpSocketLike {
   const socket = dgram.createSocket({type: "udp4"}) as CloudUdpSocket
   let onBytes: ((bytes: Uint8Array) => void) | null = null
@@ -27,10 +29,20 @@ export function createCloudUdpSocket(): UdpSocketLike {
   // Bind to any available port so the socket is ready to send.
   socket.bind(0)
 
+  // A dead UDP path fails every frame and every 1 s liveness probe for the whole
+  // session; one line per minute says the same thing without flooding the log.
+  let failures = 0
+  let lastWarnAt = 0
+
   return {
     send(bytes: Uint8Array, host: string, port: number): void {
       socket.send(bytes, 0, bytes.length, port, host, (err?: Error) => {
-        if (err) console.warn(`[cloud-client udp] send failed to ${host}:${port}: ${err.message}`)
+        if (!err) return
+        failures += 1
+        const now = Date.now()
+        if (now - lastWarnAt < SEND_FAILURE_WARN_INTERVAL_MS) return
+        lastWarnAt = now
+        console.warn(`[cloud-client udp] send failed to ${host}:${port} (${failures} so far): ${err.message}`)
       })
     },
     onMessage(cb: (bytes: Uint8Array) => void): void {

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

@@ -17,6 +17,7 @@ export type {
   SceneStrokeStyle,
   SceneTextStyle,
   SceneTransition,
+  SceneTransitionEdge,
 } from "./types"
 export {boxesEqual, contentHash, elementContentHash} from "./types"
 export {resolveAnchors} from "./anchor"

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

@@ -21,6 +21,7 @@ import type {
   ScenePoint,
   SceneTextStyle,
   SceneTransition,
+  SceneTransitionEdge,
 } from "./types"
 import {MAX_SCENE_DEPTH, POINT_SHAPE_ARITY, POINT_SHAPE_TYPES, elementContentHash} from "./types"
 
@@ -66,11 +67,24 @@ function pointsBox(points: ScenePoint[]): SceneBox {
   return {x, y, w: Math.max(...xs) - x + 1, h: Math.max(...ys) - y + 1}
 }
 
+function validEdge(e: unknown): SceneTransitionEdge | undefined {
+  if (!e || typeof e !== "object") return undefined
+  const dx = Math.round(Number((e as SceneTransitionEdge).dx ?? 0))
+  const dy = Math.round(Number((e as SceneTransitionEdge).dy ?? 0))
+  if (!isFinite(dx) || !isFinite(dy) || Math.abs(dx) > 1024 || Math.abs(dy) > 1024) return undefined
+  return {dx, dy}
+}
+
 function validTransition(t: unknown): SceneTransition | undefined {
   if (!t || typeof t !== "object") return undefined
   const {durationMs, easing} = t as SceneTransition
   if (!isFinite(durationMs) || durationMs <= 0) return undefined
-  return easing ? {durationMs, easing} : {durationMs}
+  const out: SceneTransition = easing ? {durationMs, easing} : {durationMs}
+  const enter = validEdge((t as SceneTransition).enter)
+  const exit = validEdge((t as SceneTransition).exit)
+  if (enter) out.enter = enter
+  if (exit) out.exit = exit
+  return out
 }
 
 function boxShrunk(orig: SceneBox, clamped: SceneBox): boolean {
@@ -175,6 +189,8 @@ export function processScene(
 
   for (const {el, index, box, points} of valid) {
     const transition = validTransition((el as {transition?: unknown}).transition)
+    // Leaving elements only exist to tween away; a device that jumps never shows them.
+    if (transition?.exit && !caps.animation) continue
     const transform: {rotation?: number; pivot?: ScenePoint} = {}
     if (el.rotation !== undefined || el.pivot !== undefined) {
       const angle = el.rotation ?? 0

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

@@ -18,6 +18,7 @@ export type {
   SceneStrokeStyle,
   SceneTextStyle,
   SceneTransition,
+  SceneTransitionEdge,
 } from "@glassly/miniapp/display"
 export {
   boxesEqual,

package/src/utils/miniappGlobals.ts

@@ -73,6 +73,35 @@ export interface BuildMiniappGlobalsOptions {
   colorScheme?: MiniappColorScheme
 }
 
+function safeAreaCssVars(insets: MiniappSafeArea): Record<string, string> {
+  return {
+    "--glassly-safe-top": `${insets.top}px`,
+    "--glassly-safe-bottom": `${insets.bottom}px`,
+    "--glassly-safe-left": `${insets.left}px`,
+    "--glassly-safe-right": `${insets.right}px`,
+  }
+}
+
+/**
+ * JS to inject into a running miniapp when the host's safe area changes (an
+ * iPhone Duo folding moves its status rail): updates window.Glassly and the
+ * CSS variables, then fires `glassly:safe-area-change`.
+ */
+export function buildSafeAreaUpdateScript(insets: MiniappSafeArea): string {
+  const sets = Object.entries(safeAreaCssVars(insets))
+    .map(([k, v]) => `document.documentElement.style.setProperty(${JSON.stringify(k)}, ${JSON.stringify(v)});`)
+    .join("\n      ")
+  return `
+    window.Glassly = window.Glassly || {};
+    window.Glassly.safeAreaInsets = ${JSON.stringify(insets)};
+    try {
+      ${sets}
+    } catch (e) { /* ignore */ }
+    window.dispatchEvent(new Event("glassly:safe-area-change"));
+    true;
+  `
+}
+
 /**
  * Returns the JS string to inject into a miniapp WebView before its content
  * loads. Sets window.Glassly with the standard fields miniapps read:
@@ -105,10 +134,7 @@ export function buildMiniappGlobalsScript(opts: BuildMiniappGlobalsOptions): str
   const insets = opts.safeAreaInsets
   const capsuleCenter = capsule.top + capsule.height / 2
   const cssVars: Record<string, string> = {
-    "--glassly-safe-top": `${insets.top}px`,
-    "--glassly-safe-bottom": `${insets.bottom}px`,
-    "--glassly-safe-left": `${insets.left}px`,
-    "--glassly-safe-right": `${insets.right}px`,
+    ...safeAreaCssVars(insets),
     "--glassly-capsule-top": `${capsule.top}px`,
     "--glassly-capsule-bottom": `${capsule.bottom}px`,
     "--glassly-capsule-left": `${capsule.left}px`,