@moqtap/codec 0.6.0 → 0.8.0

package/dist/{types-DjmrHp_s.d.ts → types-CVeKIk7A.d.ts}

@@ -63,8 +63,8 @@ interface Draft14Subscribe extends Draft14BaseMessage {
     readonly request_id: bigint;
     readonly track_namespace: string[];
     readonly track_name: string;
-    readonly subscriber_priority: bigint;
-    readonly group_order: bigint;
+    readonly subscriber_priority: number;
+    readonly group_order: number;
     readonly forward: bigint;
     readonly filter_type: bigint;
     readonly start_group?: bigint;
@@ -77,7 +77,7 @@ interface Draft14SubscribeOk extends Draft14BaseMessage {
     readonly request_id: bigint;
     readonly track_alias: bigint;
     readonly expires: bigint;
-    readonly group_order: bigint;
+    readonly group_order: number;
     readonly content_exists: bigint;
     readonly largest_location?: Location;
     readonly parameters: Draft14Params;
@@ -89,7 +89,7 @@ interface Draft14SubscribeUpdate extends Draft14BaseMessage {
     readonly start_group: bigint;
     readonly start_object: bigint;
     readonly end_group: bigint;
-    readonly subscriber_priority: bigint;
+    readonly subscriber_priority: number;
     readonly forward: bigint;
     readonly parameters: Draft14Params;
 }
@@ -109,7 +109,7 @@ interface Draft14Publish extends Draft14BaseMessage {
     readonly track_namespace: string[];
     readonly track_name: string;
     readonly track_alias: bigint;
-    readonly group_order: bigint;
+    readonly group_order: number;
     readonly content_exists: bigint;
     readonly largest_location?: Location;
     readonly forward: bigint;
@@ -119,8 +119,8 @@ interface Draft14PublishOk extends Draft14BaseMessage {
     readonly type: 'publish_ok';
     readonly request_id: bigint;
     readonly forward: bigint;
-    readonly subscriber_priority: bigint;
-    readonly group_order: bigint;
+    readonly subscriber_priority: number;
+    readonly group_order: number;
     readonly filter_type: bigint;
     readonly start_group?: bigint;
     readonly start_object?: bigint;
@@ -188,26 +188,34 @@ interface Draft14UnsubscribeNamespace extends Draft14BaseMessage {
     readonly type: 'unsubscribe_namespace';
     readonly track_namespace_prefix: string[];
 }
+interface StandaloneFetch {
+    readonly track_namespace: string[];
+    readonly track_name: string;
+    readonly start_group: bigint;
+    readonly start_object: bigint;
+    readonly end_group: bigint;
+    readonly end_object: bigint;
+}
+interface JoiningFetch {
+    readonly joining_request_id: bigint;
+    readonly joining_start: bigint;
+}
 interface Draft14Fetch extends Draft14BaseMessage {
     readonly type: 'fetch';
     readonly request_id: bigint;
-    readonly subscriber_priority: bigint;
-    readonly group_order: bigint;
+    readonly subscriber_priority: number;
+    readonly group_order: number;
     readonly fetch_type: bigint;
-    readonly track_namespace?: string[];
-    readonly track_name?: string;
-    readonly start_group?: bigint;
-    readonly start_object?: bigint;
-    readonly end_group?: bigint;
-    readonly end_object?: bigint;
-    readonly joining_request_id?: bigint;
-    readonly joining_start?: bigint;
+    /** Present when fetch_type = 1 */
+    readonly standalone?: StandaloneFetch;
+    /** Present when fetch_type = 2 or 3 */
+    readonly joining?: JoiningFetch;
     readonly parameters: Draft14Params;
 }
 interface Draft14FetchOk extends Draft14BaseMessage {
     readonly type: 'fetch_ok';
     readonly request_id: bigint;
-    readonly group_order: bigint;
+    readonly group_order: number;
     readonly end_of_track: bigint;
     readonly end_location: Location;
     readonly parameters: Draft14Params;
@@ -227,8 +235,8 @@ interface Draft14TrackStatus extends Draft14BaseMessage {
     readonly request_id: bigint;
     readonly track_namespace: string[];
     readonly track_name: string;
-    readonly subscriber_priority: bigint;
-    readonly group_order: bigint;
+    readonly subscriber_priority: number;
+    readonly group_order: number;
     readonly forward: bigint;
     readonly filter_type: bigint;
     readonly start_group?: bigint;
@@ -240,7 +248,7 @@ interface Draft14TrackStatusOk extends Draft14BaseMessage {
     readonly request_id: bigint;
     readonly track_alias: bigint;
     readonly expires: bigint;
-    readonly group_order: bigint;
+    readonly group_order: number;
     readonly content_exists: bigint;
     readonly largest_location?: Location;
     readonly parameters: Draft14Params;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moqtap/codec",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "MoQT wire-format codec and session state machine — multi-draft, zero dependencies",
   "type": "module",
   "license": "MIT",
@@ -208,7 +208,7 @@
     "test": "vitest run"
   },
   "devDependencies": {
-    "@moqtap/test-vectors": "^0.10.0",
+    "@moqtap/test-vectors": "^0.11.0",
     "tsup": "^8.0.0",
     "typescript": "^5.5.0",
     "vitest": "^3.0.0"

package/src/core/accessors.ts

@@ -0,0 +1,120 @@
+/**
+ * Draft-agnostic readers for decoded control messages.
+ *
+ * The codec keeps one message model per draft, because the drafts genuinely
+ * disagree: a track alias travels in SUBSCRIBE through draft-11 and in
+ * SUBSCRIBE_OK from draft-12; a request was a `subscribe_id` through draft-10
+ * and a `request_id` after it; a joining FETCH points at a
+ * `joining_subscribe_id` through draft-13 and a `joining_request_id` after it.
+ * Faithfulness to each draft is the point of the codec.
+ *
+ * What consumers usually want is the answer, not the archaeology — and every
+ * one of them that has asked has written the same field-spelling ladder by
+ * hand. These accessors are that ladder, written once.
+ *
+ * Each returns `undefined` when the message does not carry the field, which
+ * includes the cases where the draft has not assigned it yet: `trackAliasOf`
+ * on a draft-14 SUBSCRIBE is `undefined` because the publisher has not chosen
+ * the alias until SUBSCRIBE_OK.
+ *
+ * Both snake_case (what this codec emits) and camelCase spellings are read, so
+ * these also work on messages recovered from qlog-style traces written by
+ * other tools.
+ */
+
+/** Any decoded control message, from any draft. */
+export type AnyMessage = Readonly<Record<string, unknown>>
+
+/** A track's full identity: the namespace tuple plus the name within it. */
+export interface TrackIdentity {
+  readonly namespace: string[]
+  readonly name: string
+}
+
+/** First defined value among several spellings of one field. */
+function pick(msg: AnyMessage, names: readonly string[]): unknown {
+  for (const name of names) {
+    const value = msg[name]
+    if (value != null) return value
+  }
+  return undefined
+}
+
+function bigintOf(value: unknown): bigint | undefined {
+  if (value == null) return undefined
+  if (typeof value === 'bigint') return value
+  if (typeof value === 'number' || typeof value === 'string') {
+    try {
+      return BigInt(value)
+    } catch {
+      return undefined
+    }
+  }
+  return undefined
+}
+
+/**
+ * The request this message belongs to.
+ *
+ * Named `subscribe_id` through draft-10 and `request_id` from draft-11, when
+ * the id space widened to cover every request type rather than subscriptions
+ * alone.
+ *
+ * Returns `undefined` for draft-17+ responses, which carry no id at all: each
+ * request there has its own bidirectional stream, and that stream — not a
+ * field — is what ties a response to its request.
+ */
+export function requestIdOf(msg: AnyMessage): bigint | undefined {
+  return bigintOf(pick(msg, ['request_id', 'requestId', 'subscribe_id', 'subscribeId']))
+}
+
+/**
+ * The track alias this message assigns or refers to, if any.
+ *
+ * Which message carries it moved: SUBSCRIBE through draft-11, then SUBSCRIBE_OK
+ * from draft-12, when assigning the alias became the publisher's job. PUBLISH
+ * carries it alongside the track name in every draft that has PUBLISH.
+ */
+export function trackAliasOf(msg: AnyMessage): bigint | undefined {
+  return bigintOf(pick(msg, ['track_alias', 'trackAlias']))
+}
+
+/**
+ * The track this message names, or `undefined` if it names none.
+ *
+ * Covers SUBSCRIBE, PUBLISH, TRACK_STATUS and a standalone FETCH — whose track
+ * sits under `standalone` in most drafts and flat in draft-07, which predates
+ * joining fetch. A joining FETCH names no track of its own; use
+ * {@link joiningRequestIdOf} to find the request whose track it continues.
+ *
+ * PUBLISH_NAMESPACE and its relatives are namespace-only and yield
+ * `undefined`: a namespace is not a track.
+ */
+export function trackOf(msg: AnyMessage): TrackIdentity | undefined {
+  const source = (pick(msg, ['standalone']) ?? msg) as AnyMessage
+  const name = pick(source, ['track_name', 'trackName'])
+  if (typeof name !== 'string') return undefined
+  const namespace = pick(source, ['track_namespace', 'trackNamespace'])
+  return {
+    namespace: Array.isArray(namespace) ? namespace.map(String) : [],
+    name,
+  }
+}
+
+/**
+ * For a joining FETCH, the request whose track it continues.
+ *
+ * Spelled `joining_subscribe_id` through draft-13 and `joining_request_id`
+ * after it, nested under `joining` in every draft that has one.
+ */
+export function joiningRequestIdOf(msg: AnyMessage): bigint | undefined {
+  const source = (pick(msg, ['joining']) ?? msg) as AnyMessage
+  return bigintOf(
+    pick(source, [
+      'joining_request_id',
+      'joiningRequestId',
+      'joining_subscribe_id',
+      'joiningSubscribeId',
+    ]),
+  )
+}

package/src/core/buffer-reader.ts

@@ -3,8 +3,8 @@ import { DecodeError } from './types.js'
 const textDecoder = /* @__PURE__ */ new TextDecoder()
 
 export class BufferReader {
-  private readonly view: DataView
-  private pos: number
+  protected readonly view: DataView
+  protected pos: number
 
   constructor(
     readonly buffer: Uint8Array,
@@ -128,3 +128,75 @@ export class BufferReader {
     return params
   }
 }
+
+/**
+ * Reader for drafts 17 and later, which dropped the RFC 9000 varint for MoQT's
+ * own (§1.4.1).
+ *
+ * The number of leading 1 bits in the first byte gives the encoded length; the
+ * bits after the terminating 0, followed by the remaining bytes, are the value
+ * in network byte order. One byte therefore carries 0-127 rather than 0-63,
+ * and nine bytes carry the full 64-bit range instead of RFC 9000's 62. A first
+ * byte of 0xff is the nine-byte form and is prefix only.
+ *
+ * Encodings need not be minimal: draft-19 §1.4.1 says any length that can
+ * represent the value is valid, so 0 may arrive as 0x00, 0x8000, 0xc00000 or
+ * longer.
+ */
+export class MoqtBufferReader extends BufferReader {
+  /** Draft-17 omits the 7-byte length; draft-18 restored it. */
+  protected get allowSevenByte(): boolean {
+    return true
+  }
+
+  override readVarInt(): bigint {
+    if (this.remaining < 1) {
+      throw new DecodeError('UNEXPECTED_END', 'Not enough bytes for varint', this.pos)
+    }
+    const first = this.view.getUint8(this.pos)
+
+    if (first === 0xff) {
+      if (this.remaining < 9) {
+        throw new DecodeError('UNEXPECTED_END', 'Not enough bytes for 9-byte varint', this.pos)
+      }
+      const value = this.view.getBigUint64(this.pos + 1)
+      this.pos += 9
+      return value
+    }
+
+    let leadingOnes = 0
+    while (leadingOnes < 8 && (first & (0x80 >> leadingOnes)) !== 0) leadingOnes++
+    const length = leadingOnes + 1
+
+    if (length === 7 && !this.allowSevenByte) {
+      // draft-17 §1.4.1: "11111100 is an invalid code point. An endpoint that
+      // receives this value MUST close the session with a PROTOCOL_VIOLATION."
+      throw new DecodeError(
+        'INVALID_VARINT',
+        'The 7-byte varint is not defined in draft-17',
+        this.pos,
+      )
+    }
+    if (this.remaining < length) {
+      throw new DecodeError(
+        'UNEXPECTED_END',
+        `Not enough bytes for ${length}-byte varint`,
+        this.pos,
+      )
+    }
+
+    let value = BigInt(first & ((1 << (8 - length)) - 1))
+    for (let i = 1; i < length; i++) {
+      value = (value << 8n) | BigInt(this.view.getUint8(this.pos + i))
+    }
+    this.pos += length
+    return value
+  }
+}
+
+/** Draft-17's reader, which rejects the 7-byte form draft-18 restored. */
+export class Draft17BufferReader extends MoqtBufferReader {
+  protected override get allowSevenByte(): boolean {
+    return false
+  }
+}

package/src/core/buffer-writer.ts

@@ -1,9 +1,9 @@
 const textEncoder = /* @__PURE__ */ new TextEncoder()
 
 export class BufferWriter {
-  private buffer: Uint8Array
-  private view: DataView
-  private pos: number
+  protected buffer: Uint8Array
+  protected view: DataView
+  protected pos: number
 
   constructor(initialSize = 256) {
     this.buffer = new Uint8Array(initialSize)
@@ -15,7 +15,7 @@ export class BufferWriter {
     return this.pos
   }
 
-  private ensureCapacity(needed: number): void {
+  protected ensureCapacity(needed: number): void {
     const required = this.pos + needed
     if (required <= this.buffer.byteLength) return
 
@@ -98,3 +98,55 @@ export class BufferWriter {
     return this.buffer.subarray(0, this.pos)
   }
 }
+
+/**
+ * Writer for drafts 17 and later, which dropped the RFC 9000 varint for MoQT's
+ * own (§1.4.1). See {@link MoqtBufferReader} for the encoding.
+ *
+ * Values are always written in the fewest bytes that hold them. Longer forms
+ * are legal on the wire and decode fine, but there is no reason to emit them.
+ */
+export class MoqtBufferWriter extends BufferWriter {
+  /** Draft-17 omits the 7-byte length; draft-18 restored it. */
+  protected get allowSevenByte(): boolean {
+    return true
+  }
+
+  override writeVarInt(value: number | bigint): void {
+    const v = BigInt(value)
+    if (v < 0n) throw new Error('VarInt value must be non-negative')
+    if (v > 0xffffffffffffffffn) throw new Error('VarInt value exceeds 64-bit range')
+
+    let length = 9
+    for (let n = 1; n <= 8; n++) {
+      if (n === 7 && !this.allowSevenByte) continue
+      if (v < 1n << BigInt(7 * n)) {
+        length = n
+        break
+      }
+    }
+
+    this.ensureCapacity(length)
+    if (length === 9) {
+      this.view.setUint8(this.pos, 0xff)
+      this.view.setBigUint64(this.pos + 1, v)
+      this.pos += 9
+      return
+    }
+
+    // (length - 1) leading 1 bits, then a 0, in the top `length` bits.
+    const prefix = BigInt(((1 << (length - 1)) - 1) << (9 - length)) & 0xffn
+    const combined = (prefix << BigInt(8 * (length - 1))) | v
+    for (let i = 0; i < length; i++) {
+      this.view.setUint8(this.pos + i, Number((combined >> BigInt(8 * (length - 1 - i))) & 0xffn))
+    }
+    this.pos += length
+  }
+}
+
+/** Draft-17's writer, which never emits the 7-byte form draft-18 restored. */
+export class Draft17BufferWriter extends MoqtBufferWriter {
+  protected override get allowSevenByte(): boolean {
+    return false
+  }
+}

package/src/drafts/draft14/codec.ts

@@ -333,8 +333,8 @@ function encodeSubscribePayload(
   w.writeVarInt(msg.request_id)
   w.writeTuple(msg.track_namespace)
   w.writeString(msg.track_name)
-  w.writeUint8(Number(msg.subscriber_priority))
-  w.writeUint8(Number(msg.group_order))
+  w.writeUint8(msg.subscriber_priority)
+  w.writeUint8(msg.group_order)
   w.writeVarInt(msg.forward)
   w.writeVarInt(msg.filter_type)
   const ft = msg.filter_type
@@ -355,7 +355,7 @@ function encodeSubscribeOkPayload(
   w.writeVarInt(msg.request_id)
   w.writeVarInt(msg.track_alias)
   w.writeVarInt(msg.expires)
-  w.writeUint8(Number(msg.group_order))
+  w.writeUint8(msg.group_order)
   w.writeVarInt(msg.content_exists)
   if (msg.content_exists === 1n) {
     w.writeVarInt(msg.largest_location!.group)
@@ -373,7 +373,7 @@ function encodeSubscribeUpdatePayload(
   w.writeVarInt(msg.start_group)
   w.writeVarInt(msg.start_object)
   w.writeVarInt(msg.end_group)
-  w.writeUint8(Number(msg.subscriber_priority))
+  w.writeUint8(msg.subscriber_priority)
   w.writeVarInt(msg.forward)
   encodeMessageParams(msg.parameters, w)
 }
@@ -399,7 +399,7 @@ function encodePublishPayload(msg: Draft14Message & { type: 'publish' }, w: Buff
   w.writeTuple(msg.track_namespace)
   w.writeString(msg.track_name)
   w.writeVarInt(msg.track_alias)
-  w.writeUint8(Number(msg.group_order))
+  w.writeUint8(msg.group_order)
   w.writeVarInt(msg.content_exists)
   if (msg.content_exists === 1n) {
     w.writeVarInt(msg.largest_location!.group)
@@ -415,8 +415,8 @@ function encodePublishOkPayload(
 ): void {
   w.writeVarInt(msg.request_id)
   w.writeVarInt(msg.forward)
-  w.writeUint8(Number(msg.subscriber_priority))
-  w.writeUint8(Number(msg.group_order))
+  w.writeUint8(msg.subscriber_priority)
+  w.writeUint8(msg.group_order)
   w.writeVarInt(msg.filter_type)
   const ft = msg.filter_type
   if (ft >= FilterType.AbsoluteStart) {
@@ -525,27 +525,27 @@ function encodeUnsubscribeNamespacePayload(
 
 function encodeFetchPayload(msg: Draft14Message & { type: 'fetch' }, w: BufferWriter): void {
   w.writeVarInt(msg.request_id)
-  w.writeUint8(Number(msg.subscriber_priority))
-  w.writeUint8(Number(msg.group_order))
+  w.writeUint8(msg.subscriber_priority)
+  w.writeUint8(msg.group_order)
   w.writeVarInt(msg.fetch_type)
   const ft = msg.fetch_type
-  if (ft === FetchType.Standalone) {
-    w.writeTuple(msg.track_namespace!)
-    w.writeString(msg.track_name!)
-    w.writeVarInt(msg.start_group!)
-    w.writeVarInt(msg.start_object!)
-    w.writeVarInt(msg.end_group!)
-    w.writeVarInt(msg.end_object!)
-  } else {
-    w.writeVarInt(msg.joining_request_id!)
-    w.writeVarInt(msg.joining_start!)
+  if (ft === FetchType.Standalone && msg.standalone) {
+    w.writeTuple(msg.standalone.track_namespace)
+    w.writeString(msg.standalone.track_name)
+    w.writeVarInt(msg.standalone.start_group)
+    w.writeVarInt(msg.standalone.start_object)
+    w.writeVarInt(msg.standalone.end_group)
+    w.writeVarInt(msg.standalone.end_object)
+  } else if (msg.joining) {
+    w.writeVarInt(msg.joining.joining_request_id)
+    w.writeVarInt(msg.joining.joining_start)
   }
   encodeMessageParams(msg.parameters, w)
 }
 
 function encodeFetchOkPayload(msg: Draft14Message & { type: 'fetch_ok' }, w: BufferWriter): void {
   w.writeVarInt(msg.request_id)
-  w.writeUint8(Number(msg.group_order))
+  w.writeUint8(msg.group_order)
   w.writeVarInt(msg.end_of_track)
   w.writeVarInt(msg.end_location.group)
   w.writeVarInt(msg.end_location.object)
@@ -575,8 +575,8 @@ function encodeTrackStatusPayload(
   w.writeVarInt(msg.request_id)
   w.writeTuple(msg.track_namespace)
   w.writeString(msg.track_name)
-  w.writeUint8(Number(msg.subscriber_priority))
-  w.writeUint8(Number(msg.group_order))
+  w.writeUint8(msg.subscriber_priority)
+  w.writeUint8(msg.group_order)
   w.writeVarInt(msg.forward)
   w.writeVarInt(msg.filter_type)
   const ft = msg.filter_type
@@ -594,7 +594,7 @@ function encodeTrackStatusOkPayload(
   w.writeVarInt(msg.request_id)
   w.writeVarInt(msg.track_alias)
   w.writeVarInt(msg.expires)
-  w.writeUint8(Number(msg.group_order))
+  w.writeUint8(msg.group_order)
   w.writeVarInt(msg.content_exists)
   if (msg.content_exists === 1n) {
     w.writeVarInt(msg.largest_location!.group)
@@ -659,8 +659,8 @@ function decodeSubscribePayload(r: BufferReader): Draft14Message {
   const request_id = r.readVarInt()
   const track_namespace = r.readTuple()
   const track_name = r.readString()
-  const subscriber_priority = BigInt(r.readUint8())
-  const group_order = BigInt(r.readUint8())
+  const subscriber_priority = r.readUint8()
+  const group_order = r.readUint8()
   const forward = r.readVarInt()
   const filter_type = r.readVarInt()
 
@@ -705,7 +705,7 @@ function decodeSubscribeOkPayload(r: BufferReader): Draft14Message {
   const request_id = r.readVarInt()
   const track_alias = r.readVarInt()
   const expires = r.readVarInt()
-  const group_order = BigInt(r.readUint8())
+  const group_order = r.readUint8()
   const content_exists = r.readVarInt()
 
   let largest_location: Location | undefined
@@ -736,7 +736,7 @@ function decodeSubscribeUpdatePayload(r: BufferReader): Draft14Message {
   const start_group = r.readVarInt()
   const start_object = r.readVarInt()
   const end_group = r.readVarInt()
-  const subscriber_priority = BigInt(r.readUint8())
+  const subscriber_priority = r.readUint8()
   const forward = r.readVarInt()
   const parameters = decodeMessageParams(r)
   return {
@@ -769,7 +769,7 @@ function decodePublishPayload(r: BufferReader): Draft14Message {
   const track_namespace = r.readTuple()
   const track_name = r.readString()
   const track_alias = r.readVarInt()
-  const group_order = BigInt(r.readUint8())
+  const group_order = r.readUint8()
   const content_exists = r.readVarInt()
   let largest_location: Location | undefined
   if (content_exists === 1n) {
@@ -797,8 +797,8 @@ function decodePublishPayload(r: BufferReader): Draft14Message {
 function decodePublishOkPayload(r: BufferReader): Draft14Message {
   const request_id = r.readVarInt()
   const forward = r.readVarInt()
-  const subscriber_priority = BigInt(r.readUint8())
-  const group_order = BigInt(r.readUint8())
+  const subscriber_priority = r.readUint8()
+  const group_order = r.readUint8()
   const filter_type = r.readVarInt()
 
   let start_group: bigint | undefined
@@ -931,8 +931,8 @@ function decodeUnsubscribeNamespacePayload(r: BufferReader): Draft14Message {
 
 function decodeFetchPayload(r: BufferReader): Draft14Message {
   const request_id = r.readVarInt()
-  const subscriber_priority = BigInt(r.readUint8())
-  const group_order = BigInt(r.readUint8())
+  const subscriber_priority = r.readUint8()
+  const group_order = r.readUint8()
   const fetch_type = r.readVarInt()
 
   if (fetch_type < FetchType.Standalone || fetch_type > FetchType.AbsoluteJoining) {
@@ -940,12 +940,14 @@ function decodeFetchPayload(r: BufferReader): Draft14Message {
   }
 
   if (fetch_type === FetchType.Standalone) {
-    const track_namespace = r.readTuple()
-    const track_name = r.readString()
-    const start_group = r.readVarInt()
-    const start_object = r.readVarInt()
-    const end_group = r.readVarInt()
-    const end_object = r.readVarInt()
+    const standalone = {
+      track_namespace: r.readTuple(),
+      track_name: r.readString(),
+      start_group: r.readVarInt(),
+      start_object: r.readVarInt(),
+      end_group: r.readVarInt(),
+      end_object: r.readVarInt(),
+    }
     const parameters = decodeMessageParams(r)
     return {
       type: 'fetch',
@@ -953,17 +955,14 @@ function decodeFetchPayload(r: BufferReader): Draft14Message {
       subscriber_priority,
       group_order,
       fetch_type,
-      track_namespace,
-      track_name,
-      start_group,
-      start_object,
-      end_group,
-      end_object,
+      standalone,
       parameters,
     }
   } else {
-    const joining_request_id = r.readVarInt()
-    const joining_start = r.readVarInt()
+    const joining = {
+      joining_request_id: r.readVarInt(),
+      joining_start: r.readVarInt(),
+    }
     const parameters = decodeMessageParams(r)
     return {
       type: 'fetch',
@@ -971,8 +970,7 @@ function decodeFetchPayload(r: BufferReader): Draft14Message {
       subscriber_priority,
       group_order,
       fetch_type,
-      joining_request_id,
-      joining_start,
+      joining,
       parameters,
     }
   }
@@ -980,7 +978,7 @@ function decodeFetchPayload(r: BufferReader): Draft14Message {
 
 function decodeFetchOkPayload(r: BufferReader): Draft14Message {
   const request_id = r.readVarInt()
-  const group_order = BigInt(r.readUint8())
+  const group_order = r.readUint8()
   const end_of_track = r.readVarInt()
   const end_location: Location = {
     group: r.readVarInt(),
@@ -1013,8 +1011,8 @@ function decodeTrackStatusPayload(r: BufferReader): Draft14Message {
   const request_id = r.readVarInt()
   const track_namespace = r.readTuple()
   const track_name = r.readString()
-  const subscriber_priority = BigInt(r.readUint8())
-  const group_order = BigInt(r.readUint8())
+  const subscriber_priority = r.readUint8()
+  const group_order = r.readUint8()
   const forward = r.readVarInt()
   const filter_type = r.readVarInt()
 
@@ -1048,7 +1046,7 @@ function decodeTrackStatusOkPayload(r: BufferReader): Draft14Message {
   const request_id = r.readVarInt()
   const track_alias = r.readVarInt()
   const expires = r.readVarInt()
-  const group_order = BigInt(r.readUint8())
+  const group_order = r.readUint8()
   const content_exists = r.readVarInt()
 
   let largest_location: Location | undefined