@mentra/sdk 3.0.0-alpha.1 → 3.0.0-alpha.4

package/dist/index.js

@@ -164,7 +164,7 @@ function tryCreateBetterStackTransport() {
 }
 function createLogger(config) {
   const { pinoLevel, verbose } = resolveConfig(config);
-  const NODE_ENV = "development";
+  const NODE_ENV = "isaiah";
   const PORTER_APP_NAME = process.env.PORTER_APP_NAME || "cloud-local";
   const streams = [];
   if (pinoLevel !== "silent") {
@@ -1613,21 +1613,6 @@ class CameraManager {
       }
     });
   }
-  onPhotoTaken(handler) {
-    const streamKey = "photo_taken" /* PHOTO_TAKEN */;
-    this.deps.addSubscription(streamKey);
-    const routerCleanup = this.deps.router.on(streamKey, (_streamType, data) => {
-      try {
-        handler(normalisePhotoData(data));
-      } catch (err) {
-        this.deps.logger.error("[CameraManager] Error in onPhotoTaken handler:", err);
-      }
-    });
-    return () => {
-      routerCleanup();
-      this.deps.removeSubscription(streamKey);
-    };
-  }
   async startStream(options) {
     const opts = options ?? {};
     if (opts.direct) {
@@ -1734,7 +1719,13 @@ class CameraManager {
     });
   }
   async startDirectStream(options) {
-    return this._startDirectStream({ direct: options.rtmpUrl, video: options.video, audio: options.audio, stream: options.stream, sound: options.sound });
+    return this._startDirectStream({
+      direct: options.rtmpUrl,
+      video: options.video,
+      audio: options.audio,
+      stream: options.stream,
+      sound: options.sound
+    });
   }
   async startManagedStream(options = {}) {
     return this._startManagedStream({
@@ -1927,15 +1918,6 @@ class CameraManager {
     this.isManagedStreaming = false;
   }
 }
-function normalisePhotoData(raw) {
-  return {
-    url: raw.photoUrl ?? raw.url ?? "",
-    width: raw.width ?? 0,
-    height: raw.height ?? 0,
-    timestamp: raw.timestamp ? new Date(raw.timestamp).getTime() : Date.now(),
-    savedToGallery: raw.savedToGallery ?? false
-  };
-}
 
 // src/session/managers/DashboardManager.ts
 init_message_types();
@@ -2114,6 +2096,20 @@ class DeviceManager {
     });
   }
   onTouchEvent(gestureOrHandler, handler) {
+    if (Array.isArray(gestureOrHandler)) {
+      const gestures = gestureOrHandler;
+      const cleanups = [];
+      for (const gesture2 of gestures) {
+        const gestureStream2 = `${"touch_event" /* TOUCH_EVENT */}:${gesture2}`;
+        cleanups.push(this.addStreamHandler(gestureStream2, (_st, data) => {
+          handler(normaliseTouchEvent(data));
+        }));
+      }
+      return () => {
+        for (const fn of cleanups)
+          fn();
+      };
+    }
     if (typeof gestureOrHandler === "function") {
       return this.addStreamHandler("touch_event" /* TOUCH_EVENT */, (_st, data) => {
         gestureOrHandler(normaliseTouchEvent(data));
@@ -2125,19 +2121,6 @@ class DeviceManager {
       handler(normaliseTouchEvent(data));
     });
   }
-  subscribeToGestures(gestures) {
-    const cleanupFns = [];
-    for (const gesture of gestures) {
-      const gestureStream = `${"touch_event" /* TOUCH_EVENT */}:${gesture}`;
-      const cleanup = this.addStreamHandler(gestureStream, () => {});
-      cleanupFns.push(cleanup);
-    }
-    return () => {
-      for (const fn of cleanupFns) {
-        fn();
-      }
-    };
-  }
   onBatteryUpdate(handler) {
     return this.addStreamHandler("glasses_battery_update" /* GLASSES_BATTERY_UPDATE */, (_st, data) => {
       if (data.level !== undefined) {
@@ -2180,7 +2163,6 @@ class DeviceManager {
       this.deps.logger.debug("DeviceManager: Received empty device_state_update");
       return;
     }
-    this.deps.logger.debug("DeviceManager: Processing device state update");
     if (state.connected !== undefined)
       this._connected.setValue(state.connected);
     if (state.modelName !== undefined)
@@ -2218,7 +2200,8 @@ class DeviceManager {
   }
   setCapabilities(caps) {
     this.capabilities = caps;
-    this.deps.logger.info(`DeviceManager: Capabilities ${caps ? "updated" : "cleared"}`);
+    const model = this._modelName.value;
+    this.deps.logger.info({ model: model ?? undefined, hasCamera: !!caps?.camera, hasMicrophone: !!caps?.microphone }, `Glasses capabilities ${caps ? "received" : "cleared"}${model ? ` (${model})` : ""}`);
     for (const listener of this.capabilitiesListeners) {
       try {
         listener(caps);
@@ -2382,8 +2365,20 @@ class LedManager {
   constructor(deps) {
     this.deps = deps;
   }
-  setColor(color, onTimeMs) {
+  setColor(color, durationOrOptions) {
     const requestId = generateRequestId2();
+    let ontime;
+    let offtime;
+    let count;
+    if (typeof durationOrOptions === "object" && durationOrOptions !== null) {
+      ontime = durationOrOptions.onTime;
+      offtime = durationOrOptions.offTime;
+      count = durationOrOptions.count;
+    } else {
+      ontime = durationOrOptions ?? 1000;
+      offtime = 0;
+      count = 1;
+    }
     const message = {
       type: "rgb_led_control" /* RGB_LED_CONTROL */,
       packageName: this.deps.getPackageName(),
@@ -2392,12 +2387,12 @@ class LedManager {
       timestamp: new Date,
       action: "on",
       color,
-      ontime: onTimeMs ?? 1000,
-      offtime: 0,
-      count: 1
+      ontime,
+      offtime,
+      count
     };
     this.deps.sendMessage(message);
-    this.deps.logger.debug({ requestId, color, ontime: message.ontime }, "\uD83D\uDCA1 LED setColor request sent");
+    this.deps.logger.debug({ requestId, color, ontime, offtime, count }, "\uD83D\uDCA1 LED setColor request sent");
   }
   off() {
     const requestId = generateRequestId2();
@@ -2421,6 +2416,7 @@ class LedManager {
 init_types();
 var LOCATION_STREAM = "location_stream" /* LOCATION_STREAM */;
 var LOCATION_UPDATE = "location_update" /* LOCATION_UPDATE */;
+var POLL_TIMEOUT_MS = 15000;
 function generateCorrelationId() {
   if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
     return `poll_${crypto.randomUUID()}`;
@@ -2446,19 +2442,27 @@ class LocationManager {
   _accuracy = null;
   _timestamp = null;
   _hasPermission = true;
+  _config = {};
+  pendingPolls = new Map;
   locationUpdateCleanup = null;
   constructor(deps) {
     this.deps = deps;
     this.locationUpdateCleanup = this.deps.router.on(LOCATION_UPDATE, (_streamType, data, _message) => {
       this.cacheLocation(data);
+      this.resolvePendingPoll(data);
     });
   }
-  onUpdate(handler, accuracy) {
+  configure(config) {
+    this._config = { ...this._config, ...config };
+  }
+  onUpdate(handler) {
     const streamKey = LOCATION_STREAM;
+    const accuracy = this._config.accuracy ?? "standard";
     const routerCleanup = this.deps.router.on(streamKey, (_streamType, data, _message) => {
       try {
         const location = normalise(data);
         this.cacheLocation(data);
+        this.resolvePendingPoll(data);
         handler(location);
       } catch (err) {
         this.deps.logger.error("[LocationManager] Error in onUpdate handler:", err);
@@ -2468,6 +2472,7 @@ class LocationManager {
       try {
         const location = normalise(data);
         this.cacheLocation(data);
+        this.resolvePendingPoll(data);
         handler(location);
       } catch (err) {
         this.deps.logger.error("[LocationManager] Error in onUpdate handler (location_update):", err);
@@ -2478,7 +2483,7 @@ class LocationManager {
     this.streamRefCount++;
     if (this.streamRefCount === 1) {
       this.deps.addSubscription(streamKey);
-      this.deps.logger.debug({ accuracy: accuracy ?? "standard" }, `[LocationManager] Subscribed to "${streamKey}".`);
+      this.deps.logger.debug({ accuracy }, `[LocationManager] Subscribed to "${streamKey}".`);
     }
     return () => {
       if (!this.registrations.has(reg))
@@ -2494,17 +2499,31 @@ class LocationManager {
       }
     };
   }
-  requestUpdate(accuracy) {
+  requestUpdate() {
     const correlationId = generateCorrelationId();
-    const message = {
-      type: "location_poll_request" /* LOCATION_POLL_REQUEST */,
-      correlationId,
-      packageName: this.deps.getPackageName(),
-      sessionId: this.deps.getSessionId(),
-      accuracy: accuracy ?? "standard"
-    };
-    this.deps.sendMessage(message);
-    this.deps.logger.debug({ correlationId, accuracy: message.accuracy }, "\uD83D\uDCCD Location poll request sent");
+    const accuracy = this._config.accuracy ?? "standard";
+    return new Promise((resolve, reject) => {
+      const timeoutId = setTimeout(() => {
+        this.pendingPolls.delete(correlationId);
+        reject(new Error(`Location poll timed out after ${POLL_TIMEOUT_MS}ms (correlationId: ${correlationId})`));
+      }, POLL_TIMEOUT_MS);
+      this.pendingPolls.set(correlationId, { resolve, reject, timeoutId });
+      const message = {
+        type: "location_poll_request" /* LOCATION_POLL_REQUEST */,
+        correlationId,
+        packageName: this.deps.getPackageName(),
+        sessionId: this.deps.getSessionId(),
+        accuracy
+      };
+      try {
+        this.deps.sendMessage(message);
+        this.deps.logger.debug({ correlationId, accuracy }, "\uD83D\uDCCD Location poll request sent");
+      } catch (err) {
+        clearTimeout(timeoutId);
+        this.pendingPolls.delete(correlationId);
+        reject(err instanceof Error ? err : new Error(String(err)));
+      }
+    });
   }
   stop() {
     const snapshot = Array.from(this.registrations);
@@ -2517,6 +2536,11 @@ class LocationManager {
       this.deps.removeSubscription(LOCATION_STREAM);
     }
     this.streamRefCount = 0;
+    for (const [id, pending] of this.pendingPolls) {
+      clearTimeout(pending.timeoutId);
+      pending.reject(new Error("LocationManager stopped while poll was pending"));
+      this.pendingPolls.delete(id);
+    }
     this.deps.logger.debug("[LocationManager] All subscriptions stopped.");
   }
   get lat() {
@@ -2534,6 +2558,17 @@ class LocationManager {
   get hasPermission() {
     return this._hasPermission;
   }
+  resolvePendingPoll(raw) {
+    const correlationId = raw?.correlationId;
+    if (!correlationId)
+      return;
+    const pending = this.pendingPolls.get(correlationId);
+    if (!pending)
+      return;
+    clearTimeout(pending.timeoutId);
+    this.pendingPolls.delete(correlationId);
+    pending.resolve(normalise(raw));
+  }
   cacheLocation(raw) {
     if (typeof raw.lat === "number") {
       this._lat = raw.lat;
@@ -2559,6 +2594,7 @@ class LocationManager {
     this._lng = null;
     this._accuracy = null;
     this._timestamp = null;
+    this._config = {};
     this.deps.logger.debug("[LocationManager] Destroyed.");
   }
 }
@@ -2708,8 +2744,10 @@ class PermissionsManager {
   permissions;
   listeners = new Set;
   logger;
+  messageHandlers;
   constructor(deps) {
     this.logger = deps.logger;
+    this.messageHandlers = deps.messageHandlers;
     this.permissions = createDefaultPermissions();
   }
   has(permission) {
@@ -2724,6 +2762,26 @@ class PermissionsManager {
       this.listeners.delete(handler);
     };
   }
+  onPermissionError(handler) {
+    const cleanup = this.messageHandlers.register("permission_error", (msg) => {
+      try {
+        handler({ message: msg.message ?? "Permission error", deniedPermissions: msg.deniedPermissions });
+      } catch (err) {
+        this.logger.error("[PermissionsManager] Error in onPermissionError handler:", err);
+      }
+    });
+    return cleanup;
+  }
+  onPermissionDenied(handler) {
+    const cleanup = this.messageHandlers.register("permission_denied", (msg) => {
+      try {
+        handler({ message: msg.message ?? "Permission denied", permission: msg.permission, streamType: msg.streamType });
+      } catch (err) {
+        this.logger.error("[PermissionsManager] Error in onPermissionDenied handler:", err);
+      }
+    });
+    return cleanup;
+  }
   updateFromSettings(settings) {
     if (!settings) {
       this.logger.debug("PermissionsManager: No settings provided, skipping update");
@@ -2894,7 +2952,6 @@ class PhoneManager {
   deps;
   permissions;
   tracker;
-  _battery = null;
   constructor(deps) {
     this.deps = deps;
     this.permissions = deps.permissions;
@@ -2902,29 +2959,8 @@ class PhoneManager {
     this.notifications = new NotificationSubManager(this.permissions, this.tracker, deps.logger);
     this.calendar = new CalendarSubManager(this.permissions, this.tracker, deps.logger);
   }
-  get battery() {
-    return this._battery;
-  }
-  onBatteryUpdate(handler) {
-    return this.tracker.add("phone_battery_update" /* PHONE_BATTERY_UPDATE */, (_streamType, data) => {
-      const level = data.level ?? data.batteryLevel ?? data.battery_level;
-      if (level !== undefined) {
-        this._battery = level;
-      }
-      try {
-        handler({
-          level: level ?? 0,
-          charging: data.charging ?? false,
-          timeRemaining: data.timeRemaining ?? data.time_remaining
-        });
-      } catch (err) {
-        this.deps.logger.error(`PhoneManager: Error in battery handler: ${err instanceof Error ? err.message : String(err)}`);
-      }
-    });
-  }
   destroy() {
     this.tracker.destroyAll();
-    this._battery = null;
     this.deps.logger.debug("PhoneManager: Destroyed.");
   }
 }
@@ -2934,6 +2970,20 @@ init_message_types();
 var STREAM_ID_LENGTH = 36;
 var STREAM_READY_TIMEOUT_MS = 1e4;
 var PLAY_RESPONSE_TIMEOUT_MS = 60000;
+function createMp3Encoder(channels, sampleRate, bitrate) {
+  globalThis.MPEGMode ??= __require("lamejs/src/js/MPEGMode.js");
+  globalThis.Lame ??= __require("lamejs/src/js/Lame.js");
+  globalThis.BitStream ??= __require("lamejs/src/js/BitStream.js");
+  const lamejs = __require("lamejs");
+  const Encoder = lamejs.Mp3Encoder ?? lamejs.default?.Mp3Encoder;
+  return new Encoder(channels, sampleRate, bitrate);
+}
+function toInt16Array(data) {
+  if (data instanceof Int16Array)
+    return data;
+  const buffer = data instanceof ArrayBuffer ? data : data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
+  return new Int16Array(buffer);
+}
 
 class AudioOutputStreamImpl {
   id;
@@ -2943,6 +2993,7 @@ class AudioOutputStreamImpl {
   options;
   stateChangeHandlers = [];
   streamUrl = null;
+  encoder = null;
   constructor(streamId, deps, opts = {}) {
     this.id = streamId;
     this.deps = deps;
@@ -2964,6 +3015,9 @@ class AudioOutputStreamImpl {
     if (this._state !== "created") {
       throw new Error(`Cannot open stream in state "${this._state}"`);
     }
+    if (this.options.format === "pcm16") {
+      this.encoder = createMp3Encoder(this.options.channels, this.options.sampleRate, this.options.bitrate);
+    }
     const startMessage = {
       type: "audio_stream_start" /* AUDIO_STREAM_START */,
       packageName: this.deps.getPackageName(),
@@ -2996,7 +3050,15 @@ class AudioOutputStreamImpl {
     }
     if (chunk.length === 0)
       return;
-    this.sendBinaryFrame(chunk);
+    if (this.options.format === "pcm16" && this.encoder) {
+      const pcm = toInt16Array(chunk);
+      const encoded = this.encoder.encodeBuffer(pcm);
+      if (encoded.length === 0)
+        return;
+      this.sendBinaryFrame(new Uint8Array(encoded));
+    } else {
+      this.sendBinaryFrame(chunk);
+    }
   }
   async end() {
     if (this._state !== "streaming")
@@ -4263,7 +4325,7 @@ class MentraSession {
         this.logger.error(error, "MentraSession transport error");
       }
     });
-    this.permissions = new PermissionsManager({ logger: sdkLogger });
+    this.permissions = new PermissionsManager({ logger: sdkLogger, messageHandlers: this._router.messageHandlers });
     const deps = {
       router: this._router.dataStreamRouter,
       messageHandlers: this._router.messageHandlers,
@@ -4382,10 +4444,6 @@ class MentraSession {
     }));
     this.cleanupTasks.push(this._router.messageHandlers.register("capabilities_update" /* CAPABILITIES_UPDATE */, (message) => {
       this.capabilities = message.capabilities ?? null;
-      this.device.handleCapabilitiesUpdate(message);
-    }));
-    this.cleanupTasks.push(this._router.messageHandlers.register("device_state_update" /* DEVICE_STATE_UPDATE */, (message) => {
-      this.device.handleDeviceStateUpdate(message);
     }));
     this.cleanupTasks.push(this._router.messageHandlers.register("app_stopped" /* APP_STOPPED */, (message) => {
       const reason = message.reason ?? "unknown";
@@ -6167,7 +6225,7 @@ class AudioOutputStream extends EventEmitter5 {
       throw new Error(`Cannot open stream in state "${this._state}"`);
     }
     if (this.options.format === "pcm16") {
-      this.encoder = createMp3Encoder(this.options.channels, this.options.sampleRate, this.options.bitrate);
+      this.encoder = createMp3Encoder2(this.options.channels, this.options.sampleRate, this.options.bitrate);
     }
     const startMessage = {
       type: "audio_stream_start" /* AUDIO_STREAM_START */,
@@ -6201,7 +6259,7 @@ class AudioOutputStream extends EventEmitter5 {
     }
     let mp3Data;
     if (this.options.format === "pcm16" && this.encoder) {
-      const pcm = toInt16Array(data);
+      const pcm = toInt16Array2(data);
       const encoded = this.encoder.encodeBuffer(pcm);
       if (encoded.length === 0)
         return;
@@ -6296,7 +6354,7 @@ class AudioOutputStream extends EventEmitter5 {
     });
   }
 }
-function createMp3Encoder(channels, sampleRate, bitrate) {
+function createMp3Encoder2(channels, sampleRate, bitrate) {
   globalThis.MPEGMode ??= __require("lamejs/src/js/MPEGMode.js");
   globalThis.Lame ??= __require("lamejs/src/js/Lame.js");
   globalThis.BitStream ??= __require("lamejs/src/js/BitStream.js");
@@ -6312,7 +6370,7 @@ function toUint8Array(data) {
   const buf = data;
   return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
 }
-function toInt16Array(data) {
+function toInt16Array2(data) {
   if (data instanceof Int16Array)
     return data;
   const bytes = toUint8Array(data);
@@ -8445,7 +8503,7 @@ function createAuthMiddleware(options) {
     if (signedUserToken) {
       const userId = await verifySignedUserToken(signedUserToken);
       if (userId) {
-        console.log("[auth.middleware] User ID verified from signed user token:", userId);
+        console.debug("[auth.middleware] Authenticated via signed user token");
         return setAuthAndContinue(userId);
       } else {
         console.log("[auth.middleware] Signed user token invalid");
@@ -8465,7 +8523,7 @@ function createAuthMiddleware(options) {
           }
         }
         const { userId } = await exchangeToken(cloudApiUrl, tempToken, apiKey, packageName);
-        console.log("[auth.middleware] User ID verified from temporary token:", userId);
+        console.debug("[auth.middleware] Authenticated via temporary token");
         return setAuthAndContinue(userId);
       } catch (error) {
         console.error("Webview token exchange failed:", error);
@@ -8474,7 +8532,7 @@ function createAuthMiddleware(options) {
     if (frontendToken) {
       const userId = verifyFrontendToken(frontendToken, apiKey);
       if (userId) {
-        console.log("[auth.middleware] User ID verified from frontend user token:", userId);
+        console.debug("[auth.middleware] Authenticated via frontend token");
         return setAuthAndContinue(userId);
       } else {
         console.log("[auth.middleware] Frontend token invalid");
@@ -8615,15 +8673,11 @@ class AppServer extends Hono2 {
       healthCheck: true,
       ...config
     };
-    if (config.verbose !== undefined) {
-      process.env.MENTRA_VERBOSE = config.verbose ? "true" : "false";
-    }
     if (config.logLevel !== undefined) {
       process.env.MENTRA_LOG_LEVEL = config.logLevel;
     }
     this.logger = createLogger({
-      verbose: config.verbose,
-      logLevel: config.logLevel
+      logLevel: config.logLevel ?? "warn"
     }).child({
       app: this.config.packageName,
       packageName: this.config.packageName,
@@ -8919,8 +8973,11 @@ class AppServer extends Hono2 {
     try {
       await session.connect(sessionId);
       this.setActiveSession(sessionId, userId, session);
-      await this.onSession(session, sessionId, userId);
-      return c.json({ status: "success" });
+      const response = c.json({ status: "success" });
+      this.onSession(session, sessionId, userId).catch((error) => {
+        this.logger.error({ error, sessionId, userId }, "Error in onSession handler");
+      });
+      return response;
     } catch (error) {
       this.logger.error(error, "Failed to connect session");
       cleanupDisconnect();
@@ -9386,9 +9443,6 @@ class _V2CameraShim {
   takePhoto(options) {
     return this.session.camera.takePhoto(options);
   }
-  onPhotoTaken(handler) {
-    return this.session.camera.onPhotoTaken(handler);
-  }
   async requestPhoto(options) {
     const bridge = this.config.photoRequestBridge;
     const userId = this.session.userId;
@@ -9508,9 +9562,6 @@ class _V2EventManagerShim {
   onVpsCoordinates(handler) {
     return this.session.device.onVpsCoordinates(handler);
   }
-  onPhotoTaken(handler) {
-    return this.session.camera.onPhotoTaken(handler);
-  }
   onAudioChunk(handler) {
     return this.session.mic.onChunk((chunk) => {
       handler({
@@ -9563,8 +9614,6 @@ class _V2EventManagerShim {
         return this.onPhoneNotificationDismissed(handler);
       case "vps_coordinates":
         return this.onVpsCoordinates(handler);
-      case "photo_taken":
-        return this.onPhotoTaken(handler);
       default:
         return () => {};
     }
@@ -9736,9 +9785,6 @@ class _V2SessionShim {
   on(event, handler) {
     return this.events.on(event, handler);
   }
-  subscribeToGestures(gestures) {
-    return this.session.device.subscribeToGestures(gestures);
-  }
   onGlassesConnectionState(handler) {
     return this.session.device.state.connected.onChange((connected) => {
       handler({
@@ -9778,9 +9824,6 @@ class _V2SessionShim {
   onVpsCoordinates(handler) {
     return this.events.onVpsCoordinates(handler);
   }
-  onPhotoTaken(handler) {
-    return this.events.onPhotoTaken(handler);
-  }
   _subscriptionSettingsHandler;
   _subscriptionUpdateTriggers = [];
   setSubscriptionSettings(options) {
@@ -9927,8 +9970,11 @@ class _SessionManager {
       this.deleteIfSameSession(request.sessionId, created.session);
       throw error;
     }
-    await this.invokeSessionHandler(created.compatSession, request.sessionId);
-    return { status: "success" };
+    const response = { status: "success" };
+    this.invokeSessionHandler(created.compatSession, request.sessionId).catch((error) => {
+      this.logger.error({ error, sessionId: request.sessionId }, "Error in onSession handler");
+    });
+    return response;
   }
   async handleStopRequest(request) {
     this.stopSuppression.add(request.sessionId);
@@ -10274,4 +10320,4 @@ export {
   AnimationUtils
 };
 
-//# debugId=11051307E83217F164756E2164756E21
+//# debugId=69C890D7C0BEBFE864756E2164756E21