werift 0.16.2 → 0.17.0

package/lib/webrtc/src/peerConnection.js

@@ -61,6 +61,7 @@ class RTCPeerConnection extends helper_1.EventTarget {
         this.signalingState = "stable";
         this.negotiationneeded = false;
         this.transceivers = [];
+        this.candidatesSent = new Set();
         this.iceGatheringStateChange = new rx_mini_1.default();
         this.iceConnectionStateChange = new rx_mini_1.default();
         this.signalingStateChange = new rx_mini_1.default();
@@ -245,6 +246,10 @@ class RTCPeerConnection extends helper_1.EventTarget {
             else {
                 const transceiver = this.getTransceiverByMid(mid);
                 if (!transceiver) {
+                    if (m.direction === "inactive") {
+                        description.media.push(m);
+                        return;
+                    }
                     throw new Error("transceiver not found");
                 }
                 transceiver.mLineIndex = i;
@@ -255,11 +260,17 @@ class RTCPeerConnection extends helper_1.EventTarget {
         this.transceivers
             .filter((t) => !description.media.find((m) => m.rtp.muxId === t.mid))
             .forEach((transceiver) => {
-            transceiver.mLineIndex = description.media.length;
             if (transceiver.mid == undefined) {
                 transceiver.mid = allocateMid(this.seenMid, "av");
             }
-            description.media.push(createMediaDescriptionForTransceiver(transceiver, this.cname, transceiver.direction));
+            const mediaDescription = createMediaDescriptionForTransceiver(transceiver, this.cname, transceiver.direction);
+            if (transceiver.mLineIndex === undefined) {
+                transceiver.mLineIndex = description.media.length;
+                description.media.push(mediaDescription);
+            }
+            else {
+                description.media[transceiver.mLineIndex] = mediaDescription;
+            }
         });
         if (this.sctpTransport &&
             !description.media.find((m) => m.kind === "application")) {
@@ -271,10 +282,12 @@ class RTCPeerConnection extends helper_1.EventTarget {
         }
         if (this.config.bundlePolicy !== "disable") {
             const mids = description.media
-                .map((m) => m.rtp.muxId)
+                .map((m) => (m.direction !== "inactive" ? m.rtp.muxId : undefined))
                 .filter((v) => v);
-            const bundle = new sdp_1.GroupDescription("BUNDLE", mids);
-            description.group.push(bundle);
+            if (mids.length) {
+                const bundle = new sdp_1.GroupDescription("BUNDLE", mids);
+                description.group.push(bundle);
+            }
         }
         return description;
     }
@@ -317,13 +330,18 @@ class RTCPeerConnection extends helper_1.EventTarget {
             this.needNegotiation();
             return;
         }
-        if (transceiver.direction === "sendrecv") {
-            transceiver.direction = "recvonly";
-        }
-        else if (transceiver.direction === "sendonly" ||
-            transceiver.direction === "recvonly") {
+        if (transceiver.stopping || transceiver.stopped) {
             transceiver.direction = "inactive";
         }
+        else {
+            if (transceiver.direction === "sendrecv") {
+                transceiver.direction = "recvonly";
+            }
+            else if (transceiver.direction === "sendonly" ||
+                transceiver.direction === "recvonly") {
+                transceiver.direction = "inactive";
+            }
+        }
         this.needNegotiation();
     }
     createTransport(srtpProfiles = []) {
@@ -379,6 +397,15 @@ class RTCPeerConnection extends helper_1.EventTarget {
                 }
             }
             candidate.foundation = "candidate:" + candidate.foundation;
+            // prevent ice candidates that have already been sent from being being resent
+            // when the connection is renegotiated during a later setLocalDescription call.
+            if (candidate.sdpMid) {
+                const candidateKey = `${candidate.foundation}:${candidate.sdpMid}`;
+                if (this.candidatesSent.has(candidateKey)) {
+                    return;
+                }
+                this.candidatesSent.add(candidateKey);
+            }
             this.onIceCandidate.execute(candidate.toJSON());
             if (this.onicecandidate) {
                 this.onicecandidate({ candidate: candidate.toJSON() });
@@ -623,11 +650,12 @@ class RTCPeerConnection extends helper_1.EventTarget {
         }
         let bundleTransport;
         // # apply description
-        const transports = (0, helper_1.enumerate)(remoteSdp.media).map(([i, remoteMedia]) => {
+        const matchTransceiverWithMedia = (transceiver, media) => transceiver.kind === media.kind &&
+            [undefined, media.rtp.muxId].includes(transceiver.mid);
+        let transports = (0, helper_1.enumerate)(remoteSdp.media).map(([i, remoteMedia]) => {
             let dtlsTransport;
             if (["audio", "video"].includes(remoteMedia.kind)) {
-                let transceiver = this.transceivers.find((t) => t.kind === remoteMedia.kind &&
-                    [undefined, remoteMedia.rtp.muxId].includes(t.mid));
+                let transceiver = this.transceivers.find((t) => matchTransceiverWithMedia(t, remoteMedia));
                 if (!transceiver) {
                     // create remote transceiver
                     transceiver = this.addTransceiver(remoteMedia.kind, {
@@ -636,6 +664,13 @@ class RTCPeerConnection extends helper_1.EventTarget {
                     transceiver.mid = remoteMedia.rtp.muxId;
                     this.onRemoteTransceiverAdded.execute(transceiver);
                 }
+                else {
+                    if (transceiver.direction === "inactive" && transceiver.stopping) {
+                        transceiver.stopped = true;
+                        transceiver.currentDirection = "inactive";
+                        return;
+                    }
+                }
                 if (this.remoteIsBundled) {
                     if (!bundleTransport) {
                         bundleTransport = transceiver.dtlsTransport;
@@ -688,6 +723,18 @@ class RTCPeerConnection extends helper_1.EventTarget {
             }
             return iceTransport;
         });
+        // filter out inactive transports
+        transports = transports.filter((iceTransport) => !!iceTransport);
+        const removedTransceivers = this.transceivers.filter((t) => remoteSdp.media.find((m) => matchTransceiverWithMedia(t, m)) ==
+            undefined);
+        if (sessionDescription.type === "answer") {
+            for (const transceiver of removedTransceivers) {
+                // todo: handle answer side transceiver removal work.
+                // event should trigger to notify media source to stop.
+                transceiver.stop();
+                transceiver.stopped = true;
+            }
+        }
         if (remoteSdp.type === "offer") {
             this.setSignalingState("have-remote-offer");
         }
@@ -852,7 +899,17 @@ class RTCPeerConnection extends helper_1.EventTarget {
         const transceiver = new rtpTransceiver_1.RTCRtpTransceiver(kind, dtlsTransport, receiver, sender, direction);
         transceiver.options = options;
         this.router.registerRtpSender(transceiver.sender);
-        this.transceivers.push(transceiver);
+        // reuse inactive
+        const inactiveTransceiverIndex = this.transceivers.findIndex((t) => t.currentDirection === "inactive");
+        const inactiveTransceiver = this.transceivers.find((t) => t.currentDirection === "inactive");
+        if (inactiveTransceiverIndex > -1) {
+            this.transceivers[inactiveTransceiverIndex] = transceiver;
+            transceiver.mLineIndex = inactiveTransceiver.mLineIndex;
+            inactiveTransceiver.currentDirection = "stopped";
+        }
+        else {
+            this.transceivers.push(transceiver);
+        }
         this.onTransceiverAdded.execute(transceiver);
         this.updateIceConnectionState();
         this.needNegotiation();
@@ -1145,17 +1202,11 @@ function addTransportDescription(media, dtlsTransport) {
     media.iceCandidatesComplete = iceGatherer.gatheringState === "complete";
     media.iceParams = iceGatherer.localParameters;
     media.iceOptions = "trickle";
-    if (media.iceCandidates.length > 0) {
-        const candidate = media.iceCandidates[media.iceCandidates.length - 1];
-        media.host = candidate.ip;
-        media.port = candidate.port;
-    }
-    else {
-        media.host = const_1.DISCARD_HOST;
-        media.port = const_1.DISCARD_PORT;
-    }
+    media.host = const_1.DISCARD_HOST;
+    media.port = const_1.DISCARD_PORT;
     if (media.direction === "inactive") {
         media.port = 0;
+        media.msid = undefined;
     }
     if (!media.dtlsParams) {
         media.dtlsParams = dtlsTransport.localParameters;