@wazo/sdk 0.37.3 → 0.37.4

package/esm/simple/room/__tests__/RemoteParticipant.test.js

@@ -11747,9 +11747,11 @@ class Room$1 extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -11779,15 +11781,41 @@ class Room$1 extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);

package/esm/simple/utils.js

@@ -11747,9 +11747,11 @@ class Room$1 extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -11779,15 +11781,41 @@ class Room$1 extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);

package/lib/index.js

@@ -12733,9 +12733,11 @@ class Room extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -12765,15 +12767,41 @@ class Room extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);

package/lib/simple/Auth.js

@@ -11497,9 +11497,11 @@ class Room$1 extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -11529,15 +11531,41 @@ class Room$1 extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);

package/lib/simple/Configuration.js

@@ -11495,9 +11495,11 @@ class Room$1 extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -11527,15 +11529,41 @@ class Room$1 extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);

package/lib/simple/Phone.js

@@ -11368,9 +11368,11 @@ class Room$1 extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -11400,15 +11402,41 @@ class Room$1 extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);

package/lib/simple/index.js

@@ -11757,9 +11757,11 @@ class Room$1 extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -11789,15 +11791,41 @@ class Room$1 extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);

package/lib/simple/room/LocalParticipant.js

@@ -12623,9 +12623,11 @@ class Room extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -12655,15 +12657,41 @@ class Room extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);

package/lib/simple/room/Participant.js

@@ -12628,9 +12628,11 @@ class Room extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -12660,15 +12662,41 @@ class Room extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);

package/lib/simple/room/RemoteParticipant.js

@@ -12902,9 +12902,11 @@ class Room extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -12934,15 +12936,41 @@ class Room extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);

package/lib/simple/room/Room.js

@@ -12915,9 +12915,11 @@ class Room extends Emitter {
   _onParticipantTrackUpdate(oldParticipant             , update        )              {
     const newParticipant = oldParticipant;
 
-    const { trackId } = this._callIdStreamIdMap[newParticipant.callId] || {};
+    const { trackId, streamId } = this._callIdStreamIdMap[newParticipant.callId] || {};
     const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
-    const stream = pc.getRemoteStreams().find(someStream => someStream.getTracks().some(track => track.id === trackId));
+    // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
+    const stream = pc.getRemoteStreams().find(someStream =>
+      someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.streams = [];
@@ -12947,15 +12949,41 @@ class Room extends Emitter {
       return;
     }
 
-    if (this._unassociatedVideoStreams[trackId]) {
+    const streamId = this._getStreamIdFrTrackId(trackId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const stream = this._unassociatedVideoStreams[key];
+
+    if (stream) {
       // Try to associate stream
-      this._associateStreamTo(this._unassociatedVideoStreams[trackId], participant);
+      this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[trackId];
+      delete this._unassociatedVideoStreams[key];
       delete this._unassociatedParticipants[participant.callId];
     }
   }
 
+  _getUnassociatedMapIdFromTrackIdOrStreamId(trackId        , streamId         ) {
+    // Find by trackId
+    if (trackId in this._unassociatedVideoStreams) {
+      return trackId;
+    }
+
+    // Find by streamId
+    if (streamId && streamId in this._unassociatedVideoStreams) {
+      return streamId;
+    }
+
+    // Find in all the streams by streamId (used on FF where we can't map by trackId)
+    const idx = Object.values(this._unassociatedVideoStreams).findIndex((stream        ) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId        ) {
+    const mapping         = Object.values(this._callIdStreamIdMap).find((map        ) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream     , participant             ) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);