mediasoup-client 3.24.0 → 3.24.3

package/lib/handlers/Chrome74.js

@@ -243,126 +243,145 @@ class Chrome74 extends enhancedEvents_1.EnhancedEventEmitter {
             streams: [this._sendStream],
             sendEncodings: encodings,
         });
-        if (this._forcedRtpExtensions) {
-            ortcUtils.applyForcedRtpExtensions(transceiver, this._forcedRtpExtensions);
-        }
-        if (onRtpSender) {
-            onRtpSender(transceiver.sender);
-        }
-        let offer = await this._pc.createOffer();
-        let localSdpObject = sdpTransform.parse(offer.sdp);
-        if (localSdpObject.extmapAllowMixed) {
-            this._remoteSdp.setSessionExtmapAllowMixed();
-        }
-        const nativeRtpCapabilities = Chrome74.getLocalRtpCapabilities(localSdpObject);
-        const sendExtendedRtpCapabilities = this._getSendExtendedRtpCapabilities(nativeRtpCapabilities);
-        // Generic sending RTP parameters.
-        const sendingRtpParameters = ortc.getSendingRtpParameters(track.kind, sendExtendedRtpCapabilities);
-        // This may throw.
-        sendingRtpParameters.codecs = ortc.reduceCodecs(sendingRtpParameters.codecs, codec);
-        // Generic sending RTP parameters suitable for the SDP remote answer.
-        const sendingRemoteRtpParameters = ortc.getSendingRemoteRtpParameters(track.kind, sendExtendedRtpCapabilities);
-        // This may throw.
-        sendingRemoteRtpParameters.codecs = ortc.reduceCodecs(sendingRemoteRtpParameters.codecs, codec);
-        if (!this._transportReady) {
-            await this.setupTransport({
-                localDtlsRole: this._forcedLocalDtlsRole ?? 'client',
-                localSdpObject,
-            });
-        }
-        // Special case for VP9 with SVC.
-        let hackVp9Svc = false;
-        const layers = (0, scalabilityModes_1.parse)((encodings ?? [{}])[0].scalabilityMode);
-        let offerMediaObject;
-        if (encodings?.length === 1 &&
-            layers.spatialLayers > 1 &&
-            sendingRtpParameters.codecs[0].mimeType.toLowerCase() === 'video/vp9') {
-            logger.debug('send() | enabling legacy simulcast for VP9 SVC');
-            hackVp9Svc = true;
-            localSdpObject = sdpTransform.parse(offer.sdp);
+        try {
+            if (this._forcedRtpExtensions) {
+                ortcUtils.applyForcedRtpExtensions(transceiver, this._forcedRtpExtensions);
+            }
+            if (onRtpSender) {
+                onRtpSender(transceiver.sender);
+            }
+            let offer = await this._pc.createOffer();
+            let localSdpObject = sdpTransform.parse(offer.sdp);
+            if (localSdpObject.extmapAllowMixed) {
+                this._remoteSdp.setSessionExtmapAllowMixed();
+            }
+            const nativeRtpCapabilities = Chrome74.getLocalRtpCapabilities(localSdpObject);
+            const sendExtendedRtpCapabilities = this._getSendExtendedRtpCapabilities(nativeRtpCapabilities);
+            // Generic sending RTP parameters.
+            const sendingRtpParameters = ortc.getSendingRtpParameters(track.kind, sendExtendedRtpCapabilities);
+            // This may throw.
+            sendingRtpParameters.codecs = ortc.reduceCodecs(sendingRtpParameters.codecs, codec);
+            // Generic sending RTP parameters suitable for the SDP remote answer.
+            const sendingRemoteRtpParameters = ortc.getSendingRemoteRtpParameters(track.kind, sendExtendedRtpCapabilities);
+            // This may throw.
+            sendingRemoteRtpParameters.codecs = ortc.reduceCodecs(sendingRemoteRtpParameters.codecs, codec);
+            if (!this._transportReady) {
+                await this.setupTransport({
+                    localDtlsRole: this._forcedLocalDtlsRole ?? 'client',
+                    localSdpObject,
+                });
+            }
+            // Special case for VP9 with SVC.
+            let hackVp9Svc = false;
+            const layers = (0, scalabilityModes_1.parse)((encodings ?? [{}])[0].scalabilityMode);
+            let offerMediaObject;
+            if (encodings?.length === 1 &&
+                layers.spatialLayers > 1 &&
+                sendingRtpParameters.codecs[0].mimeType.toLowerCase() === 'video/vp9') {
+                logger.debug('send() | enabling legacy simulcast for VP9 SVC');
+                hackVp9Svc = true;
+                localSdpObject = sdpTransform.parse(offer.sdp);
+                offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
+                sdpUnifiedPlanUtils.addLegacySimulcast({
+                    offerMediaObject,
+                    numStreams: layers.spatialLayers,
+                });
+                offer = {
+                    type: 'offer',
+                    sdp: sdpTransform.write(localSdpObject),
+                };
+            }
+            logger.debug('send() | calling pc.setLocalDescription() [offer:%o]', offer);
+            await this._pc.setLocalDescription(offer);
+            // We can now get the transceiver.mid.
+            const localId = transceiver.mid;
+            // Set MID.
+            sendingRtpParameters.mid = localId;
+            localSdpObject = sdpTransform.parse(this._pc.localDescription.sdp);
             offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
-            sdpUnifiedPlanUtils.addLegacySimulcast({
+            // Set RTCP CNAME.
+            sendingRtpParameters.rtcp.cname = sdpCommonUtils.getCname({
                 offerMediaObject,
-                numStreams: layers.spatialLayers,
             });
-            offer = {
-                type: 'offer',
-                sdp: sdpTransform.write(localSdpObject),
-            };
-        }
-        logger.debug('send() | calling pc.setLocalDescription() [offer:%o]', offer);
-        await this._pc.setLocalDescription(offer);
-        // We can now get the transceiver.mid.
-        const localId = transceiver.mid;
-        // Set MID.
-        sendingRtpParameters.mid = localId;
-        localSdpObject = sdpTransform.parse(this._pc.localDescription.sdp);
-        offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
-        // Set RTCP CNAME.
-        sendingRtpParameters.rtcp.cname = sdpCommonUtils.getCname({
-            offerMediaObject,
-        });
-        // Set msid.
-        sendingRtpParameters.msid = `${streamId ?? this._sendStream.id} ${track.id}`;
-        // Set RTP encodings by parsing the SDP offer if no encodings are given.
-        if (!encodings) {
-            sendingRtpParameters.encodings = sdpUnifiedPlanUtils.getRtpEncodings({
-                offerMediaObject,
-                codecs: sendingRtpParameters.codecs,
-            });
-        }
-        // Set RTP encodings by parsing the SDP offer and complete them with given
-        // one if just a single encoding has been given.
-        else if (encodings.length === 1) {
-            let newEncodings = sdpUnifiedPlanUtils.getRtpEncodings({
+            // Set msid.
+            sendingRtpParameters.msid = `${streamId ?? this._sendStream.id} ${track.id}`;
+            // Set RTP encodings by parsing the SDP offer if no encodings are given.
+            if (!encodings) {
+                sendingRtpParameters.encodings = sdpUnifiedPlanUtils.getRtpEncodings({
+                    offerMediaObject,
+                    codecs: sendingRtpParameters.codecs,
+                });
+            }
+            // Set RTP encodings by parsing the SDP offer and complete them with given
+            // one if just a single encoding has been given.
+            else if (encodings.length === 1) {
+                let newEncodings = sdpUnifiedPlanUtils.getRtpEncodings({
+                    offerMediaObject,
+                    codecs: sendingRtpParameters.codecs,
+                });
+                Object.assign(newEncodings[0], encodings[0]);
+                // Hack for VP9 SVC.
+                if (hackVp9Svc) {
+                    newEncodings = [newEncodings[0]];
+                }
+                sendingRtpParameters.encodings = newEncodings;
+            }
+            // Otherwise if more than 1 encoding are given use them verbatim.
+            else {
+                sendingRtpParameters.encodings = encodings;
+            }
+            // If VP8 or H264 and there is effective simulcast, add scalabilityMode to
+            // each encoding.
+            if (sendingRtpParameters.encodings.length > 1 &&
+                (sendingRtpParameters.codecs[0].mimeType.toLowerCase() ===
+                    'video/vp8' ||
+                    sendingRtpParameters.codecs[0].mimeType.toLowerCase() ===
+                        'video/h264')) {
+                for (const encoding of sendingRtpParameters.encodings) {
+                    if (encoding.scalabilityMode) {
+                        encoding.scalabilityMode = `L1T${layers.temporalLayers}`;
+                    }
+                    else {
+                        encoding.scalabilityMode = 'L1T3';
+                    }
+                }
+            }
+            this._remoteSdp.send({
                 offerMediaObject,
-                codecs: sendingRtpParameters.codecs,
+                reuseMid: mediaSectionIdx.reuseMid,
+                offerRtpParameters: sendingRtpParameters,
+                answerRtpParameters: sendingRemoteRtpParameters,
+                codecOptions,
             });
-            Object.assign(newEncodings[0], encodings[0]);
-            // Hack for VP9 SVC.
-            if (hackVp9Svc) {
-                newEncodings = [newEncodings[0]];
-            }
-            sendingRtpParameters.encodings = newEncodings;
+            const answer = {
+                type: 'answer',
+                sdp: this._remoteSdp.getSdp(),
+            };
+            logger.debug('send() | calling pc.setRemoteDescription() [answer:%o]', answer);
+            await this._pc.setRemoteDescription(answer);
+            // Store in the map.
+            this._mapMidTransceiver.set(localId, transceiver);
+            return {
+                localId,
+                rtpParameters: sendingRtpParameters,
+                rtpSender: transceiver.sender,
+            };
         }
-        // Otherwise if more than 1 encoding are given use them verbatim.
-        else {
-            sendingRtpParameters.encodings = encodings;
-        }
-        // If VP8 or H264 and there is effective simulcast, add scalabilityMode to
-        // each encoding.
-        if (sendingRtpParameters.encodings.length > 1 &&
-            (sendingRtpParameters.codecs[0].mimeType.toLowerCase() === 'video/vp8' ||
-                sendingRtpParameters.codecs[0].mimeType.toLowerCase() === 'video/h264')) {
-            for (const encoding of sendingRtpParameters.encodings) {
-                if (encoding.scalabilityMode) {
-                    encoding.scalabilityMode = `L1T${layers.temporalLayers}`;
-                }
-                else {
-                    encoding.scalabilityMode = 'L1T3';
+        catch (error) {
+            // Undo the changes done in the PeerConnection, otherwise it gets out of
+            // sync with the remote SDP and later calls to send() fail.
+            try {
+                if (this._pc.signalingState === 'have-local-offer') {
+                    try {
+                        await this._pc.setLocalDescription({ type: 'rollback' });
+                    }
+                    catch (error2) { }
                 }
+                transceiver.stop();
             }
+            catch (error3) { }
+            throw error;
         }
-        this._remoteSdp.send({
-            offerMediaObject,
-            reuseMid: mediaSectionIdx.reuseMid,
-            offerRtpParameters: sendingRtpParameters,
-            answerRtpParameters: sendingRemoteRtpParameters,
-            codecOptions,
-        });
-        const answer = {
-            type: 'answer',
-            sdp: this._remoteSdp.getSdp(),
-        };
-        logger.debug('send() | calling pc.setRemoteDescription() [answer:%o]', answer);
-        await this._pc.setRemoteDescription(answer);
-        // Store in the map.
-        this._mapMidTransceiver.set(localId, transceiver);
-        return {
-            localId,
-            rtpParameters: sendingRtpParameters,
-            rtpSender: transceiver.sender,
-        };
     }
     async stopSending(localId) {
         this.assertSendDirection();
@@ -530,25 +549,43 @@ class Chrome74 extends enhancedEvents_1.EnhancedEventEmitter {
         // If this is the first DataChannel we need to create the SDP answer with
         // m=application section.
         if (!this._hasDataChannelMediaSection) {
-            const offer = await this._pc.createOffer();
-            const localSdpObject = sdpTransform.parse(offer.sdp);
-            const offerMediaObject = localSdpObject.media.find(m => m.type === 'application');
-            if (!this._transportReady) {
-                await this.setupTransport({
-                    localDtlsRole: this._forcedLocalDtlsRole ?? 'client',
-                    localSdpObject,
-                });
+            try {
+                const offer = await this._pc.createOffer();
+                const localSdpObject = sdpTransform.parse(offer.sdp);
+                const offerMediaObject = localSdpObject.media.find(m => m.type === 'application');
+                if (!this._transportReady) {
+                    await this.setupTransport({
+                        localDtlsRole: this._forcedLocalDtlsRole ?? 'client',
+                        localSdpObject,
+                    });
+                }
+                logger.debug('sendDataChannel() | calling pc.setLocalDescription() [offer:%o]', offer);
+                await this._pc.setLocalDescription(offer);
+                this._remoteSdp.sendSctpAssociation({ offerMediaObject });
+                const answer = {
+                    type: 'answer',
+                    sdp: this._remoteSdp.getSdp(),
+                };
+                logger.debug('sendDataChannel() | calling pc.setRemoteDescription() [answer:%o]', answer);
+                await this._pc.setRemoteDescription(answer);
+                this._hasDataChannelMediaSection = true;
+            }
+            catch (error) {
+                // Undo the changes done in the PeerConnection, otherwise it gets out of
+                // sync with the remote SDP and later calls to send() and
+                // sendDataChannel() fail.
+                try {
+                    if (this._pc.signalingState === 'have-local-offer') {
+                        try {
+                            await this._pc.setLocalDescription({ type: 'rollback' });
+                        }
+                        catch (error2) { }
+                    }
+                    dataChannel.close();
+                }
+                catch (error3) { }
+                throw error;
             }
-            logger.debug('sendDataChannel() | calling pc.setLocalDescription() [offer:%o]', offer);
-            await this._pc.setLocalDescription(offer);
-            this._remoteSdp.sendSctpAssociation({ offerMediaObject });
-            const answer = {
-                type: 'answer',
-                sdp: this._remoteSdp.getSdp(),
-            };
-            logger.debug('sendDataChannel() | calling pc.setRemoteDescription() [answer:%o]', answer);
-            await this._pc.setRemoteDescription(answer);
-            this._hasDataChannelMediaSection = true;
         }
         const newSctpStreamParameters = {
             streamId: options.id,

package/lib/handlers/Firefox120.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Firefox120.d.ts","sourceRoot":"","sources":["../../src/handlers/Firefox120.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Firefox120.d.ts","sourceRoot":"","sources":["../../src/handlers/Firefox120.ts"],"names":[],"mappings":"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"}

package/lib/handlers/Firefox120.js

@@ -266,101 +266,120 @@ class Firefox120 extends enhancedEvents_1.EnhancedEventEmitter {
             streams: [this._sendStream],
             sendEncodings: encodings,
         });
-        if (this._forcedRtpExtensions) {
-            ortcUtils.applyForcedRtpExtensions(transceiver, this._forcedRtpExtensions);
-        }
-        if (onRtpSender) {
-            onRtpSender(transceiver.sender);
-        }
-        const offer = await this._pc.createOffer();
-        let localSdpObject = sdpTransform.parse(offer.sdp);
-        if (localSdpObject.extmapAllowMixed) {
-            this._remoteSdp.setSessionExtmapAllowMixed();
-        }
-        const nativeRtpCapabilities = Firefox120.getLocalRtpCapabilities(localSdpObject);
-        const sendExtendedRtpCapabilities = this._getSendExtendedRtpCapabilities(nativeRtpCapabilities);
-        // Generic sending RTP parameters.
-        const sendingRtpParameters = ortc.getSendingRtpParameters(track.kind, sendExtendedRtpCapabilities);
-        // This may throw.
-        sendingRtpParameters.codecs = ortc.reduceCodecs(sendingRtpParameters.codecs, codec);
-        // Generic sending RTP parameters suitable for the SDP remote answer.
-        const sendingRemoteRtpParameters = ortc.getSendingRemoteRtpParameters(track.kind, sendExtendedRtpCapabilities);
-        // This may throw.
-        sendingRemoteRtpParameters.codecs = ortc.reduceCodecs(sendingRemoteRtpParameters.codecs, codec);
-        // In Firefox use DTLS role client even if we are the "offerer" since
-        // Firefox does not respect ICE-Lite.
-        if (!this._transportReady) {
-            await this.setupTransport({ localDtlsRole: 'client', localSdpObject });
-        }
-        const layers = (0, scalabilityModes_1.parse)((encodings ?? [{}])[0].scalabilityMode);
-        logger.debug('send() | calling pc.setLocalDescription() [offer:%o]', offer);
-        await this._pc.setLocalDescription(offer);
-        // We can now get the transceiver.mid.
-        const localId = transceiver.mid;
-        // Set MID.
-        sendingRtpParameters.mid = localId;
-        localSdpObject = sdpTransform.parse(this._pc.localDescription.sdp);
-        const offerMediaObject = localSdpObject.media[localSdpObject.media.length - 1];
-        // Set RTCP CNAME.
-        sendingRtpParameters.rtcp.cname = sdpCommonUtils.getCname({
-            offerMediaObject,
-        });
-        // Set msid.
-        sendingRtpParameters.msid = `${streamId ?? this._sendStream.id} ${track.id}`;
-        // Set RTP encodings by parsing the SDP offer if no encodings are given.
-        if (!encodings) {
-            sendingRtpParameters.encodings = sdpUnifiedPlanUtils.getRtpEncodings({
+        try {
+            if (this._forcedRtpExtensions) {
+                ortcUtils.applyForcedRtpExtensions(transceiver, this._forcedRtpExtensions);
+            }
+            if (onRtpSender) {
+                onRtpSender(transceiver.sender);
+            }
+            const offer = await this._pc.createOffer();
+            let localSdpObject = sdpTransform.parse(offer.sdp);
+            if (localSdpObject.extmapAllowMixed) {
+                this._remoteSdp.setSessionExtmapAllowMixed();
+            }
+            const nativeRtpCapabilities = Firefox120.getLocalRtpCapabilities(localSdpObject);
+            const sendExtendedRtpCapabilities = this._getSendExtendedRtpCapabilities(nativeRtpCapabilities);
+            // Generic sending RTP parameters.
+            const sendingRtpParameters = ortc.getSendingRtpParameters(track.kind, sendExtendedRtpCapabilities);
+            // This may throw.
+            sendingRtpParameters.codecs = ortc.reduceCodecs(sendingRtpParameters.codecs, codec);
+            // Generic sending RTP parameters suitable for the SDP remote answer.
+            const sendingRemoteRtpParameters = ortc.getSendingRemoteRtpParameters(track.kind, sendExtendedRtpCapabilities);
+            // This may throw.
+            sendingRemoteRtpParameters.codecs = ortc.reduceCodecs(sendingRemoteRtpParameters.codecs, codec);
+            // In Firefox use DTLS role client even if we are the "offerer" since
+            // Firefox does not respect ICE-Lite.
+            if (!this._transportReady) {
+                await this.setupTransport({ localDtlsRole: 'client', localSdpObject });
+            }
+            const layers = (0, scalabilityModes_1.parse)((encodings ?? [{}])[0].scalabilityMode);
+            logger.debug('send() | calling pc.setLocalDescription() [offer:%o]', offer);
+            await this._pc.setLocalDescription(offer);
+            // We can now get the transceiver.mid.
+            const localId = transceiver.mid;
+            // Set MID.
+            sendingRtpParameters.mid = localId;
+            localSdpObject = sdpTransform.parse(this._pc.localDescription.sdp);
+            const offerMediaObject = localSdpObject.media[localSdpObject.media.length - 1];
+            // Set RTCP CNAME.
+            sendingRtpParameters.rtcp.cname = sdpCommonUtils.getCname({
                 offerMediaObject,
-                codecs: sendingRtpParameters.codecs,
             });
-        }
-        // Set RTP encodings by parsing the SDP offer and complete them with given
-        // one if just a single encoding has been given.
-        else if (encodings.length === 1) {
-            const newEncodings = sdpUnifiedPlanUtils.getRtpEncodings({
+            // Set msid.
+            sendingRtpParameters.msid = `${streamId ?? this._sendStream.id} ${track.id}`;
+            // Set RTP encodings by parsing the SDP offer if no encodings are given.
+            if (!encodings) {
+                sendingRtpParameters.encodings = sdpUnifiedPlanUtils.getRtpEncodings({
+                    offerMediaObject,
+                    codecs: sendingRtpParameters.codecs,
+                });
+            }
+            // Set RTP encodings by parsing the SDP offer and complete them with given
+            // one if just a single encoding has been given.
+            else if (encodings.length === 1) {
+                const newEncodings = sdpUnifiedPlanUtils.getRtpEncodings({
+                    offerMediaObject,
+                    codecs: sendingRtpParameters.codecs,
+                });
+                Object.assign(newEncodings[0], encodings[0]);
+                sendingRtpParameters.encodings = newEncodings;
+            }
+            // Otherwise if more than 1 encoding are given use them verbatim.
+            else {
+                sendingRtpParameters.encodings = encodings;
+            }
+            // If VP8 or H264 and there is effective simulcast, add scalabilityMode to
+            // each encoding.
+            if (sendingRtpParameters.encodings.length > 1 &&
+                (sendingRtpParameters.codecs[0].mimeType.toLowerCase() ===
+                    'video/vp8' ||
+                    sendingRtpParameters.codecs[0].mimeType.toLowerCase() ===
+                        'video/h264')) {
+                for (const encoding of sendingRtpParameters.encodings) {
+                    if (encoding.scalabilityMode) {
+                        encoding.scalabilityMode = `L1T${layers.temporalLayers}`;
+                    }
+                    else {
+                        encoding.scalabilityMode = 'L1T3';
+                    }
+                }
+            }
+            this._remoteSdp.send({
                 offerMediaObject,
-                codecs: sendingRtpParameters.codecs,
+                offerRtpParameters: sendingRtpParameters,
+                answerRtpParameters: sendingRemoteRtpParameters,
+                codecOptions,
             });
-            Object.assign(newEncodings[0], encodings[0]);
-            sendingRtpParameters.encodings = newEncodings;
+            const answer = {
+                type: 'answer',
+                sdp: this._remoteSdp.getSdp(),
+            };
+            logger.debug('send() | calling pc.setRemoteDescription() [answer:%o]', answer);
+            await this._pc.setRemoteDescription(answer);
+            // Store in the map.
+            this._mapMidTransceiver.set(localId, transceiver);
+            return {
+                localId,
+                rtpParameters: sendingRtpParameters,
+                rtpSender: transceiver.sender,
+            };
         }
-        // Otherwise if more than 1 encoding are given use them verbatim.
-        else {
-            sendingRtpParameters.encodings = encodings;
-        }
-        // If VP8 or H264 and there is effective simulcast, add scalabilityMode to
-        // each encoding.
-        if (sendingRtpParameters.encodings.length > 1 &&
-            (sendingRtpParameters.codecs[0].mimeType.toLowerCase() === 'video/vp8' ||
-                sendingRtpParameters.codecs[0].mimeType.toLowerCase() === 'video/h264')) {
-            for (const encoding of sendingRtpParameters.encodings) {
-                if (encoding.scalabilityMode) {
-                    encoding.scalabilityMode = `L1T${layers.temporalLayers}`;
-                }
-                else {
-                    encoding.scalabilityMode = 'L1T3';
+        catch (error) {
+            // Undo the changes done in the PeerConnection, otherwise it gets out of
+            // sync with the remote SDP and later calls to send() fail.
+            try {
+                if (this._pc.signalingState === 'have-local-offer') {
+                    try {
+                        await this._pc.setLocalDescription({ type: 'rollback' });
+                    }
+                    catch (error2) { }
                 }
+                transceiver.stop();
             }
+            catch (error3) { }
+            throw error;
         }
-        this._remoteSdp.send({
-            offerMediaObject,
-            offerRtpParameters: sendingRtpParameters,
-            answerRtpParameters: sendingRemoteRtpParameters,
-            codecOptions,
-        });
-        const answer = {
-            type: 'answer',
-            sdp: this._remoteSdp.getSdp(),
-        };
-        logger.debug('send() | calling pc.setRemoteDescription() [answer:%o]', answer);
-        await this._pc.setRemoteDescription(answer);
-        // Store in the map.
-        this._mapMidTransceiver.set(localId, transceiver);
-        return {
-            localId,
-            rtpParameters: sendingRtpParameters,
-            rtpSender: transceiver.sender,
-        };
     }
     async stopSending(localId) {
         this.assertSendDirection();
@@ -533,22 +552,43 @@ class Firefox120 extends enhancedEvents_1.EnhancedEventEmitter {
         // If this is the first DataChannel we need to create the SDP answer with
         // m=application section.
         if (!this._hasDataChannelMediaSection) {
-            const offer = await this._pc.createOffer();
-            const localSdpObject = sdpTransform.parse(offer.sdp);
-            const offerMediaObject = localSdpObject.media.find(m => m.type === 'application');
-            if (!this._transportReady) {
-                await this.setupTransport({ localDtlsRole: 'client', localSdpObject });
+            try {
+                const offer = await this._pc.createOffer();
+                const localSdpObject = sdpTransform.parse(offer.sdp);
+                const offerMediaObject = localSdpObject.media.find(m => m.type === 'application');
+                if (!this._transportReady) {
+                    await this.setupTransport({
+                        localDtlsRole: 'client',
+                        localSdpObject,
+                    });
+                }
+                logger.debug('sendDataChannel() | calling pc.setLocalDescription() [offer:%o]', offer);
+                await this._pc.setLocalDescription(offer);
+                this._remoteSdp.sendSctpAssociation({ offerMediaObject });
+                const answer = {
+                    type: 'answer',
+                    sdp: this._remoteSdp.getSdp(),
+                };
+                logger.debug('sendDataChannel() | calling pc.setRemoteDescription() [answer:%o]', answer);
+                await this._pc.setRemoteDescription(answer);
+                this._hasDataChannelMediaSection = true;
+            }
+            catch (error) {
+                // Undo the changes done in the PeerConnection, otherwise it gets out of
+                // sync with the remote SDP and later calls to send() and
+                // sendDataChannel() fail.
+                try {
+                    if (this._pc.signalingState === 'have-local-offer') {
+                        try {
+                            await this._pc.setLocalDescription({ type: 'rollback' });
+                        }
+                        catch (error2) { }
+                    }
+                    dataChannel.close();
+                }
+                catch (error3) { }
+                throw error;
             }
-            logger.debug('sendDataChannel() | calling pc.setLocalDescription() [offer:%o]', offer);
-            await this._pc.setLocalDescription(offer);
-            this._remoteSdp.sendSctpAssociation({ offerMediaObject });
-            const answer = {
-                type: 'answer',
-                sdp: this._remoteSdp.getSdp(),
-            };
-            logger.debug('sendDataChannel() | calling pc.setRemoteDescription() [answer:%o]', answer);
-            await this._pc.setRemoteDescription(answer);
-            this._hasDataChannelMediaSection = true;
         }
         const newSctpStreamParameters = {
             streamId: options.id,

package/lib/handlers/ReactNative106.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNative106.d.ts","sourceRoot":"","sources":["../../src/handlers/ReactNative106.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ReactNative106.d.ts","sourceRoot":"","sources":["../../src/handlers/ReactNative106.ts"],"names":[],"mappings":"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"}