@blockcast/mmt-container 0.5.0 → 1.0.0-main.63922d1832ee

package/README.md

@@ -270,7 +270,7 @@ per-commit `0.1.0-main.<sha>` prerelease from `stamp-prerelease.mjs`), and a
 > Superseded by BLO-40665. Every package is now bumped in lockstep by a `v*`
 > tag and the sibling ranges move with it, so the objection above no longer
 > applies -- it was an argument against bumping *one* package. The set is at
-> `0.5.0`; see `RELEASES.md`.
+> `1.0.0`; see `RELEASES.md`.
 
 #### Track-role convention (Phase 14)
 

package/dist/browser-runtime.js

@@ -19622,8 +19622,6 @@ var MmtpRouter = class {
   // Callbacks (legacy — used when per-track callbacks are not registered)
   #onVideoFrame = null;
   #onAudioFrame = null;
-  // Init segment (ftyp+moov) from MMTP MPU metadata — needed for MSE SourceBuffer
-  #onInitSegment = null;
   // Per-track init segment callbacks keyed by packetId
   #trackInitCallbacks = /* @__PURE__ */ new Map();
   // Track whether init has been delivered per physical stream — prevent duplicates
@@ -19886,11 +19884,10 @@ var MmtpRouter = class {
     };
   }
   /**
-   * Init segments delivered for a packetId with no `onTrackInit` handler
-   * since construction, whether the deprecated aggregate `onInitSegment`
-   * callback then received them or nothing did. A supported deployment reads
-   * 0 here; a non-zero value is the evidence that blocks removing the
-   * aggregate callback (MOQT-01, BLO-21181).
+   * Init segments rejected since construction because their packetId had no
+   * `onTrackInit` handler. A rejected init is delivered nowhere; there is no
+   * aggregate fallback (removed in 1.0.0, MOQT-01 / BLO-21181). A supported
+   * deployment reads 0 here.
    */
   get unmappedInitDeliveryCount() {
     return this.#unmappedInitDeliveries;
@@ -20067,20 +20064,10 @@ var MmtpRouter = class {
   onTrackPacket(packetId, cb) {
     this.#trackPacketCallbacks.set(packetId, cb);
   }
-  /**
-   * Register an init segment callback (ftyp+moov from MMTP MPU metadata).
-   * Receives an init only for a packetId with no `onTrackInit` handler.
-   *
-   * @deprecated Use onTrackInit(packetId, cb). Still delivered as a fallback;
-   * removed in the 1.0.0 major, no earlier than one minor release after this
-   * deprecation reaches the `latest` dist-tag (BLO-21181). Count fallback
-   * deliveries with `unmappedInitDeliveryCount`.
-   */
-  onInitSegment(cb) {
-    this.#onInitSegment = cb;
-  }
   /** Register an init segment callback for a specific MMTP packetId.
-   *  Called when FT=0 init arrives via direct source or FEC recovery. */
+   *  Called when FT=0 init arrives via direct source or FEC recovery. An init
+   *  for a packetId with no handler is rejected and counted by
+   *  `unmappedInitDeliveryCount`. */
   onTrackInit(packetId, cb) {
     this.#trackInitCallbacks.set(packetId, cb);
   }
@@ -21480,16 +21467,15 @@ var MmtpRouter = class {
     if (this.#trackInitDelivered.has(streamKey)) return;
     if (data.byteLength <= 8) return;
     this.#trackInitDelivered.add(streamKey);
+    const track = `packetId=${packetId}${catalogTrackName === void 0 ? "" : ` track=${catalogTrackName}`}`;
     const cb = this.#trackInitCallbacks.get(packetId);
-    if (cb) {
-      cb(data);
-    } else {
+    if (!cb) {
       this.#unmappedInitDeliveries++;
-      this.#onInitSegment?.(data);
+      console.log(`[MmtpRouter] Init rejected for ${track}: no onTrackInit handler`);
+      return;
     }
-    console.log(
-      `[MmtpRouter] Init delivered for packetId=${packetId}${catalogTrackName === void 0 ? "" : ` track=${catalogTrackName}`} (${data.byteLength}B)`
-    );
+    cb(data);
+    console.log(`[MmtpRouter] Init delivered for ${track} (${data.byteLength}B)`);
   }
   /**
    * Core MMTP packet processing — source packets → play + FEC, repair → FEC only.
@@ -22989,6 +22975,10 @@ function getMulticastGlobals() {
 function hasMulticastGateway() {
   return typeof getMulticastGlobals().multicast?.subscribe === "function";
 }
+function senderOf(event) {
+  const sourceAddress = event.sourceAddress;
+  return typeof sourceAddress === "string" ? sourceAddress : void 0;
+}
 function normalizeBytesEventDetail(detail) {
   const value = detail && typeof detail === "object" && "data" in detail ? detail.data : detail;
   if (value instanceof Uint8Array) return value;
@@ -23035,7 +23025,8 @@ var MulticastTransport = class {
     bytesReceived: 0,
     packetsDroppedUnregisteredPid: 0,
     packetsDroppedUnparseable: 0,
-    packetsDroppedSignaling: 0
+    packetsDroppedSignaling: 0,
+    packetsDroppedForeignSender: 0
   };
   // join() calls by how they resolved; see joinStats.
   #joinsSucceeded = 0;
@@ -23060,6 +23051,11 @@ var MulticastTransport = class {
   // per packet once a count outgrows the small-integer range.
   #acceptedBytesByPacketId = /* @__PURE__ */ new Map();
   #packetIds = null;
+  // The sender S this join's accepted packets came from, once known; see
+  // packetsDroppedForeignSender. Cleared by every join and by a silence
+  // failback, so a replacement publisher is not locked out.
+  #sender = void 0;
+  #lockedTo;
   // What the live join delivers with each accepted packet. A field, not a
   // listener closure, so an in-place admission change (setContext) applies
   // from the next packet on without rejoining.
@@ -23081,9 +23077,15 @@ var MulticastTransport = class {
   #joinGeneration = 0;
   // The provider to subscribe through; window.multicast when unset.
   #gateway;
+  /**
+   * `lockedTo` reads the sender another transport is locked to (a repair
+   * group follows its media join, whose publisher sends both). While it reads
+   * a sender, this join admits only that one; until then its own lock applies.
+   */
   constructor(onPacket, options = {}) {
     this.#onPacket = onPacket;
     this.#gateway = options.gateway;
+    this.#lockedTo = options.lockedTo;
   }
   static isAvailable() {
     return hasMulticastGateway();
@@ -23092,6 +23094,7 @@ var MulticastTransport = class {
     const generation = ++this.#joinGeneration;
     this.#releaseSubscription();
     this.#dataPlaneLive = false;
+    this.#sender = void 0;
     if (this.#disposed) return this.#declined(generation, "disposed");
     const gateway = this.#gateway ?? getMulticastGlobals().multicast;
     if (typeof gateway?.subscribe !== "function") {
@@ -23133,7 +23136,8 @@ var MulticastTransport = class {
       }
       this.#subscription = subscription;
       const live = () => !this.#disposed && generation === this.#joinGeneration;
-      const packetListener = subscriptionDeliversPacketBatches(subscription) ? {
+      const anySource = !config.sourceAddress && !config.senderAddress && !config.atsc3;
+      const packetListener = !anySource && subscriptionDeliversPacketBatches(subscription) ? {
         type: "packets",
         listener: (event) => {
           if (!live()) return;
@@ -23143,7 +23147,7 @@ var MulticastTransport = class {
         type: "bytes",
         listener: (event) => {
           if (!live()) return;
-          if (this.#deliver(event.detail)) this.#resetWatchdog();
+          if (this.#deliver(event.detail, senderOf(event))) this.#resetWatchdog();
         }
       };
       this.#packetListener = packetListener;
@@ -23234,13 +23238,13 @@ var MulticastTransport = class {
    * One packet from the subscription: filter, count, and hand it to the
    * callback. Returns whether it was delivered; the caller notes liveness.
    */
-  #deliver(detail) {
+  #deliver(detail, sourceAddress) {
     const packet = normalizeBytesEventDetail(detail);
     if (!packet) {
       this.#stats.packetsDroppedUnparseable++;
       return false;
     }
-    if (!this.#acceptPacket(packet)) return false;
+    if (!this.#acceptPacket(packet, sourceAddress)) return false;
     this.#onPacket(packet, this.#context);
     return true;
   }
@@ -23281,11 +23285,15 @@ var MulticastTransport = class {
       throw failures[0];
     }
   }
-  /** Feed a raw packet from an external source (e.g., AMT tunnel or ASM subscription). */
-  feedPacket(data, context) {
+  /**
+   * Feed a raw packet from an external source (e.g., AMT tunnel or ASM
+   * subscription). `sourceAddress` is the datagram's sender when the source
+   * knows it; see packetsDroppedForeignSender.
+   */
+  feedPacket(data, context, sourceAddress) {
     if (this.#disposed) return;
     const packet = data instanceof Uint8Array ? data : new Uint8Array(data);
-    if (!this.#acceptPacket(packet)) return;
+    if (!this.#acceptPacket(packet, sourceAddress)) return;
     this.#onPacket(packet, context);
     this.#resetWatchdog();
   }
@@ -23435,6 +23443,10 @@ var MulticastTransport = class {
   get withdrawnPacketIdDrops() {
     return this.#withdrawnPacketIdDrops;
   }
+  /** The sender this join is locked to; undefined until one is known. */
+  get sender() {
+    return this.#sender;
+  }
   /** Whether a subscription is live: joined, and not yet released or replaced. */
   get joined() {
     return this.#subscription !== null;
@@ -23597,11 +23609,16 @@ var MulticastTransport = class {
     this.#withdrawnPacketIds.clear();
   }
   /** The ingress filter; an accepted packet is counted here, once. */
-  #acceptPacket(packet) {
+  #acceptPacket(packet, sourceAddress) {
+    const owner = this.#lockedTo?.() ?? this.#sender;
+    if (sourceAddress !== void 0 && owner !== void 0 && sourceAddress !== owner) {
+      this.#stats.packetsDroppedForeignSender++;
+      return false;
+    }
     const packetId = readMMTPPacketId(packet);
     if (packetId === null) {
       if (!this.#packetIds) {
-        this.#countAccepted(packet, null);
+        this.#countAccepted(packet, null, sourceAddress);
         return true;
       }
       this.#stats.packetsDroppedUnparseable++;
@@ -23612,14 +23629,15 @@ var MulticastTransport = class {
       return false;
     }
     if (!this.#packetIds || this.#packetIds.has(packetId)) {
-      this.#countAccepted(packet, packetId);
+      this.#countAccepted(packet, packetId, sourceAddress);
       return true;
     }
     this.#recordUnregisteredPidDrop(packetId);
     return false;
   }
   /** Receive counters for one accepted packet; `packetId` is null when it has none. */
-  #countAccepted(packet, packetId) {
+  #countAccepted(packet, packetId, sourceAddress) {
+    this.#sender ??= sourceAddress;
     this.#stats.packetsReceived++;
     this.#stats.bytesReceived += packet.byteLength;
     if (packetId === null) return;
@@ -23690,6 +23708,7 @@ var MulticastTransport = class {
       console.warn(
         `[MulticastTransport] No packets for ${this.#failbackWindowMs}ms; failing back to MoQ`
       );
+      this.#sender = void 0;
       this.#onFailback({ kind: "silence", windowMs: this.#failbackWindowMs });
     }, delayMs);
   }
@@ -27704,10 +27723,6 @@ var MulticastManager = class {
   onTrackPacket(packetId, cb) {
     this.#router.onTrackPacket(packetId, cb);
   }
-  /** @deprecated Use onTrackInit(packetId, cb); see MmtpRouter.onInitSegment. */
-  onInitSegment(cb) {
-    this.#router.onInitSegment(cb);
-  }
   onTrackInit(packetId, cb) {
     this.#router.onTrackInit(packetId, cb);
   }
@@ -27931,15 +27946,21 @@ var MulticastManager = class {
         tracks: Object.freeze(endpoint.tracks.map(({ name, packetId }) => Object.freeze({ name, packetId }))),
         ...endpoint.flow === void 0 ? {} : { flow: endpoint.flow }
       };
-      const onPacket = (packet) => {
-        if (!released) this.#router.feedPacket(packet, "multicast", ingress);
+      let sender;
+      const onPacket = (packet, sourceAddress) => {
+        if (released) return;
+        if (sourceAddress !== void 0 && sourceAddress !== (this.#transport.sender ?? (sender ??= sourceAddress))) return;
+        this.#router.feedPacket(packet, "multicast", ingress);
       };
       const fail = (error) => console.warn(`[MulticastManager] repair group ${endpoint.group}:${endpoint.port} not joined`, error);
       if (typeof provider === "function") {
         Promise.resolve().then(() => provider(endpoint, onPacket)).then((release2) => released ? safely(release2) : releases.push(release2), fail);
         continue;
       }
-      const transport = new MulticastTransport((packet) => onPacket(packet), { gateway: provider });
+      const transport = new MulticastTransport((packet) => onPacket(packet), {
+        gateway: provider,
+        lockedTo: () => this.#transport.sender
+      });
       releases.push(() => transport.dispose());
       void transport.join({
         sourceAddress: endpoint.source,
@@ -28218,8 +28239,8 @@ var MulticastManager = class {
    *  transport attribution in FEC path counters.
    *  The `router` accessor above is already public.
    */
-  feedPacket(data, ingress) {
-    this.#transport.feedPacket(data, ingress);
+  feedPacket(data, ingress, sourceAddress) {
+    this.#transport.feedPacket(data, ingress, sourceAddress);
   }
   /**
    * Declare how packets given to feedPacket() reach this manager. A consumer