@mentra/sdk 3.0.0-hono.0 → 3.0.0-hono.2

package/dist/index.js

@@ -1333,6 +1333,9 @@ class AnimationUtils {
     return frames;
   }
 }
+// src/types/index.ts
+init_message_types();
+
 // src/types/messages/cloud-to-app.ts
 init_message_types();
 init_streams();
@@ -1385,7 +1388,7 @@ function isAudioPlayResponse2(message) {
   return message.type === "audio_play_response" /* AUDIO_PLAY_RESPONSE */;
 }
 
-// src/index.ts
+// src/types/index.ts
 init_streams();
 init_dashboard();
 
@@ -1513,11 +1516,15 @@ function isSessionWebhookRequest(request) {
 function isStopWebhookRequest(request) {
   return request.type === "stop_request" /* STOP_REQUEST */;
 }
+// src/index.ts
+init_streams();
+init_dashboard();
+
 // src/app/server/index.ts
 import fs2 from "fs";
 import path2 from "path";
 import axios3 from "axios";
-import { Hono } from "hono";
+import { Hono as Hono2 } from "hono";
 import { serveStatic } from "hono/bun";
 
 // src/constants/log-messages/updates.ts
@@ -1591,7 +1598,7 @@ var BETTERSTACK_ENDPOINT = process.env.BETTERSTACK_ENDPOINT || "https://s1311181
 var NODE_ENV = "isaiah";
 var PORTER_APP_NAME = process.env.PORTER_APP_NAME || "cloud-local";
 var LOG_LEVEL = NODE_ENV === "production" ? "info" : "debug";
-var streams = [];
+var streams2 = [];
 var prettyTransport = pino.transport({
   target: "pino-pretty",
   options: {
@@ -1603,7 +1610,7 @@ var prettyTransport = pino.transport({
     customPrettifiers: {}
   }
 });
-streams.push({
+streams2.push({
   stream: prettyTransport,
   level: LOG_LEVEL
 });
@@ -1616,7 +1623,7 @@ if (BETTERSTACK_SOURCE_TOKEN) {
         options: { endpoint: BETTERSTACK_ENDPOINT }
       }
     });
-    streams.push({
+    streams2.push({
       stream: betterStackTransport,
       level: LOG_LEVEL
     });
@@ -1624,7 +1631,7 @@ if (BETTERSTACK_SOURCE_TOKEN) {
     console.warn("BetterStack logging unavailable:", error instanceof Error ? error.message : error);
   }
 }
-var multistream = pino.multistream(streams);
+var multistream = pino.multistream(streams2);
 var baseLoggerOptions = {
   level: LOG_LEVEL,
   base: {
@@ -1635,11 +1642,6 @@ var baseLoggerOptions = {
 };
 var logger = pino(baseLoggerOptions, multistream);
 
-// src/types/index.ts
-init_message_types();
-init_streams();
-init_dashboard();
-
 // src/app/session/index.ts
 import { WebSocket } from "ws";
 
@@ -2689,7 +2691,6 @@ class CameraModule {
   packageName;
   sessionId;
   logger;
-  pendingPhotoRequests = new Map;
   isStreaming = false;
   currentStreamUrl;
   currentStreamState;
@@ -2706,9 +2707,13 @@ class CameraModule {
       const baseUrl = this.session?.getHttpsServerUrl?.() || "";
       cameraWarnLog(baseUrl, this.packageName, "requestPhoto");
       try {
-        console.log("DEBUG: requestPhoto options:", options);
-        const requestId = `photo_req_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
-        this.pendingPhotoRequests.set(requestId, { resolve, reject });
+        const requestId = this.session.appServer.registerPhotoRequest({
+          userId: this.session.userId,
+          sessionId: this.sessionId,
+          session: this.session,
+          resolve,
+          reject
+        });
         const message = {
           type: "photo_request" /* PHOTO_REQUEST */,
           packageName: this.packageName,
@@ -2729,7 +2734,7 @@ class CameraModule {
           hasAuthToken: !!options?.authToken
         }, `\uD83D\uDCF8 Photo request sent`);
         if (options?.customWebhookUrl) {
-          this.logger.info({ requestId, customWebhookUrl: options.customWebhookUrl }, `\uD83D\uDCF8 Using custom webhook URL - resolving promise immediately since photo will be uploaded directly to custom endpoint`);
+          this.logger.info({ requestId, customWebhookUrl: options.customWebhookUrl }, `\uD83D\uDCF8 Using custom webhook URL - resolving promise immediately`);
           const mockPhotoData = {
             buffer: Buffer.from([]),
             mimeType: "image/jpeg",
@@ -2738,83 +2743,37 @@ class CameraModule {
             size: 0,
             timestamp: new Date
           };
-          this.pendingPhotoRequests.delete(requestId);
+          this.session.appServer.completePhotoRequest(requestId);
           resolve(mockPhotoData);
           return;
         }
-        const timeoutMs = 30000;
-        if (this.session && this.session.resources) {
-          this.session.resources.setTimeout(() => {
-            if (this.pendingPhotoRequests.has(requestId)) {
-              this.pendingPhotoRequests.get(requestId).reject("Photo request timed out");
-              this.pendingPhotoRequests.delete(requestId);
-              this.logger.warn({ requestId }, `\uD83D\uDCF8 Photo request timed out`);
-            }
-          }, timeoutMs);
-        } else {
-          setTimeout(() => {
-            if (this.pendingPhotoRequests.has(requestId)) {
-              this.pendingPhotoRequests.get(requestId).reject("Photo request timed out");
-              this.pendingPhotoRequests.delete(requestId);
-              this.logger.warn({ requestId }, `\uD83D\uDCF8 Photo request timed out`);
-            }
-          }, timeoutMs);
-        }
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        reject(`Failed to request photo: ${errorMessage}`);
+        reject(new Error(`Failed to request photo: ${errorMessage}`));
       }
     });
   }
-  handlePhotoReceived(photoData) {
-    const { requestId } = photoData;
-    const pendingRequest = this.pendingPhotoRequests.get(requestId);
-    if (pendingRequest) {
-      this.logger.info({ requestId }, `\uD83D\uDCF8 Photo received for request ${requestId}`);
-      pendingRequest.resolve(photoData);
-      this.pendingPhotoRequests.delete(requestId);
-    } else {
-      this.logger.warn({ requestId }, `\uD83D\uDCF8 Received photo for unknown request ID: ${requestId}`);
-    }
-  }
-  handlePhotoError(errorResponse) {
-    const { requestId, error } = errorResponse;
-    const pendingRequest = this.pendingPhotoRequests.get(requestId);
-    if (pendingRequest) {
-      this.logger.error({ requestId, errorCode: error.code, errorMessage: error.message }, `\uD83D\uDCF8 Photo capture failed: ${error.code} - ${error.message}`);
-      pendingRequest.reject(`${error.code}: ${error.message}`);
-      this.pendingPhotoRequests.delete(requestId);
-    } else {
-      this.logger.warn({ requestId, errorCode: error.code, errorMessage: error.message }, `\uD83D\uDCF8 Received photo error for unknown request ID: ${requestId}`);
-    }
-  }
   hasPhotoPendingRequest(requestId) {
-    return this.pendingPhotoRequests.has(requestId);
+    return false;
   }
   getPhotoPendingRequestCount() {
-    return this.pendingPhotoRequests.size;
+    return 0;
   }
   getPhotoPendingRequestIds() {
-    return Array.from(this.pendingPhotoRequests.keys());
+    return [];
   }
   cancelPhotoRequest(requestId) {
-    const pendingRequest = this.pendingPhotoRequests.get(requestId);
-    if (pendingRequest) {
-      pendingRequest.reject("Photo request cancelled");
-      this.pendingPhotoRequests.delete(requestId);
+    const pending = this.session.appServer.completePhotoRequest(requestId);
+    if (pending) {
+      pending.reject(new Error("Photo request cancelled"));
       this.logger.info({ requestId }, `\uD83D\uDCF8 Photo request cancelled`);
       return true;
     }
     return false;
   }
   cancelAllPhotoRequests() {
-    const count = this.pendingPhotoRequests.size;
-    for (const [requestId, { reject }] of this.pendingPhotoRequests) {
-      reject("Photo request cancelled - session cleanup");
-      this.logger.info({ requestId }, `\uD83D\uDCF8 Photo request cancelled during cleanup`);
-    }
-    this.pendingPhotoRequests.clear();
-    return count;
+    this.session.appServer.cleanupPhotoRequestsForSession(this.sessionId);
+    return 0;
   }
   async startStream(options) {
     this.logger.info({ rtmpUrl: options.rtmpUrl }, `\uD83D\uDCF9 RTMP stream request starting`);
@@ -4834,6 +4793,7 @@ class TpaSession extends AppSession {
 // src/app/webview/index.ts
 import * as crypto from "crypto";
 import axios2 from "axios";
+import { Hono } from "hono";
 import { getCookie, setCookie, deleteCookie } from "hono/cookie";
 import { KEYUTIL, KJUR } from "jsrsasign";
 var userTokenPublicKey = process.env.MENTRAOS_CLOUD_USER_TOKEN_PUBLIC_KEY || `-----BEGIN PUBLIC KEY-----
@@ -5055,14 +5015,80 @@ function createAuthMiddleware(options) {
     await next();
   };
 }
+function generateFrontendToken(userId, apiKey) {
+  const hashedApiKey = crypto.createHash("sha256").update(apiKey).digest("hex");
+  const hash = crypto.createHash("sha256").update(userId).update(hashedApiKey).digest("hex");
+  return `${userId}:${hash}`;
+}
+function createMentraAuthRoutes(options) {
+  const {
+    apiKey,
+    packageName,
+    cookieSecret,
+    cookieOptions = {
+      httpOnly: true,
+      secure: false,
+      maxAge: 30 * 24 * 60 * 60,
+      sameSite: "Lax",
+      path: "/"
+    }
+  } = options;
+  if (!apiKey) {
+    throw new Error("API Key is required for Mentra auth routes.");
+  }
+  if (!cookieSecret || typeof cookieSecret !== "string" || cookieSecret.length < 8) {
+    throw new Error("A strong cookieSecret (at least 8 characters) is required.");
+  }
+  const authRouter = new Hono;
+  const cookieName = `${packageName}-session`;
+  authRouter.get("/init", async (c) => {
+    const tempToken = c.req.query("aos_temp_token");
+    const signedUserToken = c.req.query("aos_signed_user_token");
+    if (signedUserToken) {
+      const userId = await verifySignedUserToken(signedUserToken);
+      if (userId) {
+        const frontendToken = generateFrontendToken(userId, apiKey);
+        const signedSession = signSession(userId, cookieSecret);
+        setCookie(c, cookieName, signedSession, cookieOptions);
+        console.log("[mentra/auth/init] User authenticated via signed user token:", userId);
+        return c.json({ success: true, userId, frontendToken });
+      }
+      return c.json({ success: false, error: "Invalid signed user token" }, 401);
+    }
+    if (tempToken) {
+      try {
+        let cloudApiUrl = "https://api.mentra.glass";
+        const cloudApiUrlFromQuery = c.req.query("cloudApiUrl");
+        if (cloudApiUrlFromQuery) {
+          const checksum = c.req.query("cloudApiUrlChecksum");
+          if (checksum && validateCloudApiUrlChecksum(checksum, cloudApiUrlFromQuery, apiKey)) {
+            cloudApiUrl = cloudApiUrlFromQuery;
+          }
+        }
+        const { userId } = await exchangeToken(cloudApiUrl, tempToken, apiKey, packageName);
+        const frontendToken = generateFrontendToken(userId, apiKey);
+        const signedSession = signSession(userId, cookieSecret);
+        setCookie(c, cookieName, signedSession, cookieOptions);
+        console.log("[mentra/auth/init] User authenticated via temp token:", userId);
+        return c.json({ success: true, userId, frontendToken });
+      } catch (error) {
+        console.error("[mentra/auth/init] Token exchange failed:", error);
+        return c.json({ success: false, error: "Token exchange failed" }, 401);
+      }
+    }
+    return c.json({ success: false, error: "No token provided" }, 400);
+  });
+  return authRouter;
+}
 
 // src/app/server/index.ts
 var GIVE_APP_CONTROL_OF_TOOL_RESPONSE = "GIVE_APP_CONTROL_OF_TOOL_RESPONSE";
 
-class AppServer extends Hono {
+class AppServer extends Hono2 {
   config;
   activeSessions = new Map;
   activeSessionsByUserId = new Map;
+  pendingPhotoRequests = new Map;
   cleanupHandlers = [];
   appInstructions = null;
   logger;
@@ -5086,7 +5112,7 @@ class AppServer extends Hono {
       getAppSessionForUser: (userId) => {
         return this.activeSessionsByUserId.get(userId) || null;
       },
-      cookieSecret: this.config.cookieSecret || `AOS_${this.config.packageName}_${this.config.apiKey.substring(0, 8)}`
+      cookieSecret: this.config.cookieSecret || this.config.apiKey
     }));
     this.appInstructions = config.appInstructions || null;
     this.setupWebhook();
@@ -5176,6 +5202,44 @@ class AppServer extends Hono {
   addCleanupHandler(handler) {
     this.cleanupHandlers.push(handler);
   }
+  registerPhotoRequest(params) {
+    const requestId = `photo_req_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
+    const timeoutId = setTimeout(() => {
+      const pending = this.pendingPhotoRequests.get(requestId);
+      if (pending) {
+        this.logger.warn({ requestId, userId: pending.userId }, "\uD83D\uDCF8 Photo request timed out at AppServer level");
+        pending.reject(new Error("Photo request timed out"));
+        this.pendingPhotoRequests.delete(requestId);
+      }
+    }, 30000);
+    this.pendingPhotoRequests.set(requestId, {
+      ...params,
+      timestamp: Date.now(),
+      timeoutId
+    });
+    return requestId;
+  }
+  completePhotoRequest(requestId) {
+    const pending = this.pendingPhotoRequests.get(requestId);
+    if (pending) {
+      if (pending.timeoutId) {
+        clearTimeout(pending.timeoutId);
+      }
+      this.pendingPhotoRequests.delete(requestId);
+    }
+    return pending;
+  }
+  cleanupPhotoRequestsForSession(sessionId) {
+    for (const [requestId, pending] of this.pendingPhotoRequests.entries()) {
+      if (pending.sessionId === sessionId) {
+        if (pending.timeoutId) {
+          clearTimeout(pending.timeoutId);
+        }
+        pending.reject(new Error("Session ended while photo request was pending"));
+        this.pendingPhotoRequests.delete(requestId);
+      }
+    }
+  }
   setupWebhook() {
     const webhookPath = this.config.webhookPath || "/webhook";
     this.post(webhookPath, async (c) => {
@@ -5242,6 +5306,7 @@ class AppServer extends Hono {
       userId
     });
     const cleanupDisconnect = session.events.onDisconnected((info) => {
+      const isPermanent = typeof info === "object" && (info.permanent === true || info.sessionEnded === true);
       if (typeof info === "string") {
         this.logger.info(`\uD83D\uDC4B Session ${sessionId} disconnected: ${info}`);
       } else {
@@ -5258,8 +5323,17 @@ class AppServer extends Hono {
           });
         }
       }
-      this.activeSessions.delete(sessionId);
-      this.activeSessionsByUserId.delete(userId);
+      if (isPermanent) {
+        if (this.activeSessions.get(sessionId) === session) {
+          this.activeSessions.delete(sessionId);
+        }
+        if (this.activeSessionsByUserId.get(userId) === session) {
+          this.activeSessionsByUserId.delete(userId);
+        }
+        this.cleanupPhotoRequestsForSession(sessionId);
+      } else {
+        this.logger.debug({ sessionId }, "\uD83D\uDD04 Temporary disconnect, session stays in maps for reconnection");
+      }
     });
     const cleanupError = session.events.onError((error) => {
       this.logger.error(error, `❌ [Session ${sessionId}] Error:`);
@@ -5387,32 +5461,26 @@ class AppServer extends Hono {
         const body = await c.req.parseBody();
         const requestId = body.requestId;
         const type = body.type;
-        const successStr = String(body.success);
-        const success = successStr === "true";
         const errorCode = body.errorCode;
         const errorMessage = body.errorMessage;
         const photoFile = body.photo;
-        console.log("Received photo response:", { requestId, type, success, errorCode });
-        this.logger.info({ requestId, type, success, errorCode }, `\uD83D\uDCF8 Received photo response: ${requestId} (type: ${type})`);
+        const hasPhotoFile = !!photoFile;
+        const successValue = typeof body.success === "string" ? body.success : undefined;
+        const isExplicitError = type === "photo_error" || successValue === "false";
+        const isSuccess = hasPhotoFile || !isExplicitError && successValue !== "false";
+        this.logger.info({ requestId, type, hasPhotoFile, isExplicitError, rawSuccess: body.success }, `\uD83D\uDCF8 Received photo response: ${requestId} (type: ${type})`);
         if (!requestId) {
           this.logger.error("No requestId in photo response");
           return c.json({ success: false, error: "No requestId provided" }, 400);
         }
-        const session = this.findSessionByPhotoRequestId(requestId);
-        if (!session) {
-          this.logger.warn({ requestId }, "No active session found for photo request");
-          return c.json({ success: false, error: "No active session found for this photo request" }, 404);
+        const pending = this.completePhotoRequest(requestId);
+        if (!pending) {
+          this.logger.warn({ requestId }, "\uD83D\uDCF8 No pending request found for photo (possibly timed out or already handled)");
+          return c.json({ success: false, error: "No pending request found" }, 404);
         }
-        if (type === "photo_error" || success === false) {
-          const errorResponse = {
-            requestId,
-            success: false,
-            error: {
-              code: errorCode || "UNKNOWN_ERROR",
-              message: errorMessage || "Unknown error occurred"
-            }
-          };
-          session.camera.handlePhotoError(errorResponse);
+        if (isExplicitError && !hasPhotoFile) {
+          this.logger.error({ requestId, errorCode, errorMessage }, `\uD83D\uDCF8 Photo capture failed: ${errorCode} - ${errorMessage}`);
+          pending.reject(new Error(`${errorCode || "UNKNOWN_ERROR"}: ${errorMessage || "Unknown error"}`));
           return c.json({
             success: true,
             requestId,
@@ -5420,19 +5488,20 @@ class AppServer extends Hono {
           });
         }
         if (!photoFile) {
-          this.logger.error({ requestId }, "No photo file in successful upload");
-          return c.json({ success: false, error: "No photo file provided for successful upload" }, 400);
+          const errorMsg = "No photo file in upload (and no explicit error reported)";
+          this.logger.error({ requestId, bodyKeys: Object.keys(body) }, errorMsg);
+          pending.reject(new Error(errorMsg));
+          return c.json({ success: false, error: errorMsg }, 400);
         }
         const buffer = Buffer.from(await photoFile.arrayBuffer());
-        const photoData = {
+        pending.resolve({
           buffer,
           mimeType: photoFile.type,
           filename: photoFile.name || "photo.jpg",
           requestId,
           size: photoFile.size,
           timestamp: new Date
-        };
-        session.camera.handlePhotoReceived(photoData);
+        });
         return c.json({
           success: true,
           requestId,
@@ -5451,14 +5520,6 @@ class AppServer extends Hono {
       return c.redirect(authUrl, 302);
     });
   }
-  findSessionByPhotoRequestId(requestId) {
-    for (const [_sessionId, session] of this.activeSessions) {
-      if (session.camera.hasPhotoPendingRequest(requestId)) {
-        return session;
-      }
-    }
-    return;
-  }
 }
 
 class TpaServer extends AppServer {
@@ -5493,11 +5554,11 @@ export {
   isSessionWebhookRequest,
   isRtmpStreamStopRequest,
   isRtmpStreamStatus as isRtmpStreamStatusFromGlasses,
-  isRtmpStreamStatus2 as isRtmpStreamStatusFromCloud,
+  isRtmpStreamStatus as isRtmpStreamStatusFromCloud,
   isRtmpStreamStatus,
   isRtmpStreamRequest,
   isRgbLedControlResponse as isRgbLedControlResponseFromGlasses,
-  isRgbLedControlResponse2 as isRgbLedControlResponseFromCloud,
+  isRgbLedControlResponse as isRgbLedControlResponseFromCloud,
   isRgbLedControlResponse,
   isRgbLedControlRequest,
   isRgbLedControl,
@@ -5505,7 +5566,7 @@ export {
   isRequestSettings,
   isPhotoTaken,
   isPhotoResponse as isPhotoResponseFromGlasses,
-  isPhotoResponse2 as isPhotoResponseFromCloud,
+  isPhotoResponse as isPhotoResponseFromCloud,
   isPhotoResponse,
   isPhotoRequest2 as isPhotoRequestFromApp,
   isPhotoRequest,
@@ -5558,6 +5619,7 @@ export {
   getLanguageInfo,
   getBaseStreamType,
   generateWebviewUrl,
+  generateFrontendToken,
   extractTokenFromUrl,
   extractTempToken,
   exchangeToken,
@@ -5566,6 +5628,7 @@ export {
   createTranscriptionStream,
   createTouchEventStream,
   createToken,
+  createMentraAuthRoutes,
   createAuthMiddleware,
   WebhookRequestType,
   ViewType,
@@ -5590,7 +5653,6 @@ export {
   GlassesToCloudMessageType,
   GIVE_APP_CONTROL_OF_TOOL_RESPONSE,
   EventTypes,
-  DeviceState,
   DashboardMode,
   DashboardMessageTypes,
   ControlActionTypes,
@@ -5608,4 +5670,4 @@ export {
   AnimationUtils
 };
 
-//# debugId=BFC07A34FCAB341764756E2164756E21
+//# debugId=BD78F7F1ED1E3E0F64756E2164756E21