@webex/web-client-media-engine 1.37.1 → 1.37.3

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) {
@@ -8883,6 +8891,18 @@ class SendOnlyTransceiver extends Transceiver {
             }
         });
     }
+    replaceTransceiver(newRtcRtpTransceiver) {
+        const _super = Object.create(null, {
+            replaceTransceiver: { get: () => super.replaceTransceiver }
+        });
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            _super.replaceTransceiver.call(this, newRtcRtpTransceiver);
+            if (this.requested) {
+                yield this.sender.replaceTrack(((_a = this.publishedTrack) === null || _a === void 0 ? void 0 : _a.underlyingTrack) || null);
+            }
+        });
+    }
     replacePublishedTrack(newTrack) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -9575,6 +9595,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,6 +9615,16 @@ 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();
@@ -9621,6 +9653,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);
@@ -9825,29 +9858,39 @@ class MultistreamConnection extends EventEmitter {
         }
     }
     publishTrack(track) {
-        let mediaContent;
-        if (track instanceof LocalDisplayTrack && this.options.floorControlledPresentation) {
-            mediaContent = MediaContent.Slides;
-        }
-        else {
-            mediaContent = MediaContent.Main;
-        }
-        const mediaFamily = toMediaFamily(track.kind);
-        const mediaType = getMediaType(mediaFamily, mediaContent);
-        this.addTrackListeners(mediaType, track);
-        return this.getSendTransceiverOrThrow(mediaType).publishTrack(track);
+        return __awaiter(this, void 0, void 0, function* () {
+            let mediaContent;
+            if (track instanceof LocalDisplayTrack && this.options.floorControlledPresentation) {
+                mediaContent = MediaContent.Slides;
+            }
+            else {
+                mediaContent = MediaContent.Main;
+            }
+            const mediaFamily = toMediaFamily(track.kind);
+            const mediaType = getMediaType(mediaFamily, mediaContent);
+            const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
+            if (track === sendTransceiver.publishedTrack) {
+                logger.warn(`This track has already been published on the transceiver.`);
+                return Promise.resolve();
+            }
+            this.addTrackListeners(mediaType, track);
+            return sendTransceiver.publishTrack(track);
+        });
     }
     unpublishTrack(track) {
-        let mediaContent;
-        if (track instanceof LocalDisplayTrack && this.options.floorControlledPresentation) {
-            mediaContent = MediaContent.Slides;
-        }
-        else {
-            mediaContent = MediaContent.Main;
-        }
-        const mediaFamily = toMediaFamily(track.kind);
-        const mediaType = getMediaType(mediaFamily, mediaContent);
-        return this.getSendTransceiverOrThrow(mediaType).unpublishTrack();
+        return __awaiter(this, void 0, void 0, function* () {
+            let mediaContent;
+            if (track instanceof LocalDisplayTrack && this.options.floorControlledPresentation) {
+                mediaContent = MediaContent.Slides;
+            }
+            else {
+                mediaContent = MediaContent.Main;
+            }
+            const mediaFamily = toMediaFamily(track.kind);
+            const mediaType = getMediaType(mediaFamily, mediaContent);
+            const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
+            return sendTransceiver.unpublishTrack();
+        });
     }
     addTrackListeners(mediaType, track) {
         const onTrackMute = (event) => {
@@ -9900,6 +9943,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) {
@@ -9963,6 +10007,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) => {
@@ -10022,7 +10069,7 @@ class MultistreamConnection extends EventEmitter {
             }
         });
         if (getBrowserDetails().name !== 'Firefox') {
-            setupBundle(parsed, this.options.bundlePolicy);
+            setupBundle(parsed, this.options.bundlePolicy, this.midMap);
         }
         return parsed.toString();
     }
@@ -10057,7 +10104,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();
     }
@@ -10099,26 +10146,26 @@ 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
                     ? this.getVideoEncodingOptions()
                     : undefined,
             }));
-            if (transceiver.publishedTrack) {
-                transceiver.publishTrack(transceiver.publishedTrack);
-            }
             transceiver.csi = generateCsi(getMediaFamily(mediaType), mainSceneId);
             (_a = this.jmpSessions.get(mediaType)) === null || _a === void 0 ? void 0 : _a.close();
             this.createJmpSession(mediaType);
         });
         this.recvTransceivers.forEach((transceivers, mediaType) => {
             transceivers.forEach((t) => {
+                this.addMid(mediaType);
                 t.replaceTransceiver(this.pc.addTransceiver(toMediaStreamTrackKind(mediaType), {
                     direction: 'recvonly',
                 }));