mosskoi/element-call-custom
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Restore a hidden 'null' state for the local transport/connection

Browse Source
This commit is contained in:
Robin
2025-10-08 17:35:53 -04:00
parent 8778be8351
commit 3691e7120d
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/state/CallViewModel.ts
View File

@@ -562,16 +562,22 @@ export class CallViewModel extends ViewModel {
/** /**
* The transport over which we should be actively publishing our media. * The transport over which we should be actively publishing our media.
* null when not joined.
*/ */
private readonly localTransport$: Behavior<Async<LivekitTransport>> = private readonly localTransport$: Behavior<Async<LivekitTransport> | null> =
this.scope.behavior( this.scope.behavior(
this.transports$.pipe( this.transports$.pipe(
map((transports) => transports?.local ?? null), map((transports) => transports?.local ?? null),
distinctUntilChanged(deepCompare), distinctUntilChanged<Async<LivekitTransport> | null>(deepCompare),
), ),
); );
private readonly localConnection$: Behavior<Async<PublishConnection>> = /**
* The local connection over which we will publish our media. It could
* possibly also have some remote users' media available on it.
* null when not joined.
*/
private readonly localConnection$: Behavior<Async<PublishConnection> | null> =
this.scope.behavior( this.scope.behavior(
this.localTransport$.pipe( this.localTransport$.pipe(
map( map(
@@ -807,15 +813,14 @@ export class CallViewModel extends ViewModel {
// TODO: Move this logic into Connection/PublishConnection if possible // TODO: Move this logic into Connection/PublishConnection if possible
this.localConnection$ this.localConnection$
.pipe( .pipe(
switchMap((values) => { switchMap((localConnection) => {
if (values?.state !== "ready") return []; if (localConnection?.state !== "ready") return [];
const localConnection = values.value;
const memberError = (): never => { const memberError = (): never => {
throw new Error("No room member for call membership"); throw new Error("No room member for call membership");
}; };
const localParticipant = { const localParticipant = {
id: "local", id: "local",
participant: localConnection.livekitRoom.localParticipant, participant: localConnection.value.livekitRoom.localParticipant,
member: member:
this.matrixRoom.getMember(this.userId ?? "") ?? memberError(), this.matrixRoom.getMember(this.userId ?? "") ?? memberError(),
}; };
@@ -823,7 +828,7 @@ export class CallViewModel extends ViewModel {
return this.remoteConnections$.pipe( return this.remoteConnections$.pipe(
switchMap((remoteConnections) => switchMap((remoteConnections) =>
combineLatest( combineLatest(
[localConnection, ...remoteConnections].map((c) => [localConnection.value, ...remoteConnections].map((c) =>
c.publishingParticipants$.pipe( c.publishingParticipants$.pipe(
map((ps) => { map((ps) => {
const participants: { const participants: {
@@ -842,7 +847,7 @@ export class CallViewModel extends ViewModel {
this.matrixRoom, this.matrixRoom,
)?.member ?? memberError(), )?.member ?? memberError(),
})); }));
if (c === localConnection) if (c === localConnection.value)
participants.push(localParticipant); participants.push(localParticipant);
return { return {
@@ -1974,7 +1979,10 @@ export class CallViewModel extends ViewModel {
); );
c.stop().catch((err) => { c.stop().catch((err) => {
// TODO: better error handling // TODO: better error handling
logger.error("MuteState: handler error", err); logger.error(
`Fail to stop connection to ${c.localTransport.livekit_service_url}`,
err,
);
}); });
} }
for (const c of start) { for (const c of start) {