@moq/watch 0.3.2 → 0.4.0

package/README.md

@@ -72,7 +72,7 @@ The simplest way to watch a stream:
 | `muted`   | boolean                             | false    | Mute audio                               |
 | `visible` | never, distance, or always          | `20%`    | When to download video (see below)       |
 | `volume`  | number                              | 0.5      | Audio volume (0-1)                       |
-| `reload`  | boolean                             | true     | Wait for (re)announcement before subscribing. Defaults off for `mediaoverquic.com` relays until they support broadcast discovery. |
+| `reload`  | boolean                             | true     | Wait for (re)announcement before subscribing. Ignored when the relay does not support broadcast discovery. |
 
 The `visible` attribute controls when the video track is downloaded, based on the canvas
 position relative to the viewport:
@@ -129,7 +129,6 @@ The `<moq-watch-ui>` element automatically discovers the nested `<moq-watch>` el
 ## Features
 
 - **WebCodecs decoding** — Hardware-accelerated video and audio decoding
-- **MSE fallback** — Media Source Extensions for broader codec support
 - **Reactive state** — All properties are signals from `@moq/signals`
 - **Chat** — Subscribe to text chat channels
 - **Location** — Peer location and window tracking

package/audio/decoder.d.ts

@@ -1,11 +1,23 @@
+import * as Catalog from "@moq/hang/catalog";
+import * as Container from "@moq/hang/container";
 import { Time } from "@moq/net";
-import { type Getter, Signal } from "@moq/signals";
-import type { BufferedRanges } from "../buffered";
+import { type Getter, type Inputs, type Readonlys, Signal } from "@moq/signals";
+import type { Sync } from "../sync";
 import type { Source } from "./source";
-export type DecoderProps = {
-    enabled?: boolean | Signal<boolean>;
+export type DecoderInput = {
+    enabled: Getter<boolean>;
 };
-export interface AudioStats {
+type DecoderOutput = {
+    context: Signal<AudioContext | undefined>;
+    root: Signal<AudioNode | undefined>;
+    sampleRate: Signal<number | undefined>;
+    stats: Signal<Stats | undefined>;
+    timestamp: Signal<Time.Milli | undefined>;
+    stalled: Signal<boolean>;
+    buffered: Signal<Container.BufferedRanges>;
+};
+/** Cumulative audio statistics since the decoder started. */
+export interface Stats {
     /** Number of encoded bytes received. */
     bytesReceived: number;
 }
@@ -16,17 +28,15 @@ export interface AudioStats {
  */
 export declare class Decoder {
     #private;
-    source: Source;
-    enabled: Signal<boolean>;
-    readonly context: Getter<AudioContext | undefined>;
-    readonly root: Getter<AudioNode | undefined>;
-    readonly sampleRate: Getter<number | undefined>;
-    readonly stats: Getter<AudioStats | undefined>;
-    readonly timestamp: Getter<Time.Milli | undefined>;
-    readonly stalled: Getter<boolean>;
-    readonly buffered: Getter<BufferedRanges>;
-    constructor(source: Source, props?: DecoderProps);
+    readonly in: Readonlys<DecoderInput>;
+    readonly source: Source;
+    readonly sync: Sync;
+    readonly out: Readonlys<DecoderOutput>;
+    constructor(source: Source, sync: Sync, props?: Inputs<DecoderInput>);
     reset(): void;
     close(): void;
+    static supported: typeof supported;
 }
+declare function supported(config: Catalog.AudioConfig): Promise<boolean>;
+export {};
 //# sourceMappingURL=decoder.d.ts.map

package/audio/decoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decoder.d.ts","sourceRoot":"","sources":["../../src/audio/decoder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,MAAM,YAAY,GAAG;IAE1B,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,WAAW,UAAU;IAC1B,wCAAwC;IACxC,aAAa,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,qBAAa,OAAO;;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAGzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC,CAAiB;IAKnE,QAAQ,CAAC,IAAI,EAAoB,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAG/D,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,CAAoB;IAGnE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC,CAAe;IAI7D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,CAAmB;IAIrE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAiB;IAOlD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,CAAkB;IAuB3D,YAAY,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,YAAY,EAc/C;IAoWD,KAAK,IAAI,IAAI,CAEZ;IAaD,KAAK,SAEJ;CACD"}
+{"version":3,"file":"decoder.d.ts","sourceRoot":"","sources":["../../src/audio/decoder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,SAAS,MAAM,qBAAqB,CAAC;AAGjD,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAU,KAAK,MAAM,EAAU,KAAK,MAAM,EAAE,KAAK,SAAS,EAAa,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3G,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAIpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,MAAM,MAAM,YAAY,GAAG;IAE1B,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;CACzB,CAAC;AAEF,KAAK,aAAa,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC;IAI1C,IAAI,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAEpC,UAAU,EAAE,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IAGjC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IAG1C,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAGzB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;CAC3C,CAAC;AAEF,6DAA6D;AAC7D,MAAM,WAAW,KAAK;IACrB,wCAAwC;IACxC,aAAa,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,qBAAa,OAAO;;IACnB,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAWpB,QAAQ,CAAC,GAAG,2BAAwB;IAgCpC,YAAY,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,EAgBnE;IA0XD,KAAK,IAAI,IAAI,CAEZ;IAaD,KAAK,SAEJ;IAGD,MAAM,CAAC,SAAS,mBAAa;CAC7B;AAED,iBAAe,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAsCtE"}

package/audio/emitter.d.ts

@@ -1,17 +1,20 @@
-import { Signal } from "@moq/signals";
+import { type Getter, type Inputs, type Readonlys, Signal } from "@moq/signals";
 import type { Decoder } from "./decoder";
-export type EmitterProps = {
-    volume?: number | Signal<number>;
-    muted?: boolean | Signal<boolean>;
-    paused?: boolean | Signal<boolean>;
+export type EmitterInput = {
+    volume: Getter<number>;
+    muted: Getter<boolean>;
+    paused: Getter<boolean>;
+};
+type EmitterOutput = {
+    enabled: Signal<boolean>;
 };
 export declare class Emitter {
     #private;
-    source: Decoder;
-    volume: Signal<number>;
-    muted: Signal<boolean>;
-    paused: Signal<boolean>;
-    constructor(source: Decoder, props?: EmitterProps);
+    readonly source: Decoder;
+    readonly in: Readonlys<EmitterInput>;
+    readonly out: Readonlys<EmitterOutput>;
+    constructor(source: Decoder, props?: Inputs<EmitterInput>);
     close(): void;
 }
+export {};
 //# sourceMappingURL=emitter.d.ts.map

package/audio/emitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/audio/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,MAAM,MAAM,YAAY,GAAG;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;CACnC,CAAC;AAGF,qBAAa,OAAO;;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAIvB,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAUxB,YAAY,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,YAAY,EA+DhD;IAED,KAAK,SAEJ;CACD"}
+{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/audio/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,MAAM,EAAU,KAAK,MAAM,EAAE,KAAK,SAAS,EAAa,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,MAAM,MAAM,YAAY,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAIvB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAGvB,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;CACxB,CAAC;AAEF,KAAK,aAAa,GAAG;IAEpB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;CACzB,CAAC;AAGF,qBAAa,OAAO;;IACnB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAKrC,QAAQ,CAAC,GAAG,2BAAwB;IAOpC,YAAY,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,EAiDxD;IAED,KAAK,SAEJ;CACD"}

package/audio/index.d.ts

@@ -1,6 +1,4 @@
-export type * from "./backend";
 export * from "./decoder";
 export * from "./emitter";
-export * from "./mse";
 export * from "./source";
 //# sourceMappingURL=index.d.ts.map

package/audio/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/audio/index.ts"],"names":[],"mappings":"AAAA,mBAAmB,WAAW,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/audio/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC"}

package/audio/source.d.ts

@@ -1,34 +1,38 @@
 import type * as Catalog from "@moq/hang/catalog";
-import { type Getter, Signal } from "@moq/signals";
+import type * as Moq from "@moq/net";
+import { type Getter, type Inputs, type Readonlys, Signal } from "@moq/signals";
 import type { Broadcast } from "../broadcast";
-import type { Sync } from "../sync";
 export type Target = {
     name?: string;
 };
 /**
- * A function that checks if an audio configuration is supported by the backend.
+ * A function that checks if an audio configuration can be played.
+ *
+ * `Decoder.supported` is the WebCodecs probe used by `<moq-watch>`.
  */
 export type Supported = (config: Catalog.AudioConfig) => Promise<boolean>;
-export type SourceProps = {
-    broadcast?: Broadcast | Signal<Broadcast | undefined>;
-    target?: Target | Signal<Target | undefined>;
-    supported?: Supported;
+export type SourceInput = {
+    broadcast: Getter<Broadcast | undefined>;
+    target: Getter<Target | undefined>;
+    supported: Getter<Supported | undefined>;
+};
+type SourceOutput = {
+    catalog: Signal<Catalog.Audio | undefined>;
+    available: Signal<Record<string, Catalog.AudioConfig>>;
+    track: Signal<string | undefined>;
+    config: Signal<Catalog.AudioConfig | undefined>;
+    jitter: Signal<Moq.Time.Milli | undefined>;
 };
 /**
  * Source handles catalog extraction, support checking, and rendition selection
- * for audio playback. It is used by both MSE and Decoder backends.
+ * for audio playback. The Decoder consumes whichever rendition it picks.
  */
 export declare class Source {
     #private;
-    broadcast: Signal<Broadcast | undefined>;
-    target: Signal<Target | undefined>;
-    readonly catalog: Getter<Catalog.Audio | undefined>;
-    readonly available: Getter<Record<string, Catalog.AudioConfig>>;
-    readonly track: Signal<string | undefined>;
-    readonly config: Getter<Catalog.AudioConfig | undefined>;
-    supported: Signal<Supported | undefined>;
-    sync: Sync;
-    constructor(sync: Sync, props?: SourceProps);
+    readonly in: Readonlys<SourceInput>;
+    readonly out: Readonlys<SourceOutput>;
+    constructor(props?: Inputs<SourceInput>);
     close(): void;
 }
+export {};
 //# sourceMappingURL=source.d.ts.map

package/audio/source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../src/audio/source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAKpC,MAAM,MAAM,MAAM,GAAG;IAEpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE1E,MAAM,MAAM,WAAW,GAAG;IACzB,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAGtD,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAG7C,SAAS,CAAC,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF;;;GAGG;AACH,qBAAa,MAAM;;IAClB,SAAS,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IAGpD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAmB;IAGlF,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,CAAe;IAGzD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAgB;IAExE,SAAS,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAGzC,IAAI,EAAE,IAAI,CAAC;IAIX,YAAY,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,WAAW,EAe1C;IAiFD,KAAK,IAAI,IAAI,CAEZ;CACD"}
+{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../src/audio/source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAC;AAErC,OAAO,EAAU,KAAK,MAAM,EAAU,KAAK,MAAM,EAAE,KAAK,SAAS,EAAa,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAK9C,MAAM,MAAM,MAAM,GAAG;IAEpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE1E,MAAM,MAAM,WAAW,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAGzC,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAInC,SAAS,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;CACzC,CAAC;AAEF,KAAK,YAAY,GAAG;IACnB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IACvD,KAAK,EAAE,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IAGhD,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;CAC3C,CAAC;AAEF;;;GAGG;AACH,qBAAa,MAAM;;IAClB,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IASpC,QAAQ,CAAC,GAAG,0BAAwB;IAIpC,YAAY,KAAK,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,EAUtC;IA2FD,KAAK,IAAI,IAAI,CAEZ;CACD"}

package/audio/unlock.d.ts

@@ -0,0 +1,20 @@
+import { type Effect } from "@moq/signals";
+/**
+ * Resume a suspended {@link AudioContext} from a real user gesture.
+ *
+ * The context is built at page load, before any user activation can exist, so browsers that
+ * gate audio on a gesture reject a `resume()` made then. A single unconditional attempt would
+ * fire once, be rejected, and never retry, leaving audio silent. This instead attempts
+ * `resume()` immediately (for autoplay-permissive browsers like Chrome with prior engagement),
+ * then retries on every `pointerdown`/`keydown` until the context is actually running, dropping
+ * the gesture listeners once it is. `pointerdown` and `keydown` cover mouse, touch, pen, and
+ * keyboard, and each carries a user activation.
+ *
+ * Safari also reports an "interrupted" state (a WebKit-only value outside the
+ * suspended/running/closed set) and can leave it on its own; mirroring `statechange` into a
+ * signal picks that up so the listeners are re-armed or dropped as the state moves.
+ *
+ * Scoped to `effect`: the listeners are removed when the effect reruns or closes.
+ */
+export declare function unlockOnGesture(effect: Effect, context: AudioContext): void;
+//# sourceMappingURL=unlock.d.ts.map

package/audio/unlock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unlock.d.ts","sourceRoot":"","sources":["../../src/audio/unlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAU,MAAM,cAAc,CAAC;AAEnD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAe3E"}

package/audio/unlock.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=unlock.test.d.ts.map

package/audio/unlock.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unlock.test.d.ts","sourceRoot":"","sources":["../../src/audio/unlock.test.ts"],"names":[],"mappings":""}

package/broadcast.d.ts

@@ -1,71 +1,41 @@
 import * as Catalog from "@moq/hang/catalog";
 import type * as Moq from "@moq/net";
-import { Effect, type Getter, Signal } from "@moq/signals";
-/** Consumes a custom track once subscribed, scoped to the subscription's lifetime. */
-export type ConsumeTrack = (track: Moq.Track, effect: Effect) => void;
-/**
- * Catalog formats accepted by Watch.
- *
- * Watch supports the on-the-wire catalog formats from `@moq/hang`, plus
- * `"hangz"` (the DEFLATE-compressed `catalog.json.z` track) and `"manual"`, where
- * the user supplies the catalog directly without fetching. `"hangz"` is opt-in
- * only: it shares the `.hang` broadcast suffix and is never auto-detected, so set
- * it explicitly via `catalogFormat`.
- */
+import { Effect, type Getter, type Inputs, type Readonlys, Signal } from "@moq/signals";
 export declare const CATALOG_FORMATS: readonly ["hang", "msf", "hangz", "manual"];
-/** A catalog format accepted by Watch. */
 export type CatalogFormat = (typeof CATALOG_FORMATS)[number];
-/** Parse a catalog format string, returning `undefined` for unknown values. */
 export declare function parseCatalogFormat(value: string | null): CatalogFormat | undefined;
-export interface BroadcastProps {
-    connection?: Moq.Connection.Established | Signal<Moq.Connection.Established | undefined>;
-    announced?: Getter<Set<Moq.Path.Valid>>;
-    enabled?: boolean | Signal<boolean>;
-    name?: Moq.Path.Valid | Signal<Moq.Path.Valid>;
-    reload?: boolean | Signal<boolean>;
-    catalogFormat?: CatalogFormat | Signal<CatalogFormat | undefined>;
-    catalog?: Catalog.Root | Signal<Catalog.Root | undefined>;
-}
-/** A catalog source that optionally reloads automatically when live or offline. */
+type Status = "offline" | "loading" | "live";
+export type BroadcastInput = {
+    connection: Getter<Moq.Connection.Established | undefined>;
+    enabled: Getter<boolean>;
+    name: Getter<Moq.Path.Valid>;
+    reload: Getter<boolean>;
+    catalogFormat: Getter<CatalogFormat | undefined>;
+    catalog: Getter<Catalog.Root | undefined>;
+};
+type BroadcastOutput = {
+    status: Signal<Status>;
+    active: Signal<Moq.Broadcast.Consumer | undefined>;
+    catalog: Signal<Catalog.Root | undefined>;
+};
 export declare class Broadcast {
     #private;
-    connection: Signal<Moq.Connection.Established | undefined>;
-    enabled: Signal<boolean>;
-    name: Signal<Moq.Path.Valid>;
-    status: Signal<"live" | "loading" | "offline">;
-    reload: Signal<boolean>;
-    catalogFormat: Signal<CatalogFormat | undefined>;
-    readonly active: Getter<Moq.Broadcast | undefined>;
-    catalog: Signal<Catalog.Root | undefined>;
-    signals: Effect;
-    constructor(props?: BroadcastProps);
+    readonly in: Readonlys<BroadcastInput>;
+    readonly out: Readonlys<BroadcastOutput>;
+    constructor(props?: Inputs<BroadcastInput>);
     /**
-     * Subscribe to a custom track within this broadcast, following the active broadcast across
-     * reconnects. `consume` runs with a freshly-subscribed track and a subscription-scoped effect
-     * each time a broadcast becomes active (re-running on reconnect).
-     *
-     * For a JSON track, wrap the track with a `@moq/json` `Consumer` and read it in a spawned loop
-     * (e.g. into a Signal). An application advertises the track in its own catalog section, which it
-     * reads back from {@link catalog} (unknown sections pass through the loose schema):
+     * Resolve the `Moq.Broadcast.Consumer` that publishes a given track.
      *
-     * ```ts
-     * import * as Json from "@moq/json";
-     * const scte35 = new Signal<{ splices: number[] } | undefined>(undefined);
-     * broadcast.subscribeTrack("scte35.json", Catalog.PRIORITY.catalog, (track, effect) => {
-     * 	const consumer = new Json.Snapshot.Consumer<{ splices: number[] }>(track);
-     * 	effect.spawn(async () => {
-     * 		for (;;) {
-     * 			const next = await Promise.race([effect.cancel, consumer.next()]);
-     * 			if (next === undefined) break;
-     * 			scte35.set(next);
-     * 		}
-     * 	});
-     * });
-     * ```
+     * If `rel` is set (a rendition's catalog `broadcast` field), treat it as a path
+     * relative to this broadcast's name and consume the resolved broadcast on the same
+     * connection. Otherwise return the catalog's own active broadcast.
      *
-     * Returns a function to stop subscribing; also stopped when this broadcast closes.
+     * The consumer is scoped to the caller's `effect` (closed on its next run), so a
+     * reference resolves lazily and reacts to `enabled` / connection / announcement
+     * changes exactly like the catalog broadcast.
      */
-    subscribeTrack(name: string, priority: number, consume: ConsumeTrack): () => void;
+    relativeBroadcast(effect: Effect, rel: string | undefined): Moq.Broadcast.Consumer | undefined;
     close(): void;
 }
+export {};
 //# sourceMappingURL=broadcast.d.ts.map

package/broadcast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../src/broadcast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAE7C,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3D,sFAAsF;AACtF,MAAM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;AAEtE;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,6CAAmD,CAAC;AAChF,0CAA0C;AAC1C,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D,+EAA+E;AAC/E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,aAAa,GAAG,SAAS,CAGlF;AAED,MAAM,WAAW,cAAc;IAC9B,UAAU,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IAIzF,SAAS,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAIxC,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAGpC,IAAI,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAI/C,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAOnC,aAAa,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;IAOlE,OAAO,CAAC,EAAE,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;CAC1D;AAED,mFAAmF;AACnF,qBAAa,SAAS;;IACrB,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IAE3D,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,yCAAyD;IAC/D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAGxB,aAAa,EAAE,MAAM,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;IAGjD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC,CAAgB;IAIlE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IAU1C,OAAO,SAAgB;IAEvB,YAAY,KAAK,CAAC,EAAE,cAAc,EAajC;IAuGD;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,MAAM,IAAI,CAahF;IAED,KAAK,SAEJ;CACD"}
+{"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../src/broadcast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAG7C,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAU,KAAK,MAAM,EAAE,KAAK,SAAS,EAAa,MAAM,EAAE,MAAM,cAAc,CAAC;AAuB3G,eAAO,MAAM,eAAe,6CAAmD,CAAC;AAChF,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,aAAa,GAAG,SAAS,CAGlF;AAED,KAAK,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AAI7C,MAAM,MAAM,cAAc,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IAI3D,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAGzB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAI7B,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAOxB,aAAa,EAAE,MAAM,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;IAIjD,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;CAC1C,CAAC;AAEF,KAAK,eAAe,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;IAGnD,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;CAC1C,CAAC;AAGF,qBAAa,SAAS;;IACrB,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IAOvC,QAAQ,CAAC,GAAG,6BAAwB;IAcpC,YAAY,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,EAazC;IAqKD;;;;;;;;;;OAUG;IACH,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,GAAG,SAAS,CAqB7F;IAED,KAAK,SAEJ;CACD"}

package/element.d.ts

@@ -1,11 +1,18 @@
+/**
+ * The `<moq-watch>` custom element: a broadcast player driven by HTML attributes.
+ *
+ * Side-effectful: importing this registers the element.
+ *
+ * @module
+ */
 import type * as Catalog from "@moq/hang/catalog";
 import type { Time } from "@moq/net";
 import * as Moq from "@moq/net";
-import { Effect } from "@moq/signals";
-import { MultiBackend } from "./backend";
+import { Effect, Signal } from "@moq/signals";
+import * as Audio from "./audio";
 import { Broadcast, type CatalogFormat } from "./broadcast";
-import { type Bound, type Latency } from "./sync";
-import type { Visible } from "./video";
+import { type Bound, type Latency, Sync } from "./sync";
+import * as Video from "./video";
 declare const OBSERVED: readonly ["url", "name", "paused", "volume", "muted", "visible", "reload", "latency", "latency-min", "latency-max", "jitter", "catalog-format"];
 type Observed = (typeof OBSERVED)[number];
 export default class MoqWatch extends HTMLElement {
@@ -13,8 +20,31 @@ export default class MoqWatch extends HTMLElement {
     static observedAttributes: readonly ["url", "name", "paused", "volume", "muted", "visible", "reload", "latency", "latency-min", "latency-max", "jitter", "catalog-format"];
     connection: Moq.Connection.Reload;
     broadcast: Broadcast;
-    backend: MultiBackend;
-    signals: Effect;
+    /** Downloads and decodes the video track. `video.source` picks the rendition. */
+    video: Video.Decoder;
+    /** Downloads and decodes the audio track. `audio.source` picks the rendition. */
+    audio: Audio.Decoder;
+    /** Paints decoded frames to the nested <canvas>. */
+    renderer: Video.Renderer;
+    /** Plays decoded samples through the speakers. */
+    emitter: Audio.Emitter;
+    /** Keeps audio and video playing at the target latency. */
+    sync: Sync;
+    readonly controls: {
+        paused: Signal<boolean>;
+        volume: Signal<number>;
+        muted: Signal<boolean>;
+        visible: Signal<Video.Visible>;
+        latency: Signal<Latency>;
+        target: Signal<Video.Target | undefined>;
+    };
+    /**
+     * Effects scoped to this element's lifetime, closed on disconnect.
+     *
+     * Public because the element is the top of the tree: it's where an application hangs its own
+     * reactivity. The components underneath keep theirs private, so `close()` is the only handle.
+     */
+    readonly signals: Effect;
     constructor();
     connectedCallback(): void;
     disconnectedCallback(): void;
@@ -29,9 +59,8 @@ export default class MoqWatch extends HTMLElement {
     set volume(value: number);
     get muted(): boolean;
     set muted(value: boolean);
-    /** When video is downloaded relative to the canvas position. See {@link Visible}. */
-    get visible(): Visible;
-    set visible(value: Visible);
+    get visible(): Video.Visible;
+    set visible(value: Video.Visible);
     get reload(): boolean;
     set reload(value: boolean);
     /**
@@ -53,9 +82,10 @@ export default class MoqWatch extends HTMLElement {
     set latencyMax(value: Bound);
     /** The jitter buffer in milliseconds. */
     get jitter(): Time.Milli;
-    /** @deprecated Use `latency = <number>` instead. */
-    set jitter(value: number);
-    /** Re-anchor playback and flush the audio buffer at an utterance boundary (buffered mode). */
+    /**
+     * Re-anchor playback at an utterance boundary in buffered mode: reset the sync reference
+     * and flush the audio buffer so the next utterance plays from its own first frame.
+     */
     reset(): void;
     get catalogFormat(): CatalogFormat | undefined;
     set catalogFormat(value: CatalogFormat | undefined);

package/element.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../src/element.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../src/element.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,KAAK,aAAa,EAAsB,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,OAAO,EAAoC,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC1F,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,QAAA,MAAM,QAAQ,YACb,KAAK,EACL,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,SAAS,EACT,QAAQ,EACR,SAAS,EACT,aAAa,EACb,aAAa,EACb,QAAQ,EACR,gBAAgB,CACP,CAAC;AACX,KAAK,QAAQ,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAgC1C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;;IAChD,MAAM,CAAC,kBAAkB,kJAAY;IAGrC,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC;IAGlC,SAAS,EAAE,SAAS,CAAC;IAErB,iFAAiF;IACjF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;IAErB,iFAAiF;IACjF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;IAErB,oDAAoD;IACpD,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;IAEzB,kDAAkD;IAClD,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;IAEvB,2DAA2D;IAC3D,IAAI,EAAE,IAAI,CAAC;IAKX,QAAQ,CAAC,QAAQ;QAChB,MAAM;QACN,MAAM;QACN,KAAK;QAEL,OAAO;QACP,OAAO;QAEP,MAAM;MACL;IAqBF;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,SAAgB;IAEhC,cA0MC;IAID,iBAAiB,SAIhB;IAED,oBAAoB,SAGnB;IASD,wBAAwB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,QAoCxF;IAED,IAAI,GAAG,IAAI,GAAG,GAAG,SAAS,CAEzB;IAED,IAAI,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,EAEtC;IAED,IAAI,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAEzB;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,EAEtC;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,EAExB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAEvB;IAED,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,EAEvB;IAED,IAAI,OAAO,IAAI,KAAK,CAAC,OAAO,CAE3B;IAED,IAAI,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,EAE/B;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,EAExB;IAED;;;OAGG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAEzB;IAED,oGAAoG;IACpG,IAAI,UAAU,IAAI,KAAK,CAEtB;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,KAAK,EAG1B;IAED;;;;;OAKG;IACH,IAAI,UAAU,IAAI,KAAK,CAEtB;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,KAAK,EAG1B;IAED,yCAAyC;IACzC,IAAI,MAAM,IAAI,IAAI,CAAC,KAAK,CAEvB;IAED;;;OAGG;IACH,KAAK,IAAI,IAAI,CAGZ;IAED,IAAI,aAAa,IAAI,aAAa,GAAG,SAAS,CAE7C;IAED,IAAI,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,EAEjD;IAED;;;OAGG;IACH,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,CAEtC;IAED,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,GAAG,SAAS,EAE1C;CACD;AAID,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,qBAAqB;QAC9B,WAAW,EAAE,QAAQ,CAAC;KACtB;CACD"}