werift 0.24.0 → 0.24.1

package/lib/nonstandard/index.mjs

@@ -10,12 +10,11 @@ import {
 
 // ../common/src/binary.ts
 import { randomBytes } from "crypto";
-import { jspack } from "@shinyoshiaki/jspack";
 function random16() {
-  return jspack.Unpack("!H", randomBytes(2))[0];
+  return randomBytes(2).readUInt16BE(0);
 }
 function random32() {
-  return jspack.Unpack("!L", randomBytes(4))[0];
+  return randomBytes(4).readUInt32BE(0);
 }
 function bufferXor(a, b) {
   if (a.length !== b.length) {
@@ -1838,8 +1837,25 @@ var OggParser = class {
 // ../rtp/src/extra/container/webm/container.ts
 import { createCipheriv, randomBytes as randomBytes2, randomFillSync } from "crypto";
 
+// ../rtp/src/codec/leb128.ts
+function leb128encode(value) {
+  if (!Number.isInteger(value) || value < 0 || !Number.isSafeInteger(value)) {
+    throw new Error("LEB128 encode requires a non-negative safe integer");
+  }
+  const bytes2 = [];
+  let remaining = value;
+  do {
+    let byte = remaining & 127;
+    remaining = Math.floor(remaining / 128);
+    if (remaining !== 0) {
+      byte |= 128;
+    }
+    bytes2.push(byte);
+  } while (remaining !== 0);
+  return Buffer.from(bytes2);
+}
+
 // ../rtp/src/codec/av1.ts
-import { LEB128 } from "@minhducsun2002/leb128";
 var log2 = debug("werift-rtp : packages/rtp/src/codec/av1.ts");
 var AV1RtpPayload = class _AV1RtpPayload {
   /**
@@ -1969,7 +1985,7 @@ var AV1Obu = class _AV1Obu {
     const header = new BitWriter2(8).set(this.obu_forbidden_bit).set(OBU_TYPE_IDS[this.obu_type], 4).set(this.obu_extension_flag).set(this.obu_has_size_field).set(this.obu_reserved_1bit).buffer;
     let obuSize = Buffer.alloc(0);
     if (this.obu_has_size_field) {
-      obuSize = LEB128.encode(this.payload.length);
+      obuSize = leb128encode(this.payload.length);
     }
     return Buffer.concat([header, obuSize, this.payload]);
   }
@@ -1978,14 +1994,20 @@ function leb128decode(buf) {
   let value = 0;
   let leb128bytes = 0;
   for (let i = 0; i < 8; i++) {
+    if (i >= buf.length) {
+      throw new Error("LEB128 decode incomplete");
+    }
     const leb128byte = buf.readUInt8(i);
-    value |= (leb128byte & 127) << i * 7;
+    value += (leb128byte & 127) * 128 ** i;
     leb128bytes++;
     if (!(leb128byte & 128)) {
-      break;
+      if (!Number.isSafeInteger(value)) {
+        throw new Error("LEB128 value exceeds safe integer");
+      }
+      return [value, leb128bytes];
     }
   }
-  return [value, leb128bytes];
+  throw new Error("LEB128 decode incomplete");
 }
 var OBU_TYPES = {
   0: "Reserved",
@@ -4665,13 +4687,12 @@ var RtpPacket = class _RtpPacket {
 };
 
 // ../rtp/src/rtp/rtx.ts
-import { jspack as jspack2 } from "@shinyoshiaki/jspack";
 function unwrapRtx(rtx, payloadType, ssrc) {
   const packet = new RtpPacket(
     new RtpHeader({
       payloadType,
       marker: rtx.header.marker,
-      sequenceNumber: jspack2.Unpack("!H", rtx.payload.subarray(0, 2))[0],
+      sequenceNumber: rtx.payload.readUInt16BE(0),
       timestamp: rtx.header.timestamp,
       ssrc
     }),
@@ -4680,6 +4701,8 @@ function unwrapRtx(rtx, payloadType, ssrc) {
   return packet;
 }
 function wrapRtx(packet, payloadType, sequenceNumber, ssrc) {
+  const originalSequence = Buffer.allocUnsafe(2);
+  originalSequence.writeUInt16BE(packet.header.sequenceNumber, 0);
   const rtx = new RtpPacket(
     new RtpHeader({
       payloadType,
@@ -4690,17 +4713,13 @@ function wrapRtx(packet, payloadType, sequenceNumber, ssrc) {
       csrc: packet.header.csrc,
       extensions: packet.header.extensions
     }),
-    Buffer.concat([
-      Buffer.from(jspack2.Pack("!H", [packet.header.sequenceNumber])),
-      packet.payload
-    ])
+    Buffer.concat([originalSequence, packet.payload])
   );
   return rtx;
 }
 
 // ../rtp/src/srtp/context/context.ts
-import { createHmac as createHmac2 } from "crypto";
-import AES from "aes-js";
+import { createCipheriv as createCipheriv4, createHmac as createHmac2 } from "crypto";
 
 // ../rtp/src/srtp/cipher/ctr.ts
 import {
@@ -5088,6 +5107,11 @@ function finalizeAuthenticatedDecryption(decipher, packetType) {
 }
 
 // ../rtp/src/srtp/context/context.ts
+function aes128EcbEncrypt(key, plaintext) {
+  const cipher = createCipheriv4("aes-128-ecb", key, null);
+  cipher.setAutoPadding(false);
+  return Buffer.concat([cipher.update(plaintext), cipher.final()]);
+}
 var Context = class {
   constructor(masterKey, masterSalt, profile) {
     this.masterKey = masterKey;
@@ -5154,8 +5178,7 @@ var Context = class {
       sessionKey[j] = sessionKey[j] ^ labelAndIndexOverKdr[i];
     }
     sessionKey = Buffer.concat([sessionKey, Buffer.from([0, 0])]);
-    const block = new AES.AES(this.masterKey);
-    return Buffer.from(block.encrypt(sessionKey));
+    return aes128EcbEncrypt(this.masterKey, sessionKey);
   }
   generateSessionSalt(label) {
     let sessionSalt = Buffer.from(this.masterSalt);
@@ -5172,8 +5195,7 @@ var Context = class {
       sessionSalt[j] = sessionSalt[j] ^ labelAndIndexOverKdr[i];
     }
     sessionSalt = Buffer.concat([sessionSalt, Buffer.from([0, 0])]);
-    const block = new AES.AES(this.masterKey);
-    sessionSalt = Buffer.from(block.encrypt(sessionSalt));
+    sessionSalt = aes128EcbEncrypt(this.masterKey, sessionSalt);
     return sessionSalt.subarray(0, 14);
   }
   generateSessionAuthTag(label) {
@@ -5198,9 +5220,8 @@ var Context = class {
       sessionAuthTag,
       Buffer.from([0, 1])
     ]);
-    const block = new AES.AES(this.masterKey);
-    firstRun = Buffer.from(block.encrypt(firstRun));
-    secondRun = Buffer.from(block.encrypt(secondRun));
+    firstRun = aes128EcbEncrypt(this.masterKey, firstRun);
+    secondRun = aes128EcbEncrypt(this.masterKey, secondRun);
     return Buffer.concat([firstRun, secondRun.subarray(0, 4)]);
   }
   getSrtpSsrcState(ssrc) {
@@ -7955,7 +7976,7 @@ function createECDHEPSKKeyExchange() {
 }
 
 // ../dtls/src/cipher/suites/aead.ts
-import { createCipheriv as createCipheriv4, createDecipheriv as createDecipheriv3 } from "crypto";
+import { createCipheriv as createCipheriv5, createDecipheriv as createDecipheriv3 } from "crypto";
 var err2 = debug(
   "werift-dtls : packages/dtls/src/cipher/suites/aead.ts : err"
 );
@@ -8003,7 +8024,7 @@ var AEADCipher = class extends AbstractCipher {
     iv.writeUIntBE(header.sequenceNumber, this.nonceImplicitLength + 2, 6);
     const explicitNonce = iv.slice(this.nonceImplicitLength);
     const additionalBuffer = this.encodeAdditionalBuffer(header, data.length);
-    const cipher = createCipheriv4(this.blockAlgorithm, writeKey, iv, {
+    const cipher = createCipheriv5(this.blockAlgorithm, writeKey, iv, {
       authTagLength: this.authTagLength
     });
     cipher.setAAD(additionalBuffer, {
@@ -8956,17 +8977,82 @@ var COOKIE = 554869826;
 var IPV4_PROTOCOL = 1;
 var IPV6_PROTOCOL = 2;
 
+// ../ice-server/src/stun/ip.ts
+import { isIPv4, isIPv6 } from "node:net";
+function ipAddressToBuffer(address) {
+  if (isIPv4(address)) {
+    const buf = Buffer.allocUnsafe(4);
+    const parts = address.split(".");
+    for (let i = 0; i < 4; i++) {
+      buf[i] = Number(parts[i]) & 255;
+    }
+    return buf;
+  }
+  if (!isIPv6(address)) {
+    throw new Error(`Invalid ip address: ${address}`);
+  }
+  const sections = address.split(":", 8);
+  for (let i = 0; i < sections.length; i++) {
+    let v4Buffer;
+    if (isIPv4(sections[i])) {
+      v4Buffer = ipAddressToBuffer(sections[i]);
+      sections[i] = v4Buffer.subarray(0, 2).toString("hex");
+    }
+    if (v4Buffer && ++i < 8) {
+      sections.splice(i, 0, v4Buffer.subarray(2, 4).toString("hex"));
+    }
+  }
+  if (sections[0] === "") {
+    while (sections.length < 8) sections.unshift("0");
+  } else if (sections[sections.length - 1] === "") {
+    while (sections.length < 8) sections.push("0");
+  } else if (sections.length < 8) {
+    let emptyIndex = 0;
+    for (; emptyIndex < sections.length && sections[emptyIndex] !== ""; emptyIndex++) ;
+    const zeros = [];
+    for (let n = 9 - sections.length; n > 0; n--) {
+      zeros.push("0");
+    }
+    sections.splice(emptyIndex, 1, ...zeros);
+  }
+  const result = Buffer.allocUnsafe(16);
+  let offset = 0;
+  for (const section of sections) {
+    const word = Number.parseInt(section, 16) || 0;
+    result[offset++] = word >> 8 & 255;
+    result[offset++] = word & 255;
+  }
+  return result;
+}
+function bufferToIpAddress(buf) {
+  if (buf.length === 4) {
+    return `${buf[0]}.${buf[1]}.${buf[2]}.${buf[3]}`;
+  }
+  if (buf.length !== 16) {
+    throw new Error(`Invalid ip address buffer length: ${buf.length}`);
+  }
+  const hextets = [];
+  for (let i = 0; i < 16; i += 2) {
+    hextets.push(buf.readUInt16BE(i).toString(16));
+  }
+  let result = hextets.join(":");
+  result = result.replace(/(^|:)0(:0)*:0(:|$)/, "$1::$3");
+  result = result.replace(/:{3,4}/, "::");
+  return result;
+}
+function isIpV4Address(address) {
+  return isIPv4(address);
+}
+
 // ../ice-server/src/stun/attributes.ts
-import * as Int64 from "int64-buffer";
-import nodeIp from "ip";
 function packAddress(value) {
   const [address] = value;
-  const protocol = nodeIp.isV4Format(address) ? IPV4_PROTOCOL : IPV6_PROTOCOL;
+  const protocol = isIpV4Address(address) ? IPV4_PROTOCOL : IPV6_PROTOCOL;
   const buffer2 = Buffer.alloc(4);
   buffer2.writeUInt8(0, 0);
   buffer2.writeUInt8(protocol, 1);
   buffer2.writeUInt16BE(value[1], 2);
-  return Buffer.concat([buffer2, nodeIp.toBuffer(address)]);
+  return Buffer.concat([buffer2, ipAddressToBuffer(address)]);
 }
 function unpackErrorCode(data) {
   if (data.length < 4) {
@@ -8989,12 +9075,12 @@ function unpackAddress(data) {
       if (address.length !== 4) {
         throw new Error("STUN address has invalid length for IPv4");
       }
-      return [nodeIp.toString(address), port];
+      return [bufferToIpAddress(address), port];
     case IPV6_PROTOCOL:
       if (address.length !== 16) {
         throw new Error("STUN address has invalid length for IPv6");
       }
-      return [nodeIp.toString(address), port];
+      return [bufferToIpAddress(address), port];
     default:
       throw new Error("STUN address has unknown protocol");
   }
@@ -9057,12 +9143,11 @@ var packUnsignedShort = (value) => {
 };
 var unpackUnsignedShort = (data) => data.readUInt16BE(0);
 var packUnsigned64 = (value) => {
-  return new Int64.Int64BE(value.toString()).toBuffer();
-};
-var unpackUnsigned64 = (data) => {
-  const int2 = new Int64.Int64BE(data);
-  return BigInt(int2.toString());
+  const buffer2 = Buffer.allocUnsafe(8);
+  buffer2.writeBigUInt64BE(value, 0);
+  return buffer2;
 };
+var unpackUnsigned64 = (data) => data.readBigUInt64BE(0);
 var packString = (value) => Buffer.from(value, "utf8");
 var unpackString = (data) => data.toString("utf8");
 var packSoftware = (value) => {
@@ -9143,10 +9228,6 @@ var log22 = debug("werift-ice : packages/ice/src/stun/protocol.ts");
 // ../ice/src/turn/protocol.ts
 var log23 = debug("werift-ice:packages/ice/src/turn/protocol.ts");
 
-// ../ice/src/ice.ts
-import * as Int642 from "int64-buffer";
-import isEqual from "fast-deep-equal";
-
 // ../ice/src/dns/lookup.ts
 import mdns from "multicast-dns";
 
@@ -9154,7 +9235,6 @@ import mdns from "multicast-dns";
 var log24 = debug("werift-ice : packages/ice/src/ice.ts : log");
 
 // ../ice/src/utils.ts
-import nodeIp2 from "ip";
 var logger = debug("werift-ice : packages/ice/src/utils.ts");
 
 // ../ice/src/ice.ts
@@ -9413,9 +9493,6 @@ var LOST_SIZE2 = 30 * 5;
 // src/media/receiver/receiverTwcc.ts
 var log29 = debug("werift:packages/webrtc/media/receiver/receiverTwcc");
 
-// src/sdp.ts
-import * as Int643 from "int64-buffer";
-
 // src/transport/dtls.ts
 import { Certificate as Certificate3, PrivateKey as PrivateKey2 } from "@fidm/x509";
 var log30 = debug("werift:packages/webrtc/src/transport/dtls.ts");
@@ -9423,12 +9500,6 @@ var log30 = debug("werift:packages/webrtc/src/transport/dtls.ts");
 // src/transport/ice.ts
 var log31 = debug("werift:packages/webrtc/src/transport/ice.ts");
 
-// src/transport/sctp.ts
-import { jspack as jspack5 } from "@shinyoshiaki/jspack";
-
-// ../sctp/src/sctp.ts
-import { jspack as jspack4 } from "@shinyoshiaki/jspack";
-
 // ../sctp/src/chunk.ts
 var Chunk = class _Chunk {
   constructor(flags = 0, _body = Buffer.from("")) {
@@ -9816,9 +9887,6 @@ function decodeParams(body) {
   return params;
 }
 
-// ../sctp/src/param.ts
-import { jspack as jspack3 } from "@shinyoshiaki/jspack";
-
 // ../sctp/src/sctp.ts
 var log32 = debug("werift/sctp/sctp");
 var SCTP_RTO_ALPHA = 1 / 8;
@@ -9857,7 +9925,6 @@ var log34 = debug("werift:packages/webrtc/src/media/rtpReceiver.ts");
 var log35 = debug("werift:packages/webrtc/src/media/router.ts");
 
 // src/media/rtpSender.ts
-import { jspack as jspack6 } from "@shinyoshiaki/jspack";
 var log36 = debug("werift:packages/webrtc/src/media/rtpSender.ts");
 
 // src/sctpManager.ts

package/lib/rtp/src/codec/av1.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AV1Obu = exports.AV1RtpPayload = void 0;
 exports.leb128decode = leb128decode;
-const leb128_1 = require("@minhducsun2002/leb128");
 const common_1 = require("../imports/common");
+const leb128_1 = require("./leb128");
 const log = (0, common_1.debug)("werift-rtp : packages/rtp/src/codec/av1.ts");
 // 4.4 AV1 Aggregation Header
 //  0 1 2 3 4 5 6 7
@@ -254,7 +254,7 @@ class AV1Obu {
             .set(this.obu_reserved_1bit).buffer;
         let obuSize = Buffer.alloc(0);
         if (this.obu_has_size_field) {
-            obuSize = leb128_1.LEB128.encode(this.payload.length);
+            obuSize = (0, leb128_1.leb128encode)(this.payload.length);
         }
         return Buffer.concat([header, obuSize, this.payload]);
     }
@@ -264,14 +264,20 @@ function leb128decode(buf) {
     let value = 0;
     let leb128bytes = 0;
     for (let i = 0; i < 8; i++) {
+        if (i >= buf.length) {
+            throw new Error("LEB128 decode incomplete");
+        }
         const leb128byte = buf.readUInt8(i);
-        value |= (leb128byte & 0x7f) << (i * 7);
+        value += (leb128byte & 0x7f) * 128 ** i;
         leb128bytes++;
         if (!(leb128byte & 0x80)) {
-            break;
+            if (!Number.isSafeInteger(value)) {
+                throw new Error("LEB128 value exceeds safe integer");
+            }
+            return [value, leb128bytes];
         }
     }
-    return [value, leb128bytes];
+    throw new Error("LEB128 decode incomplete");
 }
 const OBU_TYPES = {
     0: "Reserved",

package/lib/rtp/src/codec/av1.js.map

@@ -1 +1 @@
-{"version":3,"file":"av1.js","sourceRoot":"","sources":["../../../../../rtp/src/codec/av1.ts"],"names":[],"mappings":"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","sourcesContent":["// RTP Payload Format For AV1 https://aomediacodec.github.io/av1-rtp-spec/\n\nimport { LEB128 } from \"@minhducsun2002/leb128\";\n\nimport type { RtpHeader } from \"..\";\nimport { BitWriter2, debug, getBit } from \"../imports/common\";\n\nconst log = debug(\"werift-rtp : packages/rtp/src/codec/av1.ts\");\n\n// 4.4 AV1 Aggregation Header\n//  0 1 2 3 4 5 6 7\n// +-+-+-+-+-+-+-+-+\n// |Z|Y| W |N|-|-|-|\n// +-+-+-+-+-+-+-+-+\n\n// RTP payload syntax:\n// 0                   1                   2                   3\n// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n// |Z|Y|0 0|N|-|-|-|  OBU element 1 size (leb128)  |               |\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+               |\n// :                                                               :\n// :                      OBU element 1 data                       :\n// :                                                               :\n// |                                                               |\n// |                               +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n// |                               |  OBU element 2 size (leb128)  |\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n// :                                                               :\n// :                       OBU element 2 data                      :\n// :                                                               :\n// |                                                               |\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n// :                                                               :\n// :                              ...                              :\n// :                                                               :\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n// |OBU e... N size|                                               |\n// +-+-+-+-+-+-+-+-+       OBU element N data      +-+-+-+-+-+-+-+-+\n// |                                               |\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n\n// OBU syntax:\n//     0 1 2 3 4 5 6 7\n//    +-+-+-+-+-+-+-+-+\n//    |0| type  |X|S|-| (REQUIRED)\n//    +-+-+-+-+-+-+-+-+\n// X: | TID |SID|-|-|-| (OPTIONAL)\n//    +-+-+-+-+-+-+-+-+\n//    |1|             |\n//    +-+ OBU payload |\n// S: |1|             | (OPTIONAL, variable length leb128 encoded)\n//    +-+    size     |\n//    |0|             |\n//    +-+-+-+-+-+-+-+-+\n//    |  OBU payload  |\n//    |     ...       |\n\nexport class AV1RtpPayload {\n  /**\n   * RtpStartsWithFragment\n   * MUST be set to 1 if the first OBU element is an OBU fragment that is a continuation of an OBU fragment from the previous packet, and MUST be set to 0 otherwise.\n   */\n  zBit_RtpStartsWithFragment!: number;\n  /**\n   * RtpEndsWithFragment\n   * MUST be set to 1 if the last OBU element is an OBU fragment that will continue in the next packet, and MUST be set to 0 otherwise.\n   */\n  yBit_RtpEndsWithFragment!: number;\n  /**\n   * RtpNumObus\n   * two bit field that describes the number of OBU elements in the packet. This field MUST be set equal to 0 or equal to the number of OBU elements contained in the packet. If set to 0, each OBU element MUST be preceded by a length field.\n   */\n  w_RtpNumObus!: number;\n  /**\n   * RtpStartsNewCodedVideoSequence\n   * MUST be set to 1 if the packet is the first packet of a coded video sequence, and MUST be set to 0 otherwise.\n   */\n  nBit_RtpStartsNewCodedVideoSequence!: number;\n  obu_or_fragment: { data: Buffer; isFragment: boolean }[] = [];\n\n  static deSerialize = (buf: Buffer) => {\n    const p = new AV1RtpPayload();\n\n    let offset = 0;\n\n    p.zBit_RtpStartsWithFragment = getBit(buf[offset], 0);\n    p.yBit_RtpEndsWithFragment = getBit(buf[offset], 1);\n    p.w_RtpNumObus = getBit(buf[offset], 2, 2);\n    p.nBit_RtpStartsNewCodedVideoSequence = getBit(buf[offset], 4);\n    offset++;\n\n    if (p.nBit_RtpStartsNewCodedVideoSequence && p.zBit_RtpStartsWithFragment) {\n      throw new Error();\n    }\n\n    [...Array(p.w_RtpNumObus - 1).keys()].forEach((i) => {\n      const [elementSize, bytes] = leb128decode(buf.subarray(offset));\n\n      const start = offset + bytes;\n      const end = start + elementSize;\n\n      let isFragment = false;\n      if (p.zBit_RtpStartsWithFragment && i === 0) {\n        isFragment = true;\n      }\n      p.obu_or_fragment.push({ data: buf.subarray(start, end), isFragment });\n\n      offset += bytes + elementSize;\n    });\n    let isFragment = false;\n    if (\n      p.yBit_RtpEndsWithFragment ||\n      (p.w_RtpNumObus === 1 && p.zBit_RtpStartsWithFragment)\n    ) {\n      isFragment = true;\n    }\n    p.obu_or_fragment.push({\n      data: buf.subarray(offset),\n      isFragment: isFragment,\n    });\n\n    return p;\n  };\n\n  static isDetectedFinalPacketInSequence(header: RtpHeader) {\n    return header.marker;\n  }\n\n  get isKeyframe() {\n    return this.nBit_RtpStartsNewCodedVideoSequence === 1;\n  }\n\n  static getFrame(payloads: AV1RtpPayload[]) {\n    const frames: Buffer[] = [];\n    const objects = payloads\n      .flatMap((p) => p.obu_or_fragment)\n      .reduce(\n        (\n          acc: Record<number, { data: Buffer; isFragment: boolean }>,\n          cur,\n          i,\n        ) => {\n          acc[i] = cur;\n          return acc;\n        },\n        {},\n      );\n    const length = Object.keys(objects).length;\n\n    for (const i of Object.keys(objects).map(Number)) {\n      const exist = objects[i];\n      if (!exist) continue;\n      const { data, isFragment } = exist;\n      if (isFragment) {\n        let fragments: Buffer[] = [];\n        for (let head = i; head < length; head++) {\n          const target = objects[head];\n          if (target.isFragment) {\n            fragments.push(target.data);\n            delete objects[head];\n          } else {\n            break;\n          }\n        }\n        if (fragments.length <= 1) {\n          log(\"fragment lost, maybe packet lost\");\n          fragments = [];\n        }\n        frames.push(Buffer.concat(fragments));\n      } else {\n        frames.push(data);\n      }\n    }\n    const obus = frames.map((f) => AV1Obu.deSerialize(f));\n    const lastObu = obus.pop()!;\n    return Buffer.concat([\n      ...obus.map((o) => {\n        o.obu_has_size_field = 1;\n        return o.serialize();\n      }),\n      lastObu.serialize(),\n    ]);\n  }\n}\n\nexport class AV1Obu {\n  obu_forbidden_bit!: number;\n  obu_type!: OBU_TYPE;\n  obu_extension_flag!: number;\n  obu_has_size_field!: number;\n  obu_reserved_1bit!: number;\n  payload!: Buffer;\n\n  static deSerialize(buf: Buffer) {\n    const obu = new AV1Obu();\n    let offset = 0;\n    obu.obu_forbidden_bit = getBit(buf[offset], 0);\n    obu.obu_type =\n      OBU_TYPES[getBit(buf[offset], 1, 4) as keyof typeof OBU_TYPES];\n    obu.obu_extension_flag = getBit(buf[offset], 5);\n    obu.obu_has_size_field = getBit(buf[offset], 6);\n    obu.obu_reserved_1bit = getBit(buf[offset], 7);\n    offset++;\n\n    obu.payload = buf.subarray(offset);\n\n    return obu;\n  }\n\n  serialize() {\n    const header = new BitWriter2(8)\n      .set(this.obu_forbidden_bit)\n      .set(OBU_TYPE_IDS[this.obu_type], 4)\n      .set(this.obu_extension_flag)\n      .set(this.obu_has_size_field)\n      .set(this.obu_reserved_1bit).buffer;\n    let obuSize: Uint8Array | Buffer = Buffer.alloc(0);\n    if (this.obu_has_size_field) {\n      obuSize = LEB128.encode(this.payload.length);\n    }\n    return Buffer.concat([header, obuSize, this.payload]);\n  }\n}\n\nexport function leb128decode(buf: Buffer) {\n  let value = 0;\n  let leb128bytes = 0;\n  for (let i = 0; i < 8; i++) {\n    const leb128byte = buf.readUInt8(i);\n    value |= (leb128byte & 0x7f) << (i * 7);\n    leb128bytes++;\n    if (!(leb128byte & 0x80)) {\n      break;\n    }\n  }\n  return [value, leb128bytes];\n}\n\nconst OBU_TYPES = {\n  0: \"Reserved\",\n  1: \"OBU_SEQUENCE_HEADER\",\n  2: \"OBU_TEMPORAL_DELIMITER\",\n  3: \"OBU_FRAME_HEADER\",\n  4: \"OBU_TILE_GROUP\",\n  5: \"OBU_METADATA\",\n  6: \"OBU_FRAME\",\n  7: \"OBU_REDUNDANT_FRAME_HEADER\",\n  8: \"OBU_TILE_LIST\",\n  15: \"OBU_PADDING\",\n} as const;\ntype OBU_TYPE = (typeof OBU_TYPES)[keyof typeof OBU_TYPES];\nconst OBU_TYPE_IDS: Record<OBU_TYPE, number> = Object.entries(OBU_TYPES).reduce(\n  (acc: any, [key, value]) => {\n    acc[value] = Number(key);\n    return acc;\n  },\n  {},\n);\n"]}
+{"version":3,"file":"av1.js","sourceRoot":"","sources":["../../../../../rtp/src/codec/av1.ts"],"names":[],"mappings":"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","sourcesContent":["// RTP Payload Format For AV1 https://aomediacodec.github.io/av1-rtp-spec/\n\nimport type { RtpHeader } from \"..\";\nimport { BitWriter2, debug, getBit } from \"../imports/common\";\nimport { leb128encode } from \"./leb128\";\n\nconst log = debug(\"werift-rtp : packages/rtp/src/codec/av1.ts\");\n\n// 4.4 AV1 Aggregation Header\n//  0 1 2 3 4 5 6 7\n// +-+-+-+-+-+-+-+-+\n// |Z|Y| W |N|-|-|-|\n// +-+-+-+-+-+-+-+-+\n\n// RTP payload syntax:\n// 0                   1                   2                   3\n// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n// |Z|Y|0 0|N|-|-|-|  OBU element 1 size (leb128)  |               |\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+               |\n// :                                                               :\n// :                      OBU element 1 data                       :\n// :                                                               :\n// |                                                               |\n// |                               +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n// |                               |  OBU element 2 size (leb128)  |\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n// :                                                               :\n// :                       OBU element 2 data                      :\n// :                                                               :\n// |                                                               |\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n// :                                                               :\n// :                              ...                              :\n// :                                                               :\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n// |OBU e... N size|                                               |\n// +-+-+-+-+-+-+-+-+       OBU element N data      +-+-+-+-+-+-+-+-+\n// |                                               |\n// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n\n// OBU syntax:\n//     0 1 2 3 4 5 6 7\n//    +-+-+-+-+-+-+-+-+\n//    |0| type  |X|S|-| (REQUIRED)\n//    +-+-+-+-+-+-+-+-+\n// X: | TID |SID|-|-|-| (OPTIONAL)\n//    +-+-+-+-+-+-+-+-+\n//    |1|             |\n//    +-+ OBU payload |\n// S: |1|             | (OPTIONAL, variable length leb128 encoded)\n//    +-+    size     |\n//    |0|             |\n//    +-+-+-+-+-+-+-+-+\n//    |  OBU payload  |\n//    |     ...       |\n\nexport class AV1RtpPayload {\n  /**\n   * RtpStartsWithFragment\n   * MUST be set to 1 if the first OBU element is an OBU fragment that is a continuation of an OBU fragment from the previous packet, and MUST be set to 0 otherwise.\n   */\n  zBit_RtpStartsWithFragment!: number;\n  /**\n   * RtpEndsWithFragment\n   * MUST be set to 1 if the last OBU element is an OBU fragment that will continue in the next packet, and MUST be set to 0 otherwise.\n   */\n  yBit_RtpEndsWithFragment!: number;\n  /**\n   * RtpNumObus\n   * two bit field that describes the number of OBU elements in the packet. This field MUST be set equal to 0 or equal to the number of OBU elements contained in the packet. If set to 0, each OBU element MUST be preceded by a length field.\n   */\n  w_RtpNumObus!: number;\n  /**\n   * RtpStartsNewCodedVideoSequence\n   * MUST be set to 1 if the packet is the first packet of a coded video sequence, and MUST be set to 0 otherwise.\n   */\n  nBit_RtpStartsNewCodedVideoSequence!: number;\n  obu_or_fragment: { data: Buffer; isFragment: boolean }[] = [];\n\n  static deSerialize = (buf: Buffer) => {\n    const p = new AV1RtpPayload();\n\n    let offset = 0;\n\n    p.zBit_RtpStartsWithFragment = getBit(buf[offset], 0);\n    p.yBit_RtpEndsWithFragment = getBit(buf[offset], 1);\n    p.w_RtpNumObus = getBit(buf[offset], 2, 2);\n    p.nBit_RtpStartsNewCodedVideoSequence = getBit(buf[offset], 4);\n    offset++;\n\n    if (p.nBit_RtpStartsNewCodedVideoSequence && p.zBit_RtpStartsWithFragment) {\n      throw new Error();\n    }\n\n    [...Array(p.w_RtpNumObus - 1).keys()].forEach((i) => {\n      const [elementSize, bytes] = leb128decode(buf.subarray(offset));\n\n      const start = offset + bytes;\n      const end = start + elementSize;\n\n      let isFragment = false;\n      if (p.zBit_RtpStartsWithFragment && i === 0) {\n        isFragment = true;\n      }\n      p.obu_or_fragment.push({ data: buf.subarray(start, end), isFragment });\n\n      offset += bytes + elementSize;\n    });\n    let isFragment = false;\n    if (\n      p.yBit_RtpEndsWithFragment ||\n      (p.w_RtpNumObus === 1 && p.zBit_RtpStartsWithFragment)\n    ) {\n      isFragment = true;\n    }\n    p.obu_or_fragment.push({\n      data: buf.subarray(offset),\n      isFragment: isFragment,\n    });\n\n    return p;\n  };\n\n  static isDetectedFinalPacketInSequence(header: RtpHeader) {\n    return header.marker;\n  }\n\n  get isKeyframe() {\n    return this.nBit_RtpStartsNewCodedVideoSequence === 1;\n  }\n\n  static getFrame(payloads: AV1RtpPayload[]) {\n    const frames: Buffer[] = [];\n    const objects = payloads\n      .flatMap((p) => p.obu_or_fragment)\n      .reduce(\n        (\n          acc: Record<number, { data: Buffer; isFragment: boolean }>,\n          cur,\n          i,\n        ) => {\n          acc[i] = cur;\n          return acc;\n        },\n        {},\n      );\n    const length = Object.keys(objects).length;\n\n    for (const i of Object.keys(objects).map(Number)) {\n      const exist = objects[i];\n      if (!exist) continue;\n      const { data, isFragment } = exist;\n      if (isFragment) {\n        let fragments: Buffer[] = [];\n        for (let head = i; head < length; head++) {\n          const target = objects[head];\n          if (target.isFragment) {\n            fragments.push(target.data);\n            delete objects[head];\n          } else {\n            break;\n          }\n        }\n        if (fragments.length <= 1) {\n          log(\"fragment lost, maybe packet lost\");\n          fragments = [];\n        }\n        frames.push(Buffer.concat(fragments));\n      } else {\n        frames.push(data);\n      }\n    }\n    const obus = frames.map((f) => AV1Obu.deSerialize(f));\n    const lastObu = obus.pop()!;\n    return Buffer.concat([\n      ...obus.map((o) => {\n        o.obu_has_size_field = 1;\n        return o.serialize();\n      }),\n      lastObu.serialize(),\n    ]);\n  }\n}\n\nexport class AV1Obu {\n  obu_forbidden_bit!: number;\n  obu_type!: OBU_TYPE;\n  obu_extension_flag!: number;\n  obu_has_size_field!: number;\n  obu_reserved_1bit!: number;\n  payload!: Buffer;\n\n  static deSerialize(buf: Buffer) {\n    const obu = new AV1Obu();\n    let offset = 0;\n    obu.obu_forbidden_bit = getBit(buf[offset], 0);\n    obu.obu_type =\n      OBU_TYPES[getBit(buf[offset], 1, 4) as keyof typeof OBU_TYPES];\n    obu.obu_extension_flag = getBit(buf[offset], 5);\n    obu.obu_has_size_field = getBit(buf[offset], 6);\n    obu.obu_reserved_1bit = getBit(buf[offset], 7);\n    offset++;\n\n    obu.payload = buf.subarray(offset);\n\n    return obu;\n  }\n\n  serialize() {\n    const header = new BitWriter2(8)\n      .set(this.obu_forbidden_bit)\n      .set(OBU_TYPE_IDS[this.obu_type], 4)\n      .set(this.obu_extension_flag)\n      .set(this.obu_has_size_field)\n      .set(this.obu_reserved_1bit).buffer;\n    let obuSize: Buffer = Buffer.alloc(0);\n    if (this.obu_has_size_field) {\n      obuSize = leb128encode(this.payload.length);\n    }\n    return Buffer.concat([header, obuSize, this.payload]);\n  }\n}\n\nexport function leb128decode(buf: Buffer) {\n  let value = 0;\n  let leb128bytes = 0;\n  for (let i = 0; i < 8; i++) {\n    if (i >= buf.length) {\n      throw new Error(\"LEB128 decode incomplete\");\n    }\n    const leb128byte = buf.readUInt8(i);\n    value += (leb128byte & 0x7f) * 128 ** i;\n    leb128bytes++;\n    if (!(leb128byte & 0x80)) {\n      if (!Number.isSafeInteger(value)) {\n        throw new Error(\"LEB128 value exceeds safe integer\");\n      }\n      return [value, leb128bytes];\n    }\n  }\n  throw new Error(\"LEB128 decode incomplete\");\n}\n\nconst OBU_TYPES = {\n  0: \"Reserved\",\n  1: \"OBU_SEQUENCE_HEADER\",\n  2: \"OBU_TEMPORAL_DELIMITER\",\n  3: \"OBU_FRAME_HEADER\",\n  4: \"OBU_TILE_GROUP\",\n  5: \"OBU_METADATA\",\n  6: \"OBU_FRAME\",\n  7: \"OBU_REDUNDANT_FRAME_HEADER\",\n  8: \"OBU_TILE_LIST\",\n  15: \"OBU_PADDING\",\n} as const;\ntype OBU_TYPE = (typeof OBU_TYPES)[keyof typeof OBU_TYPES];\nconst OBU_TYPE_IDS: Record<OBU_TYPE, number> = Object.entries(OBU_TYPES).reduce(\n  (acc: any, [key, value]) => {\n    acc[value] = Number(key);\n    return acc;\n  },\n  {},\n);\n"]}

package/lib/rtp/src/codec/leb128.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Unsigned LEB128 encoder（package-private）。
+ * `codec/index.ts` の public barrel からは re-export しない。decode は `av1.ts` 側の公開 API を維持する。
+ */
+export declare function leb128encode(value: number): Buffer;

package/lib/rtp/src/codec/leb128.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.leb128encode = leb128encode;
+/**
+ * Unsigned LEB128 encoder（package-private）。
+ * `codec/index.ts` の public barrel からは re-export しない。decode は `av1.ts` 側の公開 API を維持する。
+ */
+function leb128encode(value) {
+    if (!Number.isInteger(value) || value < 0 || !Number.isSafeInteger(value)) {
+        throw new Error("LEB128 encode requires a non-negative safe integer");
+    }
+    const bytes = [];
+    let remaining = value;
+    do {
+        let byte = remaining & 0x7f;
+        remaining = Math.floor(remaining / 128);
+        if (remaining !== 0) {
+            byte |= 0x80;
+        }
+        bytes.push(byte);
+    } while (remaining !== 0);
+    return Buffer.from(bytes);
+}
+//# sourceMappingURL=leb128.js.map

package/lib/rtp/src/codec/leb128.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"leb128.js","sourceRoot":"","sources":["../../../../../rtp/src/codec/leb128.ts"],"names":[],"mappings":";;AAIA,oCAiBC;AArBD;;;GAGG;AACH,SAAgB,YAAY,CAAC,KAAa;IACxC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,GAAG,CAAC;QACF,IAAI,IAAI,GAAG,SAAS,GAAG,IAAI,CAAC;QAC5B,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC;QACxC,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;YACpB,IAAI,IAAI,IAAI,CAAC;QACf,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,QAAQ,SAAS,KAAK,CAAC,EAAE;IAE1B,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["/**\n * Unsigned LEB128 encoder（package-private）。\n * `codec/index.ts` の public barrel からは re-export しない。decode は `av1.ts` 側の公開 API を維持する。\n */\nexport function leb128encode(value: number): Buffer {\n  if (!Number.isInteger(value) || value < 0 || !Number.isSafeInteger(value)) {\n    throw new Error(\"LEB128 encode requires a non-negative safe integer\");\n  }\n\n  const bytes: number[] = [];\n  let remaining = value;\n  do {\n    let byte = remaining & 0x7f;\n    remaining = Math.floor(remaining / 128);\n    if (remaining !== 0) {\n      byte |= 0x80;\n    }\n    bytes.push(byte);\n  } while (remaining !== 0);\n\n  return Buffer.from(bytes);\n}\n"]}

package/lib/rtp/src/rtp/rtx.js

@@ -2,19 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unwrapRtx = unwrapRtx;
 exports.wrapRtx = wrapRtx;
-const jspack_1 = require("@shinyoshiaki/jspack");
 const rtp_1 = require("./rtp");
 function unwrapRtx(rtx, payloadType, ssrc) {
     const packet = new rtp_1.RtpPacket(new rtp_1.RtpHeader({
         payloadType,
         marker: rtx.header.marker,
-        sequenceNumber: jspack_1.jspack.Unpack("!H", rtx.payload.subarray(0, 2))[0],
+        sequenceNumber: rtx.payload.readUInt16BE(0),
         timestamp: rtx.header.timestamp,
         ssrc,
     }), rtx.payload.subarray(2));
     return packet;
 }
 function wrapRtx(packet, payloadType, sequenceNumber, ssrc) {
+    const originalSequence = Buffer.allocUnsafe(2);
+    originalSequence.writeUInt16BE(packet.header.sequenceNumber, 0);
     const rtx = new rtp_1.RtpPacket(new rtp_1.RtpHeader({
         payloadType,
         marker: packet.header.marker,
@@ -23,10 +24,7 @@ function wrapRtx(packet, payloadType, sequenceNumber, ssrc) {
         ssrc,
         csrc: packet.header.csrc,
         extensions: packet.header.extensions,
-    }), Buffer.concat([
-        Buffer.from(jspack_1.jspack.Pack("!H", [packet.header.sequenceNumber])),
-        packet.payload,
-    ]));
+    }), Buffer.concat([originalSequence, packet.payload]));
     return rtx;
 }
 //# sourceMappingURL=rtx.js.map

package/lib/rtp/src/rtp/rtx.js.map

@@ -1 +1 @@
-{"version":3,"file":"rtx.js","sourceRoot":"","sources":["../../../../../rtp/src/rtp/rtx.ts"],"names":[],"mappings":";;AAIA,8BAYC;AAED,0BAsBC;AAxCD,iDAA8C;AAE9C,+BAA6C;AAE7C,SAAgB,SAAS,CAAC,GAAc,EAAE,WAAmB,EAAE,IAAY;IACzE,MAAM,MAAM,GAAG,IAAI,eAAS,CAC1B,IAAI,eAAS,CAAC;QACZ,WAAW;QACX,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM;QACzB,cAAc,EAAE,eAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS;QAC/B,IAAI;KACL,CAAC,EACF,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CACxB,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,OAAO,CACrB,MAAiB,EACjB,WAAmB,EACnB,cAAsB,EACtB,IAAY;IAEZ,MAAM,GAAG,GAAG,IAAI,eAAS,CACvB,IAAI,eAAS,CAAC;QACZ,WAAW;QACX,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;QAC5B,cAAc;QACd,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS;QAClC,IAAI;QACJ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;QACxB,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;KACrC,CAAC,EACF,MAAM,CAAC,MAAM,CAAC;QACZ,MAAM,CAAC,IAAI,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,OAAO;KACf,CAAC,CACH,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import { jspack } from \"@shinyoshiaki/jspack\";\n\nimport { RtpHeader, RtpPacket } from \"./rtp\";\n\nexport function unwrapRtx(rtx: RtpPacket, payloadType: number, ssrc: number) {\n  const packet = new RtpPacket(\n    new RtpHeader({\n      payloadType,\n      marker: rtx.header.marker,\n      sequenceNumber: jspack.Unpack(\"!H\", rtx.payload.subarray(0, 2))[0],\n      timestamp: rtx.header.timestamp,\n      ssrc,\n    }),\n    rtx.payload.subarray(2),\n  );\n  return packet;\n}\n\nexport function wrapRtx(\n  packet: RtpPacket,\n  payloadType: number,\n  sequenceNumber: number,\n  ssrc: number,\n) {\n  const rtx = new RtpPacket(\n    new RtpHeader({\n      payloadType,\n      marker: packet.header.marker,\n      sequenceNumber,\n      timestamp: packet.header.timestamp,\n      ssrc,\n      csrc: packet.header.csrc,\n      extensions: packet.header.extensions,\n    }),\n    Buffer.concat([\n      Buffer.from(jspack.Pack(\"!H\", [packet.header.sequenceNumber])),\n      packet.payload,\n    ]),\n  );\n  return rtx;\n}\n"]}
+{"version":3,"file":"rtx.js","sourceRoot":"","sources":["../../../../../rtp/src/rtp/rtx.ts"],"names":[],"mappings":";;AAEA,8BAYC;AAED,0BAqBC;AArCD,+BAA6C;AAE7C,SAAgB,SAAS,CAAC,GAAc,EAAE,WAAmB,EAAE,IAAY;IACzE,MAAM,MAAM,GAAG,IAAI,eAAS,CAC1B,IAAI,eAAS,CAAC;QACZ,WAAW;QACX,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM;QACzB,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QAC3C,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS;QAC/B,IAAI;KACL,CAAC,EACF,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CACxB,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,OAAO,CACrB,MAAiB,EACjB,WAAmB,EACnB,cAAsB,EACtB,IAAY;IAEZ,MAAM,gBAAgB,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC/C,gBAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IAChE,MAAM,GAAG,GAAG,IAAI,eAAS,CACvB,IAAI,eAAS,CAAC;QACZ,WAAW;QACX,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;QAC5B,cAAc;QACd,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS;QAClC,IAAI;QACJ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;QACxB,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;KACrC,CAAC,EACF,MAAM,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAClD,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import { RtpHeader, RtpPacket } from \"./rtp\";\n\nexport function unwrapRtx(rtx: RtpPacket, payloadType: number, ssrc: number) {\n  const packet = new RtpPacket(\n    new RtpHeader({\n      payloadType,\n      marker: rtx.header.marker,\n      sequenceNumber: rtx.payload.readUInt16BE(0),\n      timestamp: rtx.header.timestamp,\n      ssrc,\n    }),\n    rtx.payload.subarray(2),\n  );\n  return packet;\n}\n\nexport function wrapRtx(\n  packet: RtpPacket,\n  payloadType: number,\n  sequenceNumber: number,\n  ssrc: number,\n) {\n  const originalSequence = Buffer.allocUnsafe(2);\n  originalSequence.writeUInt16BE(packet.header.sequenceNumber, 0);\n  const rtx = new RtpPacket(\n    new RtpHeader({\n      payloadType,\n      marker: packet.header.marker,\n      sequenceNumber,\n      timestamp: packet.header.timestamp,\n      ssrc,\n      csrc: packet.header.csrc,\n      extensions: packet.header.extensions,\n    }),\n    Buffer.concat([originalSequence, packet.payload]),\n  );\n  return rtx;\n}\n"]}

package/lib/rtp/src/srtp/context/context.d.ts

@@ -1,6 +1,8 @@
 import { createHmac } from "crypto";
 import type { CipherAesBase } from "../cipher";
 import { type SrtpProfile } from "../const";
+/** AES-128-ECB single-block encrypt for SRTP KDF (no padding). */
+export declare function aes128EcbEncrypt(key: Buffer, plaintext: Buffer): Buffer;
 export declare class Context {
     masterKey: Buffer;
     masterSalt: Buffer;

package/lib/rtp/src/srtp/context/context.js

@@ -1,14 +1,17 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Context = void 0;
+exports.aes128EcbEncrypt = aes128EcbEncrypt;
 const crypto_1 = require("crypto");
-const aes_js_1 = __importDefault(require("aes-js"));
 const ctr_1 = require("../cipher/ctr");
 const gcm_1 = require("../cipher/gcm");
 const const_1 = require("../const");
+/** AES-128-ECB single-block encrypt for SRTP KDF (no padding). */
+function aes128EcbEncrypt(key, plaintext) {
+    const cipher = (0, crypto_1.createCipheriv)("aes-128-ecb", key, null);
+    cipher.setAutoPadding(false);
+    return Buffer.concat([cipher.update(plaintext), cipher.final()]);
+}
 class Context {
     constructor(masterKey, masterSalt, profile) {
         Object.defineProperty(this, "masterKey", {
@@ -96,7 +99,7 @@ class Context {
             value: void 0
         });
         {
-            // aes-js plaintext require 16byte
+            // AES-ECB plaintext require 16byte
             // so need to padding to 14 byte
             const diff = 14 - masterSalt.length;
             if (diff > 0) {
@@ -135,8 +138,7 @@ class Context {
             sessionKey[j] = sessionKey[j] ^ labelAndIndexOverKdr[i];
         }
         sessionKey = Buffer.concat([sessionKey, Buffer.from([0x00, 0x00])]);
-        const block = new aes_js_1.default.AES(this.masterKey);
-        return Buffer.from(block.encrypt(sessionKey));
+        return aes128EcbEncrypt(this.masterKey, sessionKey);
     }
     generateSessionSalt(label) {
         let sessionSalt = Buffer.from(this.masterSalt);
@@ -153,8 +155,7 @@ class Context {
             sessionSalt[j] = sessionSalt[j] ^ labelAndIndexOverKdr[i];
         }
         sessionSalt = Buffer.concat([sessionSalt, Buffer.from([0x00, 0x00])]);
-        const block = new aes_js_1.default.AES(this.masterKey);
-        sessionSalt = Buffer.from(block.encrypt(sessionSalt));
+        sessionSalt = aes128EcbEncrypt(this.masterKey, sessionSalt);
         return sessionSalt.subarray(0, 14);
     }
     generateSessionAuthTag(label) {
@@ -179,9 +180,8 @@ class Context {
             sessionAuthTag,
             Buffer.from([0x00, 0x01]),
         ]);
-        const block = new aes_js_1.default.AES(this.masterKey);
-        firstRun = Buffer.from(block.encrypt(firstRun));
-        secondRun = Buffer.from(block.encrypt(secondRun));
+        firstRun = aes128EcbEncrypt(this.masterKey, firstRun);
+        secondRun = aes128EcbEncrypt(this.masterKey, secondRun);
         return Buffer.concat([firstRun, secondRun.subarray(0, 4)]);
     }
     getSrtpSsrcState(ssrc) {