@moqtap/codec 0.5.0 → 0.7.0

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/core/types.ts

@@ -12,6 +12,7 @@ export type Draft =
   | '16'
   | '17'
   | '18'
+  | '19'
 
 // Base codec interface — draft-specific codecs extend this
 export interface BaseCodec<M> {

package/src/drafts/draft17/codec.ts

@@ -1,5 +1,5 @@
-import { BufferReader } from '../../core/buffer-reader.js'
-import { BufferWriter } from '../../core/buffer-writer.js'
+import { Draft17BufferReader as BufferReader } from '../../core/buffer-reader.js'
+import { Draft17BufferWriter as BufferWriter } from '../../core/buffer-writer.js'
 import { bytesToHex, hexToBytes } from '../../core/hex.js'
 import type { BaseCodec, DecodeResult } from '../../core/types.js'
 import { DecodeError } from '../../core/types.js'

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

@@ -1,5 +1,5 @@
-import { BufferReader } from '../../core/buffer-reader.js'
-import { BufferWriter } from '../../core/buffer-writer.js'
+import { Draft17BufferReader as BufferReader } from '../../core/buffer-reader.js'
+import { Draft17BufferWriter as BufferWriter } from '../../core/buffer-writer.js'
 import type { DecodeResult } from '../../core/types.js'
 import { DecodeError } from '../../core/types.js'
 import type {

package/src/drafts/draft18/codec.ts

@@ -1,5 +1,5 @@
-import { BufferReader } from '../../core/buffer-reader.js'
-import { BufferWriter } from '../../core/buffer-writer.js'
+import { MoqtBufferReader as BufferReader } from '../../core/buffer-reader.js'
+import { MoqtBufferWriter as BufferWriter } from '../../core/buffer-writer.js'
 import { bytesToHex, hexToBytes } from '../../core/hex.js'
 import type { BaseCodec, DecodeResult } from '../../core/types.js'
 import { DecodeError } from '../../core/types.js'

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

@@ -1,5 +1,5 @@
-import { BufferReader } from '../../core/buffer-reader.js'
-import { BufferWriter } from '../../core/buffer-writer.js'
+import { MoqtBufferReader as BufferReader } from '../../core/buffer-reader.js'
+import { MoqtBufferWriter as BufferWriter } from '../../core/buffer-writer.js'
 import type { DecodeResult } from '../../core/types.js'
 import { DecodeError } from '../../core/types.js'
 import type {