@ixo/common 1.1.2 → 1.1.3

package/src/services/memory-engine/memory-engine.service.ts

@@ -5,13 +5,17 @@ import type {
   UserContextData,
 } from './types.js';
 
+interface MemoryEngineAuthHeaders {
+  oracleToken: string;
+  userToken: string;
+  oracleHomeServer: string;
+  userHomeServer: string;
+}
+
 export class MemoryEngineService {
   private readonly QUERY_TIMEOUT_MS = 2500; // 2.5 seconds per query
 
-  constructor(
-    private readonly memoryEngineUrl: string,
-    private readonly memoryServiceApiKey: string,
-  ) {}
+  constructor(private readonly memoryEngineUrl: string) {}
 
   /**
    * Wraps a promise with a timeout, returning fallback value if timeout is exceeded
@@ -34,10 +38,20 @@ export class MemoryEngineService {
    */
   async gatherUserContext(params: {
     oracleDid: string;
-    userDid: string;
     roomId: string;
+    oracleToken: string;
+    userToken: string;
+    oracleHomeServer: string;
+    userHomeServer: string;
   }): Promise<UserContextData> {
-    const { oracleDid, userDid, roomId } = params;
+    const {
+      oracleDid,
+      roomId,
+      oracleToken,
+      userToken,
+      oracleHomeServer,
+      userHomeServer,
+    } = params;
 
     Logger.info(
       `[MemoryEngineService] Gathering user context for oracle: ${oracleDid}, room: ${roomId}`,
@@ -45,34 +59,41 @@ export class MemoryEngineService {
 
     try {
       // Execute all 6 queries in parallel with timeouts using Promise.allSettled
+      const authHeaders = {
+        oracleToken,
+        userToken,
+        oracleHomeServer,
+        userHomeServer,
+      };
+
       const results = await Promise.allSettled([
         this.withTimeout(
-          this.queryIdentity(oracleDid, userDid, roomId),
+          this.queryIdentity(oracleDid, roomId, authHeaders),
           this.QUERY_TIMEOUT_MS,
           undefined,
         ),
         this.withTimeout(
-          this.queryWork(oracleDid, userDid, roomId),
+          this.queryWork(oracleDid, roomId, authHeaders),
           this.QUERY_TIMEOUT_MS,
           undefined,
         ),
         this.withTimeout(
-          this.queryGoals(oracleDid, userDid, roomId),
+          this.queryGoals(oracleDid, roomId, authHeaders),
           this.QUERY_TIMEOUT_MS,
           undefined,
         ),
         this.withTimeout(
-          this.queryInterests(oracleDid, userDid, roomId),
+          this.queryInterests(oracleDid, roomId, authHeaders),
           this.QUERY_TIMEOUT_MS,
           undefined,
         ),
         this.withTimeout(
-          this.queryRelationships(oracleDid, userDid, roomId),
+          this.queryRelationships(oracleDid, roomId, authHeaders),
           this.QUERY_TIMEOUT_MS,
           undefined,
         ),
         this.withTimeout(
-          this.queryRecent(oracleDid, userDid, roomId),
+          this.queryRecent(oracleDid, roomId, authHeaders),
           this.QUERY_TIMEOUT_MS,
           undefined,
         ),
@@ -125,8 +146,8 @@ export class MemoryEngineService {
    */
   private async queryIdentity(
     oracleDid: string,
-    userDid: string,
     roomId: string,
+    auth: MemoryEngineAuthHeaders,
   ): Promise<SearchEnhancedResponse | undefined> {
     const request: SearchEnhancedRequest = {
       oracle_dids: [oracleDid],
@@ -153,7 +174,7 @@ export class MemoryEngineService {
       },
     };
 
-    return this.executeQuery(request, userDid, oracleDid, roomId);
+    return this.executeQuery(request, roomId, auth);
   }
 
   /**
@@ -161,8 +182,8 @@ export class MemoryEngineService {
    */
   private async queryWork(
     oracleDid: string,
-    userDid: string,
     roomId: string,
+    auth: MemoryEngineAuthHeaders,
   ): Promise<SearchEnhancedResponse | undefined> {
     const request: SearchEnhancedRequest = {
       oracle_dids: [oracleDid],
@@ -196,7 +217,7 @@ export class MemoryEngineService {
       },
     };
 
-    return this.executeQuery(request, userDid, oracleDid, roomId);
+    return this.executeQuery(request, roomId, auth);
   }
 
   /**
@@ -204,8 +225,8 @@ export class MemoryEngineService {
    */
   private async queryGoals(
     oracleDid: string,
-    userDid: string,
     roomId: string,
+    auth: MemoryEngineAuthHeaders,
   ): Promise<SearchEnhancedResponse | undefined> {
     const request: SearchEnhancedRequest = {
       oracle_dids: [oracleDid],
@@ -231,7 +252,7 @@ export class MemoryEngineService {
       },
     };
 
-    return this.executeQuery(request, userDid, oracleDid, roomId);
+    return this.executeQuery(request, roomId, auth);
   }
 
   /**
@@ -239,8 +260,8 @@ export class MemoryEngineService {
    */
   private async queryInterests(
     oracleDid: string,
-    userDid: string,
     roomId: string,
+    auth: MemoryEngineAuthHeaders,
   ): Promise<SearchEnhancedResponse | undefined> {
     const request: SearchEnhancedRequest = {
       oracle_dids: [oracleDid],
@@ -273,7 +294,7 @@ export class MemoryEngineService {
       },
     };
 
-    return this.executeQuery(request, userDid, oracleDid, roomId);
+    return this.executeQuery(request, roomId, auth);
   }
 
   /**
@@ -281,8 +302,8 @@ export class MemoryEngineService {
    */
   private async queryRelationships(
     oracleDid: string,
-    userDid: string,
     roomId: string,
+    auth: MemoryEngineAuthHeaders,
   ): Promise<SearchEnhancedResponse | undefined> {
     const request: SearchEnhancedRequest = {
       oracle_dids: [oracleDid],
@@ -308,7 +329,7 @@ export class MemoryEngineService {
       },
     };
 
-    return this.executeQuery(request, userDid, oracleDid, roomId);
+    return this.executeQuery(request, roomId, auth);
   }
 
   /**
@@ -316,8 +337,8 @@ export class MemoryEngineService {
    */
   private async queryRecent(
     oracleDid: string,
-    userDid: string,
     roomId: string,
+    auth: MemoryEngineAuthHeaders,
   ): Promise<SearchEnhancedResponse | undefined> {
     // Calculate date 90 days ago for recent context
     const ninetyDaysAgo = new Date();
@@ -339,7 +360,7 @@ export class MemoryEngineService {
       },
     };
 
-    return this.executeQuery(request, userDid, oracleDid, roomId);
+    return this.executeQuery(request, roomId, auth);
   }
 
   /**
@@ -347,9 +368,11 @@ export class MemoryEngineService {
    */
   async processConversationHistory({
     messages,
-    userDid,
-    oracleDid,
     roomId,
+    oracleToken,
+    userToken,
+    oracleHomeServer,
+    userHomeServer,
   }: {
     messages: Array<{
       content: string;
@@ -358,25 +381,21 @@ export class MemoryEngineService {
       name?: string;
       source_description?: string;
     }>;
-    userDid: string;
-    oracleDid: string;
     roomId: string;
+    oracleToken: string;
+    userToken: string;
+    oracleHomeServer: string;
+    userHomeServer: string;
   }): Promise<{ success: boolean }> {
-    if (!userDid) {
-      Logger.warn(
-        `[MemoryEngineService] No user DID provided, skipping conversation processing`,
-      );
-      return { success: false };
-    }
-    if (!oracleDid) {
+    if (!roomId) {
       Logger.warn(
-        `[MemoryEngineService] No oracle did provided, skipping conversation processing`,
+        `[MemoryEngineService] No room id provided, skipping conversation processing`,
       );
       return { success: false };
     }
-    if (!roomId) {
+    if (!oracleToken || !userToken) {
       Logger.warn(
-        `[MemoryEngineService] No room id provided, skipping conversation processing`,
+        `[MemoryEngineService] Missing oracle or user token, skipping conversation processing`,
       );
       return { success: false };
     }
@@ -391,10 +410,11 @@ export class MemoryEngineService {
       const response = await fetch(`${this.memoryEngineUrl}/messages`, {
         method: 'POST',
         headers: {
-          'x-user-did': userDid,
-          'x-oracle-did': oracleDid,
+          'x-oracle-token': oracleToken,
+          'x-user-token': userToken,
+          'x-oracle-matrix-homeserver': oracleHomeServer,
+          'x-user-matrix-homeserver': userHomeServer,
           'x-room-id': roomId,
-          'x-service-api-key': this.memoryServiceApiKey,
           'Content-Type': 'application/json',
         },
         body: JSON.stringify({ messages }),
@@ -426,25 +446,18 @@ export class MemoryEngineService {
    */
   private async executeQuery(
     request: SearchEnhancedRequest,
-    userDid: string,
-    oracleDid: string,
     roomId: string,
+    auth: MemoryEngineAuthHeaders,
   ): Promise<SearchEnhancedResponse | undefined> {
-    if (!userDid) {
-      Logger.warn(
-        `[MemoryEngineService] No user DID provided, skipping query "${request.query}"`,
-      );
-      return undefined;
-    }
-    if (!oracleDid) {
+    if (!roomId) {
       Logger.warn(
-        `[MemoryEngineService] No oracle did provided, skipping query "${request.query}"`,
+        `[MemoryEngineService] No room id provided, skipping query "${request.query}"`,
       );
       return undefined;
     }
-    if (!roomId) {
+    if (!auth.oracleToken || !auth.userToken) {
       Logger.warn(
-        `[MemoryEngineService] No room id provided, skipping query "${request.query}"`,
+        `[MemoryEngineService] Missing oracle or user token, skipping query "${request.query}"`,
       );
       return undefined;
     }
@@ -453,10 +466,11 @@ export class MemoryEngineService {
       const response = await fetch(`${this.memoryEngineUrl}/search-enhanced`, {
         method: 'POST',
         headers: {
-          'x-user-did': userDid,
-          'x-oracle-did': oracleDid,
+          'x-oracle-token': auth.oracleToken,
+          'x-user-token': auth.userToken,
+          'x-oracle-matrix-homeserver': auth.oracleHomeServer,
+          'x-user-matrix-homeserver': auth.userHomeServer,
           'x-room-id': roomId,
-          'x-service-api-key': this.memoryServiceApiKey,
           'Content-Type': 'application/json',
         },
         body: JSON.stringify(request),

package/src/services/session-manager/dto.ts

@@ -50,6 +50,22 @@ export class CreateChatSessionDto extends UserAuthDto {
   @IsString()
   @IsOptional()
   slackThreadTs?: string;
+
+  @IsString()
+  @IsOptional()
+  oracleToken?: string;
+
+  @IsString()
+  @IsOptional()
+  userToken?: string;
+
+  @IsString()
+  @IsOptional()
+  oracleHomeServer?: string;
+
+  @IsString()
+  @IsOptional()
+  userHomeServer?: string;
 }
 
 export class DeleteChatSessionDto extends UserAuthDto {

package/src/services/session-manager/session-manager.service.ts

@@ -367,13 +367,20 @@ ___________________________________________________________
 
     // Gather user context from Memory Engine
     let userContext: UserContextData | undefined;
-    if (this.memoryEngineService) {
+    if (
+      this.memoryEngineService &&
+      createSessionDto.oracleToken &&
+      createSessionDto.userToken
+    ) {
       try {
         Logger.debug('Gathering user context from Memory Engine');
         userContext = await this.memoryEngineService.gatherUserContext({
           oracleDid: createSessionDto.oracleDid,
-          userDid: createSessionDto.did,
           roomId,
+          oracleToken: createSessionDto.oracleToken,
+          userToken: createSessionDto.userToken,
+          oracleHomeServer: createSessionDto.oracleHomeServer ?? '',
+          userHomeServer: createSessionDto.userHomeServer ?? '',
         });
       } catch (error) {
         Logger.error('Failed to gather user context:', error);

package/src/utils/get-user-subscription.ts

@@ -57,7 +57,7 @@ export const getUserSubscription = async ({
     );
 
     if (!response.ok) {
-      console.error(
+      Logger.error(
         `Failed to fetch user subscription: ${response.status} ${response.statusText}`,
       );
       return null;
@@ -78,7 +78,7 @@ export const getUserSubscription = async ({
       adminAddress: subscription.adminAddress,
     };
   } catch (error) {
-    console.error('Error fetching user subscription:', error);
+    Logger.error('Error fetching user subscription:', error);
     return null;
   }
 };