@moqtap/codec 0.7.0 → 0.8.1

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) {
@@ -462,7 +462,6 @@ function encodePublishNamespaceOkPayload(
   w: BufferWriter,
 ): void {
   w.writeVarInt(msg.request_id)
-  encodeMessageParams(msg.parameters, w)
 }
 
 function encodePublishNamespaceErrorPayload(
@@ -504,7 +503,6 @@ function encodeSubscribeNamespaceOkPayload(
   w: BufferWriter,
 ): void {
   w.writeVarInt(msg.request_id)
-  encodeMessageParams(msg.parameters, w)
 }
 
 function encodeSubscribeNamespaceErrorPayload(
@@ -525,27 +523,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 +573,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 +592,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 +657,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 +703,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 +734,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 +767,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 +795,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
@@ -861,8 +859,7 @@ function decodePublishNamespacePayload(r: BufferReader): Draft14Message {
 
 function decodePublishNamespaceOkPayload(r: BufferReader): Draft14Message {
   const request_id = r.readVarInt()
-  const parameters = decodeMessageParams(r)
-  return { type: 'publish_namespace_ok', request_id, parameters }
+  return { type: 'publish_namespace_ok', request_id }
 }
 
 function decodePublishNamespaceErrorPayload(r: BufferReader): Draft14Message {
@@ -908,8 +905,7 @@ function decodeSubscribeNamespacePayload(r: BufferReader): Draft14Message {
 
 function decodeSubscribeNamespaceOkPayload(r: BufferReader): Draft14Message {
   const request_id = r.readVarInt()
-  const parameters = decodeMessageParams(r)
-  return { type: 'subscribe_namespace_ok', request_id, parameters }
+  return { type: 'subscribe_namespace_ok', request_id }
 }
 
 function decodeSubscribeNamespaceErrorPayload(r: BufferReader): Draft14Message {
@@ -931,8 +927,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 +936,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 +951,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 +966,7 @@ function decodeFetchPayload(r: BufferReader): Draft14Message {
       subscriber_priority,
       group_order,
       fetch_type,
-      joining_request_id,
-      joining_start,
+      joining,
       parameters,
     }
   }
@@ -980,7 +974,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 +1007,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 +1042,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

package/src/drafts/draft14/types.ts

@@ -115,8 +115,8 @@ export 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 // uint8
+  readonly group_order: number // uint8
   readonly forward: bigint
   readonly filter_type: bigint
   readonly start_group?: bigint
@@ -130,7 +130,7 @@ export interface Draft14SubscribeOk extends Draft14BaseMessage {
   readonly request_id: bigint
   readonly track_alias: bigint
   readonly expires: bigint
-  readonly group_order: bigint
+  readonly group_order: number // uint8
   readonly content_exists: bigint
   readonly largest_location?: Location
   readonly parameters: Draft14Params
@@ -143,7 +143,7 @@ export interface Draft14SubscribeUpdate extends Draft14BaseMessage {
   readonly start_group: bigint
   readonly start_object: bigint
   readonly end_group: bigint
-  readonly subscriber_priority: bigint
+  readonly subscriber_priority: number // uint8
   readonly forward: bigint
   readonly parameters: Draft14Params
 }
@@ -167,7 +167,7 @@ export interface Draft14Publish extends Draft14BaseMessage {
   readonly track_namespace: string[]
   readonly track_name: string
   readonly track_alias: bigint
-  readonly group_order: bigint
+  readonly group_order: number // uint8
   readonly content_exists: bigint
   readonly largest_location?: Location
   readonly forward: bigint
@@ -178,8 +178,8 @@ export 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 // uint8
+  readonly group_order: number // uint8
   readonly filter_type: bigint
   readonly start_group?: bigint
   readonly start_object?: bigint
@@ -213,7 +213,6 @@ export interface Draft14PublishNamespace extends Draft14BaseMessage {
 export interface Draft14PublishNamespaceOk extends Draft14BaseMessage {
   readonly type: 'publish_namespace_ok'
   readonly request_id: bigint
-  readonly parameters: Draft14Params
 }
 
 export interface Draft14PublishNamespaceError extends Draft14BaseMessage {
@@ -245,7 +244,6 @@ export interface Draft14SubscribeNamespace extends Draft14BaseMessage {
 export interface Draft14SubscribeNamespaceOk extends Draft14BaseMessage {
   readonly type: 'subscribe_namespace_ok'
   readonly request_id: bigint
-  readonly parameters: Draft14Params
 }
 
 export interface Draft14SubscribeNamespaceError extends Draft14BaseMessage {
@@ -261,29 +259,37 @@ export interface Draft14UnsubscribeNamespace extends Draft14BaseMessage {
 }
 
 // Fetch
+export 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
+}
+
+export interface JoiningFetch {
+  readonly joining_request_id: bigint
+  readonly joining_start: bigint
+}
+
 export interface Draft14Fetch extends Draft14BaseMessage {
   readonly type: 'fetch'
   readonly request_id: bigint
-  readonly subscriber_priority: bigint
-  readonly group_order: bigint
+  readonly subscriber_priority: number // uint8
+  readonly group_order: number // uint8
   readonly fetch_type: bigint
-  // Standalone fields (fetch_type=1)
-  readonly track_namespace?: string[]
-  readonly track_name?: string
-  readonly start_group?: bigint
-  readonly start_object?: bigint
-  readonly end_group?: bigint
-  readonly end_object?: bigint
-  // Joining fields (fetch_type=2 or 3)
-  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
 }
 
 export interface Draft14FetchOk extends Draft14BaseMessage {
   readonly type: 'fetch_ok'
   readonly request_id: bigint
-  readonly group_order: bigint
+  readonly group_order: number // uint8
   readonly end_of_track: bigint
   readonly end_location: Location
   readonly parameters: Draft14Params
@@ -307,8 +313,8 @@ export 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 // uint8
+  readonly group_order: number // uint8
   readonly forward: bigint
   readonly filter_type: bigint
   readonly start_group?: bigint
@@ -321,7 +327,7 @@ export interface Draft14TrackStatusOk extends Draft14BaseMessage {
   readonly request_id: bigint
   readonly track_alias: bigint
   readonly expires: bigint
-  readonly group_order: bigint
+  readonly group_order: number // uint8
   readonly content_exists: bigint
   readonly largest_location?: Location
   readonly parameters: Draft14Params

package/src/drafts/draft15/data-streams.ts

@@ -75,19 +75,23 @@ export function encodeDatagram(dg: DatagramObject): Uint8Array {
   w.writeVarInt(dg.trackAlias)
   w.writeVarInt(dg.groupId)
 
-  // Datagram type flags:
+  // Datagram type flags, Table 5:
   // bit 0 (0x01): extensions present
   // bit 1 (0x02): end-of-group
   // bit 2 (0x04): object_id ABSENT when set
+  // bit 3 (0x08): publisher priority ABSENT when set
   // bit 5 (0x20): status (replaces payload)
   const extensionsPresent = (dgType & 0x01) !== 0
   const objectIdAbsent = (dgType & 0x04) !== 0
+  const defaultPriority = (dgType & 0x08) !== 0
   const isStatus = (dgType & 0x20) !== 0
 
   if (!objectIdAbsent) {
     w.writeVarInt(dg.objectId)
   }
-  w.writeUint8(dg.publisherPriority)
+  if (!defaultPriority) {
+    w.writeUint8(dg.publisherPriority)
+  }
 
   if (extensionsPresent) {
     const extData = dg.extensionData ?? new Uint8Array(0)
@@ -141,29 +145,34 @@ export function decodeSubgroupStream(bytes: Uint8Array): DecodeResult<SubgroupSt
     const r = new BufferReader(bytes)
     const streamType = Number(r.readVarInt())
 
-    // Draft-15 valid subgroup types: 0x10-0x17, 0x30-0x37
-    // bit 0: extensions, bit 1: end-of-group, bit 2: explicit subgroup_id
+    // Draft-15 Table 6 assigns 0x10-0x15, 0x18-0x1D, 0x30-0x35 and 0x38-0x3D:
+    // the end-of-group marker at 0x08 doubles the range the previous drafts
+    // used. What the table leaves out is every Type whose two Subgroup ID mode
+    // bits are 0b11. Draft-16 names those reserved in prose; draft-15 only
+    // omits them, which comes to the same refusal by a different route.
     if (
-      !((streamType >= 0x10 && streamType <= 0x17) || (streamType >= 0x30 && streamType <= 0x37))
+      !((streamType >= 0x10 && streamType <= 0x1f) || (streamType >= 0x30 && streamType <= 0x3f)) ||
+      (streamType & 0x06) === 0x06
     ) {
       return {
         ok: false,
         error: new DecodeError(
           'CONSTRAINT_VIOLATION',
-          `Expected subgroup stream type 0x10-0x17/0x30-0x37, got 0x${streamType.toString(16)}`,
+          `Expected subgroup stream type 0x10-0x1F/0x30-0x3F, got 0x${streamType.toString(16)}`,
           0,
         ),
       }
     }
 
     // Decode type flags
-    // Draft-15 bit layout:
-    // bit 0: extensions present
-    // bit 1: end-of-group
-    // bit 2: explicit subgroup_id field present
+    // Draft-15 Table 6, over the 0x10 base:
+    // bit 0 (0x01): extensions present
+    // bit 1 (0x02): subgroup id is the first Object ID, not transmitted
+    // bit 2 (0x04): explicit subgroup_id field present
+    // bit 3 (0x08): contains end of group
     // bit 5 (0x20): no priority (>= 0x30)
     const extensionsPresent = (streamType & 0x01) !== 0
-    const endOfGroup = (streamType & 0x02) !== 0
+    const endOfGroup = (streamType & 0x08) !== 0
     const hasSubgroupField = (streamType & 0x04) !== 0
     const hasPriority = streamType < 0x30
 
@@ -260,10 +269,12 @@ export function decodeDatagram(bytes: Uint8Array): DecodeResult<DatagramObject>
     // bit 0 (0x01): extensions present
     // bit 1 (0x02): end-of-group
     // bit 2 (0x04): object_id ABSENT when set
+    // bit 3 (0x08): publisher priority ABSENT when set
     // bit 5 (0x20): status (replaces payload with status varint)
     const extensionsPresent = (dgType & 0x01) !== 0
     const objectIdAbsent = (dgType & 0x04) !== 0
     const endOfGroup = (dgType & 0x02) !== 0
+    const defaultPriority = (dgType & 0x08) !== 0
     const isStatus = (dgType & 0x20) !== 0
 
     const trackAlias = r.readVarInt()
@@ -272,7 +283,10 @@ export function decodeDatagram(bytes: Uint8Array): DecodeResult<DatagramObject>
     if (!objectIdAbsent) {
       objectId = r.readVarInt()
     }
-    const publisherPriority = r.readUint8()
+    let publisherPriority = 128 // default
+    if (!defaultPriority) {
+      publisherPriority = r.readUint8()
+    }
 
     let extensionData: Uint8Array | undefined
     if (extensionsPresent) {
@@ -531,8 +545,8 @@ export function createSubgroupStreamDecoder(): TransformStream<
 
           if (
             !(
-              (streamType >= 0x10 && streamType <= 0x17) ||
-              (streamType >= 0x30 && streamType <= 0x37)
+              (streamType >= 0x10 && streamType <= 0x1f) ||
+              (streamType >= 0x30 && streamType <= 0x3f)
             )
           ) {
             controller.error(
@@ -760,7 +774,7 @@ export function createDataStreamDecoder(): TransformStream<Uint8Array, DataStrea
         if (offset >= buffer.length) return
         const firstByte = buffer[offset]!
 
-        if ((firstByte >= 0x10 && firstByte <= 0x17) || (firstByte >= 0x30 && firstByte <= 0x37)) {
+        if ((firstByte >= 0x10 && firstByte <= 0x1f) || (firstByte >= 0x30 && firstByte <= 0x3f)) {
           // Subgroup — delegate to subgroup decoder
           // We need to feed the full buffer including the type byte
           const decoder = createSubgroupStreamDecoder()
@@ -796,7 +810,7 @@ export function createDataStreamDecoder(): TransformStream<Uint8Array, DataStrea
       const firstByte = view[0]!
       let result: DecodeResult<Draft15DataStream>
 
-      if ((firstByte >= 0x10 && firstByte <= 0x17) || (firstByte >= 0x30 && firstByte <= 0x37)) {
+      if ((firstByte >= 0x10 && firstByte <= 0x1f) || (firstByte >= 0x30 && firstByte <= 0x3f)) {
         result = decodeSubgroupStream(view)
       } else if (firstByte === 0x05) {
         result = decodeFetchStream(view)