Update based on feedbacks

Author: FadhlanR

packages/host/app/components/ai-assistant/past-session-item.gts

@@ -206,15 +206,7 @@ export default class PastSessionItem extends Component<Signature> {
   }
 
   get isStreaming() {
-    if (!this.args.session.lastMessage) {
-      return false;
-    }
-
-    return (
-      this.args.session.lastMessage.author.userId !==
-        this.matrixService.userId &&
-      !this.args.session.lastMessage.isStreamingFinished
-    );
+    return this.args.session.lastMessage?.isStreamingFinished === false;
   }
 
   get hasUnseenMessage() {

packages/host/app/components/ai-assistant/past-sessions.gts

@@ -68,7 +68,7 @@ export default class AiAssistantPastSessionsList extends Component<Signature> {
             {{#each @sessions key='roomId' as |session|}}
               <PastSessionItem @session={{session}} @actions={{@roomActions}} />
             {{/each}}
-            {{#if this.matrixService.loadingMoreAIRooms}}
+            {{#if this.matrixService.isLoadingMoreAIRooms}}
               <li
                 class='loading-indicator-container'
                 data-test-loading-more-rooms

packages/host/app/services/matrix-sdk-loader.ts

@@ -76,7 +76,6 @@ export type ExtendedClient = Pick<
   | 'fetchRoomEvent'
   | 'forget'
   | 'getAccessToken'
-  | 'getAccountData'
   | 'getJoinedRooms'
   | 'getProfileInfo'
   | 'getRoom'
@@ -99,6 +98,7 @@ export type ExtendedClient = Pick<
   | 'sendEvent'
   | 'sendReadReceipt'
   | 'sendStateEvent'
+  | 'setAccountData'
   | 'setDisplayName'
   | 'setPassword'
   | 'setPowerLevel'

packages/host/app/services/matrix-service.ts

@@ -4,7 +4,7 @@ import { debounce } from '@ember/runloop';
 import Service, { service } from '@ember/service';
 import { cached, tracked } from '@glimmer/tracking';
 
-import { restartableTask, task } from 'ember-concurrency';
+import { task, dropTask } from 'ember-concurrency';
 import window from 'ember-window-mock';
 import { cloneDeep } from 'lodash';
 import {
@@ -119,7 +119,7 @@ import type ResetService from './reset';
 
 import type * as MatrixSDK from 'matrix-js-sdk';
 
-const { matrixURL, environment } = ENV;
+const { matrixURL } = ENV;
 const MAX_CARD_SIZE_KB = 60;
 const STATE_EVENTS_OF_INTEREST = ['m.room.create', 'm.room.name'];
 const SLIDING_SYNC_AI_ROOM_LIST_NAME = 'ai-room';
@@ -181,7 +181,7 @@ export default class MatrixService extends Service {
 
   private slidingSync: SlidingSync | undefined;
   private aiRoomIds: Set<string> = new Set();
-  @tracked private isLoadingMoreAIRooms = false;
+  @tracked private _isLoadingMoreAIRooms = false;
 
   constructor(owner: Owner) {
     super(owner);
@@ -555,7 +555,7 @@ export default class MatrixService extends Service {
       filters: {
         is_dm: true,
       },
-      timeline_limit: 1,
+      timeline_limit: SLIDING_SYNC_LIST_TIMELINE_LIMIT,
       required_state: [['*', '*']],
     });
     this.slidingSync = new this.matrixSdkLoader.SlidingSync(
@@ -565,7 +565,7 @@ export default class MatrixService extends Service {
         timeline_limit: SLIDING_SYNC_LIST_TIMELINE_LIMIT,
       },
       this.client as any,
-      environment === 'test' ? 200 : 2000,
+      500,
     );
     this.slidingSync.on(
       SlidingSyncEvent.Lifecycle,
@@ -1224,7 +1224,7 @@ export default class MatrixService extends Service {
     return await this.client.isUsernameAvailable(username);
   }
 
-  private loadAllTimelineEvents = restartableTask(async (roomId: string) => {
+  private loadAllTimelineEvents = dropTask(async (roomId: string) => {
     let roomData = this.ensureRoomData(roomId);
     let room = this.client.getRoom(roomId);
     let roomResource = this.roomResources.get(roomId);
@@ -1669,8 +1669,12 @@ export default class MatrixService extends Service {
     this.loadMoreAIRoomsTask.perform();
   }
 
-  private loadMoreAIRoomsTask = restartableTask(async () => {
-    if (!this.slidingSync) return;
+  private loadMoreAIRoomsTask = dropTask(async () => {
+    if (!this.slidingSync) {
+      throw new Error(
+        'To load more AI rooms, sliding sync must be initialized',
+      );
+    }
 
     let currentList = this.slidingSync.getListParams(
       SLIDING_SYNC_AI_ROOM_LIST_NAME,
@@ -1686,22 +1690,26 @@ export default class MatrixService extends Service {
 
     let newEndRange = currentRange[1] + 10;
 
-    this.isLoadingMoreAIRooms = true;
+    this._isLoadingMoreAIRooms = true;
     try {
       await this.slidingSync.setListRanges(SLIDING_SYNC_AI_ROOM_LIST_NAME, [
         [0, newEndRange],
       ]);
     } finally {
-      this.isLoadingMoreAIRooms = false;
+      this._isLoadingMoreAIRooms = false;
     }
   });
 
-  get loadingMoreAIRooms() {
-    return this.isLoadingMoreAIRooms;
+  get isLoadingMoreAIRooms() {
+    return this._isLoadingMoreAIRooms;
   }
 
   async loadMoreAuthRooms(realms: string[]) {
-    if (!this.slidingSync) return;
+    if (!this.slidingSync) {
+      throw new Error(
+        'To load more auth rooms, sliding sync must be initialized',
+      );
+    }
 
     let currentList = this.slidingSync.getListParams(
       SLIDING_SYNC_AUTH_ROOM_LIST_NAME,

packages/host/tests/acceptance/ai-assistant-test.gts

@@ -35,6 +35,7 @@ import {
 } from '../helpers/base-realm';
 
 import { setupMockMatrix } from '../helpers/mock-matrix';
+import { getRoomIdForRealmAndUser } from '../helpers/mock-matrix/_utils';
 import { setupApplicationTest } from '../helpers/setup';
 
 async function selectCardFromCatalog(cardId: string) {
@@ -52,6 +53,10 @@ module('Acceptance | AI Assistant tests', function (hooks) {
   let mockMatrixUtils = setupMockMatrix(hooks, {
     loggedInAs: '@testuser:localhost',
     activeRealms: [baseRealm.url, testRealmURL],
+    directRooms: [
+      getRoomIdForRealmAndUser(testRealmURL, '@testuser:localhost'),
+      getRoomIdForRealmAndUser(baseRealm.url, '@testuser:localhost'),
+    ],
   });
 
   let { createAndJoinRoom, getRoomState } = mockMatrixUtils;

packages/host/tests/helpers/mock-matrix.ts

@@ -17,7 +17,7 @@ export interface Config {
   expiresInSec?: number;
   autostart?: boolean;
   now?: () => number;
-  directRooms?: Record<string, string[]>;
+  directRooms?: string[];
 }
 
 export function setupMockMatrix(

packages/host/tests/helpers/mock-matrix/_client.ts

@@ -52,9 +52,16 @@ export class MockClient implements ExtendedClient {
   async getAccountDataFromServer<T extends { [k: string]: any }>(
     _eventType: string,
   ): Promise<T | null> {
-    return {
-      realms: this.sdkOpts.activeRealms ?? [],
-    } as unknown as T;
+    if (_eventType === 'm.direct') {
+      return {
+        [this.loggedInAs!]: this.sdkOpts.directRooms ?? [],
+      } as unknown as T;
+    } else if (_eventType === APP_BOXEL_REALMS_EVENT_TYPE) {
+      return {
+        realms: this.sdkOpts.activeRealms ?? [],
+      } as unknown as T;
+    }
+    return null;
   }
 
   get loggedInAs() {
@@ -105,6 +112,7 @@ export class MockClient implements ExtendedClient {
       nonce: nonce++,
       permissions,
     };
+
     let stringifiedHeader = JSON.stringify(header);
     let stringifiedPayload = JSON.stringify(payload);
     let headerAndPayload = `${btoa(stringifiedHeader)}.${btoa(
@@ -131,7 +139,7 @@ export class MockClient implements ExtendedClient {
     if (type === APP_BOXEL_REALMS_EVENT_TYPE) {
       this.sdkOpts.activeRealms = (data as any).realms;
     } else if (type === 'm.direct') {
-      this.sdkOpts.directRooms = data as any;
+      this.sdkOpts.directRooms = (data as any)[this.loggedInAs!];
     } else {
       throw new Error(
         'Support for updating this event type in account data is not yet implemented in this mock.',
@@ -636,22 +644,21 @@ export class MockClient implements ExtendedClient {
   ): Promise<MSC3575SlidingSyncResponse> {
     let lists: MSC3575SlidingSyncResponse['lists'] = {};
     let rooms: MSC3575SlidingSyncResponse['rooms'] = {};
-    Object.entries(req.lists || {}).forEach(([listKey, list]) => {
-      list.ranges.forEach((range) => {
-        let [start, end] = range;
+    for (const [listKey, list] of Object.entries(req.lists || {})) {
+      for (let i = 0; i < list.ranges.length; i++) {
+        let [start, end] = list.ranges[i];
         //currently we only filter rooms using is_dm
-        let dmRooms =
-          this.getAccountData('m.direct')?.getContent()?.rooms ?? [];
+        let dmRooms = (await this.getAccountDataFromServer('m.direct')) ?? {};
         let roomsInRange = this.serverState.rooms
-          .filter((r) => r.id.includes('mock'))
           .filter((r) =>
             list.filters?.is_dm
-              ? dmRooms.includes(r.id)
-              : !dmRooms.includes(r.id),
+              ? dmRooms[this.loggedInAs!]?.includes(r.id)
+              : !dmRooms[this.loggedInAs!]?.includes(r.id),
           )
           .slice(start, end + 1);
 
-        roomsInRange.forEach((room) => {
+        for (let j = 0; j < roomsInRange.length; j++) {
+          let room = roomsInRange[j];
           let timeline = this.serverState.getRoomEvents(room.id);
           rooms[room.id] = {
             name:
@@ -665,11 +672,11 @@ export class MockClient implements ExtendedClient {
             invited_count: 0,
             initial: true,
           };
-
-          timeline.forEach((event: MatrixSDK.IRoomEvent) => {
+          for (let k = 0; k < timeline.length; k++) {
+            let event = timeline[k];
             this.emitEvent(new MatrixEvent(event));
-          });
-        });
+          }
+        }
 
         lists[listKey] = {
           count: roomsInRange.length,
@@ -681,8 +688,8 @@ export class MockClient implements ExtendedClient {
             },
           ],
         };
-      });
-    });
+      }
+    }
 
     let response: MSC3575SlidingSyncResponse = {
       pos: String(Date.now()),

packages/host/tests/helpers/mock-matrix/_server-state.ts

@@ -98,39 +98,41 @@ export class ServerState {
       { origin_server_ts: timestamp, state_key: sender },
     );
 
-    this.addRoomEvent(
-      sender,
-      {
-        room_id: roomId,
-        type: 'm.room.member',
-        content: {
-          displayname: 'aibot',
-          membership: 'invite',
+    if (!roomId.includes('test-session-room-realm')) {
+      this.addRoomEvent(
+        sender,
+        {
+          room_id: roomId,
+          type: 'm.room.member',
+          content: {
+            displayname: 'aibot',
+            membership: 'invite',
+          },
         },
-      },
-      {
-        origin_server_ts: timestamp,
-        // host application expects this for the bot to join the room
-        state_key: '@aibot:localhost',
-      },
-    );
+        {
+          origin_server_ts: timestamp,
+          // host application expects this for the bot to join the room
+          state_key: '@aibot:localhost',
+        },
+      );
 
-    this.addRoomEvent(
-      '@aibot:localhost',
-      {
-        room_id: roomId,
-        type: 'm.room.member',
-        content: {
-          displayname: 'aibot',
-          membership: 'join',
+      this.addRoomEvent(
+        '@aibot:localhost',
+        {
+          room_id: roomId,
+          type: 'm.room.member',
+          content: {
+            displayname: 'aibot',
+            membership: 'join',
+          },
         },
-      },
-      {
-        origin_server_ts: timestamp,
-        // host application expects this for the bot to join the room
-        state_key: '@aibot:localhost',
-      },
-    );
+        {
+          origin_server_ts: timestamp,
+          // host application expects this for the bot to join the room
+          state_key: '@aibot:localhost',
+        },
+      );
+    }
 
     return roomId;
   }

packages/host/tests/helpers/mock-matrix/_utils.ts

@@ -25,7 +25,7 @@ export class MockUtils {
   };
 
   getRoomIdForRealmAndUser = (realmURL: string, userId: string) => {
-    return `test-session-room-realm-${realmURL}-user-${userId}`;
+    return getRoomIdForRealmAndUser(realmURL, userId);
   };
 
   getRoomState = (roomId: string, eventType: string, stateKey?: string) => {
@@ -109,3 +109,7 @@ export class MockUtils {
 function isRealmEvent(e: IEvent): e is RealmEvent {
   return e.type === APP_BOXEL_REALM_EVENT_TYPE;
 }
+
+export function getRoomIdForRealmAndUser(realmURL: string, userId: string) {
+  return `test-session-room-realm-${realmURL}-user-${userId}`;
+}

packages/realm-server/node-realm.ts

@@ -224,7 +224,7 @@ export class NodeAdapter implements RealmAdapter {
 
     try {
       dmRooms =
-        (await matrixClient.getAccountData<Record<string, string>>(
+        (await matrixClient.getAccountDataFromServer<Record<string, string>>(
           'boxel.session-rooms',
         )) ?? {};
     } catch (e) {

packages/realm-server/server.ts

@@ -461,7 +461,7 @@ export class RealmServer {
 
   private sendEvent = async (user: string, eventType: string) => {
     let dmRooms =
-      (await this.matrixClient.getAccountData<Record<string, string>>(
+      (await this.matrixClient.getAccountDataFromServer<Record<string, string>>(
         'boxel.session-rooms',
       )) ?? {};
     let roomId = dmRooms[user];

packages/realm-server/tests/auth-client-test.ts

@@ -37,7 +37,7 @@ module(basename(__filename), function () {
         async hashMessageWithSecret(_message: string): Promise<string> {
           throw new Error('Method not implemented.');
         },
-        async getAccountData() {
+        async getAccountDataFromServer() {
           return {};
         },
         async setAccountData() {

packages/runtime-common/matrix-backend-authentication.ts

@@ -71,7 +71,7 @@ export class MatrixBackendAuthentication {
     }
 
     let dmRooms =
-      (await this.matrixClient.getAccountData<Record<string, string>>(
+      (await this.matrixClient.getAccountDataFromServer<Record<string, string>>(
         'boxel.session-rooms',
       )) ?? {};
     let roomId = dmRooms[user];
@@ -136,7 +136,7 @@ export class MatrixBackendAuthentication {
     }
 
     let dmRooms =
-      (await this.matrixClient.getAccountData<Record<string, string>>(
+      (await this.matrixClient.getAccountDataFromServer<Record<string, string>>(
         'boxel.session-rooms',
       )) ?? {};
     let roomId = dmRooms[user];