mediasoup-client 3.13.0 → 3.14.0

package/lib/handlers/Safari12.js

@@ -5,13 +5,13 @@ const sdpTransform = require("sdp-transform");
 const Logger_1 = require("../Logger");
 const utils = require("../utils");
 const ortc = require("../ortc");
-const sdpCommonUtils = require("./sdp/commonUtils");
-const sdpUnifiedPlanUtils = require("./sdp/unifiedPlanUtils");
-const ortcUtils = require("./ortc/utils");
 const errors_1 = require("../errors");
+const scalabilityModes_1 = require("../scalabilityModes");
 const HandlerInterface_1 = require("./HandlerInterface");
 const RemoteSdp_1 = require("./sdp/RemoteSdp");
-const scalabilityModes_1 = require("../scalabilityModes");
+const sdpCommonUtils = require("./sdp/commonUtils");
+const sdpUnifiedPlanUtils = require("./sdp/unifiedPlanUtils");
+const ortcUtils = require("./ortc/utils");
 const logger = new Logger_1.Logger('Safari12');
 const NAME = 'Safari12';
 const SCTP_NUM_STREAMS = { OS: 1024, MIS: 1024 };
@@ -46,70 +46,52 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
      * Creates a factory function.
      */
     static createFactory() {
-        return () => new Safari12();
-    }
-    constructor() {
-        super();
-    }
-    get name() {
-        return NAME;
-    }
-    close() {
-        logger.debug('close()');
-        if (this._closed) {
-            return;
-        }
-        this._closed = true;
-        // Close RTCPeerConnection.
-        if (this._pc) {
-            try {
-                this._pc.close();
-            }
-            catch (error) { }
-        }
-        this.emit('@close');
-    }
-    async getNativeRtpCapabilities() {
-        logger.debug('getNativeRtpCapabilities()');
-        const pc = new RTCPeerConnection({
-            iceServers: [],
-            iceTransportPolicy: 'all',
-            bundlePolicy: 'max-bundle',
-            rtcpMuxPolicy: 'require',
-        });
-        try {
-            pc.addTransceiver('audio');
-            pc.addTransceiver('video');
-            const offer = await pc.createOffer();
-            try {
-                pc.close();
-            }
-            catch (error) { }
-            const sdpObject = sdpTransform.parse(offer.sdp);
-            const nativeRtpCapabilities = sdpCommonUtils.extractRtpCapabilities({
-                sdpObject,
-            });
-            // libwebrtc supports NACK for OPUS but doesn't announce it.
-            ortcUtils.addNackSupportForOpus(nativeRtpCapabilities);
-            return nativeRtpCapabilities;
-        }
-        catch (error) {
-            try {
-                pc.close();
-            }
-            catch (error2) { }
-            throw error;
-        }
-    }
-    async getNativeSctpCapabilities() {
-        logger.debug('getNativeSctpCapabilities()');
         return {
-            numStreams: SCTP_NUM_STREAMS,
+            name: NAME,
+            factory: (options) => new Safari12(options),
+            getNativeRtpCapabilities: async () => {
+                logger.debug('getNativeRtpCapabilities()');
+                const pc = new RTCPeerConnection({
+                    iceServers: [],
+                    iceTransportPolicy: 'all',
+                    bundlePolicy: 'max-bundle',
+                    rtcpMuxPolicy: 'require',
+                });
+                try {
+                    pc.addTransceiver('audio');
+                    pc.addTransceiver('video');
+                    const offer = await pc.createOffer();
+                    try {
+                        pc.close();
+                    }
+                    catch (error) { }
+                    const sdpObject = sdpTransform.parse(offer.sdp);
+                    const nativeRtpCapabilities = sdpCommonUtils.extractRtpCapabilities({
+                        sdpObject,
+                    });
+                    // libwebrtc supports NACK for OPUS but doesn't announce it.
+                    ortcUtils.addNackSupportForOpus(nativeRtpCapabilities);
+                    return nativeRtpCapabilities;
+                }
+                catch (error) {
+                    try {
+                        pc.close();
+                    }
+                    catch (error2) { }
+                    throw error;
+                }
+            },
+            getNativeSctpCapabilities: async () => {
+                logger.debug('getNativeSctpCapabilities()');
+                return {
+                    numStreams: SCTP_NUM_STREAMS,
+                };
+            },
         };
     }
-    run({ direction, iceParameters, iceCandidates, dtlsParameters, sctpParameters, iceServers, iceTransportPolicy, additionalSettings, proprietaryConstraints, extendedRtpCapabilities, }) {
-        this.assertNotClosed();
-        logger.debug('run()');
+    constructor({ direction, iceParameters, iceCandidates, dtlsParameters, sctpParameters, iceServers, iceTransportPolicy, additionalSettings, extendedRtpCapabilities, }) {
+        super();
+        logger.debug('constructor()');
         this._direction = direction;
         this._remoteSdp = new RemoteSdp_1.RemoteSdp({
             iceParameters,
@@ -135,7 +117,7 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
             bundlePolicy: 'max-bundle',
             rtcpMuxPolicy: 'require',
             ...additionalSettings,
-        }, proprietaryConstraints);
+        });
         this._pc.addEventListener('icegatheringstatechange', () => {
             this.emit('@icegatheringstatechange', this._pc.iceGatheringState);
         });
@@ -176,6 +158,24 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
             });
         }
     }
+    get name() {
+        return NAME;
+    }
+    close() {
+        logger.debug('close()');
+        if (this._closed) {
+            return;
+        }
+        this._closed = true;
+        // Close RTCPeerConnection.
+        if (this._pc) {
+            try {
+                this._pc.close();
+            }
+            catch (error) { }
+        }
+        this.emit('@close');
+    }
     async updateIceServers(iceServers) {
         this.assertNotClosed();
         logger.debug('updateIceServers()');
@@ -195,12 +195,18 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
             const offer = await this._pc.createOffer({ iceRestart: true });
             logger.debug('restartIce() | calling pc.setLocalDescription() [offer:%o]', offer);
             await this._pc.setLocalDescription(offer);
-            const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() };
+            const answer = {
+                type: 'answer',
+                sdp: this._remoteSdp.getSdp(),
+            };
             logger.debug('restartIce() | calling pc.setRemoteDescription() [answer:%o]', answer);
             await this._pc.setRemoteDescription(answer);
         }
         else {
-            const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() };
+            const offer = {
+                type: 'offer',
+                sdp: this._remoteSdp.getSdp(),
+            };
             logger.debug('restartIce() | calling pc.setRemoteDescription() [offer:%o]', offer);
             await this._pc.setRemoteDescription(offer);
             const answer = await this._pc.createAnswer();
@@ -232,8 +238,6 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
         }
         let offer = await this._pc.createOffer();
         let localSdpObject = sdpTransform.parse(offer.sdp);
-        // @ts-expect-error --- sdpTransform.SessionDescription type doesn't
-        // define extmapAllowMixed field.
         if (localSdpObject.extmapAllowMixed) {
             this._remoteSdp.setSessionExtmapAllowMixed();
         }
@@ -253,7 +257,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
                 offerMediaObject,
                 numStreams: encodings.length,
             });
-            offer = { type: 'offer', sdp: sdpTransform.write(localSdpObject) };
+            offer = {
+                type: 'offer',
+                sdp: sdpTransform.write(localSdpObject),
+            };
         }
         logger.debug('send() | calling pc.setLocalDescription() [offer:%o]', offer);
         await this._pc.setLocalDescription(offer);
@@ -300,7 +307,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
             answerRtpParameters: sendingRemoteRtpParameters,
             codecOptions,
         });
-        const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() };
+        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.
@@ -333,7 +343,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
         const offer = await this._pc.createOffer();
         logger.debug('stopSending() | calling pc.setLocalDescription() [offer:%o]', offer);
         await this._pc.setLocalDescription(offer);
-        const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() };
+        const answer = {
+            type: 'answer',
+            sdp: this._remoteSdp.getSdp(),
+        };
         logger.debug('stopSending() | calling pc.setRemoteDescription() [answer:%o]', answer);
         await this._pc.setRemoteDescription(answer);
         this._mapMidTransceiver.delete(localId);
@@ -351,7 +364,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
         const offer = await this._pc.createOffer();
         logger.debug('pauseSending() | calling pc.setLocalDescription() [offer:%o]', offer);
         await this._pc.setLocalDescription(offer);
-        const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() };
+        const answer = {
+            type: 'answer',
+            sdp: this._remoteSdp.getSdp(),
+        };
         logger.debug('pauseSending() | calling pc.setRemoteDescription() [answer:%o]', answer);
         await this._pc.setRemoteDescription(answer);
     }
@@ -368,7 +384,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
         const offer = await this._pc.createOffer();
         logger.debug('resumeSending() | calling pc.setLocalDescription() [offer:%o]', offer);
         await this._pc.setLocalDescription(offer);
-        const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() };
+        const answer = {
+            type: 'answer',
+            sdp: this._remoteSdp.getSdp(),
+        };
         logger.debug('resumeSending() | calling pc.setRemoteDescription() [answer:%o]', answer);
         await this._pc.setRemoteDescription(answer);
     }
@@ -409,7 +428,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
         const offer = await this._pc.createOffer();
         logger.debug('setMaxSpatialLayer() | calling pc.setLocalDescription() [offer:%o]', offer);
         await this._pc.setLocalDescription(offer);
-        const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() };
+        const answer = {
+            type: 'answer',
+            sdp: this._remoteSdp.getSdp(),
+        };
         logger.debug('setMaxSpatialLayer() | calling pc.setRemoteDescription() [answer:%o]', answer);
         await this._pc.setRemoteDescription(answer);
     }
@@ -430,7 +452,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
         const offer = await this._pc.createOffer();
         logger.debug('setRtpEncodingParameters() | calling pc.setLocalDescription() [offer:%o]', offer);
         await this._pc.setLocalDescription(offer);
-        const answer = { type: 'answer', sdp: this._remoteSdp.getSdp() };
+        const answer = {
+            type: 'answer',
+            sdp: this._remoteSdp.getSdp(),
+        };
         logger.debug('setRtpEncodingParameters() | calling pc.setRemoteDescription() [answer:%o]', answer);
         await this._pc.setRemoteDescription(answer);
     }
@@ -464,7 +489,7 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
         if (!this._hasDataChannelMediaSection) {
             const offer = await this._pc.createOffer();
             const localSdpObject = sdpTransform.parse(offer.sdp);
-            const offerMediaObject = localSdpObject.media.find((m) => m.type === 'application');
+            const offerMediaObject = localSdpObject.media.find(m => m.type === 'application');
             if (!this._transportReady) {
                 await this.setupTransport({
                     localDtlsRole: this._forcedLocalDtlsRole ?? 'client',
@@ -474,7 +499,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
             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() };
+            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;
@@ -505,7 +533,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
                 trackId,
             });
         }
-        const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() };
+        const offer = {
+            type: 'offer',
+            sdp: this._remoteSdp.getSdp(),
+        };
         logger.debug('receive() | calling pc.setRemoteDescription() [offer:%o]', offer);
         await this._pc.setRemoteDescription(offer);
         for (const options of optionsList) {
@@ -526,7 +557,7 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
         for (const options of optionsList) {
             const { trackId, rtpParameters } = options;
             const localId = mapLocalId.get(trackId);
-            const answerMediaObject = localSdpObject.media.find((m) => String(m.mid) === localId);
+            const answerMediaObject = localSdpObject.media.find(m => String(m.mid) === localId);
             // May need to modify codec parameters in the answer based on codec
             // parameters in the offer.
             sdpCommonUtils.applyCodecParameters({
@@ -534,7 +565,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
                 answerMediaObject,
             });
         }
-        answer = { type: 'answer', sdp: sdpTransform.write(localSdpObject) };
+        answer = {
+            type: 'answer',
+            sdp: sdpTransform.write(localSdpObject),
+        };
         if (!this._transportReady) {
             await this.setupTransport({
                 localDtlsRole: this._forcedLocalDtlsRole ?? 'client',
@@ -575,7 +609,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
             }
             this._remoteSdp.closeMediaSection(transceiver.mid);
         }
-        const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() };
+        const offer = {
+            type: 'offer',
+            sdp: this._remoteSdp.getSdp(),
+        };
         logger.debug('stopReceiving() | calling pc.setRemoteDescription() [offer:%o]', offer);
         await this._pc.setRemoteDescription(offer);
         const answer = await this._pc.createAnswer();
@@ -597,7 +634,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
             transceiver.direction = 'inactive';
             this._remoteSdp.pauseMediaSection(localId);
         }
-        const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() };
+        const offer = {
+            type: 'offer',
+            sdp: this._remoteSdp.getSdp(),
+        };
         logger.debug('pauseReceiving() | calling pc.setRemoteDescription() [offer:%o]', offer);
         await this._pc.setRemoteDescription(offer);
         const answer = await this._pc.createAnswer();
@@ -616,7 +656,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
             transceiver.direction = 'recvonly';
             this._remoteSdp.resumeReceivingMediaSection(localId);
         }
-        const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() };
+        const offer = {
+            type: 'offer',
+            sdp: this._remoteSdp.getSdp(),
+        };
         logger.debug('resumeReceiving() | calling pc.setRemoteDescription() [offer:%o]', offer);
         await this._pc.setRemoteDescription(offer);
         const answer = await this._pc.createAnswer();
@@ -650,7 +693,10 @@ class Safari12 extends HandlerInterface_1.HandlerInterface {
         // m=application section.
         if (!this._hasDataChannelMediaSection) {
             this._remoteSdp.receiveSctpAssociation();
-            const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() };
+            const offer = {
+                type: 'offer',
+                sdp: this._remoteSdp.getSdp(),
+            };
             logger.debug('receiveDataChannel() | calling pc.setRemoteDescription() [offer:%o]', offer);
             await this._pc.setRemoteDescription(offer);
             const answer = await this._pc.createAnswer();

package/lib/handlers/sdp/MediaSection.d.ts

@@ -1,9 +1,10 @@
+import type * as SdpTransform from 'sdp-transform';
 import type { IceParameters, IceCandidate, DtlsParameters, DtlsRole, PlainRtpParameters } from '../../Transport';
 import type { ProducerCodecOptions } from '../../Producer';
 import type { MediaKind, RtpParameters } from '../../RtpParameters';
 import type { SctpParameters } from '../../SctpParameters';
 export declare abstract class MediaSection {
-    protected readonly _mediaObject: any;
+    protected readonly _mediaObject: SdpTransform.MediaDescription;
     constructor({ iceParameters, iceCandidates, dtlsParameters, }: {
         iceParameters?: IceParameters;
         iceCandidates?: IceCandidate[];
@@ -12,7 +13,7 @@ export declare abstract class MediaSection {
     abstract setDtlsRole(role: DtlsRole): void;
     get mid(): string;
     get closed(): boolean;
-    getObject(): object;
+    getObject(): SdpTransform.MediaDescription;
     setIceParameters(iceParameters: IceParameters): void;
     pause(): void;
     abstract resume(): void;
@@ -26,7 +27,7 @@ export declare class AnswerMediaSection extends MediaSection {
         dtlsParameters?: DtlsParameters;
         sctpParameters?: SctpParameters;
         plainRtpParameters?: PlainRtpParameters;
-        offerMediaObject: any;
+        offerMediaObject: SdpTransform.MediaDescription;
         offerRtpParameters?: RtpParameters;
         answerRtpParameters?: RtpParameters;
         codecOptions?: ProducerCodecOptions;
@@ -36,7 +37,7 @@ export declare class AnswerMediaSection extends MediaSection {
     muxSimulcastStreams(encodings: RTCRtpEncodingParameters[]): void;
 }
 export declare class OfferMediaSection extends MediaSection {
-    constructor({ iceParameters, iceCandidates, dtlsParameters, sctpParameters, plainRtpParameters, mid, kind, offerRtpParameters, streamId, trackId, oldDataChannelSpec, }: {
+    constructor({ iceParameters, iceCandidates, dtlsParameters, sctpParameters, plainRtpParameters, mid, kind, offerRtpParameters, streamId, trackId, }: {
         iceParameters?: IceParameters;
         iceCandidates?: IceCandidate[];
         dtlsParameters?: DtlsParameters;
@@ -47,7 +48,6 @@ export declare class OfferMediaSection extends MediaSection {
         offerRtpParameters?: RtpParameters;
         streamId?: string;
         trackId?: string;
-        oldDataChannelSpec?: boolean;
     });
     setDtlsRole(role: DtlsRole): void;
     resume(): void;

package/lib/handlers/sdp/MediaSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MediaSection.d.ts","sourceRoot":"","sources":["../../../src/handlers/sdp/MediaSection.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACX,aAAa,EACb,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,kBAAkB,EAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,KAAK,EACX,SAAS,EACT,aAAa,EAIb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,8BAAsB,YAAY;IAEjC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC;gBAEzB,EACX,aAAa,EACb,aAAa,EACb,cAAc,GACd,EAAE;QACF,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;QAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;KAChC;IAyCD,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAE1C,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,SAAS,IAAI,MAAM;IAInB,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAKpD,KAAK,IAAI,IAAI;IAIb,QAAQ,CAAC,MAAM,IAAI,IAAI;IAEvB,OAAO,IAAI,IAAI;IAYf,KAAK,IAAI,IAAI;CAKb;AAED,qBAAa,kBAAmB,SAAQ,YAAY;gBACvC,EACX,aAAa,EACb,aAAa,EACb,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,GACZ,EAAE;QACF,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;QAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;QACxC,gBAAgB,EAAE,GAAG,CAAC;QACtB,kBAAkB,CAAC,EAAE,aAAa,CAAC;QACnC,mBAAmB,CAAC,EAAE,aAAa,CAAC;QACpC,YAAY,CAAC,EAAE,oBAAoB,CAAC;KACpC;IA+PD,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAsBjC,MAAM,IAAI,IAAI;IAId,mBAAmB,CAAC,SAAS,EAAE,wBAAwB,EAAE,GAAG,IAAI;CA6BhE;AAED,qBAAa,iBAAkB,SAAQ,YAAY;gBACtC,EACX,aAAa,EACb,aAAa,EACb,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,GAAG,EACH,IAAI,EACJ,kBAAkB,EAClB,QAAQ,EACR,OAAO,EACP,kBAA0B,GAC1B,EAAE;QACF,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;QAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;QACxC,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,SAAS,GAAG,aAAa,CAAC;QAChC,kBAAkB,CAAC,EAAE,aAAa,CAAC;QACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC7B;IAsJD,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAKjC,MAAM,IAAI,IAAI;CAGd"}
+{"version":3,"file":"MediaSection.d.ts","sourceRoot":"","sources":["../../../src/handlers/sdp/MediaSection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,YAAY,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EACX,aAAa,EACb,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,kBAAkB,EAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,KAAK,EACX,SAAS,EACT,aAAa,EAGb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,8BAAsB,YAAY;IAEjC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC,gBAAgB,CAAC;gBAEnD,EACX,aAAa,EACb,aAAa,EACb,cAAc,GACd,EAAE;QACF,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;QAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;KAChC;IAmDD,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAE1C,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,SAAS,IAAI,YAAY,CAAC,gBAAgB;IAI1C,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAKpD,KAAK,IAAI,IAAI;IAIb,QAAQ,CAAC,MAAM,IAAI,IAAI;IAEvB,OAAO,IAAI,IAAI;IAYf,KAAK,IAAI,IAAI;CAKb;AAED,qBAAa,kBAAmB,SAAQ,YAAY;gBACvC,EACX,aAAa,EACb,aAAa,EACb,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,GACZ,EAAE;QACF,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;QAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;QACxC,gBAAgB,EAAE,YAAY,CAAC,gBAAgB,CAAC;QAChD,kBAAkB,CAAC,EAAE,aAAa,CAAC;QACnC,mBAAmB,CAAC,EAAE,aAAa,CAAC;QACpC,YAAY,CAAC,EAAE,oBAAoB,CAAC;KACpC;IAiQD,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAsBjC,MAAM,IAAI,IAAI;IAId,mBAAmB,CAAC,SAAS,EAAE,wBAAwB,EAAE,GAAG,IAAI;CA6BhE;AAED,qBAAa,iBAAkB,SAAQ,YAAY;gBACtC,EACX,aAAa,EACb,aAAa,EACb,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,GAAG,EACH,IAAI,EACJ,kBAAkB,EAClB,QAAQ,EACR,OAAO,GACP,EAAE;QACF,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;QAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;QACxC,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,SAAS,GAAG,aAAa,CAAC;QAChC,kBAAkB,CAAC,EAAE,aAAa,CAAC;QACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;KACjB;IA4ID,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAKjC,MAAM,IAAI,IAAI;CAGd"}

package/lib/handlers/sdp/MediaSection.js

@@ -7,25 +7,33 @@ class MediaSection {
     // SDP media object.
     _mediaObject;
     constructor({ iceParameters, iceCandidates, dtlsParameters, }) {
-        this._mediaObject = {};
+        this._mediaObject = {
+            type: '',
+            port: 0,
+            protocol: '',
+            payloads: '',
+            rtp: [],
+            fmtp: [],
+        };
         if (iceParameters) {
             this.setIceParameters(iceParameters);
         }
         if (iceCandidates) {
             this._mediaObject.candidates = [];
             for (const candidate of iceCandidates) {
-                const candidateObject = {};
-                // mediasoup does mandates rtcp-mux so candidates component is always
-                // RTP (1).
-                candidateObject.component = 1;
-                candidateObject.foundation = candidate.foundation;
-                // Be ready for new candidate.address field in mediasoup server side
-                // field and keep backward compatibility with deprecated candidate.ip.
-                candidateObject.ip = candidate.address ?? candidate.ip;
-                candidateObject.port = candidate.port;
-                candidateObject.priority = candidate.priority;
-                candidateObject.transport = candidate.protocol;
-                candidateObject.type = candidate.type;
+                const candidateObject = {
+                    foundation: candidate.foundation,
+                    // mediasoup does mandates rtcp-mux so candidates component is always
+                    // RTP (1).
+                    component: 1,
+                    // Be ready for new candidate.address field in mediasoup server side
+                    // field and keep backward compatibility with deprecated candidate.ip.
+                    ip: candidate.address ?? candidate.ip,
+                    port: candidate.port,
+                    priority: candidate.priority,
+                    transport: candidate.protocol,
+                    type: candidate.type,
+                };
                 if (candidate.tcpType) {
                     candidateObject.tcptype = candidate.tcpType;
                 }
@@ -114,25 +122,25 @@ class AnswerMediaSection extends MediaSection {
                             case 'audio/multiopus': {
                                 if (opusStereo !== undefined) {
                                     offerCodec.parameters['sprop-stereo'] = opusStereo ? 1 : 0;
-                                    codecParameters.stereo = opusStereo ? 1 : 0;
+                                    codecParameters['stereo'] = opusStereo ? 1 : 0;
                                 }
                                 if (opusFec !== undefined) {
-                                    offerCodec.parameters.useinbandfec = opusFec ? 1 : 0;
-                                    codecParameters.useinbandfec = opusFec ? 1 : 0;
+                                    offerCodec.parameters['useinbandfec'] = opusFec ? 1 : 0;
+                                    codecParameters['useinbandfec'] = opusFec ? 1 : 0;
                                 }
                                 if (opusDtx !== undefined) {
-                                    offerCodec.parameters.usedtx = opusDtx ? 1 : 0;
-                                    codecParameters.usedtx = opusDtx ? 1 : 0;
+                                    offerCodec.parameters['usedtx'] = opusDtx ? 1 : 0;
+                                    codecParameters['usedtx'] = opusDtx ? 1 : 0;
                                 }
                                 if (opusMaxPlaybackRate !== undefined) {
-                                    codecParameters.maxplaybackrate = opusMaxPlaybackRate;
+                                    codecParameters['maxplaybackrate'] = opusMaxPlaybackRate;
                                 }
                                 if (opusMaxAverageBitrate !== undefined) {
-                                    codecParameters.maxaveragebitrate = opusMaxAverageBitrate;
+                                    codecParameters['maxaveragebitrate'] = opusMaxAverageBitrate;
                                 }
                                 if (opusPtime !== undefined) {
-                                    offerCodec.parameters.ptime = opusPtime;
-                                    codecParameters.ptime = opusPtime;
+                                    offerCodec.parameters['ptime'] = opusPtime;
+                                    codecParameters['ptime'] = opusPtime;
                                 }
                                 // If opusNack is not set, we must remove NACK support for OPUS.
                                 // Otherwise it would be enabled for those handlers that artificially
@@ -251,7 +259,7 @@ class AnswerMediaSection extends MediaSection {
                 }
                 // Old spec.
                 else if (offerMediaObject.sctpmap) {
-                    this._mediaObject.payloads = sctpParameters.port;
+                    this._mediaObject.payloads = String(sctpParameters.port);
                     this._mediaObject.sctpmap = {
                         app: 'webrtc-datachannel',
                         sctpmapNumber: sctpParameters.port,
@@ -305,7 +313,7 @@ class AnswerMediaSection extends MediaSection {
 }
 exports.AnswerMediaSection = AnswerMediaSection;
 class OfferMediaSection extends MediaSection {
-    constructor({ iceParameters, iceCandidates, dtlsParameters, sctpParameters, plainRtpParameters, mid, kind, offerRtpParameters, streamId, trackId, oldDataChannelSpec = false, }) {
+    constructor({ iceParameters, iceCandidates, dtlsParameters, sctpParameters, plainRtpParameters, mid, kind, offerRtpParameters, streamId, trackId, }) {
         super({ iceParameters, iceCandidates, dtlsParameters });
         this._mediaObject.mid = String(mid);
         this._mediaObject.type = kind;
@@ -352,7 +360,7 @@ class OfferMediaSection extends MediaSection {
                         payload: codec.payloadType,
                         config: '',
                     };
-                    for (const key of Object.keys(codec.parameters)) {
+                    for (const key of Object.keys(codec.parameters ?? {})) {
                         if (fmtp.config) {
                             fmtp.config += ';';
                         }
@@ -386,7 +394,7 @@ class OfferMediaSection extends MediaSection {
                 const rtxSsrc = encoding.rtx?.ssrc;
                 this._mediaObject.ssrcs = [];
                 this._mediaObject.ssrcGroups = [];
-                if (offerRtpParameters.rtcp.cname) {
+                if (ssrc && offerRtpParameters.rtcp.cname) {
                     this._mediaObject.ssrcs.push({
                         id: ssrc,
                         attribute: 'cname',
@@ -402,29 +410,19 @@ class OfferMediaSection extends MediaSection {
                         });
                     }
                     // Associate original and retransmission SSRCs.
-                    this._mediaObject.ssrcGroups.push({
-                        semantics: 'FID',
-                        ssrcs: `${ssrc} ${rtxSsrc}`,
-                    });
+                    if (ssrc) {
+                        this._mediaObject.ssrcGroups.push({
+                            semantics: 'FID',
+                            ssrcs: `${ssrc} ${rtxSsrc}`,
+                        });
+                    }
                 }
                 break;
             }
             case 'application': {
-                // New spec.
-                if (!oldDataChannelSpec) {
-                    this._mediaObject.payloads = 'webrtc-datachannel';
-                    this._mediaObject.sctpPort = sctpParameters.port;
-                    this._mediaObject.maxMessageSize = sctpParameters.maxMessageSize;
-                }
-                // Old spec.
-                else {
-                    this._mediaObject.payloads = sctpParameters.port;
-                    this._mediaObject.sctpmap = {
-                        app: 'webrtc-datachannel',
-                        sctpmapNumber: sctpParameters.port,
-                        maxMessageSize: sctpParameters.maxMessageSize,
-                    };
-                }
+                this._mediaObject.payloads = 'webrtc-datachannel';
+                this._mediaObject.sctpPort = sctpParameters.port;
+                this._mediaObject.maxMessageSize = sctpParameters.maxMessageSize;
                 break;
             }
         }

package/lib/handlers/sdp/RemoteSdp.d.ts

@@ -1,3 +1,4 @@
+import type * as SdpTransform from 'sdp-transform';
 import { MediaSection } from './MediaSection';
 import type { IceParameters, IceCandidate, DtlsParameters, DtlsRole, PlainRtpParameters } from '../../Transport';
 import type { ProducerCodecOptions } from '../../Producer';
@@ -31,7 +32,7 @@ export declare class RemoteSdp {
         reuseMid?: string;
     };
     send({ offerMediaObject, reuseMid, offerRtpParameters, answerRtpParameters, codecOptions, }: {
-        offerMediaObject: any;
+        offerMediaObject: SdpTransform.MediaDescription;
         reuseMid?: string;
         offerRtpParameters: RtpParameters;
         answerRtpParameters: RtpParameters;
@@ -57,12 +58,10 @@ export declare class RemoteSdp {
      */
     closeMediaSection(mid: string): boolean;
     muxMediaSectionSimulcast(mid: string, encodings: RTCRtpEncodingParameters[]): void;
-    sendSctpAssociation({ offerMediaObject }: {
-        offerMediaObject: any;
-    }): void;
-    receiveSctpAssociation({ oldDataChannelSpec, }?: {
-        oldDataChannelSpec?: boolean;
+    sendSctpAssociation({ offerMediaObject, }: {
+        offerMediaObject: SdpTransform.MediaDescription;
     }): void;
+    receiveSctpAssociation(): void;
     getSdp(): string;
     _addMediaSection(newMediaSection: MediaSection): void;
     _replaceMediaSection(newMediaSection: MediaSection, reuseMid?: string): void;

package/lib/handlers/sdp/RemoteSdp.d.ts.map

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