Merge pull request #156 from whereby/thomas/fix-screenshare-stream-bug

Fix screenshare stream bug
whereby · Dec 4, 2023 · 83da34d · 83da34d
2 parents 97824c9 + 0042ebe
commit 83da34d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/lib/RoomParticipant.ts b/src/lib/RoomParticipant.ts
@@ -48,7 +48,7 @@ export interface RemoteParticipant {
     isAudioEnabled: boolean;
     isVideoEnabled: boolean;
     isLocalParticipant: boolean;
-    stream: MediaStream | null;
+    stream: (MediaStream & { inboundId?: string }) | null;
     streams: Stream[];
     newJoiner: boolean;
     presentationStream: (MediaStream & { inboundId?: string }) | null;

diff --git a/src/lib/core/redux/slices/remoteParticipants.ts b/src/lib/core/redux/slices/remoteParticipants.ts
@@ -92,6 +92,7 @@ function removeClient(state: RemoteParticipantState, participantId: string) {
 
 function addStreamId(state: RemoteParticipantState, participantId: string, streamId: string) {
     const { participant } = findParticipant(state, participantId);
+
     if (!participant || participant.streams.find((s) => s.id === streamId)) {
         console.warn(`No participant ${participantId} or stream ${streamId} already exists`);
         return state;
@@ -142,13 +143,13 @@ function addStream(state: RemoteParticipantState, payload: RtcStreamAddedPayload
         return state;
     }
 
-    const remoteParticipantStream =
-        remoteParticipant.streams.find((s) => s.id === streamId) || remoteParticipant.streams[0];
+    const remoteParticipantStream = remoteParticipant.streams.find((s) => s.id === streamId);
 
     if (
-        (remoteParticipant.stream && remoteParticipant.stream.id === streamId) ||
+        (remoteParticipant.stream &&
+            (remoteParticipant.stream.id === streamId || remoteParticipant.stream.inboundId === streamId)) ||
         (!remoteParticipant.stream && streamType === "webcam") ||
-        (!remoteParticipant.stream && !streamType && remoteParticipant.streams.indexOf(remoteParticipantStream) < 1)
+        (!remoteParticipant.stream && !streamType && !remoteParticipantStream)
     ) {
         return updateParticipant(state, clientId, { stream });
     }