studio/element-call
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix lint errors

Browse Source
This commit is contained in:
Valere
2025-10-01 17:24:19 +02:00
parent e8bf817f88
commit dfaa6a33f4
2 changed files with 115 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/state/Connection.test.ts
View File

@@ -5,41 +5,36 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE in the repository root for full details. Please see LICENSE in the repository root for full details.
*/ */
import { afterEach, vi, it, describe, type MockedObject, expect } from "vitest"; import { afterEach, describe, expect, it, type MockedObject, vi } from "vitest";
import { type CallMembership, type LivekitFocus } from "matrix-js-sdk/lib/matrixrtc"; import { type CallMembership, type LivekitFocus } from "matrix-js-sdk/lib/matrixrtc";
import { BehaviorSubject } from "rxjs"; import { BehaviorSubject } from "rxjs";
import { type Room as LivekitRoom, RoomEvent, type RoomEventCallbacks, ConnectionState } from "livekit-client"; import { ConnectionState, type Room as LivekitRoom, RoomEvent } from "livekit-client";
import fetchMock from "fetch-mock"; import fetchMock from "fetch-mock";
import EventEmitter from "events"; import EventEmitter from "events";
import { type IOpenIDToken } from "matrix-js-sdk";
import { type ConnectionOpts, type FocusConnectionState, RemoteConnection } from "./Connection.ts"; import { type ConnectionOpts, type FocusConnectionState, RemoteConnection } from "./Connection.ts";
import { ObservableScope } from "./ObservableScope.ts"; import { ObservableScope } from "./ObservableScope.ts";
import { type OpenIDClientParts, type SFUConfig } from "../livekit/openIDSFU.ts"; import { type OpenIDClientParts } from "../livekit/openIDSFU.ts";
import { FailToGetOpenIdToken } from "../utils/errors.ts"; import { FailToGetOpenIdToken } from "../utils/errors.ts";
describe("Start connection states", () => {
let testScope: ObservableScope; let testScope: ObservableScope;
let client: MockedObject<OpenIDClientParts>; let client: MockedObject<OpenIDClientParts>;
let fakeLivekitRoom: MockedObject<LivekitRoom>; let fakeLivekitRoom: MockedObject<LivekitRoom>;
let fakeRoomEventEmiter: EventEmitter<RoomEventCallbacks>; let fakeRoomEventEmiter: EventEmitter;
let fakeMembershipsFocusMap$: BehaviorSubject<{ membership: CallMembership; focus: LivekitFocus }[]>; let fakeMembershipsFocusMap$: BehaviorSubject<{ membership: CallMembership; focus: LivekitFocus }[]>;
const livekitFocus: LivekitFocus = { const livekitFocus: LivekitFocus = {
livekit_alias: "!roomID:example.org", livekit_alias: "!roomID:example.org",
livekit_service_url: "https://matrix-rtc.example.org/livekit/jwt" livekit_service_url: "https://matrix-rtc.example.org/livekit/jwt",
} type: "livekit",
}
afterEach(() => { function setupTest(): void {
vi.useRealTimers();
vi.clearAllMocks();
fetchMock.reset();
})
function setupTest(): void {
testScope = new ObservableScope(); testScope = new ObservableScope();
client = vi.mocked<OpenIDClientParts>({ client = vi.mocked<OpenIDClientParts>({
getOpenIdToken: vi.fn().mockResolvedValue( getOpenIdToken: vi.fn().mockResolvedValue(
@@ -54,7 +49,7 @@ describe("Start connection states", () => {
} as unknown as OpenIDClientParts); } as unknown as OpenIDClientParts);
fakeMembershipsFocusMap$ = new BehaviorSubject<{ membership: CallMembership; focus: LivekitFocus }[]>([]); fakeMembershipsFocusMap$ = new BehaviorSubject<{ membership: CallMembership; focus: LivekitFocus }[]>([]);
fakeRoomEventEmiter = new EventEmitter<RoomEventCallbacks>(); fakeRoomEventEmiter = new EventEmitter();
fakeLivekitRoom = vi.mocked<LivekitRoom>({ fakeLivekitRoom = vi.mocked<LivekitRoom>({
connect: vi.fn(), connect: vi.fn(),
@@ -68,9 +63,9 @@ describe("Start connection states", () => {
removeAllListeners: fakeRoomEventEmiter.removeAllListeners.bind(fakeRoomEventEmiter), removeAllListeners: fakeRoomEventEmiter.removeAllListeners.bind(fakeRoomEventEmiter),
} as unknown as LivekitRoom); } as unknown as LivekitRoom);
} }
function setupRemoteConnection(): RemoteConnection { function setupRemoteConnection(): RemoteConnection {
const opts: ConnectionOpts = { const opts: ConnectionOpts = {
client: client, client: client,
@@ -97,12 +92,20 @@ describe("Start connection states", () => {
.connect .connect
.mockResolvedValue(undefined); .mockResolvedValue(undefined);
const connection = new RemoteConnection( return new RemoteConnection(
opts, opts,
undefined, undefined,
); );
return connection; }
}
describe("Start connection states", () => {
afterEach(() => {
vi.useRealTimers();
vi.clearAllMocks();
fetchMock.reset();
})
it("start in initialized state", () => { it("start in initialized state", () => {
setupTest(); setupTest();
@@ -141,16 +144,16 @@ describe("Start connection states", () => {
undefined, undefined,
); );
let capturedState: FocusConnectionState | undefined = undefined; const capturedStates: FocusConnectionState[] = [];
connection.focusedConnectionState$.subscribe((value) => { connection.focusedConnectionState$.subscribe((value) => {
capturedState = value; capturedStates.push(value);
}); });
const deferred = Promise.withResolvers<SFUConfig>(); const deferred = Promise.withResolvers<IOpenIDToken>();
client.getOpenIdToken.mockImplementation(async () => { client.getOpenIdToken.mockImplementation(async (): Promise<IOpenIDToken> => {
await deferred.promise; return await deferred.promise;
}) })
connection.start() connection.start()
@@ -158,17 +161,19 @@ describe("Start connection states", () => {
// expected to throw // expected to throw
}) })
expect(capturedState.state).toEqual("FetchingConfig"); const capturedState = capturedStates.shift();
expect(capturedState).toBeDefined();
expect(capturedState!.state).toEqual("FetchingConfig");
deferred.reject(new FailToGetOpenIdToken(new Error("Failed to get token"))); deferred.reject(new FailToGetOpenIdToken(new Error("Failed to get token")));
await vi.runAllTimersAsync(); await vi.runAllTimersAsync();
if (capturedState.state === "FailedToStart") { if (capturedState!.state === "FailedToStart") {
expect(capturedState.error.message).toEqual("Something went wrong"); expect(capturedState!.error.message).toEqual("Something went wrong");
expect(capturedState.focus.livekit_alias).toEqual(livekitFocus.livekit_alias); expect(capturedState!.focus.livekit_alias).toEqual(livekitFocus.livekit_alias);
} else { } else {
expect.fail("Expected FailedToStart state but got " + capturedState.state); expect.fail("Expected FailedToStart state but got " + capturedState?.state);
} }
}); });
@@ -190,9 +195,9 @@ describe("Start connection states", () => {
undefined, undefined,
); );
let capturedState: FocusConnectionState | undefined = undefined; const capturedStates: FocusConnectionState[] = [];
connection.focusedConnectionState$.subscribe((value) => { connection.focusedConnectionState$.subscribe((value) => {
capturedState = value; capturedStates.push(value);
}); });
const deferredSFU = Promise.withResolvers<void>(); const deferredSFU = Promise.withResolvers<void>();
@@ -213,16 +218,18 @@ describe("Start connection states", () => {
// expected to throw // expected to throw
}) })
expect(capturedState.state).toEqual("FetchingConfig"); const capturedState = capturedStates.shift();
expect(capturedState).toBeDefined()
expect(capturedState?.state).toEqual("FetchingConfig");
deferredSFU.resolve(); deferredSFU.resolve();
await vi.runAllTimersAsync(); await vi.runAllTimersAsync();
if (capturedState.state === "FailedToStart") { if (capturedState?.state === "FailedToStart") {
expect(capturedState.error.message).toContain("SFU Config fetch failed with exception Error"); expect(capturedState?.error.message).toContain("SFU Config fetch failed with exception Error");
expect(capturedState.focus.livekit_alias).toEqual(livekitFocus.livekit_alias); expect(capturedState?.focus.livekit_alias).toEqual(livekitFocus.livekit_alias);
} else { } else {
expect.fail("Expected FailedToStart state but got " + capturedState.state); expect.fail("Expected FailedToStart state but got " + capturedState?.state);
} }
}); });
@@ -245,9 +252,9 @@ describe("Start connection states", () => {
undefined, undefined,
); );
let capturedState: FocusConnectionState | undefined = undefined; const capturedStates: FocusConnectionState[] = [];
connection.focusedConnectionState$.subscribe((value) => { connection.focusedConnectionState$.subscribe((value) => {
capturedState = value; capturedStates.push(value)
}); });
@@ -278,16 +285,19 @@ describe("Start connection states", () => {
// expected to throw // expected to throw
}) })
expect(capturedState.state).toEqual("FetchingConfig"); const capturedState = capturedStates.shift();
expect(capturedState).toBeDefined()
expect(capturedState?.state).toEqual("FetchingConfig");
deferredSFU.resolve(); deferredSFU.resolve();
await vi.runAllTimersAsync(); await vi.runAllTimersAsync();
if (capturedState.state === "FailedToStart") { if (capturedState && capturedState?.state === "FailedToStart") {
expect(capturedState.error.message).toContain("Failed to connect to livekit"); expect(capturedState.error.message).toContain("Failed to connect to livekit");
expect(capturedState.focus.livekit_alias).toEqual(livekitFocus.livekit_alias); expect(capturedState.focus.livekit_alias).toEqual(livekitFocus.livekit_alias);
} else { } else {
expect.fail("Expected FailedToStart state but got " + capturedState.state); expect.fail("Expected FailedToStart state but got " + JSON.stringify(capturedState));
} }
}); });
@@ -345,11 +355,12 @@ describe("Start connection states", () => {
for (const state of states) { for (const state of states) {
const s = capturedState.shift(); const s = capturedState.shift();
expect(s?.state).toEqual("ConnectedToLkRoom"); expect(s?.state).toEqual("ConnectedToLkRoom");
expect(s?.connectionState).toEqual(state); const connectedState = s as FocusConnectionState & { state: "ConnectedToLkRoom" };
expect(connectedState.connectionState).toEqual(state);
// should always have the focus info // should always have the focus info
expect(s?.focus.livekit_alias).toEqual(livekitFocus.livekit_alias); expect(connectedState.focus.livekit_alias).toEqual(livekitFocus.livekit_alias);
expect(s?.focus.livekit_service_url).toEqual(livekitFocus.livekit_service_url); expect(connectedState.focus.livekit_service_url).toEqual(livekitFocus.livekit_service_url);
} }
// If the state is not ConnectedToLkRoom, no events should be relayed anymore // If the state is not ConnectedToLkRoom, no events should be relayed anymore

4
src/state/Connection.ts
View File

@@ -177,10 +177,10 @@ export class Connection {
scope.behavior<ConnectionState>( scope.behavior<ConnectionState>(
connectionStateObserver(this.livekitRoom) connectionStateObserver(this.livekitRoom)
).subscribe((connectionState) => { ).subscribe((connectionState) => {
const current = this.focusedConnectionState$.value; const current = this._focusedConnectionState$.value;
// Only update the state if we are already connected to the LiveKit room. // Only update the state if we are already connected to the LiveKit room.
if (current.state === 'ConnectedToLkRoom') { if (current.state === 'ConnectedToLkRoom') {
this.focusedConnectionState$.next({ state: 'ConnectedToLkRoom', connectionState, focus: current.focus }); this._focusedConnectionState$.next({ state: 'ConnectedToLkRoom', connectionState, focus: current.focus });
} }
}); });