@wazo/sdk 0.37.3 → 0.37.4

package/lib/simple/room/SipRoom.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/Stream.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/__tests__/RemoteParticipant.test.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/utils.js

@@ -11759,9 +11759,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 = [];
@@ -11791,15 +11793,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.37.3",
+  "version": "0.37.4",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",

package/src/simple/room/Room.js

@@ -754,9 +754,11 @@ class Room extends Emitter {
   _onParticipantTrackUpdate(oldParticipant: Participant, update: string): Participant {
     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 = [];
@@ -786,15 +788,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: string, streamId: ?string) {
+    // 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: Object) => stream.id === streamId);
+    return idx === -1 ? null : Object.keys(this._unassociatedVideoStreams)[idx];
+  }
+
+  _getStreamIdFrTrackId(trackId: string) {
+    const mapping: Object = Object.values(this._callIdStreamIdMap).find((map: Object) => map.trackId === trackId);
+
+    return mapping ? mapping.streamId : null;
+  }
+
   _associateStreamTo(rawStream: any, participant: Participant) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);