@norskvideo/moq-net 0.1.2 → 0.1.4

package/connection/established.d.ts

@@ -1,27 +1,54 @@
-import type { Signal } from "@norskvideo/moq-signals";
-import type { Announced } from "../announced";
-import type { Bandwidth } from "../bandwidth";
-import type { Broadcast } from "../broadcast";
+import type { Getter } from "@norskvideo/moq-signals";
+import type * as announce from "../announced";
+import type * as broadcast from "../broadcast";
 import type * as Path from "../path";
-import type * as Time from "../time";
+import type { Probe, Stats } from "./stats";
+import type { Transport } from "./transport";
 /** An established MoQ session, implemented by both the moq-lite and moq-ietf protocols. */
 export interface Established {
     /** URL of the connected server. */
     readonly url: URL;
     /** Negotiated wire protocol version. */
     readonly version: string;
-    /** Estimated send bitrate from the congestion controller (if supported). */
-    readonly sendBandwidth?: Bandwidth;
-    /** Estimated receive bitrate from PROBE (moq-lite-03+ only). */
-    readonly recvBandwidth?: Bandwidth;
-    /** RTT in milliseconds from PROBE (moq-lite-04+ only). */
-    readonly rtt?: Signal<Time.Milli | undefined>;
-    /** Subscribe to broadcast announcements under an optional path prefix. */
-    announced(prefix?: Path.Valid): Announced;
+    /** The wire transport this session runs over. */
+    readonly transport: Transport;
+    /**
+     * Estimates measured by the peer, updated as PROBE messages arrive. Stays empty on
+     * versions without PROBE. See {@link Stats} for what the local transport counts.
+     */
+    readonly probe: Getter<Probe>;
+    /**
+     * Whether the relay supports broadcast discovery: announcing which broadcasts exist under a
+     * prefix. When false, {@link announced} never yields, so a consumer must subscribe blind
+     * rather than wait for an announcement. Set via `discovery` on the connect options.
+     */
+    readonly discovery: boolean;
+    /** Subscribe to broadcast announcements under an optional path prefix, returning paths relative to that prefix. */
+    announced(prefix?: Path.Valid): announce.Consumer;
     /** Publish a broadcast at the given path. */
-    publish(path: Path.Valid, broadcast: Broadcast): void;
-    /** Consume the broadcast at the given path. */
-    consume(broadcast: Path.Valid): Broadcast;
+    publish(path: Path.Valid, broadcast: broadcast.Producer): void;
+    /**
+     * Consume the broadcast at the given path, immediately.
+     *
+     * The subscription is reset if nobody publishes the path, so use
+     * {@link announcedBroadcast} instead when the broadcast may not be online yet.
+     */
+    consume(path: Path.Valid): broadcast.Consumer;
+    /**
+     * A reactive handle to the broadcast at the given path, live only while it is announced.
+     *
+     * The announcement-gated counterpart to {@link consume}: it waits for the broadcast to come
+     * online instead of resetting, and drops back to `undefined` when it goes away. See
+     * {@link announce.Broadcast}. Close the handle when done.
+     */
+    announcedBroadcast(path: Path.Valid): announce.Broadcast;
+    /**
+     * Snapshot the transport's counters, querying it fresh on each call.
+     *
+     * Resolves to an empty snapshot on a transport without `getStats()`. Sample it on
+     * whatever schedule you need rather than expecting the library to poll for you.
+     */
+    stats(): Promise<Stats>;
     /** Close the session. */
     close(): void;
     /** Resolves when the session closes. */

package/connection/established.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"established.d.ts","sourceRoot":"","sources":["../../src/connection/established.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,KAAK,IAAI,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,KAAK,IAAI,MAAM,YAAY,CAAC;AAExC,2FAA2F;AAC3F,MAAM,WAAW,WAAW;IAC3B,mCAAmC;IACnC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB,wCAAwC;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,4EAA4E;IAC5E,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,CAAC;IAEnC,gEAAgE;IAChE,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,CAAC;IAEnC,0DAA0D;IAC1D,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IAE9C,0EAA0E;IAC1E,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IAE1C,6CAA6C;IAC7C,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAEtD,+CAA+C;IAC/C,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IAE1C,yBAAyB;IACzB,KAAK,IAAI,IAAI,CAAC;IAEd,wCAAwC;IACxC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACtB"}
+{"version":3,"file":"established.d.ts","sourceRoot":"","sources":["../../src/connection/established.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,KAAK,IAAI,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,2FAA2F;AAC3F,MAAM,WAAW,WAAW;IAC3B,mCAAmC;IACnC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB,wCAAwC;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,iDAAiD;IACjD,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAE9B;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAE9B;;;;OAIG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B,mHAAmH;IACnH,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC;IAElD,6CAA6C;IAC7C,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC;IAE/D;;;;;OAKG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC;IAE9C;;;;;;OAMG;IACH,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC;IAEzD;;;;;OAKG;IACH,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;IAExB,yBAAyB;IACzB,KAAK,IAAI,IAAI,CAAC;IAEd,wCAAwC;IACxC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACtB"}

package/connection/established.js.map

@@ -1 +1 @@
-{"version":3,"file":"established.js","sourceRoot":"","sources":["../../src/connection/established.ts"],"names":[],"mappings":"","sourcesContent":["import type { Signal } from \"@moq/signals\";\nimport type { Announced } from \"../announced.ts\";\nimport type { Bandwidth } from \"../bandwidth.ts\";\nimport type { Broadcast } from \"../broadcast.ts\";\nimport type * as Path from \"../path.ts\";\nimport type * as Time from \"../time.ts\";\n\n/** An established MoQ session, implemented by both the moq-lite and moq-ietf protocols. */\nexport interface Established {\n\t/** URL of the connected server. */\n\treadonly url: URL;\n\n\t/** Negotiated wire protocol version. */\n\treadonly version: string;\n\n\t/** Estimated send bitrate from the congestion controller (if supported). */\n\treadonly sendBandwidth?: Bandwidth;\n\n\t/** Estimated receive bitrate from PROBE (moq-lite-03+ only). */\n\treadonly recvBandwidth?: Bandwidth;\n\n\t/** RTT in milliseconds from PROBE (moq-lite-04+ only). */\n\treadonly rtt?: Signal<Time.Milli | undefined>;\n\n\t/** Subscribe to broadcast announcements under an optional path prefix. */\n\tannounced(prefix?: Path.Valid): Announced;\n\n\t/** Publish a broadcast at the given path. */\n\tpublish(path: Path.Valid, broadcast: Broadcast): void;\n\n\t/** Consume the broadcast at the given path. */\n\tconsume(broadcast: Path.Valid): Broadcast;\n\n\t/** Close the session. */\n\tclose(): void;\n\n\t/** Resolves when the session closes. */\n\tclosed: Promise<void>;\n}\n"]}
+{"version":3,"file":"established.js","sourceRoot":"","sources":["../../src/connection/established.ts"],"names":[],"mappings":"","sourcesContent":["import type { Getter } from \"@moq/signals\";\nimport type * as announce from \"../announced.ts\";\nimport type * as broadcast from \"../broadcast.ts\";\nimport type * as Path from \"../path.ts\";\nimport type { Probe, Stats } from \"./stats.ts\";\nimport type { Transport } from \"./transport.ts\";\n\n/** An established MoQ session, implemented by both the moq-lite and moq-ietf protocols. */\nexport interface Established {\n\t/** URL of the connected server. */\n\treadonly url: URL;\n\n\t/** Negotiated wire protocol version. */\n\treadonly version: string;\n\n\t/** The wire transport this session runs over. */\n\treadonly transport: Transport;\n\n\t/**\n\t * Estimates measured by the peer, updated as PROBE messages arrive. Stays empty on\n\t * versions without PROBE. See {@link Stats} for what the local transport counts.\n\t */\n\treadonly probe: Getter<Probe>;\n\n\t/**\n\t * Whether the relay supports broadcast discovery: announcing which broadcasts exist under a\n\t * prefix. When false, {@link announced} never yields, so a consumer must subscribe blind\n\t * rather than wait for an announcement. Set via `discovery` on the connect options.\n\t */\n\treadonly discovery: boolean;\n\n\t/** Subscribe to broadcast announcements under an optional path prefix, returning paths relative to that prefix. */\n\tannounced(prefix?: Path.Valid): announce.Consumer;\n\n\t/** Publish a broadcast at the given path. */\n\tpublish(path: Path.Valid, broadcast: broadcast.Producer): void;\n\n\t/**\n\t * Consume the broadcast at the given path, immediately.\n\t *\n\t * The subscription is reset if nobody publishes the path, so use\n\t * {@link announcedBroadcast} instead when the broadcast may not be online yet.\n\t */\n\tconsume(path: Path.Valid): broadcast.Consumer;\n\n\t/**\n\t * A reactive handle to the broadcast at the given path, live only while it is announced.\n\t *\n\t * The announcement-gated counterpart to {@link consume}: it waits for the broadcast to come\n\t * online instead of resetting, and drops back to `undefined` when it goes away. See\n\t * {@link announce.Broadcast}. Close the handle when done.\n\t */\n\tannouncedBroadcast(path: Path.Valid): announce.Broadcast;\n\n\t/**\n\t * Snapshot the transport's counters, querying it fresh on each call.\n\t *\n\t * Resolves to an empty snapshot on a transport without `getStats()`. Sample it on\n\t * whatever schedule you need rather than expecting the library to poll for you.\n\t */\n\tstats(): Promise<Stats>;\n\n\t/** Close the session. */\n\tclose(): void;\n\n\t/** Resolves when the session closes. */\n\tclosed: Promise<void>;\n}\n"]}

package/connection/handshake.d.ts

@@ -5,6 +5,17 @@ import { Stream } from "../stream";
  * message, and reads the peer's Setup off an incoming uni stream. The two
  * halves run in parallel and the protocol is symmetric, so both `connect`
  * (client) and `accept` (server) use this same function.
+ *
+ * Returns the control stream plus what the peer's SETUP declared: whether it requires
+ * solicitation, which decides whether we announce namespaces unprompted (see the MoQ Solicit
+ * extension), and its Hop ID (see the MoQ Cluster extension). We declare both ourselves on
+ * every session: we send SUBSCRIBE_NAMESPACE for each prefix we want, so an unsolicited
+ * advertisement can tell us nothing we won't have asked for, and a peer that knows our Hop
+ * ID can withhold the advertisements that already flowed through us.
  */
-export declare function exchangeSetup(transport: WebTransport, version: Ietf.IetfVersion, implementation: string): Promise<Stream>;
+export declare function exchangeSetup(transport: WebTransport, version: Ietf.IetfVersion, implementation: string): Promise<{
+    control: Stream;
+    solicit: boolean | undefined;
+    cluster: Ietf.Cluster.Hops;
+}>;
 //# sourceMappingURL=handshake.d.ts.map

package/connection/handshake.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handshake.d.ts","sourceRoot":"","sources":["../../src/connection/handshake.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAU,MAAM,EAAU,MAAM,cAAc,CAAC;AAEtD;;;;;GAKG;AACH,wBAAsB,aAAa,CAClC,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,IAAI,CAAC,WAAW,EACzB,cAAc,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAiBjB"}
+{"version":3,"file":"handshake.d.ts","sourceRoot":"","sources":["../../src/connection/handshake.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAU,MAAM,EAAU,MAAM,cAAc,CAAC;AAEtD;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAClC,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,IAAI,CAAC,WAAW,EACzB,cAAc,EAAE,MAAM,GACpB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;CAAE,CAAC,CAuBxF"}

package/connection/handshake.js

@@ -1,34 +1,47 @@
 /* @ts-self-types="./handshake.d.ts" */
 import * as Ietf from "../ietf/index.js";
+import { randomOrigin } from "../origin.js";
 import { Reader, Stream, Writer } from "../stream.js";
 /**
  * Draft-17+ SETUP exchange. Each side opens a uni stream, writes its Setup
  * message, and reads the peer's Setup off an incoming uni stream. The two
  * halves run in parallel and the protocol is symmetric, so both `connect`
  * (client) and `accept` (server) use this same function.
+ *
+ * Returns the control stream plus what the peer's SETUP declared: whether it requires
+ * solicitation, which decides whether we announce namespaces unprompted (see the MoQ Solicit
+ * extension), and its Hop ID (see the MoQ Cluster extension). We declare both ourselves on
+ * every session: we send SUBSCRIBE_NAMESPACE for each prefix we want, so an unsolicited
+ * advertisement can tell us nothing we won't have asked for, and a peer that knows our Hop
+ * ID can withhold the advertisements that already flowed through us.
  */
 export async function exchangeSetup(transport, version, implementation) {
     const encoder = new TextEncoder();
     const params = new Ietf.SetupOptions();
     params.setBytes(Ietf.SetupOption.Implementation, encoder.encode(implementation));
+    Ietf.solicitIntoSetup(params);
+    // One id per session, like the moq-lite connection: nothing in this process forwards
+    // between sessions, so there is nothing for a shared id to detect.
+    const self = randomOrigin();
+    Ietf.Cluster.intoSetup(params, self, version);
     const setupMsg = new Ietf.Setup({ parameters: params });
-    const [sent, received] = await Promise.all([
+    const [writer, received] = await Promise.all([
         sendSetup(transport, version, setupMsg),
         receiveSetup(transport, version),
     ]);
-    return new Stream({
-        writable: sent.writable,
-        readable: received.readable,
-        writer: sent.writer,
-        reader: received.reader,
-    });
+    return {
+        control: new Stream({ writer, reader: received.reader }),
+        solicit: received.solicit,
+        cluster: { self, peer: received.cluster },
+    };
 }
 async function sendSetup(transport, version, setupMsg) {
-    const writable = (await transport.createUnidirectionalStream());
-    const writer = new Writer(writable, version);
+    // Via Writer.open for its deadline: a peer can advertise a stream limit of zero and
+    // never raise it, which would otherwise hang the handshake rather than failing it.
+    const writer = await Writer.open(transport, { version });
     await writer.u53(Ietf.Setup.id); // 0x2F00 stream type
     await setupMsg.encode(writer, version);
-    return { writable, writer };
+    return writer;
 }
 async function receiveSetup(transport, version) {
     const uniReader = transport.incomingUnidirectionalStreams.getReader();
@@ -36,13 +49,16 @@ async function receiveSetup(transport, version) {
     uniReader.releaseLock();
     if (next.done)
         throw new Error("no incoming uni stream for SETUP");
-    const readable = next.value;
-    const reader = new Reader(readable, undefined, version);
+    const reader = new Reader(next.value, undefined, version);
     const streamType = await reader.u53();
     if (streamType !== Ietf.Setup.id) {
         throw new Error(`unexpected stream type on setup uni: 0x${streamType.toString(16)}`);
     }
-    await Ietf.Setup.decode(reader, version);
-    return { readable, reader };
+    const setup = await Ietf.Setup.decode(reader, version);
+    return {
+        reader,
+        solicit: Ietf.solicitFromSetup(setup.parameters),
+        cluster: Ietf.Cluster.fromSetup(setup.parameters, version),
+    };
 }
 //# sourceMappingURL=handshake.js.map

package/connection/handshake.js.map

@@ -1 +1 @@
-{"version":3,"file":"handshake.js","sourceRoot":"","sources":["../../src/connection/handshake.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,SAAuB,EACvB,OAAyB,EACzB,cAAsB;IAEtB,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;IACvC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;IACjF,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IAExD,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1C,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC;QACvC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC;KAChC,CAAC,CAAC;IAEH,OAAO,IAAI,MAAM,CAAC;QACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;KACvB,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,SAAS,CACvB,SAAuB,EACvB,OAAyB,EACzB,QAAoB;IAEpB,MAAM,QAAQ,GAAG,CAAC,MAAM,SAAS,CAAC,0BAA0B,EAAE,CAA+B,CAAC;IAC9F,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7C,MAAM,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB;IACtD,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,YAAY,CAC1B,SAAuB,EACvB,OAAyB;IAEzB,MAAM,SAAS,GAAG,SAAS,CAAC,6BAA6B,CAAC,SAAS,EAElE,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;IACpC,SAAS,CAAC,WAAW,EAAE,CAAC;IACxB,IAAI,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAEnE,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAExD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;IACtC,IAAI,UAAU,KAAK,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,0CAA0C,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACtF,CAAC;IACD,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC","sourcesContent":["import * as Ietf from \"../ietf/index.ts\";\nimport { Reader, Stream, Writer } from \"../stream.ts\";\n\n/**\n * Draft-17+ SETUP exchange. Each side opens a uni stream, writes its Setup\n * message, and reads the peer's Setup off an incoming uni stream. The two\n * halves run in parallel and the protocol is symmetric, so both `connect`\n * (client) and `accept` (server) use this same function.\n */\nexport async function exchangeSetup(\n\ttransport: WebTransport,\n\tversion: Ietf.IetfVersion,\n\timplementation: string,\n): Promise<Stream> {\n\tconst encoder = new TextEncoder();\n\tconst params = new Ietf.SetupOptions();\n\tparams.setBytes(Ietf.SetupOption.Implementation, encoder.encode(implementation));\n\tconst setupMsg = new Ietf.Setup({ parameters: params });\n\n\tconst [sent, received] = await Promise.all([\n\t\tsendSetup(transport, version, setupMsg),\n\t\treceiveSetup(transport, version),\n\t]);\n\n\treturn new Stream({\n\t\twritable: sent.writable,\n\t\treadable: received.readable,\n\t\twriter: sent.writer,\n\t\treader: received.reader,\n\t});\n}\n\nasync function sendSetup(\n\ttransport: WebTransport,\n\tversion: Ietf.IetfVersion,\n\tsetupMsg: Ietf.Setup,\n): Promise<{ writable: WritableStream<Uint8Array>; writer: Writer }> {\n\tconst writable = (await transport.createUnidirectionalStream()) as WritableStream<Uint8Array>;\n\tconst writer = new Writer(writable, version);\n\tawait writer.u53(Ietf.Setup.id); // 0x2F00 stream type\n\tawait setupMsg.encode(writer, version);\n\treturn { writable, writer };\n}\n\nasync function receiveSetup(\n\ttransport: WebTransport,\n\tversion: Ietf.IetfVersion,\n): Promise<{ readable: ReadableStream<Uint8Array>; reader: Reader }> {\n\tconst uniReader = transport.incomingUnidirectionalStreams.getReader() as ReadableStreamDefaultReader<\n\t\tReadableStream<Uint8Array>\n\t>;\n\tconst next = await uniReader.read();\n\tuniReader.releaseLock();\n\tif (next.done) throw new Error(\"no incoming uni stream for SETUP\");\n\n\tconst readable = next.value;\n\tconst reader = new Reader(readable, undefined, version);\n\n\tconst streamType = await reader.u53();\n\tif (streamType !== Ietf.Setup.id) {\n\t\tthrow new Error(`unexpected stream type on setup uni: 0x${streamType.toString(16)}`);\n\t}\n\tawait Ietf.Setup.decode(reader, version);\n\n\treturn { readable, reader };\n}\n"]}
+{"version":3,"file":"handshake.js","sourceRoot":"","sources":["../../src/connection/handshake.ts"],"names":[],"mappings":"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","sourcesContent":["import * as Ietf from \"../ietf/index.ts\";\nimport { type Origin, randomOrigin } from \"../origin.ts\";\nimport { Reader, Stream, Writer } from \"../stream.ts\";\n\n/**\n * Draft-17+ SETUP exchange. Each side opens a uni stream, writes its Setup\n * message, and reads the peer's Setup off an incoming uni stream. The two\n * halves run in parallel and the protocol is symmetric, so both `connect`\n * (client) and `accept` (server) use this same function.\n *\n * Returns the control stream plus what the peer's SETUP declared: whether it requires\n * solicitation, which decides whether we announce namespaces unprompted (see the MoQ Solicit\n * extension), and its Hop ID (see the MoQ Cluster extension). We declare both ourselves on\n * every session: we send SUBSCRIBE_NAMESPACE for each prefix we want, so an unsolicited\n * advertisement can tell us nothing we won't have asked for, and a peer that knows our Hop\n * ID can withhold the advertisements that already flowed through us.\n */\nexport async function exchangeSetup(\n\ttransport: WebTransport,\n\tversion: Ietf.IetfVersion,\n\timplementation: string,\n): Promise<{ control: Stream; solicit: boolean | undefined; cluster: Ietf.Cluster.Hops }> {\n\tconst encoder = new TextEncoder();\n\tconst params = new Ietf.SetupOptions();\n\tparams.setBytes(Ietf.SetupOption.Implementation, encoder.encode(implementation));\n\tIetf.solicitIntoSetup(params);\n\n\t// One id per session, like the moq-lite connection: nothing in this process forwards\n\t// between sessions, so there is nothing for a shared id to detect.\n\tconst self = randomOrigin();\n\tIetf.Cluster.intoSetup(params, self, version);\n\n\tconst setupMsg = new Ietf.Setup({ parameters: params });\n\n\tconst [writer, received] = await Promise.all([\n\t\tsendSetup(transport, version, setupMsg),\n\t\treceiveSetup(transport, version),\n\t]);\n\n\treturn {\n\t\tcontrol: new Stream({ writer, reader: received.reader }),\n\t\tsolicit: received.solicit,\n\t\tcluster: { self, peer: received.cluster },\n\t};\n}\n\nasync function sendSetup(transport: WebTransport, version: Ietf.IetfVersion, setupMsg: Ietf.Setup): Promise<Writer> {\n\t// Via Writer.open for its deadline: a peer can advertise a stream limit of zero and\n\t// never raise it, which would otherwise hang the handshake rather than failing it.\n\tconst writer = await Writer.open(transport, { version });\n\tawait writer.u53(Ietf.Setup.id); // 0x2F00 stream type\n\tawait setupMsg.encode(writer, version);\n\treturn writer;\n}\n\nasync function receiveSetup(\n\ttransport: WebTransport,\n\tversion: Ietf.IetfVersion,\n): Promise<{ reader: Reader; solicit: boolean | undefined; cluster: Origin | undefined }> {\n\tconst uniReader = transport.incomingUnidirectionalStreams.getReader() as ReadableStreamDefaultReader<\n\t\tReadableStream<Uint8Array>\n\t>;\n\tconst next = await uniReader.read();\n\tuniReader.releaseLock();\n\tif (next.done) throw new Error(\"no incoming uni stream for SETUP\");\n\n\tconst reader = new Reader(next.value, undefined, version);\n\n\tconst streamType = await reader.u53();\n\tif (streamType !== Ietf.Setup.id) {\n\t\tthrow new Error(`unexpected stream type on setup uni: 0x${streamType.toString(16)}`);\n\t}\n\tconst setup = await Ietf.Setup.decode(reader, version);\n\n\treturn {\n\t\treader,\n\t\tsolicit: Ietf.solicitFromSetup(setup.parameters),\n\t\tcluster: Ietf.Cluster.fromSetup(setup.parameters, version),\n\t};\n}\n"]}

package/connection/index.d.ts

@@ -1,5 +1,13 @@
+/**
+ * Connection helpers: connect to or accept a MoQ session and reconnect on failure.
+ *
+ * @module
+ */
 export * from "./accept";
+export { isWebTransportSupported } from "./browser";
 export * from "./connect";
 export * from "./established";
 export * from "./reload";
+export type { Probe, Stats } from "./stats";
+export type { Transport } from "./transport";
 //# sourceMappingURL=index.d.ts.map

package/connection/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/connection/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/connection/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAC/C,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC"}

package/connection/index.js

@@ -1,5 +1,11 @@
 /* @ts-self-types="./index.d.ts" */
+/**
+ * Connection helpers: connect to or accept a MoQ session and reconnect on failure.
+ *
+ * @module
+ */
 export * from "./accept.js";
+export { isWebTransportSupported } from "./browser.js";
 export * from "./connect.js";
 export * from "./established.js";
 export * from "./reload.js";

package/connection/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/connection/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC","sourcesContent":["export * from \"./accept.ts\";\nexport * from \"./connect.ts\";\nexport * from \"./established.ts\";\nexport * from \"./reload.ts\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/connection/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC","sourcesContent":["/**\n * Connection helpers: connect to or accept a MoQ session and reconnect on failure.\n *\n * @module\n */\nexport * from \"./accept.ts\";\nexport { isWebTransportSupported } from \"./browser.ts\";\nexport * from \"./connect.ts\";\nexport * from \"./established.ts\";\nexport * from \"./reload.ts\";\nexport type { Probe, Stats } from \"./stats.ts\";\nexport type { Transport } from \"./transport.ts\";\n"]}

package/connection/reload.d.ts

@@ -1,18 +1,35 @@
-import { Effect, type Getter, Signal } from "@norskvideo/moq-signals";
+import { type Getter, Signal } from "@norskvideo/moq-signals";
+import * as Announce from "../announced";
 import type * as Path from "../path";
 import { type ConnectProps, type WebSocketOptions, type WebTransportProps } from "./connect";
 import type { Established } from "./established";
-/** Exponential backoff settings for {@link Reload}'s reconnect loop. */
+import type { Probe, Stats } from "./stats";
+/**
+ * Exponential backoff settings for {@link Reload}'s reconnect loop.
+ *
+ * The delays carry jitter, so a fleet of tabs knocked offline together doesn't reconnect in
+ * lockstep. Every failure is retried; {@link ReloadDelay.timeout} is what stops the loop.
+ */
 export type ReloadDelay = {
+    /** The delay in milliseconds before reconnecting (default: 1000). */
     initial: DOMHighResTimeStamp;
+    /** The multiplier for the delay (default: 2). */
     multiplier: number;
+    /** The maximum delay in milliseconds (default: 5000). */
     max: DOMHighResTimeStamp;
+    /**
+     * Maximum total time in milliseconds to spend retrying before giving up (default:
+     * 10000). Resets after each successful connection. Set to 0 for unlimited retries.
+     */
     timeout?: DOMHighResTimeStamp;
 };
-/** Options for {@link Reload}: connect options plus reactive URL/enabled signals and backoff tuning. */
-export type ReloadProps = ConnectProps & {
+/** Connection and retry options for {@link Reload}. */
+export type ReloadProps = Omit<ConnectProps, "signal"> & {
+    /** Whether to reload the connection when it disconnects (default: true). */
     enabled?: boolean | Signal<boolean>;
+    /** The URL of the relay server. */
     url?: URL | Signal<URL | undefined>;
+    /** Backoff settings for the reconnect loop. */
     delay?: ReloadDelay;
 };
 /** Current state of a {@link Reload} connection. */
@@ -28,19 +45,59 @@ export declare class Reload {
     status: Signal<ReloadStatus>;
     /** The currently established session, or undefined while disconnected. */
     established: Signal<Established | undefined>;
-    /** The set of broadcast paths currently announced by the server, updated reactively. */
-    readonly announced: Getter<Set<Path.Valid>>;
+    /**
+     * The current connection's PROBE estimates, spanning reconnects.
+     *
+     * Undefined while disconnected: the estimates belong to a single connection.
+     * See {@link Established.probe}.
+     */
+    readonly probe: Getter<Probe | undefined>;
     /** WebTransport options applied to each connection attempt (not reactive). */
     webtransport?: WebTransportProps;
     /** WebSocket fallback options applied to each connection attempt (not reactive). */
     websocket: WebSocketOptions | undefined;
+    /**
+     * Whether the relay supports broadcast discovery, applied to each connection attempt (not
+     * reactive). Undefined defers to the default for the URL. See {@link Established.discovery}.
+     */
+    discovery?: boolean;
     /** Backoff settings for the reconnect loop. */
     delay: ReloadDelay;
-    /** The reactive effect scope driving the connect loop; closed by {@link Reload.close}. */
-    signals: Effect;
-    /** Resolves when the reconnect loop stops via {@link Reload.close} or the retry timeout. */
+    /**
+     * Resolves when the reconnect loop stops via {@link Reload.close}.
+     *
+     * Rejects when the loop gives up instead, carrying the failure that was in flight when the
+     * retry window expired.
+     */
     closed: Promise<void>;
     constructor(props?: ReloadProps);
+    /**
+     * Subscribe to broadcast announcements under an optional prefix, spanning reconnects.
+     *
+     * The same {@link Announce.Consumer} stream as {@link Established.announced}, but everything active
+     * is retracted (an `active: false` update) whenever the connection drops and re-announced on
+     * reconnect, so a consumer draining `next()` never clings to a dead route across a reconnect.
+     *
+     * Stays empty while the relay lacks {@link Established.discovery}.
+     */
+    announced(prefix?: Path.Valid): Announce.Consumer;
+    /**
+     * A reactive handle to one broadcast, spanning reconnects.
+     *
+     * The same {@link Announce.Broadcast} as {@link Established.announcedBroadcast}, but it
+     * follows the reconnect loop: the broadcast drops to `undefined` when the connection dies
+     * and resolves again once the new connection announces the path. Use it instead of
+     * consuming off {@link Reload.established} whenever the broadcast may come online after you
+     * do, which is exactly the case a blind `consume` loses.
+     *
+     * Close the handle when done; {@link Reload.close} only drops it to `undefined`.
+     */
+    announcedBroadcast(path: Path.Valid): Announce.Broadcast;
+    /**
+     * Snapshot the live connection's transport counters, or undefined while disconnected.
+     * See {@link Established.stats}.
+     */
+    stats(): Promise<Stats | undefined>;
     /** Stop reconnecting, close the current connection, and resolve {@link Reload.closed}. */
     close(): void;
 }

package/connection/reload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reload.d.ts","sourceRoot":"","sources":["../../src/connection/reload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,KAAK,IAAI,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,KAAK,YAAY,EAAW,KAAK,gBAAgB,EAAE,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACzG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,wEAAwE;AACxE,MAAM,MAAM,WAAW,GAAG;IAGzB,OAAO,EAAE,mBAAmB,CAAC;IAI7B,UAAU,EAAE,MAAM,CAAC;IAInB,GAAG,EAAE,mBAAmB,CAAC;IAKzB,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,wGAAwG;AACxG,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG;IAGxC,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAGpC,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;IAGpC,KAAK,CAAC,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF,oDAAoD;AACpD,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,WAAW,GAAG,cAAc,CAAC;AAEvE,uFAAuF;AACvF,qBAAa,MAAM;;IAClB,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;IAE7B,sCAAsC;IACtC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAEzB,iCAAiC;IACjC,MAAM,uBAA4C;IAElD,0EAA0E;IAC1E,WAAW,kCAAkD;IAK7D,wFAAwF;IACxF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAmB;IAE9D,8EAA8E;IAC9E,YAAY,CAAC,EAAE,iBAAiB,CAAC;IAEjC,oFAAoF;IACpF,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAExC,+CAA+C;IAC/C,KAAK,EAAE,WAAW,CAAC;IAEnB,0FAA0F;IAC1F,OAAO,SAAgB;IAEvB,4FAA4F;IAC5F,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAgBtB,YAAY,KAAK,CAAC,EAAE,WAAW,EAmB9B;IAiGD,0FAA0F;IAC1F,KAAK,SAGJ;CACD"}
+{"version":3,"file":"reload.d.ts","sourceRoot":"","sources":["../../src/connection/reload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,KAAK,IAAI,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,KAAK,YAAY,EAAW,KAAK,gBAAgB,EAAE,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACzG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG;IACzB,qEAAqE;IACrE,OAAO,EAAE,mBAAmB,CAAC;IAE7B,iDAAiD;IACjD,UAAU,EAAE,MAAM,CAAC;IAEnB,yDAAyD;IACzD,GAAG,EAAE,mBAAmB,CAAC;IAEzB;;;OAGG;IACH,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,uDAAuD;AACvD,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG;IACxD,4EAA4E;IAC5E,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAEpC,mCAAmC;IACnC,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;IAEpC,+CAA+C;IAC/C,KAAK,CAAC,EAAE,WAAW,CAAC;CACpB,CAAC;AAUF,oDAAoD;AACpD,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,WAAW,GAAG,cAAc,CAAC;AAEvE,uFAAuF;AACvF,qBAAa,MAAM;;IAClB,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;IAE7B,sCAAsC;IACtC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAEzB,iCAAiC;IACjC,MAAM,uBAA4C;IAElD,0EAA0E;IAC1E,WAAW,kCAAkD;IAE7D;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IAE1C,8EAA8E;IAC9E,YAAY,CAAC,EAAE,iBAAiB,CAAC;IAEjC,oFAAoF;IACpF,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAExC;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,+CAA+C;IAC/C,KAAK,EAAE,WAAW,CAAC;IAKnB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAkBtB,YAAY,KAAK,CAAC,EAAE,WAAW,EAmC9B;IAmGD;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,GAAE,IAAI,CAAC,KAAmB,GAAG,QAAQ,CAAC,QAAQ,CAoD7D;IAED;;;;;;;;;;OAUG;IACH,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,SAAS,CAEvD;IAED;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAExC;IAED,0FAA0F;IAC1F,KAAK,SAGJ;CACD"}