Merge branch 'develop' into remove-date-fns

Author: koush

package-lock.json

@@ -37,9 +37,6 @@
     "lodash": "^4.17.21",
     "tweetnacl": "^1.0.3"
   },
-  "devDependencies": {
-    "@types/lodash": "^4.17.15"
-  },
   "engines": {
     "node": ">=16"
   },

packages/dtls/package.json

@@ -1,3 +1,4 @@
+import type { CipherGCMTypes } from "crypto";
 import {
   type KeyExchange,
   createECDHEECDSAKeyExchange,
@@ -166,7 +167,7 @@ export function createCipher(cipher: number) {
 export function createAEADCipher(
   id: number,
   name: string,
-  block: string,
+  block: CipherGCMTypes,
   kx: KeyExchange,
   constants: { K_LEN: number; N_MAX: number },
   hash = "sha256",

packages/dtls/src/cipher/create.ts

@@ -1,3 +1,4 @@
+import type { CipherGCMTypes } from "crypto";
 import type { KeyExchange } from "../key-exchange";
 
 export type CipherHeader = {
@@ -19,7 +20,7 @@ export default abstract class AbstractCipher {
   hashAlgorithm?: string;
   verifyDataLength = 12;
 
-  blockAlgorithm?: string;
+  blockAlgorithm?: CipherGCMTypes;
   kx?: KeyExchange;
 
   /**

packages/dtls/src/cipher/suites/abstract.ts

@@ -1,4 +1,4 @@
-import * as crypto from "crypto";
+import { createCipheriv, createDecipheriv } from "crypto";
 
 import { dumpBuffer, getObjectSummary } from "../../helper";
 import { debug } from "../../imports/common";
@@ -72,8 +72,8 @@ export default class AEADCipher extends Cipher {
 
     const additionalBuffer = this.encodeAdditionalBuffer(header, data.length);
 
-    const cipher = crypto.createCipheriv(
-      this.blockAlgorithm as crypto.CipherCCMTypes,
+    const cipher = createCipheriv(
+      this.blockAlgorithm!,
       writeKey,
       iv,
       {
@@ -128,8 +128,8 @@ export default class AEADCipher extends Cipher {
       encrypted.length,
     );
 
-    const decipher = crypto.createDecipheriv(
-      this.blockAlgorithm as crypto.CipherCCMTypes,
+    const decipher = createDecipheriv(
+      this.blockAlgorithm!,
       writeKey,
       iv,
       {

packages/dtls/src/cipher/suites/aead.ts

@@ -1,4 +1,4 @@
-import nodeCrypto, { createSign } from "crypto";
+import { webcrypto, createSign, randomBytes } from "crypto";
 import { Certificate, PrivateKey } from "@fidm/x509";
 import * as x509 from "@peculiar/x509";
 import { encode, types } from "@shinyoshiaki/binary-data";
@@ -16,11 +16,10 @@ import type { NamedCurveKeyPair } from "../cipher/namedCurve";
 import { prfVerifyDataClient, prfVerifyDataServer } from "../cipher/prf";
 import { SessionType, type SessionTypes } from "../cipher/suites/abstract";
 import type AEADCipher from "../cipher/suites/aead";
-import { ProtocolVersion } from "../handshake/binary";
 import type { DtlsRandom } from "../handshake/random";
 import type { DtlsPlaintext } from "../record/message/plaintext";
 
-const crypto = nodeCrypto.webcrypto;
+const crypto = webcrypto;
 x509.cryptoProvider.set(crypto as any);
 
 export class CipherContext {
@@ -104,10 +103,10 @@ export class CipherContext {
     const keys = (await crypto.subtle.generateKey(alg, true, [
       "sign",
       "verify",
-    ])) as nodeCrypto.webcrypto.CryptoKeyPair;
+    ])) as webcrypto.CryptoKeyPair;
 
     const cert = await x509.X509CertificateGenerator.createSelfSigned({
-      serialNumber: nodeCrypto.randomBytes(8).toString("hex"),
+      serialNumber: randomBytes(8).toString("hex"),
       name: "C=AU, ST=Some-State, O=Internet Widgits Pty Ltd",
       notBefore: new Date(),
       notAfter: new Date(Date.now() + 10 * 365 * 24 * 60 * 60 * 1000),

packages/dtls/src/context/cipher.ts

@@ -1,5 +1,4 @@
 import { decode, encode, types } from "@shinyoshiaki/binary-data";
-import times from "lodash/times.js";
 
 import type { Extension } from "../../typings/domain";
 
@@ -30,9 +29,11 @@ export class UseSRTP {
   static deSerialize(buf: Buffer) {
     const useSrtp = new UseSRTP(decode(buf, UseSRTP.spec));
     const profileLength = useSrtp.data.readUInt16BE();
-    const profiles = times(profileLength / 2).map((i) => {
-      return useSrtp.data.readUInt16BE(i * 2 + 2);
-    });
+
+    const profiles = new Array(profileLength / 2);
+    for (let i = 0; i < profiles.length; i++) {
+      profiles[i] = useSrtp.data.readUInt16BE(i * 2 + 2);
+    }
     useSrtp.profiles = profiles;
     useSrtp.mki = useSrtp.data.slice(profileLength + 2);
     return useSrtp;

packages/dtls/src/handshake/extensions/useSrtp.ts

@@ -1,4 +1,4 @@
-import { type Hmac, createHmac } from "crypto";
+import { createHmac } from "crypto";
 import AES from "aes-js";
 
 import type { CipherAesBase } from "../cipher";
@@ -15,12 +15,12 @@ export class Context {
   srtpSessionKey: Buffer;
   srtpSessionSalt: Buffer;
   srtpSessionAuthTag: Buffer;
-  srtpSessionAuth: Hmac;
+  srtpSessionAuth: ReturnType<typeof createHmac>;
   srtcpSSRCStates: { [ssrc: number]: SrtcpSSRCState } = {};
   srtcpSessionKey: Buffer;
   srtcpSessionSalt: Buffer;
   srtcpSessionAuthTag: Buffer;
-  srtcpSessionAuth: Hmac;
+  srtcpSessionAuth: ReturnType<typeof createHmac>;
 
   cipher: CipherAesBase;
 

packages/rtp/src/srtp/context/context.ts

@@ -1,4 +1,3 @@
-import cloneDeep from "lodash/cloneDeep.js";
 import * as uuid from "uuid";
 
 import type { RTCDataChannel } from "./dataChannel";
@@ -57,7 +56,7 @@ const log = debug("werift:packages/webrtc/src/peerConnection.ts");
 export class RTCPeerConnection extends EventTarget {
   readonly cname = uuid.v4();
 
-  config: Required<PeerConfig> = cloneDeep<PeerConfig>(defaultPeerConfig);
+  config: Required<PeerConfig> = generateDefaultPeerConfig();
   signalingState: RTCSignalingState = "stable";
   negotiationneeded = false;
   needRestart = false;
@@ -196,6 +195,9 @@ export class RTCPeerConnection extends EventTarget {
   get remoteDescription() {
     return this.sdpManager.remoteDescription;
   }
+  get remoteIsBundled() {
+    return this.sdpManager.remoteIsBundled;
+  }
   /**@private */
   get _localDescription() {
     return this.sdpManager._localDescription;
@@ -917,32 +919,35 @@ export type RTCIceServer = {
   credential?: string;
 };
 
-export const defaultPeerConfig: PeerConfig = {
-  codecs: {
-    audio: [useOPUS(), usePCMU()],
-    video: [useVP8()],
-  },
-  headerExtensions: {
-    audio: [],
-    video: [],
-  },
-  iceTransportPolicy: "all",
-  iceServers: [{ urls: "stun:stun.l.google.com:19302" }],
-  icePortRange: undefined,
-  iceInterfaceAddresses: undefined,
-  iceAdditionalHostAddresses: undefined,
-  iceUseIpv4: true,
-  iceUseIpv6: true,
-  iceFilterStunResponse: undefined,
-  iceFilterCandidatePair: undefined,
-  icePasswordPrefix: undefined,
-  iceUseLinkLocalAddress: undefined,
-  dtls: {},
-  bundlePolicy: "max-compat",
-  debug: {},
-  midSuffix: false,
-  forceTurnTCP: false,
-};
+function generateDefaultPeerConfig(): PeerConfig {
+  return {
+    codecs: {
+      audio: [useOPUS(), usePCMU()],
+      video: [useVP8()],
+    },
+    headerExtensions: {
+      audio: [],
+      video: [],
+    },
+    iceTransportPolicy: "all",
+    iceServers: [{ urls: "stun:stun.l.google.com:19302" }],
+    icePortRange: undefined,
+    iceInterfaceAddresses: undefined,
+    iceAdditionalHostAddresses: undefined,
+    iceUseIpv4: true,
+    iceUseIpv6: true,
+    iceFilterStunResponse: undefined,
+    iceFilterCandidatePair: undefined,
+    icePasswordPrefix: undefined,
+    iceUseLinkLocalAddress: undefined,
+    dtls: {},
+    bundlePolicy: "max-compat",
+    debug: {},
+    midSuffix: false,
+    forceTurnTCP: false,
+  };
+}
+export const defaultPeerConfig: PeerConfig = generateDefaultPeerConfig();
 
 export interface RTCTrackEvent {
   track: MediaStreamTrack;