werift 0.18.13 → 0.18.15

package/src/peerConnection.ts

@@ -196,7 +196,7 @@ export class RTCPeerConnection extends EventTarget {
       const { keys } = this.config.dtls;
       if (keys) {
         this.certificates.push(
-          new RTCCertificate(keys.keyPem, keys.certPem, keys.signatureHash)
+          new RTCCertificate(keys.keyPem, keys.certPem, keys.signatureHash),
         );
       }
     }
@@ -237,7 +237,7 @@ export class RTCPeerConnection extends EventTarget {
 
   private getTransceiverByMLineIndex(index: number) {
     return this.transceivers.find(
-      (transceiver) => transceiver.mLineIndex === index
+      (transceiver) => transceiver.mLineIndex === index,
     );
   }
 
@@ -307,7 +307,7 @@ export class RTCPeerConnection extends EventTarget {
         }
         this.sctpTransport.mLineIndex = i;
         description.media.push(
-          createMediaDescriptionForSctp(this.sctpTransport)
+          createMediaDescriptionForSctp(this.sctpTransport),
         );
       } else {
         const transceiver = this.getTransceiverByMid(mid);
@@ -323,8 +323,8 @@ export class RTCPeerConnection extends EventTarget {
           createMediaDescriptionForTransceiver(
             transceiver,
             this.cname,
-            transceiver.direction
-          )
+            transceiver.direction,
+          ),
         );
       }
     });
@@ -336,13 +336,13 @@ export class RTCPeerConnection extends EventTarget {
         if (transceiver.mid == undefined) {
           transceiver.mid = allocateMid(
             this.seenMid,
-            this.config.midSuffix ? "av" : ""
+            this.config.midSuffix ? "av" : "",
           );
         }
         const mediaDescription = createMediaDescriptionForTransceiver(
           transceiver,
           this.cname,
-          transceiver.direction
+          transceiver.direction,
         );
         if (transceiver.mLineIndex === undefined) {
           transceiver.mLineIndex = description.media.length;
@@ -360,7 +360,7 @@ export class RTCPeerConnection extends EventTarget {
       if (this.sctpTransport.mid == undefined) {
         this.sctpTransport.mid = allocateMid(
           this.seenMid,
-          this.config.midSuffix ? "dc" : ""
+          this.config.midSuffix ? "dc" : "",
         );
       }
       description.media.push(createMediaDescriptionForSctp(this.sctpTransport));
@@ -388,7 +388,7 @@ export class RTCPeerConnection extends EventTarget {
       ordered: boolean;
       negotiated: boolean;
       id?: number;
-    }> = {}
+    }> = {},
   ): RTCDataChannel {
     const base: typeof options = {
       protocol: "",
@@ -427,7 +427,7 @@ export class RTCPeerConnection extends EventTarget {
     }
 
     const transceiver = this.transceivers.find(
-      ({ sender: { ssrc } }) => sender.ssrc === ssrc
+      ({ sender: { ssrc } }) => sender.ssrc === ssrc,
     );
     if (!transceiver) throw new Error("unExist");
 
@@ -510,7 +510,7 @@ export class RTCPeerConnection extends EventTarget {
         }
       } else {
         const transceiver = this.transceivers.find(
-          (t) => t.dtlsTransport.iceTransport.id === iceTransport.id
+          (t) => t.dtlsTransport.iceTransport.id === iceTransport.id,
         );
         if (transceiver) {
           candidate.sdpMLineIndex = transceiver.mLineIndex;
@@ -548,7 +548,7 @@ export class RTCPeerConnection extends EventTarget {
       iceTransport,
       this.router,
       this.certificates,
-      srtpProfiles
+      srtpProfiles,
     );
 
     return dtlsTransport;
@@ -655,7 +655,7 @@ export class RTCPeerConnection extends EventTarget {
 
     // # gather candidates
     const connected = this.iceTransports.find(
-      (transport) => transport.state === "connected"
+      (transport) => transport.state === "connected",
     );
     if (this.remoteIsBundled && connected) {
       // no need to gather ice candidates on an existing bundled connection
@@ -663,8 +663,8 @@ export class RTCPeerConnection extends EventTarget {
     } else {
       await Promise.allSettled(
         this.iceTransports.map((iceTransport) =>
-          iceTransport.iceGather.gather()
-        )
+          iceTransport.iceGather.gather(),
+        ),
       );
     }
 
@@ -775,7 +775,7 @@ export class RTCPeerConnection extends EventTarget {
           await this.sctpTransport.sctp.stateChanged.connected.asPromise();
           log("sctp connected");
         }
-      })
+      }),
     );
 
     this.transportEstablished = true;
@@ -796,7 +796,7 @@ export class RTCPeerConnection extends EventTarget {
 
   private getRemoteRtpParams(
     media: MediaDescription,
-    transceiver: RTCRtpTransceiver
+    transceiver: RTCRtpTransceiver,
   ): RTCRtpReceiveParameters {
     const receiveParameters: RTCRtpReceiveParameters = {
       muxId: media.rtp.muxId,
@@ -820,8 +820,8 @@ export class RTCPeerConnection extends EventTarget {
             });
             return acc;
           },
-          {}
-        )
+          {},
+        ),
       ),
     };
 
@@ -832,7 +832,7 @@ export class RTCPeerConnection extends EventTarget {
     const remoteSdp = this._remoteDescription;
     if (!remoteSdp) return;
     const bundle = remoteSdp.group.find(
-      (g) => g.semantic === "BUNDLE" && this.config.bundlePolicy !== "disable"
+      (g) => g.semantic === "BUNDLE" && this.config.bundlePolicy !== "disable",
     );
     return bundle;
   }
@@ -865,7 +865,7 @@ export class RTCPeerConnection extends EventTarget {
 
     const matchTransceiverWithMedia = (
       transceiver: RTCRtpTransceiver,
-      media: MediaDescription
+      media: MediaDescription,
     ) =>
       transceiver.kind === media.kind &&
       [undefined, media.rtp.muxId].includes(transceiver.mid);
@@ -875,7 +875,7 @@ export class RTCPeerConnection extends EventTarget {
 
       if (["audio", "video"].includes(remoteMedia.kind)) {
         let transceiver = this.transceivers.find((t) =>
-          matchTransceiverWithMedia(t, remoteMedia)
+          matchTransceiverWithMedia(t, remoteMedia),
         );
         if (!transceiver) {
           // create remote transceiver
@@ -961,7 +961,7 @@ export class RTCPeerConnection extends EventTarget {
     const removedTransceivers = this.transceivers.filter(
       (t) =>
         remoteSdp.media.find((m) => matchTransceiverWithMedia(t, m)) ==
-        undefined
+        undefined,
     );
 
     if (sessionDescription.type === "answer") {
@@ -989,14 +989,14 @@ export class RTCPeerConnection extends EventTarget {
     }
 
     const connected = this.iceTransports.find(
-      (transport) => transport.state === "connected"
+      (transport) => transport.state === "connected",
     );
     if (this.remoteIsBundled && connected) {
       // no need to gather ice candidates on an existing bundled connection
       await connected.iceGather.gather();
     } else {
       await Promise.allSettled(
-        transports.map((iceTransport) => iceTransport.iceGather.gather())
+        transports.map((iceTransport) => iceTransport.iceGather.gather()),
       );
     }
 
@@ -1010,7 +1010,7 @@ export class RTCPeerConnection extends EventTarget {
     transceiver: RTCRtpTransceiver,
     remoteMedia: MediaDescription,
     type: "offer" | "answer",
-    mLineIndex: number
+    mLineIndex: number,
   ) {
     if (!transceiver.mid) {
       transceiver.mid = remoteMedia.rtp.muxId;
@@ -1042,8 +1042,8 @@ export class RTCPeerConnection extends EventTarget {
     transceiver.headerExtensions = remoteMedia.rtp.headerExtensions.filter(
       (extension) =>
         (this.config.headerExtensions[remoteMedia.kind as Media] || []).find(
-          (v) => v.uri === extension.uri
-        )
+          (v) => v.uri === extension.uri,
+        ),
     );
 
     // # configure direction
@@ -1082,7 +1082,7 @@ export class RTCPeerConnection extends EventTarget {
           new MediaStream({
             id: streamId,
             tracks: [transceiver.receiver.track],
-          })
+          }),
         );
       }
     }
@@ -1095,7 +1095,7 @@ export class RTCPeerConnection extends EventTarget {
   private setRemoteSCTP(
     remoteMedia: MediaDescription,
     sctpTransport: RTCSctpTransport,
-    mLineIndex: number
+    mLineIndex: number,
   ) {
     // # configure sctp
     this.sctpRemotePort = remoteMedia.sctpPort;
@@ -1112,7 +1112,7 @@ export class RTCPeerConnection extends EventTarget {
 
   private validateDescription(
     description: SessionDescription,
-    isLocal: boolean
+    isLocal: boolean,
   ) {
     if (isLocal) {
       if (description.type === "offer") {
@@ -1121,7 +1121,7 @@ export class RTCPeerConnection extends EventTarget {
       } else if (description.type === "answer") {
         if (
           !["have-remote-offer", "have-local-pranswer"].includes(
-            this.signalingState
+            this.signalingState,
           )
         ) {
           throw new Error("Cannot handle answer in signaling state");
@@ -1135,7 +1135,7 @@ export class RTCPeerConnection extends EventTarget {
       } else if (description.type === "answer") {
         if (
           !["have-local-offer", "have-remote-pranswer"].includes(
-            this.signalingState
+            this.signalingState,
           )
         ) {
           throw new Error("Cannot handle answer in signaling state");
@@ -1168,7 +1168,7 @@ export class RTCPeerConnection extends EventTarget {
   private fireOnTrack(
     track: MediaStreamTrack,
     transceiver: RTCRtpTransceiver,
-    stream: MediaStream
+    stream: MediaStream,
   ) {
     const event: RTCTrackEvent = {
       track,
@@ -1183,14 +1183,14 @@ export class RTCPeerConnection extends EventTarget {
 
   addTransceiver(
     trackOrKind: Kind | MediaStreamTrack,
-    options: Partial<TransceiverOptions> = {}
+    options: Partial<TransceiverOptions> = {},
   ) {
     return this._addTransceiver(trackOrKind, options);
   }
 
   private _addTransceiver(
     trackOrKind: Kind | MediaStreamTrack,
-    options: Partial<TransceiverOptions> = {}
+    options: Partial<TransceiverOptions> = {},
   ) {
     const kind =
       typeof trackOrKind === "string" ? trackOrKind : trackOrKind.kind;
@@ -1209,17 +1209,17 @@ export class RTCPeerConnection extends EventTarget {
       dtlsTransport,
       receiver,
       sender,
-      direction
+      direction,
     );
     newTransceiver.options = options;
     this.router.registerRtpSender(newTransceiver.sender);
 
     // reuse inactive
     const inactiveTransceiverIndex = this.transceivers.findIndex(
-      (t) => t.currentDirection === "inactive"
+      (t) => t.currentDirection === "inactive",
     );
     const inactiveTransceiver = this.transceivers.find(
-      (t) => t.currentDirection === "inactive"
+      (t) => t.currentDirection === "inactive",
     );
     if (inactiveTransceiverIndex > -1 && inactiveTransceiver) {
       this.replaceTransceiver(newTransceiver, inactiveTransceiverIndex);
@@ -1252,7 +1252,7 @@ export class RTCPeerConnection extends EventTarget {
   addTrack(
     track: MediaStreamTrack,
     /**todo impl */
-    ms?: MediaStream
+    ms?: MediaStream,
   ) {
     if (this.isClosed) throw new Error("is closed");
     if (this.getSenders().find((sender) => sender.track?.uuid === track.uuid)) {
@@ -1263,7 +1263,7 @@ export class RTCPeerConnection extends EventTarget {
       (t) =>
         t.sender.track == undefined &&
         t.kind === track.kind &&
-        SenderDirections.includes(t.direction) === true
+        SenderDirections.includes(t.direction) === true,
     );
     if (emptyTrackSender) {
       const sender = emptyTrackSender.sender;
@@ -1277,7 +1277,7 @@ export class RTCPeerConnection extends EventTarget {
         t.sender.track == undefined &&
         t.kind === track.kind &&
         SenderDirections.includes(t.direction) === false &&
-        !t.usedForSender
+        !t.usedForSender,
     );
     if (notSendTransceiver) {
       const sender = notSendTransceiver.sender;
@@ -1326,7 +1326,7 @@ export class RTCPeerConnection extends EventTarget {
     this.assertNotClosed();
     if (
       !["have-remote-offer", "have-local-pranswer"].includes(
-        this.signalingState
+        this.signalingState,
       )
     ) {
       throw new Error("createAnswer failed");
@@ -1347,7 +1347,7 @@ export class RTCPeerConnection extends EventTarget {
         media = createMediaDescriptionForTransceiver(
           transceiver,
           this.cname,
-          andDirection(transceiver.direction, transceiver.offerDirection)
+          andDirection(transceiver.direction, transceiver.offerDirection),
         );
         dtlsTransport = transceiver.dtlsTransport;
       } else if (remoteMedia.kind === "application") {
@@ -1525,13 +1525,13 @@ export class RTCPeerConnection extends EventTarget {
 export function createMediaDescriptionForTransceiver(
   transceiver: RTCRtpTransceiver,
   cname: string,
-  direction: Direction
+  direction: Direction,
 ) {
   const media = new MediaDescription(
     transceiver.kind,
     9,
     "UDP/TLS/RTP/SAVPF",
-    transceiver.codecs.map((c) => c.payloadType)
+    transceiver.codecs.map((c) => c.payloadType),
   );
   media.direction = direction;
   media.msid = transceiver.msid;
@@ -1547,13 +1547,13 @@ export function createMediaDescriptionForTransceiver(
 
   if (transceiver.options.simulcast) {
     media.simulcastParameters = transceiver.options.simulcast.map(
-      (o) => new RTCRtpSimulcastParameters(o)
+      (o) => new RTCRtpSimulcastParameters(o),
     );
   }
 
   if (media.rtp.codecs.find((c) => c.name.toLowerCase() === "rtx")) {
     media.ssrc.push(
-      new SsrcDescription({ ssrc: transceiver.sender.rtxSsrc, cname })
+      new SsrcDescription({ ssrc: transceiver.sender.rtxSsrc, cname }),
     );
     media.ssrcGroup = [
       new GroupDescription("FID", [
@@ -1572,7 +1572,7 @@ export function createMediaDescriptionForSctp(sctp: RTCSctpTransport) {
     "application",
     DISCARD_PORT,
     "UDP/DTLS/SCTP",
-    ["webrtc-datachannel"]
+    ["webrtc-datachannel"],
   );
   media.sctpPort = sctp.port;
   media.rtp.muxId = sctp.mid;
@@ -1584,7 +1584,7 @@ export function createMediaDescriptionForSctp(sctp: RTCSctpTransport) {
 
 export function addTransportDescription(
   media: MediaDescription,
-  dtlsTransport: RTCDtlsTransport
+  dtlsTransport: RTCDtlsTransport,
 ) {
   const iceTransport = dtlsTransport.iceTransport;
   const iceGatherer = iceTransport.iceGather;
@@ -1674,11 +1674,11 @@ export interface PeerConfig {
 
 export const findCodecByMimeType = (
   codecs: RTCRtpCodecParameters[],
-  target: RTCRtpCodecParameters
+  target: RTCRtpCodecParameters,
 ) =>
   codecs.find(
     (localCodec) =>
-      localCodec.mimeType.toLowerCase() === target.mimeType.toLowerCase()
+      localCodec.mimeType.toLowerCase() === target.mimeType.toLowerCase(),
   )
     ? target
     : undefined;

package/src/sdp.ts

@@ -66,7 +66,7 @@ export class SessionDescription {
           case "fingerprint":
             const [algorithm, fingerprint] = value?.split(" ") || [];
             session.dtlsFingerprints.push(
-              new RTCDtlsFingerprint(algorithm, fingerprint)
+              new RTCDtlsFingerprint(algorithm, fingerprint),
             );
             break;
           case "ice-lite":
@@ -117,11 +117,11 @@ export class SessionDescription {
         kind,
         parseInt(m[2]),
         m[3],
-        fmtInt || fmt
+        fmtInt || fmt,
       );
       currentMedia.dtlsParams = new RTCDtlsParameters(
         [...session.dtlsFingerprints],
-        session.dtlsRole
+        session.dtlsRole,
       );
 
       currentMedia.iceParams = new RTCIceParameters({
@@ -157,14 +157,14 @@ export class SessionDescription {
                 new RTCRtpHeaderExtensionParameters({
                   id: parseInt(extId),
                   uri: extUri,
-                })
+                }),
               );
               break;
             case "fingerprint":
               if (!value) throw new Error();
               const [algorithm, fingerprint] = value.split(" ");
               currentMedia.dtlsParams?.fingerprints.push(
-                new RTCDtlsFingerprint(algorithm, fingerprint)
+                new RTCDtlsFingerprint(algorithm, fingerprint),
               );
               break;
             case "ice-options":
@@ -181,7 +181,7 @@ export class SessionDescription {
               break;
             case "max-message-size":
               currentMedia.sctpCapabilities = new RTCSctpCapabilities(
-                parseInt(value, 10)
+                parseInt(value, 10),
               );
               break;
             case "mid":
@@ -258,7 +258,7 @@ export class SessionDescription {
                   new RTCRtpSimulcastParameters({
                     rid,
                     direction: direction as any,
-                  })
+                  }),
                 );
               }
               break;
@@ -314,7 +314,7 @@ export class SessionDescription {
                   new RTCRtcpFeedback({
                     type: feedbackType,
                     parameter: feedbackParam,
-                  })
+                  }),
                 );
               }
             });
@@ -352,7 +352,7 @@ export class SessionDescription {
       lines.push(`a=extmap-allow-mixed`);
     }
     this.msidSemantic.forEach((group) =>
-      lines.push(`a=msid-semantic:${group.str}`)
+      lines.push(`a=msid-semantic:${group.str}`),
     );
     const media = this.media.map((m) => m.toString()).join("");
     const sdp = lines.join("\r\n") + "\r\n" + media;
@@ -403,7 +403,7 @@ export class MediaDescription {
     public kind: Kind,
     public port: number,
     public profile: string,
-    public fmt: string[] | number[]
+    public fmt: string[] | number[],
   ) {}
 
   toString() {
@@ -411,7 +411,7 @@ export class MediaDescription {
     lines.push(
       `m=${this.kind} ${this.port} ${this.profile} ${(this.fmt as number[])
         .map((v) => v.toString())
-        .join(" ")}`
+        .join(" ")}`,
     );
     if (this.host) {
       lines.push(`c=${ipAddressToSdp(this.host)}`);
@@ -440,7 +440,7 @@ export class MediaDescription {
     if (this.dtlsParams) {
       this.dtlsParams.fingerprints.forEach((fingerprint) => {
         lines.push(
-          `a=fingerprint:${fingerprint.algorithm} ${fingerprint.value}`
+          `a=fingerprint:${fingerprint.algorithm} ${fingerprint.value}`,
         );
       });
       lines.push(`a=setup:${DTLS_ROLE_SETUP[this.dtlsParams.role]}`);
@@ -502,7 +502,7 @@ export class MediaDescription {
 
     // rtp extension
     this.rtp.headerExtensions.forEach((extension) =>
-      lines.push(`a=extmap:${extension.id} ${extension.uri}`)
+      lines.push(`a=extmap:${extension.id} ${extension.uri}`),
     );
 
     // simulcast
@@ -512,13 +512,13 @@ export class MediaDescription {
       });
       let line = `a=simulcast:`;
       const recv = this.simulcastParameters.filter(
-        (v) => v.direction === "recv"
+        (v) => v.direction === "recv",
       );
       if (recv.length) {
         line += `recv ${recv.map((v) => v.rid).join(";")} `;
       }
       const send = this.simulcastParameters.filter(
-        (v) => v.direction === "send"
+        (v) => v.direction === "send",
       );
       if (send.length) {
         line += `send ${send.map((v) => v.rid).join(";")}`;
@@ -532,7 +532,10 @@ export class MediaDescription {
 }
 
 export class GroupDescription {
-  constructor(public semantic: string, public items: string[]) {}
+  constructor(
+    public semantic: string,
+    public items: string[],
+  ) {}
 
   get str() {
     return `${this.semantic} ${this.items.join(" ")}`;
@@ -598,7 +601,7 @@ function parseAttr(line: string): [string, string] {
 export function parseGroup(
   dest: GroupDescription[],
   value: string,
-  type: (v: string) => any = (v) => v.toString()
+  type: (v: string) => any = (v) => v.toString(),
 ) {
   const bits = value.split(" ");
   if (bits.length > 0) {
@@ -619,7 +622,7 @@ export function candidateFromSdp(sdp: string) {
     parseInt(bits[5], 10),
     parseInt(bits[3], 10),
     bits[2],
-    bits[7]
+    bits[7],
   );
 
   range(8, bits.length - 1, 2).forEach((i) => {
@@ -640,7 +643,10 @@ export function candidateFromSdp(sdp: string) {
 }
 
 export class RTCSessionDescription {
-  constructor(public sdp: string, public type: "offer" | "answer") {}
+  constructor(
+    public sdp: string,
+    public type: "offer" | "answer",
+  ) {}
   static isThis(o: any) {
     if (typeof o?.sdp === "string") return true;
   }
@@ -648,7 +654,7 @@ export class RTCSessionDescription {
 
 export function addSDPHeader(
   type: "offer" | "answer",
-  description: SessionDescription
+  description: SessionDescription,
 ) {
   const username = "-";
   const sessionId = new Uint64BE(randomBytes(64)).toString().slice(0, 8);
@@ -683,7 +689,7 @@ export function codecParametersToString(
   parameters: {
     [key: string]: string | number;
   },
-  joint: string = "="
+  joint: string = "=",
 ) {
   const params = Object.entries(parameters).map(([k, v]) => {
     if (v) return `${k}${joint}${v}`;

package/src/transport/dtls.ts

@@ -59,7 +59,7 @@ export class RTCDtlsTransport {
     readonly iceTransport: RTCIceTransport,
     readonly router: RtpRouter,
     readonly certificates: RTCCertificate[],
-    private readonly srtpProfiles: Profile[] = []
+    private readonly srtpProfiles: Profile[] = [],
   ) {
     this.localCertificate = this.certificates[0];
   }
@@ -67,7 +67,7 @@ export class RTCDtlsTransport {
   get localParameters() {
     return new RTCDtlsParameters(
       this.localCertificate ? this.localCertificate.getFingerprints() : [],
-      this.role
+      this.role,
     );
   }
 
@@ -79,12 +79,12 @@ export class RTCDtlsTransport {
             signature: SignatureAlgorithm.ecdsa_3,
             hash: HashAlgorithm.sha256_4,
           },
-          NamedCurveAlgorithm.secp256r1_23
+          NamedCurveAlgorithm.secp256r1_23,
         );
       this.localCertificate = new RTCCertificate(
         keyPem,
         certPem,
-        signatureHash
+        signatureHash,
       );
     }
     return this.localCertificate;
@@ -291,7 +291,7 @@ export const DtlsStates = [
   "closed",
   "failed",
 ] as const;
-export type DtlsState = typeof DtlsStates[number];
+export type DtlsState = (typeof DtlsStates)[number];
 
 export type DtlsRole = "auto" | "server" | "client";
 
@@ -302,7 +302,7 @@ export class RTCCertificate {
   constructor(
     privateKeyPem: string,
     public certPem: string,
-    public signatureHash: SignatureHash
+    public signatureHash: SignatureHash,
   ) {
     const cert = Certificate.fromPEM(Buffer.from(certPem));
     this.publicKey = cert.publicKey.toPEM();
@@ -315,8 +315,8 @@ export class RTCCertificate {
         "sha-256",
         fingerprint(
           Certificate.fromPEM(Buffer.from(this.certPem)).raw,
-          "sha256"
-        )
+          "sha256",
+        ),
       ),
     ];
   }
@@ -329,13 +329,16 @@ export type DtlsKeys = {
 };
 
 export class RTCDtlsFingerprint {
-  constructor(public algorithm: string, public value: string) {}
+  constructor(
+    public algorithm: string,
+    public value: string,
+  ) {}
 }
 
 export class RTCDtlsParameters {
   constructor(
     public fingerprints: RTCDtlsFingerprint[] = [],
-    public role: "auto" | "client" | "server"
+    public role: "auto" | "client" | "server",
   ) {}
 }