@norskvideo/moq-net 0.1.8 → 0.2.0

package/connection/accept.js.map

@@ -1 +1 @@
-{"version":3,"file":"accept.js","sourceRoot":"","sources":["../../src/connection/accept.ts"],"names":[],"mappings":"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","sourcesContent":["import * as Ietf from \"../ietf/index.ts\";\nimport * as Lite from \"../lite/index.ts\";\nimport { Stream } from \"../stream.ts\";\nimport type { Established } from \"./established.ts\";\nimport { exchangeSetup } from \"./handshake.ts\";\n\n/** Options for {@link accept}. */\nexport interface AcceptProps {\n\t/** Version to select during SETUP negotiation (for non-ALPN paths). */\n\tversion?: number;\n\n\t/**\n\t * Whether this server supports broadcast discovery; see {@link Established.discovery}.\n\t * Defaults to true.\n\t */\n\tdiscovery?: boolean;\n}\n\n/**\n * Server-side handshake: accepts a transport and performs the server half of the SETUP exchange.\n *\n * @param transport - The WebTransport session to accept\n * @param url - The URL of the connection\n * @param props - Optional configuration\n * @returns A promise that resolves to a Connection instance\n */\nexport async function accept(transport: WebTransport, url: URL, props?: AcceptProps): Promise<Established> {\n\t// @ts-expect-error - TODO: add protocol to WebTransport\n\tconst protocol: string | undefined = transport.protocol;\n\n\tconst discovery = props?.discovery ?? true;\n\n\tif (protocol === Ietf.ALPN.DRAFT_20) {\n\t\treturn acceptAlpn(transport, url, Ietf.Version.DRAFT_20, discovery);\n\t}\n\tif (protocol === Ietf.ALPN.DRAFT_19) {\n\t\treturn acceptAlpn(transport, url, Ietf.Version.DRAFT_19, discovery);\n\t} else if (protocol === Ietf.ALPN.DRAFT_18) {\n\t\treturn acceptAlpn(transport, url, Ietf.Version.DRAFT_18, discovery);\n\t} else if (protocol === Ietf.ALPN.DRAFT_17) {\n\t\treturn acceptAlpn(transport, url, Ietf.Version.DRAFT_17, discovery);\n\t} else if (protocol === Ietf.ALPN.DRAFT_16) {\n\t\treturn acceptSetup(transport, url, Ietf.Version.DRAFT_16, discovery);\n\t} else if (protocol === Ietf.ALPN.DRAFT_15) {\n\t\treturn acceptSetup(transport, url, Ietf.Version.DRAFT_15, discovery);\n\t} else if (protocol === Lite.ALPN_06_WIP) {\n\t\treturn new Lite.Connection({ url, quic: transport, version: Lite.Version.DRAFT_06, discovery });\n\t} else if (protocol === Lite.ALPN_05) {\n\t\treturn new Lite.Connection({ url, quic: transport, version: Lite.Version.DRAFT_05, discovery });\n\t} else if (protocol === Lite.ALPN_04) {\n\t\treturn new Lite.Connection({ url, quic: transport, version: Lite.Version.DRAFT_04, discovery });\n\t} else if (protocol === Lite.ALPN_03) {\n\t\treturn new Lite.Connection({ url, quic: transport, version: Lite.Version.DRAFT_03, discovery });\n\t} else if (protocol === Lite.ALPN || protocol === \"\" || protocol === undefined) {\n\t\treturn acceptNegotiated(transport, url, props);\n\t} else {\n\t\tthrow new Error(`unsupported WebTransport protocol: ${protocol}`);\n\t}\n}\n\n/**\n * Draft-17+ accept: ALPN already pinned the version. SETUP is exchanged over\n * a pair of uni streams using stream type 0x2F00.\n */\nasync function acceptAlpn(\n\ttransport: WebTransport,\n\turl: URL,\n\tversion: Ietf.IetfVersion,\n\tdiscovery: boolean,\n): Promise<Established> {\n\tconst { control, solicit, cluster } = await exchangeSetup(transport, version, \"moq-lite-js\");\n\n\treturn new Ietf.Connection({\n\t\tdiscovery,\n\t\tclient: false,\n\t\turl,\n\t\tquic: transport,\n\t\tcontrol,\n\t\tsolicit,\n\t\tcluster,\n\t\t// v17+ uses NativeSession which manages its own request IDs; maxRequestId is unused.\n\t\tmaxRequestId: 0n,\n\t\tversion,\n\t});\n}\n\n/**\n * Legacy accept (draft-15/16): ALPN pinned the version, but the SETUP message\n * is still exchanged over a bidi stream wrapped in the moq-lite compat envelope.\n */\nasync function acceptSetup(\n\ttransport: WebTransport,\n\turl: URL,\n\tversion: Ietf.IetfVersion,\n\tdiscovery: boolean,\n): Promise<Established> {\n\t// Accept bidi, read ClientSetup, write ServerSetup\n\tconst stream = await Stream.accept(transport);\n\tif (!stream) throw new Error(\"no incoming bidi stream for SETUP\");\n\n\tconst clientCompat = await stream.reader.u53();\n\tif (clientCompat !== Lite.StreamId.ClientCompat) {\n\t\tthrow new Error(`unexpected client message type: 0x${clientCompat.toString(16)}`);\n\t}\n\n\tconst client = await Ietf.ClientSetup.decode(stream.reader, version);\n\n\tawait stream.writer.u53(Lite.StreamId.ServerCompat);\n\n\tconst encoder = new TextEncoder();\n\tconst params = new Ietf.SetupOptions();\n\tparams.setVarint(Ietf.SetupOption.MaxRequestId, 42069n);\n\tparams.setBytes(Ietf.SetupOption.Implementation, encoder.encode(\"moq-lite-js\"));\n\tIetf.solicitIntoSetup(params);\n\n\tconst server = new Ietf.ServerSetup({ version, parameters: params });\n\tawait server.encode(stream.writer, version);\n\n\tconst maxRequestId = 42069n;\n\n\treturn new Ietf.Connection({\n\t\tdiscovery,\n\t\tclient: false,\n\t\turl,\n\t\tquic: transport,\n\t\tcontrol: stream,\n\t\tmaxRequestId,\n\t\tversion,\n\t\tsolicit: Ietf.solicitFromSetup(client.parameters),\n\t});\n}\n\nasync function acceptNegotiated(transport: WebTransport, url: URL, props?: AcceptProps): Promise<Established> {\n\tconst discovery = props?.discovery ?? true;\n\tconst setupVersion = Ietf.Version.DRAFT_14;\n\n\tconst stream = await Stream.accept(transport);\n\tif (!stream) throw new Error(\"no incoming bidi stream for SETUP\");\n\n\tconst clientCompat = await stream.reader.u53();\n\tif (clientCompat !== Lite.StreamId.ClientCompat) {\n\t\tthrow new Error(`unexpected client message type: 0x${clientCompat.toString(16)}`);\n\t}\n\n\tconst client = await Ietf.ClientSetup.decode(stream.reader, setupVersion);\n\n\t// Pick the requested version, or first matching version from client's list\n\tconst allVersions = [...Object.values(Lite.Version), ...Object.values(Ietf.Version)] as number[];\n\tlet selectedVersion: number;\n\tif (props?.version !== undefined) {\n\t\tselectedVersion = props.version;\n\t} else {\n\t\tconst match = client.versions.find((v) => allVersions.includes(v));\n\t\tif (match === undefined) {\n\t\t\tthrow new Error(\n\t\t\t\t`no common version found; client offered: ${client.versions.map((v) => v.toString(16)).join(\", \")}`,\n\t\t\t);\n\t\t}\n\t\tselectedVersion = match;\n\t}\n\n\tawait stream.writer.u53(Lite.StreamId.ServerCompat);\n\n\tconst encoder = new TextEncoder();\n\tconst params = new Ietf.SetupOptions();\n\tparams.setVarint(Ietf.SetupOption.MaxRequestId, 42069n);\n\tparams.setBytes(Ietf.SetupOption.Implementation, encoder.encode(\"moq-lite-js\"));\n\tIetf.solicitIntoSetup(params);\n\n\tconst server = new Ietf.ServerSetup({ version: selectedVersion, parameters: params });\n\tawait server.encode(stream.writer, setupVersion);\n\n\tif (Object.values(Lite.Version).includes(selectedVersion as Lite.Version)) {\n\t\treturn new Lite.Connection({\n\t\t\turl,\n\t\t\tquic: transport,\n\t\t\tversion: selectedVersion as Lite.Version,\n\t\t\tsession: stream,\n\t\t\tdiscovery,\n\t\t});\n\t} else if (Object.values(Ietf.Version).includes(selectedVersion as Ietf.Version)) {\n\t\tconst maxRequestId = client.parameters.getVarint(Ietf.SetupOption.MaxRequestId) ?? 0n;\n\t\treturn new Ietf.Connection({\n\t\t\tdiscovery,\n\t\t\tclient: false,\n\t\t\turl,\n\t\t\tquic: transport,\n\t\t\tcontrol: stream,\n\t\t\tmaxRequestId,\n\t\t\tversion: selectedVersion as Ietf.IetfVersion,\n\t\t\tsolicit: Ietf.solicitFromSetup(client.parameters),\n\t\t});\n\t} else {\n\t\tthrow new Error(`unsupported version: ${selectedVersion.toString(16)}`);\n\t}\n}\n"]}
+{"version":3,"file":"accept.js","sourceRoot":"","sources":["../../src/connection/accept.ts"],"names":[],"mappings":"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","sourcesContent":["import * as Ietf from \"../ietf/index.ts\";\nimport * as Lite from \"../lite/index.ts\";\nimport type { Consumer as OriginConsumer, Producer as OriginProducer } from \"../origin.ts\";\nimport { Stream } from \"../stream.ts\";\nimport type { Established } from \"./established.ts\";\nimport { forwardAnnounced } from \"./forward.ts\";\nimport { exchangeSetup } from \"./handshake.ts\";\n\n/** Options for {@link accept}. */\nexport interface AcceptProps {\n\t/** The accepted transport. */\n\ttransport: WebTransport;\n\t/** The request URL associated with the transport. */\n\turl: URL;\n\n\t/** Version to select during SETUP negotiation (for non-ALPN paths). */\n\tversion?: number;\n\n\t/**\n\t * Whether this server supports broadcast discovery; see {@link Established.discovery}.\n\t * Defaults to true.\n\t */\n\tdiscovery?: boolean;\n\n\t/**\n\t * The origin whose broadcasts the session announces and serves to the peer. Omit to\n\t * publish nothing. Borrowed, not owned: closing the session leaves its broadcasts alone.\n\t */\n\tpublish?: OriginConsumer;\n\n\t/**\n\t * The origin the session feeds with the peer's announced broadcasts. Omit to discover\n\t * nothing. The entries retract when the session dies; see the `consume` connect option.\n\t */\n\tconsume?: OriginProducer;\n}\n\n/** The per-session wiring shared by every negotiated protocol path. */\ntype SessionProps = {\n\tdiscovery: boolean;\n\tpublish?: OriginConsumer;\n};\n\n/**\n * Server-side handshake: accepts a transport and performs the server half of the SETUP exchange.\n *\n * @param transport - The WebTransport session to accept\n * @param url - The URL of the connection\n * @param props - Optional configuration\n * @returns A promise that resolves to a Connection instance\n */\nexport async function accept({ transport, url, ...props }: AcceptProps): Promise<Established> {\n\tconst connection = await acceptInner(transport, url, props);\n\tif (props.consume) forwardAnnounced(connection, props.consume);\n\treturn connection;\n}\n\nasync function acceptInner(\n\ttransport: WebTransport,\n\turl: URL,\n\tprops: Omit<AcceptProps, \"transport\" | \"url\">,\n): Promise<Established> {\n\t// The DOM lib has no `protocol` property yet. It is \"\" when none was negotiated, and\n\t// undefined in a browser that predates subprotocols (Firefox before 155).\n\tconst protocol = (transport as { protocol?: string }).protocol;\n\n\tconst wiring: SessionProps = {\n\t\tdiscovery: props.discovery ?? true,\n\t\tpublish: props.publish,\n\t};\n\n\tif (protocol === Ietf.ALPN.DRAFT_22) {\n\t\treturn acceptAlpn(transport, url, Ietf.Version.DRAFT_22, wiring);\n\t}\n\tif (protocol === Ietf.ALPN.DRAFT_21) {\n\t\treturn acceptAlpn(transport, url, Ietf.Version.DRAFT_21, wiring);\n\t}\n\tif (protocol === Ietf.ALPN.DRAFT_20) {\n\t\treturn acceptAlpn(transport, url, Ietf.Version.DRAFT_20, wiring);\n\t}\n\tif (protocol === Ietf.ALPN.DRAFT_19) {\n\t\treturn acceptAlpn(transport, url, Ietf.Version.DRAFT_19, wiring);\n\t} else if (protocol === Ietf.ALPN.DRAFT_18) {\n\t\treturn acceptAlpn(transport, url, Ietf.Version.DRAFT_18, wiring);\n\t} else if (protocol === Ietf.ALPN.DRAFT_17) {\n\t\treturn acceptAlpn(transport, url, Ietf.Version.DRAFT_17, wiring);\n\t} else if (protocol === Ietf.ALPN.DRAFT_16) {\n\t\treturn acceptSetup(transport, url, Ietf.Version.DRAFT_16, wiring);\n\t} else if (protocol === Ietf.ALPN.DRAFT_15) {\n\t\treturn acceptSetup(transport, url, Ietf.Version.DRAFT_15, wiring);\n\t} else if (protocol === Lite.ALPN_07_WIP) {\n\t\treturn new Lite.Connection({ url, quic: transport, version: Lite.Version.DRAFT_07, ...wiring });\n\t} else if (protocol === Lite.ALPN_06) {\n\t\treturn new Lite.Connection({ url, quic: transport, version: Lite.Version.DRAFT_06, ...wiring });\n\t} else if (protocol === Lite.ALPN_05) {\n\t\treturn new Lite.Connection({ url, quic: transport, version: Lite.Version.DRAFT_05, ...wiring });\n\t} else if (protocol === Lite.ALPN_04) {\n\t\treturn new Lite.Connection({ url, quic: transport, version: Lite.Version.DRAFT_04, ...wiring });\n\t} else if (protocol === Lite.ALPN_03) {\n\t\treturn new Lite.Connection({ url, quic: transport, version: Lite.Version.DRAFT_03, ...wiring });\n\t} else if (protocol === Lite.ALPN || protocol === \"\" || protocol === undefined) {\n\t\treturn acceptNegotiated(transport, url, wiring, props.version);\n\t} else {\n\t\tthrow new Error(`unsupported WebTransport protocol: ${protocol}`);\n\t}\n}\n\n/**\n * Draft-17+ accept: ALPN already pinned the version. SETUP is exchanged over\n * a pair of uni streams using stream type 0x2F00.\n */\nasync function acceptAlpn(\n\ttransport: WebTransport,\n\turl: URL,\n\tversion: Ietf.IetfVersion,\n\twiring: SessionProps,\n): Promise<Established> {\n\tconst { control, solicit, hidden, cluster } = await exchangeSetup(transport, version, \"moq-lite-js\");\n\n\treturn new Ietf.Connection({\n\t\t...wiring,\n\t\tclient: false,\n\t\turl,\n\t\tquic: transport,\n\t\tcontrol,\n\t\tsolicit,\n\t\thidden,\n\t\tcluster,\n\t\t// v17+ uses NativeSession which manages its own request IDs; maxRequestId is unused.\n\t\tmaxRequestId: 0n,\n\t\tversion,\n\t});\n}\n\n/**\n * Legacy accept (draft-15/16): ALPN pinned the version, but the SETUP message\n * is still exchanged over a bidi stream wrapped in the moq-lite compat envelope.\n */\nasync function acceptSetup(\n\ttransport: WebTransport,\n\turl: URL,\n\tversion: Ietf.IetfVersion,\n\twiring: SessionProps,\n): Promise<Established> {\n\t// Accept bidi, read ClientSetup, write ServerSetup\n\tconst stream = await Stream.accept(transport, version);\n\tif (!stream) throw new Error(\"no incoming bidi stream for SETUP\");\n\n\tconst clientCompat = await stream.reader.u53();\n\tif (clientCompat !== Lite.StreamId.ClientCompat) {\n\t\tthrow new Error(`unexpected client message type: 0x${clientCompat.toString(16)}`);\n\t}\n\n\tconst client = await Ietf.ClientSetup.decode(stream.reader, version);\n\n\tawait stream.writer.u53(Lite.StreamId.ServerCompat);\n\n\tconst encoder = new TextEncoder();\n\tconst params = new Ietf.SetupOptions();\n\tparams.setVarint(Ietf.SetupOption.MaxRequestId, 42069n);\n\tparams.setBytes(Ietf.SetupOption.Implementation, encoder.encode(\"moq-lite-js\"));\n\tIetf.solicitIntoSetup(params);\n\tIetf.hiddenIntoSetup(params);\n\n\tconst server = new Ietf.ServerSetup({ version, parameters: params });\n\tawait server.encode(stream.writer, version);\n\n\tconst maxRequestId = 42069n;\n\n\treturn new Ietf.Connection({\n\t\t...wiring,\n\t\tclient: false,\n\t\turl,\n\t\tquic: transport,\n\t\tcontrol: stream,\n\t\tmaxRequestId,\n\t\tversion,\n\t\tsolicit: Ietf.solicitFromSetup(client.parameters),\n\t\thidden: Ietf.hiddenFromSetup(client.parameters),\n\t});\n}\n\nasync function acceptNegotiated(\n\ttransport: WebTransport,\n\turl: URL,\n\twiring: SessionProps,\n\tversion?: number,\n): Promise<Established> {\n\tconst setupVersion = Ietf.Version.DRAFT_14;\n\n\tconst stream = await Stream.accept(transport, setupVersion);\n\tif (!stream) throw new Error(\"no incoming bidi stream for SETUP\");\n\n\tconst clientCompat = await stream.reader.u53();\n\tif (clientCompat !== Lite.StreamId.ClientCompat) {\n\t\tthrow new Error(`unexpected client message type: 0x${clientCompat.toString(16)}`);\n\t}\n\n\tconst client = await Ietf.ClientSetup.decode(stream.reader, setupVersion);\n\n\t// Pick the requested version, or first matching version from client's list\n\tconst allVersions = [...Object.values(Lite.Version), ...Object.values(Ietf.Version)] as number[];\n\tlet selectedVersion: number;\n\tif (version !== undefined) {\n\t\tselectedVersion = version;\n\t} else {\n\t\tconst match = client.versions.find((v) => allVersions.includes(v));\n\t\tif (match === undefined) {\n\t\t\tthrow new Error(\n\t\t\t\t`no common version found; client offered: ${client.versions.map((v) => v.toString(16)).join(\", \")}`,\n\t\t\t);\n\t\t}\n\t\tselectedVersion = match;\n\t}\n\n\tawait stream.writer.u53(Lite.StreamId.ServerCompat);\n\n\tconst encoder = new TextEncoder();\n\tconst params = new Ietf.SetupOptions();\n\tparams.setVarint(Ietf.SetupOption.MaxRequestId, 42069n);\n\tparams.setBytes(Ietf.SetupOption.Implementation, encoder.encode(\"moq-lite-js\"));\n\tIetf.solicitIntoSetup(params);\n\tIetf.hiddenIntoSetup(params);\n\n\tconst server = new Ietf.ServerSetup({ version: selectedVersion, parameters: params });\n\tawait server.encode(stream.writer, setupVersion);\n\n\tif (Object.values(Lite.Version).includes(selectedVersion as Lite.Version)) {\n\t\treturn new Lite.Connection({\n\t\t\turl,\n\t\t\tquic: transport,\n\t\t\tversion: selectedVersion as Lite.Version,\n\t\t\tsession: stream,\n\t\t\t...wiring,\n\t\t});\n\t} else if (Object.values(Ietf.Version).includes(selectedVersion as Ietf.Version)) {\n\t\tconst maxRequestId = client.parameters.getVarint(Ietf.SetupOption.MaxRequestId) ?? 0n;\n\t\treturn new Ietf.Connection({\n\t\t\t...wiring,\n\t\t\tclient: false,\n\t\t\turl,\n\t\t\tquic: transport,\n\t\t\tcontrol: stream,\n\t\t\tmaxRequestId,\n\t\t\tversion: selectedVersion as Ietf.IetfVersion,\n\t\t\tsolicit: Ietf.solicitFromSetup(client.parameters),\n\t\t\thidden: Ietf.hiddenFromSetup(client.parameters),\n\t\t});\n\t} else {\n\t\tthrow new Error(`unsupported version: ${selectedVersion.toString(16)}`);\n\t}\n}\n"]}

package/connection/browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../src/connection/browser.ts"],"names":[],"mappings":"AAEA,qFAAqF;AACrF,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAoB3E;AAED,kEAAkE;AAClE,wBAAgB,uBAAuB,IAAI,OAAO,CAIjD"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../src/connection/browser.ts"],"names":[],"mappings":"AAEA,qFAAqF;AACrF,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAsB3E;AAED,kEAAkE;AAClE,wBAAgB,uBAAuB,IAAI,OAAO,CAIjD"}

package/connection/browser.js

@@ -3,19 +3,21 @@ import Bowser from "bowser";
 /** Returns whether a browser user agent has a usable WebTransport implementation. */
 export function isWebTransportUserAgentSupported(userAgent) {
     const browser = Bowser.getParser(userAgent);
+    // Every WebKit engine stalls long sessions: the flow-control window never
+    // refills (https://bugs.webkit.org/show_bug.cgi?id=319818), and incoming
+    // unidirectional streams stop for good after roughly 7,600 of them or 16 MiB
+    // on one session (moq-dev/moq#2388); one stream per group reaches that in
+    // about two minutes. Chrome, Firefox and Edge on iOS are WebKit under the
+    // hood, and iPadOS Safari reports macOS, so gate on the engine and the OS.
+    if (browser.getEngine().name === "WebKit" || browser.getOS().name === "iOS")
+        return false;
     const supported = browser.satisfies({
         // Fixed with 153.0.0, Firefox only allows two concurrent remote-initiated streams:
         // https://bugzilla.mozilla.org/show_bug.cgi?id=2046262
         firefox: ">=153.0",
-        // Safari's flow-control window never refills, which permanently stalls sessions:
-        // https://bugs.webkit.org/show_bug.cgi?id=319818
-        // It also stops delivering incoming unidirectional streams for good after
-        // roughly 7,600 of them or 16 MiB on one session, whichever comes first
-        // (moq-dev/moq#2388); one stream per group reaches that in about two minutes.
-        safari: "<0",
     });
     if (supported === undefined) {
-        //By default, other browsers are considered to support WebTransport.
+        // By default, other browsers are considered to support WebTransport.
         return true;
     }
     return supported;

package/connection/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/connection/browser.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,qFAAqF;AACrF,MAAM,UAAU,gCAAgC,CAAC,SAAiB;IACjE,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,mFAAmF;QACnF,uDAAuD;QACvD,OAAO,EAAE,SAAS;QAElB,iFAAiF;QACjF,iDAAiD;QACjD,0EAA0E;QAC1E,wEAAwE;QACxE,8EAA8E;QAC9E,MAAM,EAAE,IAAI;KACZ,CAAC,CAAC;IAEH,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC7B,oEAAoE;QACpE,OAAO,IAAI,CAAC;IACb,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,uBAAuB;IACtC,IAAI,OAAO,UAAU,CAAC,YAAY,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IACjE,IAAI,OAAO,SAAS,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAClD,OAAO,gCAAgC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AAC9D,CAAC","sourcesContent":["import Bowser from \"bowser\";\n\n/** Returns whether a browser user agent has a usable WebTransport implementation. */\nexport function isWebTransportUserAgentSupported(userAgent: string): boolean {\n\tconst browser = Bowser.getParser(userAgent);\n\tconst supported = browser.satisfies({\n\t\t// Fixed with 153.0.0, Firefox only allows two concurrent remote-initiated streams:\n\t\t// https://bugzilla.mozilla.org/show_bug.cgi?id=2046262\n\t\tfirefox: \">=153.0\",\n\n\t\t// Safari's flow-control window never refills, which permanently stalls sessions:\n\t\t// https://bugs.webkit.org/show_bug.cgi?id=319818\n\t\t// It also stops delivering incoming unidirectional streams for good after\n\t\t// roughly 7,600 of them or 16 MiB on one session, whichever comes first\n\t\t// (moq-dev/moq#2388); one stream per group reaches that in about two minutes.\n\t\tsafari: \"<0\",\n\t});\n\n\tif (supported === undefined) {\n\t\t//By default, other browsers are considered to support WebTransport.\n\t\treturn true;\n\t}\n\treturn supported;\n}\n\n/** Returns whether this runtime can connect with WebTransport. */\nexport function isWebTransportSupported(): boolean {\n\tif (typeof globalThis.WebTransport === \"undefined\") return false;\n\tif (typeof navigator === \"undefined\") return true;\n\treturn isWebTransportUserAgentSupported(navigator.userAgent);\n}\n"]}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/connection/browser.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,qFAAqF;AACrF,MAAM,UAAU,gCAAgC,CAAC,SAAiB;IACjE,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAE5C,0EAA0E;IAC1E,yEAAyE;IACzE,6EAA6E;IAC7E,0EAA0E;IAC1E,0EAA0E;IAC1E,2EAA2E;IAC3E,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IAE1F,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,mFAAmF;QACnF,uDAAuD;QACvD,OAAO,EAAE,SAAS;KAClB,CAAC,CAAC;IAEH,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC7B,qEAAqE;QACrE,OAAO,IAAI,CAAC;IACb,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,uBAAuB;IACtC,IAAI,OAAO,UAAU,CAAC,YAAY,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IACjE,IAAI,OAAO,SAAS,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAClD,OAAO,gCAAgC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AAC9D,CAAC","sourcesContent":["import Bowser from \"bowser\";\n\n/** Returns whether a browser user agent has a usable WebTransport implementation. */\nexport function isWebTransportUserAgentSupported(userAgent: string): boolean {\n\tconst browser = Bowser.getParser(userAgent);\n\n\t// Every WebKit engine stalls long sessions: the flow-control window never\n\t// refills (https://bugs.webkit.org/show_bug.cgi?id=319818), and incoming\n\t// unidirectional streams stop for good after roughly 7,600 of them or 16 MiB\n\t// on one session (moq-dev/moq#2388); one stream per group reaches that in\n\t// about two minutes. Chrome, Firefox and Edge on iOS are WebKit under the\n\t// hood, and iPadOS Safari reports macOS, so gate on the engine and the OS.\n\tif (browser.getEngine().name === \"WebKit\" || browser.getOS().name === \"iOS\") return false;\n\n\tconst supported = browser.satisfies({\n\t\t// Fixed with 153.0.0, Firefox only allows two concurrent remote-initiated streams:\n\t\t// https://bugzilla.mozilla.org/show_bug.cgi?id=2046262\n\t\tfirefox: \">=153.0\",\n\t});\n\n\tif (supported === undefined) {\n\t\t// By default, other browsers are considered to support WebTransport.\n\t\treturn true;\n\t}\n\treturn supported;\n}\n\n/** Returns whether this runtime can connect with WebTransport. */\nexport function isWebTransportSupported(): boolean {\n\tif (typeof globalThis.WebTransport === \"undefined\") return false;\n\tif (typeof navigator === \"undefined\") return true;\n\treturn isWebTransportUserAgentSupported(navigator.userAgent);\n}\n"]}

package/connection/connect.d.ts

@@ -1,6 +1,8 @@
+import type { Consumer as OriginConsumer, Producer as OriginProducer } from "../origin";
+import * as Time from "../time";
 import type { Established } from "./established";
 /** Tuning for the WebSocket fallback used when WebTransport is unavailable or loses the connect race. */
-export interface WebSocketOptions {
+export interface WebSocketProps {
     /** Enable the WebSocket fallback. Defaults to `true`. */
     enabled?: boolean;
     /** Use a different URL than WebTransport. By default, `https` maps to `wss` and `http` to `ws`. */
@@ -9,7 +11,7 @@ export interface WebSocketOptions {
      * The delay in milliseconds before attempting the WebSocket fallback (default: 500).
      * If WebSocket won the previous race for a given URL, this is 0.
      */
-    delay?: DOMHighResTimeStamp;
+    delay?: Time.Milli;
 }
 /**
  * A server certificate hash used to pin a self-signed server, one entry of
@@ -38,10 +40,12 @@ export interface WebTransportProps extends Omit<WebTransportOptions, "serverCert
 }
 /** Options for {@link connect}. */
 export interface ConnectProps {
+    /** The relay URL. */
+    url: URL;
     /** WebTransport options. */
     webtransport?: WebTransportProps;
     /** WebSocket (fallback) options. */
-    websocket?: WebSocketOptions;
+    websocket?: WebSocketProps;
     /**
      * Use a pre-existing WebTransport session instead of connecting; skips the
      * WebTransport/WebSocket race. The publisher acquires the session's datagram
@@ -52,9 +56,29 @@ export interface ConnectProps {
     transport?: WebTransport;
     /**
      * Whether the relay supports broadcast discovery; see {@link Established.discovery}.
-     * Defaults to true, except for relays known to lack it.
+     * Defaults to true.
      */
     discovery?: boolean;
+    /**
+     * The origin whose broadcasts the session announces and serves to the peer. Omit to
+     * publish nothing.
+     *
+     * The origin is borrowed, not owned: closing the session leaves its broadcasts alone,
+     * and the same origin can back several sessions (or successive reconnects), each
+     * announcing the table for as long as it lasts.
+     */
+    publish?: OriginConsumer;
+    /**
+     * The origin the session feeds with the peer's announced broadcasts. Omit to discover
+     * nothing.
+     *
+     * Everything the peer announces appears in the origin's table for the session's
+     * lifetime, consumable by path; the entries retract when the session dies. Pass the
+     * producer behind {@link ConnectProps.publish} to route both directions through one
+     * origin: a locally published path is then served back to local consumers directly, and
+     * the session still never announces the peer's own broadcasts back to it.
+     */
+    consume?: OriginProducer;
     /**
      * Aborts the connection attempt with the signal's reason. An already-aborted
      * signal rejects before anything opens, and aborting after the connection is
@@ -67,9 +91,9 @@ export interface ConnectProps {
  *
  * @param url - The URL of the server to connect to
  * @param props - Connection options
- * @returns A promise that resolves to a Connection instance
+ * @returns A promise that resolves to an established session
  */
-export declare function connect(url: URL, props?: ConnectProps): Promise<Established>;
+export declare function connect({ url, ...props }: ConnectProps): Promise<Established>;
 /**
  * Compute the SHA-256 hash of a certificate, the value `serverCertificateHashes`
  * pins. Accepts a PEM string or raw DER bytes. Matches the hex fingerprints a moq

package/connection/connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/connection/connect.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAMpD,yGAAyG;AACzG,MAAM,WAAW,gBAAgB;IAChC,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,mGAAmG;IACnG,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV;;;OAGG;IACH,KAAK,CAAC,EAAE,mBAAmB,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC/B,4EAA4E;IAC5E,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,uDAAuD;IACvD,KAAK,EAAE,YAAY,GAAG,MAAM,CAAC;CAC7B;AAED,2GAA2G;AAC3G,MAAM,WAAW,iBAAkB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,yBAAyB,CAAC;IAC9F;;;OAGG;IACH,uBAAuB,CAAC,EAAE,eAAe,EAAE,CAAC;IAE5C;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;CAC1C;AAED,mCAAmC;AACnC,MAAM,WAAW,YAAY;IAC5B,4BAA4B;IAC5B,YAAY,CAAC,EAAE,iBAAiB,CAAC;IAEjC,oCAAoC;IACpC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAE7B;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,YAAY,CAAC;IAEzB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACrB;AAkBD;;;;;;GAMG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAqBlF;AAkMD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAInG"}
+{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/connection/connect.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,IAAI,cAAc,EAAE,QAAQ,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AAE3F,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AAInC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAWpD,yGAAyG;AACzG,MAAM,WAAW,cAAc;IAC9B,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,mGAAmG;IACnG,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV;;;OAGG;IACH,KAAK,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;CACnB;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC/B,4EAA4E;IAC5E,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,uDAAuD;IACvD,KAAK,EAAE,YAAY,GAAG,MAAM,CAAC;CAC7B;AAED,2GAA2G;AAC3G,MAAM,WAAW,iBAAkB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,yBAAyB,CAAC;IAC9F;;;OAGG;IACH,uBAAuB,CAAC,EAAE,eAAe,EAAE,CAAC;IAE5C;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;CAC1C;AAED,mCAAmC;AACnC,MAAM,WAAW,YAAY;IAC5B,qBAAqB;IACrB,GAAG,EAAE,GAAG,CAAC;IAET,4BAA4B;IAC5B,YAAY,CAAC,EAAE,iBAAiB,CAAC;IAEjC,oCAAoC;IACpC,SAAS,CAAC,EAAE,cAAc,CAAC;IAE3B;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,YAAY,CAAC;IAEzB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;IAEzB;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;IAEzB;;;;OAIG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACrB;AAcD;;;;;;GAMG;AACH,wBAAsB,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,KAAK,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAwBnF;AA4OD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAInG"}

package/connection/connect.js

@@ -1,21 +1,20 @@
 /* @ts-self-types="./connect.d.ts" */
 import Session from "@moq/qmux";
+import { error, fromClose } from "../error.js";
 import * as Ietf from "../ietf/index.js";
 import * as Lite from "../lite/index.js";
 import { Stream } from "../stream.js";
+import * as Time from "../time.js";
 import * as Hex from "../util/hex.js";
+import { dev, redact } from "../util/log.js";
 import { isWebTransportSupported } from "./browser.js";
+import { forwardAnnounced } from "./forward.js";
 import { exchangeSetup } from "./handshake.js";
 // Default head start for WebTransport before attempting the WebSocket fallback.
-const DEFAULT_WEBSOCKET_DELAY_MS = 500;
-// Relays that don't implement broadcast discovery (SUBSCRIBE_NAMESPACE), so `announced()` would
-// never yield and a consumer waiting on an announcement would hang forever. Override with the
-// `discovery` option. Drop a host once its relay ships discovery.
-const NO_DISCOVERY_HOSTS = ["mediaoverquic.com"];
-/** Whether the relay at `url` is expected to support broadcast discovery. */
-function defaultDiscovery(url) {
-    return !NO_DISCOVERY_HOSTS.some((host) => url.hostname.endsWith(host));
-}
+const DEFAULT_WEBSOCKET_DELAY_MS = Time.Milli(500);
+// RESET_STREAM and CONNECTION_CLOSE are separate transport notifications. Give the latter
+// time to surface its authoritative code without letting a reset-only peer stall SETUP forever.
+const SETUP_CLOSE_GRACE_MS = 100;
 // Save if WebSocket won the last race, so we won't give QUIC a head start next time.
 const websocketWon = new Set();
 /** The default connect signal: never aborts. */
@@ -25,10 +24,10 @@ const NEVER_ABORTED = new AbortController().signal;
  *
  * @param url - The URL of the server to connect to
  * @param props - Connection options
- * @returns A promise that resolves to a Connection instance
+ * @returns A promise that resolves to an established session
  */
-export async function connect(url, props) {
-    const signal = props?.signal ?? NEVER_ABORTED;
+export async function connect({ url, ...props }) {
+    const signal = props.signal ?? NEVER_ABORTED;
     signal.throwIfAborted();
     // Resolves on abort so every in-flight transport tears itself down.
     const { promise: abort, resolve } = Promise.withResolvers();
@@ -38,8 +37,11 @@ export async function connect(url, props) {
     try {
         // A `pending` rejection propagates unless the abort beat it to the finish line.
         const connection = await Promise.race([pending, abort.then(() => undefined)]);
-        if (connection && !signal.aborted)
+        if (connection && !signal.aborted) {
+            if (props.consume)
+                forwardAnnounced(connection, props.consume);
             return connection;
+        }
         // Close a connection that settles after the abort.
         pending.then((conn) => conn.close()).catch(() => { });
         throw signal.reason;
@@ -49,21 +51,24 @@ export async function connect(url, props) {
     }
 }
 async function connectInner(url, props, abort) {
-    const discovery = props?.discovery ?? defaultDiscovery(url);
-    if (props?.transport) {
+    const wiring = {
+        discovery: props.discovery ?? true,
+        publish: props.publish,
+    };
+    if (props.transport) {
         const transport = props.transport;
         void abort.then(() => transport.close());
-        return connectTransport(url, transport, discovery);
+        return connectTransport(url, transport, wiring);
     }
     // Stop transports after one connects or the caller aborts.
     const { promise: raced, resolve: done } = Promise.withResolvers();
     const cancel = Promise.race([raced, abort]);
-    const webtransport = isWebTransportSupported() ? connectWebTransport(url, cancel, props?.webtransport) : undefined;
+    const webtransport = isWebTransportSupported() ? connectWebTransport(url, cancel, props.webtransport) : undefined;
     // Give QUIC a head start to connect before trying WebSocket, unless WebSocket has won in the past.
     // NOTE that QUIC should be faster because it involves 1/2 fewer RTTs.
-    const headstart = !webtransport || websocketWon.has(url.toString()) ? 0 : (props?.websocket?.delay ?? DEFAULT_WEBSOCKET_DELAY_MS);
-    const websocket = props?.websocket?.enabled !== false
-        ? connectWebSocket(props?.websocket?.url ?? url, headstart, cancel)
+    const headstart = !webtransport || websocketWon.has(url.toString()) ? 0 : (props.websocket?.delay ?? DEFAULT_WEBSOCKET_DELAY_MS);
+    const websocket = props.websocket?.enabled !== false
+        ? connectWebSocket(props.websocket?.url ?? url, headstart, cancel)
         : undefined;
     if (!websocket && !webtransport) {
         throw new Error("no transport available; WebTransport not supported and WebSocket is disabled");
@@ -83,33 +88,68 @@ async function connectInner(url, props, abort) {
     void abort.then(() => session.close());
     // Save if WebSocket won the last race, so we won't give QUIC a head start next time.
     if (session instanceof Session) {
-        console.warn(url.toString(), "connected via WebSocket");
+        // Still a warning, not a debug line: losing the race means we fell back off QUIC.
+        if (dev())
+            console.warn(redact(url), "connected via WebSocket");
         websocketWon.add(url.toString());
     }
-    else {
-        console.debug(url.toString(), "connected via WebTransport");
+    else if (dev()) {
+        console.debug(redact(url), "connected via WebTransport");
     }
     // The remaining setup is identical whether the transport was raced or supplied.
-    return await connectTransport(url, session, discovery);
+    return await connectTransport(url, session, wiring);
 }
-async function connectTransport(url, session, discovery) {
-    // qmux Session exposes the negotiated protocol directly (as "" when there is none);
-    // native WebTransport doesn't have a standard .protocol property yet.
+async function connectTransport(url, session, wiring) {
+    const closed = session.closed.then(fromClose, error);
+    const terminal = closed.then((cause) => {
+        throw cause ?? new Error("session closed during SETUP");
+    });
+    try {
+        return await Promise.race([terminal, negotiate(url, session, wiring)]);
+    }
+    catch (cause) {
+        // A session shutdown can reject its SETUP stream before `closed` publishes the
+        // peer's close code. Wait briefly without closing locally, since a local clean close
+        // could overwrite that code. A reset-only peer is cleaned up after the grace period.
+        const pending = Symbol("session close pending");
+        const final = await Promise.race([
+            closed,
+            new Promise((resolve) => setTimeout(() => resolve(pending), SETUP_CLOSE_GRACE_MS)),
+        ]);
+        if (final !== pending) {
+            if (final)
+                throw final;
+            throw cause;
+        }
+        session.close();
+        throw cause;
+    }
+}
+// Negotiate the MoQ protocol over an established transport. The caller races this against
+// the session closing so a close code is not lost behind a failed or stalled SETUP stream.
+async function negotiate(url, session, wiring) {
+    // The DOM lib has no `protocol` property yet. It is "" when none was negotiated, and
+    // undefined in a browser that predates subprotocols (Firefox before 155).
     const protocol = session.protocol || undefined;
-    console.debug(url.toString(), "negotiated ALPN:", protocol ?? "(none)");
+    if (dev())
+        console.debug(redact(url), "negotiated ALPN:", protocol ?? "(none)");
     // Choose setup encoding based on negotiated WebTransport protocol (if any).
     let setupVersion;
-    const modernVersion = protocol === Ietf.ALPN.DRAFT_20
-        ? Ietf.Version.DRAFT_20
-        : protocol === Ietf.ALPN.DRAFT_19
-            ? Ietf.Version.DRAFT_19
-            : protocol === Ietf.ALPN.DRAFT_18
-                ? Ietf.Version.DRAFT_18
-                : protocol === Ietf.ALPN.DRAFT_17
-                    ? Ietf.Version.DRAFT_17
-                    : undefined;
+    const modernVersion = protocol === Ietf.ALPN.DRAFT_22
+        ? Ietf.Version.DRAFT_22
+        : protocol === Ietf.ALPN.DRAFT_21
+            ? Ietf.Version.DRAFT_21
+            : protocol === Ietf.ALPN.DRAFT_20
+                ? Ietf.Version.DRAFT_20
+                : protocol === Ietf.ALPN.DRAFT_19
+                    ? Ietf.Version.DRAFT_19
+                    : protocol === Ietf.ALPN.DRAFT_18
+                        ? Ietf.Version.DRAFT_18
+                        : protocol === Ietf.ALPN.DRAFT_17
+                            ? Ietf.Version.DRAFT_17
+                            : undefined;
     if (modernVersion !== undefined) {
-        return await handshakeAlpn(url, session, modernVersion, discovery);
+        return await handshakeAlpn(url, session, modernVersion, wiring);
     }
     else if (protocol === Ietf.ALPN.DRAFT_16) {
         setupVersion = Ietf.Version.DRAFT_16;
@@ -117,17 +157,20 @@ async function connectTransport(url, session, discovery) {
     else if (protocol === Ietf.ALPN.DRAFT_15) {
         setupVersion = Ietf.Version.DRAFT_15;
     }
-    else if (protocol === Lite.ALPN_06_WIP) {
-        return new Lite.Connection({ url, quic: session, version: Lite.Version.DRAFT_06, discovery });
+    else if (protocol === Lite.ALPN_07_WIP) {
+        return new Lite.Connection({ url, quic: session, version: Lite.Version.DRAFT_07, ...wiring });
+    }
+    else if (protocol === Lite.ALPN_06) {
+        return new Lite.Connection({ url, quic: session, version: Lite.Version.DRAFT_06, ...wiring });
     }
     else if (protocol === Lite.ALPN_05) {
-        return new Lite.Connection({ url, quic: session, version: Lite.Version.DRAFT_05, discovery });
+        return new Lite.Connection({ url, quic: session, version: Lite.Version.DRAFT_05, ...wiring });
     }
     else if (protocol === Lite.ALPN_04) {
-        return new Lite.Connection({ url, quic: session, version: Lite.Version.DRAFT_04, discovery });
+        return new Lite.Connection({ url, quic: session, version: Lite.Version.DRAFT_04, ...wiring });
     }
     else if (protocol === Lite.ALPN_03) {
-        return new Lite.Connection({ url, quic: session, version: Lite.Version.DRAFT_03, discovery });
+        return new Lite.Connection({ url, quic: session, version: Lite.Version.DRAFT_03, ...wiring });
     }
     else if (protocol === Lite.ALPN || protocol === "" || protocol === undefined) {
         setupVersion = Ietf.Version.DRAFT_14;
@@ -135,13 +178,14 @@ async function connectTransport(url, session, discovery) {
     else {
         throw new Error(`unsupported WebTransport protocol: ${protocol}`);
     }
-    const stream = await Stream.open(session);
+    const stream = await Stream.open(session, { version: setupVersion });
     await stream.writer.u53(Lite.StreamId.ClientCompat);
     const encoder = new TextEncoder();
     const params = new Ietf.SetupOptions();
     params.setVarint(Ietf.SetupOption.MaxRequestId, 42069n);
     params.setBytes(Ietf.SetupOption.Implementation, encoder.encode("moq-lite-js"));
     Ietf.solicitIntoSetup(params);
+    Ietf.hiddenIntoSetup(params);
     const client = new Ietf.ClientSetup({
         versions: setupVersion === Ietf.Version.DRAFT_16
             ? [Ietf.Version.DRAFT_16]
@@ -162,13 +206,13 @@ async function connectTransport(url, session, discovery) {
             quic: session,
             version: server.version,
             session: stream,
-            discovery,
+            ...wiring,
         });
     }
     else if (Object.values(Ietf.Version).includes(server.version)) {
         const maxRequestId = server.parameters.getVarint(Ietf.SetupOption.MaxRequestId) ?? 0n;
         return new Ietf.Connection({
-            discovery,
+            ...wiring,
             client: true,
             url,
             quic: session,
@@ -176,6 +220,7 @@ async function connectTransport(url, session, discovery) {
             maxRequestId,
             version: server.version,
             solicit: Ietf.solicitFromSetup(server.parameters),
+            hidden: Ietf.hiddenFromSetup(server.parameters),
         });
     }
     else {
@@ -186,15 +231,16 @@ async function connectTransport(url, session, discovery) {
  * Draft-17+ client handshake. ALPN already pinned the version; SETUP is
  * exchanged over a pair of uni streams using stream type 0x2F00.
  */
-async function handshakeAlpn(url, session, version, discovery) {
-    const { control, solicit, cluster } = await exchangeSetup(session, version, "moq-lite-js");
+async function handshakeAlpn(url, session, version, wiring) {
+    const { control, solicit, hidden, cluster } = await exchangeSetup(session, version, "moq-lite-js");
     return new Ietf.Connection({
-        discovery,
+        ...wiring,
         client: true,
         url,
         quic: session,
         control,
         solicit,
+        hidden,
         cluster,
         // v17+ uses NativeSession which manages its own request IDs; maxRequestId is unused.
         maxRequestId: 0n,
@@ -244,12 +290,15 @@ async function connectWebTransport(url, cancel, options) {
         allowPooling: false,
         congestionControl: "low-latency",
         protocols: [
-            // Lite.ALPN_06_WIP is intentionally omitted: lite-06 is work-in-progress and
-            // not advertised by default (connect.ts still accepts it if a server negotiates it).
+            // Lite.ALPN_07_WIP is intentionally omitted: lite-07 is work-in-progress and
+            // not advertised by default (negotiate still accepts it if a server selects it).
+            Lite.ALPN_06,
             Lite.ALPN_05,
             Lite.ALPN_04,
             Lite.ALPN_03,
             Lite.ALPN,
+            Ietf.ALPN.DRAFT_22,
+            Ietf.ALPN.DRAFT_21,
             Ietf.ALPN.DRAFT_20,
             Ietf.ALPN.DRAFT_19,
             Ietf.ALPN.DRAFT_18,
@@ -267,11 +316,14 @@ async function connectWebTransport(url, cancel, options) {
     if (url.protocol === "http:") {
         const fingerprintUrl = new URL(url);
         fingerprintUrl.pathname = "/certificate.sha256";
+        // The certificate endpoint is unauthenticated, so don't hand it the token.
         fingerprintUrl.search = "";
         // Dev-only path: http:// can't be a real WebTransport origin, so we fetch the
         // self-signed cert's hash over plain HTTP and pin it. Production uses https://
         // and never reaches here. Keep this at debug so it doesn't read as a problem.
-        console.debug(fingerprintUrl.toString(), "performing an insecure fingerprint fetch; use https:// in production");
+        if (dev()) {
+            console.debug(redact(fingerprintUrl), "performing an insecure fingerprint fetch; use https:// in production");
+        }
         // Fetch the fingerprint from the server.
         // TODO cancel the request if the effect is cancelled.
         const fingerprint = await Promise.race([fetch(fingerprintUrl), cancel]);
@@ -305,18 +357,22 @@ async function connectWebSocket(url, delay, cancel) {
     const active = await Promise.race([cancel, timer.then(() => true)]);
     if (!active)
         return undefined;
-    // Only moq-transport-18 is pinned to qmux-01 today. Every other ALPN we
+    // moq-transport-18 and newer are pinned to qmux-01. Every other ALPN we
     // support is currently negotiated as `qmux-00.{alpn}` on the wire, but we
     // don't want to lock that in: set the value to `null` so the polyfill
     // advertises every QMux draft it knows about and the server picks one.
     // Insertion order is the negotiation preference on the wire.
     const versions = {
-        // Lite.ALPN_06_WIP omitted on purpose: lite-06 is work-in-progress, not advertised by default.
+        // Lite.ALPN_07_WIP omitted on purpose: lite-07 is work-in-progress, not advertised by default.
+        [Lite.ALPN_06]: null,
         [Lite.ALPN_05]: null,
         [Lite.ALPN_04]: null,
         [Lite.ALPN_03]: null,
         [Lite.ALPN]: null,
+        [Ietf.ALPN.DRAFT_22]: "qmux-01",
+        [Ietf.ALPN.DRAFT_21]: "qmux-01",
         [Ietf.ALPN.DRAFT_20]: "qmux-01",
+        [Ietf.ALPN.DRAFT_19]: "qmux-01",
         [Ietf.ALPN.DRAFT_18]: "qmux-01",
         [Ietf.ALPN.DRAFT_17]: null,
         [Ietf.ALPN.DRAFT_16]: null,