@webex/web-client-media-engine 2.0.3 → 2.0.5

package/dist/cjs/index.js

@@ -5134,41 +5134,6 @@ class PeerConnection extends EventEmitter$2 {
 }
 PeerConnection.Events = PeerConnectionEvents;
 
-/**
- * Wait until the given peer connection has finished gathering ICE candidates and, when it has,
- * return the local description with the candidates.
- *
- * @param peerConnection - The PeerConnection to use.
- * @returns A Promise that resolves with the local description with the ICE candidates in it.
- */
-function getLocalDescriptionWithIceCandidates(peerConnection) {
-    return new Promise((resolve, reject) => {
-        /**
-         * A helper method to retrieve the local description and resolve, if one is found, or reject
-         * with an error if it's not.
-         */
-        const getLocalDescAndResolve = () => {
-            const localDesc = peerConnection.getLocalDescription();
-            if (localDesc) {
-                resolve(localDesc);
-            }
-            else {
-                reject(new Error('Local description was null'));
-            }
-        };
-        peerConnection.on(PeerConnection.Events.IceGatheringStateChange, (e) => {
-            if (e.target.iceGatheringState === 'complete') {
-                getLocalDescAndResolve();
-            }
-            // TODO(brian): throw an error if we see an error iceGatheringState
-        });
-        // It's possible ICE gathering is already done
-        if (peerConnection.iceGatheringState === 'complete') {
-            getLocalDescAndResolve();
-        }
-    });
-}
-
 exports.MediaCodecMimeType = void 0;
 (function (MediaCodecMimeType) {
     MediaCodecMimeType["H264"] = "video/H264";
@@ -9007,6 +8972,59 @@ class ReceiveOnlyTransceiver extends Transceiver {
 }
 ReceiveOnlyTransceiver.rid = '1';
 
+function deepCopy(source) {
+    return Array.isArray(source)
+        ? source.map((item) => deepCopy(item))
+        : source instanceof Map
+            ? new Map(source)
+            : source instanceof Date
+                ? new Date(source.getTime())
+                : source && typeof source === 'object'
+                    ? Object.getOwnPropertyNames(source).reduce((o, prop) => {
+                        Object.defineProperty(o, prop, Object.getOwnPropertyDescriptor(source, prop));
+                        o[prop] = deepCopy(source[prop]);
+                        return o;
+                    }, Object.create(Object.getPrototypeOf(source)))
+                    : source;
+}
+
+function matchMlinesInAnswer(parsedOffer, parsedAnswer, streamSignalerManager) {
+    parsedAnswer.session.groups = parsedOffer.session.groups;
+    parsedAnswer.media = parsedOffer.media.map((offerMline) => {
+        if (!offerMline.mid) {
+            throw new Error(`Offer mline is missing MID`);
+        }
+        const answerMline = parsedAnswer.media.find((m) => m.mid === offerMline.mid);
+        if (answerMline) {
+            if (answerMline instanceof AvMediaDescription) {
+                [...answerMline.codecs.values()].forEach((ci) => {
+                    ci.fmtParams.set('x-google-start-bitrate', '60000');
+                });
+            }
+            return answerMline;
+        }
+        if (!(offerMline instanceof AvMediaDescription)) {
+            throw new Error(`Answer is missing a non-media mline: ${offerMline.mid}`);
+        }
+        const startingMline = parsedAnswer.avMedia.find((m) => m.type === offerMline.type);
+        if (!startingMline) {
+            throw new Error(`Answer has no mline of type ${offerMline.type}, can't generate synthetic answer mline for mid ${offerMline.mid}`);
+        }
+        const fakeCorrespondingMline = deepCopy(startingMline);
+        fakeCorrespondingMline.mid = offerMline.mid;
+        fakeCorrespondingMline.simulcast = undefined;
+        if (offerMline.direction === 'sendrecv' || offerMline.direction === 'sendonly') {
+            fakeCorrespondingMline.direction = 'recvonly';
+        }
+        if (offerMline.direction === 'recvonly') {
+            fakeCorrespondingMline.direction = 'sendonly';
+            const ingressSignaler = streamSignalerManager.getIngressStreamSignalerOrThrow(offerMline.mid);
+            ingressSignaler.signalRemoteStreams(fakeCorrespondingMline);
+        }
+        return fakeCorrespondingMline;
+    });
+}
+
 class JmpLine extends Line {
     constructor(versions) {
         super();
@@ -9071,22 +9089,6 @@ DefaultSdpGrammar.addParser('a', JmpLine.fromSdpLine);
 DefaultSdpGrammar.addParser('a', JmpSourceLine.fromSdpLine);
 DefaultSdpGrammar.addParser('a', JmpStreamIdModeLine.fromSdpLine);
 
-function deepCopy(source) {
-    return Array.isArray(source)
-        ? source.map((item) => deepCopy(item))
-        : source instanceof Map
-            ? new Map(source)
-            : source instanceof Date
-                ? new Date(source.getTime())
-                : source && typeof source === 'object'
-                    ? Object.getOwnPropertyNames(source).reduce((o, prop) => {
-                        Object.defineProperty(o, prop, Object.getOwnPropertyDescriptor(source, prop));
-                        o[prop] = deepCopy(source[prop]);
-                        return o;
-                    }, Object.create(Object.getPrototypeOf(source)))
-                    : source;
-}
-
 function getMediaTypeForMline(mLine) {
     var _a, _b;
     let mediaFamily;
@@ -9156,42 +9158,6 @@ function filterRecvOnlyMlines(parsedSdp) {
         g.mids = g.mids.filter((m) => filteredMids.includes(m));
     });
 }
-function matchMlinesInAnswer(parsedOffer, parsedAnswer, streamSignalerManager) {
-    parsedAnswer.session.groups = parsedOffer.session.groups;
-    parsedAnswer.media = parsedOffer.media.map((offerMline) => {
-        if (!offerMline.mid) {
-            throw new Error(`Offer mline is missing MID`);
-        }
-        const answerMline = parsedAnswer.media.find((m) => m.mid === offerMline.mid);
-        if (answerMline) {
-            if (answerMline instanceof AvMediaDescription) {
-                [...answerMline.codecs.values()].forEach((ci) => {
-                    ci.fmtParams.set('x-google-start-bitrate', '60000');
-                });
-            }
-            return answerMline;
-        }
-        if (!(offerMline instanceof AvMediaDescription)) {
-            throw new Error(`Answer is missing a non-media mline: ${offerMline.mid}`);
-        }
-        const startingMline = parsedAnswer.avMedia.find((m) => m.type === offerMline.type);
-        if (!startingMline) {
-            throw new Error(`Answer has no mline of type ${offerMline.type}, can't generate synthetic answer mline for mid ${offerMline.mid}`);
-        }
-        const fakeCorrespondingMline = deepCopy(startingMline);
-        fakeCorrespondingMline.mid = offerMline.mid;
-        fakeCorrespondingMline.simulcast = undefined;
-        if (offerMline.direction === 'sendrecv' || offerMline.direction === 'sendonly') {
-            fakeCorrespondingMline.direction = 'recvonly';
-        }
-        if (offerMline.direction === 'recvonly') {
-            fakeCorrespondingMline.direction = 'sendonly';
-            const ingressSignaler = streamSignalerManager.getIngressStreamSignalerOrThrow(offerMline.mid);
-            ingressSignaler.signalRemoteStreams(fakeCorrespondingMline);
-        }
-        return fakeCorrespondingMline;
-    });
-}
 function injectContentTypes(sdp, contentTypeMap) {
     contentTypeMap.forEach((mediaContent, mid) => {
         const mline = sdp.media.find((m) => m.mid === mid);
@@ -9223,8 +9189,23 @@ function injectJmpAttributes(parsedSdp, csiMap, streamSignalingMode) {
         }
     });
 }
+function injectDummyCandidates(parsedSdp) {
+    parsedSdp.media.forEach((mLine) => {
+        if (mLine.iceInfo.candidates.length === 0) {
+            mLine.addLine(new CandidateLine('dummy', 1, 'udp', 1, '0.0.0.0', 1, 'host'));
+        }
+    });
+}
 function hasSimulcast(av) {
     return !!av.simulcast || av.ssrcGroups.map((sg) => sg.semantics).some((sem) => sem === 'SIM');
+}
+function addVlaExtension(mLine) {
+    const vlaUri = 'http://www.webrtc.org/experiments/rtp-hdrext/video-layers-allocation00';
+    if (mLine.extMaps.findIndex((extMapLine) => extMapLine.uri === vlaUri) === -1) {
+        const maxIdValue = Math.max(...mLine.extMaps.map((extMapLine) => extMapLine.id), 0);
+        const videoLayersAllocationLine = new ExtMapLine(maxIdValue + 1, vlaUri, undefined);
+        mLine.extMaps.push(videoLayersAllocationLine);
+    }
 }
 
 class SendOnlyTransceiver extends Transceiver {
@@ -9386,6 +9367,7 @@ class RidEgressStreamSignaler {
         if (simulcastEnabled) {
             mLine.rids = this.streamIds.map((streamId, index) => new RidLine(streamId.rid, 'send', `max-fs=${simulcastMaxFrameSizes[index]}`));
             mLine.simulcast = new SimulcastLine(SimulcastLayerList.fromString('low;medium;high'), new SimulcastLayerList());
+            addVlaExtension(mLine);
         }
     }
     getSenderIds() {
@@ -9492,6 +9474,7 @@ class SsrcEgressStreamSignaler {
         });
         if (simulcastEnabled) {
             mLine.addLine(new SsrcGroupLine('SIM', this.streamIds.map((streamId) => streamId.ssrc)));
+            addVlaExtension(mLine);
         }
     }
     getSenderIds() {
@@ -13233,7 +13216,7 @@ class MultistreamConnection extends EventEmitter {
         (_a = this.pc) === null || _a === void 0 ? void 0 : _a.close();
         this.pc = new PeerConnection({
             iceServers: this.options.iceServers,
-            bundlePolicy: getBrowserDetails().name === 'Firefox' ? 'max-compat' : this.options.bundlePolicy,
+            bundlePolicy: this.options.bundlePolicy,
         });
         this.pc.on(PeerConnection.Events.ConnectionStateChange, (state) => this.emit(exports.MultistreamConnectionEventNames.ConnectionStateUpdate, state));
         this.attachMetricsObserver();
@@ -13617,6 +13600,7 @@ class MultistreamConnection extends EventEmitter {
             }
             return new Promise((createOfferResolve) => {
                 this.offerAnswerQueue.push(() => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
                     if (this.setAnswerResolve !== undefined) {
                         throw new Error(`Tried to start a new createOffer flow before the old one had finished`);
                     }
@@ -13629,12 +13613,8 @@ class MultistreamConnection extends EventEmitter {
                     }
                     offer.sdp = this.preProcessLocalOffer(offer.sdp);
                     yield this.pc.setLocalDescription(offer);
-                    const offerWithCandidates = yield getLocalDescriptionWithIceCandidates(this.pc);
-                    const sdpToSend = this.prepareLocalOfferForRemoteServer(offerWithCandidates.sdp);
-                    createOfferResolve({
-                        sdp: sdpToSend,
-                        type: offerWithCandidates.type,
-                    });
+                    const sdpToSend = this.prepareLocalOfferForRemoteServer((_a = this.pc.getLocalDescription()) === null || _a === void 0 ? void 0 : _a.sdp);
+                    createOfferResolve({ type: 'offer', sdp: sdpToSend });
                     yield setAnswerPromise;
                 }));
             });
@@ -13743,6 +13723,7 @@ class MultistreamConnection extends EventEmitter {
         });
         injectJmpAttributes(parsed, csiMap, this.options.streamSignalingMode);
         filterRecvOnlyMlines(parsed);
+        injectDummyCandidates(parsed);
         parsed.avMedia
             .filter((av) => av.direction === 'sendrecv' && av.type === 'video')
             .forEach((av) => {
@@ -13755,6 +13736,13 @@ class MultistreamConnection extends EventEmitter {
         });
         if (getBrowserDetails().name === 'Firefox') {
             setupBundle(parsed, this.options.bundlePolicy, this.midMap);
+            if (this.options.bundlePolicy === 'max-bundle') {
+                parsed.media.forEach((mline, index) => {
+                    if (index > 0) {
+                        mline.port = parsed.media[0].port;
+                    }
+                });
+            }
         }
         return parsed.toString();
     }
@@ -13765,6 +13753,15 @@ class MultistreamConnection extends EventEmitter {
         matchMlinesInAnswer(parsedOffer, parsedAnswer, this.streamSignalerManager);
         if (getBrowserDetails().name === 'Firefox') {
             setupBundle(parsedAnswer, this.options.bundlePolicy, this.midMap);
+            if (this.options.bundlePolicy === 'max-bundle') {
+                const { ufrag, pwd } = parsedAnswer.media[0].iceInfo;
+                parsedAnswer.media.forEach((mline, index) => {
+                    if (index > 0) {
+                        mline.iceInfo.ufrag = ufrag;
+                        mline.iceInfo.pwd = pwd;
+                    }
+                });
+            }
         }
         return parsedAnswer.toString();
     }