Update _client and _sliding-sync

Author: FadhlanR

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

@@ -2,7 +2,6 @@ import type Owner from '@ember/owner';
 import type RouterService from '@ember/routing/router-service';
 import { debounce } from '@ember/runloop';
 import Service, { service } from '@ember/service';
-import { buildWaiter } from '@ember/test-waiters';
 import { cached, tracked } from '@glimmer/tracking';
 
 import { restartableTask, task } from 'ember-concurrency';
@@ -129,7 +128,6 @@ const SLIDING_SYNC_LIST_RANGE_END = 9;
 const SLIDING_SYNC_LIST_TIMELINE_LIMIT = 1;
 
 const realmEventsLogger = logger('realm:events');
-const waiter = buildWaiter('matrix-service:waiter');
 
 export type OperatorModeContext = {
   submode: Submode;
@@ -201,8 +199,7 @@ export default class MatrixService extends Service {
   set currentRoomId(value: string | undefined) {
     this._currentRoomId = value;
     if (value) {
-      this.loadAllTimelineEvents(value);
-      window.localStorage.setItem(CurrentRoomIdPersistenceKey, value);
+      this.loadAllTimelineEvents.perform(value);
     } else {
       window.localStorage.removeItem(CurrentRoomIdPersistenceKey);
     }
@@ -1226,7 +1223,7 @@ export default class MatrixService extends Service {
     return await this.client.isUsernameAvailable(username);
   }
 
-  private async loadAllTimelineEvents(roomId: string) {
+  private loadAllTimelineEvents = restartableTask(async (roomId: string) => {
     let roomData = this.ensureRoomData(roomId);
     let room = this.client.getRoom(roomId);
 
@@ -1238,7 +1235,6 @@ export default class MatrixService extends Service {
       return;
     }
 
-    let token = waiter.beginAsync();
     this.timelineLoadingState.set(roomId, true);
     try {
       while (room.oldState.paginationToken != null) {
@@ -1287,9 +1283,8 @@ export default class MatrixService extends Service {
       });
     } finally {
       this.timelineLoadingState.set(roomId, false);
-      waiter.endAsync(token);
     }
-  }
+  });
 
   get isLoadingTimeline() {
     if (!this.currentRoomId) {

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

@@ -183,6 +183,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
       ],
     });
     await click('[data-test-open-ai-assistant]');
+    await waitFor('[data-test-message-field]');
     const testCard = `${testRealmURL}Person/hassan`;
 
     for (let i = 1; i <= 3; i++) {

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

@@ -634,59 +634,63 @@ export class MockClient implements ExtendedClient {
     _proxyBaseUrl: string,
     _signal: AbortSignal,
   ): Promise<MSC3575SlidingSyncResponse> {
-    let listKey = Object.keys(req.lists || {})[0];
-    if (!listKey || !req.lists?.[listKey]?.ranges?.[0]) {
-      return Promise.resolve({
-        pos: '0',
-        lists: {},
-        rooms: {},
-        extensions: {},
-      });
-    }
+    let lists: MSC3575SlidingSyncResponse['lists'] = {};
+    let rooms: MSC3575SlidingSyncResponse['rooms'] = {};
+    Object.entries(req.lists || {}).forEach(([listKey, list]) => {
+      list.ranges.forEach((range) => {
+        let [start, end] = range;
+        //currently we only filter rooms using is_dm
+        let dmRooms =
+          this.getAccountData('m.direct')?.getContent()?.rooms ?? [];
+        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),
+          )
+          .slice(start, end + 1);
+
+        roomsInRange.forEach((room) => {
+          let timeline = this.serverState.getRoomEvents(room.id);
+          rooms[room.id] = {
+            name:
+              this.serverState.getRoomState(room.id, 'm.room.name', '')?.content
+                ?.name ?? 'room',
+            required_state: [],
+            timeline,
+            notification_count: 0,
+            highlight_count: 0,
+            joined_count: 1,
+            invited_count: 0,
+            initial: true,
+          };
 
-    let [start, end] = req.lists[listKey].ranges[0];
-    let roomsInRange = this.serverState.rooms
-      .filter((r) => r.id.includes('mock'))
-      .slice(start, end + 1);
+          timeline.forEach((event: MatrixSDK.IRoomEvent) => {
+            this.emitEvent(new MatrixEvent(event));
+          });
+        });
 
-    let response: MSC3575SlidingSyncResponse = {
-      pos: String(Date.now()),
-      lists: {
-        [listKey]: {
-          count: this.serverState.rooms.length,
+        lists[listKey] = {
+          count: roomsInRange.length,
           ops: [
             {
               op: 'SYNC',
               range: [start, end],
               room_ids: roomsInRange.map((r) => r.id),
             },
           ],
-        },
-      },
-      rooms: {},
-      extensions: {},
-    };
-
-    roomsInRange.forEach((room) => {
-      let timeline = this.serverState.getRoomEvents(room.id);
-      response.rooms[room.id] = {
-        name:
-          this.serverState.getRoomState(room.id, 'm.room.name', '')?.content
-            ?.name ?? 'room',
-        required_state: [],
-        timeline,
-        notification_count: 0,
-        highlight_count: 0,
-        joined_count: 1,
-        invited_count: 0,
-        initial: true,
-      };
-
-      timeline.forEach((event: MatrixSDK.IRoomEvent) => {
-        this.emitEvent(new MatrixEvent(event));
+        };
       });
     });
 
+    let response: MSC3575SlidingSyncResponse = {
+      pos: String(Date.now()),
+      lists,
+      rooms,
+      extensions: {},
+    };
+
     return Promise.resolve(response);
   }
 

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

@@ -9,6 +9,7 @@ import {
 
 export class MockSlidingSync extends SlidingSync {
   private _client: MatrixSDK.MatrixClient;
+  private _lists: Record<string, MSC3575List>;
   private lifecycleCallbacks: Function[] = [];
   private listCallbacks: Function[] = [];
 
@@ -21,6 +22,7 @@ export class MockSlidingSync extends SlidingSync {
   ) {
     super(proxyBaseUrl, lists, roomSubscriptionInfo, client, timeoutMS);
     this._client = client;
+    this._lists = Object.fromEntries(lists);
   }
 
   on(event: string, callback: Function) {
@@ -44,13 +46,12 @@ export class MockSlidingSync extends SlidingSync {
   }
 
   async start() {
-    let aiRoomList = this.getListParams('ai-room');
-    if (!aiRoomList) {
+    if (!this._lists) {
       return;
     }
     let slidingResponse = await this._client.slidingSync(
       {
-        lists: { ['ai-room']: aiRoomList },
+        lists: this._lists,
         room_subscriptions: undefined,
       },
       '',
@@ -64,8 +65,13 @@ export class MockSlidingSync extends SlidingSync {
     );
   }
 
+  async setListRanges(listKey: string, ranges: number[][]) {
+    this._lists[listKey].ranges = ranges;
+    return await this.resend();
+  }
+
   async resend() {
     await this.start();
-    return '';
+    return Promise.resolve('');
   }
 }