twilio-video 2.34.0 → 2.35.0

package/lib/webrtc/rtcpeerconnection/chrome.js

@@ -1,16 +1,11 @@
 /* globals RTCDataChannel, RTCPeerConnection, RTCSessionDescription */
 'use strict';
 
-const ChromeRTCSessionDescription = require('../rtcsessiondescription/chrome');
 const EventTarget = require('../../eventtarget');
 const Latch = require('../util/latch');
-const MediaStream = require('../mediastream');
-const RTCRtpSenderShim = require('../rtcrtpsender');
-const { getSdpFormat, updatePlanBTrackIdsToSSRCs, updateUnifiedPlanTrackIdsToSSRCs } = require('../util/sdp');
+const { updateTrackIdsToSSRCs } = require('../util/sdp');
 const { delegateMethods, interceptEvent, isIOSChrome, legacyPromise, proxyProperties } = require('../util');
 
-const isUnifiedPlan = getSdpFormat() === 'unified';
-
 // NOTE(mroberts): This class wraps Chrome's RTCPeerConnection implementation.
 // It provides some functionality not currently present in Chrome, namely the
 // abilities to
@@ -34,7 +29,6 @@ class ChromeRTCPeerConnection extends EventTarget {
 
     interceptEvent(this, 'datachannel');
     interceptEvent(this, 'signalingstatechange');
-    const sdpFormat = getSdpFormat(newConfiguration.sdpSemantics);
     const peerConnection = new RTCPeerConnection(newConfiguration, constraints);
 
     Object.defineProperties(this, {
@@ -49,9 +43,6 @@ class ChromeRTCPeerConnection extends EventTarget {
         value: null,
         writable: true
       },
-      _localStream: {
-        value: new MediaStream()
-      },
       _peerConnection: {
         value: peerConnection
       },
@@ -67,12 +58,6 @@ class ChromeRTCPeerConnection extends EventTarget {
         value: new Map(),
         writable: true
       },
-      _sdpFormat: {
-        value: sdpFormat
-      },
-      _senders: {
-        value: new Map()
-      },
       _signalingStateLatch: {
         value: new Latch()
       },
@@ -100,14 +85,6 @@ class ChromeRTCPeerConnection extends EventTarget {
       }
     });
 
-    peerConnection.ontrack = () => {
-      // NOTE(mroberts): adapter.js's "track" event shim only kicks off if we set
-      // the ontrack property of the RTCPeerConnection.
-    };
-
-    if (typeof peerConnection.addTrack !== 'function') {
-      peerConnection.addStream(this._localStream);
-    }
     proxyProperties(RTCPeerConnection.prototype, this, peerConnection);
   }
 
@@ -128,72 +105,6 @@ class ChromeRTCPeerConnection extends EventTarget {
     return this._peerConnection.signalingState;
   }
 
-  // NOTE(mmalavalli): This shim supports our limited case of adding
-  // all MediaStreamTracks to one MediaStream. It has been implemented this
-  // keeping in mind that this is to be maintained only until "addTrack" is
-  // supported natively in Chrome.
-  addTrack(track, ...rest) {
-    if (typeof this._peerConnection.addTrack === 'function') {
-      return this._peerConnection.addTrack(track, ...rest);
-    }
-    if (this._peerConnection.signalingState === 'closed') {
-      throw new Error(`Cannot add MediaStreamTrack [${track.id}, 
-        ${track.kind}]: RTCPeerConnection is closed`);
-    }
-
-    let sender = this._senders.get(track);
-    if (sender && sender.track) {
-      throw new Error(`Cannot add MediaStreamTrack ['${track.id}, 
-        ${track.kind}]: RTCPeerConnection already has it`);
-    }
-    this._peerConnection.removeStream(this._localStream);
-    this._localStream.addTrack(track);
-    this._peerConnection.addStream(this._localStream);
-    sender = new RTCRtpSenderShim(track);
-    this._senders.set(track, sender);
-    return sender;
-  }
-
-  // NOTE(mmalavalli): This shim supports our limited case of removing
-  // MediaStreamTracks from one MediaStream. It has been implemented this
-  // keeping in mind that this is to be maintained only until "removeTrack" is
-  // supported natively in Chrome.
-  removeTrack(sender) {
-    if (this._peerConnection.signalingState === 'closed') {
-      throw new Error('Cannot remove MediaStreamTrack: RTCPeerConnection is closed');
-    }
-    if (typeof this._peerConnection.addTrack === 'function') {
-      try {
-        return this._peerConnection.removeTrack(sender);
-      } catch (e) {
-        // NOTE(mhuynh): Do nothing. In Chrome, will throw if a 'sender was not
-        // created by this peer connection'. This behavior does not seem to be
-        // spec compliant, so a temporary shim is introduced. A bug has been filed,
-        // and is tracked here:
-        // https://bugs.chromium.org/p/chromium/issues/detail?id=860853
-      }
-    } else {
-      const { track } = sender;
-      if (!track) {
-        return;
-      }
-      sender = this._senders.get(track);
-      if (sender && sender.track) {
-        sender.track = null;
-        this._peerConnection.removeStream(this._localStream);
-        this._localStream.removeTrack(track);
-        this._peerConnection.addStream(this._localStream);
-      }
-    }
-  }
-
-  getSenders() {
-    if (typeof this._peerConnection.addTrack === 'function') {
-      return this._peerConnection.getSenders();
-    }
-    return Array.from(this._senders.values());
-  }
-
   addIceCandidate(candidate, ...rest) {
     let promise;
 
@@ -246,9 +157,9 @@ class ChromeRTCPeerConnection extends EventTarget {
         // longer need to retain the rolled back tracks to SSRCs Map.
         this._rolledBackTracksToSSRCs.clear();
 
-        return new ChromeRTCSessionDescription({
+        return new RTCSessionDescription({
           type: 'answer',
-          sdp: updateTrackIdsToSSRCs(this._sdpFormat, this._tracksToSSRCs, answer.sdp)
+          sdp: updateTrackIdsToSSRCs(this._tracksToSSRCs, answer.sdp)
         });
       }, error => {
         this._pendingRemoteOffer = null;
@@ -260,9 +171,9 @@ class ChromeRTCPeerConnection extends EventTarget {
         // longer need to retain the rolled back tracks to SSRCs Map.
         this._rolledBackTracksToSSRCs.clear();
 
-        return new ChromeRTCSessionDescription({
+        return new RTCSessionDescription({
           type: 'answer',
-          sdp: updateTrackIdsToSSRCs(this._sdpFormat, this._tracksToSSRCs, answer.sdp)
+          sdp: updateTrackIdsToSSRCs(this._tracksToSSRCs, answer.sdp)
         });
       });
     }
@@ -278,24 +189,20 @@ class ChromeRTCPeerConnection extends EventTarget {
 
     if (isIOSChrome()) {
       // NOTE (joma): From SafariRTCPeerConnection in order to support iOS Chrome.
-      if (options.offerToReceiveVideo && !this._audioTransceiver && !(isUnifiedPlan && hasReceiversForTracksOfKind(this, 'audio'))) {
+      if (options.offerToReceiveVideo && !this._audioTransceiver && !hasReceiversForTracksOfKind(this, 'audio')) {
         delete options.offerToReceiveAudio;
         try {
-          this._audioTransceiver = isUnifiedPlan
-            ? this.addTransceiver('audio', { direction: 'recvonly' })
-            : this.addTransceiver('audio');
+          this._audioTransceiver = this.addTransceiver('audio', { direction: 'recvonly' });
           this._applyCodecPreferences(this._audioTransceiver);
         } catch (e) {
           return Promise.reject(e);
         }
       }
 
-      if (options.offerToReceiveVideo && !this._videoTransceiver && !(isUnifiedPlan && hasReceiversForTracksOfKind(this, 'video'))) {
+      if (options.offerToReceiveVideo && !this._videoTransceiver && !hasReceiversForTracksOfKind(this, 'video')) {
         delete options.offerToReceiveVideo;
         try {
-          this._videoTransceiver = isUnifiedPlan
-            ? this.addTransceiver('video', { direction: 'recvonly' })
-            : this.addTransceiver('video');
+          this._videoTransceiver = this.addTransceiver('video', { direction: 'recvonly' });
           this._applyCodecPreferences(this._videoTransceiver);
         } catch (e) {
           return Promise.reject(e);
@@ -308,9 +215,9 @@ class ChromeRTCPeerConnection extends EventTarget {
       // longer need to retain the rolled back tracks to SSRCs Map.
       this._rolledBackTracksToSSRCs.clear();
 
-      return new ChromeRTCSessionDescription({
+      return new RTCSessionDescription({
         type: offer.type,
-        sdp: updateTrackIdsToSSRCs(this._sdpFormat, this._tracksToSSRCs, offer.sdp)
+        sdp: updateTrackIdsToSSRCs(this._tracksToSSRCs, offer.sdp)
       });
     });
 
@@ -466,10 +373,8 @@ function hasReceiversForTracksOfKind(peerConnection, kind) {
 }
 
 function unwrap(description) {
-  if (description instanceof ChromeRTCSessionDescription) {
-    if (description._description) {
-      return description._description;
-    }
+  if (description instanceof RTCSessionDescription) {
+    return description;
   }
   return new RTCSessionDescription(description);
 }
@@ -527,19 +432,4 @@ function shimDataChannel(dataChannel) {
   return dataChannel;
 }
 
-/**
- * Update the mappings from MediaStreamTrack IDs to SSRCs as indicated by both
- * the Map from MediaStreamTrack IDs to SSRCs and the SDP itself. This method
- * ensures that SSRCs never change once announced.
- * @param {'planb'|'unified'} sdpFormat
- * @param {Map<string, Set<string>>} tracksToSSRCs
- * @param {string} sdp - an SDP whose format is determined by `sdpSemantics`
- * @returns {string} updatedSdp - updated SDP
- */
-function updateTrackIdsToSSRCs(sdpFormat, tracksToSSRCs, sdp) {
-  return sdpFormat === 'unified'
-    ? updateUnifiedPlanTrackIdsToSSRCs(tracksToSSRCs, sdp)
-    : updatePlanBTrackIdsToSSRCs(tracksToSSRCs, sdp);
-}
-
 module.exports = ChromeRTCPeerConnection;

package/lib/webrtc/rtcpeerconnection/firefox.js

@@ -2,8 +2,7 @@
 'use strict';
 
 const EventTarget = require('../../eventtarget');
-const FirefoxRTCSessionDescription = require('../rtcsessiondescription/firefox');
-const { updateUnifiedPlanTrackIdsToSSRCs: updateTracksToSSRCs } = require('../util/sdp');
+const { updateTrackIdsToSSRCs } = require('../util/sdp');
 const { delegateMethods, interceptEvent, legacyPromise, proxyProperties } = require('../util');
 
 // NOTE(mroberts): This class wraps Firefox's RTCPeerConnection implementation.
@@ -138,9 +137,9 @@ class FirefoxRTCPeerConnection extends EventTarget {
     }
 
     promise = promise.then(offer => {
-      return new FirefoxRTCSessionDescription({
+      return new RTCSessionDescription({
         type: offer.type,
-        sdp: updateTracksToSSRCs(this._tracksToSSRCs, offer.sdp)
+        sdp: updateTrackIdsToSSRCs(this._tracksToSSRCs, offer.sdp)
       });
     });
 
@@ -224,7 +223,7 @@ delegateMethods(
 function rollback(peerConnection, local, onceRolledBack) {
   const setLocalDescription = local ? 'setLocalDescription' : 'setRemoteDescription';
   peerConnection._rollingBack = true;
-  return peerConnection._peerConnection[setLocalDescription](new FirefoxRTCSessionDescription({
+  return peerConnection._peerConnection[setLocalDescription](new RTCSessionDescription({
     type: 'rollback'
   })).then(onceRolledBack).then(result => {
     peerConnection._rollingBack = false;
@@ -283,7 +282,7 @@ function saveInitiallyNegotiatedDtlsRole(peerConnection, description, remote) {
  */
 function overwriteWithInitiallyNegotiatedDtlsRole(description, dtlsRole) {
   if (description && description.type === 'answer' && dtlsRole) {
-    return new FirefoxRTCSessionDescription({
+    return new RTCSessionDescription({
       type: description.type,
       sdp: description.sdp.replace(/a=setup:[a-z]+/g, 'a=setup:' + dtlsRole)
     });

package/lib/webrtc/rtcpeerconnection/safari.js

@@ -3,15 +3,9 @@
 
 const EventTarget = require('../../eventtarget');
 const Latch = require('../util/latch');
-const { getSdpFormat, updatePlanBTrackIdsToSSRCs, updateUnifiedPlanTrackIdsToSSRCs } = require('../util/sdp');
+const { updateTrackIdsToSSRCs } = require('../util/sdp');
 const { delegateMethods, interceptEvent, proxyProperties } = require('../util');
 
-const isUnifiedPlan = getSdpFormat() === 'unified';
-
-const updateTrackIdsToSSRCs = isUnifiedPlan
-  ? updateUnifiedPlanTrackIdsToSSRCs
-  : updatePlanBTrackIdsToSSRCs;
-
 class SafariRTCPeerConnection extends EventTarget {
   constructor(configuration, options = {}) {
     super();
@@ -143,24 +137,20 @@ class SafariRTCPeerConnection extends EventTarget {
 
     // NOTE(mroberts): In general, this is not the way to do this; however, it's
     // good enough for our application.
-    if (options.offerToReceiveVideo && !this._audioTransceiver && !(isUnifiedPlan && hasReceiversForTracksOfKind(this, 'audio'))) {
+    if (options.offerToReceiveVideo && !this._audioTransceiver && !hasReceiversForTracksOfKind(this, 'audio')) {
       delete options.offerToReceiveAudio;
       try {
-        this._audioTransceiver = isUnifiedPlan
-          ? this.addTransceiver('audio', { direction: 'recvonly' })
-          : this.addTransceiver('audio');
+        this._audioTransceiver = this.addTransceiver('audio', { direction: 'recvonly' });
         this._applyCodecPreferences(this._audioTransceiver);
       } catch (e) {
         return Promise.reject(e);
       }
     }
 
-    if (options.offerToReceiveVideo && !this._videoTransceiver && !(isUnifiedPlan && hasReceiversForTracksOfKind(this, 'video'))) {
+    if (options.offerToReceiveVideo && !this._videoTransceiver && !hasReceiversForTracksOfKind(this, 'video')) {
       delete options.offerToReceiveVideo;
       try {
-        this._videoTransceiver = isUnifiedPlan
-          ? this.addTransceiver('video', { direction: 'recvonly' })
-          : this.addTransceiver('video');
+        this._videoTransceiver = this.addTransceiver('video', { direction: 'recvonly' });
         this._applyCodecPreferences(this._videoTransceiver);
       } catch (e) {
         return Promise.reject(e);
@@ -191,10 +181,10 @@ class SafariRTCPeerConnection extends EventTarget {
         // longer need to retain the rolled back tracks to SSRCs Map.
         this._rolledBackTracksToSSRCs.clear();
 
-        return isUnifiedPlan ? new RTCSessionDescription({
+        return new RTCSessionDescription({
           type: answer.type,
           sdp: updateTrackIdsToSSRCs(this._tracksToSSRCs, answer.sdp)
-        }) : answer;
+        });
       }, error => {
         this._pendingRemoteOffer = null;
         throw error;
@@ -206,10 +196,10 @@ class SafariRTCPeerConnection extends EventTarget {
       // longer need to retain the rolled back tracks to SSRCs Map.
       this._rolledBackTracksToSSRCs.clear();
 
-      return isUnifiedPlan ? new RTCSessionDescription({
+      return new RTCSessionDescription({
         type: answer.type,
         sdp: updateTrackIdsToSSRCs(this._tracksToSSRCs, answer.sdp)
-      }) : answer;
+      });
     });
   }
 

package/lib/webrtc/util/sdp.js

@@ -1,107 +1,6 @@
-/* globals RTCPeerConnection, RTCRtpTransceiver */
-
 'use strict';
 
-const { flatMap, guessBrowser } = require('./');
-
-// NOTE(mmalavalli): We cache Chrome's sdpSemantics support in order to prevent
-// instantiation of more than one RTCPeerConnection.
-let isSdpSemanticsSupported = null;
-
-/**
- * Check if Chrome supports specifying sdpSemantics for an RTCPeerConnection.
- * @return {boolean}
- */
-function checkIfSdpSemanticsIsSupported() {
-  if (typeof isSdpSemanticsSupported === 'boolean') {
-    return isSdpSemanticsSupported;
-  }
-  if (typeof RTCPeerConnection === 'undefined') {
-    isSdpSemanticsSupported = false;
-    return isSdpSemanticsSupported;
-  }
-  try {
-    // eslint-disable-next-line no-new
-    new RTCPeerConnection({ sdpSemantics: 'foo' });
-    isSdpSemanticsSupported = false;
-  } catch (e) {
-    isSdpSemanticsSupported = true;
-  }
-  return isSdpSemanticsSupported;
-}
-
-// NOTE(mmalavalli): We cache Chrome's SDP format in order to prevent
-// instantiation of more than one RTCPeerConnection.
-let chromeSdpFormat = null;
-
-/**
- * Clear cached Chrome's SDP format
- */
-function clearChromeCachedSdpFormat() {
-  chromeSdpFormat = null;
-}
-
-/**
- * Get Chrome's default SDP format.
- * @returns {'planb'|'unified'}
- */
-function getChromeDefaultSdpFormat() {
-  if (!chromeSdpFormat) {
-    if (typeof RTCPeerConnection !== 'undefined'
-      && 'addTransceiver' in RTCPeerConnection.prototype) {
-      const pc = new RTCPeerConnection();
-      try {
-        pc.addTransceiver('audio');
-        chromeSdpFormat = 'unified';
-      } catch (e) {
-        chromeSdpFormat = 'planb';
-      }
-      pc.close();
-    } else {
-      chromeSdpFormat = 'planb';
-    }
-  }
-  return chromeSdpFormat;
-}
-
-/**
- * Get Chrome's SDP format.
- * @param {'plan-b'|'unified-plan'} [sdpSemantics]
- * @returns {'planb'|'unified'}
- */
-function getChromeSdpFormat(sdpSemantics) {
-  if (!sdpSemantics || !checkIfSdpSemanticsIsSupported()) {
-    return getChromeDefaultSdpFormat();
-  }
-  return {
-    'plan-b': 'planb',
-    'unified-plan': 'unified'
-  }[sdpSemantics];
-}
-
-/**
- * Get Safari's default SDP format.
- * @returns {'planb'|'unified'}
- */
-function getSafariSdpFormat() {
-  return typeof RTCRtpTransceiver !== 'undefined'
-    && 'currentDirection' in RTCRtpTransceiver.prototype
-    ? 'unified'
-    : 'planb';
-}
-
-/**
- * Get the browser's default SDP format.
- * @param {'plan-b'|'unified-plan'} [sdpSemantics]
- * @returns {'planb'|'unified'}
- */
-function getSdpFormat(sdpSemantics) {
-  return {
-    chrome: getChromeSdpFormat(sdpSemantics),
-    firefox: 'unified',
-    safari: getSafariSdpFormat()
-  }[guessBrowser()] || null;
-}
+const { flatMap } = require('./');
 
 /**
  * Match a pattern across lines, returning the first capture group for any
@@ -120,41 +19,11 @@ function getMatches(pattern, lines) {
 
 /**
  * Get a Set of MediaStreamTrack IDs from an SDP.
- * @param {string} pattern
- * @param {string} sdp
- * @returns {Set<string>}
- */
-function getTrackIds(pattern, sdp) {
-  return getMatches(pattern, sdp);
-}
-
-/**
- * Get a Set of MediaStreamTrack IDs from a Plan B SDP.
- * @param {string} sdp - Plan B SDP
- * @returns {Set<string>} trackIds
- */
-function getPlanBTrackIds(sdp) {
-  return getTrackIds('^a=ssrc:[0-9]+ +msid:.+ +(.+) *$', sdp);
-}
-
-/**
- * Get a Set of MediaStreamTrack IDs from a Unified Plan SDP.
- * @param {string} sdp - Unified Plan SDP
+ * @param {string} sdp - SDP
  * @returns {Set<string>} trackIds
  */
-function getUnifiedPlanTrackIds(sdp) {
-  return getTrackIds('^a=msid:.+ +(.+) *$', sdp);
-}
-
-/**
- * Get a Set of SSRCs for a MediaStreamTrack from a Plan B SDP.
- * @param {string} sdp - Plan B SDP
- * @param {string} trackId - MediaStreamTrack ID
- * @returns {Set<string>}
- */
-function getPlanBSSRCs(sdp, trackId) {
-  const pattern = `^a=ssrc:([0-9]+) +msid:[^ ]+ +${trackId} *$`;
-  return getMatches(pattern, sdp);
+function getTrackIds(sdp) {
+  return getMatches('^a=msid:.+ +(.+) *$', sdp);
 }
 
 /**
@@ -182,12 +51,12 @@ function getMediaSectionSSRCs(mediaSection) {
 }
 
 /**
- * Get a Set of SSRCs for a MediaStreamTrack from a Unified Plan SDP.
- * @param {string} sdp - Unified Plan SDP
+ * Get a Set of SSRCs for a MediaStreamTrack from an SDP.
+ * @param {string} sdp - SDP
  * @param {string} trackId - MediaStreamTrack ID
  * @returns {Set<string>}
  */
-function getUnifiedPlanSSRCs(sdp, trackId) {
+function getSSRCs(sdp, trackId) {
   const mediaSections = getMediaSections(sdp);
 
   const msidAttrRegExp = new RegExp(`^a=msid:[^ ]+ +${trackId} *$`, 'gm');
@@ -198,43 +67,22 @@ function getUnifiedPlanSSRCs(sdp, trackId) {
 
 /**
  * Get a Map from MediaStreamTrack IDs to SSRCs from an SDP.
- * @param {function(string): Set<string>} getTrackIds
- * @param {function(string, string): Set<string>} getSSRCs
  * @param {string} sdp - SDP
  * @returns {Map<string, Set<string>>} trackIdsToSSRCs
  */
-function getTrackIdsToSSRCs(getTrackIds, getSSRCs, sdp) {
+function getTrackIdsToSSRCs(sdp) {
   return new Map(Array.from(getTrackIds(sdp)).map(trackId => [trackId, getSSRCs(sdp, trackId)]));
 }
 
-/**
- * Get a Map from MediaStreamTrack IDs to SSRCs from a Plan B SDP.
- * @param {string} sdp - Plan B SDP
- * @returns {Map<string, Set<string>>} trackIdsToSSRCs
- */
-function getPlanBTrackIdsToSSRCs(sdp) {
-  return getTrackIdsToSSRCs(getPlanBTrackIds, getPlanBSSRCs, sdp);
-}
-
-/**
- * Get a Map from MediaStreamTrack IDs to SSRCs from a Plan B SDP.
- * @param {string} sdp - Plan B SDP
- * @returns {Map<string, Set<string>>} trackIdsToSSRCs
- */
-function getUnifiedPlanTrackIdsToSSRCs(sdp) {
-  return getTrackIdsToSSRCs(getUnifiedPlanTrackIds, getUnifiedPlanSSRCs, sdp);
-}
-
 /**
  * Update the mappings from MediaStreamTrack IDs to SSRCs as indicated by both
  * the Map from MediaStreamTrack IDs to SSRCs and the SDP itself. This method
  * ensures that SSRCs never change once announced.
- * @param {function(string): Map<string, Set<string>>} getTrackIdsToSSRCs
  * @param {Map<string, Set<string>>} trackIdsToSSRCs
  * @param {string} sdp - SDP
- * @returns {strinng} updatedSdp - updated SDP
+ * @returns {string} updatedSdp - updated SDP
  */
-function updateTrackIdsToSSRCs(getTrackIdsToSSRCs, trackIdsToSSRCs, sdp) {
+function updateTrackIdsToSSRCs(trackIdsToSSRCs, sdp) {
   const newTrackIdsToSSRCs = getTrackIdsToSSRCs(sdp);
   const newSSRCsToOldSSRCs = new Map();
 
@@ -275,36 +123,7 @@ function updateTrackIdsToSSRCs(getTrackIdsToSSRCs, trackIdsToSSRCs, sdp) {
   return sdp;
 }
 
-/**
- * Update the mappings from MediaStreamTrack IDs to SSRCs as indicated by both
- * the Map from MediaStreamTrack IDs to SSRCs and the Plan B SDP itself. This
- * method ensures that SSRCs never change once announced.
- * @param {Map<string, Set<string>>} trackIdsToSSRCs
- * @param {string} sdp - Plan B SDP
- * @returns {string} updatedSdp - updated Plan B SDP
- */
-function updatePlanBTrackIdsToSSRCs(trackIdsToSSRCs, sdp) {
-  return updateTrackIdsToSSRCs(getPlanBTrackIdsToSSRCs, trackIdsToSSRCs, sdp);
-}
-
-/**
- * Update the mappings from MediaStreamTrack IDs to SSRCs as indicated by both
- * the Map from MediaStreamTrack IDs to SSRCs and the Plan B SDP itself. This
- * method ensures that SSRCs never change once announced.
- * @param {Map<string, Set<string>>} trackIdsToSSRCs
- * @param {string} sdp - Plan B SDP
- * @returns {string} updatedSdp - updated Plan B SDP
- */
-function updateUnifiedPlanTrackIdsToSSRCs(trackIdsToSSRCs, sdp) {
-  return updateTrackIdsToSSRCs(getUnifiedPlanTrackIdsToSSRCs, trackIdsToSSRCs, sdp);
-}
-
-exports.clearChromeCachedSdpFormat = clearChromeCachedSdpFormat;
-exports.getSdpFormat = getSdpFormat;
 exports.getMediaSections = getMediaSections;
-exports.getPlanBTrackIds = getPlanBTrackIds;
-exports.getUnifiedPlanTrackIds = getUnifiedPlanTrackIds;
-exports.getPlanBSSRCs = getPlanBSSRCs;
-exports.getUnifiedPlanSSRCs = getUnifiedPlanSSRCs;
-exports.updatePlanBTrackIdsToSSRCs = updatePlanBTrackIdsToSSRCs;
-exports.updateUnifiedPlanTrackIdsToSSRCs = updateUnifiedPlanTrackIdsToSSRCs;
+exports.getTrackIds = getTrackIds;
+exports.getSSRCs = getSSRCs;
+exports.updateTrackIdsToSSRCs = updateTrackIdsToSSRCs;

package/package.json

@@ -2,7 +2,7 @@
   "name": "twilio-video",
   "title": "Twilio Video",
   "description": "Twilio Video JavaScript Library",
-  "version": "2.34.0",
+  "version": "2.35.0",
   "homepage": "https://twilio.com",
   "author": "Mark Andrus Roberts <mroberts@twilio.com>",
   "contributors": [
@@ -76,19 +76,23 @@
     "node-http-server": "^8.1.2",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
+    "puppeteer": "19.2.2",
     "regex-replace": "^2.3.1",
     "requirejs": "^2.3.3",
     "rimraf": "^2.6.1",
     "simple-git": "^1.126.0",
     "sinon": "^4.0.1",
     "ts-node": "^10.9.2",
+    "rollup": "^4.41.0",
+    "@rollup/plugin-alias": "^5.1.1",
+    "@rollup/plugin-commonjs": "^28.0.6",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-terser": "^0.4.4",
     "twilio": "^3.49.0",
     "twilio-release-tool": "^1.0.2",
     "typescript": "5.9.3",
-    "uglify-js": "^2.8.22",
     "vinyl-fs": "^2.4.4",
-    "vinyl-source-stream": "^1.1.0",
-    "watchify": "^4.0.0",
     "webrtc-adapter": "^7.7.1"
   },
   "engines": {
@@ -108,7 +112,6 @@
     "test:serversiderender": "mocha --exit ./test/serversiderender/index.js",
     "test:integration:adapter": "node ./scripts/karma.js karma/integration.adapter.conf.js",
     "test:integration": "npm run build:es5 && node ./scripts/karma.js karma/integration.conf.js",
-    "test:umd:install": "npm install puppeteer@19.2.2",
     "test:umd": "mocha --exit ./test/umd/index.js",
     "test:crossbrowser:build:clean": "rimraf ./test/crossbrowser/lib ./test/crossbrowser/src/browser/index.js",
     "test:crossbrowser:build:lint": "cd ./test/crossbrowser && eslint '**/*.ts'",
@@ -140,17 +143,19 @@
     "test:framework:install": "npm install chromedriver && npm install selenium-webdriver && npm install geckodriver && npm install puppeteer",
     "test:framework": "npm-run-all test:framework:install test:framework:no-framework test:framework:react",
     "test": "npm-run-all test:unit test:integration",
-    "build:es5": "rimraf ./es5 && mkdir -p es5 && npm run patch-linkifyit-111 && tsc tsdef/twilio-video-tests.ts --noEmit --lib es2018,dom && tsc",
-    "build:js": "node ./scripts/build.js ./src/twilio-video.js ./LICENSE.md ./dist/twilio-video.js",
-    "build:min.js": "uglifyjs ./dist/twilio-video.js -o ./dist/twilio-video.min.js --comments \"/^! twilio-video.js/\" -b beautify=false,ascii_only=true",
-    "build": "npm-run-all clean lint docs test:unit test:integration build:es5 build:js build:min.js test:umd",
-    "build:quick": "npm-run-all clean lint docs build:es5 build:js build:min.js",
+    "typecheck": "npm run patch-linkifyit-111 && tsc tsdef/twilio-video-tests.ts --noEmit --lib es2018,dom && tsc --noEmit",
+    "build:es5": "npm run clean && npm run typecheck && tsc && rollup -c rollup.config.mjs",
+    "build": "npm-run-all clean lint docs test:unit test:integration build:es5 test:umd",
+    "build:quick": "npm-run-all clean lint docs build:es5",
     "docs": "node ./scripts/docs.js ./dist/docs",
-    "watch": "tsc -w",
+    "watch:tsc": "tsc -w",
+    "watch:rollup": "rollup -c rollup.config.mjs --watch",
+    "watch": "npm-run-all -p watch:tsc watch:rollup",
     "clean": "rimraf ./coverage ./es5 ./dist"
   },
   "dependencies": {
     "events": "^3.3.0",
+    "tslib": "^2.8.1",
     "util": "^0.12.4",
     "ws": "^8.18.3"
   },