Another larger refactor to fix sfu switches and in general proper

cleanup.

src/state/CallViewModel/localMember/LocalMembership.test.ts

@@ -12,12 +12,15 @@ import {
 } from "matrix-js-sdk/lib/matrixrtc";
 import { describe, expect, it, vi } from "vitest";
 import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
-import { map } from "rxjs";
+import { BehaviorSubject, map, of } from "rxjs";
 import { logger } from "matrix-js-sdk/lib/logger";
+import { type LocalParticipant } from "livekit-client";
 
 import { MatrixRTCMode } from "../../../settings/settings";
 import {
+  flushPromises,
   mockConfig,
+  mockLivekitRoom,
   mockMuteStates,
   withTestScheduler,
 } from "../../../utils/test";
@@ -27,14 +30,19 @@ import {
   LivekitState,
 } from "./LocalMembership";
 import { MatrixRTCTransportMissingError } from "../../../utils/errors";
-import { Epoch } from "../../ObservableScope";
+import { Epoch, ObservableScope } from "../../ObservableScope";
 import { constant } from "../../Behavior";
 import { ConnectionManagerData } from "../remoteMembers/ConnectionManager";
-import { type Publisher } from "./Publisher";
+import { type Connection } from "../remoteMembers/Connection";
 
 const MATRIX_RTC_MODE = MatrixRTCMode.Legacy;
 const getUrlParams = vi.hoisted(() => vi.fn(() => ({})));
 vi.mock("../../../UrlParams", () => ({ getUrlParams }));
+vi.mock("@livekit/components-core", () => ({
+  observeParticipantEvents: vi
+    .fn()
+    .mockReturnValue(of({ isScreenShareEnabled: false })),
+}));
 
 describe("LocalMembership", () => {
   describe("enterRTCSession", () => {
@@ -183,7 +191,7 @@ describe("LocalMembership", () => {
       processor: undefined,
     }),
     logger: logger,
-    createPublisherFactory: (): Publisher => ({}) as unknown as Publisher,
+    createPublisherFactory: vi.fn(),
     joinMatrixRTC: async (): Promise<void> => {},
     homeserverConnected$: constant(true),
   };
@@ -216,7 +224,7 @@ describe("LocalMembership", () => {
       });
 
       expectObservable(localMembership.connectionState.livekit$).toBe("ne", {
-        n: { state: LivekitState.Uninitialized },
+        n: { state: LivekitState.Connecting },
         e: {
           state: LivekitState.Error,
           error: expect.toSatisfy(
@@ -226,4 +234,63 @@ describe("LocalMembership", () => {
       });
     });
   });
+
+  it("recreates publisher if new connection is used", async () => {
+    const scope = new ObservableScope();
+    const aTransport = {
+      livekit_service_url: "a",
+    } as LivekitTransport;
+    const bTransport = {
+      livekit_service_url: "b",
+    } as LivekitTransport;
+
+    const localTransport$ = new BehaviorSubject(aTransport);
+
+    const connectionManagerData = new ConnectionManagerData();
+
+    connectionManagerData.add(
+      {
+        livekitRoom: mockLivekitRoom({
+          localParticipant: {
+            isScreenShareEnabled: false,
+            trackPublications: [],
+          } as unknown as LocalParticipant,
+        }),
+        state$: constant({
+          state: "ConnectedToLkRoom",
+        }),
+        transport: aTransport,
+      } as unknown as Connection,
+      [],
+    );
+    connectionManagerData.add(
+      {
+        state$: constant({
+          state: "ConnectedToLkRoom",
+        }),
+        transport: bTransport,
+      } as unknown as Connection,
+      [],
+    );
+
+    const publisherFactory =
+      defaultCreateLocalMemberValues.createPublisherFactory as ReturnType<
+        typeof vi.fn
+      >;
+
+    createLocalMembership$({
+      scope,
+      ...defaultCreateLocalMemberValues,
+      connectionManager: {
+        connectionManagerData$: constant(new Epoch(connectionManagerData)),
+      },
+      localTransport$,
+    });
+    await flushPromises();
+    localTransport$.next(bTransport);
+    await flushPromises();
+    expect(publisherFactory).toHaveBeenCalledTimes(2);
+    expect(publisherFactory.mock.calls[0][0].transport).toBe(aTransport);
+    expect(publisherFactory.mock.calls[1][0].transport).toBe(bTransport);
+  });
 });