@blockcast/mmt-container 0.3.0 → 0.4.0-main.71d61b2a53f2

package/dist/no-modules.js

@@ -1,78 +1,17 @@
-// ../mmt-alta-parse/dist/index.js
+// ../mmt-base/dist/mmtp.js
 var MMTP_HEADER_SIZE = 12;
 var MPU_HEADER_SIZE = 8;
-var MPU_LENGTH_FIELD_SIZE = 2;
-var MPU_HEADER_REMAINDER_SIZE = MPU_HEADER_SIZE - MPU_LENGTH_FIELD_SIZE;
-var TIMED_MFU_DU_HEADER_SIZE = 14;
-var NONTIMED_MFU_DU_HEADER_SIZE = 4;
-var PACKET_TYPE_MPU = 0;
-var MMTP_EXT_TYPE_ALTA_AUTH = 61601;
-var MMTP_EXT_TRAILER_HEADER_SIZE = 4;
-function extractAltaTrailer(mmtpPacket, options) {
-  if (mmtpPacket.length < MMTP_HEADER_SIZE + MPU_HEADER_SIZE)
-    return null;
-  const packetType = mmtpPacket[1] & 63;
-  if (packetType !== PACKET_TYPE_MPU)
-    return null;
-  const fecType = mmtpPacket[0] >> 3 & 3;
-  let headerLength = MMTP_HEADER_SIZE;
-  if (fecType < 2 && (mmtpPacket[0] & 32) !== 0)
-    headerLength += 4;
-  if (fecType < 2 && (mmtpPacket[0] & 2) !== 0) {
-    if (headerLength + 4 > mmtpPacket.length)
-      return null;
-    const extensionLength = new DataView(mmtpPacket.buffer, mmtpPacket.byteOffset + headerLength + 2, 2).getUint16(0, false);
-    headerLength += 4 + extensionLength;
-  }
-  if (headerLength + MPU_HEADER_SIZE > mmtpPacket.length)
-    return null;
-  const payload = mmtpPacket.subarray(headerLength);
-  const payloadLength = payload[0] << 8 | payload[1];
-  const flagsByte = payload[2];
-  const fragmentType = flagsByte >> 4 & 15;
-  const timed = (flagsByte >> 3 & 1) === 1;
-  const fragmentationIndicator = flagsByte >> 1 & 3;
-  if (fragmentType !== 2)
-    return null;
-  const dataUnitHeaderSize = fragmentationIndicator <= 1 ? timed ? TIMED_MFU_DU_HEADER_SIZE : NONTIMED_MFU_DU_HEADER_SIZE : 0;
-  if (payloadLength <= MPU_HEADER_REMAINDER_SIZE + dataUnitHeaderSize)
-    return null;
-  if (fecType > 1)
-    return null;
-  const hasFecId = !options?.skipFecId && fecType === 1;
-  const payloadEnd = hasFecId ? payload.length - 4 : payload.length;
-  const declaredEnd = MPU_LENGTH_FIELD_SIZE + payloadLength;
-  if (declaredEnd > payloadEnd)
-    return null;
-  if (declaredEnd + MMTP_EXT_TRAILER_HEADER_SIZE > payloadEnd)
-    return null;
-  const extType = payload[declaredEnd] << 8 | payload[declaredEnd + 1];
-  if (extType !== MMTP_EXT_TYPE_ALTA_AUTH)
-    return null;
-  const extLen = payload[declaredEnd + 2] << 8 | payload[declaredEnd + 3];
-  const authStart = declaredEnd + MMTP_EXT_TRAILER_HEADER_SIZE;
-  if (authStart + extLen !== payloadEnd)
-    return null;
-  return {
-    auth: payload.subarray(authStart, payloadEnd),
-    signedEnd: headerLength + declaredEnd
-  };
-}
-
-// ../mmt-base/dist/mmtp.js
-var MMTP_HEADER_SIZE2 = 12;
-var MPU_HEADER_SIZE2 = 8;
 var MFU_DU_HEADER_SIZE_TIMED = 14;
 var MFU_DU_HEADER_SIZE_NONTIMED = 4;
-var MPU_LENGTH_FIELD_SIZE2 = 2;
-var MPU_HEADER_REMAINDER_SIZE2 = MPU_HEADER_SIZE2 - MPU_LENGTH_FIELD_SIZE2;
+var MPU_LENGTH_FIELD_SIZE = 2;
+var MPU_HEADER_REMAINDER_SIZE = MPU_HEADER_SIZE - MPU_LENGTH_FIELD_SIZE;
 var SOURCE_FEC_PAYLOAD_ID_SIZE = 4;
-var PACKET_TYPE_MPU2 = 0;
+var PACKET_TYPE_MPU = 0;
 var PACKET_TYPE_REPAIR = 3;
 var MMTP_SIGNALING_PACKET_ID = 0;
 var MMTP_PACKET_ID_MAX = 65535;
 function parseMMTPHeader(buffer) {
-  if (buffer.length < MMTP_HEADER_SIZE2) {
+  if (buffer.length < MMTP_HEADER_SIZE) {
     throw new Error(`MMTP packet too small: ${buffer.length} bytes`);
   }
   const view2 = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
@@ -128,7 +67,7 @@ function parseMMTPHeader(buffer) {
   };
 }
 function parseMPUHeader(payload) {
-  if (payload.length < MPU_HEADER_SIZE2) {
+  if (payload.length < MPU_HEADER_SIZE) {
     throw new Error(`Payload too small for MPU header: ${payload.length} bytes`);
   }
   const view2 = new DataView(payload.buffer, payload.byteOffset, payload.byteLength);
@@ -161,15 +100,15 @@ function parseTimedMfuDuHeader(payload, offset) {
   };
 }
 function resolveMfuPayloadLayout(mpu, fragmentType, payload) {
-  if (mpu.payloadLength < MPU_HEADER_REMAINDER_SIZE2) {
+  if (mpu.payloadLength < MPU_HEADER_REMAINDER_SIZE) {
     return {
       rejection: {
         gate: "mpu-payload-length-below-header-remainder",
-        detail: `payload_length=${mpu.payloadLength} < ${MPU_HEADER_REMAINDER_SIZE2}`
+        detail: `payload_length=${mpu.payloadLength} < ${MPU_HEADER_REMAINDER_SIZE}`
       }
     };
   }
-  const declaredEnd = MPU_LENGTH_FIELD_SIZE2 + mpu.payloadLength;
+  const declaredEnd = MPU_LENGTH_FIELD_SIZE + mpu.payloadLength;
   if (declaredEnd > payload.length) {
     return {
       rejection: {
@@ -180,7 +119,7 @@ function resolveMfuPayloadLayout(mpu, fragmentType, payload) {
   }
   const hasHeader = fragmentType === 2 && mpu.fragmentationIndicator <= 1;
   const mfuHeaderSize = mpu.timedFlag ? MFU_DU_HEADER_SIZE_TIMED : MFU_DU_HEADER_SIZE_NONTIMED;
-  const mfuOffset = MPU_HEADER_SIZE2 + (hasHeader ? mfuHeaderSize : 0);
+  const mfuOffset = MPU_HEADER_SIZE + (hasHeader ? mfuHeaderSize : 0);
   if (mfuOffset >= declaredEnd) {
     return {
       rejection: {
@@ -197,44 +136,46 @@ function resolveMfuPayloadLayout(mpu, fragmentType, payload) {
     }
   };
 }
-function isEmptyOrExactAltaTrailer(payload, start, end) {
+var LEGACY_TRAILER_EXT_TYPE = 61601;
+var LEGACY_TRAILER_HEADER_SIZE = 4;
+function isEmptyOrExactLegacyTrailer(payload, start, end) {
   if (start === end)
     return true;
-  if (start < 0 || end > payload.length || start + MMTP_EXT_TRAILER_HEADER_SIZE > end) {
+  if (start < 0 || end > payload.length || start + LEGACY_TRAILER_HEADER_SIZE > end) {
     return false;
   }
   const view2 = new DataView(payload.buffer, payload.byteOffset + start, end - start);
-  if (view2.getUint16(0, false) !== MMTP_EXT_TYPE_ALTA_AUTH)
+  if (view2.getUint16(0, false) !== LEGACY_TRAILER_EXT_TYPE)
     return false;
   const authLength = view2.getUint16(2, false);
-  return start + MMTP_EXT_TRAILER_HEADER_SIZE + authLength === end;
+  return start + LEGACY_TRAILER_HEADER_SIZE + authLength === end;
 }
 function resolveDeclaredTrailers(payload, declaredEnd, fecType, options) {
   if (declaredEnd > payload.length)
     return null;
   if (options?.skipFecId) {
-    return isEmptyOrExactAltaTrailer(payload, declaredEnd, payload.length) ? { hasFecId: false } : null;
+    return isEmptyOrExactLegacyTrailer(payload, declaredEnd, payload.length) ? { hasFecId: false } : null;
   }
   if (fecType === 1) {
     const fecStart = payload.length - SOURCE_FEC_PAYLOAD_ID_SIZE;
-    if (fecStart < declaredEnd || !isEmptyOrExactAltaTrailer(payload, declaredEnd, fecStart)) {
+    if (fecStart < declaredEnd || !isEmptyOrExactLegacyTrailer(payload, declaredEnd, fecStart)) {
       return null;
     }
     return { hasFecId: true };
   }
   if (fecType !== 0)
     return null;
-  if (isEmptyOrExactAltaTrailer(payload, declaredEnd, payload.length)) {
+  if (isEmptyOrExactLegacyTrailer(payload, declaredEnd, payload.length)) {
     return { hasFecId: false };
   }
   return null;
 }
 function planMfuExtraction(mmtpPacket, options, parsedHeader) {
-  if (mmtpPacket.length < MMTP_HEADER_SIZE2 + MPU_HEADER_SIZE2) {
+  if (mmtpPacket.length < MMTP_HEADER_SIZE + MPU_HEADER_SIZE) {
     return {
       rejection: {
         gate: "packet-shorter-than-mmtp-plus-mpu-header",
-        detail: `${mmtpPacket.length} bytes < ${MMTP_HEADER_SIZE2 + MPU_HEADER_SIZE2}`
+        detail: `${mmtpPacket.length} bytes < ${MMTP_HEADER_SIZE + MPU_HEADER_SIZE}`
       }
     };
   }
@@ -253,7 +194,7 @@ function planMfuExtraction(mmtpPacket, options, parsedHeader) {
       };
     }
   }
-  if (header.packetType !== PACKET_TYPE_MPU2) {
+  if (header.packetType !== PACKET_TYPE_MPU) {
     return {
       rejection: {
         gate: "not-an-mpu-packet",
@@ -262,11 +203,11 @@ function planMfuExtraction(mmtpPacket, options, parsedHeader) {
     };
   }
   const payload = mmtpPacket.subarray(header.headerLength);
-  if (payload.length < MPU_HEADER_SIZE2) {
+  if (payload.length < MPU_HEADER_SIZE) {
     return {
       rejection: {
         gate: "payload-shorter-than-mpu-header",
-        detail: `${payload.length} bytes < ${MPU_HEADER_SIZE2}`
+        detail: `${payload.length} bytes < ${MPU_HEADER_SIZE}`
       }
     };
   }
@@ -297,7 +238,7 @@ function planMfuExtraction(mmtpPacket, options, parsedHeader) {
     return {
       rejection: {
         gate: "declared-trailers-unresolved",
-        detail: `trailer bytes [${layout.dataEnd}, ${payload.length}) are neither empty nor an exact ALTA trailer (fecType=${header.fecType})`
+        detail: `trailer bytes [${layout.dataEnd}, ${payload.length}) are neither empty nor an exact legacy authenticator trailer (fecType=${header.fecType})`
       }
     };
   }
@@ -313,8 +254,8 @@ function extractPlannedMfu(mmtpPacket, result) {
   const mfuDuHeaderPresent = layout.hasMfuDuHeader;
   const mfuOffset = layout.mfuOffset;
   const dataEnd = layout.dataEnd;
-  const mfuDuHeader = mfuDuHeaderPresent && mpu.timedFlag === 1 ? parseTimedMfuDuHeader(payload, MPU_HEADER_SIZE2) : null;
-  const itemId = mfuDuHeaderPresent && mpu.timedFlag === 0 ? new DataView(payload.buffer, payload.byteOffset + MPU_HEADER_SIZE2, 4).getUint32(0, false) : null;
+  const mfuDuHeader = mfuDuHeaderPresent && mpu.timedFlag === 1 ? parseTimedMfuDuHeader(payload, MPU_HEADER_SIZE) : null;
+  const itemId = mfuDuHeaderPresent && mpu.timedFlag === 0 ? new DataView(payload.buffer, payload.byteOffset + MPU_HEADER_SIZE, 4).getUint32(0, false) : null;
   const data = payload.subarray(mfuOffset, dataEnd);
   const fecPayloadId = trailerLayout.hasFecId ? {
     ssId: new DataView(mmtpPacket.buffer, mmtpPacket.byteOffset + mmtpPacket.length - SOURCE_FEC_PAYLOAD_ID_SIZE, SOURCE_FEC_PAYLOAD_ID_SIZE).getUint32(0, false)
@@ -322,17 +263,17 @@ function extractPlannedMfu(mmtpPacket, result) {
   return { header, mpu, fragmentType, data, mfuDuHeader, itemId, fecPayloadId };
 }
 function sourceFecPayloadIdOf(mmtpPacket, header) {
-  if (mmtpPacket.length < MMTP_HEADER_SIZE2 + MPU_HEADER_SIZE2)
+  if (mmtpPacket.length < MMTP_HEADER_SIZE + MPU_HEADER_SIZE)
     return null;
-  if (header.packetType !== PACKET_TYPE_MPU2)
+  if (header.packetType !== PACKET_TYPE_MPU)
     return null;
   const payload = mmtpPacket.subarray(header.headerLength);
-  if (payload.length < MPU_HEADER_SIZE2)
+  if (payload.length < MPU_HEADER_SIZE)
     return null;
   const payloadLength = payload[0] << 8 | payload[1];
-  if (payloadLength < MPU_HEADER_REMAINDER_SIZE2)
+  if (payloadLength < MPU_HEADER_REMAINDER_SIZE)
     return null;
-  const declaredEnd = MPU_LENGTH_FIELD_SIZE2 + payloadLength;
+  const declaredEnd = MPU_LENGTH_FIELD_SIZE + payloadLength;
   if (!resolveDeclaredTrailers(payload, declaredEnd, header.fecType)?.hasFecId)
     return null;
   const off = mmtpPacket.length - SOURCE_FEC_PAYLOAD_ID_SIZE;
@@ -340,7 +281,6 @@ function sourceFecPayloadIdOf(mmtpPacket, header) {
     ssId: (mmtpPacket[off] << 24 | mmtpPacket[off + 1] << 16 | mmtpPacket[off + 2] << 8 | mmtpPacket[off + 3]) >>> 0
   };
 }
-var extractAltaTrailer2 = extractAltaTrailer;
 
 // ../mmt-base/dist/ntp-short.js
 var NTP_SHORT_BITS = 32;
@@ -349,19 +289,18 @@ var NTP_SHORT_HALF_RANGE = 2 ** (NTP_SHORT_BITS - 1);
 
 // ../mmt-base/dist/fec-block-profile.js
 var FEC_BLOCK_PROFILES = Object.freeze([
-  "k-padded-v1",
   "iso-ssbg1-v1"
 ]);
 function isFecBlockProfile(value) {
-  return value === "k-padded-v1" || value === "iso-ssbg1-v1";
+  return value === "iso-ssbg1-v1";
 }
 function parseFecBlockProfile(value, where) {
   if (isFecBlockProfile(value))
     return value;
   if (value === void 0) {
-    throw new Error(`${where} is required: name the FEC block profile ("k-padded-v1" or "iso-ssbg1-v1")`);
+    throw new Error(`${where} is required: name the FEC block profile ("iso-ssbg1-v1")`);
   }
-  throw new Error(`${where} must be "k-padded-v1" or "iso-ssbg1-v1" (got ${JSON.stringify(value)})`);
+  throw new Error(`${where} must be "iso-ssbg1-v1" (got ${JSON.stringify(value)})`);
 }
 
 // src/mfu-reassembler.ts
@@ -5330,6 +5269,21 @@ var FecReleaseSequencer = class {
       this.#streams.delete(key);
     }
   }
+  /**
+   * The packet's FEC ended, so no block will resolve a held gap: release its
+   * frames in order, each gap stalled as a discontinuity, and forget its
+   * streams, so FEC configured on it again starts from a fresh one.
+   */
+  endPacket(packetId) {
+    for (const [key, stream] of this.#streams) {
+      if (stream.packetId !== packetId) continue;
+      while (stream.buf.length > 0 && stream.last !== null) {
+        stream.discontinuity = true;
+        this.#drain(stream);
+      }
+      this.#streams.delete(key);
+    }
+  }
   discardPacket(packetId) {
     for (const [key, stream] of this.#streams) {
       if (stream.packetId !== packetId) continue;
@@ -5712,6 +5666,13 @@ var MmtpContainerParser = class _MmtpContainerParser {
   markFecDiscontinuity(packetId, catalogTrackName) {
     this.#fecSequencer?.markDiscontinuity(this.#streamKey(packetId, catalogTrackName));
   }
+  /**
+   * The FEC of a packet ID ended: release the frames the FEC release gate
+   * holds for it in order, each gap stalled, and forget its gated streams.
+   */
+  endFecRelease(packetId) {
+    this.#fecSequencer?.endPacket(packetId);
+  }
   /**
    * MPU and data-unit identity of one MMTP packet, parsed in place (no copy,
    * no reassembly). Null for non-MPU packets and packets that do not parse.
@@ -5892,7 +5853,7 @@ var MmtpContainerParser = class _MmtpContainerParser {
     const parsed = preParsed !== void 0 && preParsed.skipFecPayloadId === (options?.skipFecPayloadId === true) ? preParsed : this.parsePacket(packet, options);
     if (!parsed) return this.#drop("header-parse-failed");
     const info = parsed.info;
-    if (info.packetType !== PACKET_TYPE_MPU2) {
+    if (info.packetType !== PACKET_TYPE_MPU) {
       return {
         kind: info.isRepair ? "repair" : "non-media",
         packet: info,
@@ -5901,10 +5862,8 @@ var MmtpContainerParser = class _MmtpContainerParser {
     }
     if (info.fecPayloadId !== null && this.#sourceSymbolCb) {
       const rawSymbol = packet.subarray(0, packet.length - 4);
-      const altaTrailer = extractAltaTrailer2(packet);
-      const alta = altaTrailer ? { auth: altaTrailer.auth, payloadEnd: altaTrailer.signedEnd } : void 0;
       try {
-        this.#sourceSymbolCb(info.packetId, info.fecPayloadId.ssId, rawSymbol, alta);
+        this.#sourceSymbolCb(info.packetId, info.fecPayloadId.ssId, rawSymbol);
       } catch {
       }
     }
@@ -7069,6 +7028,14 @@ var throwRepairContractError = (code, path, message) => {
 };
 function readFecBlockProfile(value, path, declaresFecInstance, fail) {
   if (value === void 0 && !declaresFecInstance) return void 0;
+  if (isFecBlockProfile(value)) return value;
+  if (typeof value === "string" && value.length > 0) {
+    return fail(
+      "track_fec_block_profile_unimplemented",
+      path,
+      `${JSON.stringify(value)} is not an implemented FEC block profile; only "iso-ssbg1-v1" is implemented`
+    );
+  }
   try {
     return parseFecBlockProfile(value, "blockProfile");
   } catch (error) {
@@ -7541,8 +7508,8 @@ function validateCmsfMmtpCatalog(value) {
           "repair layers are self-describing fec-repair tracks (depends, repairLayer); fec.enhancementRepair is not supported"
         );
       }
-      if (config["interleaveDepthMs"] !== void 0 && !positiveInteger2(config["interleaveDepthMs"])) {
-        catalogError("track_fec", `${path}.fec.interleaveDepthMs`, "must be a positive integer");
+      if (config["interleaveDepthMs"] !== void 0 && (!Number.isSafeInteger(config["interleaveDepthMs"]) || config["interleaveDepthMs"] < 0)) {
+        catalogError("track_fec", `${path}.fec.interleaveDepthMs`, "must be a non-negative safe integer");
       }
       if (algorithm !== "none") {
         for (const field of ["sourceSymbols", "repairSymbols", "symbolSize"]) {
@@ -7617,6 +7584,13 @@ function validateCmsfMmtpCatalog(value) {
       for (let endpointIndex = 0; endpointIndex < endpoints.length; endpointIndex++) {
         const endpoint = endpoints[endpointIndex];
         if (typeof endpoint !== "object" || endpoint === null || Array.isArray(endpoint)) continue;
+        if ("relayAddress" in endpoint) {
+          catalogError(
+            "multicast_relay_address",
+            `$.multicast.endpoints[${endpointIndex}].relayAddress`,
+            'relayAddress is retired; publish the relay as multicast.networkSource[{type:"amt",relay}]'
+          );
+        }
         const refs = endpoint["tracks"];
         if (!Array.isArray(refs)) continue;
         const packetIds = /* @__PURE__ */ new Map();
@@ -7666,7 +7640,6 @@ function validateCmsfMmtpCatalog(value) {
 import { catalogFecInterleaveMs, computeFecTimeout } from "@blockcast/mmt-fec";
 
 // src/fec-state.ts
-var MIN_INTERLEAVE_DEPTH_MS = 33;
 var FEC_INACTIVE_REASONS = Object.freeze([
   "no-catalog-fec",
   "reliable-moq",
@@ -7693,7 +7666,7 @@ function isoBlockSpanUsable(fec) {
   const block = recordOf(fec);
   if (block === void 0 || block["blockProfile"] !== "iso-ssbg1-v1") return true;
   const ms = block["interleaveDepthMs"];
-  return typeof ms === "number" && Number.isFinite(ms) && ms >= MIN_INTERLEAVE_DEPTH_MS;
+  return ms === void 0 || typeof ms === "number" && Number.isSafeInteger(ms) && ms >= 0;
 }
 function requireBoolean(value, field) {
   if (typeof value !== "boolean") {