@moqtap/codec 0.10.0 → 0.11.0

package/dist/{chunk-FT3HDNIB.js → chunk-PJK2ZS3I.js}

@@ -3,8 +3,11 @@ import {
   MoqtBufferReader,
   MoqtBufferWriter,
   bytesToHex,
-  hexToBytes
-} from "./chunk-KLPWJU6W.js";
+  hexToBytes,
+  recordAuthValueSpan,
+  redactWith,
+  withoutAuthValueSpans
+} from "./chunk-YRZQVNZO.js";
 
 // src/drafts/draft20/messages.ts
 var MSG_REQUEST_UPDATE = 0x02n;
@@ -302,95 +305,107 @@ function resolveGroupId(first, delta, prevGroupId, offset) {
   }
   return groupId;
 }
+function readSubgroupHeader(r) {
+  const typeFlags = r.readVarInt();
+  const flagsError = subgroupTypeFlagsError(typeFlags);
+  if (flagsError !== null) {
+    throw new 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 MoqtBufferReader(bytes);
-    const typeFlags = r.readVarInt();
-    const flagsError = subgroupTypeFlagsError(typeFlags);
-    if (flagsError !== null) {
-      return { ok: false, error: new 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 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,
@@ -490,6 +505,195 @@ function decodeDatagram(bytes) {
     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 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 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 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 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 DecodeError(
+      "CONSTRAINT_VIOLATION",
+      "First fetch object must include objectId",
+      r.offset
+    );
+  }
+  if (objectId > MAX_U64) {
+    throw new 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 MoqtBufferReader(bytes);
@@ -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 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 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 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 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 DecodeError(
-            "CONSTRAINT_VIOLATION",
-            "First fetch object must include objectId",
-            r.offset
-          )
-        };
-      }
-      if (objectId > MAX_U64) {
-        return {
-          ok: false,
-          error: new 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,
@@ -749,56 +738,70 @@ function decodeDataStream(streamType, bytes) {
     }
   }
 }
+var StreamBuffer = class {
+  buf = new Uint8Array(0);
+  /** Bytes written into `buf`. */
+  len = 0;
+  /** Consumed prefix of `buf`; `base + offset` is the position in the stream. */
+  offset = 0;
+  /** Absolute position of `buf[0]` within the stream. */
+  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);
+  }
+};
 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 MoqtBufferReader(buffer.subarray(offset));
-          const typeFlags = r.readVarInt();
-          const flagsError = subgroupTypeFlagsError(typeFlags);
-          if (flagsError !== null) {
-            controller.error(new 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 MoqtBufferReader(view, b.offset);
+          header = readSubgroupHeader(hr);
+          b.offset = hr.offset;
         } catch (e) {
           if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
             return;
@@ -806,72 +809,51 @@ function createSubgroupStreamDecoder() {
           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 MoqtBufferReader(view, b.offset);
+      while (r.remaining > 0) {
+        const start = r.offset;
+        let obj;
         try {
-          const r = new 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 DecodeError && e.code === "UNEXPECTED_END") {
-            break;
+            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) {
+      if (header !== null && !headerEmitted) emitHeader(controller, header, 0n);
+      if (b.unread > 0) {
         controller.error(new 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 MoqtBufferReader(buffer.subarray(offset));
-          const streamType = r.readVarInt();
+          const r2 = new MoqtBufferReader(view, b.offset);
+          const streamType = r2.readVarInt();
           if (streamType !== FETCH_STREAM_TYPE) {
             controller.error(
               new DecodeError(
@@ -882,10 +864,10 @@ 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 DecodeError && e.code === "UNEXPECTED_END") {
             return;
@@ -894,135 +876,82 @@ function createFetchStreamDecoder() {
           return;
         }
       }
-      while (offset < buffer.length) {
+      const r = new MoqtBufferReader(view, b.offset);
+      while (r.remaining > 0) {
+        const start = r.offset;
+        let obj;
         try {
-          const r = new MoqtBufferReader(buffer.subarray(offset));
-          const flags = Number(r.readVarInt());
-          if (flags >= 128) {
-            if (!FETCH_END_OF_RANGE_MARKERS.has(flags)) {
-              controller.error(
-                new 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 DecodeError && e.code === "UNEXPECTED_END") {
-            break;
+            b.offset = start;
+            return;
           }
           controller.error(e);
           return;
         }
+        b.offset = r.offset;
+        controller.enqueue(obj);
       }
     },
     flush(controller) {
-      if (offset < buffer.length) {
+      if (b.unread > 0) {
         controller.error(new 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 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 {
+      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 DecodeError(
             "CONSTRAINT_VIOLATION",
@@ -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 {
       }
+      await pump;
     }
   });
 }
@@ -1188,10 +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 = [
-          ...result.authorization_token ?? [],
-          decodeAuthorizationToken(new MoqtBufferReader(bytes))
-        ];
+        const token = decodeAuthorizationToken(new MoqtBufferReader(bytes));
+        noteAuthTokenValue(reader.offset - length, length, token);
+        result.authorization_token = [...result.authorization_token ?? [], token];
       } else if (optType === SETUP_OPT_AUTHORITY) {
         result.authority = textDecoder.decode(bytes);
       } else if (optType === SETUP_OPT_MOQT_IMPLEMENTATION) {
@@ -1220,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;
+  recordAuthValueSpan(valueStart + valueLength - value.byteLength, value.byteLength);
+}
 function decodeAuthorizationToken(r) {
   const alias_type = r.readVarInt();
   const aliasType = Number(alias_type);
@@ -1402,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([
@@ -1431,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])
@@ -1453,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"])],
@@ -1653,10 +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 = [
-        ...result.authorization_token ?? [],
-        decodeAuthorizationToken(new MoqtBufferReader(bytes))
-      ];
+      const token = decodeAuthorizationToken(new MoqtBufferReader(bytes));
+      noteAuthTokenValue(reader.offset - length, length, token);
+      result.authorization_token = [...result.authorization_token ?? [], token];
     } else if (paramType === PARAM_RENDEZVOUS_TIMEOUT) {
       result.rendezvous_timeout = reader.readVarInt();
     } else if (paramType === PARAM_SUBGROUP_DELIVERY_TIMEOUT) {
@@ -1723,7 +1639,7 @@ function decodeFillParameters(reader) {
   const length = Number(reader.readVarInt());
   const valueBytes = reader.readBytes(length);
   const nested = new MoqtBufferReader(valueBytes);
-  const params = decodeParams(nested, FILL_SCOPE);
+  const params = withoutAuthValueSpans(() => decodeParams(nested, FILL_SCOPE));
   if (nested.remaining > 0) {
     throw new DecodeError(
       "CONSTRAINT_VIOLATION",
@@ -2325,6 +2241,19 @@ function createDraft20Codec() {
     createDataStreamDecoder
   };
 }
+function redactAuthTokens(bytes) {
+  let payloadStart;
+  try {
+    const probe = new MoqtBufferReader(bytes);
+    probe.readVarInt();
+    probe.readUint8();
+    probe.readUint8();
+    payloadStart = probe.offset;
+  } catch {
+    return { bytes, redacted: 0, incomplete: false, decoded: false };
+  }
+  return redactWith(bytes, payloadStart, () => decodeMessage(bytes).ok);
+}
 
 export {
   MSG_REQUEST_UPDATE,
@@ -2370,5 +2299,6 @@ export {
   encodeMessage,
   decodeMessage,
   createStreamDecoder,
-  createDraft20Codec
+  createDraft20Codec,
+  redactAuthTokens
 };