From ee8b27837a74a8ad71ee70359429e835206d1e2e Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 28 Jan 2026 14:38:23 +0100 Subject: [PATCH] fix lint issues --- src/state/CallViewModel/CallViewModel.ts | 6 +++--- .../CallViewModel/localMember/LocalMember.test.ts | 6 +++--- .../CallViewModel/localMember/LocalMember.ts | 6 +++--- .../remoteMembers/ConnectionManager.test.ts | 15 ++++++--------- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/state/CallViewModel/CallViewModel.ts b/src/state/CallViewModel/CallViewModel.ts index 5fbb6054..cf6ca92b 100644 --- a/src/state/CallViewModel/CallViewModel.ts +++ b/src/state/CallViewModel/CallViewModel.ts @@ -42,7 +42,7 @@ import { import { logger as rootLogger } from "matrix-js-sdk/lib/logger"; import { MembershipManagerEvent, - type LivekitTransport, + type LivekitTransportConfig, type MatrixRTCSession, } from "matrix-js-sdk/lib/matrixrtc"; import { type IWidgetApiRequest } from "matrix-widget-api"; @@ -103,7 +103,7 @@ import { type SpotlightPortraitLayoutMedia, } from "../layout-types.ts"; import { ElementCallError, UnknownCallError } from "../../utils/errors.ts"; -import { type ObservableScope } from "../ObservableScope.ts"; +import { type Epoch, type ObservableScope } from "../ObservableScope.ts"; import { createHomeserverConnected$ } from "./localMember/HomeserverConnected.ts"; import { createLocalMembership$, @@ -523,7 +523,7 @@ export function createCallViewModel$( matrixRTCSession, ), muteStates: muteStates, - joinMatrixRTC: (transport: LivekitTransport) => { + joinMatrixRTC: (transport: LivekitTransportConfig) => { return enterRTCSession( matrixRTCSession, ownMembershipIdentity, diff --git a/src/state/CallViewModel/localMember/LocalMember.test.ts b/src/state/CallViewModel/localMember/LocalMember.test.ts index b383c295..b228cd08 100644 --- a/src/state/CallViewModel/localMember/LocalMember.test.ts +++ b/src/state/CallViewModel/localMember/LocalMember.test.ts @@ -8,7 +8,7 @@ Please see LICENSE in the repository root for full details. import { Status as RTCMemberStatus, - type LivekitTransport, + type LivekitTransportConfig, type MatrixRTCSession, } from "matrix-js-sdk/lib/matrixrtc"; import { describe, expect, it, vi } from "vitest"; @@ -281,7 +281,7 @@ describe("LocalMembership", () => { const aTransport = { transport: { livekit_service_url: "a", - } as LivekitTransport, + } as LivekitTransportConfig, sfuConfig: { url: "sfu-url", jwt: "sfu-token", @@ -290,7 +290,7 @@ describe("LocalMembership", () => { const bTransport = { transport: { livekit_service_url: "b", - } as LivekitTransport, + } as LivekitTransportConfig, sfuConfig: { url: "sfu-url", jwt: "sfu-token", diff --git a/src/state/CallViewModel/localMember/LocalMember.ts b/src/state/CallViewModel/localMember/LocalMember.ts index 59074da6..ca255543 100644 --- a/src/state/CallViewModel/localMember/LocalMember.ts +++ b/src/state/CallViewModel/localMember/LocalMember.ts @@ -16,7 +16,7 @@ import { import { observeParticipantEvents } from "@livekit/components-core"; import { Status as RTCSessionStatus, - type LivekitTransport, + type LivekitTransportConfig, type MatrixRTCSession, } from "matrix-js-sdk/lib/matrixrtc"; import { @@ -125,7 +125,7 @@ interface Props { muteStates: MuteStates; connectionManager: IConnectionManager; createPublisherFactory: (connection: Connection) => Publisher; - joinMatrixRTC: (transport: LivekitTransport) => void; + joinMatrixRTC: (transport: LivekitTransportConfig) => void; homeserverConnected: HomeserverConnected; localTransport$: Behavior; matrixRTCSession: Pick< @@ -717,7 +717,7 @@ interface EnterRTCSessionOptions { export function enterRTCSession( rtcSession: MatrixRTCSession, ownMembershipIdentity: CallMembershipIdentityParts, - transport: LivekitTransport, + transport: LivekitTransportConfig, options: EnterRTCSessionOptions, ): void { const { encryptMedia, matrixRTCMode } = options; diff --git a/src/state/CallViewModel/remoteMembers/ConnectionManager.test.ts b/src/state/CallViewModel/remoteMembers/ConnectionManager.test.ts index 52f825c7..fada34be 100644 --- a/src/state/CallViewModel/remoteMembers/ConnectionManager.test.ts +++ b/src/state/CallViewModel/remoteMembers/ConnectionManager.test.ts @@ -7,10 +7,7 @@ Please see LICENSE in the repository root for full details. import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { BehaviorSubject } from "rxjs"; -import { - type LivekitTransport, - type LivekitTransportConfig, -} from "matrix-js-sdk/lib/matrixrtc"; +import { type LivekitTransportConfig } from "matrix-js-sdk/lib/matrixrtc"; import { type RemoteParticipant } from "livekit-client"; import { logger } from "matrix-js-sdk/lib/logger"; @@ -50,7 +47,7 @@ beforeEach(() => { vi.mocked(fakeConnectionFactory).createConnection = vi .fn() .mockImplementation( - (scope: ObservableScope, transport: LivekitTransport) => { + (scope: ObservableScope, transport: LivekitTransportConfig) => { const mockConnection = { transport, remoteParticipants$: new BehaviorSubject([]), @@ -210,15 +207,15 @@ describe("connectionManagerData$ stream", () => { // Used in test to control fake connections' remoteParticipants$ streams let fakeRemoteParticipantsStreams: Map>; - function keyForTransport(transport: LivekitTransport): string { - return `${transport.livekit_service_url}|${transport.livekit_alias}`; + function keyForTransport(transport: LivekitTransportConfig): string { + return `${transport.livekit_service_url}`; } beforeEach(() => { fakeRemoteParticipantsStreams = new Map(); function getRemoteParticipantsFor( - transport: LivekitTransport, + transport: LivekitTransportConfig, ): Behavior { return ( fakeRemoteParticipantsStreams.get(keyForTransport(transport)) ?? @@ -230,7 +227,7 @@ describe("connectionManagerData$ stream", () => { vi.mocked(fakeConnectionFactory).createConnection = vi .fn() .mockImplementation( - (scope: ObservableScope, transport: LivekitTransport) => { + (scope: ObservableScope, transport: LivekitTransportConfig) => { const fakeRemoteParticipants$ = new BehaviorSubject< RemoteParticipant[] >([]);