@blockcast/mmt-container 2.1.0 → 2.2.0-main.0f6aad7bb803

package/src/multicast-transport.ts

@@ -6,7 +6,10 @@
 
 import {
   isMulticastTrackPacketId,
+  isUserAgentVerifiedGateway,
+  resolveMulticastGateway,
   subscriptionDeliversPacketBatches,
+  userAgentVerifiedIngress,
   toWindowMulticastSubscribeConfig,
   type WindowMulticastDelivery,
   type WindowMulticastGateway,
@@ -52,7 +55,13 @@ export interface MulticastTransportConfig {
   protected?: boolean
 }
 
-export type ResolvedMulticastTransport = 'native' | 'amt'
+/**
+ * The leg a join resolved to. `'user-agent'`: the browser's own
+ * `MulticastReceiver` delivers it, which picks native or AMT itself and does
+ * not say which. CMCD has no user-agent value, so a caller reports a
+ * `'user-agent'` join as `'native'` (`TransportSnapshot.transport`).
+ */
+export type ResolvedMulticastTransport = 'native' | 'amt' | 'user-agent'
 
 /**
  * Why a joined transport handed control back to MoQ.
@@ -211,16 +220,8 @@ function providerErrorOf(error: unknown): MulticastJoinProviderError | undefined
  */
 const MAX_TRACKED_DROPPED_PIDS = 16
 
-type MulticastGlobals = typeof globalThis & {
-  multicast?: WindowMulticastGateway
-}
-
-function getMulticastGlobals(): MulticastGlobals {
-  return globalThis as MulticastGlobals
-}
-
 function hasMulticastGateway(): boolean {
-  return typeof getMulticastGlobals().multicast?.subscribe === 'function'
+  return typeof resolveMulticastGateway()?.subscribe === 'function'
 }
 
 /**
@@ -371,6 +372,9 @@ export class MulticastTransport<TPacketContext = never> {
   // listener closure, so an in-place admission change (setContext) applies
   // from the next packet on without rejoining.
   #context: TPacketContext | undefined = undefined
+  #deliveredContext: TPacketContext | undefined = undefined
+  /** The live join's gateway, when it is the user agent's MulticastReceiver provider. */
+  #userAgentGateway: WindowMulticastGateway | undefined = undefined
   // The live join's provider-side filter. An in-place widening must reach it,
   // or the provider never delivers the new ID; null without a live join.
   #providerFilter: ProviderFilter | null = null
@@ -415,7 +419,7 @@ export class MulticastTransport<TPacketContext = never> {
     this.#sender = undefined
 
     if (this.#disposed) return this.#declined(generation, 'disposed')
-    const gateway = this.#gateway ?? getMulticastGlobals().multicast
+    const gateway = this.#gateway ?? resolveMulticastGateway()
     if (typeof gateway?.subscribe !== 'function') {
       console.warn('[MulticastTransport] Multicast API not available')
       return this.#declined(generation, 'unavailable')
@@ -435,15 +439,18 @@ export class MulticastTransport<TPacketContext = never> {
       console.log(
         `[MulticastTransport] window.multicast.subscribe(${config.sourceAddress ?? config.senderAddress ?? '*'}, ${config.groupAddress}, ${config.port})`,
       )
+      // The browser's MulticastReceiver picks native or AMT, and the relay,
+      // itself: ask it for the group only.
+      const userAgent = isUserAgentVerifiedGateway(gateway)
       const subscribeConfig = toWindowMulticastSubscribeConfig({
         source: config.sourceAddress,
         senderAddress: config.senderAddress,
         group: config.groupAddress,
         port: config.port,
-        mode: config.mode,
-        amtRelay: config.amtRelay,
-        amtRelayPort: config.amtRelayPort,
-        amtDiscovery: config.amtDiscovery,
+        mode: userAgent ? 'native' : config.mode,
+        amtRelay: userAgent ? undefined : config.amtRelay,
+        amtRelayPort: userAgent ? undefined : config.amtRelayPort,
+        amtDiscovery: userAgent ? undefined : config.amtDiscovery,
         packetIds: config.packetIds,
         tracks: config.tracks,
         atsc3: config.atsc3,
@@ -506,7 +513,8 @@ export class MulticastTransport<TPacketContext = never> {
         acknowledgedUpdate: 0,
         inFlight: 0,
       }
-      this.#context = context
+      this.#userAgentGateway = userAgent ? gateway : undefined
+      this.#setContext(context)
       // Seed the allow-list's counters so accepted packets never insert. An
       // id already counted by an earlier join keeps its count: the counters
       // are cumulative across rejoins, as bytesReceived is.
@@ -521,7 +529,7 @@ export class MulticastTransport<TPacketContext = never> {
       // gateway no longer exposes a mutable transport/transportchange
       // surface, so assign this only after subscribe() has resolved and the
       // returned subscription has passed the event-surface check above.
-      this.#resolvedTransport = subscribeConfig.origin === 'amt' ? 'amt' : 'native'
+      this.#resolvedTransport = userAgent ? 'user-agent' : subscribeConfig.origin === 'amt' ? 'amt' : 'native'
       // The provider alone knows whether its packets are independent
       // datagrams or an ordered relay of one socket; undeclared promises no
       // ordering. Announce it before the listener can deliver a packet. A
@@ -630,7 +638,7 @@ export class MulticastTransport<TPacketContext = never> {
     // Read per packet: a callback that changes the admission (an in-place
     // rendition switch committing on this very packet) takes effect from the
     // next packet, including the rest of a batch.
-    this.#onPacket(packet, this.#context)
+    this.#onPacket(packet, this.#deliveredContext)
     return liveness
   }
 
@@ -872,8 +880,10 @@ export class MulticastTransport<TPacketContext = never> {
   }
 
   /**
-   * What the live join delivers with every accepted packet (the join's
-   * `context`, or the last setContext), or undefined without a live join.
+   * The live join's context as the caller gave it (the join's `context`, or
+   * the last setContext), or undefined without a live join. On a native
+   * provider each accepted packet is delivered with a marked copy of it
+   * (`userAgentVerifiedIngress`); this getter never carries the mark.
    */
   get context(): TPacketContext | undefined {
     return this.#context
@@ -899,7 +909,19 @@ export class MulticastTransport<TPacketContext = never> {
         '[MulticastTransport] setContext needs a live join; join() carries the first context',
       )
     }
+    this.#setContext(context)
+  }
+
+  /**
+   * The join's context, and what the subscription delivers with each packet:
+   * marked admitted by the user agent when the gateway is its native
+   * MulticastReceiver provider. feedPacket never marks.
+   */
+  #setContext(context: TPacketContext | undefined): void {
     this.#context = context
+    this.#deliveredContext = this.#userAgentGateway !== undefined && typeof context === 'object' && context !== null
+      ? userAgentVerifiedIngress(context, this.#userAgentGateway)
+      : context
   }
 
   /**
@@ -1040,6 +1062,8 @@ export class MulticastTransport<TPacketContext = never> {
     this.#matchedSource = undefined
     this.#providerFilter = null
     this.#context = undefined
+    this.#deliveredContext = undefined
+    this.#userAgentGateway = undefined
     this.#withdrawnPacketIds.clear()
   }