werift 0.15.4 → 0.15.7

package/src/peerConnection.ts

@@ -434,24 +434,38 @@ export class RTCPeerConnection extends EventTarget {
 
     iceTransport.iceGather.onIceCandidate = (candidate) => {
       if (!this.localDescription) return;
-      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
+        this.configuration.bundlePolicy === "max-bundle" ||
+        this.remoteIsBundled
       ) {
-        candidate.sdpMLineIndex = this.sctpTransport.mLineIndex;
-        candidate.sdpMid = this.sctpTransport.mid;
+        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.foundation = "candidate:" + candidate.foundation;
 
       this.onIceCandidate.execute(candidate.toJSON());
-      if (this.onicecandidate)
+      if (this.onicecandidate) {
         this.onicecandidate({ candidate: candidate.toJSON() });
+      }
       this.emit("icecandidate", { candidate });
     };
 
@@ -556,6 +570,15 @@ export class RTCPeerConnection extends EventTarget {
     // for trickle ice
     this.setLocal(description);
 
+    // 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())
@@ -573,15 +596,6 @@ export class RTCPeerConnection extends EventTarget {
 
     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();
     }
@@ -727,6 +741,16 @@ export class RTCPeerConnection extends 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: {
     type: "offer" | "answer";
     sdp: string;
@@ -743,93 +767,93 @@ export class RTCPeerConnection extends EventTarget {
       this.pendingRemoteDescription = remoteSdp;
     }
 
-    const bundle = remoteSdp.group.find(
-      (g) =>
-        g.semantic === "BUNDLE" && this.configuration.bundlePolicy !== "disable"
-    );
     let bundleTransport: RTCDtlsTransport | undefined;
 
     // # apply description
-    await Promise.all(
-      enumerate(remoteSdp.media).map(async ([i, remoteMedia]) => {
-        let dtlsTransport: RTCDtlsTransport | undefined;
-
-        if (["audio", "video"].includes(remoteMedia.kind)) {
-          let transceiver = this.transceivers.find(
-            (t) =>
-              t.kind === remoteMedia.kind &&
-              [undefined, remoteMedia.rtp.muxId].includes(t.mid)
-          );
-          if (!transceiver) {
-            // create remote transceiver
-            transceiver = this.addTransceiver(remoteMedia.kind, {
-              direction: "recvonly",
-            });
-            transceiver.mid = remoteMedia.rtp.muxId;
-            this.onRemoteTransceiverAdded.execute(transceiver);
-          }
 
-          if (bundle) {
-            if (!bundleTransport) {
-              bundleTransport = transceiver.dtlsTransport;
-            } else {
-              transceiver.setDtlsTransport(bundleTransport);
-            }
-          }
+    const transports = enumerate(remoteSdp.media).map(([i, remoteMedia]) => {
+      let dtlsTransport: RTCDtlsTransport | undefined;
 
-          dtlsTransport = transceiver.dtlsTransport;
+      if (["audio", "video"].includes(remoteMedia.kind)) {
+        let transceiver = this.transceivers.find(
+          (t) =>
+            t.kind === remoteMedia.kind &&
+            [undefined, remoteMedia.rtp.muxId].includes(t.mid)
+        );
+        if (!transceiver) {
+          // create remote transceiver
+          transceiver = this.addTransceiver(remoteMedia.kind, {
+            direction: "recvonly",
+          });
+          transceiver.mid = remoteMedia.rtp.muxId;
+          this.onRemoteTransceiverAdded.execute(transceiver);
+        }
 
-          this.setRemoteRTP(transceiver, remoteMedia, remoteSdp.type, i);
-        } else if (remoteMedia.kind === "application") {
-          if (!this.sctpTransport) {
-            this.sctpTransport = this.createSctpTransport();
-            this.sctpTransport.mid = remoteMedia.rtp.muxId;
+        if (this.remoteIsBundled) {
+          if (!bundleTransport) {
+            bundleTransport = transceiver.dtlsTransport;
+          } else {
+            transceiver.setDtlsTransport(bundleTransport);
           }
+        }
 
-          if (bundle) {
-            if (!bundleTransport) {
-              bundleTransport = this.sctpTransport.dtlsTransport;
-            } else {
-              this.sctpTransport.setDtlsTransport(bundleTransport);
-            }
-          }
+        dtlsTransport = transceiver.dtlsTransport;
 
-          dtlsTransport = this.sctpTransport.dtlsTransport;
+        this.setRemoteRTP(transceiver, remoteMedia, remoteSdp.type, i);
+      } else if (remoteMedia.kind === "application") {
+        if (!this.sctpTransport) {
+          this.sctpTransport = this.createSctpTransport();
+          this.sctpTransport.mid = remoteMedia.rtp.muxId;
+        }
 
-          this.setRemoteSCTP(remoteMedia, this.sctpTransport, i);
-        } else {
-          throw new Error("invalid media kind");
+        if (this.remoteIsBundled) {
+          if (!bundleTransport) {
+            bundleTransport = this.sctpTransport.dtlsTransport;
+          } else {
+            this.sctpTransport.setDtlsTransport(bundleTransport);
+          }
         }
 
-        const iceTransport = dtlsTransport.iceTransport;
+        dtlsTransport = this.sctpTransport.dtlsTransport;
+
+        this.setRemoteSCTP(remoteMedia, this.sctpTransport, i);
+      } else {
+        throw new Error("invalid media kind");
+      }
+
+      const iceTransport = dtlsTransport.iceTransport;
 
-        if (remoteMedia.iceParams && remoteMedia.dtlsParams) {
-          iceTransport.setRemoteParams(remoteMedia.iceParams);
-          dtlsTransport.setRemoteParams(remoteMedia.dtlsParams);
+      if (remoteMedia.iceParams && remoteMedia.dtlsParams) {
+        iceTransport.setRemoteParams(remoteMedia.iceParams);
+        dtlsTransport.setRemoteParams(remoteMedia.dtlsParams);
 
-          // One agent full, one lite:  The full agent MUST take the controlling role, and the lite agent MUST take the controlled role
-          // RFC 8445 S6.1.1
-          if (remoteMedia.iceParams?.iceLite) {
-            iceTransport.connection.iceControlling = true;
-          }
+        // One agent full, one lite:  The full agent MUST take the controlling role, and the lite agent MUST take the controlled role
+        // RFC 8445 S6.1.1
+        if (remoteMedia.iceParams?.iceLite) {
+          iceTransport.connection.iceControlling = true;
         }
+      }
 
-        // # add ICE candidates
-        remoteMedia.iceCandidates.forEach(iceTransport.addRemoteCandidate);
+      // # add ICE candidates
+      remoteMedia.iceCandidates.forEach(iceTransport.addRemoteCandidate);
 
-        await iceTransport.iceGather.gather();
+      if (remoteMedia.iceCandidatesComplete) {
+        iceTransport.addRemoteCandidate(undefined);
+      }
 
-        if (remoteMedia.iceCandidatesComplete) {
-          await iceTransport.addRemoteCandidate(undefined);
-        }
+      // # set DTLS role
+      if (remoteSdp.type === "answer" && remoteMedia.dtlsParams?.role) {
+        dtlsTransport.role =
+          remoteMedia.dtlsParams.role === "client" ? "server" : "client";
+      }
+      return iceTransport;
+    });
 
-        // # set DTLS role
-        if (remoteSdp.type === "answer" && remoteMedia.dtlsParams?.role) {
-          dtlsTransport.role =
-            remoteMedia.dtlsParams.role === "client" ? "server" : "client";
-        }
-      })
-    );
+    if (remoteSdp.type === "offer") {
+      this.setSignalingState("have-remote-offer");
+    } else if (remoteSdp.type === "answer") {
+      this.setSignalingState("stable");
+    }
 
     // connect transports
     if (remoteSdp.type === "answer") {
@@ -840,11 +864,11 @@ export class RTCPeerConnection extends EventTarget {
       });
     }
 
-    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) {
@@ -1140,6 +1164,12 @@ export class RTCPeerConnection extends EventTarget {
   }
 
   async createAnswer() {
+    await this.ensureCerts();
+    const description = this.buildAnswer();
+    return description.toJSON();
+  }
+
+  private buildAnswer() {
     this.assertNotClosed();
     if (
       !["have-remote-offer", "have-local-pranswer"].includes(
@@ -1152,8 +1182,6 @@ export class RTCPeerConnection extends EventTarget {
       throw new Error("wrong state");
     }
 
-    await this.ensureCerts();
-
     const description = new SessionDescription();
     addSDPHeader("answer", description);
 
@@ -1206,7 +1234,7 @@ export class RTCPeerConnection extends EventTarget {
       description.group.push(bundle);
     }
 
-    return description.toJSON();
+    return description;
   }
 
   async close() {

package/src/transport/ice.ts

@@ -43,12 +43,12 @@ export class RTCIceTransport {
     }
   }
 
-  addRemoteCandidate = async (candidate?: IceCandidate) => {
+  addRemoteCandidate = (candidate?: IceCandidate) => {
     if (!this.connection.remoteCandidatesEnd) {
       if (!candidate) {
-        await this.connection.addRemoteCandidate(undefined);
+        return this.connection.addRemoteCandidate(undefined);
       } else {
-        await this.connection.addRemoteCandidate(candidateToIce(candidate));
+        return this.connection.addRemoteCandidate(candidateToIce(candidate));
       }
     }
   };