werift 0.14.5 → 0.15.0

package/src/media/rtpReceiver.ts

@@ -48,6 +48,7 @@ export class RTCRtpReceiver {
   readonly onPacketLost = this.nack.onPacketLost;
   readonly onRtcp = new Event<[RtcpPacket]>();
 
+  dtlsTransport!: RTCDtlsTransport;
   sdesMid?: string;
   latestRid?: string;
   latestRepairedRid?: string;
@@ -62,11 +63,11 @@ export class RTCRtpReceiver {
   private rtcpCancel = new AbortController();
   private remoteStreams: { [ssrc: number]: StreamStatistics } = {};
 
-  constructor(
-    public kind: Kind,
-    public dtlsTransport: RTCDtlsTransport,
-    public rtcpSsrc: number
-  ) {}
+  constructor(public kind: Kind, public rtcpSsrc: number) {}
+
+  setDtlsTransport(dtls: RTCDtlsTransport) {
+    this.dtlsTransport = dtls;
+  }
 
   // todo fix
   get track() {

package/src/media/rtpSender.ts

@@ -93,21 +93,15 @@ export class RTCRtpSender {
   private seqOffset = 0;
   private rtpCache: RtpPacket[] = [];
   codec?: RTCRtpCodecParameters;
+  public dtlsTransport!: RTCDtlsTransport;
+  private dtlsDisposer: (() => void)[] = [];
 
   track?: MediaStreamTrack;
   stopped = false;
   rtcpRunning = false;
   private rtcpCancel = new AbortController();
 
-  constructor(
-    public trackOrKind: Kind | MediaStreamTrack,
-    public dtlsTransport: RTCDtlsTransport
-  ) {
-    dtlsTransport.onStateChange.subscribe((state) => {
-      if (state === "connected") {
-        this.onReady.execute();
-      }
-    });
+  constructor(public trackOrKind: Kind | MediaStreamTrack) {
     if (trackOrKind instanceof MediaStreamTrack) {
       if (trackOrKind.streamId) {
         this.streamId = trackOrKind.streamId;
@@ -116,6 +110,21 @@ export class RTCRtpSender {
     }
   }
 
+  setDtlsTransport(dtlsTransport: RTCDtlsTransport) {
+    if (this.dtlsTransport) {
+      this.dtlsDisposer.forEach((dispose) => dispose());
+    }
+
+    this.dtlsTransport = dtlsTransport;
+    this.dtlsDisposer = [
+      this.dtlsTransport.onStateChange.subscribe((state) => {
+        if (state === "connected") {
+          this.onReady.execute();
+        }
+      }).unSubscribe,
+    ];
+  }
+
   get redDistance() {
     return this._redDistance;
   }

package/src/media/rtpTransceiver.ts

@@ -1,8 +1,8 @@
 import Event from "rx.mini";
 import * as uuid from "uuid";
 
+import { RTCDtlsTransport } from "..";
 import { SenderDirections } from "../const";
-import { RTCDtlsTransport } from "../transport/dtls";
 import { Kind } from "../types/domain";
 import {
   RTCRtpCodecParameters,
@@ -39,12 +39,23 @@ export class RTCRtpTransceiver {
 
   constructor(
     public readonly kind: Kind,
-    public readonly receiver: RTCRtpReceiver,
-    public readonly sender: RTCRtpSender,
+    dtlsTransport: RTCDtlsTransport,
+    public receiver: RTCRtpReceiver,
+    public sender: RTCRtpSender,
     /**RFC 8829 4.2.4.  direction the transceiver was initialized with */
-    public direction: Direction,
-    public dtlsTransport: RTCDtlsTransport
-  ) {}
+    public direction: Direction
+  ) {
+    this.setDtlsTransport(dtlsTransport);
+  }
+
+  get dtlsTransport() {
+    return this.receiver.dtlsTransport;
+  }
+
+  setDtlsTransport(dtls: RTCDtlsTransport) {
+    this.receiver.setDtlsTransport(dtls);
+    this.sender.setDtlsTransport(dtls);
+  }
 
   get msid() {
     return `${this.sender.streamId} ${this.sender.trackId}`;