@moqtap/codec 0.9.0 → 0.11.0

package/dist/{chunk-2XH6PHXR.js → chunk-5AWIXOLB.js}

@@ -3,8 +3,10 @@ import {
   MoqtBufferReader,
   MoqtBufferWriter,
   bytesToHex,
-  hexToBytes
-} from "./chunk-KLPWJU6W.js";
+  hexToBytes,
+  recordAuthValueSpan,
+  redactWith
+} from "./chunk-YRZQVNZO.js";
 
 // src/drafts/draft18/messages.ts
 var MSG_REQUEST_UPDATE = 0x02n;
@@ -250,99 +252,108 @@ function encodeFetchStream(stream) {
   void prevObjectId;
   return w.finish();
 }
+function readSubgroupHeader(r) {
+  const streamType = r.readUint8();
+  if (!isValidSubgroupType(streamType)) {
+    throw new DecodeError(
+      "CONSTRAINT_VIOLATION",
+      `Invalid subgroup stream type 0x${streamType.toString(16)}`,
+      0
+    );
+  }
+  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,
+    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 streamType = r.readUint8();
-    if (!isValidSubgroupType(streamType)) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Invalid subgroup stream type 0x${streamType.toString(16)}`,
-          0
-        )
-      };
-    }
-    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,
-        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,
@@ -409,6 +420,178 @@ 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 (flags !== 140 && flags !== 268) {
+      throw new DecodeError(
+        "CONSTRAINT_VIOLATION",
+        `Unknown serialization flags value: 0x${flags.toString(16)}`,
+        r.offset
+      );
+    }
+    groupId = r.readVarInt();
+    objectId = r.readVarInt();
+    payloadLength = Number(r.readVarInt());
+    payloadByteOffset = base + r.offset;
+    payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
+  } else if (flags & 64) {
+    const objectIdPresent = (flags & 4) !== 0;
+    const groupIdPresent = (flags & 8) !== 0;
+    const priorityPresent = (flags & 16) !== 0;
+    const propsPresent = (flags & 32) !== 0;
+    if (groupIdPresent) {
+      const groupDelta = r.readVarInt();
+      groupId = st.first ? groupDelta : st.prevGroupId + groupDelta + 1n;
+    }
+    if (objectIdPresent) {
+      objectId = r.readVarInt();
+    }
+    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 obj2 = {
+      type: "object",
+      byteOffset,
+      payloadByteOffset,
+      serializationFlags: flags,
+      groupId,
+      subgroupId: 0n,
+      objectId,
+      publisherPriority: st.prevPriority,
+      payloadLength,
+      payload,
+      extensionData
+    };
+    if (objectProperties)
+      obj2.objectProperties = objectProperties;
+    st.prevGroupId = groupId;
+    st.prevObjectId = objectId;
+    st.first = false;
+    return obj2;
+  } else {
+    const subgroupEncoding = flags & 3;
+    const objectIdPresent = (flags & 4) !== 0;
+    const groupIdPresent = (flags & 8) !== 0;
+    const priorityPresent = (flags & 16) !== 0;
+    const propsPresent = (flags & 32) !== 0;
+    if (groupIdPresent) {
+      const groupDelta = r.readVarInt();
+      groupId = st.first ? groupDelta : st.prevGroupId + groupDelta + 1n;
+    } 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) {
+      if (st.first) {
+        throw new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          "First fetch object cannot reference prior subgroupId",
+          r.offset
+        );
+      }
+      subgroupId = st.prevSubgroupId;
+    } else if (subgroupEncoding === 2) {
+      if (st.first) {
+        throw new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          "First fetch object cannot reference prior subgroupId",
+          r.offset
+        );
+      }
+      subgroupId = st.prevSubgroupId + 1n;
+    } else if (subgroupEncoding === 3) {
+      subgroupId = r.readVarInt();
+    }
+    if (objectIdPresent) {
+      objectId = r.readVarInt();
+    } else if (st.first) {
+      throw new DecodeError(
+        "CONSTRAINT_VIOLATION",
+        "First fetch object must include objectId",
+        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);
+    if (objectProperties) {
+      const obj2 = {
+        type: "object",
+        byteOffset,
+        payloadByteOffset,
+        serializationFlags: flags,
+        groupId,
+        subgroupId,
+        objectId,
+        publisherPriority: st.prevPriority,
+        payloadLength,
+        payload,
+        extensionData
+      };
+      obj2.objectProperties = objectProperties;
+      st.prevGroupId = groupId;
+      st.prevSubgroupId = subgroupId;
+      st.prevObjectId = objectId;
+      st.first = false;
+      return obj2;
+    }
+  }
+  const obj = {
+    type: "object",
+    byteOffset,
+    payloadByteOffset,
+    serializationFlags: flags,
+    groupId,
+    subgroupId,
+    objectId,
+    publisherPriority: st.prevPriority,
+    payloadLength,
+    payload,
+    extensionData
+  };
+  st.prevGroupId = groupId;
+  st.prevSubgroupId = subgroupId;
+  st.prevObjectId = objectId;
+  st.first = false;
+  return obj;
+}
 function decodeFetchStream(bytes) {
   try {
     const r = new MoqtBufferReader(bytes);
@@ -425,196 +608,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 (flags !== 140 && flags !== 268) {
-          return {
-            ok: false,
-            error: new DecodeError(
-              "CONSTRAINT_VIOLATION",
-              `Unknown serialization flags value: 0x${flags.toString(16)}`,
-              r.offset
-            )
-          };
-        }
-        groupId = r.readVarInt();
-        objectId = r.readVarInt();
-        payloadLength = Number(r.readVarInt());
-        payloadByteOffset = r.offset;
-        payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
-      } else if (flags & 64) {
-        const objectIdPresent = (flags & 4) !== 0;
-        const groupIdPresent = (flags & 8) !== 0;
-        const priorityPresent = (flags & 16) !== 0;
-        const propsPresent = (flags & 32) !== 0;
-        if (groupIdPresent) {
-          const groupDelta = r.readVarInt();
-          groupId = first ? groupDelta : prevGroupId + groupDelta + 1n;
-        }
-        if (objectIdPresent) {
-          objectId = r.readVarInt();
-        }
-        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 obj2 = {
-          type: "object",
-          byteOffset,
-          payloadByteOffset,
-          serializationFlags: flags,
-          groupId,
-          subgroupId: 0n,
-          objectId,
-          publisherPriority: prevPriority,
-          payloadLength,
-          payload,
-          extensionData
-        };
-        if (objectProperties)
-          obj2.objectProperties = objectProperties;
-        objects.push(obj2);
-        prevGroupId = groupId;
-        prevObjectId = objectId;
-        first = false;
-        continue;
-      } else {
-        const subgroupEncoding = flags & 3;
-        const objectIdPresent = (flags & 4) !== 0;
-        const groupIdPresent = (flags & 8) !== 0;
-        const priorityPresent = (flags & 16) !== 0;
-        const propsPresent = (flags & 32) !== 0;
-        if (groupIdPresent) {
-          const groupDelta = r.readVarInt();
-          groupId = first ? groupDelta : prevGroupId + groupDelta + 1n;
-        } 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) {
-          if (first) {
-            return {
-              ok: false,
-              error: new DecodeError(
-                "CONSTRAINT_VIOLATION",
-                "First fetch object cannot reference prior subgroupId",
-                r.offset
-              )
-            };
-          }
-          subgroupId = prevSubgroupId;
-        } else if (subgroupEncoding === 2) {
-          if (first) {
-            return {
-              ok: false,
-              error: new DecodeError(
-                "CONSTRAINT_VIOLATION",
-                "First fetch object cannot reference prior subgroupId",
-                r.offset
-              )
-            };
-          }
-          subgroupId = prevSubgroupId + 1n;
-        } else if (subgroupEncoding === 3) {
-          subgroupId = r.readVarInt();
-        }
-        if (objectIdPresent) {
-          objectId = r.readVarInt();
-        } else if (first) {
-          return {
-            ok: false,
-            error: new DecodeError(
-              "CONSTRAINT_VIOLATION",
-              "First fetch object must include objectId",
-              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);
-        if (objectProperties) {
-          const obj2 = {
-            type: "object",
-            byteOffset,
-            payloadByteOffset,
-            serializationFlags: flags,
-            groupId,
-            subgroupId,
-            objectId,
-            publisherPriority: prevPriority,
-            payloadLength,
-            payload,
-            extensionData
-          };
-          obj2.objectProperties = objectProperties;
-          objects.push(obj2);
-          prevGroupId = groupId;
-          prevSubgroupId = subgroupId;
-          prevObjectId = objectId;
-          first = false;
-          continue;
-        }
-      }
-      const obj = {
-        type: "object",
-        byteOffset,
-        payloadByteOffset,
-        serializationFlags: flags,
-        groupId,
-        subgroupId,
-        objectId,
-        publisherPriority: prevPriority,
-        payloadLength,
-        payload,
-        extensionData
-      };
-      objects.push(obj);
-      prevGroupId = groupId;
-      prevSubgroupId = subgroupId;
-      prevObjectId = objectId;
-      first = false;
+      objects.push(readFetchObject(r, 0, st));
     }
     return {
       ok: true,
@@ -640,60 +636,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 streamType = r.readUint8();
-          if (!isValidSubgroupType(streamType)) {
-            controller.error(
-              new DecodeError(
-                "CONSTRAINT_VIOLATION",
-                `Invalid subgroup stream type 0x${streamType.toString(16)}`,
-                0
-              )
-            );
-            return;
-          }
-          _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;
@@ -701,71 +707,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,
-            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(
@@ -776,10 +762,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;
@@ -788,99 +774,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());
-          const objectIdPresent = (flags & 4) !== 0;
-          const groupIdPresent = (flags & 8) !== 0;
-          const priorityPresent = (flags & 16) !== 0;
-          const extensionsPresent = (flags & 32) !== 0;
-          const subgroupEncoding = flags & 3;
-          if (groupIdPresent) r.readVarInt();
-          if (subgroupEncoding === 3) r.readVarInt();
-          let objectId = 0n;
-          if (objectIdPresent) objectId = r.readVarInt();
-          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);
-          controller.enqueue({
-            type: "object",
-            objectId,
-            payloadLength,
-            payload,
-            extensionData,
-            byteOffset: 0,
-            payloadByteOffset
-          });
-          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",
@@ -890,31 +859,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;
     }
   });
 }
@@ -935,12 +888,12 @@ function encodeSetupOptions(opts, writer) {
       }
     });
   }
-  if (opts.authorization_token !== void 0) {
+  for (const token of opts.authorization_token ?? []) {
     entries.push({
       type: SETUP_OPT_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new MoqtBufferWriter(64);
-        encodeAuthorizationToken(opts.authorization_token, tmpW);
+        encodeAuthorizationToken(token, tmpW);
         const raw = tmpW.finish();
         w.writeVarInt(BigInt(raw.byteLength));
         w.writeBytes(raw);
@@ -1028,7 +981,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 MoqtBufferReader(bytes));
+        const token = decodeAuthorizationToken(new MoqtBufferReader(bytes));
+        noteAuthTokenValue(reader.offset - length, length, token.token_value);
+        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) {
@@ -1138,12 +1093,12 @@ function encodeParams(params, writer) {
       encode: (w) => w.writeVarInt(params.object_delivery_timeout)
     });
   }
-  if (params.authorization_token !== void 0) {
+  for (const token of params.authorization_token ?? []) {
     entries.push({
       type: PARAM_AUTHORIZATION_TOKEN,
       encode: (w) => {
         const tmpW = new MoqtBufferWriter(64);
-        encodeAuthorizationToken(params.authorization_token, tmpW);
+        encodeAuthorizationToken(token, tmpW);
         const raw = tmpW.finish();
         w.writeVarInt(BigInt(raw.byteLength));
         w.writeBytes(raw);
@@ -1283,7 +1238,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 MoqtBufferReader(bytes));
+      const token = decodeAuthorizationToken(new MoqtBufferReader(bytes));
+      noteAuthTokenValue(reader.offset - length, length, token.token_value);
+      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) {
@@ -1959,6 +1916,23 @@ function createDraft18Codec() {
     createDataStreamDecoder
   };
 }
+function noteAuthTokenValue(valueStart, valueLength, value) {
+  if (value === void 0 || value.byteLength === 0) return;
+  recordAuthValueSpan(valueStart + valueLength - value.byteLength, value.byteLength);
+}
+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,
@@ -2000,5 +1974,6 @@ export {
   encodeMessage,
   decodeMessage,
   createStreamDecoder,
-  createDraft18Codec
+  createDraft18Codec,
+  redactAuthTokens
 };