@norskvideo/moq-net 0.1.7 → 0.2.0

package/lite/subscribe.d.ts

@@ -1,19 +1,52 @@
 import * as Path from "../path";
 import type { Reader, Writer } from "../stream";
 import { Version } from "./version";
+/**
+ * Exclusive model/local cap from a decoded inclusive last group.
+ *
+ * The wire's `Group End` is inclusive once decoded; the track model and `setGroups` are
+ * exclusive. `undefined` stays unbounded.
+ */
+export declare function exclusiveGroupEnd(inclusive?: number): number | undefined;
+/** The error for a requested range the wire cannot carry; see {@link emptyRange}. */
+export declare const EMPTY_RANGE = "empty subscription range cannot be encoded";
+/**
+ * Inclusive last group a Subscribe message carries, from an exclusive model end.
+ *
+ * Empty (`0`) cannot be encoded: the wire's 0 means unbounded. Callers refuse an empty
+ * requested range with {@link emptyRange} before reaching here.
+ */
+export declare function inclusiveGroupEnd(exclusive?: number): number | undefined;
+/**
+ * Whether a requested range asks for nothing.
+ *
+ * The wire has no encoding for one: its bounds are inclusive, so flooring the end would
+ * either hand back the group the caller excluded (0 means unbounded) or invert the
+ * range once the two bounds meet. An absent start is the live edge, so it only empties
+ * the range when the end is 0.
+ */
+export declare function emptyRange({ startGroup, endGroup }: {
+    startGroup?: number;
+    endGroup?: number;
+}): boolean;
 export declare class SubscribeUpdate {
     #private;
     priority: number;
-    ordered: boolean;
-    maxLatency: number;
+    /** Subscriber max latency in milliseconds; zero skips once a newer group is available. */
+    maxAge: number;
     startGroup?: number;
     endGroup?: number;
+    /** See {@link Subscribe.startFrame}. */
+    startFrame: number;
+    /** See {@link Subscribe.endFrame}. */
+    endFrame?: number;
     constructor(props: {
         priority: number;
-        ordered?: boolean;
-        maxLatency?: number;
+        maxAge?: number;
         startGroup?: number;
         endGroup?: number;
+        startFrame?: number;
+        endFrame?: number;
     });
     encode(w: Writer, version: Version): Promise<void>;
     static decode(r: Reader, version: Version): Promise<SubscribeUpdate>;
@@ -25,19 +58,31 @@ export declare class Subscribe {
     broadcast: Path.Valid;
     track: string;
     priority: number;
-    ordered: boolean;
-    maxLatency: number;
+    /** Subscriber max latency in milliseconds; zero skips once a newer group is available. */
+    maxAge: number;
     startGroup?: number;
     endGroup?: number;
+    /**
+     * First frame to deliver within `startGroup`'s group; 0 is the whole group.
+     * Lite-06+. It qualifies the named group, so it needs `startGroup` to name one
+     * (defined, including 0: group 0 can host a mid-group resume).
+     */
+    startFrame: number;
+    /**
+     * Last frame to deliver (inclusive) within `endGroup`'s group, or undefined for the
+     * whole group. Lite-06+, and meaningless without an explicit `endGroup`.
+     */
+    endFrame?: number;
     constructor(props: {
         id: bigint;
         broadcast: Path.Valid;
         track: string;
         priority: number;
-        ordered?: boolean;
-        maxLatency?: number;
+        maxAge?: number;
         startGroup?: number;
         endGroup?: number;
+        startFrame?: number;
+        endFrame?: number;
     });
     encode(w: Writer, version: Version): Promise<void>;
     static decode(r: Reader, version: Version): Promise<Subscribe>;
@@ -51,14 +96,13 @@ export declare class Subscribe {
 export declare class SubscribeOk {
     #private;
     priority: number;
-    ordered: boolean;
-    maxLatency: number;
+    /** Accepted subscriber max latency in milliseconds. */
+    maxAge: number;
     startGroup?: number;
     endGroup?: number;
-    constructor({ priority, ordered, maxLatency, startGroup, endGroup, }: {
+    constructor({ priority, maxAge, startGroup, endGroup, }: {
         priority?: number;
-        ordered?: boolean;
-        maxLatency?: number;
+        maxAge?: number;
         startGroup?: number;
         endGroup?: number;
     });
@@ -69,6 +113,10 @@ export declare class SubscribeOk {
  * Resolves the absolute start group of a Draft-05+ subscription. The first message
  * the publisher sends, once the start group is known. A value greater than the
  * requested start implicitly drops the leading range.
+ *
+ * There is no start frame: a partial group is only served to a subscriber that asked
+ * for one, so delivery begins either at the requested `startFrame` (when this is the
+ * requested group) or at frame 0 (when the publisher resolved to a later one).
  */
 export declare class SubscribeStart {
     group: number;
@@ -83,9 +131,14 @@ export declare class SubscribeStart {
 export declare class SubscribeEnd {
     /** The exclusive final group sequence: the first sequence that will never be produced. */
     group: number;
-    constructor(group: number);
-    encode(w: Writer): Promise<void>;
-    static decode(r: Reader): Promise<SubscribeEnd>;
+    /**
+     * The number of group streams the publisher opened for this subscription.
+     * Draft-07+ only; not on the wire before, where it decodes as 0.
+     */
+    streams: number;
+    constructor(group: number, streams?: number);
+    encode(w: Writer, version: Version): Promise<void>;
+    static decode(r: Reader, version: Version): Promise<SubscribeEnd>;
 }
 export declare class SubscribeDrop {
     #private;
@@ -106,8 +159,9 @@ export declare class SubscribeDrop {
  *
  * The discriminator is version-dependent:
  * - Draft-03/04: `0x0` SUBSCRIBE_OK, `0x1` SUBSCRIBE_DROP.
- * - Draft-05+: `0x0` SUBSCRIBE_START, `0x1` SUBSCRIBE_END, `0x2` SUBSCRIBE_DROP
+ * - Draft-05/06: `0x0` SUBSCRIBE_START, `0x1` SUBSCRIBE_END, `0x2` SUBSCRIBE_DROP
  *   (SUBSCRIBE_OK was removed; acceptance is implicit).
+ * - Draft-07+: `0x0` SUBSCRIBE_START, `0x1` SUBSCRIBE_END (SUBSCRIBE_DROP was removed).
  */
 export type SubscribeResponse = {
     ok: SubscribeOk;

package/lite/subscribe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../src/lite/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,qBAAa,eAAe;;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,YAAY,KAAK,EAAE;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;KAClB,EAMA;IAwCK,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvD;IAED,OAAa,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAEzE;IAED,OAAa,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAE1F;CACD;AAED,qBAAa,SAAS;;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,YAAY,KAAK,EAAE;QAClB,EAAE,EAAE,MAAM,CAAC;QACX,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC;QACtB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;KAClB,EASA;IAkDK,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvD;IAED,OAAa,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAEnE;CACD;AAED;;;;;GAKG;AACH,qBAAa,WAAW;;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,YAAY,EACX,QAAY,EACZ,OAAe,EACf,UAAc,EACd,UAAsB,EACtB,QAAoB,GACpB,EAAE;QACF,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;KAClB,EAMA;IAsDK,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvD;IAED,OAAa,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAErE;CACD;AAED;;;;GAIG;AACH,qBAAa,cAAc;IAC1B,KAAK,EAAE,MAAM,CAAC;IAEd,YAAY,KAAK,EAAE,MAAM,EAExB;IAEK,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIrC;IAED,OAAa,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAEtD;CACD;AAED;;;GAGG;AACH,qBAAa,YAAY;IACxB,0FAA0F;IAC1F,KAAK,EAAE,MAAM,CAAC;IAEd,YAAY,KAAK,EAAE,MAAM,EAExB;IAEK,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIrC;IAED,OAAa,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAEpD;CACD;AAKD,qBAAa,aAAa;;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IAEd,YAAY,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAI/D;IAYK,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErC;IAED,OAAa,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAErD;CACD;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,iBAAiB,GAC1B;IAAE,EAAE,EAAE,WAAW,CAAA;CAAE,GACnB;IAAE,KAAK,EAAE,cAAc,CAAA;CAAE,GACzB;IAAE,GAAG,EAAE,YAAY,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC;AAE3B,wBAAsB,uBAAuB,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCjH;AAED,wBAAsB,uBAAuB,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA+BrG;AAED,oFAAoF;AACpF,wBAAsB,4BAA4B,CACjD,CAAC,EAAE,MAAM,EACT,OAAO,EAAE,OAAO,GACd,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAGxC"}
+{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../src/lite/subscribe.ts"],"names":[],"mappings":"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"}

package/lite/subscribe.js

@@ -1,19 +1,142 @@
 /* @ts-self-types="./subscribe.d.ts" */
 import * as Path from "../path.js";
 import * as Message from "./message.js";
-import { Version } from "./version.js";
+import { hasFrameBounds, hasGroupOrder, hasStreamCount, resolvesStart, Version } from "./version.js";
+/**
+ * Encode the `Group Start` field shared by SUBSCRIBE and SUBSCRIBE_UPDATE.
+ *
+ * Lite-06 writes the raw floor (`undefined` and 0 are the same absence of a constraint),
+ * while a pre-06 wire encodes the sequence + 1 and gets a vacuous floor folded back to
+ * absent: an explicit group 0 there means "replay from the beginning", which is not what
+ * a floor of 0 asks for.
+ */
+async function encodeStartGroup(w, version, startGroup) {
+    if (resolvesStart(version)) {
+        await w.u53(startGroup ?? 0);
+        return;
+    }
+    await w.u53(startGroup !== undefined && startGroup > 0 ? startGroup + 1 : 0);
+}
+/**
+ * Decode the `Group Start` field shared by SUBSCRIBE and SUBSCRIBE_UPDATE.
+ *
+ * The inverse of {@link encodeStartGroup}. Callers canonicalize with
+ * {@link canonicalStartGroup} once the frame bounds are known.
+ */
+async function decodeStartGroup(r, version) {
+    const value = await r.u53();
+    if (resolvesStart(version))
+        return value;
+    return value > 0 ? value - 1 : undefined;
+}
+/**
+ * Canonicalize a decoded floor: a lite-06 `Group Start` of 0 with no frame offset is the
+ * same absence of a constraint as no floor at all, so it decodes as undefined. Group 0
+ * stays named only when a `Frame Start` actually qualifies it (a subscription can resume
+ * partway through group 0: a catalog never leaves it).
+ */
+function canonicalStartGroup(version, startGroup, startFrame) {
+    if (resolvesStart(version) && startGroup === 0 && startFrame === 0)
+        return undefined;
+    return startGroup;
+}
+/**
+ * Encode the trailing `Frame Start` / `Frame End` pair shared by SUBSCRIBE and
+ * SUBSCRIBE_UPDATE. A no-op before lite-06, which has nowhere to put them.
+ */
+async function encodeFrameBounds(w, version, { startGroup, startFrame, endGroup, endFrame, }) {
+    if ((startFrame !== 0 && startGroup === undefined) || (endFrame !== undefined && endGroup === undefined)) {
+        throw new Error("frame bound without a group bound");
+    }
+    if (!hasFrameBounds(version)) {
+        // Silently widening to the whole group would deliver frames we excluded.
+        if (startFrame !== 0 || endFrame !== undefined) {
+            throw new Error("frame bounds not supported for this version");
+        }
+        return;
+    }
+    await w.u53(startFrame);
+    await w.u53(endFrame !== undefined ? endFrame + 1 : 0);
+}
+/**
+ * Decode the trailing `Frame Start` / `Frame End` pair, defaulting to the whole group.
+ *
+ * A frame bound without the group bound it qualifies is a protocol violation: frames
+ * are numbered per group, so there is nothing to count from.
+ */
+async function decodeFrameBounds(r, version, startGroup, endGroup) {
+    if (!hasFrameBounds(version)) {
+        return { startFrame: 0 };
+    }
+    const startFrame = await r.u53();
+    const endFrame = await r.u53();
+    if ((startFrame !== 0 && startGroup === undefined) || (endFrame !== 0 && endGroup === undefined)) {
+        throw new Error("frame bound without a group bound");
+    }
+    return { startFrame, endFrame: endFrame > 0 ? endFrame - 1 : undefined };
+}
+/** Step over the retired `Ordered` byte on a version whose layout still has it. */
+async function skipGroupOrder(r, version) {
+    if (hasGroupOrder(version))
+        await r.bool();
+}
+/** Write the retired `Ordered` byte as 0, keeping a deployed version's field offsets. */
+async function padGroupOrder(w, version) {
+    if (hasGroupOrder(version))
+        await w.bool(false);
+}
+/**
+ * Exclusive model/local cap from a decoded inclusive last group.
+ *
+ * The wire's `Group End` is inclusive once decoded; the track model and `setGroups` are
+ * exclusive. `undefined` stays unbounded.
+ */
+export function exclusiveGroupEnd(inclusive) {
+    return inclusive === undefined ? undefined : inclusive + 1;
+}
+/** The error for a requested range the wire cannot carry; see {@link emptyRange}. */
+export const EMPTY_RANGE = "empty subscription range cannot be encoded";
+/**
+ * Inclusive last group a Subscribe message carries, from an exclusive model end.
+ *
+ * Empty (`0`) cannot be encoded: the wire's 0 means unbounded. Callers refuse an empty
+ * requested range with {@link emptyRange} before reaching here.
+ */
+export function inclusiveGroupEnd(exclusive) {
+    if (exclusive === undefined)
+        return undefined;
+    if (exclusive === 0)
+        throw new Error(EMPTY_RANGE);
+    return exclusive - 1;
+}
+/**
+ * Whether a requested range asks for nothing.
+ *
+ * The wire has no encoding for one: its bounds are inclusive, so flooring the end would
+ * either hand back the group the caller excluded (0 means unbounded) or invert the
+ * range once the two bounds meet. An absent start is the live edge, so it only empties
+ * the range when the end is 0.
+ */
+export function emptyRange({ startGroup, endGroup }) {
+    return endGroup !== undefined && (startGroup ?? 0) >= endGroup;
+}
 export class SubscribeUpdate {
     priority;
-    ordered;
-    maxLatency;
+    /** Subscriber max latency in milliseconds; zero skips once a newer group is available. */
+    maxAge;
     startGroup;
     endGroup;
+    /** See {@link Subscribe.startFrame}. */
+    startFrame;
+    /** See {@link Subscribe.endFrame}. */
+    endFrame;
     constructor(props) {
         this.priority = props.priority;
-        this.ordered = props.ordered ?? false;
-        this.maxLatency = props.maxLatency ?? 0;
+        this.maxAge = props.maxAge ?? 0;
         this.startGroup = props.startGroup;
         this.endGroup = props.endGroup;
+        this.startFrame = props.startFrame ?? 0;
+        this.endFrame = props.endFrame;
     }
     async #encode(w, version) {
         switch (version) {
@@ -23,10 +146,11 @@ export class SubscribeUpdate {
                 break;
             default:
                 await w.u8(this.priority);
-                await w.bool(this.ordered);
-                await w.u53(this.maxLatency);
-                await w.u53(this.startGroup !== undefined ? this.startGroup + 1 : 0);
+                await padGroupOrder(w, version);
+                await w.u53(this.maxAge);
+                await encodeStartGroup(w, version, this.startGroup);
                 await w.u53(this.endGroup !== undefined ? this.endGroup + 1 : 0);
+                await encodeFrameBounds(w, version, this);
                 break;
         }
     }
@@ -37,16 +161,18 @@ export class SubscribeUpdate {
                 return new SubscribeUpdate({ priority: await r.u8() });
             default: {
                 const priority = await r.u8();
-                const ordered = await r.bool();
-                const maxLatency = await r.u53();
-                const startGroup = await r.u53();
-                const endGroup = await r.u53();
+                await skipGroupOrder(r, version);
+                const maxAge = await r.u53();
+                const startGroup = await decodeStartGroup(r, version);
+                const endGroup = (await r.u53()) || undefined;
+                const end = endGroup !== undefined ? endGroup - 1 : undefined;
+                const frames = await decodeFrameBounds(r, version, startGroup, end);
                 return new SubscribeUpdate({
                     priority,
-                    ordered,
-                    maxLatency,
-                    startGroup: startGroup > 0 ? startGroup - 1 : undefined,
-                    endGroup: endGroup > 0 ? endGroup - 1 : undefined,
+                    maxAge,
+                    startGroup: canonicalStartGroup(version, startGroup, frames.startFrame),
+                    endGroup: end,
+                    ...frames,
                 });
             }
         }
@@ -66,19 +192,31 @@ export class Subscribe {
     broadcast;
     track;
     priority;
-    ordered;
-    maxLatency;
+    /** Subscriber max latency in milliseconds; zero skips once a newer group is available. */
+    maxAge;
     startGroup;
     endGroup;
+    /**
+     * First frame to deliver within `startGroup`'s group; 0 is the whole group.
+     * Lite-06+. It qualifies the named group, so it needs `startGroup` to name one
+     * (defined, including 0: group 0 can host a mid-group resume).
+     */
+    startFrame;
+    /**
+     * Last frame to deliver (inclusive) within `endGroup`'s group, or undefined for the
+     * whole group. Lite-06+, and meaningless without an explicit `endGroup`.
+     */
+    endFrame;
     constructor(props) {
         this.id = props.id;
         this.broadcast = props.broadcast;
         this.track = props.track;
         this.priority = props.priority;
-        this.ordered = props.ordered ?? false;
-        this.maxLatency = props.maxLatency ?? 0;
+        this.maxAge = props.maxAge ?? 0;
         this.startGroup = props.startGroup;
         this.endGroup = props.endGroup;
+        this.startFrame = props.startFrame ?? 0;
+        this.endFrame = props.endFrame;
     }
     async #encode(w, version) {
         await w.u62(this.id);
@@ -90,10 +228,11 @@ export class Subscribe {
             case Version.DRAFT_02:
                 break;
             default:
-                await w.bool(this.ordered);
-                await w.u53(this.maxLatency);
-                await w.u53(this.startGroup !== undefined ? this.startGroup + 1 : 0);
+                await padGroupOrder(w, version);
+                await w.u53(this.maxAge);
+                await encodeStartGroup(w, version, this.startGroup);
                 await w.u53(this.endGroup !== undefined ? this.endGroup + 1 : 0);
+                await encodeFrameBounds(w, version, this);
                 break;
         }
     }
@@ -107,19 +246,21 @@ export class Subscribe {
             case Version.DRAFT_02:
                 return new Subscribe({ id, broadcast, track, priority });
             default: {
-                const ordered = await r.bool();
-                const maxLatency = await r.u53();
-                const startGroup = await r.u53();
-                const endGroup = await r.u53();
+                await skipGroupOrder(r, version);
+                const maxAge = await r.u53();
+                const startGroup = await decodeStartGroup(r, version);
+                const endGroup = (await r.u53()) || undefined;
+                const end = endGroup !== undefined ? endGroup - 1 : undefined;
+                const frames = await decodeFrameBounds(r, version, startGroup, end);
                 return new Subscribe({
                     id,
                     broadcast,
                     track,
                     priority,
-                    ordered,
-                    maxLatency,
-                    startGroup: startGroup > 0 ? startGroup - 1 : undefined,
-                    endGroup: endGroup > 0 ? endGroup - 1 : undefined,
+                    maxAge,
+                    startGroup: canonicalStartGroup(version, startGroup, frames.startFrame),
+                    endGroup: end,
+                    ...frames,
                 });
             }
         }
@@ -139,14 +280,13 @@ export class Subscribe {
  */
 export class SubscribeOk {
     priority;
-    ordered;
-    maxLatency;
+    /** Accepted subscriber max latency in milliseconds. */
+    maxAge;
     startGroup;
     endGroup;
-    constructor({ priority = 0, ordered = false, maxLatency = 0, startGroup = undefined, endGroup = undefined, }) {
+    constructor({ priority = 0, maxAge = 0, startGroup = undefined, endGroup = undefined, }) {
         this.priority = priority;
-        this.ordered = ordered;
-        this.maxLatency = maxLatency;
+        this.maxAge = maxAge;
         this.startGroup = startGroup;
         this.endGroup = endGroup;
     }
@@ -162,8 +302,8 @@ export class SubscribeOk {
             // Draft-03/04 so a stray future use stays well-formed.
             default:
                 await w.u8(this.priority);
-                await w.bool(this.ordered);
-                await w.u53(this.maxLatency);
+                await padGroupOrder(w, version);
+                await w.u53(this.maxAge);
                 await w.u53(this.startGroup !== undefined ? this.startGroup + 1 : 0);
                 await w.u53(this.endGroup !== undefined ? this.endGroup + 1 : 0);
                 break;
@@ -171,8 +311,7 @@ export class SubscribeOk {
     }
     static async #decode(version, r) {
         let priority;
-        let ordered;
-        let maxLatency;
+        let maxAge;
         let startGroup;
         let endGroup;
         switch (version) {
@@ -184,16 +323,15 @@ export class SubscribeOk {
                 break;
             default:
                 priority = await r.u8();
-                ordered = await r.bool();
-                maxLatency = await r.u53();
+                await skipGroupOrder(r, version);
+                maxAge = await r.u53();
                 startGroup = await r.u53();
                 endGroup = await r.u53();
                 break;
         }
         return new SubscribeOk({
             priority,
-            ordered,
-            maxLatency,
+            maxAge,
             startGroup: startGroup !== undefined && startGroup > 0 ? startGroup - 1 : undefined,
             endGroup: endGroup !== undefined && endGroup > 0 ? endGroup - 1 : undefined,
         });
@@ -209,6 +347,10 @@ export class SubscribeOk {
  * Resolves the absolute start group of a Draft-05+ subscription. The first message
  * the publisher sends, once the start group is known. A value greater than the
  * requested start implicitly drops the leading range.
+ *
+ * There is no start frame: a partial group is only served to a subscriber that asked
+ * for one, so delivery begins either at the requested `startFrame` (when this is the
+ * requested group) or at frame 0 (when the publisher resolved to a later one).
  */
 export class SubscribeStart {
     group;
@@ -231,21 +373,29 @@ export class SubscribeStart {
 export class SubscribeEnd {
     /** The exclusive final group sequence: the first sequence that will never be produced. */
     group;
-    constructor(group) {
+    /**
+     * The number of group streams the publisher opened for this subscription.
+     * Draft-07+ only; not on the wire before, where it decodes as 0.
+     */
+    streams;
+    constructor(group, streams = 0) {
         this.group = group;
+        this.streams = streams;
     }
-    async encode(w) {
+    async encode(w, version) {
         return Message.encode(w, async (w) => {
             await w.u53(this.group);
+            if (hasStreamCount(version))
+                await w.u53(this.streams);
         });
     }
-    static async decode(r) {
-        return Message.decode(r, async (r) => new SubscribeEnd(await r.u53()));
+    static async decode(r, version) {
+        return Message.decode(r, async (r) => new SubscribeEnd(await r.u53(), hasStreamCount(version) ? await r.u53() : 0));
     }
 }
 /// Indicates that one or more groups have been dropped.
 ///
-/// Draft03+ only.
+/// Draft-03 to Draft-06 only: Draft-07 counts group streams in SUBSCRIBE_END instead.
 export class SubscribeDrop {
     start;
     end;
@@ -303,14 +453,14 @@ export async function encodeSubscribeResponse(w, resp, version) {
             }
             else if ("end" in resp) {
                 await w.u53(0x1);
-                await resp.end.encode(w);
+                await resp.end.encode(w, version);
             }
-            else if ("drop" in resp) {
+            else if ("drop" in resp && !hasStreamCount(version)) {
                 await w.u53(0x2);
                 await resp.drop.encode(w);
             }
             else {
-                throw new Error("SUBSCRIBE_OK not supported for this version");
+                throw new Error("subscribe response not supported for this version");
             }
             break;
     }
@@ -338,8 +488,10 @@ export async function decodeSubscribeResponse(r, version) {
                 case 0x0:
                     return { start: await SubscribeStart.decode(r) };
                 case 0x1:
-                    return { end: await SubscribeEnd.decode(r) };
+                    return { end: await SubscribeEnd.decode(r, version) };
                 case 0x2:
+                    if (hasStreamCount(version))
+                        throw new Error(`unknown subscribe response type: ${typ}`);
                     return { drop: await SubscribeDrop.decode(r) };
                 default:
                     throw new Error(`unknown subscribe response type: ${typ}`);