Skip to content

Always wait for local transport #3850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
toger5 wants to merge 1 commit into
base: livekit
Choose a base branch
from
+7 −1
Draft

Always wait for local transport #3850

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/state/CallViewModel/remoteMembers/ConnectionManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import { type LivekitTransportConfig } from "matrix-js-sdk/lib/matrixrtc";
import { combineLatest, map, of, switchMap } from "rxjs";
import { combineLatest, map, of, skipWhile, switchMap } from "rxjs";

Check failure on line 10 in src/state/CallViewModel/remoteMembers/ConnectionManager.ts

View workflow job for this annotation

GitHub Actions / Lint, format & type check 

'skipWhile' is defined but never used
import { type Logger } from "matrix-js-sdk/lib/logger";
import { type RemoteParticipant } from "livekit-client";
import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
Expand Down Expand Up @@ -131,6 +131,12 @@
// Combine local and remote transports into one transport array
// and set the forceOldJwtEndpoint property on the local transport
map(([remoteTransports, localTransport]) => {
if (!localTransport) {
// Dont return any transports as long as there is no local transport.
// Otherwise we might end up with two connections since the local transport will already connect to the SFU.
// The local transport needs to connect with dedicated logic to also setup delayed event delegation.
return new Epoch([]);
}
let localTransportAsArray: LocalTransportWithSFUConfig[] = [];
if (localTransport) {
localTransportAsArray = [localTransport];
Expand Down
Loading