@moqtap/codec 0.8.1 → 0.10.0

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) {
@@ -1429,7 +1441,7 @@ export function createStreamDecoder(): TransformStream<Uint8Array, Draft19Messag
 // ─── Codec Factory ─────────────────────────────────────────────────────────────
 
 export interface Draft19Codec extends BaseCodec<Draft19Message> {
-  readonly draft: '18'
+  readonly draft: '19'
   encodeSubgroupStream(stream: SubgroupStream): Uint8Array
   encodeDatagram(dg: DatagramObject): Uint8Array
   encodeFetchStream(stream: FetchStream): Uint8Array
@@ -1448,7 +1460,9 @@ export interface Draft19Codec extends BaseCodec<Draft19Message> {
 
 export function createDraft19Codec(): Draft19Codec {
   return {
-    draft: '18',
+    // Was '18' — a copy-paste from draft18/codec.ts. createSessionState() keys
+    // off codec.draft, so a draft-19 codec was handing back a draft-18 FSM.
+    draft: '19',
     encodeMessage,
     decodeMessage,
     encodeSubgroupStream,

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[]