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

Fix publisher clean up! This is the acutal bug we chased

Browse Source
This commit is contained in:
Timo K
2026-01-15 18:11:43 +01:00
parent c74accb906
commit f7590a33d7
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/state/CallViewModel/CallViewModel.ts
View File

@@ -527,7 +527,10 @@ export function createCallViewModel$(
connectOptions$.value, connectOptions$.value,
); );
}, },
createPublisherFactory: (connection: Connection) => { createPublisherFactory: (
scope: ObservableScope,
connection: Connection,
) => {
return new Publisher( return new Publisher(
scope, scope,
connection, connection,

18
src/state/CallViewModel/localMember/LocalMember.ts
View File

@@ -40,7 +40,7 @@ import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/En
import { type Behavior } from "../../Behavior.ts"; import { type Behavior } from "../../Behavior.ts";
import { type IConnectionManager } from "../remoteMembers/ConnectionManager.ts"; import { type IConnectionManager } from "../remoteMembers/ConnectionManager.ts";
import { type ObservableScope } from "../../ObservableScope.ts"; import { ObservableScope } from "../../ObservableScope.ts";
import { type Publisher } from "./Publisher.ts"; import { type Publisher } from "./Publisher.ts";
import { type MuteStates } from "../../MuteStates.ts"; import { type MuteStates } from "../../MuteStates.ts";
import { import {
@@ -124,7 +124,10 @@ interface Props {
scope: ObservableScope; scope: ObservableScope;
muteStates: MuteStates; muteStates: MuteStates;
connectionManager: IConnectionManager; connectionManager: IConnectionManager;
createPublisherFactory: (connection: Connection) => Publisher; createPublisherFactory: (
scope: ObservableScope,
connection: Connection,
) => Publisher;
joinMatrixRTC: (transport: LivekitTransport) => void; joinMatrixRTC: (transport: LivekitTransport) => void;
homeserverConnected: HomeserverConnected; homeserverConnected: HomeserverConnected;
localTransport$: Behavior<LocalTransportWithSFUConfig | null>; localTransport$: Behavior<LocalTransportWithSFUConfig | null>;
@@ -310,13 +313,18 @@ export const createLocalMembership$ = ({
// - destruct all current streams // - destruct all current streams
// - overwrite current publisher // - overwrite current publisher
scope.reconcile(localConnection$, async (connection) => { scope.reconcile(localConnection$, async (connection) => {
logger.info(
"reconcile based on new localConnection:",
connection?.transport.livekit_service_url,
);
if (connection !== null) { if (connection !== null) {
const publisher = createPublisherFactory(connection); const scope = new ObservableScope();
const publisher = createPublisherFactory(scope, connection);
publisher$.next(publisher); publisher$.next(publisher);
// Clean-up callback // Clean-up callback
return Promise.resolve(async (): Promise<void> => { return Promise.resolve(async (): Promise<void> => {
await publisher.stopPublishing(); scope.end();
await publisher.stopTracks();
}); });
} }
}); });