werift 0.19.0 → 0.19.1

package/src/nonstandard/recorder/writer/webm.ts

@@ -1,6 +1,8 @@
 import { unlink } from "fs/promises";
 import { EventDisposer } from "rx.mini";
 
+import { MediaWriter } from ".";
+import { MediaStreamTrack, WeriftError } from "../../..";
 import {
   DepacketizeCallback,
   JitterBufferCallback,
@@ -8,12 +10,10 @@ import {
   NtpTimeCallback,
   RtcpSourceCallback,
   RtpSourceCallback,
-  saveToFileSystem,
   SupportedCodec,
   WebmCallback,
+  saveToFileSystem,
 } from "../../../../../rtp/src/extra";
-import { MediaStreamTrack, WeriftError } from "../../..";
-import { MediaWriter } from ".";
 
 const sourcePath = "packages/webrtc/src/nonstandard/recorder/writer/webm.ts";
 

package/src/nonstandard/userMedia.ts

@@ -134,9 +134,7 @@ export class MediaPlayerWebm extends MediaPlayer {
     const run = async () => {
       if (payloadType > 100) payloadType = 96;
 
-      const cmd = `gst-launch-1.0 filesrc location=${
-        this.props.path
-      } ! matroskademux name=d \
+      const cmd = `gst-launch-1.0 filesrc location=${this.props.path} ! matroskademux name=d \
 d.video_0 ! queue ! rtpvp8pay pt=${payloadType++} ! \
 udpsink host=127.0.0.1 port=${this.props.videoPort} \
 d.audio_0 ! queue ! rtpopuspay pt=${payloadType++} ! \

package/src/peerConnection.ts

@@ -4,34 +4,34 @@ import isEqual from "lodash/isEqual";
 import Event from "rx.mini";
 import * as uuid from "uuid";
 
-import { Profile } from "../../dtls/src/context/srtp";
-import { Message } from "../../ice/src/stun/message";
-import { Protocol } from "../../ice/src/types/model";
 import {
   Address,
   CandidatePair,
-  deepMerge,
   InterfaceAddresses,
   Recvonly,
   Sendonly,
   Sendrecv,
+  deepMerge,
 } from ".";
 import {
-  codecParametersFromString,
   DtlsKeys,
+  codecParametersFromString,
   useNACK,
   usePLI,
   useREMB,
 } from ".";
+import { Profile } from "../../dtls/src/context/srtp";
+import { Message } from "../../ice/src/stun/message";
+import { Protocol } from "../../ice/src/types/model";
 import {
   DISCARD_HOST,
   DISCARD_PORT,
   ReceiverDirection,
-  SenderDirections,
   SRTP_PROFILE,
+  SenderDirections,
 } from "./const";
 import { RTCDataChannel, RTCDataChannelParameters } from "./dataChannel";
-import { enumerate, EventTarget } from "./helper";
+import { EventTarget, enumerate } from "./helper";
 import {
   RTCRtpCodecParameters,
   RTCRtpCodingParameters,
@@ -51,11 +51,11 @@ import {
 } from "./media/rtpTransceiver";
 import { MediaStream, MediaStreamTrack } from "./media/track";
 import {
-  addSDPHeader,
   GroupDescription,
   MediaDescription,
   SessionDescription,
   SsrcDescription,
+  addSDPHeader,
 } from "./sdp";
 import { RTCCertificate, RTCDtlsTransport } from "./transport/dtls";
 import {
@@ -168,20 +168,18 @@ export class RTCPeerConnection extends EventTarget {
 
       codecParams.payloadType = 96 + i;
       switch (codecParams.name.toLowerCase()) {
-        case "rtx":
-          {
-            codecParams.parameters = `apt=${codecParams.payloadType - 1}`;
-          }
-          break;
-        case "red":
-          {
-            if (codecParams.contentType === "audio") {
-              const redundant = codecParams.payloadType + 1;
-              codecParams.parameters = `${redundant}/${redundant}`;
-              codecParams.payloadType = 63;
-            }
+        case "rtx": {
+          codecParams.parameters = `apt=${codecParams.payloadType - 1}`;
+        }
+        break;
+        case "red": {
+          if (codecParams.contentType === "audio") {
+            const redundant = codecParams.payloadType + 1;
+            codecParams.parameters = `${redundant}/${redundant}`;
+            codecParams.payloadType = 63;
           }
-          break;
+        }
+        break;
       }
     }
 
@@ -214,12 +212,16 @@ export class RTCPeerConnection extends EventTarget {
   }
 
   get localDescription() {
-    if (!this._localDescription) return;
+    if (!this._localDescription) {
+      return undefined;
+    }
     return this._localDescription.toJSON();
   }
 
   get remoteDescription() {
-    if (!this._remoteDescription) return;
+    if (!this._remoteDescription) {
+      return undefined;
+    }
     return this._remoteDescription.toJSON();
   }
 
@@ -830,7 +832,9 @@ export class RTCPeerConnection extends EventTarget {
 
   get remoteIsBundled() {
     const remoteSdp = this._remoteDescription;
-    if (!remoteSdp) return;
+    if (!remoteSdp) {
+      return undefined;
+    }
     const bundle = remoteSdp.group.find(
       (g) => g.semantic === "BUNDLE" && this.config.bundlePolicy !== "disable",
     );

package/src/sdp.ts

@@ -1,7 +1,7 @@
 import { randomBytes } from "crypto";
+import { isIPv4 } from "net";
 import { Uint64BE } from "int64-buffer";
 import range from "lodash/range";
-import { isIPv4 } from "net";
 
 import {
   DTLS_ROLE_SETUP,
@@ -63,12 +63,13 @@ export class SessionDescription {
       } else if (line.startsWith("a=")) {
         const [attr, value] = parseAttr(line);
         switch (attr) {
-          case "fingerprint":
+          case "fingerprint": {
             const [algorithm, fingerprint] = value?.split(" ") || [];
             session.dtlsFingerprints.push(
               new RTCDtlsFingerprint(algorithm, fingerprint),
             );
-            break;
+          }
+          break;
           case "ice-lite":
             session.iceLite = true;
             break;
@@ -147,7 +148,7 @@ export class SessionDescription {
             case "end-of-candidates":
               currentMedia.iceCandidatesComplete = true;
               break;
-            case "extmap":
+            case "extmap": {
               // eslint-disable-next-line prefer-const
               let [extId, extUri] = value.split(" ");
               if (extId.includes("/")) {
@@ -159,14 +160,16 @@ export class SessionDescription {
                   uri: extUri,
                 }),
               );
-              break;
-            case "fingerprint":
+            }
+            break;
+            case "fingerprint": {
               if (!value) throw new Error();
               const [algorithm, fingerprint] = value.split(" ");
               currentMedia.dtlsParams?.fingerprints.push(
                 new RTCDtlsFingerprint(algorithm, fingerprint),
               );
-              break;
+            }
+            break;
             case "ice-options":
               currentMedia.iceOptions = value;
               break;
@@ -190,11 +193,12 @@ export class SessionDescription {
             case "msid":
               currentMedia.msid = value;
               break;
-            case "rtcp":
+            case "rtcp": {
               const [port, rest] = divide(value, " ");
               currentMedia.rtcpPort = parseInt(port);
               currentMedia.rtcpHost = ipAddressFromSdp(rest);
-              break;
+            }
+            break;
             case "rtcp-mux":
               currentMedia.rtcpMux = true;
               break;
@@ -207,34 +211,34 @@ export class SessionDescription {
             case "inactive":
               currentMedia.direction = attr;
               break;
-            case "rtpmap":
-              {
-                const [formatId, formatDesc] = divide(value, " ");
-                const [type, clock, channel] = formatDesc.split("/");
-                let channels: number | undefined;
-                if (currentMedia.kind === "audio") {
-                  channels = channel ? parseInt(channel) : 1;
-                }
-                const codec = new RTCRtpCodecParameters({
-                  mimeType: currentMedia.kind + "/" + type,
-                  channels,
-                  clockRate: parseInt(clock),
-                  payloadType: parseInt(formatId),
-                });
-                currentMedia.rtp.codecs.push(codec);
+            case "rtpmap": {
+              const [formatId, formatDesc] = divide(value, " ");
+              const [type, clock, channel] = formatDesc.split("/");
+              let channels: number | undefined;
+              if (currentMedia.kind === "audio") {
+                channels = channel ? parseInt(channel) : 1;
               }
-              break;
-            case "sctpmap":
+              const codec = new RTCRtpCodecParameters({
+                mimeType: currentMedia.kind + "/" + type,
+                channels,
+                clockRate: parseInt(clock),
+                payloadType: parseInt(formatId),
+              });
+              currentMedia.rtp.codecs.push(codec);
+            }
+            break;
+            case "sctpmap": {
               if (!value) throw new Error();
               const [formatId, formatDesc] = divide(value, " ");
               currentMedia.sctpMap[parseInt(formatId)] = formatDesc;
               currentMedia.sctpPort = parseInt(formatId);
-              break;
+            }
+            break;
             case "sctp-port":
               if (!value) throw new Error();
               currentMedia.sctpPort = parseInt(value);
               break;
-            case "ssrc":
+            case "ssrc": {
               const [ssrcStr, ssrcDesc] = divide(value, " ");
               const ssrc = parseInt(ssrcStr);
               const [ssrcAttr, ssrcValue] = divide(ssrcDesc, ":");
@@ -246,22 +250,22 @@ export class SessionDescription {
               if (SSRC_INFO_ATTRS.includes(ssrcAttr)) {
                 ssrcInfo[ssrcAttr] = ssrcValue;
               }
-              break;
+            }
+            break;
             case "ssrc-group":
               parseGroup(currentMedia.ssrcGroup, value);
               break;
-            case "rid":
-              {
-                const [rid, direction] = divide(value, " ");
-
-                currentMedia.simulcastParameters.push(
-                  new RTCRtpSimulcastParameters({
-                    rid,
-                    direction: direction as any,
-                  }),
-                );
-              }
-              break;
+            case "rid": {
+              const [rid, direction] = divide(value, " ");
+
+              currentMedia.simulcastParameters.push(
+                new RTCRtpSimulcastParameters({
+                  rid,
+                  direction: direction as any,
+                }),
+              );
+            }
+            break;
           }
         }
       });
@@ -278,11 +282,7 @@ export class SessionDescription {
           for (let i = 0; i < bundle.items.length; i++) {
             if (!bundle.items.includes(i.toString())) continue;
             const check = session.media[i];
-            if (
-              check?.iceParams &&
-              check.iceParams.usernameFragment &&
-              check.iceParams.password
-            ) {
+            if (check.iceParams?.usernameFragment && check.iceParams.password) {
               currentMedia.iceParams = {
                 ...check.iceParams,
               };
@@ -327,7 +327,7 @@ export class SessionDescription {
   }
 
   webrtcTrackId(media: MediaDescription) {
-    if (media.msid && media.msid.includes(" ")) {
+    if (media.msid?.includes(" ")) {
       const bits = media.msid.split(" ");
       for (const group of this.msidSemantic) {
         if (
@@ -532,10 +532,7 @@ 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(" ")}`;
@@ -643,10 +640,7 @@ 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;
   }

package/src/transport/dtls.ts

@@ -20,14 +20,14 @@ import { CipherContext } from "../../../dtls/src/context/cipher";
 import { Profile } from "../../../dtls/src/context/srtp";
 import { Connection } from "../../../ice/src";
 import {
-  isMedia,
-  isRtcp,
   RtcpPacket,
   RtcpPacketConverter,
   RtpHeader,
   RtpPacket,
   SrtcpSession,
   SrtpSession,
+  isMedia,
+  isRtcp,
 } from "../../../rtp/src";
 import { keyLength, saltLength } from "../../../rtp/src/srtp/const";
 import { RtpRouter } from "../media/router";
@@ -329,10 +329,7 @@ export type DtlsKeys = {
 };
 
 export class RTCDtlsFingerprint {
-  constructor(
-    public algorithm: string,
-    public value: string,
-  ) {}
+  constructor(public algorithm: string, public value: string) {}
 }
 
 export class RTCDtlsParameters {

package/src/transport/ice.ts

@@ -248,7 +248,7 @@ export class IceCandidate {
 }
 
 export class RTCIceParameters {
-  iceLite: boolean = false;
+  iceLite = false;
   usernameFragment!: string;
   password!: string;
 

package/src/transport/sctp.ts

@@ -108,79 +108,73 @@ export class RTCSctpTransport {
     if (ppId === WEBRTC_DCEP && data.length > 0) {
       log("DCEP", streamId, ppId, data);
       switch (data[0]) {
-        case DATA_CHANNEL_OPEN:
-          {
-            if (data.length < 12) {
-              log("DATA_CHANNEL_OPEN data.length not enough");
-              return;
-            }
-
-            if (!Object.keys(this.dataChannels).includes(streamId.toString())) {
-              const [
-                ,
-                channelType,
-                ,
-                reliability,
-                labelLength,
-                protocolLength,
-              ] = jspack.Unpack("!BBHLHH", data);
-
-              let pos = 12;
-              const label = data.slice(pos, pos + labelLength).toString("utf8");
-              pos += labelLength;
-              const protocol = data
-                .slice(pos, pos + protocolLength)
-                .toString("utf8");
-
-              log("DATA_CHANNEL_OPEN", {
-                channelType,
-                reliability,
-                streamId,
-                label,
-                protocol,
-              });
-
-              const maxRetransmits =
-                (channelType & 0x03) === 1 ? reliability : undefined;
-              const maxPacketLifeTime =
-                (channelType & 0x03) === 2 ? reliability : undefined;
-
-              // # register channel
-              const parameters = new RTCDataChannelParameters({
-                label,
-                ordered: (channelType & 0x80) === 0,
-                maxPacketLifeTime,
-                maxRetransmits,
-                protocol,
-                id: streamId,
-              });
-              const channel = new RTCDataChannel(this, parameters, false);
-              channel.isCreatedByRemote = true;
-              this.dataChannels[streamId] = channel;
-
-              this.onDataChannel.execute(channel);
-              channel.setReadyState("open");
-            } else {
-              log("datachannel already opened", "retransmit ack");
-            }
+        case DATA_CHANNEL_OPEN: {
+          if (data.length < 12) {
+            log("DATA_CHANNEL_OPEN data.length not enough");
+            return;
+          }
 
-            const channel = this.dataChannels[streamId];
-            this.dataChannelQueue.push([
-              channel,
-              WEBRTC_DCEP,
-              Buffer.from(jspack.Pack("!B", [DATA_CHANNEL_ACK])),
-            ]);
-            await this.dataChannelFlush();
+          if (!Object.keys(this.dataChannels).includes(streamId.toString())) {
+            const [, channelType, , reliability, labelLength, protocolLength] =
+              jspack.Unpack("!BBHLHH", data);
+
+            let pos = 12;
+            const label = data.slice(pos, pos + labelLength).toString("utf8");
+            pos += labelLength;
+            const protocol = data
+              .slice(pos, pos + protocolLength)
+              .toString("utf8");
+
+            log("DATA_CHANNEL_OPEN", {
+              channelType,
+              reliability,
+              streamId,
+              label,
+              protocol,
+            });
+
+            const maxRetransmits =
+              (channelType & 0x03) === 1 ? reliability : undefined;
+            const maxPacketLifeTime =
+              (channelType & 0x03) === 2 ? reliability : undefined;
+
+            // # register channel
+            const parameters = new RTCDataChannelParameters({
+              label,
+              ordered: (channelType & 0x80) === 0,
+              maxPacketLifeTime,
+              maxRetransmits,
+              protocol,
+              id: streamId,
+            });
+            const channel = new RTCDataChannel(this, parameters, false);
+            channel.isCreatedByRemote = true;
+            this.dataChannels[streamId] = channel;
+
+            this.onDataChannel.execute(channel);
+            channel.setReadyState("open");
+          } else {
+            log("datachannel already opened", "retransmit ack");
           }
-          break;
-        case DATA_CHANNEL_ACK:
+
+          const channel = this.dataChannels[streamId];
+          this.dataChannelQueue.push([
+            channel,
+            WEBRTC_DCEP,
+            Buffer.from(jspack.Pack("!B", [DATA_CHANNEL_ACK])),
+          ]);
+          await this.dataChannelFlush();
+        }
+        break;
+        case DATA_CHANNEL_ACK: {
           log("DATA_CHANNEL_ACK", streamId, ppId);
           const channel = this.dataChannels[streamId];
           if (!channel) {
             throw new Error("channel not found");
           }
           channel.setReadyState("open");
-          break;
+        }
+        break;
       }
     } else {
       const channel = this.dataChannels[streamId];
@@ -200,7 +194,7 @@ export class RTCSctpTransport {
           }
         })();
 
-        channel.message.execute(msg);
+        channel.onMessage.execute(msg);
         channel.emit("message", { data: msg });
         if (channel.onmessage) {
           channel.onmessage({ data: msg });

package/src/utils.ts

@@ -1,7 +1,7 @@
 /* eslint-disable prefer-const */
 import { createHash } from "crypto";
+import { RemoteInfo, createSocket } from "dgram";
 import debug from "debug";
-import { createSocket, RemoteInfo } from "dgram";
 import mergeWith from "lodash/mergeWith";
 import { performance } from "perf_hooks";