werift 0.15.3 → 0.15.6

package/lib/webrtc/src/peerConnection.js

@@ -194,10 +194,18 @@ class RTCPeerConnection extends helper_1.EventTarget {
     }
     async createOffer() {
         await this.ensureCerts();
+        const description = this.buildOfferSdp();
+        return description.toJSON();
+    }
+    buildOfferSdp() {
         this.transceivers.forEach((transceiver) => {
-            transceiver.codecs = this.configuration.codecs[transceiver.kind];
-            transceiver.headerExtensions =
-                this.configuration.headerExtensions[transceiver.kind];
+            if (transceiver.codecs.length === 0) {
+                transceiver.codecs = this.configuration.codecs[transceiver.kind];
+            }
+            if (transceiver.headerExtensions.length === 0) {
+                transceiver.headerExtensions =
+                    this.configuration.headerExtensions[transceiver.kind];
+            }
         });
         const description = new sdp_1.SessionDescription();
         (0, sdp_1.addSDPHeader)("offer", description);
@@ -212,16 +220,19 @@ class RTCPeerConnection extends helper_1.EventTarget {
                 return;
             }
             if (m.kind === "application") {
-                description.media.push(createMediaDescriptionForSctp(this.sctpTransport, mid));
+                if (!this.sctpTransport) {
+                    throw new Error("sctpTransport not found");
+                }
+                this.sctpTransport.mLineIndex = i;
+                description.media.push(createMediaDescriptionForSctp(this.sctpTransport));
             }
             else {
                 const transceiver = this.getTransceiverByMid(mid);
                 if (!transceiver) {
-                    log("transceiver by mid not found", mid);
-                    return;
+                    throw new Error("transceiver not found");
                 }
                 transceiver.mLineIndex = i;
-                description.media.push(createMediaDescriptionForTransceiver(transceiver, this.cname, transceiver.direction, mid));
+                description.media.push(createMediaDescriptionForTransceiver(transceiver, this.cname, transceiver.direction));
             }
         });
         // # handle new transceivers / sctp
@@ -229,11 +240,18 @@ class RTCPeerConnection extends helper_1.EventTarget {
             .filter((t) => !description.media.find((m) => m.rtp.muxId === t.mid))
             .forEach((transceiver) => {
             transceiver.mLineIndex = description.media.length;
-            description.media.push(createMediaDescriptionForTransceiver(transceiver, this.cname, transceiver.direction, allocateMid(this.seenMid)));
+            if (transceiver.mid == undefined) {
+                transceiver.mid = allocateMid(this.seenMid) + "_srtp";
+            }
+            description.media.push(createMediaDescriptionForTransceiver(transceiver, this.cname, transceiver.direction));
         });
         if (this.sctpTransport &&
-            !description.media.find((m) => this.sctpTransport.mid === m.rtp.muxId)) {
-            description.media.push(createMediaDescriptionForSctp(this.sctpTransport, allocateMid(this.seenMid)));
+            !description.media.find((m) => m.kind === "application")) {
+            this.sctpTransport.mLineIndex = description.media.length;
+            if (this.sctpTransport.mid == undefined) {
+                this.sctpTransport.mid = allocateMid(this.seenMid) + "_sctp";
+            }
+            description.media.push(createMediaDescriptionForSctp(this.sctpTransport));
         }
         if (this.configuration.bundlePolicy !== "disable") {
             const mids = description.media
@@ -242,7 +260,7 @@ class RTCPeerConnection extends helper_1.EventTarget {
             const bundle = new sdp_1.GroupDescription("BUNDLE", mids);
             description.group.push(bundle);
         }
-        return description.toJSON();
+        return description;
     }
     createDataChannel(label, options = {}) {
         const base = {
@@ -321,18 +339,30 @@ class RTCPeerConnection extends helper_1.EventTarget {
         iceTransport.iceGather.onIceCandidate = (candidate) => {
             if (!this.localDescription)
                 return;
-            const sdp = sdp_1.SessionDescription.parse(this.localDescription.sdp);
-            const media = sdp.media[0];
-            if (!media) {
-                log("media not exist");
-                return;
+            if (this.configuration.bundlePolicy === "max-bundle" ||
+                this.remoteIsBundled) {
+                candidate.sdpMLineIndex = 0;
+                const media = this._localDescription?.media[0];
+                if (media) {
+                    candidate.sdpMid = media.rtp.muxId;
+                }
+            }
+            else {
+                const transceiver = this.transceivers.find((t) => t.dtlsTransport.iceTransport.id === iceTransport.id);
+                if (transceiver) {
+                    candidate.sdpMLineIndex = transceiver.mLineIndex;
+                    candidate.sdpMid = transceiver.mid;
+                }
+                if (this.sctpTransport?.dtlsTransport.iceTransport.id === iceTransport.id) {
+                    candidate.sdpMLineIndex = this.sctpTransport.mLineIndex;
+                    candidate.sdpMid = this.sctpTransport.mid;
+                }
             }
-            candidate.sdpMLineIndex = 0;
-            candidate.sdpMid = media.rtp.muxId;
             candidate.foundation = "candidate:" + candidate.foundation;
             this.onIceCandidate.execute(candidate.toJSON());
-            if (this.onicecandidate)
+            if (this.onicecandidate) {
                 this.onicecandidate({ candidate: candidate.toJSON() });
+            }
             this.emit("icecandidate", { candidate });
         };
         const dtlsTransport = new dtls_1.RTCDtlsTransport(iceTransport, this.router, this.certificates, srtpProfiles);
@@ -416,10 +446,16 @@ class RTCPeerConnection extends helper_1.EventTarget {
         });
         // for trickle ice
         this.setLocal(description);
-        // # gather candidates
-        for (const iceTransport of this.iceTransports) {
-            await iceTransport.iceGather.gather();
+        // connect transports
+        if (description.type === "answer") {
+            log("callee start connect");
+            this.connect().catch((err) => {
+                log("connect failed", err);
+                this.setConnectionState("failed");
+            });
         }
+        // # gather candidates
+        await Promise.all(this.iceTransports.map((iceTransport) => iceTransport.iceGather.gather()));
         description.media
             .filter((m) => ["audio", "video"].includes(m.kind))
             .forEach((m, i) => {
@@ -430,14 +466,6 @@ class RTCPeerConnection extends helper_1.EventTarget {
             addTransportDescription(sctpMedia, this.sctpTransport.dtlsTransport);
         }
         this.setLocal(description);
-        // connect transports
-        if (description.type === "answer") {
-            log("callee start connect");
-            this.connect().catch((err) => {
-                log("connect failed", err);
-                this.setConnectionState("failed");
-            });
-        }
         if (this.shouldNegotiationneeded) {
             this.needNegotiation();
         }
@@ -452,11 +480,47 @@ class RTCPeerConnection extends helper_1.EventTarget {
             this.pendingLocalDescription = description;
         }
     }
+    getTransportByMid(mid) {
+        let iceTransport;
+        const transceiver = this.transceivers.find((t) => t.mid === mid);
+        if (transceiver) {
+            iceTransport = transceiver.dtlsTransport.iceTransport;
+        }
+        else if (!iceTransport && this.sctpTransport?.mid === mid) {
+            iceTransport = this.sctpTransport?.dtlsTransport.iceTransport;
+        }
+        return iceTransport;
+    }
+    getTransportByMLineIndex(index) {
+        const sdp = this.buildOfferSdp();
+        const media = sdp.media[index];
+        if (!media) {
+            return;
+        }
+        const transport = this.getTransportByMid(media.rtp.muxId);
+        return transport;
+    }
     async addIceCandidate(candidateMessage) {
         const candidate = ice_1.IceCandidate.fromJSON(candidateMessage);
-        for (const iceTransport of this.iceTransports) {
+        if (!candidate) {
+            return;
+        }
+        let iceTransport;
+        if (typeof candidate.sdpMid === "number") {
+            iceTransport = this.getTransportByMid(candidate.sdpMid);
+        }
+        if (!iceTransport && typeof candidate.sdpMLineIndex === "number") {
+            iceTransport = this.getTransportByMLineIndex(candidate.sdpMLineIndex);
+        }
+        if (!iceTransport) {
+            iceTransport = this.iceTransports[0];
+        }
+        if (iceTransport) {
             await iceTransport.addRemoteCandidate(candidate);
         }
+        else {
+            log("iceTransport not found", candidate);
+        }
     }
     async connect() {
         if (this.masterTransportEstablished)
@@ -518,6 +582,13 @@ class RTCPeerConnection extends helper_1.EventTarget {
         };
         return receiveParameters;
     }
+    get remoteIsBundled() {
+        const remoteSdp = this._remoteDescription;
+        if (!remoteSdp)
+            return;
+        const bundle = remoteSdp.group.find((g) => g.semantic === "BUNDLE" && this.configuration.bundlePolicy !== "disable");
+        return bundle;
+    }
     async setRemoteDescription(sessionDescription) {
         // # parse and validate description
         const remoteSdp = sdp_1.SessionDescription.parse(sessionDescription.sdp);
@@ -530,10 +601,9 @@ class RTCPeerConnection extends helper_1.EventTarget {
         else {
             this.pendingRemoteDescription = remoteSdp;
         }
-        const bundle = remoteSdp.group.find((g) => g.semantic === "BUNDLE" && this.configuration.bundlePolicy !== "disable");
         let bundleTransport;
         // # apply description
-        await Promise.all((0, helper_1.enumerate)(remoteSdp.media).map(async ([i, remoteMedia]) => {
+        const 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 &&
@@ -543,9 +613,10 @@ class RTCPeerConnection extends helper_1.EventTarget {
                     transceiver = this.addTransceiver(remoteMedia.kind, {
                         direction: "recvonly",
                     });
+                    transceiver.mid = remoteMedia.rtp.muxId;
                     this.onRemoteTransceiverAdded.execute(transceiver);
                 }
-                if (bundle) {
+                if (this.remoteIsBundled) {
                     if (!bundleTransport) {
                         bundleTransport = transceiver.dtlsTransport;
                     }
@@ -559,8 +630,9 @@ class RTCPeerConnection extends helper_1.EventTarget {
             else if (remoteMedia.kind === "application") {
                 if (!this.sctpTransport) {
                     this.sctpTransport = this.createSctpTransport();
+                    this.sctpTransport.mid = remoteMedia.rtp.muxId;
                 }
-                if (bundle) {
+                if (this.remoteIsBundled) {
                     if (!bundleTransport) {
                         bundleTransport = this.sctpTransport.dtlsTransport;
                     }
@@ -569,7 +641,7 @@ class RTCPeerConnection extends helper_1.EventTarget {
                     }
                 }
                 dtlsTransport = this.sctpTransport.dtlsTransport;
-                this.setRemoteSCTP(remoteMedia, this.sctpTransport);
+                this.setRemoteSCTP(remoteMedia, this.sctpTransport, i);
             }
             else {
                 throw new Error("invalid media kind");
@@ -586,16 +658,22 @@ class RTCPeerConnection extends helper_1.EventTarget {
             }
             // # add ICE candidates
             remoteMedia.iceCandidates.forEach(iceTransport.addRemoteCandidate);
-            await iceTransport.iceGather.gather();
             if (remoteMedia.iceCandidatesComplete) {
-                await iceTransport.addRemoteCandidate(undefined);
+                iceTransport.addRemoteCandidate(undefined);
             }
             // # set DTLS role
             if (remoteSdp.type === "answer" && remoteMedia.dtlsParams?.role) {
                 dtlsTransport.role =
                     remoteMedia.dtlsParams.role === "client" ? "server" : "client";
             }
-        }));
+            return iceTransport;
+        });
+        if (remoteSdp.type === "offer") {
+            this.setSignalingState("have-remote-offer");
+        }
+        else if (remoteSdp.type === "answer") {
+            this.setSignalingState("stable");
+        }
         // connect transports
         if (remoteSdp.type === "answer") {
             log("caller start connect");
@@ -604,12 +682,9 @@ class RTCPeerConnection extends helper_1.EventTarget {
                 this.setConnectionState("failed");
             });
         }
-        if (remoteSdp.type === "offer") {
-            this.setSignalingState("have-remote-offer");
-        }
-        else if (remoteSdp.type === "answer") {
-            this.setSignalingState("stable");
-        }
+        await Promise.all(transports.map(async (iceTransport) => {
+            await iceTransport.iceGather.gather();
+        }));
         this.negotiationneeded = false;
         if (this.shouldNegotiationneeded) {
             this.needNegotiation();
@@ -676,13 +751,14 @@ class RTCPeerConnection extends helper_1.EventTarget {
         }
         transceiver.receiver.setupTWCC(remoteMedia.ssrc[0]?.ssrc);
     }
-    setRemoteSCTP(remoteMedia, sctpTransport) {
+    setRemoteSCTP(remoteMedia, sctpTransport, mLineIndex) {
         // # configure sctp
         this.sctpRemotePort = remoteMedia.sctpPort;
         if (!this.sctpRemotePort) {
             throw new Error("sctpRemotePort not exist");
         }
         sctpTransport.setRemotePort(this.sctpRemotePort);
+        sctpTransport.mLineIndex = mLineIndex;
         if (!sctpTransport.mid) {
             sctpTransport.mid = remoteMedia.rtp.muxId;
         }
@@ -824,6 +900,11 @@ class RTCPeerConnection extends helper_1.EventTarget {
         }
     }
     async createAnswer() {
+        await this.ensureCerts();
+        const description = this.buildAnswer();
+        return description.toJSON();
+    }
+    buildAnswer() {
         this.assertNotClosed();
         if (!["have-remote-offer", "have-local-pranswer"].includes(this.signalingState)) {
             throw new Error("createAnswer failed");
@@ -831,7 +912,6 @@ class RTCPeerConnection extends helper_1.EventTarget {
         if (!this._remoteDescription) {
             throw new Error("wrong state");
         }
-        await this.ensureCerts();
         const description = new sdp_1.SessionDescription();
         (0, sdp_1.addSDPHeader)("answer", description);
         this._remoteDescription.media.forEach((remoteMedia) => {
@@ -839,14 +919,14 @@ class RTCPeerConnection extends helper_1.EventTarget {
             let media;
             if (["audio", "video"].includes(remoteMedia.kind)) {
                 const transceiver = this.getTransceiverByMid(remoteMedia.rtp.muxId);
-                media = createMediaDescriptionForTransceiver(transceiver, this.cname, (0, utils_1.andDirection)(transceiver.direction, transceiver.offerDirection), transceiver.mid);
+                media = createMediaDescriptionForTransceiver(transceiver, this.cname, (0, utils_1.andDirection)(transceiver.direction, transceiver.offerDirection));
                 dtlsTransport = transceiver.dtlsTransport;
             }
             else if (remoteMedia.kind === "application") {
                 if (!this.sctpTransport || !this.sctpTransport.mid) {
                     throw new Error("sctpTransport not found");
                 }
-                media = createMediaDescriptionForSctp(this.sctpTransport, this.sctpTransport.mid);
+                media = createMediaDescriptionForSctp(this.sctpTransport);
                 dtlsTransport = this.sctpTransport.dtlsTransport;
             }
             else {
@@ -875,7 +955,7 @@ class RTCPeerConnection extends helper_1.EventTarget {
             });
             description.group.push(bundle);
         }
-        return description.toJSON();
+        return description;
     }
     async close() {
         if (this.isClosed)
@@ -996,14 +1076,14 @@ class RTCPeerConnection extends helper_1.EventTarget {
     }
 }
 exports.RTCPeerConnection = RTCPeerConnection;
-function createMediaDescriptionForTransceiver(transceiver, cname, direction, mid) {
+function createMediaDescriptionForTransceiver(transceiver, cname, direction) {
     const media = new sdp_1.MediaDescription(transceiver.kind, 9, "UDP/TLS/RTP/SAVPF", transceiver.codecs.map((c) => c.payloadType));
     media.direction = direction;
     media.msid = transceiver.msid;
     media.rtp = {
         codecs: transceiver.codecs,
         headerExtensions: transceiver.headerExtensions,
-        muxId: mid,
+        muxId: transceiver.mid,
     };
     media.rtcpHost = "0.0.0.0";
     media.rtcpPort = 9;
@@ -1025,10 +1105,10 @@ function createMediaDescriptionForTransceiver(transceiver, cname, direction, mid
     return media;
 }
 exports.createMediaDescriptionForTransceiver = createMediaDescriptionForTransceiver;
-function createMediaDescriptionForSctp(sctp, mid) {
+function createMediaDescriptionForSctp(sctp) {
     const media = new sdp_1.MediaDescription("application", const_1.DISCARD_PORT, "UDP/DTLS/SCTP", ["webrtc-datachannel"]);
     media.sctpPort = sctp.port;
-    media.rtp.muxId = mid;
+    media.rtp.muxId = sctp.mid;
     media.sctpCapabilities = sctp_1.RTCSctpTransport.getCapabilities();
     addTransportDescription(media, sctp.dtlsTransport);
     return media;