@blockcast/mmt-container 2.2.0-main.efb4fa4521af → 2.2.0-main.f480a7ede8b1

package/dist/browser-runtime.js

@@ -7988,8 +7988,8 @@ var MulticastSubscriptionPool = class {
       record.claims--;
       return this.acquire(gateway, config, consumer);
     }
-    const token = Symbol(key);
-    entry.consumers.set(token, consumer);
+    const token2 = Symbol(key);
+    entry.consumers.set(token2, consumer);
     let released = false;
     return {
       key,
@@ -7997,7 +7997,7 @@ var MulticastSubscriptionPool = class {
         if (released)
           return;
         released = true;
-        entry.consumers.delete(token);
+        entry.consumers.delete(token2);
         record.claims--;
         if (record.claims > 0)
           return;
@@ -8746,14 +8746,15 @@ var MOQT_PUBLISHER_PRIORITY = Object.freeze({
 });
 
 // node_modules/@blockcast/mmt-transport/dist/amt-gateway.js
+var MAX_PENDING_PACKETS = 256;
 var AMTGatewayManager = class {
   subscriptions = /* @__PURE__ */ new Map();
   messageHandler;
+  messageListenerRegistered = false;
   pendingPackets = /* @__PURE__ */ new Map();
   constructor() {
     this.messageHandler = (event) => {
       const data = event.data;
-      console.log(`[AMT] SW message received:`, data.type);
       if (data.type === "UDP_PACKET") {
         this.handlePacket(data);
       } else if (data.type === "SOCKET_ERROR") {
@@ -8762,12 +8763,22 @@ var AMTGatewayManager = class {
         console.log(`[AMT SW Debug] ${data.message}`);
       }
     };
-    if (typeof navigator !== "undefined" && navigator.serviceWorker) {
-      navigator.serviceWorker.addEventListener("message", this.messageHandler);
-      console.log("[AMT] Registered service worker message handler");
-    } else {
-      console.warn("[AMT] Service worker not available");
+  }
+  ensureMessageListener() {
+    if (this.messageListenerRegistered || typeof navigator === "undefined" || !navigator.serviceWorker || !this.messageHandler) {
+      return;
     }
+    navigator.serviceWorker.addEventListener("message", this.messageHandler);
+    this.messageListenerRegistered = true;
+    console.log("[AMT] Registered service worker message handler");
+  }
+  removeMessageListener() {
+    if (!this.messageListenerRegistered)
+      return;
+    if (this.messageHandler && typeof navigator !== "undefined" && navigator.serviceWorker) {
+      navigator.serviceWorker.removeEventListener("message", this.messageHandler);
+    }
+    this.messageListenerRegistered = false;
   }
   /**
    * Subscribe via AMT tunnel
@@ -8777,6 +8788,7 @@ var AMTGatewayManager = class {
     if (config.protected) {
       throw new Error("AMTGatewayManager refuses a protected join: it reports no per-datagram sender (multicast-02 7.2.7)");
     }
+    this.ensureMessageListener();
     const keyStr = this.getKeyString(key);
     if (this.subscriptions.has(keyStr)) {
       console.log(`[AMT] Reusing existing subscription to ${keyStr}`);
@@ -8812,6 +8824,8 @@ var AMTGatewayManager = class {
         this.subscriptions.delete(keyStr);
         this.pendingPackets.delete(subscription.subscriptionId);
       }
+      if (this.subscriptions.size === 0)
+        this.removeMessageListener();
       throw new Error(`Failed to subscribe via AMT: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
@@ -8833,6 +8847,8 @@ var AMTGatewayManager = class {
     } finally {
       this.subscriptions.delete(handle);
       this.pendingPackets.delete(subscription.subscriptionId);
+      if (this.subscriptions.size === 0)
+        this.removeMessageListener();
     }
   }
   /**
@@ -8849,14 +8865,12 @@ var AMTGatewayManager = class {
     if (!subscriptionId)
       return;
     const subscription = this.subscriptions.get(subscriptionId);
-    if (!subscription) {
-      console.warn(`[AMT] Received packet for unknown subscription: ${subscriptionId}`);
+    if (!subscription)
       return;
-    }
     if (!subscription.handshakeComplete) {
       const queue = this.pendingPackets.get(subscriptionId);
       const packetData2 = data;
-      if (queue) {
+      if (queue && queue.length < MAX_PENDING_PACKETS) {
         queue.push({
           data: packetData2.data,
           remoteAddress: packetData2.remoteAddress,
@@ -8882,19 +8896,15 @@ var AMTGatewayManager = class {
     if (!subscriptionId)
       return;
     const subscription = this.subscriptions.get(subscriptionId);
-    if (!subscription) {
-      console.warn(`[AMT] Received error for unknown subscription: ${subscriptionId}`);
+    if (!subscription)
       return;
-    }
     subscription.config.onError(new Error(error || "Unknown error"));
   }
   /**
    * Cleanup on destroy
    */
   destroy() {
-    if (this.messageHandler && typeof navigator !== "undefined" && navigator.serviceWorker) {
-      navigator.serviceWorker.removeEventListener("message", this.messageHandler);
-    }
+    this.removeMessageListener();
     const handles = Array.from(this.subscriptions.keys());
     for (const handle of handles) {
       this.unsubscribe(handle).catch((err) => {
@@ -12939,6 +12949,7 @@ var IsoBlockLocator = class _IsoBlockLocator {
   #retentionBlocks;
   #heldEvicted;
   #newest;
+  #newestSource;
   #holes;
   static #checkedRetention(retentionBlocks) {
     if (!Number.isSafeInteger(retentionBlocks) || retentionBlocks <= 0) {
@@ -12976,6 +12987,21 @@ var IsoBlockLocator = class _IsoBlockLocator {
   observe(position) {
     if (this.#newest === void 0 || serial32Precedes(this.#newest, position)) this.#newest = position;
   }
+  /**
+   * The newest source SS_ID noted with `noteSource` (RFC 1982 order). Unlike
+   * `newest`, a repair never moves it: a repair can run ahead of its sources,
+   * a source cannot run ahead of the sources sent before it except by
+   * reordering.
+   */
+  get newestSource() {
+    return this.#newestSource;
+  }
+  /** Note a received source's SS_ID; true when it is the newest one yet. */
+  noteSource(ssId) {
+    if (this.#newestSource !== void 0 && !serial32Precedes(this.#newestSource, ssId)) return false;
+    this.#newestSource = ssId;
+    return true;
+  }
   /** Held sources evicted by `heldCapacity` (never by the horizon itself). */
   get heldEvicted() {
     return this.#heldEvicted;
@@ -13208,6 +13234,7 @@ var IsoBlockLocator = class _IsoBlockLocator {
     this.#held.clear();
     this.#coverageEnd = void 0;
     this.#newest = void 0;
+    this.#newestSource = void 0;
   }
   #claim(block) {
     const placed = [];
@@ -14052,6 +14079,10 @@ var FECManager = class _FECManager {
     // ── Keyframe-protected repair policy (block-policy.ts) ──
     // One classifier per physical stream, built from that stream's geometry.
     this.#classifiers = /* @__PURE__ */ new Map();
+    // A stream without catalog timing has no classifier, so the last RAP it
+    // released stands in for one: "an MPU boundary bounds its RAPs" holds until
+    // a second RAP is released inside one MPU (BLO-52085).
+    this.#noSpanRaps = /* @__PURE__ */ new Map();
     // Geometry a stream-scoped configuration gave one stream (streamKey). ABR
     // rungs can share a packetId with a different framerate or GOP, so the
     // packet-level geometry is only the geometry of a packet whose streams
@@ -14251,6 +14282,7 @@ var FECManager = class _FECManager {
   #orderedFrontiers;
   #orderedPendingBlocks;
   #classifiers;
+  #noSpanRaps;
   #streamGeometries;
   #failedBlocks;
   #resolvedBlockClasses;
@@ -14912,6 +14944,7 @@ var FECManager = class _FECManager {
     };
     const discontinuity = () => {
       this.#classifiers.get(streamKey)?.noteSourceDiscontinuity();
+      this.#noSpanRaps.delete(streamKey);
       this.#highestSbn.set(streamKey, { sbn, atMs: now });
       this.#sourceFrontiers.set(streamKey, { sbn, atMs: now });
       if (psn === void 0) this.#sourceAnchors.delete(streamKey);
@@ -15324,6 +15357,9 @@ var FECManager = class _FECManager {
     }
     if (policyChanged) {
       this.#bumpEpoch(packetId);
+      for (const key of [...this.#noSpanRaps.keys()]) {
+        if (this.#belongsToPacket(key, packetId)) this.#noSpanRaps.delete(key);
+      }
       for (const [key, classifier] of [...this.#classifiers]) {
         if (!this.#belongsToPacket(key, packetId)) continue;
         const stream = this.#parseStreamKey(key);
@@ -15559,6 +15595,7 @@ var FECManager = class _FECManager {
     resetMap(this.#isoLocators);
     resetMap(this.#sourceAnchors);
     this.#classifiers.delete(this.#streamKey(packetId, catalogTrackName));
+    this.#noSpanRaps.delete(this.#streamKey(packetId, catalogTrackName));
     this.#bumpEpoch(packetId);
     for (const [sbn, keys] of this.#blockKeysBySbn) {
       for (const key of keys.keys()) {
@@ -15665,6 +15702,7 @@ var FECManager = class _FECManager {
     dropMap(this.#isoLocators);
     dropMap(this.#sourceAnchors);
     dropMap(this.#classifiers);
+    dropMap(this.#noSpanRaps);
     dropMap(this.#streamGeometries);
     dropSet(this.#pendingWorkerCleanups);
     dropSet(this.#completedBlocks);
@@ -15810,6 +15848,9 @@ var FECManager = class _FECManager {
         this.#unindexBlockKey(key);
       }
     }
+    if (isSourceSymbol && source === "multicast") {
+      this.#noteMulticastSource(this.#isoLocatorFor(packetId, catalogTrackName), sbn + esi >>> 0, packetId, catalogTrackName);
+    }
     return true;
   }
   #observeBlockCatalogTrackName(blockKey, sbn, packetId, catalogTrackName) {
@@ -16127,6 +16168,7 @@ var FECManager = class _FECManager {
     const locator = this.#growingIsoLocatorFor(packetId, catalogTrackName);
     const evictedBefore = locator.heldEvicted;
     const held = locator.hold(ssId, source);
+    if (held && source.source === "multicast") this.#noteMulticastSource(locator, ssId, packetId, catalogTrackName);
     const evicted = locator.heldEvicted - evictedBefore;
     if (evicted > 0) {
       const before = this.#isoHeldEvictedCount;
@@ -16295,11 +16337,14 @@ var FECManager = class _FECManager {
   /**
    * Whether an MPU boundary still bounds this stream's RAPs (see
    * `BlockClassifier.mpuBoundsRaps`). Gap decisions drop MPU evidence once
-   * it does not. A stream with no classifier yet has shown nothing against it.
+   * it does not. A stream with no classifier yet has shown nothing against it,
+   * and neither has a stream without catalog timing until it releases two
+   * RAPs inside one MPU.
    */
   mpuBoundsRapsFor(packetId, catalogTrackName) {
-    if (!this.#hasCatalogTimingForPacket(packetId)) return false;
-    return this.#classifiers.get(this.#streamKey(packetId, catalogTrackName))?.mpuBoundsRaps ?? true;
+    const streamKey = this.#streamKey(packetId, catalogTrackName);
+    if (!this.#hasCatalogTimingForPacket(packetId)) return this.#noSpanRaps.get(streamKey)?.inside !== true;
+    return this.#classifiers.get(streamKey)?.mpuBoundsRaps ?? true;
   }
   /** A block's class now, or frozen at its resolution. */
   blockClassFor(sbn, packetId, catalogTrackName) {
@@ -16325,7 +16370,14 @@ var FECManager = class _FECManager {
    * invariant (consecutive MPUs exactly one keyframe interval apart).
    */
   noteReleasedRap(packetId, catalogTrackName, mpu, presentationTime, mediaTimescale) {
-    if (!this.#trackConfigs.has(packetId) || !this.#hasCatalogTimingForPacket(packetId)) return;
+    if (!this.#trackConfigs.has(packetId)) return;
+    if (!this.#hasCatalogTimingForPacket(packetId)) {
+      const streamKey = this.#streamKey(packetId, catalogTrackName);
+      const last = this.#noSpanRaps.get(streamKey);
+      const inside = last?.inside === true || last?.mpu === mpu && last.presentationTime !== presentationTime;
+      this.#noSpanRaps.set(streamKey, { mpu, presentationTime, inside });
+      return;
+    }
     this.#applyClassifierChanges(
       packetId,
       catalogTrackName,
@@ -16943,8 +16995,72 @@ var FECManager = class _FECManager {
       this.#completeCleanBlock(blockKey, sbn, packetId, catalogTrackName);
       return null;
     }
+    if (recovered === null) this.#shortenUnrecoverableWait(blockKey, sbn, packetId, catalogTrackName);
     return recovered;
   }
+  /**
+   * A first-arrival multicast source, held or placed. A datagram flow keeps
+   * its sources in send order, so one that moves the stream's newest source
+   * position past a block leaves the sources that block still misses
+   * reordered behind it at best: it shortens the wait of every block it
+   * passed that only a late source can complete. MoQ is left out: its streams
+   * can overtake one another, so a MoQ source shows nothing about the sources
+   * sent before it.
+   */
+  #noteMulticastSource(locator, ssId, packetId, catalogTrackName) {
+    const previous = locator.newestSource;
+    if (!locator.noteSource(ssId) || previous === void 0) return;
+    for (const block of locator.blocksBetween(previous - 1 >>> 0, ssId)) {
+      if (block.span || !serial32Precedes(serial32Add(block.start, block.length - 1), ssId)) continue;
+      this.#shortenUnrecoverableWait(
+        this.#blockKey(block.start, packetId, catalogTrackName),
+        block.start,
+        packetId,
+        catalogTrackName
+      );
+    }
+  }
+  /**
+   * The wait of a block that only a late source can complete (BLO-52085): a
+   * repair stated it, its received sources plus every symbol its repair group
+   * carries (RSB_length) are short of K' (the repair scheduler's
+   * group-cannot-complete), and a later source of the stream has arrived, so
+   * a source it misses is lost or reordered behind that one. The span, which
+   * covers repair symbols paced after its sources, buys it nothing: it waits
+   * the late-symbol allowance alone, the multicast wait less the span (the
+   * catalog tolerance or the measured delivery gap). Undefined for any other
+   * block.
+   */
+  #lateSourceWaitMs(key, sbn, packetId, catalogTrackName, config) {
+    const authoredLength = this.#blockAuthoredLengths.get(key);
+    const rsbLength = this.#blockRsbLengths.get(key);
+    if (authoredLength === void 0 || rsbLength === void 0) return void 0;
+    if ((this.#blockSourceCounts.get(key) ?? 0) + rsbLength >= authoredLength) return void 0;
+    const newestSource = this.#isoLocators.get(this.#streamKey(packetId, catalogTrackName))?.newestSource;
+    if (newestSource === void 0 || !serial32Precedes(serial32Add(sbn, authoredLength - 1), newestSource)) {
+      return void 0;
+    }
+    return this.#multicastWaitMs(config) - config.interleaveDepthMs;
+  }
+  /**
+   * Bring an open block's wait in to its late-source wait, when it has one.
+   * Never later than it is armed: only a source can complete such a block,
+   * so a repair of its group (paced across the span) must not keep it open.
+   */
+  #shortenUnrecoverableWait(key, sbn, packetId, catalogTrackName) {
+    if (!this.#activeBlocks.has(key)) return;
+    const config = this.#trackConfigs.get(packetId);
+    if (config === void 0) return;
+    const waitMs = this.#lateSourceWaitMs(key, sbn, packetId, catalogTrackName, config);
+    if (waitMs === void 0) return;
+    const armedAtMs = this.#blockWaitDeadlinesMs.get(key);
+    this.#armBlockTimeout(
+      sbn,
+      packetId,
+      catalogTrackName,
+      armedAtMs === void 0 ? waitMs : Math.min(waitMs, armedAtMs - this.#receiptNow())
+    );
+  }
   /**
    * Record a block's authored SSB_length from a repair symbol. Returns false,
    * leaving the block unchanged, when the symbol contradicts the block: a
@@ -17173,7 +17289,16 @@ var FECManager = class _FECManager {
         this.#repairDeadlineMs(trackConfig)
       );
     }
-    this.#armBlockTimeout(sbn, packetId, catalogTrackName, timeoutMs);
+    if (!sourceProgress && this.#lateSourceWaitMs(key, sbn, packetId, catalogTrackName, trackConfig) !== void 0) {
+      this.#shortenUnrecoverableWait(key, sbn, packetId, catalogTrackName);
+      return;
+    }
+    this.#armBlockTimeout(
+      sbn,
+      packetId,
+      catalogTrackName,
+      this.#lateSourceWaitMs(key, sbn, packetId, catalogTrackName, trackConfig) ?? timeoutMs
+    );
   }
   #failBlock(sbn, packetId, catalogTrackName) {
     const key = this.#blockKey(sbn, packetId, catalogTrackName);
@@ -17340,6 +17465,7 @@ var FECManager = class _FECManager {
     this.#blockAnchorsMs.clear();
     this.#blockCatalogTrackNames.clear();
     this.#classifiers.clear();
+    this.#noSpanRaps.clear();
     this.#streamGeometries.clear();
     this.#failedBlocks.clear();
     this.#resolvedBlockClasses.clear();
@@ -17870,9 +17996,21 @@ var IsoBmffTimingResolver = class {
   }
   #track = null;
   #fragments = /* @__PURE__ */ new Map();
+  /** First sample of each pending fragment, kept in `#delivered` with its sample count. */
+  #firstSamples = /* @__PURE__ */ new Map();
+  /**
+   * First sample and sample count of the newest fragments whose every slot was
+   * cleared. Abandonment counts: `releaseSample` clears a slot too, which
+   * matches the combiner, since it retires an abandoned sample as well.
+   */
+  #delivered = /* @__PURE__ */ new Map();
   #pendingSamples = 0;
   #evictedSamples = 0;
   #lastMovieFragmentRejection = null;
+  /** True once an FT=0 has bound the track that FT=1 timing is read against. */
+  get initialized() {
+    return this.#track !== null;
+  }
   get pendingSampleCount() {
     return this.#pendingSamples;
   }
@@ -17896,7 +18034,14 @@ var IsoBmffTimingResolver = class {
     this.#track = timing;
     return true;
   }
-  addMovieFragment(mpuSequenceNumber2, data, additionalSampleLimit = this.maxPendingSamples) {
+  /**
+   * `recovered` marks an FEC-recovered copy. A recovered block hands back
+   * every FT=1 it holds, the received ones included, so a recovered copy of a
+   * fragment whose samples are all done is a duplicate: admitting it again
+   * would charge stale timing and could displace the live MPU's. A source
+   * copy is still admitted again (a rendition switch re-arms timing that way).
+   */
+  addMovieFragment(mpuSequenceNumber2, data, additionalSampleLimit = this.maxPendingSamples, recovered = false) {
     this.#lastMovieFragmentRejection = null;
     if (!Number.isInteger(additionalSampleLimit) || additionalSampleLimit < 0) {
       this.#lastMovieFragmentRejection = "invalid";
@@ -17922,6 +18067,8 @@ var IsoBmffTimingResolver = class {
         (sample, index) => sample !== null && sameSample(sample, parsed.samples[index])
       );
     }
+    const delivered = recovered ? this.#delivered.get(key) : void 0;
+    if (delivered && delivered.sampleCount === parsed.samples.length && sameSample(delivered.first, parsed.samples[0])) return true;
     let freed = 0;
     while (this.#fragments.size > 0 && (this.#pendingSamples + parsed.samples.length > this.maxPendingSamples || parsed.samples.length - freed > additionalSampleLimit)) {
       freed += this.#evictOldestFragment();
@@ -17935,6 +18082,7 @@ var IsoBmffTimingResolver = class {
       return false;
     }
     this.#fragments.set(key, [...parsed.samples]);
+    this.#firstSamples.set(key, parsed.samples[0]);
     this.#pendingSamples += parsed.samples.length;
     return true;
   }
@@ -17992,6 +18140,7 @@ var IsoBmffTimingResolver = class {
     let live = 0;
     for (const sample of samples) if (sample !== null) live++;
     this.#fragments.delete(oldest);
+    this.#firstSamples.delete(oldest);
     this.#pendingSamples -= live;
     this.#evictedSamples += live;
     return live;
@@ -18007,12 +18156,23 @@ var IsoBmffTimingResolver = class {
     if (!samples || !samples[index]) return false;
     samples[index] = null;
     this.#pendingSamples--;
-    if (samples.every((value) => value === null)) this.#fragments.delete(key);
+    if (samples.every((value) => value === null)) {
+      this.#fragments.delete(key);
+      const first = this.#firstSamples.get(key);
+      this.#firstSamples.delete(key);
+      this.#delivered.delete(key);
+      this.#delivered.set(key, { first, sampleCount: samples.length });
+      if (this.#delivered.size > this.maxPendingSamples) {
+        this.#delivered.delete(this.#delivered.keys().next().value);
+      }
+    }
     return true;
   }
   reset() {
     this.#track = null;
     this.#fragments.clear();
+    this.#firstSamples.clear();
+    this.#delivered.clear();
     this.#pendingSamples = 0;
   }
 };
@@ -18494,6 +18654,12 @@ var MmtpContainerParser = class _MmtpContainerParser {
     this.#reclaimedTimingSamples = 0;
     this.#evictedTimingSamples = 0;
     this.#rejectedMovieFragments = 0;
+    this.#recoveredHeadsAwaitingTiming = {
+      held: 0,
+      expired: 0,
+      discarded: 0,
+      superseded: 0
+    };
     this.#sequencers = /* @__PURE__ */ new Map();
     this.#fecGate = null;
     this.#fecSequencer = null;
@@ -18602,6 +18768,7 @@ var MmtpContainerParser = class _MmtpContainerParser {
   #reclaimedTimingSamples;
   #evictedTimingSamples;
   #rejectedMovieFragments;
+  #recoveredHeadsAwaitingTiming;
   #sequencers;
   #fecGate;
   #fecSequencer;
@@ -18722,6 +18889,14 @@ var MmtpContainerParser = class _MmtpContainerParser {
       rejectedMovieFragments: this.#rejectedMovieFragments
     };
   }
+  /** Recovered heads parked for FT=1 timing (BLO-53369). Survives dispose(). */
+  get recoveredHeadsAwaitingTiming() {
+    let pending = 0;
+    for (const { awaitingTiming } of this.#timingStreams.values()) {
+      for (const head of awaitingTiming) if (head.options?.recovered) pending++;
+    }
+    return { ...this.#recoveredHeadsAwaitingTiming, pending };
+  }
   get reorderStats() {
     let bufferedFrames = this.#fecSequencer?.buffered ?? 0;
     for (const { sequencer } of this.#sequencers.values()) bufferedFrames += sequencer.buffered;
@@ -18850,10 +19025,10 @@ var MmtpContainerParser = class _MmtpContainerParser {
   get reassemblerDataUnitsReturned() {
     return this.#reassemblerDataUnitsReturned;
   }
-  #countOutcome(token) {
-    const count = (this.#feedOutcomes.get(token) ?? 0) + 1;
-    this.#feedOutcomes.set(token, count);
-    this.#lastOutcome = token;
+  #countOutcome(token2) {
+    const count = (this.#feedOutcomes.get(token2) ?? 0) + 1;
+    this.#feedOutcomes.set(token2, count);
+    this.#lastOutcome = token2;
     this.#lastOutcomeCount = count;
   }
   #countDeferredOutcome(reason) {
@@ -18895,7 +19070,7 @@ var MmtpContainerParser = class _MmtpContainerParser {
     const now = Date.now();
     for (const { awaitingTiming } of this.#timingStreams.values()) {
       while (awaitingTiming.length > 0 && now - awaitingTiming[0].arrivedAt > timeoutMs) {
-        awaitingTiming.shift();
+        this.#leaveAwaitingTiming(awaitingTiming.shift(), "expired");
       }
     }
   }
@@ -19013,11 +19188,16 @@ var MmtpContainerParser = class _MmtpContainerParser {
       if (mpu.fragmentationIndicator !== 0 || mpu.fragmentCounter !== 0)
         return this.#drop("fragment-unexpected-fragmentation");
       const resolver2 = this.#timingResolver(streamKey, info.packetId, false);
-      if (!resolver2) return this.#drop("fragment-no-resolver");
+      if (!resolver2?.initialized) return this.#drop("fragment-no-resolver");
       const pendingBefore = resolver2.pendingSampleCount;
       const evictedBefore = resolver2.evictedSampleCount;
       const remaining = this.#maxPendingTimingSamples - this.#pendingTimingSamples;
-      const admitted = resolver2.addMovieFragment(mpu.mpuSequenceNumber, data, remaining);
+      const admitted = resolver2.addMovieFragment(
+        mpu.mpuSequenceNumber,
+        data,
+        remaining,
+        options?.recovered === true
+      );
       this.#pendingTimingSamples += resolver2.pendingSampleCount - pendingBefore;
       this.#evictedTimingSamples += resolver2.evictedSampleCount - evictedBefore;
       if (!admitted) {
@@ -19037,7 +19217,7 @@ var MmtpContainerParser = class _MmtpContainerParser {
       };
     }
     if (fragmentType !== 2) return this.#drop("unknown-fragment-type");
-    const resolver = this.#timingResolver(streamKey, info.packetId, false);
+    const resolver = this.#timingResolver(streamKey, info.packetId, true);
     if (!resolver) return this.#drop("mfu-no-resolver");
     if (!Number.isSafeInteger(data.byteLength) || data.byteLength <= 0)
       return this.#drop("mfu-empty-payload");
@@ -19058,6 +19238,7 @@ var MmtpContainerParser = class _MmtpContainerParser {
           mpuSequenceNumber: mpu.mpuSequenceNumber,
           movieFragmentSequenceNumber: mfuDuHeader.movieFragmentSequenceNumber,
           sampleNumber: mfuDuHeader.sampleNumber,
+          sequenceNumber: info.sequenceNumber,
           arrivedAt: Date.now()
         });
         return this.#drop("mfu-sample-timing-missing");
@@ -19381,6 +19562,10 @@ var MmtpContainerParser = class _MmtpContainerParser {
     }
     this.#emitFrame(data, meta);
   }
+  /** Whether FT=1 metadata already names this sample, without claiming it. */
+  hasAuthoredTimingFor(packetId, mpuSequenceNumber2, movieFragmentSequenceNumber, sampleNumber, catalogTrackName) {
+    return this.#timingResolver(this.#streamKey(packetId, catalogTrackName), packetId, false)?.sampleTiming(mpuSequenceNumber2, movieFragmentSequenceNumber, sampleNumber) != null;
+  }
   /**
    * Claim and return the authored timing for a recovered sample. Recovery does
    * not pass through the ordinary `feed()` completion path, so it must retire
@@ -19442,6 +19627,9 @@ var MmtpContainerParser = class _MmtpContainerParser {
     for (const { sequencer } of this.#sequencers.values()) sequencer.discard();
     this.#sequencers.clear();
     this.#fecSequencer?.discard();
+    for (const { awaitingTiming } of this.#timingStreams.values()) {
+      for (const head of awaitingTiming) this.#leaveAwaitingTiming(head, "discarded");
+    }
     this.#timingStreams.clear();
     this.#pendingTimingSamples = 0;
     this.#reliableMoqStartupGate.clear();
@@ -19460,10 +19648,23 @@ var MmtpContainerParser = class _MmtpContainerParser {
     return resolver;
   }
   #awaitTiming(streamKey, head) {
-    const awaitingTiming = this.#timingStreams.get(streamKey)?.awaitingTiming;
-    if (!awaitingTiming) return;
+    const state = this.#timingStreams.get(streamKey);
+    if (!state) return;
+    if (!head.options?.recovered) {
+      const kept = state.awaitingTiming.filter((queued) => !queued.options?.recovered || queued.sequenceNumber !== head.sequenceNumber);
+      this.#recoveredHeadsAwaitingTiming.superseded += state.awaitingTiming.length - kept.length;
+      state.awaitingTiming = kept;
+    }
+    const awaitingTiming = state.awaitingTiming;
     awaitingTiming.push(head);
-    if (awaitingTiming.length > MAX_AWAITING_TIMING_HEADS) awaitingTiming.shift();
+    if (head.options?.recovered) this.#recoveredHeadsAwaitingTiming.held++;
+    if (awaitingTiming.length > MAX_AWAITING_TIMING_HEADS) {
+      this.#leaveAwaitingTiming(awaitingTiming.shift(), "expired");
+    }
+  }
+  /** Count a recovered head leaving the queue other than by replay or its source copy. */
+  #leaveAwaitingTiming(head, outcome) {
+    if (head.options?.recovered) this.#recoveredHeadsAwaitingTiming[outcome]++;
   }
   /**
    * Feed again the heads whose timing the FT=1 just admitted declares. That
@@ -19491,6 +19692,7 @@ var MmtpContainerParser = class _MmtpContainerParser {
     const state = this.#timingStreams.get(streamKey);
     if (!state) return;
     this.#timingStreams.delete(streamKey);
+    for (const head of state.awaitingTiming) this.#leaveAwaitingTiming(head, "discarded");
     this.#pendingTimingSamples -= state.resolver.pendingSampleCount;
     if (this.#pendingTimingSamples < 0) {
       throw new Error("[MmtpContainerParser] pending timing sample accounting underflow");
@@ -23106,7 +23308,7 @@ var MmtpRouter = class {
     const cb = this.#getFrameCallback(packetId);
     if (isVideo && !assembler) {
       if (frameMeta.recovered) {
-        this.#routeDirectRecoveredVideo(packetId, data, frameMeta, cb);
+        this.#routeDirectRecoveredVideo(packetId, data, frameMeta, cb, meta.fecSbn);
       } else {
         this.#routeDirectSourceVideo(packetId, data, frameMeta, cb);
       }
@@ -23496,6 +23698,10 @@ var MmtpRouter = class {
   get keyframeOverlayStats() {
     return { ...this.#overlayStats };
   }
+  /** Recovered FT=2 heads held for their FT=1, and how each left the wait (BLO-53369). */
+  get recoveredHeadsAwaitingTiming() {
+    return this.#parser.recoveredHeadsAwaitingTiming;
+  }
   #isOverlayRepair(repairPacketId, repairTrackName) {
     return this.#overlayLegs.has(repairPacketId) || repairTrackName !== void 0 && this.#overlayRepairNames.has(repairTrackName);
   }
@@ -25650,8 +25856,16 @@ var MmtpRouter = class {
     this.#drainDirectRecoveredVideo(streamKey, packetId, (frame) => frame.timestamp <= meta.timestamp, cb);
     this.#emitDirectVideo(packetId, data, meta, cb);
   }
-  #routeDirectRecoveredVideo(packetId, data, meta, cb) {
+  #routeDirectRecoveredVideo(packetId, data, meta, cb, fecSbn) {
     const streamKey = this.#mediaStreamKey(packetId, meta.catalogTrackName);
+    if (this.#isFecTrack(packetId)) {
+      const high = this.#deliveredVideoHighWaterByStream.get(streamKey);
+      if (fecSbn !== void 0 || high !== void 0 && authoredAdjacent(high, meta)) {
+        this.#drainDirectRecoveredVideo(streamKey, packetId, (frame) => frame.timestamp <= meta.timestamp, cb);
+        this.#emitDirectVideo(packetId, data, meta, cb);
+        return;
+      }
+    }
     this.#enqueueDirectRecoveredVideo(packetId, data, meta);
     const lastSourceTs = this.#lastDirectSourceVideoTsByStream.get(streamKey);
     this.#drainDirectRecoveredVideo(
@@ -25905,6 +26119,29 @@ var MmtpRouter = class {
         }
       );
     }
+    const untimedHead = (sym) => sym.fragmentType === 2 && sym.fragment.fragmentationIndicator === 1 && sym.fragment.movieFragmentSequenceNumber !== void 0 && sym.fragment.sampleNumber !== void 0 && !this.#parser.hasAuthoredTimingFor(
+      ownerPacketId,
+      sym.fragment.mpuSequenceNumber,
+      sym.fragment.movieFragmentSequenceNumber,
+      sym.fragment.sampleNumber,
+      catalogTrackName
+    );
+    for (const sym of result.symbols) {
+      if (!untimedHead(sym) || this.#sourceSeqReceived(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)) continue;
+      this.#feedViaParser(
+        sym.rawSymbol,
+        { packetId: ownerPacketId, sequenceNumber: sym.packetSequenceNumber },
+        void 0,
+        {
+          skipFecPayloadId: true,
+          recovered: true,
+          deliveryProvenance,
+          ...fecSbnOf(sym.index),
+          ...catalogTrackName === void 0 ? {} : { catalogTrackName }
+        }
+      );
+    }
+    result = { ...result, symbols: result.symbols.filter((sym) => !untimedHead(sym)) };
     const gated = this.#isFecTrack(ownerPacketId);
     const assembler = this.#mseAssemblerFor(ownerPacketId, catalogTrackName);
     if (assembler) {
@@ -29666,7 +29903,7 @@ async function setupFecWorkerForTrack(opts) {
     blockProfile,
     k: opts.fecK,
     // P as this receiver joined it, not the catalog total: the worker snapshot
-    // and CMCD `x-bc-fec-p` are read from this. Identity on a single layer.
+    // and CMCD `com.blockcast-fp` are read from this. Identity on a single layer.
     repairCount: opts.joinedRepairCount ?? opts.fecRepairCount,
     symbolSize: opts.fecSymbolSize,
     interleaveDepth: interleaveDepthBlocks,
@@ -30208,24 +30445,24 @@ var MediaRouter = class {
     if (!this.#multicastVideoKeyed) return;
     if (this.#requireAudio && !this.#multicastAudioReceived) return;
     if (this.#requireAudio && !this.#moqAudioWarmed) return;
-    const token = ++this.#sourceSwitchToken;
+    const token2 = ++this.#sourceSwitchToken;
     const maybeReady = this.#onSourceSwitch?.("multicast");
     if (!maybeReady || typeof maybeReady.then !== "function") {
-      this.#commitMulticastActivation(token);
+      this.#commitMulticastActivation(token2);
       return;
     }
     const ready = Promise.resolve(maybeReady);
-    this.#pendingMulticastToken = token;
+    this.#pendingMulticastToken = token2;
     this.#sourceSwitchReady = ready;
     void ready.then(
-      () => this.#commitMulticastActivation(token),
-      (err) => this.#rejectMulticastActivation(token, err)
+      () => this.#commitMulticastActivation(token2),
+      (err) => this.#rejectMulticastActivation(token2, err)
     ).finally(() => {
       if (this.#sourceSwitchReady === ready) this.#sourceSwitchReady = null;
     });
   }
-  #commitMulticastActivation(token) {
-    if (token !== this.#sourceSwitchToken) return;
+  #commitMulticastActivation(token2) {
+    if (token2 !== this.#sourceSwitchToken) return;
     this.#active = "multicast";
     this.#suppressed = true;
     this.#pendingMulticastToken = null;
@@ -30236,9 +30473,9 @@ var MediaRouter = class {
     if (video) this.#onVideoFrame?.(video.data, video.meta);
     if (audio) this.#onAudioFrame?.(audio.data, audio.meta);
   }
-  #rejectMulticastActivation(token, err) {
-    if (token !== this.#sourceSwitchToken) return;
-    if (this.#pendingMulticastToken === token) this.#pendingMulticastToken = null;
+  #rejectMulticastActivation(token2, err) {
+    if (token2 !== this.#sourceSwitchToken) return;
+    if (this.#pendingMulticastToken === token2) this.#pendingMulticastToken = null;
     this.#pendingMulticastVideo = null;
     this.#pendingMulticastAudio = null;
     console.warn("[MediaRouter] onSourceSwitch(multicast) failed", err);
@@ -31207,63 +31444,65 @@ var FecStarvationDetector = class {
 
 // src/cmcd-producer.ts
 var PLAY_MODES = ["full", "base-only", "single-track"];
-function sanitize(value) {
-  return value.replace(/[,\r\n]/g, "");
-}
-function buildFecParams(stats) {
-  const params = {};
-  const cfg = stats.config;
-  params["x-bc-fec-algo"] = cfg.algorithm;
-  params["x-bc-fec-k"] = cfg.k;
-  params["x-bc-fec-p"] = cfg.repairCount;
-  params["x-bc-fec-recovery"] = parseFloat((stats.recoveryRate / 100).toFixed(4));
-  return params;
-}
-function buildTransportParams(snap) {
-  if (!snap) return {};
-  const params = {};
-  params["x-bc-transport"] = snap.transport;
-  if (snap.multicastGroup != null) {
-    params["x-bc-multicast-group"] = snap.multicastGroup;
-  }
-  if (snap.multicastSource != null) {
-    params["x-bc-multicast-source"] = snap.multicastSource;
-  }
-  if (snap.amtRelay != null) {
-    params["x-bc-amt-relay"] = snap.amtRelay;
-  }
-  return params;
-}
-function formatQueryString(params) {
-  return Object.keys(params).sort().map((key) => {
-    const v = params[key];
-    if (typeof v === "string") return `${key}=${sanitize(v)}`;
-    return `${key}=${v}`;
+var DEFAULT_INTERVAL_MS = 3e4;
+var CUSTOM_PREFIX = "com.blockcast-";
+var MAX_CUSTOM_VALUE = 64;
+var TRANSPORT_TOKEN = {
+  native: "ssm",
+  amt: "amt",
+  moq: "moq"
+};
+function sfString(value) {
+  return `"${value.replace(/[^\x20-\x7e]/g, "").replace(/[\\"]/g, "\\$&")}"`;
+}
+function encodeCmcdRecord(record) {
+  return Object.keys(record).sort().map((key) => {
+    const value = record[key];
+    if (typeof value === "number") return `${key}=${value}`;
+    if (typeof value === "string") return `${key}=${sfString(value)}`;
+    if (Array.isArray(value)) return `${key}=(${value.map(sfString).join(" ")})`;
+    return `${key}=${value.token}`;
   }).join(",");
 }
+var token = (value) => ({ token: value });
+function putCustom(record, name, value) {
+  if (value === void 0) return;
+  if (typeof value === "number") value = String(value);
+  if (typeof value === "string" && value.length > MAX_CUSTOM_VALUE) return;
+  record[CUSTOM_PREFIX + name] = value;
+}
 var CmcdProducer = class {
-  #onCmcdParams;
   #onCmcdPost;
+  #intervalMs;
+  #sessionId;
+  #now;
+  #sn = 0;
+  #lastHeartbeat = null;
   #transport;
   #lastStats;
-  // Phase 14 state — Plan 03 Task 2 (D-12, D-15).
   #playMode = null;
   #deltaFailRate = null;
   #switchMiscount = 0;
   #manifestStats = null;
   #fecFailClosed = null;
+  /** Video-block resolutions from the repair lifecycle; null until the player feeds one. */
+  #lifecycle = null;
   constructor(options) {
-    this.#onCmcdParams = options.onCmcdParams;
     this.#onCmcdPost = options.onCmcdPost;
+    this.#intervalMs = options.intervalMs ?? DEFAULT_INTERVAL_MS;
+    if (!Number.isFinite(this.#intervalMs) || this.#intervalMs <= 0) {
+      throw new Error(`[CmcdProducer] invalid intervalMs "${String(options.intervalMs)}"; expected a positive number`);
+    }
+    this.#sessionId = options.sessionId ?? globalThis.crypto.randomUUID();
+    this.#now = options.now ?? Date.now;
   }
   /** Update the stored transport state. Called by player wiring layer. */
   updateTransport(snapshot) {
     this.#transport = snapshot;
   }
   /**
-   * Set the current play-mode. Emitted as `x-bc-play-mode` on subsequent
-   * snapshots. Throws on any value outside {'full','base-only','single-track'}
-   * (CLAUDE.md: error on bad init).
+   * Set the current play-mode, reported as `com.blockcast-pm`. Throws on any
+   * value outside {'full','base-only','single-track'} (CLAUDE.md: error on bad init).
    */
   updatePlayMode(mode) {
     if (typeof mode !== "string" || !PLAY_MODES.includes(mode)) {
@@ -31274,9 +31513,8 @@ var CmcdProducer = class {
     this.#playMode = mode;
   }
   /**
-   * Set the delta-track FEC block-failure rate (0..1 inclusive). Emitted as
-   * `x-bc-delta-fail-rate` on snapshots when play-mode is 'full' or 'base-only'.
-   * Omitted on single-track streams.
+   * Set the delta-track FEC block-failure rate (0..1 inclusive), reported as
+   * `com.blockcast-dfr` when play-mode is 'full' or 'base-only'.
    */
   updateDeltaFailRate(rate) {
     if (typeof rate !== "number" || !Number.isFinite(rate) || rate < 0 || rate > 1) {
@@ -31286,112 +31524,139 @@ var CmcdProducer = class {
     }
     this.#deltaFailRate = rate;
   }
-  /**
-   * Bump the cumulative switching-set misalignment counter. Emitted as
-   * `x-bc-switch-miscount` on snapshots when the counter is > 0.
-   */
+  /** Bump the cumulative switching-set misalignment counter (`com.blockcast-sm`). */
   incrementSwitchMiscount() {
     this.#switchMiscount += 1;
   }
   /**
-   * Record that FEC failed closed at runtime (fec-01 6.3.9). Every later
-   * snapshot carries `x-bc-fec-fail-closed` (the reason code) and
-   * `x-bc-fec-fail-layer` (the held layer i whose total B_i was undercut), so a
-   * stream playing without FEC is told apart from one with no loss.
+   * Record that FEC failed closed at runtime (fec-01 6.3.9). Reported at once
+   * as `e=e` with the reason code in `ec`, and on every later counter report
+   * as `com.blockcast-ffc` / `com.blockcast-ffl` (the held layer whose total
+   * B_i was undercut), so a stream playing without FEC is told apart from one
+   * with no loss.
    */
   updateFecFailClosed(reason) {
+    const changed = this.#fecFailClosed?.code !== reason.code || this.#fecFailClosed?.layer !== reason.layer;
     this.#fecFailClosed = reason;
+    if (changed) this.#post([{ ...this.#base("e"), ec: [reason.code] }]);
   }
   updateManifestVerification(stats) {
     this.#manifestStats = stats;
   }
   /**
-   * One-shot emit of `x-bc-switch-drift-us` for a single misalignment event.
-   * Does NOT mutate snapshot state — subsequent onSnapshot() calls will not
-   * include the drift key until the next emitSwitchDrift(). Mirrors the
-   * existing onTransition() pattern.
+   * Count a video block's resolution from the repair lifecycle: recovered in
+   * band (`com.blockcast-fbr`), recovered by repair FETCH (`-fbq`), or failed
+   * as a keyframe-class block (`-fbfk`). Audio blocks are not counted, matching
+   * the video-track `-fbf`. Until the player feeds this, the three are absent.
    */
+  onRepairLifecycle(event) {
+    this.#lifecycle ??= { inband: 0, fetch: 0, failedKeyframe: 0 };
+    if (event.type === "recovered" && event.blockClass !== "audio") {
+      if (event.via === "inband") this.#lifecycle.inband++;
+      else this.#lifecycle.fetch++;
+    } else if (event.type === "failed" && event.blockClass === "keyframe") {
+      this.#lifecycle.failedKeyframe++;
+    }
+  }
+  /** One-shot custom event `com.blockcast-switch-drift` for a single misalignment. */
   emitSwitchDrift(driftUs) {
     if (typeof driftUs !== "number" || !Number.isFinite(driftUs) || driftUs < 0) {
       throw new Error(
         `[CmcdProducer] invalid drift-us "${String(driftUs)}"; expected a non-negative finite number`
       );
     }
-    const params = {};
-    if (this.#lastStats) Object.assign(params, buildFecParams(this.#lastStats));
-    Object.assign(params, buildTransportParams(this.#transport));
-    if (this.#switchMiscount > 0) params["x-bc-switch-miscount"] = this.#switchMiscount;
-    params["x-bc-switch-drift-us"] = driftUs;
-    this.#emit(params);
+    const record = { ...this.#base("ce"), cen: CUSTOM_PREFIX + "switch-drift" };
+    putCustom(record, "sdu", Math.round(driftUs));
+    this.#post([record]);
   }
-  /**
-   * Process a FecTrackStats snapshot. Finds the video track, builds
-   * x-bc-* vendor keys, and fires both delivery callbacks.
-   */
+  /** Take a FecTrackStats snapshot (first video track) and send the heartbeat when due. */
   onSnapshot(data) {
     const videoTrack = data.tracks.find((t) => t.config.trackType === "video");
     if (!videoTrack) return;
     this.#lastStats = videoTrack;
-    const params = {
-      ...buildFecParams(videoTrack),
-      ...buildTransportParams(this.#transport)
-    };
-    if (this.#playMode !== null) {
-      params["x-bc-play-mode"] = this.#playMode;
-    }
-    if (this.#fecFailClosed) {
-      params["x-bc-fec-fail-closed"] = this.#fecFailClosed.code;
-      params["x-bc-fec-fail-layer"] = this.#fecFailClosed.layer;
-    }
-    if (this.#playMode !== null && this.#playMode !== "single-track" && this.#deltaFailRate !== null) {
-      params["x-bc-delta-fail-rate"] = parseFloat(this.#deltaFailRate.toFixed(4));
-    }
-    if (this.#switchMiscount > 0) {
-      params["x-bc-switch-miscount"] = this.#switchMiscount;
-    }
-    if (this.#manifestStats) {
-      params["x-bc-manifest-verified"] = this.#manifestStats.verified > 0;
-      params["x-bc-manifest-failures"] = Object.values(this.#manifestStats.failures).reduce((total, count) => total + count, 0);
-    }
-    this.#emit(params);
+    this.#heartbeat();
   }
   /**
-   * Emit transport state without inventing FEC metrics. Cadence is owned by
-   * the caller because only the transport integration knows when state changed.
+   * Take transport state for receivers that do not own FEC stats, and send the
+   * heartbeat when due.
    */
   onTransportSnapshot(data) {
     if (!Number.isFinite(data.timestampMs) || data.timestampMs < 0) {
       throw new Error("[CmcdProducer] transport snapshot timestamp must be a non-negative finite number");
     }
     if (data.playMode !== void 0) this.updatePlayMode(data.playMode);
-    if (data.switchMiscount !== void 0 && (!Number.isSafeInteger(data.switchMiscount) || data.switchMiscount < 0)) {
-      throw new Error("[CmcdProducer] transport snapshot switch-miscount must be a non-negative safe integer");
+    if (data.switchMiscount !== void 0) {
+      if (!Number.isSafeInteger(data.switchMiscount) || data.switchMiscount < 0) {
+        throw new Error("[CmcdProducer] transport snapshot switch-miscount must be a non-negative safe integer");
+      }
+      this.#switchMiscount = data.switchMiscount;
     }
     this.#transport = data.transport;
-    const params = buildTransportParams(data.transport);
-    if (this.#playMode !== null) params["x-bc-play-mode"] = this.#playMode;
-    const switchMiscount = data.switchMiscount ?? this.#switchMiscount;
-    if (switchMiscount > 0) params["x-bc-switch-miscount"] = switchMiscount;
-    this.#emit(params);
+    this.#heartbeat();
   }
-  /**
-   * Signal a transport transition event. Fires an immediate out-of-band
-   * emit with x-bc-ct set. The subsequent onSnapshot() will NOT include
-   * x-bc-ct (one-shot).
-   */
+  /** Report a transport transition at once, as custom event `com.blockcast-ct`. */
   onTransition(event) {
-    const params = {};
-    if (this.#lastStats) {
-      Object.assign(params, buildFecParams(this.#lastStats));
+    const record = { ...this.#base("ce"), cen: CUSTOM_PREFIX + "ct" };
+    putCustom(record, "ct", token(event));
+    this.#putTransport(record);
+    this.#post([record]);
+  }
+  #base(event) {
+    return { e: token(event), sid: this.#sessionId, sn: this.#sn++, ts: Math.floor(this.#now()), v: 2 };
+  }
+  #heartbeat() {
+    const now = this.#now();
+    if (this.#lastHeartbeat !== null && now - this.#lastHeartbeat < this.#intervalMs) return;
+    this.#lastHeartbeat = now;
+    this.#post([this.#base("t"), this.#counters()]);
+  }
+  #putTransport(record) {
+    const snap = this.#transport;
+    if (!snap) return;
+    putCustom(record, "tr", token(TRANSPORT_TOKEN[snap.transport]));
+    if (snap.multicastGroup != null && snap.multicastSource != null) {
+      putCustom(record, "sg", `${snap.multicastGroup}@${snap.multicastSource}`);
+    }
+    putCustom(record, "ar", snap.amtRelay);
+  }
+  /** The `e=ce` counter report. */
+  #counters() {
+    const record = { ...this.#base("ce"), cen: CUSTOM_PREFIX + "fec" };
+    const stats = this.#lastStats;
+    if (stats) {
+      putCustom(record, "fa", stats.config.algorithm);
+      putCustom(record, "fk", stats.config.k);
+      putCustom(record, "fp", stats.config.repairCount);
+      putCustom(record, "pr", stats.sourceSymbols);
+      putCustom(record, "pl", stats.sourcePacketsMissing);
+      putCustom(record, "pu", stats.sourcePacketsUnrecovered);
+      putCustom(record, "fbf", stats.blocksFailed);
+    }
+    if (this.#lifecycle) {
+      putCustom(record, "fbr", this.#lifecycle.inband);
+      putCustom(record, "fbq", this.#lifecycle.fetch);
+      putCustom(record, "fbfk", this.#lifecycle.failedKeyframe);
+    }
+    this.#putTransport(record);
+    if (this.#playMode !== null) {
+      putCustom(record, "pm", token(this.#playMode));
+      if (this.#playMode !== "single-track" && this.#deltaFailRate !== null) {
+        putCustom(record, "dfr", this.#deltaFailRate.toFixed(3));
+      }
+    }
+    if (this.#fecFailClosed) {
+      putCustom(record, "ffc", token(this.#fecFailClosed.code));
+      putCustom(record, "ffl", this.#fecFailClosed.layer);
     }
-    Object.assign(params, buildTransportParams(this.#transport));
-    params["x-bc-ct"] = event;
-    this.#emit(params);
+    if (this.#switchMiscount > 0) putCustom(record, "sm", this.#switchMiscount);
+    if (this.#manifestStats) {
+      putCustom(record, "mv", this.#manifestStats.verified);
+      putCustom(record, "mf", Object.values(this.#manifestStats.failures).reduce((a, b) => a + b, 0));
+    }
+    return record;
   }
-  /** Fire both delivery callbacks with the given params. */
-  #emit(params) {
-    this.#onCmcdParams?.(params);
-    this.#onCmcdPost?.(formatQueryString(params));
+  #post(records) {
+    this.#onCmcdPost?.(records.map(encodeCmcdRecord).join("\n"));
   }
 };
 
@@ -31487,6 +31752,19 @@ function resolveRepairLayers(catalog, source) {
     totalBaseRepairSymbols: binding.totalBaseRepairSymbols
   };
 }
+function valueAt(catalog, pointer) {
+  let node = catalog;
+  for (const segment of pointer.split("/").slice(1)) {
+    if (typeof node !== "object" || node === null) return void 0;
+    node = node[segment.replace(/~1/g, "/").replace(/~0/g, "~")];
+  }
+  return node;
+}
+function catalogTrackDeliveryMode(catalog, source) {
+  const binding = bindingOf(catalog, source);
+  const entry = binding ? valueAt(catalog, binding.pointer) : void 0;
+  return entry?.deliveryMode === "stream" ? "stream" : "datagram";
+}
 function moqtPriority2(value) {
   return Number.isSafeInteger(value) && value >= 0 && value <= 255 ? value : null;
 }
@@ -31530,6 +31808,7 @@ function fecParams(catalog, track, fps, sampleRate) {
     repairTrackName: base.repairTrack,
     repairLayers: repair.baseLayers,
     repairOverlays: repair.overlays,
+    deliveryMode: catalogTrackDeliveryMode(catalog, track),
     ...mediaRate
   };
 }
@@ -32054,7 +32333,7 @@ var RepairLayerSubscriptions = class {
    * or interleaved sequences read as loss.
    */
   noteSourceSequence(seq) {
-    if (this.#disposed || this.#opts.delivery === "stream") return;
+    if (this.#disposed || this.#delivery() === "stream") return;
     seq >>>= 0;
     if (this.#lastSeq === void 0) {
       this.#lastSeq = seq;
@@ -32087,12 +32366,12 @@ var RepairLayerSubscriptions = class {
     this.#expected = 0;
     this.#lost = 0;
     this.#wantFewer = 0;
-    this.#layerCount = Math.min(this.#layerCount, this.#layers().length);
+    this.#layerCount = this.#delivery() === "stream" ? 0 : Math.min(this.#layerCount, this.#layers().length);
     this.#reconcile();
   }
   snapshot() {
     return {
-      delivery: this.#opts.delivery,
+      delivery: this.#delivery(),
       layerCount: this.#layerCount,
       subscribedTracks: [...this.#subs.keys()],
       repairPackets: this.#repairPackets,
@@ -32106,6 +32385,9 @@ var RepairLayerSubscriptions = class {
     this.#closeAll();
     this.#disposed = true;
   }
+  #delivery() {
+    return this.#source.deliveryMode === "stream" ? "stream" : "datagram";
+  }
   #layers() {
     return this.#source.repairLayers ?? [];
   }
@@ -32848,6 +33130,7 @@ export {
   catalogGroupDurationMs,
   catalogKeyframeCadenceMs,
   catalogRepairTarget,
+  catalogTrackDeliveryMode,
   catalogTrackFecUnavailable,
   classifyH264Keyframe,
   classifyHevcKeyframe,
@@ -32868,6 +33151,7 @@ export {
   detectH264Keyframe,
   detectHevcKeyframe,
   driftCheck,
+  encodeCmcdRecord,
   encodeDataSegment,
   encodeFecSourceInfo,
   encodeLocTimestamp,