Merge remote-tracking branch 'origin/livekit' into hs/reactions-viewcallmodel

src/utils/matrix.ts

@@ -9,12 +9,12 @@ import { IndexedDBStore } from "matrix-js-sdk/src/store/indexeddb";
 import { MemoryStore } from "matrix-js-sdk/src/store/memory";
 import {
   createClient,
-  ICreateClientOpts,
+  type ICreateClientOpts,
   Preset,
   Visibility,
 } from "matrix-js-sdk/src/matrix";
 import { ClientEvent } from "matrix-js-sdk/src/client";
-import { ISyncStateData, SyncState } from "matrix-js-sdk/src/sync";
+import { type ISyncStateData, type SyncState } from "matrix-js-sdk/src/sync";
 import { logger } from "matrix-js-sdk/src/logger";
 import { secureRandomBase64Url } from "matrix-js-sdk/src/randomstring";
 
@@ -24,7 +24,10 @@ import IndexedDBWorker from "../IndexedDBWorker?worker";
 import { generateUrlSearchParams, getUrlParams } from "../UrlParams";
 import { Config } from "../config/Config";
 import { E2eeType } from "../e2ee/e2eeType";
-import { EncryptionSystem, saveKeyForRoom } from "../e2ee/sharedKeyManagement";
+import {
+  type EncryptionSystem,
+  saveKeyForRoom,
+} from "../e2ee/sharedKeyManagement";
 
 export const fallbackICEServerAllowed =
   import.meta.env.VITE_FALLBACK_STUN_ALLOWED === "true";

src/utils/observable.ts

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 Please see LICENSE in the repository root for full details.
 */
 
-import { Observable, defer, finalize, scan, startWith, tap } from "rxjs";
+import { type Observable, defer, finalize, scan, startWith, tap } from "rxjs";
 
 const nothing = Symbol("nothing");
 

src/utils/spa.ts

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 Please see LICENSE in the repository root for full details.
 */
 
-import { ICreateClientOpts } from "matrix-js-sdk/src/client";
+import { type ICreateClientOpts } from "matrix-js-sdk/src/client";
 import { MatrixError } from "matrix-js-sdk/src/http-api";
 import { logger } from "matrix-js-sdk/src/logger";
 

src/utils/test.ts

@@ -4,32 +4,29 @@ Copyright 2023, 2024 New Vector Ltd.
 SPDX-License-Identifier: AGPL-3.0-only
 Please see LICENSE in the repository root for full details.
 */
-import { BehaviorSubject, map, Observable, of, SchedulerLike } from "rxjs";
-import { RunHelpers, TestScheduler } from "rxjs/testing";
+import { map, type Observable, of, type SchedulerLike } from "rxjs";
+import { type RunHelpers, TestScheduler } from "rxjs/testing";
 import { expect, vi, vitest } from "vitest";
 import {
-  RoomMember,
-  Room as MatrixRoom,
+  type RoomMember,
+  type Room as MatrixRoom,
   MatrixEvent,
-  Room,
+  type Room,
   TypedEventEmitter,
-  MatrixClient,
 } from "matrix-js-sdk/src/matrix";
 import {
   CallMembership,
-  Focus,
-  MatrixRTCSession,
+  type Focus,
   MatrixRTCSessionEvent,
-  MatrixRTCSessionEventHandlerMap,
-  SessionMembershipData,
+  type MatrixRTCSessionEventHandlerMap,
+  type SessionMembershipData,
 } from "matrix-js-sdk/src/matrixrtc";
 import {
-  LocalParticipant,
-  LocalTrackPublication,
-  RemoteParticipant,
-  RemoteTrackPublication,
-  Room as LivekitRoom,
-  ConnectionState,
+  type LocalParticipant,
+  type LocalTrackPublication,
+  type RemoteParticipant,
+  type RemoteTrackPublication,
+  type Room as LivekitRoom,
 } from "livekit-client";
 
 import {
@@ -37,15 +34,11 @@ import {
   RemoteUserMediaViewModel,
 } from "../state/MediaViewModel";
 import { E2eeType } from "../e2ee/e2eeType";
-import { DEFAULT_CONFIG, ResolvedConfigOptions } from "../config/ConfigOptions";
-import { Config } from "../config/Config";
-import { CallViewModel } from "../state/CallViewModel";
 import {
-  aliceParticipant,
-  aliceRtcMember,
-  localParticipant,
-  localRtcMember,
-} from "./test-fixtures";
+  DEFAULT_CONFIG,
+  type ResolvedConfigOptions,
+} from "../config/ConfigOptions";
+import { Config } from "../config/Config";
 import { randomUUID } from "crypto";
 
 export function withFakeTimers(continuation: () => void): void {
@@ -271,6 +264,12 @@ export class MockRTCSession extends TypedEventEmitter<
   MatrixRTCSessionEvent,
   MatrixRTCSessionEventHandlerMap
 > {
+  public readonly statistics = {
+    counters: {},
+  };
+
+  public leaveRoomSession = vitest.fn().mockResolvedValue(undefined);
+
   public constructor(
     public readonly room: Room,
     private localMembership: CallMembership,
@@ -279,6 +278,10 @@ export class MockRTCSession extends TypedEventEmitter<
     super();
   }
 
+  public isJoined(): true {
+    return true;
+  }
+
   public withMemberships(
     rtcMembers: Observable<Partial<CallMembership>[]>,
   ): MockRTCSession {

src/utils/testReactions.tsx

@@ -5,27 +5,27 @@ SPDX-License-Identifier: AGPL-3.0-only
 Please see LICENSE in the repository root for full details.
 */
 
-import { PropsWithChildren, ReactNode } from "react";
+import { type PropsWithChildren, type ReactNode } from "react";
 import { randomUUID } from "crypto";
 import EventEmitter from "events";
-import { MatrixClient } from "matrix-js-sdk/src/client";
+import { type MatrixClient } from "matrix-js-sdk/src/client";
 import { EventType, RoomEvent, RelationType } from "matrix-js-sdk/src/matrix";
 import {
   MatrixEvent,
   EventTimeline,
   EventTimelineSet,
-  Room,
+  type Room,
 } from "matrix-js-sdk/src/matrix";
 import {
-  MatrixRTCSession,
+  type MatrixRTCSession,
   MatrixRTCSessionEvent,
 } from "matrix-js-sdk/src/matrixrtc";
 
 import { ReactionsProvider } from "../useReactions";
 import {
-  ECallReactionEventContent,
+  type ECallReactionEventContent,
   ElementCallReactionEventType,
-  ReactionOption,
+  type ReactionOption,
 } from "../reactions";
 import { MockRTCSession } from "./test";