@moqtap/codec 0.6.0 → 0.8.0

package/README.md

@@ -2,7 +2,7 @@
 
 MoQT (Media over QUIC Transport) wire-format codec and session state machine for JavaScript/TypeScript.
 
-- Multi-draft support (drafts 07 through 17)
+- Multi-draft support (drafts 07 through 19)
 - Stateless encode/decode of all MoQT control messages and data streams
 - Protocol session state machine with FSM-based validation per draft
 - Zero runtime dependencies
@@ -43,7 +43,7 @@ Or use the factory if your application supports multiple drafts:
 ```typescript
 import { createCodec, DRAFT_VERSIONS } from '@moqtap/codec'
 
-const codec = createCodec({ draft: '17' }) // '07' through '17'
+const codec = createCodec({ draft: '19' }) // '07' through '19'
 
 // DRAFT_VERSIONS provides wire version numbers under short aliases:
 //   DRAFT_VERSIONS['07'] — 0xff000007n
@@ -67,6 +67,8 @@ Each draft is available as a subpath import with its own codec and session state
 | `@moqtap/codec/draft15`          | Draft-15 codec                                    |
 | `@moqtap/codec/draft16`          | Draft-16 codec                                    |
 | `@moqtap/codec/draft17`          | Draft-17 codec                                    |
+| `@moqtap/codec/draft18`          | Draft-18 codec                                    |
+| `@moqtap/codec/draft19`          | Draft-19 codec                                    |
 | `@moqtap/codec/draft{N}/session` | Session state machine for draft N                 |
 
 > **Note:** A default (versionless) codec will be available once the MoQT specification reaches RFC status. Until then, always specify a draft version.
@@ -80,6 +82,30 @@ import { createDraft17Codec } from '@moqtap/codec/draft17'
 import { createDraft17SessionState } from '@moqtap/codec/draft17/session'
 ```
 
+## Reading Across Drafts
+
+Each draft gets its own message model, because the drafts genuinely differ — a
+track alias travels in SUBSCRIBE through draft-11 and in SUBSCRIBE_OK from
+draft-12; a request is a `subscribe_id` through draft-10 and a `request_id`
+after it. Code that spans drafts can ask for the answer instead of tracking
+where each version keeps it:
+
+```typescript
+import { joiningRequestIdOf, requestIdOf, trackAliasOf, trackOf } from '@moqtap/codec'
+
+const decoded = codec.decodeMessage(bytes)
+if (decoded.ok) {
+  requestIdOf(decoded.value) // bigint, whichever name this draft uses
+  trackAliasOf(decoded.value) // bigint, or undefined if not assigned yet
+  trackOf(decoded.value) // { namespace, name }, or undefined if none is named
+  joiningRequestIdOf(decoded.value) // for a joining FETCH: the request it continues
+}
+```
+
+Each returns `undefined` when the message does not carry the field, including
+when the draft has not assigned it yet — `trackAliasOf` on a draft-14 SUBSCRIBE
+is `undefined` because the publisher chooses the alias in SUBSCRIBE_OK.
+
 ## Session State Machine
 
 Validate protocol message sequences without transport coupling:

package/dist/{chunk-CXFAQKL3.js → chunk-23KRITJ6.js}

@@ -4,7 +4,7 @@ import {
   DecodeError,
   bytesToHex,
   hexToBytes
-} from "./chunk-VOU7PNHI.js";
+} from "./chunk-KLPWJU6W.js";
 
 // src/drafts/draft13/data-streams.ts
 var FETCH_STREAM_TYPE = 0x05n;

package/dist/{chunk-JL3NEW3O.cjs → chunk-4XLYCT5Q.cjs}

@@ -124,6 +124,54 @@ var BufferReader = class {
     return params;
   }
 };
+var MoqtBufferReader = class extends BufferReader {
+  /** Draft-17 omits the 7-byte length; draft-18 restored it. */
+  get allowSevenByte() {
+    return true;
+  }
+  readVarInt() {
+    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 === 255) {
+      if (this.remaining < 9) {
+        throw new DecodeError("UNEXPECTED_END", "Not enough bytes for 9-byte varint", this.pos);
+      }
+      const value2 = this.view.getBigUint64(this.pos + 1);
+      this.pos += 9;
+      return value2;
+    }
+    let leadingOnes = 0;
+    while (leadingOnes < 8 && (first & 128 >> leadingOnes) !== 0) leadingOnes++;
+    const length = leadingOnes + 1;
+    if (length === 7 && !this.allowSevenByte) {
+      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;
+  }
+};
+var Draft17BufferReader = class extends MoqtBufferReader {
+  get allowSevenByte() {
+    return false;
+  }
+};
 
 // src/core/buffer-writer.ts
 var textEncoder = /* @__PURE__ */ new TextEncoder();
@@ -211,6 +259,43 @@ var BufferWriter = class {
     return this.buffer.subarray(0, this.pos);
   }
 };
+var MoqtBufferWriter = class extends BufferWriter {
+  /** Draft-17 omits the 7-byte length; draft-18 restored it. */
+  get allowSevenByte() {
+    return true;
+  }
+  writeVarInt(value) {
+    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, 255);
+      this.view.setBigUint64(this.pos + 1, v);
+      this.pos += 9;
+      return;
+    }
+    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;
+  }
+};
+var Draft17BufferWriter = class extends MoqtBufferWriter {
+  get allowSevenByte() {
+    return false;
+  }
+};
 
 // src/core/hex.ts
 var HEX_TABLE = /* @__PURE__ */ Array.from(
@@ -238,4 +323,8 @@ function hexToBytes(hex) {
 
 
 
-exports.DecodeError = DecodeError; exports.BufferReader = BufferReader; exports.BufferWriter = BufferWriter; exports.bytesToHex = bytesToHex; exports.hexToBytes = hexToBytes;
+
+
+
+
+exports.DecodeError = DecodeError; exports.BufferReader = BufferReader; exports.MoqtBufferReader = MoqtBufferReader; exports.Draft17BufferReader = Draft17BufferReader; exports.BufferWriter = BufferWriter; exports.MoqtBufferWriter = MoqtBufferWriter; exports.Draft17BufferWriter = Draft17BufferWriter; exports.bytesToHex = bytesToHex; exports.hexToBytes = hexToBytes;

package/dist/{chunk-DLSGOZ6P.js → chunk-5XZKO2U5.js}

@@ -1,10 +1,10 @@
 import {
-  BufferReader,
-  BufferWriter,
   DecodeError,
+  MoqtBufferReader,
+  MoqtBufferWriter,
   bytesToHex,
   hexToBytes
-} from "./chunk-VOU7PNHI.js";
+} from "./chunk-KLPWJU6W.js";
 
 // src/drafts/draft18/messages.ts
 var MSG_REQUEST_UPDATE = 0x02n;
@@ -108,7 +108,7 @@ function isValidSubgroupType(streamType) {
   return (streamType & 6) !== 6;
 }
 function encodeSubgroupStream(stream) {
-  const w = new BufferWriter();
+  const w = new MoqtBufferWriter();
   const streamType = stream.headerType;
   w.writeUint8(streamType);
   const propertiesPresent = (streamType & 1) !== 0;
@@ -129,7 +129,7 @@ function encodeSubgroupStream(stream) {
     w.writeVarInt(delta);
     if (propertiesPresent) {
       if (obj.objectProperties && Object.keys(obj.objectProperties).length > 0) {
-        const tmpW = new BufferWriter(32);
+        const tmpW = new MoqtBufferWriter(32);
         encodeObjectProperties(obj.objectProperties, tmpW);
         const raw = tmpW.finish();
         w.writeVarInt(BigInt(raw.byteLength));
@@ -149,7 +149,7 @@ function encodeSubgroupStream(stream) {
   return w.finish();
 }
 function encodeDatagram(dg) {
-  const w = new BufferWriter();
+  const w = new MoqtBufferWriter();
   const dgType = dg.datagramType;
   w.writeUint8(dgType);
   w.writeVarInt(dg.trackAlias);
@@ -166,7 +166,7 @@ function encodeDatagram(dg) {
   }
   if (propertiesPresent) {
     if (dg.objectProperties && Object.keys(dg.objectProperties).length > 0) {
-      const tmpW = new BufferWriter(32);
+      const tmpW = new MoqtBufferWriter(32);
       encodeObjectProperties(dg.objectProperties, tmpW);
       const raw = tmpW.finish();
       w.writeVarInt(BigInt(raw.byteLength));
@@ -183,7 +183,7 @@ function encodeDatagram(dg) {
   return w.finish();
 }
 function encodeFetchStream(stream) {
-  const w = new BufferWriter();
+  const w = new MoqtBufferWriter();
   w.writeVarInt(FETCH_STREAM_TYPE);
   w.writeVarInt(stream.requestId);
   let prevGroupId = 0n;
@@ -205,7 +205,7 @@ function encodeFetchStream(stream) {
       if (flags & 16) w.writeUint8(obj.publisherPriority);
       if (flags & 32) {
         if (obj.objectProperties && Object.keys(obj.objectProperties).length > 0) {
-          const tmpW = new BufferWriter(32);
+          const tmpW = new MoqtBufferWriter(32);
           encodeObjectProperties(obj.objectProperties, tmpW);
           const raw = tmpW.finish();
           w.writeVarInt(BigInt(raw.byteLength));
@@ -229,7 +229,7 @@ function encodeFetchStream(stream) {
       if (flags & 16) w.writeUint8(obj.publisherPriority);
       if (flags & 32) {
         if (obj.objectProperties && Object.keys(obj.objectProperties).length > 0) {
-          const tmpW = new BufferWriter(32);
+          const tmpW = new MoqtBufferWriter(32);
           encodeObjectProperties(obj.objectProperties, tmpW);
           const raw = tmpW.finish();
           w.writeVarInt(BigInt(raw.byteLength));
@@ -252,7 +252,7 @@ function encodeFetchStream(stream) {
 }
 function decodeSubgroupStream(bytes) {
   try {
-    const r = new BufferReader(bytes);
+    const r = new MoqtBufferReader(bytes);
     const streamType = r.readUint8();
     if (!isValidSubgroupType(streamType)) {
       return {
@@ -355,7 +355,7 @@ function decodeSubgroupStream(bytes) {
 }
 function decodeDatagram(bytes) {
   try {
-    const r = new BufferReader(bytes);
+    const r = new MoqtBufferReader(bytes);
     const dgType = r.readUint8();
     const objectIdAbsent = (dgType & 4) !== 0;
     const endOfGroup = (dgType & 2) !== 0;
@@ -411,7 +411,7 @@ function decodeDatagram(bytes) {
 }
 function decodeFetchStream(bytes) {
   try {
-    const r = new BufferReader(bytes);
+    const r = new MoqtBufferReader(bytes);
     const streamType = r.readVarInt();
     if (streamType !== FETCH_STREAM_TYPE) {
       return {
@@ -659,7 +659,7 @@ function createSubgroupStreamDecoder() {
       buffer = newBuffer;
       if (!headerEmitted) {
         try {
-          const r = new BufferReader(buffer.subarray(offset));
+          const r = new MoqtBufferReader(buffer.subarray(offset));
           const streamType = r.readUint8();
           if (!isValidSubgroupType(streamType)) {
             controller.error(
@@ -704,7 +704,7 @@ function createSubgroupStreamDecoder() {
       }
       while (offset < buffer.length) {
         try {
-          const r = new BufferReader(buffer.subarray(offset));
+          const r = new MoqtBufferReader(buffer.subarray(offset));
           const delta = r.readVarInt();
           let objectId;
           if (firstObject) {
@@ -764,7 +764,7 @@ function createFetchStreamDecoder() {
       buffer = newBuffer;
       if (!headerEmitted) {
         try {
-          const r = new BufferReader(buffer.subarray(offset));
+          const r = new MoqtBufferReader(buffer.subarray(offset));
           const streamType = r.readVarInt();
           if (streamType !== FETCH_STREAM_TYPE) {
             controller.error(
@@ -790,7 +790,7 @@ function createFetchStreamDecoder() {
       }
       while (offset < buffer.length) {
         try {
-          const r = new BufferReader(buffer.subarray(offset));
+          const r = new MoqtBufferReader(buffer.subarray(offset));
           const flags = Number(r.readVarInt());
           const objectIdPresent = (flags & 4) !== 0;
           const groupIdPresent = (flags & 8) !== 0;
@@ -939,7 +939,7 @@ function encodeSetupOptions(opts, writer) {
     entries.push({
       type: SETUP_OPT_AUTHORIZATION_TOKEN,
       encode: (w) => {
-        const tmpW = new BufferWriter(64);
+        const tmpW = new MoqtBufferWriter(64);
         encodeAuthorizationToken(opts.authorization_token, tmpW);
         const raw = tmpW.finish();
         w.writeVarInt(BigInt(raw.byteLength));
@@ -981,7 +981,7 @@ function encodeSetupOptions(opts, writer) {
         encode: (w) => {
           if (id % 2n === 0n) {
             const raw = hexToBytes(u.raw_hex);
-            const tmpReader = new BufferReader(raw);
+            const tmpReader = new MoqtBufferReader(raw);
             w.writeVarInt(tmpReader.readVarInt());
           } else {
             const raw = hexToBytes(u.raw_hex);
@@ -1013,7 +1013,7 @@ function decodeSetupOptions(reader, payloadEnd) {
       if (optType === SETUP_OPT_MAX_AUTH_TOKEN_CACHE_SIZE) {
         result.max_auth_token_cache_size = value;
       } else {
-        const tmpWriter = new BufferWriter(16);
+        const tmpWriter = new MoqtBufferWriter(16);
         tmpWriter.writeVarInt(value);
         const raw = tmpWriter.finish();
         unknown.push({
@@ -1028,7 +1028,7 @@ function decodeSetupOptions(reader, payloadEnd) {
       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 = decodeAuthorizationToken(new MoqtBufferReader(bytes));
       } else if (optType === SETUP_OPT_AUTHORITY) {
         result.authority = textDecoder.decode(bytes);
       } else if (optType === SETUP_OPT_MOQT_IMPLEMENTATION) {
@@ -1115,7 +1115,7 @@ function encodeParams(params, writer) {
     entries.push({
       type: PARAM_AUTHORIZATION_TOKEN,
       encode: (w) => {
-        const tmpW = new BufferWriter(64);
+        const tmpW = new MoqtBufferWriter(64);
         encodeAuthorizationToken(params.authorization_token, tmpW);
         const raw = tmpW.finish();
         w.writeVarInt(BigInt(raw.byteLength));
@@ -1145,7 +1145,7 @@ function encodeParams(params, writer) {
     entries.push({
       type: PARAM_LARGEST_OBJECT,
       encode: (w) => {
-        const tmpW = new BufferWriter(16);
+        const tmpW = new MoqtBufferWriter(16);
         tmpW.writeVarInt(params.largest_object.group);
         tmpW.writeVarInt(params.largest_object.object);
         const raw = tmpW.finish();
@@ -1177,7 +1177,7 @@ function encodeParams(params, writer) {
       type: PARAM_SUBSCRIPTION_FILTER,
       encode: (w) => {
         const f = params.subscription_filter;
-        const tmpW = new BufferWriter(32);
+        const tmpW = new MoqtBufferWriter(32);
         tmpW.writeVarInt(f.filter_type);
         if (f.filter_type === 3n || f.filter_type === 4n) {
           tmpW.writeVarInt(f.start_group);
@@ -1208,7 +1208,7 @@ function encodeParams(params, writer) {
     entries.push({
       type: PARAM_TRACK_NAMESPACE_PREFIX,
       encode: (w) => {
-        const tmpW = new BufferWriter(32);
+        const tmpW = new MoqtBufferWriter(32);
         encodeNamespaceTuple(params.track_namespace_prefix, tmpW);
         const raw = tmpW.finish();
         w.writeVarInt(BigInt(raw.byteLength));
@@ -1251,7 +1251,7 @@ function decodeParams(reader) {
     } 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 = decodeAuthorizationToken(new MoqtBufferReader(bytes));
     } else if (paramType === PARAM_RENDEZVOUS_TIMEOUT) {
       result.rendezvous_timeout = reader.readVarInt();
     } else if (paramType === PARAM_SUBGROUP_DELIVERY_TIMEOUT) {
@@ -1294,11 +1294,11 @@ function decodeParams(reader) {
     } else if (paramType === PARAM_TRACK_NAMESPACE_PREFIX) {
       const length = Number(reader.readVarInt());
       const bytes = reader.readBytes(length);
-      result.track_namespace_prefix = decodeNamespaceTuple(new BufferReader(bytes));
+      result.track_namespace_prefix = decodeNamespaceTuple(new MoqtBufferReader(bytes));
     } else {
       if (paramType % 2n === 0n) {
         const value = reader.readVarInt();
-        const tmpWriter = new BufferWriter(16);
+        const tmpWriter = new MoqtBufferWriter(16);
         tmpWriter.writeVarInt(value);
         const raw = tmpWriter.finish();
         unknown.push({
@@ -1383,7 +1383,7 @@ function encodeTrackProperties(props, writer) {
         encode: (w) => {
           if (id % 2n === 0n) {
             const raw = hexToBytes(u.raw_hex);
-            const tmpReader = new BufferReader(raw);
+            const tmpReader = new MoqtBufferReader(raw);
             w.writeVarInt(tmpReader.readVarInt());
           } else {
             const raw = hexToBytes(u.raw_hex);
@@ -1425,7 +1425,7 @@ function decodeTrackProperties(reader, payloadEnd) {
       } else if (propType === TPROP_DYNAMIC_GROUPS) {
         result.dynamic_groups = value;
       } else {
-        const tmpWriter = new BufferWriter(16);
+        const tmpWriter = new MoqtBufferWriter(16);
         tmpWriter.writeVarInt(value);
         const raw = tmpWriter.finish();
         unknown.push({
@@ -1774,13 +1774,13 @@ function encodeMessage(message) {
   if (typeId === void 0) {
     throw new Error(`Unknown message type: ${message.type}`);
   }
-  const payloadWriter = new BufferWriter();
+  const payloadWriter = new MoqtBufferWriter();
   encodePayload(message, payloadWriter);
   const payload = payloadWriter.finishView();
   if (payload.byteLength > 65535) {
     throw new Error(`Payload too large for 16-bit length: ${payload.byteLength}`);
   }
-  const writer = new BufferWriter(payload.byteLength + 16);
+  const writer = new MoqtBufferWriter(payload.byteLength + 16);
   writer.writeVarInt(typeId);
   writer.writeUint8(payload.byteLength >> 8 & 255);
   writer.writeUint8(payload.byteLength & 255);
@@ -1833,13 +1833,13 @@ function encodePayload(msg, w) {
 }
 function decodeMessage(bytes) {
   try {
-    const reader = new BufferReader(bytes);
+    const reader = new MoqtBufferReader(bytes);
     const typeId = reader.readVarInt();
     const lenHi = reader.readUint8();
     const lenLo = reader.readUint8();
     const payloadLength = lenHi << 8 | lenLo;
     const payloadBytes = reader.readBytes(payloadLength);
-    const payloadReader = new BufferReader(payloadBytes);
+    const payloadReader = new MoqtBufferReader(payloadBytes);
     let message;
     if (typeId === MSG_SETUP) {
       message = decodeSetupPayload(payloadReader, payloadLength);