werift 0.18.7 → 0.18.9

package/lib/webrtc/src/utils.d.ts

@@ -1,11 +1,10 @@
 /// <reference types="node" />
-import { RtpPacket } from "../../rtp/src";
 import { Direction } from "./media/rtpTransceiver";
+import { MediaStreamTrack } from "./media/track";
 import { RTCIceServer } from "./peerConnection";
 export declare function fingerprint(file: Buffer, hashName: string): any;
 export declare function isDtls(buf: Buffer): boolean;
-export declare function isMedia(buf: Buffer): boolean;
-export declare function reverseSimulcastDirection(dir: "recv" | "send"): "recv" | "send";
+export declare function reverseSimulcastDirection(dir: "recv" | "send"): "send" | "recv";
 export declare const andDirection: (a: Direction, b: Direction) => "inactive" | "sendonly" | "recvonly" | "sendrecv";
 export declare function reverseDirection(dir: Direction): Direction;
 export declare const microTime: () => number;
@@ -25,11 +24,6 @@ export declare function parseIceServers(iceServers: RTCIceServer[]): {
     turnUsername: string | undefined;
     turnPassword: string | undefined;
 };
-export declare class RtpBuilder {
-    sequenceNumber: number;
-    timestamp: number;
-    create(payload: Buffer): RtpPacket;
-}
 /**
  *
  * @param signatureHash
@@ -40,3 +34,9 @@ export declare const createSelfSignedCertificate: (signatureHash: import(".").Si
     keyPem: string;
     signatureHash: import(".").SignatureHash;
 }>;
+export declare class MediaStreamTrackFactory {
+    static rtpSource({ port, kind, }: {
+        port?: number;
+        kind: "audio" | "video";
+    }): Promise<readonly [MediaStreamTrack, number, () => void]>;
+}

package/lib/webrtc/src/utils.js

@@ -3,15 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSelfSignedCertificate = exports.RtpBuilder = exports.parseIceServers = exports.compactNtp = exports.ntpTime = exports.timestampSeconds = exports.milliTime = exports.microTime = exports.reverseDirection = exports.andDirection = exports.reverseSimulcastDirection = exports.isMedia = exports.isDtls = exports.fingerprint = void 0;
+exports.MediaStreamTrackFactory = exports.createSelfSignedCertificate = exports.parseIceServers = exports.compactNtp = exports.ntpTime = exports.timestampSeconds = exports.milliTime = exports.microTime = exports.reverseDirection = exports.andDirection = exports.reverseSimulcastDirection = exports.isDtls = exports.fingerprint = void 0;
 /* eslint-disable prefer-const */
 const crypto_1 = require("crypto");
 const debug_1 = __importDefault(require("debug"));
+const dgram_1 = require("dgram");
 const perf_hooks_1 = require("perf_hooks");
 const src_1 = require("../../common/src");
 const cipher_1 = require("../../dtls/src/context/cipher");
-const src_2 = require("../../rtp/src");
 const rtpTransceiver_1 = require("./media/rtpTransceiver");
+const track_1 = require("./media/track");
 const now = require("nano-time");
 const log = (0, debug_1.default)("werift:packages/webrtc/src/utils.ts");
 function fingerprint(file, hashName) {
@@ -26,11 +27,6 @@ function isDtls(buf) {
     return firstByte > 19 && firstByte < 64;
 }
 exports.isDtls = isDtls;
-function isMedia(buf) {
-    const firstByte = buf[0];
-    return firstByte > 127 && firstByte < 192;
-}
-exports.isMedia = isMedia;
 function reverseSimulcastDirection(dir) {
     if (dir === "recv")
         return "send";
@@ -93,41 +89,28 @@ function parseIceServers(iceServers) {
     return options;
 }
 exports.parseIceServers = parseIceServers;
-class RtpBuilder {
-    constructor() {
-        Object.defineProperty(this, "sequenceNumber", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (0, src_1.random16)()
-        });
-        Object.defineProperty(this, "timestamp", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (0, src_1.random32)()
-        });
-    }
-    create(payload) {
-        this.sequenceNumber = (0, src_1.uint16Add)(this.sequenceNumber, 1);
-        this.timestamp = (0, src_1.uint32Add)(this.timestamp, 960);
-        const header = new src_2.RtpHeader({
-            sequenceNumber: this.sequenceNumber,
-            timestamp: Number(this.timestamp),
-            payloadType: 96,
-            extension: true,
-            marker: false,
-            padding: false,
-        });
-        const rtp = new src_2.RtpPacket(header, payload);
-        return rtp;
-    }
-}
-exports.RtpBuilder = RtpBuilder;
 /**
  *
  * @param signatureHash
  * @param namedCurveAlgorithm necessary when use ecdsa
  */
 exports.createSelfSignedCertificate = cipher_1.CipherContext.createSelfSignedCertificateWithKey;
+class MediaStreamTrackFactory {
+    static async rtpSource({ port, kind, }) {
+        port ?? (port = await (0, src_1.randomPort)());
+        const track = new track_1.MediaStreamTrack({ kind });
+        const udp = (0, dgram_1.createSocket)("udp4");
+        udp.bind(port);
+        const onMessage = (msg, rinfo) => {
+            track.writeRtp(msg);
+        };
+        udp.addListener("message", onMessage);
+        const dispose = () => {
+            udp.removeListener("message", onMessage);
+            udp.close();
+        };
+        return [track, port, dispose];
+    }
+}
+exports.MediaStreamTrackFactory = MediaStreamTrackFactory;
 //# sourceMappingURL=utils.js.map

package/lib/webrtc/src/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable prefer-const */\nimport { createHash } from \"crypto\";\nimport debug from \"debug\";\nimport { performance } from \"perf_hooks\";\n\nimport {\n  bufferReader,\n  bufferWriter,\n  random16,\n  random32,\n  uint16Add,\n  uint32Add,\n} from \"../../common/src\";\nimport { CipherContext } from \"../../dtls/src/context/cipher\";\nimport { Address } from \"../../ice/src\";\nimport { RtpHeader, RtpPacket } from \"../../rtp/src\";\nimport { Direction, Directions } from \"./media/rtpTransceiver\";\nimport { RTCIceServer } from \"./peerConnection\";\nconst now = require(\"nano-time\");\n\nconst log = debug(\"werift:packages/webrtc/src/utils.ts\");\n\nexport function fingerprint(file: Buffer, hashName: string) {\n  const upper = (s: string) => s.toUpperCase();\n  const colon = (s: any) => s.match(/(.{2})/g).join(\":\");\n\n  const hash = createHash(hashName).update(file).digest(\"hex\");\n\n  return colon(upper(hash));\n}\n\nexport function isDtls(buf: Buffer) {\n  const firstByte = buf[0];\n  return firstByte > 19 && firstByte < 64;\n}\n\nexport function isMedia(buf: Buffer) {\n  const firstByte = buf[0];\n  return firstByte > 127 && firstByte < 192;\n}\n\nexport function reverseSimulcastDirection(dir: \"recv\" | \"send\") {\n  if (dir === \"recv\") return \"send\";\n  return \"recv\";\n}\n\nexport const andDirection = (a: Direction, b: Direction) =>\n  Directions[Directions.indexOf(a) & Directions.indexOf(b)];\n\nexport function reverseDirection(dir: Direction): Direction {\n  if (dir === \"sendonly\") return \"recvonly\";\n  if (dir === \"recvonly\") return \"sendonly\";\n  return dir;\n}\n\nexport const microTime = () => now.micro() as number;\n\nexport const milliTime = () => new Date().getTime();\n\nexport const timestampSeconds = () => Date.now() / 1000;\n\n/**https://datatracker.ietf.org/doc/html/rfc3550#section-4 */\nexport const ntpTime = () => {\n  const now = performance.timeOrigin + performance.now() - Date.UTC(1900, 0, 1);\n\n  const seconds = now / 1000;\n  const [sec, msec] = seconds.toString().split(\".\").map(Number);\n\n  const buf = bufferWriter([4, 4], [sec, msec]);\n\n  return buf.readBigUInt64BE();\n};\n\n/**\n * https://datatracker.ietf.org/doc/html/rfc3550#section-4\n * @param ntp\n * @returns 32bit\n */\nexport const compactNtp = (ntp: bigint) => {\n  const buf = bufferWriter([8], [ntp]);\n  const [, sec, msec] = bufferReader(buf, [2, 2, 2, 2]);\n  return bufferWriter([2, 2], [sec, msec]).readUInt32BE();\n};\n\nexport function parseIceServers(iceServers: RTCIceServer[]) {\n  const url2Address = (url?: string) => {\n    if (!url) return;\n    const [address, port] = url.split(\":\");\n    return [address, parseInt(port)] as Address;\n  };\n\n  const stunServer = url2Address(\n    iceServers.find(({ urls }) => urls.includes(\"stun:\"))?.urls.slice(5)\n  );\n  const turnServer = url2Address(\n    iceServers.find(({ urls }) => urls.includes(\"turn:\"))?.urls.slice(5)\n  );\n  const { credential, username } =\n    iceServers.find(({ urls }) => urls.includes(\"turn:\")) || {};\n\n  const options = {\n    stunServer,\n    turnServer,\n    turnUsername: username,\n    turnPassword: credential,\n  };\n  log(\"iceOptions\", options);\n  return options;\n}\n\nexport class RtpBuilder {\n  sequenceNumber = random16();\n  timestamp = random32();\n\n  create(payload: Buffer) {\n    this.sequenceNumber = uint16Add(this.sequenceNumber, 1);\n    this.timestamp = uint32Add(this.timestamp, 960);\n\n    const header = new RtpHeader({\n      sequenceNumber: this.sequenceNumber,\n      timestamp: Number(this.timestamp),\n      payloadType: 96,\n      extension: true,\n      marker: false,\n      padding: false,\n    });\n    const rtp = new RtpPacket(header, payload);\n    return rtp;\n  }\n}\n\n/**\n *\n * @param signatureHash\n * @param namedCurveAlgorithm necessary when use ecdsa\n */\nexport const createSelfSignedCertificate =\n  CipherContext.createSelfSignedCertificateWithKey;\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable prefer-const */\nimport { createHash } from \"crypto\";\nimport debug from \"debug\";\nimport { createSocket, RemoteInfo } from \"dgram\";\nimport { performance } from \"perf_hooks\";\n\nimport { bufferReader, bufferWriter, randomPort } from \"../../common/src\";\nimport { CipherContext } from \"../../dtls/src/context/cipher\";\nimport { Address } from \"../../ice/src\";\nimport { Direction, Directions } from \"./media/rtpTransceiver\";\nimport { MediaStreamTrack } from \"./media/track\";\nimport { RTCIceServer } from \"./peerConnection\";\nconst now = require(\"nano-time\");\n\nconst log = debug(\"werift:packages/webrtc/src/utils.ts\");\n\nexport function fingerprint(file: Buffer, hashName: string) {\n  const upper = (s: string) => s.toUpperCase();\n  const colon = (s: any) => s.match(/(.{2})/g).join(\":\");\n\n  const hash = createHash(hashName).update(file).digest(\"hex\");\n\n  return colon(upper(hash));\n}\n\nexport function isDtls(buf: Buffer) {\n  const firstByte = buf[0];\n  return firstByte > 19 && firstByte < 64;\n}\n\nexport function reverseSimulcastDirection(dir: \"recv\" | \"send\") {\n  if (dir === \"recv\") return \"send\";\n  return \"recv\";\n}\n\nexport const andDirection = (a: Direction, b: Direction) =>\n  Directions[Directions.indexOf(a) & Directions.indexOf(b)];\n\nexport function reverseDirection(dir: Direction): Direction {\n  if (dir === \"sendonly\") return \"recvonly\";\n  if (dir === \"recvonly\") return \"sendonly\";\n  return dir;\n}\n\nexport const microTime = () => now.micro() as number;\n\nexport const milliTime = () => new Date().getTime();\n\nexport const timestampSeconds = () => Date.now() / 1000;\n\n/**https://datatracker.ietf.org/doc/html/rfc3550#section-4 */\nexport const ntpTime = () => {\n  const now = performance.timeOrigin + performance.now() - Date.UTC(1900, 0, 1);\n\n  const seconds = now / 1000;\n  const [sec, msec] = seconds.toString().split(\".\").map(Number);\n\n  const buf = bufferWriter([4, 4], [sec, msec]);\n\n  return buf.readBigUInt64BE();\n};\n\n/**\n * https://datatracker.ietf.org/doc/html/rfc3550#section-4\n * @param ntp\n * @returns 32bit\n */\nexport const compactNtp = (ntp: bigint) => {\n  const buf = bufferWriter([8], [ntp]);\n  const [, sec, msec] = bufferReader(buf, [2, 2, 2, 2]);\n  return bufferWriter([2, 2], [sec, msec]).readUInt32BE();\n};\n\nexport function parseIceServers(iceServers: RTCIceServer[]) {\n  const url2Address = (url?: string) => {\n    if (!url) return;\n    const [address, port] = url.split(\":\");\n    return [address, parseInt(port)] as Address;\n  };\n\n  const stunServer = url2Address(\n    iceServers.find(({ urls }) => urls.includes(\"stun:\"))?.urls.slice(5)\n  );\n  const turnServer = url2Address(\n    iceServers.find(({ urls }) => urls.includes(\"turn:\"))?.urls.slice(5)\n  );\n  const { credential, username } =\n    iceServers.find(({ urls }) => urls.includes(\"turn:\")) || {};\n\n  const options = {\n    stunServer,\n    turnServer,\n    turnUsername: username,\n    turnPassword: credential,\n  };\n  log(\"iceOptions\", options);\n  return options;\n}\n\n/**\n *\n * @param signatureHash\n * @param namedCurveAlgorithm necessary when use ecdsa\n */\nexport const createSelfSignedCertificate =\n  CipherContext.createSelfSignedCertificateWithKey;\n\nexport class MediaStreamTrackFactory {\n  static async rtpSource({\n    port,\n    kind,\n  }: {\n    port?: number;\n    kind: \"audio\" | \"video\";\n  }) {\n    port ??= await randomPort();\n    const track = new MediaStreamTrack({ kind });\n\n    const udp = createSocket(\"udp4\");\n    udp.bind(port);\n    const onMessage = (msg: Buffer, rinfo: RemoteInfo) => {\n      track.writeRtp(msg);\n    };\n    udp.addListener(\"message\", onMessage);\n\n    const dispose = () => {\n      udp.removeListener(\"message\", onMessage);\n      udp.close();\n    };\n\n    return [track, port, dispose] as const;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "werift",
-  "version": "0.18.7",
+  "version": "0.18.9",
   "description": "WebRTC Implementation for TypeScript (Node.js)",
   "keywords": [
     "WebRTC",

package/src/index.ts

@@ -6,6 +6,8 @@ export * from "./dataChannel";
 export * from "./media/extension/rtcpFeedback";
 export * from "./media/extension/rtpExtension";
 export * from "./media/parameters";
+export * from "./media/rtpReceiver";
+export * from "./media/rtpSender";
 export * from "./media/rtpTransceiver";
 export * from "./media/track";
 export * from "./nonstandard/recorder";

package/src/peerConnection.ts

@@ -9,6 +9,7 @@ import { Message } from "../../ice/src/stun/message";
 import { Protocol } from "../../ice/src/types/model";
 import {
   Address,
+  CandidatePair,
   deepMerge,
   InterfaceAddresses,
   Recvonly,
@@ -481,6 +482,7 @@ export class RTCPeerConnection extends EventTarget {
       interfaceAddresses: this.config.iceInterfaceAddresses,
       additionalHostAddresses: this.config.iceAdditionalHostAddresses,
       filterStunResponse: this.config.iceFilterStunResponse,
+      filterCandidatePair: this.config.iceFilterCandidatePair,
       useIpv4: this.config.iceUseIpv4,
       useIpv6: this.config.iceUseIpv6,
     });
@@ -835,10 +837,16 @@ export class RTCPeerConnection extends EventTarget {
     return bundle;
   }
 
-  async setRemoteDescription(sessionDescription: {
-    type: "offer" | "answer";
-    sdp: string;
-  }) {
+  async setRemoteDescription(sessionDescription: RTCSessionDescriptionInit) {
+    if (
+      !sessionDescription.sdp ||
+      !sessionDescription.type ||
+      sessionDescription.type === "rollback" ||
+      sessionDescription.type === "pranswer"
+    ) {
+      throw new Error("invalid sessionDescription");
+    }
+
     // # parse and validate description
     const remoteSdp = SessionDescription.parse(sessionDescription.sdp);
     remoteSdp.type = sessionDescription.type;
@@ -1646,6 +1654,7 @@ export interface PeerConfig {
   iceFilterStunResponse:
     | ((message: Message, addr: Address, protocol: Protocol) => boolean)
     | undefined;
+  iceFilterCandidatePair: ((pair: CandidatePair) => boolean) | undefined;
   dtls: Partial<{
     keys: DtlsKeys;
   }>;
@@ -1715,6 +1724,7 @@ export const defaultPeerConfig: PeerConfig = {
   iceUseIpv4: true,
   iceUseIpv6: true,
   iceFilterStunResponse: undefined,
+  iceFilterCandidatePair: undefined,
   dtls: {},
   bundlePolicy: "max-compat",
   debug: {},
@@ -1737,3 +1747,9 @@ export interface RTCPeerConnectionIceEvent {
 }
 
 type Media = "audio" | "video";
+
+export interface RTCSessionDescriptionInit {
+  sdp?: string;
+  type: RTCSdpType;
+}
+export type RTCSdpType = "answer" | "offer" | "pranswer" | "rollback";

package/src/transport/dtls.ts

@@ -20,6 +20,7 @@ import { CipherContext } from "../../../dtls/src/context/cipher";
 import { Profile } from "../../../dtls/src/context/srtp";
 import { Connection } from "../../../ice/src";
 import {
+  isMedia,
   isRtcp,
   RtcpPacket,
   RtcpPacketConverter,
@@ -31,7 +32,7 @@ import {
 import { keyLength, saltLength } from "../../../rtp/src/srtp/const";
 import { RtpRouter } from "../media/router";
 import { PeerConfig } from "../peerConnection";
-import { fingerprint, isDtls, isMedia } from "../utils";
+import { fingerprint, isDtls } from "../utils";
 import { RTCIceTransport } from "./ice";
 
 const log = debug("werift:packages/webrtc/src/transport/dtls.ts");

package/src/utils.ts

@@ -1,20 +1,14 @@
 /* eslint-disable prefer-const */
 import { createHash } from "crypto";
 import debug from "debug";
+import { createSocket, RemoteInfo } from "dgram";
 import { performance } from "perf_hooks";
 
-import {
-  bufferReader,
-  bufferWriter,
-  random16,
-  random32,
-  uint16Add,
-  uint32Add,
-} from "../../common/src";
+import { bufferReader, bufferWriter, randomPort } from "../../common/src";
 import { CipherContext } from "../../dtls/src/context/cipher";
 import { Address } from "../../ice/src";
-import { RtpHeader, RtpPacket } from "../../rtp/src";
 import { Direction, Directions } from "./media/rtpTransceiver";
+import { MediaStreamTrack } from "./media/track";
 import { RTCIceServer } from "./peerConnection";
 const now = require("nano-time");
 
@@ -34,11 +28,6 @@ export function isDtls(buf: Buffer) {
   return firstByte > 19 && firstByte < 64;
 }
 
-export function isMedia(buf: Buffer) {
-  const firstByte = buf[0];
-  return firstByte > 127 && firstByte < 192;
-}
-
 export function reverseSimulcastDirection(dir: "recv" | "send") {
   if (dir === "recv") return "send";
   return "recv";
@@ -108,27 +97,6 @@ export function parseIceServers(iceServers: RTCIceServer[]) {
   return options;
 }
 
-export class RtpBuilder {
-  sequenceNumber = random16();
-  timestamp = random32();
-
-  create(payload: Buffer) {
-    this.sequenceNumber = uint16Add(this.sequenceNumber, 1);
-    this.timestamp = uint32Add(this.timestamp, 960);
-
-    const header = new RtpHeader({
-      sequenceNumber: this.sequenceNumber,
-      timestamp: Number(this.timestamp),
-      payloadType: 96,
-      extension: true,
-      marker: false,
-      padding: false,
-    });
-    const rtp = new RtpPacket(header, payload);
-    return rtp;
-  }
-}
-
 /**
  *
  * @param signatureHash
@@ -136,3 +104,30 @@ export class RtpBuilder {
  */
 export const createSelfSignedCertificate =
   CipherContext.createSelfSignedCertificateWithKey;
+
+export class MediaStreamTrackFactory {
+  static async rtpSource({
+    port,
+    kind,
+  }: {
+    port?: number;
+    kind: "audio" | "video";
+  }) {
+    port ??= await randomPort();
+    const track = new MediaStreamTrack({ kind });
+
+    const udp = createSocket("udp4");
+    udp.bind(port);
+    const onMessage = (msg: Buffer, rinfo: RemoteInfo) => {
+      track.writeRtp(msg);
+    };
+    udp.addListener("message", onMessage);
+
+    const dispose = () => {
+      udp.removeListener("message", onMessage);
+      udp.close();
+    };
+
+    return [track, port, dispose] as const;
+  }
+}