@moqtap/codec 0.6.0 → 0.7.0

package/dist/index.cjs

@@ -1,45 +1,45 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkA33U4WVScjs = require('./chunk-A33U4WVS.cjs');
+var _chunkKTVN4P6Jcjs = require('./chunk-KTVN4P6J.cjs');
 
 
-var _chunkMSG2FXJ2cjs = require('./chunk-MSG2FXJ2.cjs');
+var _chunkMH7537FBcjs = require('./chunk-MH7537FB.cjs');
 
 
-var _chunkJTRU76JNcjs = require('./chunk-JTRU76JN.cjs');
+var _chunkY4FRXYX6cjs = require('./chunk-Y4FRXYX6.cjs');
 
 
-var _chunkWMJVSBBEcjs = require('./chunk-WMJVSBBE.cjs');
+var _chunkJ3ASFPCXcjs = require('./chunk-J3ASFPCX.cjs');
 
 
-var _chunkBAG6YWCPcjs = require('./chunk-BAG6YWCP.cjs');
+var _chunkIEJULBKBcjs = require('./chunk-IEJULBKB.cjs');
 
 
-var _chunkOGZTQA24cjs = require('./chunk-OGZTQA24.cjs');
+var _chunkEQAYMCXOcjs = require('./chunk-EQAYMCXO.cjs');
 
 
-var _chunkPKEOQSSZcjs = require('./chunk-PKEOQSSZ.cjs');
+var _chunkRIIA4ALQcjs = require('./chunk-RIIA4ALQ.cjs');
 
 
-var _chunkHO44OANKcjs = require('./chunk-HO44OANK.cjs');
+var _chunkQGIHC6BAcjs = require('./chunk-QGIHC6BA.cjs');
 
 
-var _chunkJB5VDJ2Vcjs = require('./chunk-JB5VDJ2V.cjs');
+var _chunkB56AG5HUcjs = require('./chunk-B56AG5HU.cjs');
 
 
-var _chunkSIYYMFCCcjs = require('./chunk-SIYYMFCC.cjs');
+var _chunkKCH4BQXKcjs = require('./chunk-KCH4BQXK.cjs');
 
 
-var _chunkHZHSO7EWcjs = require('./chunk-HZHSO7EW.cjs');
+var _chunkIDV2JYJ6cjs = require('./chunk-IDV2JYJ6.cjs');
 
 
-var _chunkXZE5R57Rcjs = require('./chunk-XZE5R57R.cjs');
+var _chunkVZHL2U2Ncjs = require('./chunk-VZHL2U2N.cjs');
 
 
-var _chunk4HBKHNU2cjs = require('./chunk-4HBKHNU2.cjs');
+var _chunkCZNW3R5Ecjs = require('./chunk-CZNW3R5E.cjs');
 
 
-var _chunkJL3NEW3Ocjs = require('./chunk-JL3NEW3O.cjs');
+var _chunk4XLYCT5Qcjs = require('./chunk-4XLYCT5Q.cjs');
 
 // src/index.ts
 var DRAFT_VERSIONS = {
@@ -67,31 +67,31 @@ Supported draft values: ${Object.keys(DRAFT_VERSIONS).join(", ")}`
   }
   switch (options.draft) {
     case "07":
-      return _chunkHZHSO7EWcjs.createDraft07Codec.call(void 0, );
+      return _chunkIDV2JYJ6cjs.createDraft07Codec.call(void 0, );
     case "08":
-      return _chunkXZE5R57Rcjs.createDraft08Codec.call(void 0, );
+      return _chunkVZHL2U2Ncjs.createDraft08Codec.call(void 0, );
     case "09":
-      return _chunk4HBKHNU2cjs.createDraft09Codec.call(void 0, );
+      return _chunkCZNW3R5Ecjs.createDraft09Codec.call(void 0, );
     case "10":
-      return _chunkPKEOQSSZcjs.createDraft10Codec.call(void 0, );
+      return _chunkRIIA4ALQcjs.createDraft10Codec.call(void 0, );
     case "11":
-      return _chunkHO44OANKcjs.createDraft11Codec.call(void 0, );
+      return _chunkQGIHC6BAcjs.createDraft11Codec.call(void 0, );
     case "12":
-      return _chunkJB5VDJ2Vcjs.createDraft12Codec.call(void 0, );
+      return _chunkB56AG5HUcjs.createDraft12Codec.call(void 0, );
     case "13":
-      return _chunkSIYYMFCCcjs.createDraft13Codec.call(void 0, );
+      return _chunkKCH4BQXKcjs.createDraft13Codec.call(void 0, );
     case "14":
-      return _chunkJTRU76JNcjs.createDraft14Codec.call(void 0, );
+      return _chunkY4FRXYX6cjs.createDraft14Codec.call(void 0, );
     case "15":
-      return _chunkWMJVSBBEcjs.createDraft15Codec.call(void 0, );
+      return _chunkJ3ASFPCXcjs.createDraft15Codec.call(void 0, );
     case "16":
-      return _chunkBAG6YWCPcjs.createDraft16Codec.call(void 0, );
+      return _chunkIEJULBKBcjs.createDraft16Codec.call(void 0, );
     case "17":
-      return _chunkOGZTQA24cjs.createDraft17Codec.call(void 0, );
+      return _chunkEQAYMCXOcjs.createDraft17Codec.call(void 0, );
     case "18":
-      return _chunkA33U4WVScjs.createDraft18Codec.call(void 0, );
+      return _chunkKTVN4P6Jcjs.createDraft18Codec.call(void 0, );
     case "19":
-      return _chunkMSG2FXJ2cjs.createDraft19Codec.call(void 0, );
+      return _chunkMH7537FBcjs.createDraft19Codec.call(void 0, );
     default:
       throw new Error(`Unsupported draft: ${draft}`);
   }
@@ -100,4 +100,4 @@ Supported draft values: ${Object.keys(DRAFT_VERSIONS).join(", ")}`
 
 
 
-exports.DRAFT_VERSIONS = DRAFT_VERSIONS; exports.DecodeError = _chunkJL3NEW3Ocjs.DecodeError; exports.createCodec = createCodec;
+exports.DRAFT_VERSIONS = DRAFT_VERSIONS; exports.DecodeError = _chunk4XLYCT5Qcjs.DecodeError; exports.createCodec = createCodec;

package/dist/index.js

@@ -1,45 +1,45 @@
 import {
   createDraft18Codec
-} from "./chunk-DLSGOZ6P.js";
+} from "./chunk-5XZKO2U5.js";
 import {
   createDraft19Codec
-} from "./chunk-62LYLROG.js";
+} from "./chunk-APTV6F72.js";
 import {
   createDraft14Codec
-} from "./chunk-Q5D6OW6Q.js";
+} from "./chunk-DORX55MO.js";
 import {
   createDraft15Codec
-} from "./chunk-RZ3UML47.js";
+} from "./chunk-MD2OA7SE.js";
 import {
   createDraft16Codec
-} from "./chunk-HYI6LFMD.js";
+} from "./chunk-HEO2JG6C.js";
 import {
   createDraft17Codec
-} from "./chunk-UP4XPH4J.js";
+} from "./chunk-I55J3KXD.js";
 import {
   createDraft10Codec
-} from "./chunk-SHMA4PBY.js";
+} from "./chunk-N2V7Z37J.js";
 import {
   createDraft11Codec
-} from "./chunk-COWGGUL4.js";
+} from "./chunk-JKMYAUGY.js";
 import {
   createDraft12Codec
-} from "./chunk-NZ7GYEMT.js";
+} from "./chunk-KNLPX3YA.js";
 import {
   createDraft13Codec
-} from "./chunk-CXFAQKL3.js";
+} from "./chunk-23KRITJ6.js";
 import {
   createDraft07Codec
-} from "./chunk-7KBAWOBA.js";
+} from "./chunk-KYVTM5VI.js";
 import {
   createDraft08Codec
-} from "./chunk-RW4UG7CN.js";
+} from "./chunk-XHAP2YST.js";
 import {
   createDraft09Codec
-} from "./chunk-Y6KCSM3V.js";
+} from "./chunk-IJAF6PAY.js";
 import {
   DecodeError
-} from "./chunk-VOU7PNHI.js";
+} from "./chunk-KLPWJU6W.js";
 
 // src/index.ts
 var DRAFT_VERSIONS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moqtap/codec",
-  "version": "0.6.0",
+  "version": "0.7.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/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/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 {

package/src/drafts/draft19/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/draft19/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 {