@moqtap/codec 0.9.0 → 0.10.0

package/src/drafts/draft15/codec.ts

@@ -63,7 +63,7 @@ function encodeSetupParams(params: Draft15SetupParams, writer: BufferWriter): vo
   let count = 0
   if (params.path !== undefined) count++
   if (params.max_request_id !== undefined) count++
-  if (params.authorization_token !== undefined) count++
+  count += params.authorization_token?.length ?? 0
   if (params.max_auth_token_cache_size !== undefined) count++
   if (params.authority !== undefined) count++
   if (params.moqt_implementation !== undefined) count++
@@ -86,10 +86,10 @@ function encodeSetupParams(params: Draft15SetupParams, writer: BufferWriter): vo
   }
 
   // AUTHORIZATION_TOKEN (0x03) - odd, length-prefixed with nested structure
-  if (params.authorization_token !== undefined) {
+  for (const token of params.authorization_token ?? []) {
     writer.writeVarInt(SETUP_PARAM_AUTHORIZATION_TOKEN)
     const tmpW = new BufferWriter(64)
-    encodeAuthorizationToken(params.authorization_token, tmpW)
+    encodeAuthorizationToken(token, tmpW)
     const raw = tmpW.finish()
     writer.writeVarInt(raw.byteLength)
     writer.writeBytes(raw)
@@ -170,7 +170,10 @@ function decodeSetupParams(reader: BufferReader): Draft15SetupParams {
       if (paramType === SETUP_PARAM_PATH) {
         result.path = textDecoder.decode(bytes)
       } else if (paramType === SETUP_PARAM_AUTHORIZATION_TOKEN) {
-        result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes))
+        result.authorization_token = [
+          ...(result.authorization_token ?? []),
+          decodeAuthorizationToken(new BufferReader(bytes)),
+        ]
       } else if (paramType === SETUP_PARAM_AUTHORITY) {
         result.authority = textDecoder.decode(bytes)
       } else if (paramType === SETUP_PARAM_MOQT_IMPLEMENTATION) {
@@ -242,7 +245,7 @@ function encodeParams(params: Draft15Params, writer: BufferWriter): void {
   // Count known + unknown params
   let count = params.unknown ? params.unknown.length : 0
   if (params.delivery_timeout !== undefined) count++
-  if (params.authorization_token !== undefined) count++
+  count += params.authorization_token?.length ?? 0
   if (params.max_cache_duration !== undefined) count++
   if (params.expires !== undefined) count++
   if (params.largest_object !== undefined) count++
@@ -260,10 +263,10 @@ function encodeParams(params: Draft15Params, writer: BufferWriter): void {
     writer.writeVarInt(PARAM_DELIVERY_TIMEOUT)
     writer.writeVarInt(params.delivery_timeout)
   }
-  if (params.authorization_token !== undefined) {
+  for (const token of params.authorization_token ?? []) {
     writer.writeVarInt(PARAM_AUTHORIZATION_TOKEN)
     const tmpW = new BufferWriter(64)
-    encodeAuthorizationToken(params.authorization_token, tmpW)
+    encodeAuthorizationToken(token, tmpW)
     const raw = tmpW.finish()
     writer.writeVarInt(raw.byteLength)
     writer.writeBytes(raw)
@@ -358,7 +361,10 @@ function decodeParams(reader: BufferReader): Draft15Params {
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
       const length = Number(reader.readVarInt())
       const tokenBytes = reader.readBytes(length)
-      result.authorization_token = decodeAuthorizationToken(new BufferReader(tokenBytes))
+      result.authorization_token = [
+        ...(result.authorization_token ?? []),
+        decodeAuthorizationToken(new BufferReader(tokenBytes)),
+      ]
     } else if (paramType === PARAM_MAX_CACHE_DURATION) {
       result.max_cache_duration = reader.readVarInt()
     } else if (paramType === PARAM_EXPIRES) {

package/src/drafts/draft15/types.ts

@@ -20,7 +20,7 @@ export interface AuthorizationToken {
 export interface Draft15SetupParams {
   path?: string // 0x01 odd
   max_request_id?: bigint // 0x02 even
-  authorization_token?: AuthorizationToken // 0x03 odd (length-prefixed, nested)
+  authorization_token?: readonly AuthorizationToken[] // 0x03 odd (length-prefixed, nested)
   max_auth_token_cache_size?: bigint // 0x04 even
   authority?: string // 0x05 odd
   moqt_implementation?: string // 0x07 odd
@@ -44,7 +44,7 @@ export interface LargestObject {
 // Version-specific parameters (well-known + unknown)
 export interface Draft15Params {
   delivery_timeout?: bigint // 0x02 even
-  authorization_token?: AuthorizationToken // 0x03 odd (length-prefixed, nested)
+  authorization_token?: readonly AuthorizationToken[] // 0x03 odd (length-prefixed, nested)
   max_cache_duration?: bigint // 0x04 even
   expires?: bigint // 0x08 even
   largest_object?: LargestObject // 0x09 odd (length-prefixed)

package/src/drafts/draft16/codec.ts

@@ -65,7 +65,7 @@ function encodeSetupParams(params: Draft16SetupParams, writer: BufferWriter): vo
   let count = 0
   if (params.path !== undefined) count++
   if (params.max_request_id !== undefined) count++
-  if (params.authorization_token !== undefined) count++
+  count += params.authorization_token?.length ?? 0
   if (params.max_auth_token_cache_size !== undefined) count++
   if (params.authority !== undefined) count++
   if (params.moqt_implementation !== undefined) count++
@@ -88,10 +88,10 @@ function encodeSetupParams(params: Draft16SetupParams, writer: BufferWriter): vo
   }
 
   // AUTHORIZATION_TOKEN (0x03) - odd, length-prefixed with nested structure
-  if (params.authorization_token !== undefined) {
+  for (const token of params.authorization_token ?? []) {
     writer.writeVarInt(SETUP_PARAM_AUTHORIZATION_TOKEN)
     const tmpW = new BufferWriter(64)
-    encodeAuthorizationToken(params.authorization_token, tmpW)
+    encodeAuthorizationToken(token, tmpW)
     const raw = tmpW.finish()
     writer.writeVarInt(raw.byteLength)
     writer.writeBytes(raw)
@@ -168,7 +168,10 @@ function decodeSetupParams(reader: BufferReader): Draft16SetupParams {
       if (paramType === SETUP_PARAM_PATH) {
         result.path = textDecoder.decode(bytes)
       } else if (paramType === SETUP_PARAM_AUTHORIZATION_TOKEN) {
-        result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes))
+        result.authorization_token = [
+          ...(result.authorization_token ?? []),
+          decodeAuthorizationToken(new BufferReader(bytes)),
+        ]
       } else if (paramType === SETUP_PARAM_AUTHORITY) {
         result.authority = textDecoder.decode(bytes)
       } else if (paramType === SETUP_PARAM_MOQT_IMPLEMENTATION) {
@@ -324,12 +327,12 @@ function encodeParams(params: Draft16Params, writer: BufferWriter): void {
       encode: (w) => w.writeVarInt(params.delivery_timeout!),
     })
   }
-  if (params.authorization_token !== undefined) {
+  for (const token of params.authorization_token ?? []) {
     entries.push({
       type: PARAM_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new BufferWriter(64)
-        encodeAuthorizationToken(params.authorization_token!, tmpW)
+        encodeAuthorizationToken(token, tmpW)
         const raw = tmpW.finish()
         w.writeVarInt(raw.byteLength)
         w.writeBytes(raw)
@@ -457,7 +460,10 @@ function decodeParams(reader: BufferReader): Draft16Params {
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
       const length = Number(reader.readVarInt())
       const tokenBytes = reader.readBytes(length)
-      result.authorization_token = decodeAuthorizationToken(new BufferReader(tokenBytes))
+      result.authorization_token = [
+        ...(result.authorization_token ?? []),
+        decodeAuthorizationToken(new BufferReader(tokenBytes)),
+      ]
     } else if (paramType === PARAM_MAX_CACHE_DURATION) {
       result.max_cache_duration = reader.readVarInt()
     } else if (paramType === PARAM_EXPIRES) {

package/src/drafts/draft16/types.ts

@@ -20,7 +20,7 @@ export interface AuthorizationToken {
 export interface Draft16SetupParams {
   path?: string // 0x01 odd
   max_request_id?: bigint // 0x02 even
-  authorization_token?: AuthorizationToken // 0x03 odd
+  authorization_token?: readonly AuthorizationToken[] // 0x03 odd
   max_auth_token_cache_size?: bigint // 0x04 even
   authority?: string // 0x05 odd
   moqt_implementation?: string // 0x07 odd
@@ -52,7 +52,7 @@ export interface Draft16TrackExtensions {
 // Version-specific parameters (well-known + unknown)
 export interface Draft16Params {
   delivery_timeout?: bigint // 0x02 even
-  authorization_token?: AuthorizationToken // 0x03 odd
+  authorization_token?: readonly AuthorizationToken[] // 0x03 odd
   max_cache_duration?: bigint // 0x04 even
   expires?: bigint // 0x08 even
   largest_object?: LargestObject // 0x09 odd (length-prefixed)

package/src/drafts/draft17/codec.ts

@@ -68,12 +68,12 @@ function encodeSetupOptions(opts: Draft17SetupOptions, writer: BufferWriter): vo
       },
     })
   }
-  if (opts.authorization_token !== undefined) {
+  for (const token of opts.authorization_token ?? []) {
     entries.push({
       type: SETUP_OPT_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new BufferWriter(64)
-        encodeAuthorizationToken(opts.authorization_token!, tmpW)
+        encodeAuthorizationToken(token, tmpW)
         const raw = tmpW.finish()
         w.writeVarInt(BigInt(raw.byteLength))
         w.writeBytes(raw)
@@ -168,7 +168,10 @@ function decodeSetupOptions(reader: BufferReader, payloadEnd: number): Draft17Se
       if (optType === SETUP_OPT_PATH) {
         result.path = textDecoder.decode(bytes)
       } else if (optType === SETUP_OPT_AUTHORIZATION_TOKEN) {
-        result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes))
+        result.authorization_token = [
+          ...(result.authorization_token ?? []),
+          decodeAuthorizationToken(new BufferReader(bytes)),
+        ]
       } else if (optType === SETUP_OPT_AUTHORITY) {
         result.authority = textDecoder.decode(bytes)
       } else if (optType === SETUP_OPT_MOQT_IMPLEMENTATION) {
@@ -283,12 +286,12 @@ function encodeParams(params: Draft17Params, writer: BufferWriter): void {
       encode: (w) => w.writeVarInt(params.delivery_timeout!),
     })
   }
-  if (params.authorization_token !== undefined) {
+  for (const token of params.authorization_token ?? []) {
     entries.push({
       type: PARAM_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new BufferWriter(64)
-        encodeAuthorizationToken(params.authorization_token!, tmpW)
+        encodeAuthorizationToken(token, tmpW)
         const raw = tmpW.finish()
         w.writeVarInt(BigInt(raw.byteLength))
         w.writeBytes(raw)
@@ -411,7 +414,10 @@ function decodeParams(reader: BufferReader, messageType: string): Draft17Params
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
       const length = Number(reader.readVarInt())
       const bytes = reader.readBytes(length)
-      result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes))
+      result.authorization_token = [
+        ...(result.authorization_token ?? []),
+        decodeAuthorizationToken(new BufferReader(bytes)),
+      ]
     } else if (paramType === PARAM_RENDEZVOUS_TIMEOUT) {
       result.rendezvous_timeout = reader.readVarInt()
     } else if (paramType === PARAM_EXPIRES) {

package/src/drafts/draft17/types.ts

@@ -18,7 +18,7 @@ export interface AuthorizationToken {
 // Setup options (KVP encoding, no count prefix)
 export interface Draft17SetupOptions {
   path?: string // 0x01 odd
-  authorization_token?: AuthorizationToken // 0x03 odd
+  authorization_token?: readonly AuthorizationToken[] // 0x03 odd
   max_auth_token_cache_size?: bigint // 0x04 even
   authority?: string // 0x05 odd
   moqt_implementation?: string // 0x07 odd
@@ -42,7 +42,7 @@ export interface LargestObject {
 // Version-specific parameters (delta-encoded types, count-prefixed)
 export interface Draft17Params {
   delivery_timeout?: bigint // 0x02 varint
-  authorization_token?: AuthorizationToken // 0x03 length-prefixed nested
+  authorization_token?: readonly AuthorizationToken[] // 0x03 length-prefixed nested
   rendezvous_timeout?: bigint // 0x04 varint
   expires?: bigint // 0x08 varint
   largest_object?: LargestObject // 0x09 Location (2 bare varints)

package/src/drafts/draft18/codec.ts

@@ -71,12 +71,12 @@ function encodeSetupOptions(opts: Draft18SetupOptions, writer: BufferWriter): vo
       },
     })
   }
-  if (opts.authorization_token !== undefined) {
+  for (const token of opts.authorization_token ?? []) {
     entries.push({
       type: SETUP_OPT_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new BufferWriter(64)
-        encodeAuthorizationToken(opts.authorization_token!, tmpW)
+        encodeAuthorizationToken(token, tmpW)
         const raw = tmpW.finish()
         w.writeVarInt(BigInt(raw.byteLength))
         w.writeBytes(raw)
@@ -171,7 +171,10 @@ function decodeSetupOptions(reader: BufferReader, payloadEnd: number): Draft18Se
       if (optType === SETUP_OPT_PATH) {
         result.path = textDecoder.decode(bytes)
       } else if (optType === SETUP_OPT_AUTHORIZATION_TOKEN) {
-        result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes))
+        result.authorization_token = [
+          ...(result.authorization_token ?? []),
+          decodeAuthorizationToken(new BufferReader(bytes)),
+        ]
       } else if (optType === SETUP_OPT_AUTHORITY) {
         result.authority = textDecoder.decode(bytes)
       } else if (optType === SETUP_OPT_MOQT_IMPLEMENTATION) {
@@ -315,12 +318,12 @@ function encodeParams(params: Draft18Params, writer: BufferWriter): void {
       encode: (w) => w.writeVarInt(params.object_delivery_timeout!),
     })
   }
-  if (params.authorization_token !== undefined) {
+  for (const token of params.authorization_token ?? []) {
     entries.push({
       type: PARAM_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new BufferWriter(64)
-        encodeAuthorizationToken(params.authorization_token!, tmpW)
+        encodeAuthorizationToken(token, tmpW)
         const raw = tmpW.finish()
         w.writeVarInt(BigInt(raw.byteLength))
         w.writeBytes(raw)
@@ -469,7 +472,10 @@ function decodeParams(reader: BufferReader, messageType: string): Draft18Params
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
       const length = Number(reader.readVarInt())
       const bytes = reader.readBytes(length)
-      result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes))
+      result.authorization_token = [
+        ...(result.authorization_token ?? []),
+        decodeAuthorizationToken(new BufferReader(bytes)),
+      ]
     } else if (paramType === PARAM_RENDEZVOUS_TIMEOUT) {
       result.rendezvous_timeout = reader.readVarInt()
     } else if (paramType === PARAM_SUBGROUP_DELIVERY_TIMEOUT) {

package/src/drafts/draft18/types.ts

@@ -18,7 +18,7 @@ export interface AuthorizationToken {
 // Setup options (KVP encoding, no count prefix)
 export interface Draft18SetupOptions {
   path?: string // 0x01 odd
-  authorization_token?: AuthorizationToken // 0x03 odd
+  authorization_token?: readonly AuthorizationToken[] // 0x03 odd
   max_auth_token_cache_size?: bigint // 0x04 even
   authority?: string // 0x05 odd
   moqt_implementation?: string // 0x07 odd
@@ -42,7 +42,7 @@ export interface LargestObject {
 // Version-specific parameters (delta-encoded types, count-prefixed)
 export interface Draft18Params {
   object_delivery_timeout?: bigint // 0x02 varint (renamed from delivery_timeout in draft-17)
-  authorization_token?: AuthorizationToken // 0x03 length-prefixed nested
+  authorization_token?: readonly AuthorizationToken[] // 0x03 length-prefixed nested
   rendezvous_timeout?: bigint // 0x04 varint
   subgroup_delivery_timeout?: bigint // 0x06 varint (NEW in draft-18)
   expires?: bigint // 0x08 varint

package/src/drafts/draft19/codec.ts

@@ -75,12 +75,12 @@ function encodeSetupOptions(opts: Draft19SetupOptions, writer: BufferWriter): vo
       },
     })
   }
-  if (opts.authorization_token !== undefined) {
+  for (const token of opts.authorization_token ?? []) {
     entries.push({
       type: SETUP_OPT_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new BufferWriter(64)
-        encodeAuthorizationToken(opts.authorization_token!, tmpW)
+        encodeAuthorizationToken(token, tmpW)
         const raw = tmpW.finish()
         w.writeVarInt(BigInt(raw.byteLength))
         w.writeBytes(raw)
@@ -191,7 +191,10 @@ function decodeSetupOptions(reader: BufferReader, payloadEnd: number): Draft19Se
       if (optType === SETUP_OPT_PATH) {
         result.path = textDecoder.decode(bytes)
       } else if (optType === SETUP_OPT_AUTHORIZATION_TOKEN) {
-        result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes))
+        result.authorization_token = [
+          ...(result.authorization_token ?? []),
+          decodeAuthorizationToken(new BufferReader(bytes)),
+        ]
       } else if (optType === SETUP_OPT_AUTHORITY) {
         result.authority = textDecoder.decode(bytes)
       } else if (optType === SETUP_OPT_MOQT_IMPLEMENTATION) {
@@ -403,12 +406,12 @@ function encodeParams(params: Draft19Params, writer: BufferWriter): void {
       encode: (w) => w.writeVarInt(params.object_delivery_timeout!),
     })
   }
-  if (params.authorization_token !== undefined) {
+  for (const token of params.authorization_token ?? []) {
     entries.push({
       type: PARAM_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new BufferWriter(64)
-        encodeAuthorizationToken(params.authorization_token!, tmpW)
+        encodeAuthorizationToken(token, tmpW)
         const raw = tmpW.finish()
         w.writeVarInt(BigInt(raw.byteLength))
         w.writeBytes(raw)
@@ -489,34 +492,34 @@ function encodeParams(params: Draft19Params, writer: BufferWriter): void {
       encode: (w) => w.writeUint8(Number(params.group_order!)),
     })
   }
-  if (params.subgroup_filter !== undefined) {
+  for (const filter of params.subgroup_filter ?? []) {
     entries.push({
       type: PARAM_SUBGROUP_FILTER,
-      encode: (w) => encodeRangeFilter(params.subgroup_filter!, false, w),
+      encode: (w) => encodeRangeFilter(filter, false, w),
     })
   }
-  if (params.objectid_filter !== undefined) {
+  for (const filter of params.objectid_filter ?? []) {
     entries.push({
       type: PARAM_OBJECTID_FILTER,
-      encode: (w) => encodeRangeFilter(params.objectid_filter!, false, w),
+      encode: (w) => encodeRangeFilter(filter, false, w),
     })
   }
-  if (params.priority_filter !== undefined) {
+  for (const filter of params.priority_filter ?? []) {
     entries.push({
       type: PARAM_PRIORITY_FILTER,
-      encode: (w) => encodeRangeFilter(params.priority_filter!, false, w),
+      encode: (w) => encodeRangeFilter(filter, false, w),
     })
   }
-  if (params.object_property_filter !== undefined) {
+  for (const filter of params.object_property_filter ?? []) {
     entries.push({
       type: PARAM_OBJECT_PROPERTY_FILTER,
-      encode: (w) => encodeRangeFilter(params.object_property_filter!, true, w),
+      encode: (w) => encodeRangeFilter(filter, true, w),
     })
   }
-  if (params.track_property_filter !== undefined) {
+  for (const filter of params.track_property_filter ?? []) {
     entries.push({
       type: PARAM_TRACK_PROPERTY_FILTER,
-      encode: (w) => encodeRangeFilter(params.track_property_filter!, true, w),
+      encode: (w) => encodeRangeFilter(filter, true, w),
     })
   }
   if (params.new_group_request !== undefined) {
@@ -587,7 +590,10 @@ function decodeParams(reader: BufferReader, messageType: string): Draft19Params
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
       const length = Number(reader.readVarInt())
       const bytes = reader.readBytes(length)
-      result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes))
+      result.authorization_token = [
+        ...(result.authorization_token ?? []),
+        decodeAuthorizationToken(new BufferReader(bytes)),
+      ]
     } else if (paramType === PARAM_RENDEZVOUS_TIMEOUT) {
       result.rendezvous_timeout = reader.readVarInt()
     } else if (paramType === PARAM_SUBGROUP_DELIVERY_TIMEOUT) {
@@ -632,15 +638,21 @@ function decodeParams(reader: BufferReader, messageType: string): Draft19Params
       // uint8: single raw byte
       result.group_order = BigInt(reader.readUint8())
     } else if (paramType === PARAM_SUBGROUP_FILTER) {
-      result.subgroup_filter = decodeRangeFilter(reader, false)
+      result.subgroup_filter = [...(result.subgroup_filter ?? []), decodeRangeFilter(reader, false)]
     } else if (paramType === PARAM_OBJECTID_FILTER) {
-      result.objectid_filter = decodeRangeFilter(reader, false)
+      result.objectid_filter = [...(result.objectid_filter ?? []), decodeRangeFilter(reader, false)]
     } else if (paramType === PARAM_PRIORITY_FILTER) {
-      result.priority_filter = decodeRangeFilter(reader, false)
+      result.priority_filter = [...(result.priority_filter ?? []), decodeRangeFilter(reader, false)]
     } else if (paramType === PARAM_OBJECT_PROPERTY_FILTER) {
-      result.object_property_filter = decodeRangeFilter(reader, true)
+      result.object_property_filter = [
+        ...(result.object_property_filter ?? []),
+        decodeRangeFilter(reader, true),
+      ]
     } else if (paramType === PARAM_TRACK_PROPERTY_FILTER) {
-      result.track_property_filter = decodeRangeFilter(reader, true)
+      result.track_property_filter = [
+        ...(result.track_property_filter ?? []),
+        decodeRangeFilter(reader, true),
+      ]
     } else if (paramType === PARAM_NEW_GROUP_REQUEST) {
       result.new_group_request = reader.readVarInt()
     } else if (paramType === PARAM_TRACK_NAMESPACE_PREFIX) {

package/src/drafts/draft19/types.ts

@@ -18,7 +18,7 @@ export interface AuthorizationToken {
 // Setup options (KVP encoding, no count prefix)
 export interface Draft19SetupOptions {
   path?: string // 0x01 odd
-  authorization_token?: AuthorizationToken // 0x03 odd
+  authorization_token?: readonly AuthorizationToken[] // 0x03 odd
   max_auth_token_cache_size?: bigint // 0x04 even
   authority?: string // 0x05 odd
   max_filter_ranges?: bigint // 0x06 even (NEW in draft-19)
@@ -58,7 +58,7 @@ export interface LargestObject {
 // Version-specific parameters (delta-encoded types, count-prefixed)
 export interface Draft19Params {
   object_delivery_timeout?: bigint // 0x02 varint (renamed from delivery_timeout in draft-17)
-  authorization_token?: AuthorizationToken // 0x03 length-prefixed nested
+  authorization_token?: readonly AuthorizationToken[] // 0x03 length-prefixed nested
   rendezvous_timeout?: bigint // 0x04 varint
   subgroup_delivery_timeout?: bigint // 0x06 varint (NEW in draft-18)
   expires?: bigint // 0x08 varint
@@ -68,11 +68,14 @@ export interface Draft19Params {
   subscriber_priority?: bigint // 0x20 uint8
   location_filter?: LocationFilter // 0x21 length-prefixed (renamed from subscription_filter in draft-19)
   group_order?: bigint // 0x22 uint8
-  subgroup_filter?: RangeFilter // 0x25 length-prefixed (NEW in draft-19)
-  objectid_filter?: RangeFilter // 0x26 length-prefixed (NEW in draft-19)
-  priority_filter?: RangeFilter // 0x27 length-prefixed (NEW in draft-19)
-  object_property_filter?: RangeFilter // 0x28 length-prefixed (NEW in draft-19)
-  track_property_filter?: RangeFilter // 0x29 length-prefixed (NEW in draft-19)
+  // Section 5.1.3 permits each of the five more than once in a message: a
+  // filter parameter carries one SetID, so two alternatives over the same
+  // field need two parameters. A single filter is a one-element list.
+  subgroup_filter?: readonly RangeFilter[] // 0x25 length-prefixed (NEW in draft-19)
+  objectid_filter?: readonly RangeFilter[] // 0x26 length-prefixed (NEW in draft-19)
+  priority_filter?: readonly RangeFilter[] // 0x27 length-prefixed (NEW in draft-19)
+  object_property_filter?: readonly RangeFilter[] // 0x28 length-prefixed (NEW in draft-19)
+  track_property_filter?: readonly RangeFilter[] // 0x29 length-prefixed (NEW in draft-19)
   new_group_request?: bigint // 0x32 varint
   track_namespace_prefix?: string[] // 0x34 Track Namespace encoding (NEW in draft-18)
   unknown?: UnknownParam[]

package/src/drafts/draft20/codec.ts

@@ -98,12 +98,12 @@ function encodeSetupOptions(opts: Draft20SetupOptions, writer: BufferWriter): vo
       },
     })
   }
-  if (opts.authorization_token !== undefined) {
+  for (const token of opts.authorization_token ?? []) {
     entries.push({
       type: SETUP_OPT_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new BufferWriter(64)
-        encodeAuthorizationToken(opts.authorization_token!, tmpW)
+        encodeAuthorizationToken(token, tmpW)
         const raw = tmpW.finish()
         w.writeVarInt(BigInt(raw.byteLength))
         w.writeBytes(raw)
@@ -216,7 +216,10 @@ function decodeSetupOptions(reader: BufferReader, payloadEnd: number): Draft20Se
       if (optType === SETUP_OPT_PATH) {
         result.path = textDecoder.decode(bytes)
       } else if (optType === SETUP_OPT_AUTHORIZATION_TOKEN) {
-        result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes))
+        result.authorization_token = [
+          ...(result.authorization_token ?? []),
+          decodeAuthorizationToken(new BufferReader(bytes)),
+        ]
       } else if (optType === SETUP_OPT_AUTHORITY) {
         result.authority = textDecoder.decode(bytes)
       } else if (optType === SETUP_OPT_MOQT_IMPLEMENTATION) {
@@ -619,12 +622,12 @@ function encodeParams(params: Draft20Params, writer: BufferWriter): void {
       encode: (w) => w.writeVarInt(params.object_delivery_timeout!),
     })
   }
-  if (params.authorization_token !== undefined) {
+  for (const token of params.authorization_token ?? []) {
     entries.push({
       type: PARAM_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new BufferWriter(64)
-        encodeAuthorizationToken(params.authorization_token!, tmpW)
+        encodeAuthorizationToken(token, tmpW)
         const raw = tmpW.finish()
         w.writeVarInt(BigInt(raw.byteLength))
         w.writeBytes(raw)
@@ -718,34 +721,34 @@ function encodeParams(params: Draft20Params, writer: BufferWriter): void {
       },
     })
   }
-  if (params.subgroup_filter !== undefined) {
+  for (const filter of params.subgroup_filter ?? []) {
     entries.push({
       type: PARAM_SUBGROUP_FILTER,
-      encode: (w) => encodeRangeFilter(params.subgroup_filter!, false, w),
+      encode: (w) => encodeRangeFilter(filter, false, w),
     })
   }
-  if (params.objectid_filter !== undefined) {
+  for (const filter of params.objectid_filter ?? []) {
     entries.push({
       type: PARAM_OBJECTID_FILTER,
-      encode: (w) => encodeRangeFilter(params.objectid_filter!, false, w),
+      encode: (w) => encodeRangeFilter(filter, false, w),
     })
   }
-  if (params.priority_filter !== undefined) {
+  for (const filter of params.priority_filter ?? []) {
     entries.push({
       type: PARAM_PRIORITY_FILTER,
-      encode: (w) => encodeRangeFilter(params.priority_filter!, false, w),
+      encode: (w) => encodeRangeFilter(filter, false, w),
     })
   }
-  if (params.object_property_filter !== undefined) {
+  for (const filter of params.object_property_filter ?? []) {
     entries.push({
       type: PARAM_OBJECT_PROPERTY_FILTER,
-      encode: (w) => encodeRangeFilter(params.object_property_filter!, true, w),
+      encode: (w) => encodeRangeFilter(filter, true, w),
     })
   }
-  if (params.track_property_filter !== undefined) {
+  for (const filter of params.track_property_filter ?? []) {
     entries.push({
       type: PARAM_TRACK_PROPERTY_FILTER,
-      encode: (w) => encodeRangeFilter(params.track_property_filter!, true, w),
+      encode: (w) => encodeRangeFilter(filter, true, w),
     })
   }
   if (params.new_group_request !== undefined) {
@@ -823,7 +826,10 @@ function decodeParams(reader: BufferReader, messageType: string): Draft20Params
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
       const length = Number(reader.readVarInt())
       const bytes = reader.readBytes(length)
-      result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes))
+      result.authorization_token = [
+        ...(result.authorization_token ?? []),
+        decodeAuthorizationToken(new BufferReader(bytes)),
+      ]
     } else if (paramType === PARAM_RENDEZVOUS_TIMEOUT) {
       result.rendezvous_timeout = reader.readVarInt()
     } else if (paramType === PARAM_SUBGROUP_DELIVERY_TIMEOUT) {
@@ -851,15 +857,21 @@ function decodeParams(reader: BufferReader, messageType: string): Draft20Params
     } else if (paramType === PARAM_FILL_PARAMETERS) {
       result.fill_parameters = decodeFillParameters(reader)
     } else if (paramType === PARAM_SUBGROUP_FILTER) {
-      result.subgroup_filter = decodeRangeFilter(reader, false)
+      result.subgroup_filter = [...(result.subgroup_filter ?? []), decodeRangeFilter(reader, false)]
     } else if (paramType === PARAM_OBJECTID_FILTER) {
-      result.objectid_filter = decodeRangeFilter(reader, false)
+      result.objectid_filter = [...(result.objectid_filter ?? []), decodeRangeFilter(reader, false)]
     } else if (paramType === PARAM_PRIORITY_FILTER) {
-      result.priority_filter = decodeRangeFilter(reader, false)
+      result.priority_filter = [...(result.priority_filter ?? []), decodeRangeFilter(reader, false)]
     } else if (paramType === PARAM_OBJECT_PROPERTY_FILTER) {
-      result.object_property_filter = decodeRangeFilter(reader, true)
+      result.object_property_filter = [
+        ...(result.object_property_filter ?? []),
+        decodeRangeFilter(reader, true),
+      ]
     } else if (paramType === PARAM_TRACK_PROPERTY_FILTER) {
-      result.track_property_filter = decodeRangeFilter(reader, true)
+      result.track_property_filter = [
+        ...(result.track_property_filter ?? []),
+        decodeRangeFilter(reader, true),
+      ]
     } else if (paramType === PARAM_NEW_GROUP_REQUEST) {
       result.new_group_request = reader.readVarInt()
     } else if (paramType === PARAM_TRACK_NAMESPACE_PREFIX) {