@webex/web-client-media-engine 1.37.0 → 1.37.2

package/dist/cjs/index.js

@@ -8773,17 +8773,25 @@ function setMaxBandwidth(parsedSdp, maxBandwidth) {
         mline.bandwidth = new BandwidthLine('TIAS', maxBandwidth);
     });
 }
-function setupBundle(parsedSdp, bundlePolicy) {
+function setupBundle(parsedSdp, bundlePolicy, midMap) {
     if (bundlePolicy === 'max-compat') {
-        const audioMids = parsedSdp.avMedia
-            .filter((m) => m.type === 'audio')
-            .map((m) => m.mid);
-        const videoMids = parsedSdp.avMedia
-            .filter((m) => m.type === 'video')
-            .map((m) => m.mid);
+        const audioMainMids = midMap.get(MediaType.AudioMain);
+        const videoMainMids = midMap.get(MediaType.VideoMain);
+        const audioContentMids = midMap.get(MediaType.AudioSlides);
+        const videoContentMids = midMap.get(MediaType.VideoSlides);
         parsedSdp.session.groups.splice(0, parsedSdp.session.groups.length);
-        parsedSdp.session.groups.push(new BundleGroupLine(audioMids));
-        parsedSdp.session.groups.push(new BundleGroupLine(videoMids));
+        if (audioMainMids) {
+            parsedSdp.session.groups.push(new BundleGroupLine(audioMainMids));
+        }
+        if (videoMainMids) {
+            parsedSdp.session.groups.push(new BundleGroupLine(videoMainMids));
+        }
+        if (audioContentMids) {
+            parsedSdp.session.groups.push(new BundleGroupLine(audioContentMids));
+        }
+        if (videoContentMids) {
+            parsedSdp.session.groups.push(new BundleGroupLine(videoContentMids));
+        }
     }
 }
 function filterRecvOnlyMlines(parsedSdp) {
@@ -9575,6 +9583,8 @@ class MultistreamConnection extends EventEmitter {
         this.pendingJmpTasks = [];
         this.metricsCallback = () => { };
         this.overuseUpdateCallback = () => { };
+        this.midMap = new Map();
+        this.currentMid = 0;
         this.options = Object.assign(Object.assign({}, defaultMultistreamConnectionOptions), userOptions);
         logger.info(`Creating multistream connection with options ${JSON.stringify(this.options)}`);
         this.initializePeerConnection();
@@ -9593,10 +9603,23 @@ class MultistreamConnection extends EventEmitter {
             this.createSendTransceiver(MediaType.AudioSlides, contentSceneId);
         }
     }
+    addMid(mediaType) {
+        const mid = this.currentMid++;
+        const mids = this.midMap.get(mediaType) || [];
+        mids.push(`${mid}`);
+        this.midMap.set(mediaType, mids);
+    }
+    clearMids() {
+        this.midMap = new Map();
+        this.currentMid = 0;
+    }
     initializePeerConnection() {
         var _a;
         (_a = this.pc) === null || _a === void 0 ? void 0 : _a.close();
-        this.pc = new PeerConnection({ iceServers: this.options.iceServers });
+        this.pc = new PeerConnection({
+            iceServers: this.options.iceServers,
+            bundlePolicy: this.options.bundlePolicy,
+        });
         this.pc.on(PeerConnection.Events.ConnectionStateChange, (state) => this.emit(exports.MultistreamConnectionEventNames.ConnectionStateUpdate, state));
         this.attachMetricsObserver();
         this.createDataChannel();
@@ -9618,6 +9641,7 @@ class MultistreamConnection extends EventEmitter {
             direction: 'sendrecv',
             sendEncodings: sendEncodingsOptions,
         });
+        this.addMid(mediaType);
         const csi = generateCsi(getMediaFamily(mediaType), sceneId);
         this.sendTransceivers.set(mediaType, new SendOnlyTransceiver(rtcTransceiver, csi));
         this.createJmpSession(mediaType);
@@ -9897,6 +9921,7 @@ class MultistreamConnection extends EventEmitter {
             const rtcRtpTransceiver = this.pc.addTransceiver(toMediaStreamTrackKind(mediaType), {
                 direction: 'recvonly',
             });
+            this.addMid(mediaType);
             const recvOnlyTransceiver = new ReceiveOnlyTransceiver(rtcRtpTransceiver, (mid) => {
                 const ingressSignaler = this.streamSignalerManager.getIngressStreamSignaler(mid);
                 if (!ingressSignaler) {
@@ -9960,6 +9985,9 @@ class MultistreamConnection extends EventEmitter {
     }
     createOffer() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.pc.getLocalDescription()) {
+                this.currentMid++;
+            }
             return (this.pc
                 .createOffer()
                 .then((offer) => {
@@ -10019,7 +10047,7 @@ class MultistreamConnection extends EventEmitter {
             }
         });
         if (getBrowserDetails().name !== 'Firefox') {
-            setupBundle(parsed, this.options.bundlePolicy);
+            setupBundle(parsed, this.options.bundlePolicy, this.midMap);
         }
         return parsed.toString();
     }
@@ -10054,7 +10082,7 @@ class MultistreamConnection extends EventEmitter {
         const parsedOffer = parse((_a = this.pc.getLocalDescription()) === null || _a === void 0 ? void 0 : _a.sdp);
         matchMlinesInAnswer(parsedOffer, parsedAnswer, this.streamSignalerManager);
         if (getBrowserDetails().name === 'Firefox') {
-            setupBundle(parsedAnswer, this.options.bundlePolicy);
+            setupBundle(parsedAnswer, this.options.bundlePolicy, this.midMap);
         }
         return parsedAnswer.toString();
     }
@@ -10096,11 +10124,13 @@ class MultistreamConnection extends EventEmitter {
             this.options = Object.assign(Object.assign({}, defaultMultistreamConnectionOptions), userOptions);
         }
         logger.info(`Renewing multistream connection with options ${JSON.stringify(this.options)}`);
+        this.clearMids();
         this.initializePeerConnection();
         this.streamSignalerManager = new StreamSignalerManager(this.options.streamSignalingMode);
         const mainSceneId = generateSceneId();
         this.sendTransceivers.forEach((transceiver, mediaType) => {
             var _a;
+            this.addMid(mediaType);
             transceiver.replaceTransceiver(this.pc.addTransceiver(toMediaStreamTrackKind(mediaType), {
                 direction: 'sendrecv',
                 sendEncodings: getMediaFamily(mediaType) === MediaFamily.Video
@@ -10116,6 +10146,7 @@ class MultistreamConnection extends EventEmitter {
         });
         this.recvTransceivers.forEach((transceivers, mediaType) => {
             transceivers.forEach((t) => {
+                this.addMid(mediaType);
                 t.replaceTransceiver(this.pc.addTransceiver(toMediaStreamTrackKind(mediaType), {
                     direction: 'recvonly',
                 }));