@mentra/sdk 2.1.29-beta.2 → 2.1.31-beta.1

package/dist/index.js

@@ -373,6 +373,7 @@ var init_message_types = __esm(() => {
     AppToCloudMessageType2["APP_USER_DISCOVERY"] = "app_user_discovery";
     AppToCloudMessageType2["APP_ROOM_JOIN"] = "app_room_join";
     AppToCloudMessageType2["APP_ROOM_LEAVE"] = "app_room_leave";
+    AppToCloudMessageType2["OWNERSHIP_RELEASE"] = "ownership_release";
   })(AppToCloudMessageType ||= {});
   ((CloudToAppMessageType2) => {
     CloudToAppMessageType2["CONNECTION_ACK"] = "tpa_connection_ack";
@@ -380,6 +381,7 @@ var init_message_types = __esm(() => {
     CloudToAppMessageType2["APP_STOPPED"] = "app_stopped";
     CloudToAppMessageType2["SETTINGS_UPDATE"] = "settings_update";
     CloudToAppMessageType2["CAPABILITIES_UPDATE"] = "capabilities_update";
+    CloudToAppMessageType2["DEVICE_STATE_UPDATE"] = "device_state_update";
     CloudToAppMessageType2["DASHBOARD_MODE_CHANGED"] = "dashboard_mode_changed";
     CloudToAppMessageType2["DASHBOARD_ALWAYS_ON_CHANGED"] = "dashboard_always_on_changed";
     CloudToAppMessageType2["DATA_STREAM"] = "data_stream";
@@ -829,6 +831,9 @@ function isRtmpStreamRequest(message) {
 function isRtmpStreamStopRequest(message) {
   return message.type === "rtmp_stream_stop" /* RTMP_STREAM_STOP */;
 }
+function isOwnershipRelease(message) {
+  return message.type === "ownership_release" /* OWNERSHIP_RELEASE */;
+}
 // src/utils/bitmap-utils.ts
 import * as fs from "fs/promises";
 import * as path from "path";
@@ -1339,6 +1344,9 @@ function isSettingsUpdate2(message) {
 function isCapabilitiesUpdate(message) {
   return message.type === "capabilities_update" /* CAPABILITIES_UPDATE */;
 }
+function isDeviceStateUpdate(message) {
+  return message.type === "device_state_update" /* DEVICE_STATE_UPDATE */;
+}
 function isDataStream(message) {
   return message.type === "data_stream" /* DATA_STREAM */;
 }
@@ -1906,6 +1914,9 @@ class EventManager {
       this.unsubscribe(type);
     }
   }
+  getRegisteredStreams() {
+    return Array.from(this.handlers.keys());
+  }
   emit(event, data) {
     try {
       this.emitter.emit(event, data);
@@ -2195,7 +2206,7 @@ class ApiClient {
 import pino from "pino";
 var BETTERSTACK_SOURCE_TOKEN = process.env.BETTERSTACK_SOURCE_TOKEN;
 var BETTERSTACK_ENDPOINT = process.env.BETTERSTACK_ENDPOINT || "https://s1311181.eu-nbg-2.betterstackdata.com";
-var NODE_ENV = "isaiah";
+var NODE_ENV = "development";
 var PORTER_APP_NAME = process.env.PORTER_APP_NAME || "cloud-local";
 var LOG_LEVEL = NODE_ENV === "production" ? "info" : "debug";
 var streams2 = [];
@@ -3527,7 +3538,151 @@ class SimpleStorage {
   }
 }
 
+// src/utils/Observable.ts
+class Observable {
+  _value;
+  _listeners = new Set;
+  _initialized = false;
+  constructor(initialValue) {
+    this._value = initialValue;
+  }
+  get value() {
+    return this._value;
+  }
+  valueOf() {
+    return this._value;
+  }
+  toString() {
+    return String(this._value);
+  }
+  [Symbol.toPrimitive](hint) {
+    if (hint === "string") {
+      return String(this._value);
+    }
+    return this._value;
+  }
+  onChange(callback) {
+    this._listeners.add(callback);
+    if (this._initialized) {
+      callback(this._value);
+    }
+    return () => this._listeners.delete(callback);
+  }
+  setValue(value) {
+    const isFirstInit = !this._initialized;
+    if (isFirstInit) {
+      this._initialized = true;
+    }
+    if (isFirstInit || this._value !== value) {
+      this._value = value;
+      this._listeners.forEach((cb) => {
+        try {
+          cb(value);
+        } catch (error) {
+          console.error("Error in Observable onChange callback:", error);
+        }
+      });
+    }
+  }
+  get listenerCount() {
+    return this._listeners.size;
+  }
+}
+
+// src/app/session/device-state.ts
+class DeviceState {
+  wifiConnected;
+  wifiSsid;
+  wifiLocalIp;
+  batteryLevel;
+  charging;
+  caseBatteryLevel;
+  caseCharging;
+  caseOpen;
+  caseRemoved;
+  hotspotEnabled;
+  hotspotSsid;
+  connected;
+  modelName;
+  appSession;
+  constructor(appSession) {
+    this.appSession = appSession;
+    this.wifiConnected = new Observable(false);
+    this.wifiSsid = new Observable(null);
+    this.wifiLocalIp = new Observable(null);
+    this.batteryLevel = new Observable(null);
+    this.charging = new Observable(null);
+    this.caseBatteryLevel = new Observable(null);
+    this.caseCharging = new Observable(null);
+    this.caseOpen = new Observable(null);
+    this.caseRemoved = new Observable(null);
+    this.hotspotEnabled = new Observable(null);
+    this.hotspotSsid = new Observable(null);
+    this.connected = new Observable(false);
+    this.modelName = new Observable(null);
+  }
+  updateFromMessage(state) {
+    if (state.connected !== undefined) {
+      this.connected.setValue(state.connected);
+    }
+    if (state.modelName !== undefined) {
+      this.modelName.setValue(state.modelName);
+    }
+    if (state.wifiConnected !== undefined) {
+      this.wifiConnected.setValue(state.wifiConnected);
+    }
+    if (state.wifiSsid !== undefined) {
+      this.wifiSsid.setValue(state.wifiSsid ?? null);
+    }
+    if (state.wifiLocalIp !== undefined) {
+      this.wifiLocalIp.setValue(state.wifiLocalIp ?? null);
+    }
+    if (state.batteryLevel !== undefined) {
+      this.batteryLevel.setValue(state.batteryLevel ?? null);
+    }
+    if (state.charging !== undefined) {
+      this.charging.setValue(state.charging ?? null);
+    }
+    if (state.caseBatteryLevel !== undefined) {
+      this.caseBatteryLevel.setValue(state.caseBatteryLevel ?? null);
+    }
+    if (state.caseCharging !== undefined) {
+      this.caseCharging.setValue(state.caseCharging ?? null);
+    }
+    if (state.caseOpen !== undefined) {
+      this.caseOpen.setValue(state.caseOpen ?? null);
+    }
+    if (state.caseRemoved !== undefined) {
+      this.caseRemoved.setValue(state.caseRemoved ?? null);
+    }
+    if (state.hotspotEnabled !== undefined) {
+      this.hotspotEnabled.setValue(state.hotspotEnabled ?? null);
+    }
+    if (state.hotspotSsid !== undefined) {
+      this.hotspotSsid.setValue(state.hotspotSsid ?? null);
+    }
+  }
+  getSnapshot() {
+    return {
+      connected: this.connected.value,
+      modelName: this.modelName.value ?? undefined,
+      wifiConnected: this.wifiConnected.value,
+      wifiSsid: this.wifiSsid.value ?? undefined,
+      wifiLocalIp: this.wifiLocalIp.value ?? undefined,
+      batteryLevel: this.batteryLevel.value ?? undefined,
+      charging: this.charging.value ?? undefined,
+      caseBatteryLevel: this.caseBatteryLevel.value ?? undefined,
+      caseCharging: this.caseCharging.value ?? undefined,
+      caseOpen: this.caseOpen.value ?? undefined,
+      caseRemoved: this.caseRemoved.value ?? undefined,
+      hotspotEnabled: this.hotspotEnabled.value ?? undefined,
+      hotspotSsid: this.hotspotSsid.value ?? undefined
+    };
+  }
+}
+
 // src/app/session/index.ts
+var SDK_SUBSCRIPTION_PATCH = "bug007-fix-v2";
 var APP_TO_APP_EVENT_TYPES = [
   "app_message_received",
   "app_user_joined",
@@ -3541,7 +3696,7 @@ class AppSession {
   ws = null;
   sessionId = null;
   reconnectAttempts = 0;
-  subscriptions = new Set;
+  terminated = false;
   streamRates = new Map;
   resources = new ResourceTracker;
   settingsData = [];
@@ -3560,6 +3715,7 @@ class AppSession {
   led;
   audio;
   simpleStorage;
+  device;
   appServer;
   logger;
   userId;
@@ -3609,18 +3765,14 @@ class AppSession {
     this.layouts = new LayoutManager(config.packageName, this.send.bind(this));
     this.settings = new SettingsManager(this.settingsData, this.config.packageName, this.config.mentraOSWebsocketUrl, this.sessionId ?? undefined, async (streams3) => {
       this.logger.debug({ streams: JSON.stringify(streams3) }, `[AppSession] subscribeFn called for streams`);
-      streams3.forEach((stream) => {
-        if (!this.subscriptions.has(stream)) {
-          this.subscriptions.add(stream);
-          this.logger.debug(`[AppSession] Auto-subscribed to stream '${stream}' for MentraOS setting.`);
-        } else {
-          this.logger.debug(`[AppSession] Already subscribed to stream '${stream}'.`);
-        }
-      });
-      this.logger.debug({ subscriptions: JSON.stringify(Array.from(this.subscriptions)) }, `[AppSession] Current subscriptions after subscribeFn`);
+      const currentHandlerStreams = this.events.getRegisteredStreams();
+      this.logger.debug({
+        requestedStreams: JSON.stringify(streams3),
+        currentHandlerStreams: JSON.stringify(currentHandlerStreams)
+      }, `[AppSession] subscribeFn: requested streams vs current handler streams`);
       if (this.ws?.readyState === 1) {
         this.updateSubscriptions();
-        this.logger.debug(`[AppSession] Sent updated subscriptions to cloud after auto-subscribing to MentraOS setting.`);
+        this.logger.debug(`[AppSession] Sent updated subscriptions to cloud (derived from handlers).`);
       } else {
         this.logger.debug(`[AppSession] WebSocket not open, will send subscriptions when connected.`);
       }
@@ -3631,6 +3783,7 @@ class AppSession {
     this.led = new LedModule(this, this.config.packageName, this.sessionId || "unknown-session-id", this.logger.child({ module: "led" }));
     this.audio = new AudioManager(this, this.config.packageName, this.sessionId || "unknown-session-id", this.logger.child({ module: "audio" }));
     this.simpleStorage = new SimpleStorage(this);
+    this.device = { state: new DeviceState(this) };
     this.location = new LocationManager(this);
   }
   getSessionId() {
@@ -3697,7 +3850,6 @@ class AppSession {
       this.logger.warn(`[AppSession] Attempted to subscribe to App-to-App event type '${type}', which is not a valid stream. Use the event handler (e.g., onAppMessage) instead.`);
       return;
     }
-    this.subscriptions.add(type);
     if (rate) {
       this.streamRates.set(type, rate);
     }
@@ -3716,7 +3868,6 @@ class AppSession {
       this.logger.warn(`[AppSession] Attempted to unsubscribe from App-to-App event type '${type}', which is not a valid stream.`);
       return;
     }
-    this.subscriptions.delete(type);
     this.streamRates.delete(type);
     if (this.ws?.readyState === 1) {
       this.updateSubscriptions();
@@ -3840,11 +3991,15 @@ class AppSession {
           const isUserSessionEnded = reason && reason.includes("User session ended");
           this.logger.debug(`\uD83D\uDD0C [${this.config.packageName}] WebSocket closed with code ${code}${reasonStr}`);
           this.logger.debug(`\uD83D\uDD0C [${this.config.packageName}] isNormalClosure: ${isNormalClosure}, isManualStop: ${isManualStop}, isUserSessionEnded: ${isUserSessionEnded}`);
-          if (!isNormalClosure && !isManualStop) {
+          if (isUserSessionEnded) {
+            this.terminated = true;
+            this.logger.info(`\uD83D\uDED1 [${this.config.packageName}] User session ended - marking as terminated, no reconnection allowed`);
+          }
+          if (!isNormalClosure && !isManualStop && !this.terminated) {
             this.logger.warn(`\uD83D\uDD0C [${this.config.packageName}] Abnormal closure detected, attempting reconnection`);
             this.handleReconnection();
           } else {
-            this.logger.debug(`\uD83D\uDD0C [${this.config.packageName}] Normal closure detected, not attempting reconnection`);
+            this.logger.debug(`\uD83D\uDD0C [${this.config.packageName}] Normal/terminated closure detected, not attempting reconnection (terminated: ${this.terminated})`);
           }
           if (isUserSessionEnded) {
             this.logger.info(`\uD83D\uDED1 [${this.config.packageName}] User session ended - emitting disconnected event with sessionEnded flag`);
@@ -3908,7 +4063,26 @@ class AppSession {
       }
     });
   }
-  async disconnect() {
+  async releaseOwnership(reason) {
+    if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
+      this.logger.debug(`[${this.config.packageName}] Cannot release ownership - WebSocket not open`);
+      return;
+    }
+    const message = {
+      type: "ownership_release" /* OWNERSHIP_RELEASE */,
+      packageName: this.config.packageName,
+      sessionId: this.sessionId || "",
+      reason,
+      timestamp: new Date
+    };
+    this.logger.info({ reason, sessionId: this.sessionId }, `\uD83D\uDD04 [${this.config.packageName}] Releasing ownership: ${reason}`);
+    this.send(message);
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+  async disconnect(options) {
+    if (options?.releaseOwnership && options?.reason) {
+      await this.releaseOwnership(options.reason);
+    }
     try {
       await this.simpleStorage.flush();
       console.log("SimpleStorage flushed on disconnect");
@@ -3924,7 +4098,6 @@ class AppSession {
     this.resources.dispose();
     this.ws = null;
     this.sessionId = null;
-    this.subscriptions.clear();
     this.reconnectAttempts = 0;
   }
   getSettings() {
@@ -3945,11 +4118,14 @@ class AppSession {
     if (!this.subscriptionSettingsHandler)
       return;
     try {
-      const newSubscriptions = this.subscriptionSettingsHandler(this.settingsData);
-      this.subscriptions.clear();
-      newSubscriptions.forEach((subscription) => {
-        this.subscriptions.add(subscription);
-      });
+      const settingsSubscriptions = this.subscriptionSettingsHandler(this.settingsData);
+      const handlerStreams = this.events.getRegisteredStreams();
+      if (settingsSubscriptions.length !== handlerStreams.length) {
+        this.logger.warn({
+          settingsSubscriptions: JSON.stringify(settingsSubscriptions),
+          handlerStreams: JSON.stringify(handlerStreams)
+        }, `[AppSession] Settings-based subscriptions (${settingsSubscriptions.length}) differ from handler-based subscriptions (${handlerStreams.length}). ` + `Subscriptions are now derived from handlers. Ensure handlers are registered for desired streams.`);
+      }
       if (this.ws && this.ws.readyState === 1) {
         this.updateSubscriptions();
       }
@@ -4079,6 +4255,8 @@ class AppSession {
             this.logger.debug(`[AppSession] No capabilities provided in CONNECTION_ACK`);
           }
           this.events.emit("connected", this.settingsData);
+          const handlerCount = this.events.getRegisteredStreams().length;
+          this.logger.info({ patch: SDK_SUBSCRIPTION_PATCH, handlerCount }, `[AppSession] \uD83D\uDD27 SDK Patch Active: ${SDK_SUBSCRIPTION_PATCH} - Subscriptions derived from ${handlerCount} handler(s)`);
           this.updateSubscriptions();
           if (this.shouldUpdateSubscriptionsOnSettingsChange && this.settingsData.length > 0) {
             this.updateSubscriptionsFromSettings();
@@ -4087,28 +4265,33 @@ class AppSession {
           const errorMessage = message.message || "Unknown connection error";
           this.events.emit("error", new Error(errorMessage));
         } else if (message.type === "audio_chunk" /* AUDIO_CHUNK */) {
-          if (this.subscriptions.has("audio_chunk" /* AUDIO_CHUNK */)) {
+          const hasAudioHandler = this.events.getRegisteredStreams().includes("audio_chunk" /* AUDIO_CHUNK */);
+          if (hasAudioHandler) {
             this.events.emit("audio_chunk" /* AUDIO_CHUNK */, message);
           }
         } else if (isDataStream(message) && message.streamType === "glasses_connection_state" /* GLASSES_CONNECTION_STATE */) {
           this.glassesConnectionState = message.data;
-          if (this.subscriptions.has("glasses_connection_state" /* GLASSES_CONNECTION_STATE */)) {
+          const hasGlassesStateHandler = this.events.getRegisteredStreams().includes("glasses_connection_state" /* GLASSES_CONNECTION_STATE */);
+          if (hasGlassesStateHandler) {
             const sanitizedData = this.sanitizeEventData("glasses_connection_state" /* GLASSES_CONNECTION_STATE */, message.data);
             this.events.emit("glasses_connection_state" /* GLASSES_CONNECTION_STATE */, sanitizedData);
           }
         } else if (isDataStream(message)) {
           const messageStreamType = message.streamType;
-          if (messageStreamType && this.subscriptions.has(messageStreamType)) {
+          const hasHandler = this.events.getRegisteredStreams().includes(messageStreamType);
+          if (messageStreamType && hasHandler) {
             const sanitizedData = this.sanitizeEventData(messageStreamType, message.data);
             this.events.emit(messageStreamType, sanitizedData);
           }
         } else if (isRtmpStreamStatus2(message)) {
-          if (this.subscriptions.has("rtmp_stream_status" /* RTMP_STREAM_STATUS */)) {
+          const hasRtmpHandler = this.events.getRegisteredStreams().includes("rtmp_stream_status" /* RTMP_STREAM_STATUS */);
+          if (hasRtmpHandler) {
             this.events.emit("rtmp_stream_status" /* RTMP_STREAM_STATUS */, message);
           }
           this.camera.updateStreamState(message);
         } else if (isManagedStreamStatus(message)) {
-          if (this.subscriptions.has("managed_stream_status" /* MANAGED_STREAM_STATUS */)) {
+          const hasManagedStreamHandler = this.events.getRegisteredStreams().includes("managed_stream_status" /* MANAGED_STREAM_STATUS */);
+          if (hasManagedStreamHandler) {
             this.events.emit("managed_stream_status" /* MANAGED_STREAM_STATUS */, message);
           }
           this.camera.handleManagedStreamStatus(message);
@@ -4139,6 +4322,12 @@ class AppSession {
             modelName: capabilitiesMessage.modelName,
             timestamp: capabilitiesMessage.timestamp
           });
+        } else if (isDeviceStateUpdate(message)) {
+          this.device.state.updateFromMessage(message.state);
+          this.logger.debug({
+            changedFields: Object.keys(message.state),
+            fullSnapshot: message.fullSnapshot
+          }, `[AppSession] Device state updated via WebSocket`);
         } else if (isAppStopped(message)) {
           const reason = message.reason || "unknown";
           const displayReason = `App stopped: ${reason}`;
@@ -4245,7 +4434,8 @@ class AppSession {
   }
   handleBinaryMessage(buffer) {
     try {
-      if (!this.subscriptions.has("audio_chunk" /* AUDIO_CHUNK */)) {
+      const hasAudioHandler = this.events.getRegisteredStreams().includes("audio_chunk" /* AUDIO_CHUNK */);
+      if (!hasAudioHandler) {
         return;
       }
       if (!buffer || buffer.byteLength === 0) {
@@ -4318,8 +4508,9 @@ class AppSession {
     this.send(message);
   }
   updateSubscriptions() {
-    this.logger.info({ subscriptions: JSON.stringify(Array.from(this.subscriptions)) }, `[AppSession] updateSubscriptions: sending subscriptions to cloud`);
-    const subscriptionPayload = Array.from(this.subscriptions).map((stream) => {
+    const derivedSubscriptions = this.events.getRegisteredStreams();
+    this.logger.info({ subscriptions: JSON.stringify(derivedSubscriptions) }, `[AppSession] updateSubscriptions: sending ${derivedSubscriptions.length} subscriptions to cloud (derived from handlers)`);
+    const subscriptionPayload = derivedSubscriptions.map((stream) => {
       const rate = this.streamRates.get(stream);
       if (rate && stream === "location_stream" /* LOCATION_STREAM */) {
         return { stream: "location_stream", rate };
@@ -4336,6 +4527,10 @@ class AppSession {
     this.send(message);
   }
   async handleReconnection() {
+    if (this.terminated) {
+      this.logger.info(`\uD83D\uDD04 Reconnection skipped: session was terminated (User session ended). ` + `If cloud restarts app, onSession will be called with fresh handlers.`);
+      return;
+    }
     if (!this.config.autoReconnect || !this.sessionId) {
       this.logger.debug(`\uD83D\uDD04 Reconnection skipped: autoReconnect=${this.config.autoReconnect}, sessionId=${this.sessionId ? "valid" : "invalid"}`);
       return;
@@ -4415,7 +4610,12 @@ class AppSession {
         throw new Error(`Failed to send message: ${errorMessage}`);
       }
     } catch (error) {
-      this.logger.error(error, "Message send error");
+      const isDisconnectError = error instanceof Error && (error.message.includes("WebSocket not connected") || error.message.includes("CLOSED") || error.message.includes("CLOSING"));
+      if (isDisconnectError) {
+        this.logger.debug(error, "Message send skipped - session disconnected");
+      } else {
+        this.logger.error(error, "Message send error");
+      }
       if (error instanceof Error) {
         this.events.emit("error", error);
       } else {
@@ -4968,10 +5168,10 @@ class AppServer {
       });
     });
   }
-  stop() {
+  async stop() {
     this.logger.info(`
 \uD83D\uDED1 Shutting down...`);
-    this.cleanup();
+    await this.cleanup();
     process.exit(0);
   }
   generateToken(userId, sessionId, secretKey) {
@@ -5175,10 +5375,20 @@ class AppServer {
     process.on("SIGTERM", () => this.stop());
     process.on("SIGINT", () => this.stop());
   }
-  cleanup() {
+  async cleanup() {
     for (const [sessionId, session] of this.activeSessions) {
-      this.logger.info(`\uD83D\uDC4B Closing session ${sessionId}`);
-      session.disconnect();
+      this.logger.info(`\uD83D\uDC4B Closing session ${sessionId} with ownership release`);
+      try {
+        await session.disconnect({
+          releaseOwnership: true,
+          reason: "clean_shutdown"
+        });
+      } catch (error) {
+        this.logger.error(error, `Error during cleanup of session ${sessionId}`);
+        try {
+          await session.disconnect();
+        } catch {}
+      }
     }
     this.activeSessions.clear();
     this.activeSessionsByUserId.clear();
@@ -5332,6 +5542,7 @@ export {
   isPhoneNotificationDismissed,
   isPhoneNotification,
   isPhoneBatteryUpdate,
+  isOwnershipRelease,
   isMicrophoneStateChange,
   isManagedStreamStopRequest,
   isManagedStreamStatus,
@@ -5400,6 +5611,7 @@ export {
   PhotoStage,
   PhotoErrorCode,
   PermissionType,
+  Observable,
   LedModule,
   LayoutType,
   LEGACY_PERMISSION_MAP,
@@ -5408,6 +5620,7 @@ export {
   GlassesToCloudMessageType,
   GIVE_APP_CONTROL_OF_TOOL_RESPONSE,
   EventTypes,
+  DeviceState,
   DashboardMode,
   DashboardMessageTypes,
   ControlActionTypes,
@@ -5425,4 +5638,4 @@ export {
   AnimationUtils
 };
 
-//# debugId=AD30D8A3207C691A64756E2164756E21
+//# debugId=BBCA9D1CAB7CB76464756E2164756E21