@moqtap/codec 0.9.0 → 0.11.0

package/dist/{chunk-MAXEHYVB.cjs → chunk-BNIUVOCJ.cjs}

@@ -1,10 +1,13 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } var _class;
 
 
 
 
 
-var _chunk4XLYCT5Qcjs = require('./chunk-4XLYCT5Q.cjs');
+
+
+
+var _chunk5IMHJIAZcjs = require('./chunk-5IMHJIAZ.cjs');
 
 // src/drafts/draft20/messages.ts
 var MSG_REQUEST_UPDATE = 0x02n;
@@ -147,7 +150,7 @@ function datagramTypeFlagsError(typeFlags) {
 var OBJECT_STATUS_NORMAL = 0n;
 var MAX_U64 = 0xffffffffffffffffn;
 function encodeSubgroupStream(stream) {
-  const w = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)();
+  const w = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)();
   const streamType = stream.headerType;
   w.writeVarInt(BigInt(streamType));
   const propertiesPresent = (streamType & 1) !== 0;
@@ -168,7 +171,7 @@ function encodeSubgroupStream(stream) {
     w.writeVarInt(delta);
     if (propertiesPresent) {
       if (obj.objectProperties && Object.keys(obj.objectProperties).length > 0) {
-        const tmpW = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(32);
+        const tmpW = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(32);
         encodeObjectProperties(obj.objectProperties, tmpW);
         const raw = tmpW.finish();
         w.writeVarInt(BigInt(raw.byteLength));
@@ -188,7 +191,7 @@ function encodeSubgroupStream(stream) {
   return w.finish();
 }
 function encodeDatagram(dg) {
-  const w = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)();
+  const w = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)();
   const dgType = dg.datagramType;
   w.writeVarInt(BigInt(dgType));
   w.writeVarInt(dg.trackAlias);
@@ -205,7 +208,7 @@ function encodeDatagram(dg) {
   }
   if (propertiesPresent) {
     if (dg.objectProperties && Object.keys(dg.objectProperties).length > 0) {
-      const tmpW = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(32);
+      const tmpW = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(32);
       encodeObjectProperties(dg.objectProperties, tmpW);
       const raw = tmpW.finish();
       w.writeVarInt(BigInt(raw.byteLength));
@@ -222,7 +225,7 @@ function encodeDatagram(dg) {
   return w.finish();
 }
 function encodeFetchStream(stream) {
-  const w = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)();
+  const w = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)();
   w.writeVarInt(FETCH_STREAM_TYPE);
   w.writeVarInt(stream.requestId);
   let prevGroupId = 0n;
@@ -245,7 +248,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 (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(32);
+          const tmpW = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(32);
           encodeObjectProperties(obj.objectProperties, tmpW);
           const raw = tmpW.finish();
           w.writeVarInt(BigInt(raw.byteLength));
@@ -269,7 +272,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 (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(32);
+          const tmpW = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(32);
           encodeObjectProperties(obj.objectProperties, tmpW);
           const raw = tmpW.finish();
           w.writeVarInt(BigInt(raw.byteLength));
@@ -298,116 +301,128 @@ function resolveObjectId(groupIdPresent, delta, prevObjectId) {
 function resolveGroupId(first, delta, prevGroupId, offset) {
   const groupId = first ? delta : prevGroupId + delta + 1n;
   if (groupId > MAX_U64) {
-    throw new (0, _chunk4XLYCT5Qcjs.DecodeError)("CONSTRAINT_VIOLATION", "computed Group ID exceeds 2^64 - 1", offset);
+    throw new (0, _chunk5IMHJIAZcjs.DecodeError)("CONSTRAINT_VIOLATION", "computed Group ID exceeds 2^64 - 1", offset);
   }
   return groupId;
 }
+function readSubgroupHeader(r) {
+  const typeFlags = r.readVarInt();
+  const flagsError = subgroupTypeFlagsError(typeFlags);
+  if (flagsError !== null) {
+    throw new (0, _chunk5IMHJIAZcjs.DecodeError)("CONSTRAINT_VIOLATION", flagsError, 0);
+  }
+  const streamType = Number(typeFlags);
+  const propertiesPresent = (streamType & 1) !== 0;
+  const subgroupMode = (streamType & 6) >> 1;
+  const hasSubgroupField = subgroupMode === 2;
+  const subgroupIsFirstObjId = subgroupMode === 1;
+  const endOfGroup = (streamType & 8) !== 0;
+  const hasPriority = (streamType & 32) === 0;
+  const firstObjectFlag = (streamType & 64) !== 0;
+  const trackAlias = r.readVarInt();
+  const groupId = r.readVarInt();
+  let subgroupId = 0n;
+  if (hasSubgroupField) {
+    subgroupId = r.readVarInt();
+  }
+  let publisherPriority = 128;
+  if (hasPriority) {
+    publisherPriority = r.readUint8();
+  }
+  return {
+    streamType,
+    propertiesPresent,
+    subgroupIsFirstObjId,
+    endOfGroup,
+    firstObjectFlag,
+    trackAlias,
+    groupId,
+    subgroupId,
+    publisherPriority
+  };
+}
+function readSubgroupObject(r, propertiesPresent, isFirst, prevObjectId, base) {
+  const byteOffset = base + r.offset;
+  const delta = r.readVarInt();
+  const objectId = isFirst ? delta : prevObjectId + 1n + delta;
+  const extensionData = new Uint8Array(0);
+  let objectProperties;
+  if (propertiesPresent) {
+    const propsLen = Number(r.readVarInt());
+    if (propsLen > 0) {
+      objectProperties = decodeObjectProperties(r, propsLen);
+    }
+  }
+  const payloadLength = Number(r.readVarInt());
+  let payload;
+  let status;
+  let payloadByteOffset;
+  if (payloadLength === 0) {
+    status = r.readVarInt();
+    payloadByteOffset = base + r.offset;
+    payload = new Uint8Array(0);
+  } else {
+    payloadByteOffset = base + r.offset;
+    payload = r.readBytesView(payloadLength);
+  }
+  const obj = {
+    type: "object",
+    byteOffset,
+    payloadByteOffset,
+    objectId,
+    objectIdDelta: delta,
+    payloadLength,
+    payload,
+    extensionData
+  };
+  if (status !== void 0) obj.status = status;
+  if (objectProperties !== void 0)
+    obj.objectProperties = objectProperties;
+  return obj;
+}
 function decodeSubgroupStream(bytes) {
   try {
-    const r = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(bytes);
-    const typeFlags = r.readVarInt();
-    const flagsError = subgroupTypeFlagsError(typeFlags);
-    if (flagsError !== null) {
-      return { ok: false, error: new (0, _chunk4XLYCT5Qcjs.DecodeError)("CONSTRAINT_VIOLATION", flagsError, 0) };
-    }
-    const streamType = Number(typeFlags);
-    const propertiesPresent = (streamType & 1) !== 0;
-    const subgroupMode = (streamType & 6) >> 1;
-    const hasSubgroupField = subgroupMode === 2;
-    const subgroupIsFirstObjId = subgroupMode === 1;
-    const endOfGroup = (streamType & 8) !== 0;
-    const hasPriority = (streamType & 32) === 0;
-    const firstObject = (streamType & 64) !== 0;
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    let subgroupId = 0n;
-    if (hasSubgroupField) {
-      subgroupId = r.readVarInt();
-    }
-    let publisherPriority = 128;
-    if (hasPriority) {
-      publisherPriority = r.readUint8();
-    }
+    const r = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(bytes);
+    const h = readSubgroupHeader(r);
     const objects = [];
     let prevObjectId = -1n;
     let isFirst = true;
+    let subgroupId = h.subgroupId;
     while (r.remaining > 0) {
-      const byteOffset = r.offset;
-      const delta = r.readVarInt();
-      let objectId;
-      if (isFirst) {
-        objectId = delta;
-        if (subgroupIsFirstObjId) {
-          subgroupId = objectId;
-        }
-        isFirst = false;
-      } else {
-        objectId = prevObjectId + 1n + delta;
-      }
-      const extensionData = new Uint8Array(0);
-      let objectProperties;
-      if (propertiesPresent) {
-        const propsLen = Number(r.readVarInt());
-        if (propsLen > 0) {
-          objectProperties = decodeObjectProperties(r, propsLen);
-        }
-      }
-      const payloadLength = Number(r.readVarInt());
-      let payload;
-      let status;
-      let payloadByteOffset;
-      if (payloadLength === 0) {
-        status = r.readVarInt();
-        payloadByteOffset = r.offset;
-        payload = new Uint8Array(0);
-      } else {
-        payloadByteOffset = r.offset;
-        payload = r.readBytesView(payloadLength);
-      }
-      const obj = {
-        type: "object",
-        byteOffset,
-        payloadByteOffset,
-        objectId,
-        objectIdDelta: delta,
-        payloadLength,
-        payload,
-        extensionData
-      };
-      if (status !== void 0) obj.status = status;
-      if (objectProperties !== void 0)
-        obj.objectProperties = objectProperties;
+      const obj = readSubgroupObject(r, h.propertiesPresent, isFirst, prevObjectId, 0);
+      if (isFirst && h.subgroupIsFirstObjId) subgroupId = obj.objectId;
+      isFirst = false;
       objects.push(obj);
-      prevObjectId = objectId;
+      prevObjectId = obj.objectId;
     }
     const result = {
       type: "subgroup",
-      headerType: streamType,
-      trackAlias,
-      groupId,
+      headerType: h.streamType,
+      trackAlias: h.trackAlias,
+      groupId: h.groupId,
       subgroupId,
-      publisherPriority,
-      objects
+      publisherPriority: h.publisherPriority,
+      objects,
+      ...h.endOfGroup ? { endOfGroup: true } : {},
+      ...h.firstObjectFlag ? { firstObject: true } : {}
     };
-    if (endOfGroup) result.endOfGroup = true;
-    if (firstObject) result.firstObject = true;
     return {
       ok: true,
       value: result,
       bytesRead: r.offset
     };
   } catch (e) {
-    if (e instanceof _chunk4XLYCT5Qcjs.DecodeError) return { ok: false, error: e };
+    if (e instanceof _chunk5IMHJIAZcjs.DecodeError) return { ok: false, error: e };
     throw e;
   }
 }
 function decodeDatagram(bytes) {
   try {
-    const r = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(bytes);
+    const r = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(bytes);
     const typeFlags = r.readVarInt();
     const flagsError = datagramTypeFlagsError(typeFlags);
     if (flagsError !== null) {
-      return { ok: false, error: new (0, _chunk4XLYCT5Qcjs.DecodeError)("CONSTRAINT_VIOLATION", flagsError, 0) };
+      return { ok: false, error: new (0, _chunk5IMHJIAZcjs.DecodeError)("CONSTRAINT_VIOLATION", flagsError, 0) };
     }
     const dgType = Number(typeFlags);
     const objectIdAbsent = (dgType & 4) !== 0;
@@ -431,7 +446,7 @@ function decodeDatagram(bytes) {
       if (propsLen === 0) {
         return {
           ok: false,
-          error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+          error: new (0, _chunk5IMHJIAZcjs.DecodeError)(
             "CONSTRAINT_VIOLATION",
             "a datagram with the PROPERTIES bit set must carry a non-empty Properties structure",
             r.offset
@@ -447,7 +462,7 @@ function decodeDatagram(bytes) {
       if (propertiesPresent && objectStatus !== OBJECT_STATUS_NORMAL) {
         return {
           ok: false,
-          error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+          error: new (0, _chunk5IMHJIAZcjs.DecodeError)(
             "CONSTRAINT_VIOLATION",
             `only a Normal (0x0) Object may carry Properties, got status 0x${objectStatus.toString(16)}`,
             r.offset
@@ -457,7 +472,7 @@ function decodeDatagram(bytes) {
       if (r.remaining > 0) {
         return {
           ok: false,
-          error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+          error: new (0, _chunk5IMHJIAZcjs.DecodeError)(
             "CONSTRAINT_VIOLATION",
             `a status datagram must not carry a payload (${r.remaining} trailing byte(s))`,
             r.offset
@@ -486,18 +501,207 @@ function decodeDatagram(bytes) {
       result.objectProperties = objectProperties;
     return { ok: true, value: result, bytesRead: r.offset };
   } catch (e) {
-    if (e instanceof _chunk4XLYCT5Qcjs.DecodeError) return { ok: false, error: e };
+    if (e instanceof _chunk5IMHJIAZcjs.DecodeError) return { ok: false, error: e };
     throw e;
   }
 }
+function newFetchObjectState() {
+  return { prevGroupId: 0n, prevSubgroupId: 0n, prevObjectId: 0n, prevPriority: 128, first: true };
+}
+function readFetchObject(r, base, st) {
+  const byteOffset = base + r.offset;
+  const flags = Number(r.readVarInt());
+  let groupId = st.prevGroupId;
+  let subgroupId = st.prevSubgroupId;
+  let objectId = st.prevObjectId + 1n;
+  let payloadLength;
+  let payload;
+  let payloadByteOffset;
+  const extensionData = new Uint8Array(0);
+  if (flags >= 128) {
+    if (!FETCH_END_OF_RANGE_MARKERS.has(flags)) {
+      throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
+        "CONSTRAINT_VIOLATION",
+        `0x${flags.toString(16)} is neither a flag combination below 128 nor one of the three End of Range markers`,
+        r.offset
+      );
+    }
+    const groupDelta2 = r.readVarInt();
+    groupId = resolveGroupId(st.first, groupDelta2, st.prevGroupId, r.offset);
+    const objectDelta2 = r.readVarInt();
+    objectId = objectDelta2;
+    payloadLength = Number(r.readVarInt());
+    payloadByteOffset = base + r.offset;
+    payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
+    const marker = {
+      type: "object",
+      byteOffset,
+      payloadByteOffset,
+      serializationFlags: flags,
+      groupId,
+      groupIdDelta: groupDelta2,
+      // A marker has no Subgroup ID or Priority of its own — Section
+      // 11.4.4.2 says neither field is present. The interface requires
+      // both, so they carry the last actual Object's values, which is also
+      // what a following Object that references "the prior Object" gets.
+      subgroupId: st.prevSubgroupId,
+      objectId,
+      objectIdDelta: objectDelta2,
+      publisherPriority: st.prevPriority,
+      payloadLength,
+      payload,
+      extensionData
+    };
+    st.prevGroupId = groupId;
+    st.prevObjectId = objectId;
+    st.first = false;
+    return marker;
+  }
+  if (flags & 64) {
+    const objectIdPresent2 = (flags & 4) !== 0;
+    const groupIdPresent2 = (flags & 8) !== 0;
+    const priorityPresent2 = (flags & 16) !== 0;
+    const propsPresent2 = (flags & 32) !== 0;
+    let groupDelta2;
+    if (groupIdPresent2) {
+      groupDelta2 = r.readVarInt();
+      groupId = resolveGroupId(st.first, groupDelta2, st.prevGroupId, r.offset);
+    }
+    let objectDelta2;
+    if (objectIdPresent2) {
+      objectDelta2 = r.readVarInt();
+      objectId = resolveObjectId(groupIdPresent2, objectDelta2, st.prevObjectId);
+    }
+    if (objectId > MAX_U64) {
+      throw new (0, _chunk5IMHJIAZcjs.DecodeError)("CONSTRAINT_VIOLATION", "computed Object ID exceeds 2^64 - 1", r.offset);
+    }
+    if (priorityPresent2) {
+      st.prevPriority = r.readUint8();
+    }
+    let objectProperties2;
+    if (propsPresent2) {
+      const propsLen = Number(r.readVarInt());
+      if (propsLen > 0) {
+        objectProperties2 = decodeObjectProperties(r, propsLen);
+      }
+    }
+    payloadLength = Number(r.readVarInt());
+    payloadByteOffset = base + r.offset;
+    payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
+    const obj2 = {
+      type: "object",
+      byteOffset,
+      payloadByteOffset,
+      serializationFlags: flags,
+      groupId,
+      subgroupId: 0n,
+      objectId,
+      publisherPriority: st.prevPriority,
+      payloadLength,
+      payload,
+      extensionData
+    };
+    if (groupDelta2 !== void 0)
+      obj2.groupIdDelta = groupDelta2;
+    if (objectDelta2 !== void 0)
+      obj2.objectIdDelta = objectDelta2;
+    if (objectProperties2)
+      obj2.objectProperties = objectProperties2;
+    st.prevGroupId = groupId;
+    st.prevObjectId = objectId;
+    st.first = false;
+    return obj2;
+  }
+  const subgroupEncoding = flags & 3;
+  const objectIdPresent = (flags & 4) !== 0;
+  const groupIdPresent = (flags & 8) !== 0;
+  const priorityPresent = (flags & 16) !== 0;
+  const propsPresent = (flags & 32) !== 0;
+  let groupDelta;
+  if (groupIdPresent) {
+    groupDelta = r.readVarInt();
+    groupId = resolveGroupId(st.first, groupDelta, st.prevGroupId, r.offset);
+  } else if (st.first) {
+    throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
+      "CONSTRAINT_VIOLATION",
+      "First fetch object must include groupId",
+      r.offset
+    );
+  }
+  if (subgroupEncoding === 0) {
+    subgroupId = 0n;
+  } else if (subgroupEncoding === 1 || subgroupEncoding === 2) {
+    if (st.first) {
+      throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
+        "CONSTRAINT_VIOLATION",
+        "First fetch object cannot reference prior subgroupId",
+        r.offset
+      );
+    }
+    subgroupId = subgroupEncoding === 1 ? st.prevSubgroupId : st.prevSubgroupId + 1n;
+  } else {
+    subgroupId = r.readVarInt();
+  }
+  let objectDelta;
+  if (objectIdPresent) {
+    objectDelta = r.readVarInt();
+    objectId = resolveObjectId(groupIdPresent, objectDelta, st.prevObjectId);
+  } else if (st.first) {
+    throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
+      "CONSTRAINT_VIOLATION",
+      "First fetch object must include objectId",
+      r.offset
+    );
+  }
+  if (objectId > MAX_U64) {
+    throw new (0, _chunk5IMHJIAZcjs.DecodeError)("CONSTRAINT_VIOLATION", "computed Object ID exceeds 2^64 - 1", r.offset);
+  }
+  if (priorityPresent) {
+    st.prevPriority = r.readUint8();
+  }
+  let objectProperties;
+  if (propsPresent) {
+    const propsLen = Number(r.readVarInt());
+    if (propsLen > 0) {
+      objectProperties = decodeObjectProperties(r, propsLen);
+    }
+  }
+  payloadLength = Number(r.readVarInt());
+  payloadByteOffset = base + r.offset;
+  payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
+  const obj = {
+    type: "object",
+    byteOffset,
+    payloadByteOffset,
+    serializationFlags: flags,
+    groupId,
+    subgroupId,
+    objectId,
+    publisherPriority: st.prevPriority,
+    payloadLength,
+    payload,
+    extensionData
+  };
+  if (groupDelta !== void 0)
+    obj.groupIdDelta = groupDelta;
+  if (objectDelta !== void 0)
+    obj.objectIdDelta = objectDelta;
+  if (objectProperties)
+    obj.objectProperties = objectProperties;
+  st.prevGroupId = groupId;
+  st.prevSubgroupId = subgroupId;
+  st.prevObjectId = objectId;
+  st.first = false;
+  return obj;
+}
 function decodeFetchStream(bytes) {
   try {
-    const r = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(bytes);
+    const r = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(bytes);
     const streamType = r.readVarInt();
     if (streamType !== FETCH_STREAM_TYPE) {
       return {
         ok: false,
-        error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+        error: new (0, _chunk5IMHJIAZcjs.DecodeError)(
           "CONSTRAINT_VIOLATION",
           `Expected fetch stream type 0x05, got 0x${streamType.toString(16)}`,
           0
@@ -506,224 +710,9 @@ function decodeFetchStream(bytes) {
     }
     const requestId = r.readVarInt();
     const objects = [];
-    let prevGroupId = 0n;
-    let prevSubgroupId = 0n;
-    let prevObjectId = 0n;
-    let prevPriority = 128;
-    let first = true;
+    const st = newFetchObjectState();
     while (r.remaining > 0) {
-      const byteOffset = r.offset;
-      const flags = Number(r.readVarInt());
-      let groupId = prevGroupId;
-      let subgroupId = prevSubgroupId;
-      let objectId = prevObjectId + 1n;
-      let payloadLength;
-      let payload;
-      let payloadByteOffset;
-      const extensionData = new Uint8Array(0);
-      if (flags >= 128) {
-        if (!FETCH_END_OF_RANGE_MARKERS.has(flags)) {
-          return {
-            ok: false,
-            error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
-              "CONSTRAINT_VIOLATION",
-              `0x${flags.toString(16)} is neither a flag combination below 128 nor one of the three End of Range markers`,
-              r.offset
-            )
-          };
-        }
-        const groupDelta2 = r.readVarInt();
-        groupId = resolveGroupId(first, groupDelta2, prevGroupId, r.offset);
-        const objectDelta2 = r.readVarInt();
-        objectId = objectDelta2;
-        payloadLength = Number(r.readVarInt());
-        payloadByteOffset = r.offset;
-        payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
-        const marker = {
-          type: "object",
-          byteOffset,
-          payloadByteOffset,
-          serializationFlags: flags,
-          groupId,
-          groupIdDelta: groupDelta2,
-          // A marker has no Subgroup ID or Priority of its own — Section
-          // 11.4.4.2 says neither field is present. The interface requires
-          // both, so they carry the last actual Object's values, which is also
-          // what a following Object that references "the prior Object" gets.
-          subgroupId: prevSubgroupId,
-          objectId,
-          objectIdDelta: objectDelta2,
-          publisherPriority: prevPriority,
-          payloadLength,
-          payload,
-          extensionData
-        };
-        objects.push(marker);
-        prevGroupId = groupId;
-        prevObjectId = objectId;
-        first = false;
-        continue;
-      }
-      if (flags & 64) {
-        const objectIdPresent2 = (flags & 4) !== 0;
-        const groupIdPresent2 = (flags & 8) !== 0;
-        const priorityPresent2 = (flags & 16) !== 0;
-        const propsPresent2 = (flags & 32) !== 0;
-        let groupDelta2;
-        if (groupIdPresent2) {
-          groupDelta2 = r.readVarInt();
-          groupId = resolveGroupId(first, groupDelta2, prevGroupId, r.offset);
-        }
-        let objectDelta2;
-        if (objectIdPresent2) {
-          objectDelta2 = r.readVarInt();
-          objectId = resolveObjectId(groupIdPresent2, objectDelta2, prevObjectId);
-        }
-        if (objectId > MAX_U64) {
-          return {
-            ok: false,
-            error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
-              "CONSTRAINT_VIOLATION",
-              "computed Object ID exceeds 2^64 - 1",
-              r.offset
-            )
-          };
-        }
-        if (priorityPresent2) {
-          prevPriority = r.readUint8();
-        }
-        let objectProperties2;
-        if (propsPresent2) {
-          const propsLen = Number(r.readVarInt());
-          if (propsLen > 0) {
-            objectProperties2 = decodeObjectProperties(r, propsLen);
-          }
-        }
-        payloadLength = Number(r.readVarInt());
-        payloadByteOffset = r.offset;
-        payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
-        const obj2 = {
-          type: "object",
-          byteOffset,
-          payloadByteOffset,
-          serializationFlags: flags,
-          groupId,
-          subgroupId: 0n,
-          objectId,
-          publisherPriority: prevPriority,
-          payloadLength,
-          payload,
-          extensionData
-        };
-        if (groupDelta2 !== void 0)
-          obj2.groupIdDelta = groupDelta2;
-        if (objectDelta2 !== void 0)
-          obj2.objectIdDelta = objectDelta2;
-        if (objectProperties2)
-          obj2.objectProperties = objectProperties2;
-        objects.push(obj2);
-        prevGroupId = groupId;
-        prevObjectId = objectId;
-        first = false;
-        continue;
-      }
-      const subgroupEncoding = flags & 3;
-      const objectIdPresent = (flags & 4) !== 0;
-      const groupIdPresent = (flags & 8) !== 0;
-      const priorityPresent = (flags & 16) !== 0;
-      const propsPresent = (flags & 32) !== 0;
-      let groupDelta;
-      if (groupIdPresent) {
-        groupDelta = r.readVarInt();
-        groupId = resolveGroupId(first, groupDelta, prevGroupId, r.offset);
-      } else if (first) {
-        return {
-          ok: false,
-          error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
-            "CONSTRAINT_VIOLATION",
-            "First fetch object must include groupId",
-            r.offset
-          )
-        };
-      }
-      if (subgroupEncoding === 0) {
-        subgroupId = 0n;
-      } else if (subgroupEncoding === 1 || subgroupEncoding === 2) {
-        if (first) {
-          return {
-            ok: false,
-            error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
-              "CONSTRAINT_VIOLATION",
-              "First fetch object cannot reference prior subgroupId",
-              r.offset
-            )
-          };
-        }
-        subgroupId = subgroupEncoding === 1 ? prevSubgroupId : prevSubgroupId + 1n;
-      } else {
-        subgroupId = r.readVarInt();
-      }
-      let objectDelta;
-      if (objectIdPresent) {
-        objectDelta = r.readVarInt();
-        objectId = resolveObjectId(groupIdPresent, objectDelta, prevObjectId);
-      } else if (first) {
-        return {
-          ok: false,
-          error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
-            "CONSTRAINT_VIOLATION",
-            "First fetch object must include objectId",
-            r.offset
-          )
-        };
-      }
-      if (objectId > MAX_U64) {
-        return {
-          ok: false,
-          error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
-            "CONSTRAINT_VIOLATION",
-            "computed Object ID exceeds 2^64 - 1",
-            r.offset
-          )
-        };
-      }
-      if (priorityPresent) {
-        prevPriority = r.readUint8();
-      }
-      let objectProperties;
-      if (propsPresent) {
-        const propsLen = Number(r.readVarInt());
-        if (propsLen > 0) {
-          objectProperties = decodeObjectProperties(r, propsLen);
-        }
-      }
-      payloadLength = Number(r.readVarInt());
-      payloadByteOffset = r.offset;
-      payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
-      const obj = {
-        type: "object",
-        byteOffset,
-        payloadByteOffset,
-        serializationFlags: flags,
-        groupId,
-        subgroupId,
-        objectId,
-        publisherPriority: prevPriority,
-        payloadLength,
-        payload,
-        extensionData
-      };
-      if (groupDelta !== void 0)
-        obj.groupIdDelta = groupDelta;
-      if (objectDelta !== void 0)
-        obj.objectIdDelta = objectDelta;
-      if (objectProperties)
-        obj.objectProperties = objectProperties;
-      objects.push(obj);
-      prevGroupId = groupId;
-      prevSubgroupId = subgroupId;
-      prevObjectId = objectId;
-      first = false;
+      objects.push(readFetchObject(r, 0, st));
     }
     return {
       ok: true,
@@ -731,7 +720,7 @@ function decodeFetchStream(bytes) {
       bytesRead: r.offset
     };
   } catch (e) {
-    if (e instanceof _chunk4XLYCT5Qcjs.DecodeError) return { ok: false, error: e };
+    if (e instanceof _chunk5IMHJIAZcjs.DecodeError) return { ok: false, error: e };
     throw e;
   }
 }
@@ -749,132 +738,125 @@ function decodeDataStream(streamType, bytes) {
     }
   }
 }
+var StreamBuffer = (_class = class {constructor() { _class.prototype.__init.call(this);_class.prototype.__init2.call(this);_class.prototype.__init3.call(this);_class.prototype.__init4.call(this); }
+  __init() {this.buf = new Uint8Array(0)}
+  /** Bytes written into `buf`. */
+  __init2() {this.len = 0}
+  /** Consumed prefix of `buf`; `base + offset` is the position in the stream. */
+  __init3() {this.offset = 0}
+  /** Absolute position of `buf[0]` within the stream. */
+  __init4() {this.base = 0}
+  get unread() {
+    return this.len - this.offset;
+  }
+  append(chunk) {
+    if (this.len + chunk.length > this.buf.length) {
+      const live = this.len - this.offset;
+      const needed = live + chunk.length;
+      let cap = Math.max(4096, this.buf.length);
+      while (cap < needed * 2) cap *= 2;
+      const next = new Uint8Array(cap);
+      next.set(this.buf.subarray(this.offset, this.len), 0);
+      this.buf = next;
+      this.base += this.offset;
+      this.len = live;
+      this.offset = 0;
+    }
+    this.buf.set(chunk, this.len);
+    this.len += chunk.length;
+  }
+  /**
+   * The written bytes, for a reader positioned at `offset`. Bounded by `len`
+   * rather than by capacity, so `BufferReader.remaining` counts real bytes and
+   * not the spare room after them.
+   */
+  written() {
+    return this.buf.subarray(0, this.len);
+  }
+}, _class);
 function createSubgroupStreamDecoder() {
-  let buffer = new Uint8Array(0);
-  let offset = 0;
+  const b = new StreamBuffer();
+  let header = null;
   let headerEmitted = false;
   let prevObjectId = -1n;
-  let firstObject = true;
-  let _propertiesPresent = false;
+  let isFirst = true;
+  function emitHeader(controller, h, subgroupId) {
+    controller.enqueue({
+      type: "subgroup_header",
+      headerType: h.streamType,
+      trackAlias: h.trackAlias,
+      groupId: h.groupId,
+      subgroupId,
+      publisherPriority: h.publisherPriority,
+      ...h.endOfGroup ? { endOfGroup: true } : {},
+      ...h.firstObjectFlag ? { firstObject: true } : {}
+    });
+    headerEmitted = true;
+  }
   return new TransformStream({
     transform(chunk, controller) {
-      if (offset > 0) {
-        buffer = buffer.subarray(offset);
-        offset = 0;
-      }
-      const newBuffer = new Uint8Array(buffer.length + chunk.length);
-      newBuffer.set(buffer, 0);
-      newBuffer.set(chunk, buffer.length);
-      buffer = newBuffer;
-      if (!headerEmitted) {
+      b.append(chunk);
+      const view = b.written();
+      if (header === null) {
         try {
-          const r = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(buffer.subarray(offset));
-          const typeFlags = r.readVarInt();
-          const flagsError = subgroupTypeFlagsError(typeFlags);
-          if (flagsError !== null) {
-            controller.error(new (0, _chunk4XLYCT5Qcjs.DecodeError)("CONSTRAINT_VIOLATION", flagsError, 0));
-            return;
-          }
-          const streamType = Number(typeFlags);
-          _propertiesPresent = (streamType & 1) !== 0;
-          const subgroupMode = (streamType & 6) >> 1;
-          const hasSubgroupField = subgroupMode === 2;
-          const hasPriority = (streamType & 32) === 0;
-          const trackAlias = r.readVarInt();
-          const groupId = r.readVarInt();
-          let subgroupId = 0n;
-          if (hasSubgroupField) {
-            subgroupId = r.readVarInt();
-          }
-          let publisherPriority = 128;
-          if (hasPriority) {
-            publisherPriority = r.readUint8();
-          }
-          controller.enqueue({
-            type: "subgroup_header",
-            trackAlias,
-            groupId,
-            subgroupId,
-            publisherPriority
-          });
-          headerEmitted = true;
-          offset += r.offset;
+          const hr = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(view, b.offset);
+          header = readSubgroupHeader(hr);
+          b.offset = hr.offset;
         } catch (e) {
-          if (e instanceof _chunk4XLYCT5Qcjs.DecodeError && e.code === "UNEXPECTED_END") {
+          if (e instanceof _chunk5IMHJIAZcjs.DecodeError && e.code === "UNEXPECTED_END") {
             return;
           }
           controller.error(e);
           return;
         }
+        if (!header.subgroupIsFirstObjId) emitHeader(controller, header, header.subgroupId);
       }
-      while (offset < buffer.length) {
+      const h = header;
+      if (h === null) return;
+      const r = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(view, b.offset);
+      while (r.remaining > 0) {
+        const start = r.offset;
+        let obj;
         try {
-          const r = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(buffer.subarray(offset));
-          const delta = r.readVarInt();
-          let objectId;
-          if (firstObject) {
-            objectId = delta;
-            firstObject = false;
-          } else {
-            objectId = prevObjectId + 1n + delta;
-          }
-          let extensionData = new Uint8Array(0);
-          if (_propertiesPresent) {
-            const extLen = Number(r.readVarInt());
-            extensionData = extLen > 0 ? r.readBytesView(extLen) : new Uint8Array(0);
-          }
-          const payloadLength = Number(r.readVarInt());
-          const payloadByteOffset = r.offset;
-          const payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
-          controller.enqueue({
-            type: "object",
-            objectId,
-            objectIdDelta: delta,
-            payloadLength,
-            payload,
-            extensionData,
-            byteOffset: 0,
-            payloadByteOffset
-          });
-          offset += r.offset;
-          prevObjectId = objectId;
+          obj = readSubgroupObject(r, h.propertiesPresent, isFirst, prevObjectId, b.base);
         } catch (e) {
-          if (e instanceof _chunk4XLYCT5Qcjs.DecodeError && e.code === "UNEXPECTED_END") {
-            break;
+          if (e instanceof _chunk5IMHJIAZcjs.DecodeError && e.code === "UNEXPECTED_END") {
+            b.offset = start;
+            return;
           }
           controller.error(e);
           return;
         }
+        if (!headerEmitted) emitHeader(controller, h, obj.objectId);
+        isFirst = false;
+        b.offset = r.offset;
+        prevObjectId = obj.objectId;
+        controller.enqueue(obj);
       }
     },
     flush(controller) {
-      if (offset < buffer.length) {
-        controller.error(new (0, _chunk4XLYCT5Qcjs.DecodeError)("UNEXPECTED_END", "Stream ended with incomplete data", 0));
+      if (header !== null && !headerEmitted) emitHeader(controller, header, 0n);
+      if (b.unread > 0) {
+        controller.error(new (0, _chunk5IMHJIAZcjs.DecodeError)("UNEXPECTED_END", "Stream ended with incomplete data", 0));
       }
     }
   });
 }
 function createFetchStreamDecoder() {
-  let buffer = new Uint8Array(0);
-  let offset = 0;
+  const b = new StreamBuffer();
   let headerEmitted = false;
+  const st = newFetchObjectState();
   return new TransformStream({
     transform(chunk, controller) {
-      if (offset > 0) {
-        buffer = buffer.subarray(offset);
-        offset = 0;
-      }
-      const newBuffer = new Uint8Array(buffer.length + chunk.length);
-      newBuffer.set(buffer, 0);
-      newBuffer.set(chunk, buffer.length);
-      buffer = newBuffer;
+      b.append(chunk);
+      const view = b.written();
       if (!headerEmitted) {
         try {
-          const r = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(buffer.subarray(offset));
-          const streamType = r.readVarInt();
+          const r2 = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(view, b.offset);
+          const streamType = r2.readVarInt();
           if (streamType !== FETCH_STREAM_TYPE) {
             controller.error(
-              new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+              new (0, _chunk5IMHJIAZcjs.DecodeError)(
                 "CONSTRAINT_VIOLATION",
                 `Expected fetch stream type 0x05, got 0x${streamType.toString(16)}`,
                 0
@@ -882,149 +864,96 @@ function createFetchStreamDecoder() {
             );
             return;
           }
-          const requestId = r.readVarInt();
+          const requestId = r2.readVarInt();
           controller.enqueue({ type: "fetch_header", requestId });
           headerEmitted = true;
-          offset += r.offset;
+          b.offset = r2.offset;
         } catch (e) {
-          if (e instanceof _chunk4XLYCT5Qcjs.DecodeError && e.code === "UNEXPECTED_END") {
+          if (e instanceof _chunk5IMHJIAZcjs.DecodeError && e.code === "UNEXPECTED_END") {
             return;
           }
           controller.error(e);
           return;
         }
       }
-      while (offset < buffer.length) {
+      const r = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(view, b.offset);
+      while (r.remaining > 0) {
+        const start = r.offset;
+        let obj;
         try {
-          const r = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(buffer.subarray(offset));
-          const flags = Number(r.readVarInt());
-          if (flags >= 128) {
-            if (!FETCH_END_OF_RANGE_MARKERS.has(flags)) {
-              controller.error(
-                new (0, _chunk4XLYCT5Qcjs.DecodeError)(
-                  "CONSTRAINT_VIOLATION",
-                  `0x${flags.toString(16)} is neither a flag combination below 128 nor one of the three End of Range markers`,
-                  0
-                )
-              );
-              return;
-            }
-            r.readVarInt();
-            const objectDelta = r.readVarInt();
-            const markerPayloadLength = Number(r.readVarInt());
-            const markerPayloadByteOffset = r.offset;
-            controller.enqueue({
-              type: "object",
-              objectId: objectDelta,
-              objectIdDelta: objectDelta,
-              payloadLength: markerPayloadLength,
-              payload: new Uint8Array(0),
-              extensionData: new Uint8Array(0),
-              byteOffset: 0,
-              payloadByteOffset: markerPayloadByteOffset
-            });
-            offset += r.offset;
-            continue;
-          }
-          const objectIdPresent = (flags & 4) !== 0;
-          const groupIdPresent = (flags & 8) !== 0;
-          const priorityPresent = (flags & 16) !== 0;
-          const extensionsPresent = (flags & 32) !== 0;
-          const subgroupEncoding = flags & 3;
-          const datagramMode = (flags & 64) !== 0;
-          if (groupIdPresent) r.readVarInt();
-          if (!datagramMode && subgroupEncoding === 3) r.readVarInt();
-          let objectId = 0n;
-          let objectIdDelta;
-          if (objectIdPresent) {
-            objectIdDelta = r.readVarInt();
-            objectId = objectIdDelta;
-          }
-          if (priorityPresent) r.readUint8();
-          let extensionData = new Uint8Array(0);
-          if (extensionsPresent) {
-            const extLen = Number(r.readVarInt());
-            extensionData = extLen > 0 ? r.readBytesView(extLen) : new Uint8Array(0);
-          }
-          const payloadLength = Number(r.readVarInt());
-          const payloadByteOffset = r.offset;
-          const payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
-          const event = {
-            type: "object",
-            objectId,
-            payloadLength,
-            payload,
-            extensionData,
-            byteOffset: 0,
-            payloadByteOffset
-          };
-          if (objectIdDelta !== void 0)
-            event.objectIdDelta = objectIdDelta;
-          controller.enqueue(event);
-          offset += r.offset;
+          obj = readFetchObject(r, b.base, st);
         } catch (e) {
-          if (e instanceof _chunk4XLYCT5Qcjs.DecodeError && e.code === "UNEXPECTED_END") {
-            break;
+          if (e instanceof _chunk5IMHJIAZcjs.DecodeError && e.code === "UNEXPECTED_END") {
+            b.offset = start;
+            return;
           }
           controller.error(e);
           return;
         }
+        b.offset = r.offset;
+        controller.enqueue(obj);
       }
     },
     flush(controller) {
-      if (offset < buffer.length) {
-        controller.error(new (0, _chunk4XLYCT5Qcjs.DecodeError)("UNEXPECTED_END", "Stream ended with incomplete data", 0));
+      if (b.unread > 0) {
+        controller.error(new (0, _chunk5IMHJIAZcjs.DecodeError)("UNEXPECTED_END", "Stream ended with incomplete data", 0));
       }
     }
   });
 }
 function createDataStreamDecoder() {
-  let buffer = new Uint8Array(0);
-  let offset = 0;
-  let inner = null;
-  return new TransformStream({
-    transform(chunk, controller) {
-      if (offset > 0) {
-        buffer = buffer.subarray(offset);
-        offset = 0;
-      }
-      const newBuffer = new Uint8Array(buffer.length + chunk.length);
-      newBuffer.set(buffer, 0);
-      newBuffer.set(chunk, buffer.length);
-      buffer = newBuffer;
-      if (inner === null) {
-        if (offset >= buffer.length) return;
-        const firstByte = buffer[offset];
-        if (isValidSubgroupType(firstByte)) {
-          const decoder = createSubgroupStreamDecoder();
-          inner = decoder;
-        } else if (firstByte === 5) {
-          const decoder = createFetchStreamDecoder();
-          inner = decoder;
-        } else {
-          controller.error(
-            new (0, _chunk4XLYCT5Qcjs.DecodeError)(
-              "CONSTRAINT_VIOLATION",
-              `Unknown data stream type: 0x${firstByte.toString(16)}`,
-              0
-            )
-          );
-          return;
+  let writer = null;
+  let pump = Promise.resolve();
+  let broken = false;
+  function attach(inner, controller) {
+    writer = inner.writable.getWriter();
+    const reader = inner.readable.getReader();
+    pump = (async () => {
+      try {
+        for (; ; ) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          controller.enqueue(value);
+        }
+      } catch (e) {
+        if (!broken) {
+          broken = true;
+          controller.error(e);
         }
       }
-    },
-    flush(controller) {
-      if (offset >= buffer.length) return;
-      const view = buffer.subarray(offset);
-      const firstByte = view[0];
-      let result;
+    })();
+  }
+  async function feed(bytes) {
+    if (writer === null || broken || bytes.length === 0) return;
+    try {
+      await writer.write(bytes);
+    } catch (e2) {
+      broken = true;
+    }
+  }
+  return new TransformStream({
+    async transform(chunk, controller) {
+      if (broken) return;
+      if (writer !== null) {
+        await feed(chunk);
+        return;
+      }
+      if (chunk.length === 0) return;
+      const firstByte = chunk[0];
       if (isValidSubgroupType(firstByte)) {
-        result = decodeSubgroupStream(view);
+        attach(
+          createSubgroupStreamDecoder(),
+          controller
+        );
       } else if (firstByte === 5) {
-        result = decodeFetchStream(view);
+        attach(
+          createFetchStreamDecoder(),
+          controller
+        );
       } else {
+        broken = true;
         controller.error(
-          new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+          new (0, _chunk5IMHJIAZcjs.DecodeError)(
             "CONSTRAINT_VIOLATION",
             `Unknown data stream type: 0x${firstByte.toString(16)}`,
             0
@@ -1032,31 +961,15 @@ function createDataStreamDecoder() {
         );
         return;
       }
-      if (!result.ok) {
-        controller.error(result.error);
-        return;
-      }
-      const stream = result.value;
-      if (stream.type === "subgroup") {
-        controller.enqueue({
-          type: "subgroup_header",
-          trackAlias: stream.trackAlias,
-          groupId: stream.groupId,
-          subgroupId: stream.subgroupId,
-          publisherPriority: stream.publisherPriority
-        });
-        for (const obj of stream.objects) {
-          controller.enqueue(obj);
-        }
-      } else if (stream.type === "fetch") {
-        controller.enqueue({
-          type: "fetch_header",
-          requestId: stream.requestId
-        });
-        for (const obj of stream.objects) {
-          controller.enqueue(obj);
-        }
+      await feed(chunk);
+    },
+    async flush() {
+      if (writer === null) return;
+      try {
+        await writer.close();
+      } catch (e3) {
       }
+      await pump;
     }
   });
 }
@@ -1079,12 +992,12 @@ function encodeSetupOptions(opts, writer) {
       }
     });
   }
-  if (opts.authorization_token !== void 0) {
+  for (const token of _nullishCoalesce(opts.authorization_token, () => ( []))) {
     entries.push({
       type: SETUP_OPT_AUTHORIZATION_TOKEN,
       encode: (w) => {
-        const tmpW = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(64);
-        encodeAuthorizationToken(opts.authorization_token, tmpW);
+        const tmpW = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(64);
+        encodeAuthorizationToken(token, tmpW);
         const raw = tmpW.finish();
         w.writeVarInt(BigInt(raw.byteLength));
         w.writeBytes(raw);
@@ -1136,11 +1049,11 @@ function encodeSetupOptions(opts, writer) {
         type: id,
         encode: (w) => {
           if (id % 2n === 0n) {
-            const raw = _chunk4XLYCT5Qcjs.hexToBytes.call(void 0, u.raw_hex);
-            const tmpReader = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(raw);
+            const raw = _chunk5IMHJIAZcjs.hexToBytes.call(void 0, u.raw_hex);
+            const tmpReader = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(raw);
             w.writeVarInt(tmpReader.readVarInt());
           } else {
-            const raw = _chunk4XLYCT5Qcjs.hexToBytes.call(void 0, u.raw_hex);
+            const raw = _chunk5IMHJIAZcjs.hexToBytes.call(void 0, u.raw_hex);
             w.writeVarInt(BigInt(raw.byteLength));
             w.writeBytes(raw);
           }
@@ -1173,13 +1086,13 @@ function decodeSetupOptions(reader, payloadEnd) {
       } else if (optType === SETUP_OPT_MAX_REQUEST_UPDATES) {
         result.max_request_updates = value;
       } else {
-        const tmpWriter = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(16);
+        const tmpWriter = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(16);
         tmpWriter.writeVarInt(value);
         const raw = tmpWriter.finish();
         unknown.push({
           id: `0x${optType.toString(16)}`,
           length: raw.byteLength,
-          raw_hex: _chunk4XLYCT5Qcjs.bytesToHex.call(void 0, raw)
+          raw_hex: _chunk5IMHJIAZcjs.bytesToHex.call(void 0, raw)
         });
       }
     } else {
@@ -1188,7 +1101,9 @@ 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 (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(bytes));
+        const token = decodeAuthorizationToken(new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(bytes));
+        noteAuthTokenValue(reader.offset - length, length, token);
+        result.authorization_token = [..._nullishCoalesce(result.authorization_token, () => ( [])), token];
       } else if (optType === SETUP_OPT_AUTHORITY) {
         result.authority = textDecoder.decode(bytes);
       } else if (optType === SETUP_OPT_MOQT_IMPLEMENTATION) {
@@ -1197,7 +1112,7 @@ function decodeSetupOptions(reader, payloadEnd) {
         unknown.push({
           id: `0x${optType.toString(16)}`,
           length,
-          raw_hex: _chunk4XLYCT5Qcjs.bytesToHex.call(void 0, bytes)
+          raw_hex: _chunk5IMHJIAZcjs.bytesToHex.call(void 0, bytes)
         });
       }
     }
@@ -1217,6 +1132,11 @@ function encodeAuthorizationToken(token, w) {
     w.writeBytes(tv);
   }
 }
+function noteAuthTokenValue(valueStart, valueLength, token) {
+  const value = token.token_value;
+  if (value === void 0 || value.byteLength === 0) return;
+  _chunk5IMHJIAZcjs.recordAuthValueSpan.call(void 0, valueStart + valueLength - value.byteLength, value.byteLength);
+}
 function decodeAuthorizationToken(r) {
   const alias_type = r.readVarInt();
   const aliasType = Number(alias_type);
@@ -1276,7 +1196,7 @@ function encodeRangeFilter(filter, hasProperty, w) {
     w.writeVarInt(0n);
     return;
   }
-  const tmpW = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(32);
+  const tmpW = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(32);
   tmpW.writeUint8(Number(_nullishCoalesce(filter.set_id, () => ( 0n))));
   if (hasProperty) {
     tmpW.writeVarInt(_nullishCoalesce(filter.property_type, () => ( 0n)));
@@ -1323,7 +1243,7 @@ function encodeLocationFilter(f, w) {
     w.writeVarInt(0n);
     return;
   }
-  const tmpW = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(48);
+  const tmpW = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(48);
   if (f.start_group !== void 0) tmpW.writeVarInt(f.start_group);
   if (f.start_object !== void 0) tmpW.writeVarInt(f.start_object);
   if (f.end_group_delta !== void 0) tmpW.writeVarInt(f.end_group_delta);
@@ -1338,14 +1258,14 @@ function decodeLocationFilter(reader) {
   if (length === 0) {
     return { removed: true };
   }
-  const r = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(valueBytes);
+  const r = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(valueBytes);
   const fields = [];
   while (r.remaining > 0) {
     let value;
     try {
       value = r.readVarInt();
-    } catch (e2) {
-      throw new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+    } catch (e4) {
+      throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
         "CONSTRAINT_VIOLATION",
         "a LOCATION_FILTER field must not extend past the parameter's Length",
         reader.offset
@@ -1353,7 +1273,7 @@ function decodeLocationFilter(reader) {
     }
     fields.push(value);
     if (fields.length > 4) {
-      throw new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+      throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
         "CONSTRAINT_VIOLATION",
         "a LOCATION_FILTER value may hold at most four vi64 fields",
         reader.offset
@@ -1367,7 +1287,7 @@ function decodeLocationFilter(reader) {
   if (fields.length >= 4) filter.end_object = fields[3];
   if (filter.start_group !== void 0 && filter.end_group_delta !== void 0) {
     if (filter.start_group + filter.end_group_delta > MAX_U642) {
-      throw new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+      throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
         "CONSTRAINT_VIOLATION",
         "StartGroup + EndGroupDelta exceeds 2^64 - 1",
         reader.offset
@@ -1399,24 +1319,24 @@ var PARAMETER_SCOPE = /* @__PURE__ */ new Map([
   [PARAM_SUBGROUP_DELIVERY_TIMEOUT, /* @__PURE__ */ new Set(["subscribe", "publish", "request_update"])],
   // 0x08 EXPIRES (10.2.16) — the one parameter that still names PUBLISH_OK.
   [PARAM_EXPIRES, /* @__PURE__ */ new Set(["subscribe_ok", "publish", "request_ok"])],
-  // 0x09 LARGEST_OBJECT (10.2.17) — gained PUBLISH_STATE_NOTIFY in draft-20.
+  // 0x09 LARGEST_OBJECT (10.2.17) — PUBLISH_STATE_NOTIFY here; draft-19 (10.2.16) omits it.
   [
     PARAM_LARGEST_OBJECT,
     /* @__PURE__ */ new Set(["subscribe_ok", "publish", "request_ok", "publish_state_notify"])
   ],
   // 0x0A FILL_TIMEOUT (10.2.5) — FETCH, or nested inside FILL_PARAMETERS.
   [PARAM_FILL_TIMEOUT, /* @__PURE__ */ new Set(["fetch", FILL_SCOPE])],
-  // 0x10 FORWARD (10.2.18) — lost PUBLISH_OK, gained PUBLISH_STATE_NOTIFY.
+  // 0x10 FORWARD (10.2.18) — PUBLISH_STATE_NOTIFY here where draft-19 (10.2.17) lists PUBLISH_OK.
   [
     PARAM_FORWARD,
     /* @__PURE__ */ new Set(["subscribe", "request_update", "publish", "subscribe_tracks", "publish_state_notify"])
   ],
-  // 0x20 SUBSCRIBER_PRIORITY (10.2.7) — lost PUBLISH_OK, gained PUBLISH.
+  // 0x20 SUBSCRIBER_PRIORITY (10.2.7) — PUBLISH here where draft-19 lists PUBLISH_OK.
   [
     PARAM_SUBSCRIBER_PRIORITY,
     /* @__PURE__ */ new Set(["subscribe", "publish", "fetch", "request_update", FILL_SCOPE])
   ],
-  // 0x21 LOCATION_FILTER (10.2.9) — lost PUBLISH_OK, gained PUBLISH and PUBLISH_STATE_NOTIFY.
+  // 0x21 LOCATION_FILTER (10.2.9) — PUBLISH and PUBLISH_STATE_NOTIFY here where draft-19 lists PUBLISH_OK.
   [
     PARAM_LOCATION_FILTER,
     /* @__PURE__ */ new Set([
@@ -1428,12 +1348,12 @@ var PARAMETER_SCOPE = /* @__PURE__ */ new Map([
       FILL_SCOPE
     ])
   ],
-  // 0x22 GROUP_ORDER (10.2.8) — gained PUBLISH and FILL_PARAMETERS nesting.
+  // 0x22 GROUP_ORDER (10.2.8) — PUBLISH and FILL_PARAMETERS nesting here; draft-19 has neither.
   [PARAM_GROUP_ORDER, /* @__PURE__ */ new Set(["subscribe", "publish", "subscribe_tracks", "fetch", FILL_SCOPE])],
   // 0x23 FILL_PARAMETERS (10.2.15) — NEW. Subscriptions only, and never nested
   // in itself: a FETCH already is a fetch, so it has nothing to fill.
   [PARAM_FILL_PARAMETERS, /* @__PURE__ */ new Set(["subscribe", "request_update"])],
-  // 0x25-0x28 range filters (5.1.4) — lost PUBLISH_OK, gained FILL_PARAMETERS nesting.
+  // 0x25-0x28 range filters (5.1.4) — permitted inside FILL_PARAMETERS (Table 6).
   [
     PARAM_SUBGROUP_FILTER,
     /* @__PURE__ */ new Set(["fetch", "subscribe", "subscribe_tracks", "request_update", FILL_SCOPE])
@@ -1450,11 +1370,11 @@ var PARAMETER_SCOPE = /* @__PURE__ */ new Map([
     PARAM_OBJECT_PROPERTY_FILTER,
     /* @__PURE__ */ new Set(["fetch", "subscribe", "subscribe_tracks", "request_update", FILL_SCOPE])
   ],
-  // 0x29 TRACK_PROPERTY_FILTER (10.2.14) — lost PUBLISH_OK; NOT permitted
-  // inside FILL_PARAMETERS. A relay forwarding a downstream FILL_PARAMETERS
-  // upstream has to strip it rather than trip this rule.
+  // 0x29 TRACK_PROPERTY_FILTER (10.2.14) — NOT permitted inside
+  // FILL_PARAMETERS: Table 6 omits it. A relay forwarding a downstream
+  // FILL_PARAMETERS upstream has to strip it rather than trip this rule.
   [PARAM_TRACK_PROPERTY_FILTER, /* @__PURE__ */ new Set(["subscribe_tracks", "request_update"])],
-  // 0x32 NEW_GROUP_REQUEST (10.2.19) — lost PUBLISH_OK.
+  // 0x32 NEW_GROUP_REQUEST (10.2.19) — draft-19 (10.2.18) also lists PUBLISH_OK.
   [PARAM_NEW_GROUP_REQUEST, /* @__PURE__ */ new Set(["subscribe", "request_update"])],
   // 0x34 TRACK_NAMESPACE_PREFIX (10.2.20) — REQUEST_UPDATE for a namespace subscription.
   [PARAM_TRACK_NAMESPACE_PREFIX, /* @__PURE__ */ new Set(["request_update"])],
@@ -1469,12 +1389,12 @@ function encodeParams(params, writer) {
       encode: (w) => w.writeVarInt(params.object_delivery_timeout)
     });
   }
-  if (params.authorization_token !== void 0) {
+  for (const token of _nullishCoalesce(params.authorization_token, () => ( []))) {
     entries.push({
       type: PARAM_AUTHORIZATION_TOKEN,
       encode: (w) => {
-        const tmpW = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(64);
-        encodeAuthorizationToken(params.authorization_token, tmpW);
+        const tmpW = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(64);
+        encodeAuthorizationToken(token, tmpW);
         const raw = tmpW.finish();
         w.writeVarInt(BigInt(raw.byteLength));
         w.writeBytes(raw);
@@ -1546,7 +1466,7 @@ function encodeParams(params, writer) {
     entries.push({
       type: PARAM_FILL_PARAMETERS,
       encode: (w) => {
-        const tmpW = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(64);
+        const tmpW = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(64);
         encodeParams(params.fill_parameters, tmpW);
         const raw = tmpW.finish();
         w.writeVarInt(BigInt(raw.byteLength));
@@ -1554,34 +1474,34 @@ function encodeParams(params, writer) {
       }
     });
   }
-  if (params.subgroup_filter !== void 0) {
+  for (const filter of _nullishCoalesce(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 !== void 0) {
+  for (const filter of _nullishCoalesce(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 !== void 0) {
+  for (const filter of _nullishCoalesce(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 !== void 0) {
+  for (const filter of _nullishCoalesce(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 !== void 0) {
+  for (const filter of _nullishCoalesce(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 !== void 0) {
@@ -1614,7 +1534,7 @@ function encodeParams(params, writer) {
       entries.push({
         type: id,
         encode: (w) => {
-          const raw = _chunk4XLYCT5Qcjs.hexToBytes.call(void 0, u.raw_hex);
+          const raw = _chunk5IMHJIAZcjs.hexToBytes.call(void 0, u.raw_hex);
           w.writeBytes(raw);
         }
       });
@@ -1639,7 +1559,7 @@ function decodeParams(reader, messageType) {
     prevType = paramType;
     const scope = PARAMETER_SCOPE.get(paramType);
     if (scope !== void 0 && !scope.has(messageType)) {
-      throw new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+      throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
         "CONSTRAINT_VIOLATION",
         `Message Parameter 0x${paramType.toString(16)} may not appear in ${messageType}`,
         reader.offset
@@ -1650,7 +1570,9 @@ function decodeParams(reader, messageType) {
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
       const length = Number(reader.readVarInt());
       const bytes = reader.readBytes(length);
-      result.authorization_token = decodeAuthorizationToken(new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(bytes));
+      const token = decodeAuthorizationToken(new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(bytes));
+      noteAuthTokenValue(reader.offset - length, length, token);
+      result.authorization_token = [..._nullishCoalesce(result.authorization_token, () => ( [])), token];
     } else if (paramType === PARAM_RENDEZVOUS_TIMEOUT) {
       result.rendezvous_timeout = reader.readVarInt();
     } else if (paramType === PARAM_SUBGROUP_DELIVERY_TIMEOUT) {
@@ -1674,15 +1596,21 @@ function decodeParams(reader, messageType) {
     } else if (paramType === PARAM_FILL_PARAMETERS) {
       result.fill_parameters = decodeFillParameters(reader);
     } else if (paramType === PARAM_SUBGROUP_FILTER) {
-      result.subgroup_filter = decodeRangeFilter(reader, false);
+      result.subgroup_filter = [..._nullishCoalesce(result.subgroup_filter, () => ( [])), decodeRangeFilter(reader, false)];
     } else if (paramType === PARAM_OBJECTID_FILTER) {
-      result.objectid_filter = decodeRangeFilter(reader, false);
+      result.objectid_filter = [..._nullishCoalesce(result.objectid_filter, () => ( [])), decodeRangeFilter(reader, false)];
     } else if (paramType === PARAM_PRIORITY_FILTER) {
-      result.priority_filter = decodeRangeFilter(reader, false);
+      result.priority_filter = [..._nullishCoalesce(result.priority_filter, () => ( [])), decodeRangeFilter(reader, false)];
     } else if (paramType === PARAM_OBJECT_PROPERTY_FILTER) {
-      result.object_property_filter = decodeRangeFilter(reader, true);
+      result.object_property_filter = [
+        ..._nullishCoalesce(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 = [
+        ..._nullishCoalesce(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) {
@@ -1690,7 +1618,7 @@ function decodeParams(reader, messageType) {
     } else if (paramType === PARAM_INCLUDE_PROPERTIES) {
       const value = BigInt(reader.readUint8());
       if (value !== 0n && value !== 1n) {
-        throw new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+        throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
           "CONSTRAINT_VIOLATION",
           `INCLUDE_PROPERTIES accepts only 0 or 1, got ${value}`,
           reader.offset
@@ -1698,7 +1626,7 @@ function decodeParams(reader, messageType) {
       }
       result.include_properties = value;
     } else {
-      throw new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+      throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
         "INVALID_PARAMETER",
         `Unknown Message Parameter type 0x${paramType.toString(16)}`,
         reader.offset
@@ -1710,10 +1638,10 @@ function decodeParams(reader, messageType) {
 function decodeFillParameters(reader) {
   const length = Number(reader.readVarInt());
   const valueBytes = reader.readBytes(length);
-  const nested = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(valueBytes);
-  const params = decodeParams(nested, FILL_SCOPE);
+  const nested = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(valueBytes);
+  const params = _chunk5IMHJIAZcjs.withoutAuthValueSpans.call(void 0, () => decodeParams(nested, FILL_SCOPE));
   if (nested.remaining > 0) {
-    throw new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+    throw new (0, _chunk5IMHJIAZcjs.DecodeError)(
       "CONSTRAINT_VIOLATION",
       `FILL_PARAMETERS has ${nested.remaining} trailing byte(s) after its parameter block`,
       reader.offset
@@ -1783,11 +1711,11 @@ function encodeTrackProperties(props, writer) {
         type: id,
         encode: (w) => {
           if (id % 2n === 0n) {
-            const raw = _chunk4XLYCT5Qcjs.hexToBytes.call(void 0, u.raw_hex);
-            const tmpReader = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(raw);
+            const raw = _chunk5IMHJIAZcjs.hexToBytes.call(void 0, u.raw_hex);
+            const tmpReader = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(raw);
             w.writeVarInt(tmpReader.readVarInt());
           } else {
-            const raw = _chunk4XLYCT5Qcjs.hexToBytes.call(void 0, u.raw_hex);
+            const raw = _chunk5IMHJIAZcjs.hexToBytes.call(void 0, u.raw_hex);
             w.writeVarInt(BigInt(raw.byteLength));
             w.writeBytes(raw);
           }
@@ -1826,13 +1754,13 @@ function decodeTrackProperties(reader, payloadEnd) {
       } else if (propType === TPROP_DYNAMIC_GROUPS) {
         result.dynamic_groups = value;
       } else {
-        const tmpWriter = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(16);
+        const tmpWriter = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(16);
         tmpWriter.writeVarInt(value);
         const raw = tmpWriter.finish();
         unknown.push({
           id: `0x${propType.toString(16)}`,
           length: raw.byteLength,
-          raw_hex: _chunk4XLYCT5Qcjs.bytesToHex.call(void 0, raw)
+          raw_hex: _chunk5IMHJIAZcjs.bytesToHex.call(void 0, raw)
         });
       }
     } else {
@@ -1844,7 +1772,7 @@ function decodeTrackProperties(reader, payloadEnd) {
         unknown.push({
           id: `0x${propType.toString(16)}`,
           length,
-          raw_hex: _chunk4XLYCT5Qcjs.bytesToHex.call(void 0, bytes)
+          raw_hex: _chunk5IMHJIAZcjs.bytesToHex.call(void 0, bytes)
         });
       }
     }
@@ -2135,13 +2063,13 @@ function encodeMessage(message) {
   if (typeId === void 0) {
     throw new Error(`Unknown message type: ${message.type}`);
   }
-  const payloadWriter = new (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)();
+  const payloadWriter = new (0, _chunk5IMHJIAZcjs.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 (0, _chunk4XLYCT5Qcjs.MoqtBufferWriter)(payload.byteLength + 16);
+  const writer = new (0, _chunk5IMHJIAZcjs.MoqtBufferWriter)(payload.byteLength + 16);
   writer.writeVarInt(typeId);
   writer.writeUint8(payload.byteLength >> 8 & 255);
   writer.writeUint8(payload.byteLength & 255);
@@ -2196,13 +2124,13 @@ function encodePayload(msg, w) {
 }
 function decodeMessage(bytes) {
   try {
-    const reader = new (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(bytes);
+    const reader = new (0, _chunk5IMHJIAZcjs.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 (0, _chunk4XLYCT5Qcjs.MoqtBufferReader)(payloadBytes);
+    const payloadReader = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(payloadBytes);
     let message;
     if (typeId === MSG_SETUP) {
       message = decodeSetupPayload(payloadReader, payloadLength);
@@ -2245,7 +2173,7 @@ function decodeMessage(bytes) {
     } else {
       return {
         ok: false,
-        error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+        error: new (0, _chunk5IMHJIAZcjs.DecodeError)(
           "UNKNOWN_MESSAGE_TYPE",
           `Unknown message type ID: 0x${typeId.toString(16)}`,
           0
@@ -2254,7 +2182,7 @@ function decodeMessage(bytes) {
     }
     return { ok: true, value: message, bytesRead: reader.offset };
   } catch (e) {
-    if (e instanceof _chunk4XLYCT5Qcjs.DecodeError) {
+    if (e instanceof _chunk5IMHJIAZcjs.DecodeError) {
       return { ok: false, error: e };
     }
     throw e;
@@ -2289,7 +2217,7 @@ function createStreamDecoder() {
     flush(controller) {
       if (offset < buffer.length) {
         controller.error(
-          new (0, _chunk4XLYCT5Qcjs.DecodeError)("UNEXPECTED_END", "Stream ended with incomplete message data", 0)
+          new (0, _chunk5IMHJIAZcjs.DecodeError)("UNEXPECTED_END", "Stream ended with incomplete message data", 0)
         );
       }
     }
@@ -2313,6 +2241,20 @@ function createDraft20Codec() {
     createDataStreamDecoder
   };
 }
+function redactAuthTokens(bytes) {
+  let payloadStart;
+  try {
+    const probe = new (0, _chunk5IMHJIAZcjs.MoqtBufferReader)(bytes);
+    probe.readVarInt();
+    probe.readUint8();
+    probe.readUint8();
+    payloadStart = probe.offset;
+  } catch (e5) {
+    return { bytes, redacted: 0, incomplete: false, decoded: false };
+  }
+  return _chunk5IMHJIAZcjs.redactWith.call(void 0, bytes, payloadStart, () => decodeMessage(bytes).ok);
+}
+
 
 
 
@@ -2359,4 +2301,4 @@ function createDraft20Codec() {
 
 
 
-exports.MSG_REQUEST_UPDATE = MSG_REQUEST_UPDATE; exports.MSG_SUBSCRIBE = MSG_SUBSCRIBE; exports.MSG_SUBSCRIBE_OK = MSG_SUBSCRIBE_OK; exports.MSG_REQUEST_ERROR = MSG_REQUEST_ERROR; exports.MSG_PUBLISH_NAMESPACE = MSG_PUBLISH_NAMESPACE; exports.MSG_REQUEST_OK = MSG_REQUEST_OK; exports.MSG_NAMESPACE = MSG_NAMESPACE; exports.MSG_PUBLISH_DONE = MSG_PUBLISH_DONE; exports.MSG_TRACK_STATUS = MSG_TRACK_STATUS; exports.MSG_NAMESPACE_DONE = MSG_NAMESPACE_DONE; exports.MSG_PUBLISH_SKIPPED = MSG_PUBLISH_SKIPPED; exports.MSG_GOAWAY = MSG_GOAWAY; exports.MSG_FETCH = MSG_FETCH; exports.MSG_FETCH_OK = MSG_FETCH_OK; exports.MSG_PUBLISH = MSG_PUBLISH; exports.MSG_PUBLISH_STATE_NOTIFY = MSG_PUBLISH_STATE_NOTIFY; exports.MSG_PUBLISH_OK = MSG_PUBLISH_OK; exports.MSG_SUBSCRIBE_NAMESPACE = MSG_SUBSCRIBE_NAMESPACE; exports.MSG_SUBSCRIBE_TRACKS = MSG_SUBSCRIBE_TRACKS; exports.MSG_SETUP = MSG_SETUP; exports.SETUP_OPT_PATH = SETUP_OPT_PATH; exports.SETUP_OPT_AUTHORIZATION_TOKEN = SETUP_OPT_AUTHORIZATION_TOKEN; exports.SETUP_OPT_MAX_AUTH_TOKEN_CACHE_SIZE = SETUP_OPT_MAX_AUTH_TOKEN_CACHE_SIZE; exports.SETUP_OPT_AUTHORITY = SETUP_OPT_AUTHORITY; exports.SETUP_OPT_MAX_FILTER_RANGES = SETUP_OPT_MAX_FILTER_RANGES; exports.SETUP_OPT_MOQT_IMPLEMENTATION = SETUP_OPT_MOQT_IMPLEMENTATION; exports.SETUP_OPT_MAX_REQUEST_UPDATES = SETUP_OPT_MAX_REQUEST_UPDATES; exports.MESSAGE_TYPE_MAP = MESSAGE_TYPE_MAP; exports.MESSAGE_ID_MAP = MESSAGE_ID_MAP; exports.encodeSubgroupStream = encodeSubgroupStream; exports.encodeDatagram = encodeDatagram; exports.encodeFetchStream = encodeFetchStream; exports.decodeSubgroupStream = decodeSubgroupStream; exports.decodeDatagram = decodeDatagram; exports.decodeFetchStream = decodeFetchStream; exports.decodeDataStream = decodeDataStream; exports.createSubgroupStreamDecoder = createSubgroupStreamDecoder; exports.createFetchStreamDecoder = createFetchStreamDecoder; exports.createDataStreamDecoder = createDataStreamDecoder; exports.UNKNOWN_STREAM_COUNT = UNKNOWN_STREAM_COUNT; exports.encodeMessage = encodeMessage; exports.decodeMessage = decodeMessage; exports.createStreamDecoder = createStreamDecoder; exports.createDraft20Codec = createDraft20Codec;
+exports.MSG_REQUEST_UPDATE = MSG_REQUEST_UPDATE; exports.MSG_SUBSCRIBE = MSG_SUBSCRIBE; exports.MSG_SUBSCRIBE_OK = MSG_SUBSCRIBE_OK; exports.MSG_REQUEST_ERROR = MSG_REQUEST_ERROR; exports.MSG_PUBLISH_NAMESPACE = MSG_PUBLISH_NAMESPACE; exports.MSG_REQUEST_OK = MSG_REQUEST_OK; exports.MSG_NAMESPACE = MSG_NAMESPACE; exports.MSG_PUBLISH_DONE = MSG_PUBLISH_DONE; exports.MSG_TRACK_STATUS = MSG_TRACK_STATUS; exports.MSG_NAMESPACE_DONE = MSG_NAMESPACE_DONE; exports.MSG_PUBLISH_SKIPPED = MSG_PUBLISH_SKIPPED; exports.MSG_GOAWAY = MSG_GOAWAY; exports.MSG_FETCH = MSG_FETCH; exports.MSG_FETCH_OK = MSG_FETCH_OK; exports.MSG_PUBLISH = MSG_PUBLISH; exports.MSG_PUBLISH_STATE_NOTIFY = MSG_PUBLISH_STATE_NOTIFY; exports.MSG_PUBLISH_OK = MSG_PUBLISH_OK; exports.MSG_SUBSCRIBE_NAMESPACE = MSG_SUBSCRIBE_NAMESPACE; exports.MSG_SUBSCRIBE_TRACKS = MSG_SUBSCRIBE_TRACKS; exports.MSG_SETUP = MSG_SETUP; exports.SETUP_OPT_PATH = SETUP_OPT_PATH; exports.SETUP_OPT_AUTHORIZATION_TOKEN = SETUP_OPT_AUTHORIZATION_TOKEN; exports.SETUP_OPT_MAX_AUTH_TOKEN_CACHE_SIZE = SETUP_OPT_MAX_AUTH_TOKEN_CACHE_SIZE; exports.SETUP_OPT_AUTHORITY = SETUP_OPT_AUTHORITY; exports.SETUP_OPT_MAX_FILTER_RANGES = SETUP_OPT_MAX_FILTER_RANGES; exports.SETUP_OPT_MOQT_IMPLEMENTATION = SETUP_OPT_MOQT_IMPLEMENTATION; exports.SETUP_OPT_MAX_REQUEST_UPDATES = SETUP_OPT_MAX_REQUEST_UPDATES; exports.MESSAGE_TYPE_MAP = MESSAGE_TYPE_MAP; exports.MESSAGE_ID_MAP = MESSAGE_ID_MAP; exports.encodeSubgroupStream = encodeSubgroupStream; exports.encodeDatagram = encodeDatagram; exports.encodeFetchStream = encodeFetchStream; exports.decodeSubgroupStream = decodeSubgroupStream; exports.decodeDatagram = decodeDatagram; exports.decodeFetchStream = decodeFetchStream; exports.decodeDataStream = decodeDataStream; exports.createSubgroupStreamDecoder = createSubgroupStreamDecoder; exports.createFetchStreamDecoder = createFetchStreamDecoder; exports.createDataStreamDecoder = createDataStreamDecoder; exports.UNKNOWN_STREAM_COUNT = UNKNOWN_STREAM_COUNT; exports.encodeMessage = encodeMessage; exports.decodeMessage = decodeMessage; exports.createStreamDecoder = createStreamDecoder; exports.createDraft20Codec = createDraft20Codec; exports.redactAuthTokens = redactAuthTokens;