@moqtap/codec 0.2.2 → 0.3.0

package/dist/{chunk-ZBKE2QRQ.js → chunk-Z6U26IRI.js}

@@ -1,8 +1,10 @@
 import {
   BufferReader,
   BufferWriter,
-  DecodeError
-} from "./chunk-A27S7HW7.js";
+  DecodeError,
+  bytesToHex,
+  hexToBytes
+} from "./chunk-VOU7PNHI.js";
 
 // src/drafts/draft17/messages.ts
 var MSG_REQUEST_UPDATE = 0x02n;
@@ -24,6 +26,7 @@ var MSG_PUBLISH = 0x1dn;
 var MSG_PUBLISH_OK = 0x1en;
 var MSG_SETUP = 0x2f00n;
 var SETUP_OPT_PATH = 0x01n;
+var SETUP_OPT_AUTHORIZATION_TOKEN = 0x03n;
 var SETUP_OPT_MAX_AUTH_TOKEN_CACHE_SIZE = 0x04n;
 var SETUP_OPT_AUTHORITY = 0x05n;
 var SETUP_OPT_MOQT_IMPLEMENTATION = 0x07n;
@@ -51,33 +54,874 @@ var MESSAGE_ID_MAP = new Map(
   [...MESSAGE_TYPE_MAP.entries()].map(([id, name]) => [name, id])
 );
 
-// src/drafts/draft17/codec.ts
-function bytesToHex(bytes) {
-  let hex = "";
-  for (let i = 0; i < bytes.byteLength; i++) {
-    hex += bytes[i].toString(16).padStart(2, "0");
+// src/drafts/draft17/data-streams.ts
+var FETCH_STREAM_TYPE = 0x05n;
+var OBJPROP_PRIOR_GROUP_ID_GAP = 0x3cn;
+var OBJPROP_PRIOR_OBJECT_ID_GAP = 0x3en;
+var KNOWN_OBJ_PROPS = /* @__PURE__ */ new Map([
+  [OBJPROP_PRIOR_OBJECT_ID_GAP, "prior_object_id_gap"],
+  [OBJPROP_PRIOR_GROUP_ID_GAP, "prior_group_id_gap"]
+]);
+function decodeObjectProperties(r, propsLength) {
+  const endOff = r.offset + propsLength;
+  const props = {};
+  let prevType = 0n;
+  while (r.offset < endOff) {
+    const delta = r.readVarInt();
+    const propType = prevType + delta;
+    prevType = propType;
+    if (propType % 2n === 0n) {
+      const value = r.readVarInt();
+      const name = KNOWN_OBJ_PROPS.get(propType) ?? `0x${propType.toString(16)}`;
+      props[name] = value;
+    } else {
+      const length = Number(r.readVarInt());
+      r.readBytes(length);
+    }
+  }
+  return props;
+}
+function encodeObjectProperties(props, w) {
+  const reverseMap = /* @__PURE__ */ new Map();
+  for (const [id, name] of KNOWN_OBJ_PROPS) {
+    reverseMap.set(name, id);
+  }
+  const entries = [];
+  for (const [name, value] of Object.entries(props)) {
+    const typeId = reverseMap.get(name);
+    if (typeId !== void 0) {
+      entries.push({ type: typeId, value });
+    }
+  }
+  entries.sort((a, b) => a.type < b.type ? -1 : a.type > b.type ? 1 : 0);
+  let prevType = 0n;
+  for (const entry of entries) {
+    w.writeVarInt(entry.type - prevType);
+    w.writeVarInt(entry.value);
+    prevType = entry.type;
+  }
+}
+function encodeSubgroupStream(stream) {
+  const w = new BufferWriter();
+  const streamType = stream.headerType;
+  w.writeVarInt(BigInt(streamType));
+  const propertiesPresent = (streamType & 1) !== 0;
+  const hasSubgroupField = (streamType & 4) !== 0;
+  const hasPriority = streamType < 48;
+  w.writeVarInt(stream.trackAlias);
+  w.writeVarInt(stream.groupId);
+  if (hasSubgroupField) {
+    w.writeVarInt(stream.subgroupId);
   }
-  return hex;
+  if (hasPriority) {
+    w.writeUint8(stream.publisherPriority);
+  }
+  let prevObjectId = -1n;
+  for (const obj of stream.objects) {
+    const delta = prevObjectId < 0n ? obj.objectId : obj.objectId - prevObjectId - 1n;
+    w.writeVarInt(delta);
+    if (propertiesPresent) {
+      if (obj.objectProperties && Object.keys(obj.objectProperties).length > 0) {
+        const tmpW = new BufferWriter(32);
+        encodeObjectProperties(obj.objectProperties, tmpW);
+        const raw = tmpW.finish();
+        w.writeVarInt(BigInt(raw.byteLength));
+        w.writeBytes(raw);
+      } else {
+        w.writeVarInt(0n);
+      }
+    }
+    w.writeVarInt(BigInt(obj.payloadLength));
+    if (obj.payloadLength === 0) {
+      w.writeVarInt(obj.status ?? 0n);
+    } else {
+      w.writeBytes(obj.payload);
+    }
+    prevObjectId = obj.objectId;
+  }
+  return w.finish();
+}
+function encodeDatagram(dg) {
+  const w = new BufferWriter();
+  const dgType = dg.datagramType;
+  w.writeVarInt(BigInt(dgType));
+  w.writeVarInt(dg.trackAlias);
+  w.writeVarInt(dg.groupId);
+  const objectIdAbsent = (dgType & 4) !== 0;
+  const isStatus = (dgType & 32) !== 0;
+  const defaultPriority = (dgType & 8) !== 0;
+  const propertiesPresent = (dgType & 1) !== 0;
+  if (!objectIdAbsent) {
+    w.writeVarInt(dg.objectId);
+  }
+  if (!defaultPriority) {
+    w.writeUint8(dg.publisherPriority);
+  }
+  if (propertiesPresent) {
+    if (dg.objectProperties && Object.keys(dg.objectProperties).length > 0) {
+      const tmpW = new BufferWriter(32);
+      encodeObjectProperties(dg.objectProperties, tmpW);
+      const raw = tmpW.finish();
+      w.writeVarInt(BigInt(raw.byteLength));
+      w.writeBytes(raw);
+    } else {
+      w.writeVarInt(0n);
+    }
+  }
+  if (isStatus) {
+    w.writeVarInt(dg.objectStatus ?? 0n);
+  } else {
+    w.writeBytes(dg.payload);
+  }
+  return w.finish();
+}
+function encodeFetchStream(stream) {
+  const w = new BufferWriter();
+  w.writeVarInt(FETCH_STREAM_TYPE);
+  w.writeVarInt(stream.requestId);
+  for (const obj of stream.objects) {
+    w.writeVarInt(BigInt(obj.serializationFlags));
+    const flags = obj.serializationFlags;
+    if (flags >= 128) {
+      w.writeVarInt(obj.groupId);
+      w.writeVarInt(obj.objectId);
+      w.writeVarInt(BigInt(obj.payloadLength));
+    } else if (flags & 64) {
+      if (flags & 8) w.writeVarInt(obj.groupId);
+      if (flags & 4) w.writeVarInt(obj.objectId);
+      if (flags & 16) w.writeUint8(obj.publisherPriority);
+      if (flags & 32) {
+        if (obj.objectProperties && Object.keys(obj.objectProperties).length > 0) {
+          const tmpW = new BufferWriter(32);
+          encodeObjectProperties(obj.objectProperties, tmpW);
+          const raw = tmpW.finish();
+          w.writeVarInt(BigInt(raw.byteLength));
+          w.writeBytes(raw);
+        } else {
+          w.writeVarInt(0n);
+        }
+      }
+      w.writeVarInt(BigInt(obj.payloadLength));
+      if (obj.payloadLength > 0) {
+        w.writeBytes(obj.payload);
+      }
+    } else {
+      if (flags & 8) w.writeVarInt(obj.groupId);
+      const subgroupEncoding = flags & 3;
+      if (subgroupEncoding === 3) w.writeVarInt(obj.subgroupId);
+      if (flags & 4) w.writeVarInt(obj.objectId);
+      if (flags & 16) w.writeUint8(obj.publisherPriority);
+      if (flags & 32) {
+        if (obj.objectProperties && Object.keys(obj.objectProperties).length > 0) {
+          const tmpW = new BufferWriter(32);
+          encodeObjectProperties(obj.objectProperties, tmpW);
+          const raw = tmpW.finish();
+          w.writeVarInt(BigInt(raw.byteLength));
+          w.writeBytes(raw);
+        } else {
+          w.writeVarInt(0n);
+        }
+      }
+      w.writeVarInt(BigInt(obj.payloadLength));
+      if (obj.payloadLength > 0) {
+        w.writeBytes(obj.payload);
+      }
+    }
+  }
+  return w.finish();
+}
+function decodeSubgroupStream(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const streamType = Number(r.readVarInt());
+    if (!(streamType >= 16 && streamType <= 29 || streamType >= 48 && streamType <= 61) || (streamType & 6) === 6) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected subgroup stream type 0x10-0x15/0x18-0x1D/0x30-0x35/0x38-0x3D, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const propertiesPresent = (streamType & 1) !== 0;
+    const hasSubgroupField = (streamType & 4) !== 0;
+    const subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
+    const hasPriority = streamType < 48;
+    const endOfGroup = (streamType & 8) !== 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 objects = [];
+    let prevObjectId = -1n;
+    let firstObject = true;
+    while (r.remaining > 0) {
+      const byteOffset = r.offset;
+      const delta = r.readVarInt();
+      let objectId;
+      if (firstObject) {
+        objectId = delta;
+        if (subgroupIsFirstObjId && firstObject) {
+          subgroupId = objectId;
+        }
+        firstObject = 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;
+      objects.push(obj);
+      prevObjectId = objectId;
+    }
+    const result = {
+      type: "subgroup",
+      headerType: streamType,
+      trackAlias,
+      groupId,
+      subgroupId,
+      publisherPriority,
+      objects
+    };
+    if (endOfGroup) result.endOfGroup = true;
+    return {
+      ok: true,
+      value: result,
+      bytesRead: r.offset
+    };
+  } catch (e) {
+    if (e instanceof DecodeError) return { ok: false, error: e };
+    throw e;
+  }
+}
+function decodeDatagram(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const dgType = Number(r.readVarInt());
+    const objectIdAbsent = (dgType & 4) !== 0;
+    const endOfGroup = (dgType & 2) !== 0;
+    const isStatus = (dgType & 32) !== 0;
+    const defaultPriority = (dgType & 8) !== 0;
+    const propertiesPresent = (dgType & 1) !== 0;
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    let objectId = 0n;
+    if (!objectIdAbsent) {
+      objectId = r.readVarInt();
+    }
+    let publisherPriority = 128;
+    if (!defaultPriority) {
+      publisherPriority = r.readUint8();
+    }
+    let objectProperties;
+    if (propertiesPresent) {
+      const propsLen = Number(r.readVarInt());
+      if (propsLen > 0) {
+        objectProperties = decodeObjectProperties(r, propsLen);
+      }
+    }
+    let objectStatus;
+    let payload;
+    if (isStatus) {
+      objectStatus = r.readVarInt();
+      payload = new Uint8Array(0);
+    } else {
+      payload = r.readBytesView(r.remaining);
+    }
+    const payloadLength = payload.byteLength;
+    const result = {
+      type: "datagram",
+      datagramType: dgType,
+      trackAlias,
+      groupId,
+      objectId,
+      publisherPriority,
+      payloadLength,
+      payload
+    };
+    if (endOfGroup) result.endOfGroup = true;
+    if (objectStatus !== void 0)
+      result.objectStatus = objectStatus;
+    if (objectProperties !== void 0)
+      result.objectProperties = objectProperties;
+    return { ok: true, value: result, bytesRead: r.offset };
+  } catch (e) {
+    if (e instanceof DecodeError) return { ok: false, error: e };
+    throw e;
+  }
+}
+function decodeFetchStream(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const streamType = r.readVarInt();
+    if (streamType !== FETCH_STREAM_TYPE) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected fetch stream type 0x05, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const requestId = r.readVarInt();
+    const objects = [];
+    let prevGroupId = 0n;
+    let prevSubgroupId = 0n;
+    let prevObjectId = 0n;
+    let prevPriority = 128;
+    let first = true;
+    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) {
+          groupId = r.readVarInt();
+        }
+        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) {
+          groupId = r.readVarInt();
+        } 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;
+    }
+    return {
+      ok: true,
+      value: { type: "fetch", requestId, objects },
+      bytesRead: r.offset
+    };
+  } catch (e) {
+    if (e instanceof DecodeError) return { ok: false, error: e };
+    throw e;
+  }
+}
+function decodeDataStream(streamType, bytes) {
+  switch (streamType) {
+    case "subgroup":
+      return decodeSubgroupStream(bytes);
+    case "datagram":
+      return decodeDatagram(bytes);
+    case "fetch":
+      return decodeFetchStream(bytes);
+    default: {
+      const _exhaustive = streamType;
+      throw new Error(`Unknown stream type: ${_exhaustive}`);
+    }
+  }
+}
+function createSubgroupStreamDecoder() {
+  let buffer = new Uint8Array(0);
+  let offset = 0;
+  let headerEmitted = false;
+  let prevObjectId = -1n;
+  let firstObject = true;
+  let _subgroupIsFirstObjId = false;
+  let _extensionsPresent = false;
+  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) {
+        try {
+          const r = new BufferReader(buffer.subarray(offset));
+          const streamType = Number(r.readVarInt());
+          if (!(streamType >= 16 && streamType <= 29 || streamType >= 48 && streamType <= 61)) {
+            controller.error(
+              new DecodeError(
+                "CONSTRAINT_VIOLATION",
+                `Expected subgroup stream type, got 0x${streamType.toString(16)}`,
+                0
+              )
+            );
+            return;
+          }
+          _extensionsPresent = (streamType & 1) !== 0;
+          const hasSubgroupField = (streamType & 4) !== 0;
+          _subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
+          const hasPriority = streamType < 48;
+          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;
+        } catch (e) {
+          if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
+            return;
+          }
+          controller.error(e);
+          return;
+        }
+      }
+      while (offset < buffer.length) {
+        try {
+          const r = new BufferReader(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 (_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;
+          prevObjectId = objectId;
+        } catch (e) {
+          if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
+            break;
+          }
+          controller.error(e);
+          return;
+        }
+      }
+    },
+    flush(controller) {
+      if (offset < buffer.length) {
+        controller.error(new DecodeError("UNEXPECTED_END", "Stream ended with incomplete data", 0));
+      }
+    }
+  });
 }
-function hexToBytes(hex) {
-  const bytes = new Uint8Array(hex.length / 2);
-  for (let i = 0; i < hex.length; i += 2) {
-    bytes[i / 2] = parseInt(hex.substring(i, i + 2), 16);
-  }
-  return bytes;
+function createFetchStreamDecoder() {
+  let buffer = new Uint8Array(0);
+  let offset = 0;
+  let headerEmitted = false;
+  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) {
+        try {
+          const r = new BufferReader(buffer.subarray(offset));
+          const streamType = r.readVarInt();
+          if (streamType !== FETCH_STREAM_TYPE) {
+            controller.error(
+              new DecodeError(
+                "CONSTRAINT_VIOLATION",
+                `Expected fetch stream type 0x05, got 0x${streamType.toString(16)}`,
+                0
+              )
+            );
+            return;
+          }
+          const requestId = r.readVarInt();
+          controller.enqueue({ type: "fetch_header", requestId });
+          headerEmitted = true;
+          offset += r.offset;
+        } catch (e) {
+          if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
+            return;
+          }
+          controller.error(e);
+          return;
+        }
+      }
+      while (offset < buffer.length) {
+        try {
+          const r = new BufferReader(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;
+        } catch (e) {
+          if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
+            break;
+          }
+          controller.error(e);
+          return;
+        }
+      }
+    },
+    flush(controller) {
+      if (offset < buffer.length) {
+        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 (firstByte >= 16 && firstByte <= 29 || firstByte >= 48 && firstByte <= 61) {
+          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;
+        }
+      }
+    },
+    flush(controller) {
+      if (offset >= buffer.length) return;
+      const view = buffer.subarray(offset);
+      const firstByte = view[0];
+      let result;
+      if (firstByte >= 16 && firstByte <= 29 || firstByte >= 48 && firstByte <= 61) {
+        result = decodeSubgroupStream(view);
+      } else if (firstByte === 5) {
+        result = decodeFetchStream(view);
+      } else {
+        controller.error(
+          new DecodeError(
+            "CONSTRAINT_VIOLATION",
+            `Unknown data stream type: 0x${firstByte.toString(16)}`,
+            0
+          )
+        );
+        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);
+        }
+      }
+    }
+  });
 }
+
+// src/drafts/draft17/codec.ts
+var textEncoder = /* @__PURE__ */ new TextEncoder();
+var textDecoder = /* @__PURE__ */ new TextDecoder();
 function encodeSetupOptions(opts, writer) {
   const entries = [];
   if (opts.path !== void 0) {
     entries.push({
       type: SETUP_OPT_PATH,
       encode: (w) => {
-        const encoded = new TextEncoder().encode(opts.path);
+        const encoded = textEncoder.encode(opts.path);
         w.writeVarInt(BigInt(encoded.byteLength));
         w.writeBytes(encoded);
       }
     });
   }
+  if (opts.authorization_token !== void 0) {
+    entries.push({
+      type: SETUP_OPT_AUTHORIZATION_TOKEN,
+      encode: (w) => {
+        const tmpW = new BufferWriter(64);
+        encodeAuthorizationToken(opts.authorization_token, tmpW);
+        const raw = tmpW.finish();
+        w.writeVarInt(BigInt(raw.byteLength));
+        w.writeBytes(raw);
+      }
+    });
+  }
   if (opts.max_auth_token_cache_size !== void 0) {
     entries.push({
       type: SETUP_OPT_MAX_AUTH_TOKEN_CACHE_SIZE,
@@ -88,7 +932,7 @@ function encodeSetupOptions(opts, writer) {
     entries.push({
       type: SETUP_OPT_AUTHORITY,
       encode: (w) => {
-        const encoded = new TextEncoder().encode(opts.authority);
+        const encoded = textEncoder.encode(opts.authority);
         w.writeVarInt(BigInt(encoded.byteLength));
         w.writeBytes(encoded);
       }
@@ -98,7 +942,7 @@ function encodeSetupOptions(opts, writer) {
     entries.push({
       type: SETUP_OPT_MOQT_IMPLEMENTATION,
       encode: (w) => {
-        const encoded = new TextEncoder().encode(opts.moqt_implementation);
+        const encoded = textEncoder.encode(opts.moqt_implementation);
         w.writeVarInt(BigInt(encoded.byteLength));
         w.writeBytes(encoded);
       }
@@ -157,28 +1001,96 @@ function decodeSetupOptions(reader, payloadEnd) {
       const length = Number(reader.readVarInt());
       const bytes = reader.readBytes(length);
       if (optType === SETUP_OPT_PATH) {
-        result.path = new TextDecoder().decode(bytes);
+        result.path = textDecoder.decode(bytes);
+      } else if (optType === SETUP_OPT_AUTHORIZATION_TOKEN) {
+        result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes));
       } else if (optType === SETUP_OPT_AUTHORITY) {
-        result.authority = new TextDecoder().decode(bytes);
+        result.authority = textDecoder.decode(bytes);
       } else if (optType === SETUP_OPT_MOQT_IMPLEMENTATION) {
-        result.moqt_implementation = new TextDecoder().decode(bytes);
+        result.moqt_implementation = textDecoder.decode(bytes);
       } else {
-        unknown.push({ id: `0x${optType.toString(16)}`, length, raw_hex: bytesToHex(bytes) });
+        unknown.push({
+          id: `0x${optType.toString(16)}`,
+          length,
+          raw_hex: bytesToHex(bytes)
+        });
       }
     }
   }
   if (unknown.length > 0) result.unknown = unknown;
   return result;
 }
+function encodeAuthorizationToken(token, w) {
+  const aliasType = Number(token.alias_type);
+  w.writeVarInt(token.alias_type);
+  if (aliasType === 0 || aliasType === 1 || aliasType === 2) {
+    w.writeVarInt(token.token_alias ?? 0n);
+  }
+  if (aliasType === 1 || aliasType === 3) {
+    w.writeVarInt(token.token_type ?? 0n);
+    const encoded = textEncoder.encode(token.token_value ?? "");
+    w.writeVarInt(BigInt(encoded.byteLength));
+    w.writeBytes(encoded);
+  }
+}
+function decodeAuthorizationToken(r) {
+  const alias_type = r.readVarInt();
+  const aliasType = Number(alias_type);
+  const result = { alias_type };
+  if (aliasType === 0 || aliasType === 1 || aliasType === 2) {
+    ;
+    result.token_alias = r.readVarInt();
+  }
+  if (aliasType === 1 || aliasType === 3) {
+    ;
+    result.token_type = r.readVarInt();
+    const len = Number(r.readVarInt());
+    const bytes = r.readBytes(len);
+    result.token_value = textDecoder.decode(bytes);
+  }
+  return result;
+}
+var PARAM_DELIVERY_TIMEOUT = 0x02n;
+var PARAM_AUTHORIZATION_TOKEN = 0x03n;
+var PARAM_RENDEZVOUS_TIMEOUT = 0x04n;
 var PARAM_EXPIRES = 0x08n;
 var PARAM_LARGEST_OBJECT = 0x09n;
+var PARAM_FORWARD = 0x10n;
 var PARAM_SUBSCRIBER_PRIORITY = 0x20n;
 var PARAM_SUBSCRIPTION_FILTER = 0x21n;
 var PARAM_GROUP_ORDER = 0x22n;
+var PARAM_NEW_GROUP_REQUEST = 0x32n;
 function encodeParams(params, writer) {
   const entries = [];
+  if (params.delivery_timeout !== void 0) {
+    entries.push({
+      type: PARAM_DELIVERY_TIMEOUT,
+      encode: (w) => w.writeVarInt(params.delivery_timeout)
+    });
+  }
+  if (params.authorization_token !== void 0) {
+    entries.push({
+      type: PARAM_AUTHORIZATION_TOKEN,
+      encode: (w) => {
+        const tmpW = new BufferWriter(64);
+        encodeAuthorizationToken(params.authorization_token, tmpW);
+        const raw = tmpW.finish();
+        w.writeVarInt(BigInt(raw.byteLength));
+        w.writeBytes(raw);
+      }
+    });
+  }
+  if (params.rendezvous_timeout !== void 0) {
+    entries.push({
+      type: PARAM_RENDEZVOUS_TIMEOUT,
+      encode: (w) => w.writeVarInt(params.rendezvous_timeout)
+    });
+  }
   if (params.expires !== void 0) {
-    entries.push({ type: PARAM_EXPIRES, encode: (w) => w.writeVarInt(params.expires) });
+    entries.push({
+      type: PARAM_EXPIRES,
+      encode: (w) => w.writeVarInt(params.expires)
+    });
   }
   if (params.largest_object !== void 0) {
     entries.push({
@@ -189,6 +1101,12 @@ function encodeParams(params, writer) {
       }
     });
   }
+  if (params.forward !== void 0) {
+    entries.push({
+      type: PARAM_FORWARD,
+      encode: (w) => w.writeVarInt(params.forward)
+    });
+  }
   if (params.subscriber_priority !== void 0) {
     entries.push({
       type: PARAM_SUBSCRIBER_PRIORITY,
@@ -221,6 +1139,12 @@ function encodeParams(params, writer) {
       encode: (w) => w.writeUint8(Number(params.group_order))
     });
   }
+  if (params.new_group_request !== void 0) {
+    entries.push({
+      type: PARAM_NEW_GROUP_REQUEST,
+      encode: (w) => w.writeVarInt(params.new_group_request)
+    });
+  }
   if (params.unknown) {
     for (const u of params.unknown) {
       const id = BigInt(u.id);
@@ -251,7 +1175,15 @@ function decodeParams(reader) {
     const delta = reader.readVarInt();
     const paramType = prevType + delta;
     prevType = paramType;
-    if (paramType === PARAM_EXPIRES) {
+    if (paramType === PARAM_DELIVERY_TIMEOUT) {
+      result.delivery_timeout = reader.readVarInt();
+    } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
+      const length = Number(reader.readVarInt());
+      const bytes = reader.readBytes(length);
+      result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes));
+    } else if (paramType === PARAM_RENDEZVOUS_TIMEOUT) {
+      result.rendezvous_timeout = reader.readVarInt();
+    } else if (paramType === PARAM_EXPIRES) {
       result.expires = reader.readVarInt();
     } else if (paramType === PARAM_LARGEST_OBJECT) {
       const group = reader.readVarInt();
@@ -274,8 +1206,12 @@ function decodeParams(reader) {
       const consumed = reader.offset - startOff;
       if (consumed < length) reader.readBytes(length - consumed);
       result.subscription_filter = filter;
+    } else if (paramType === PARAM_FORWARD) {
+      result.forward = reader.readVarInt();
     } else if (paramType === PARAM_GROUP_ORDER) {
       result.group_order = BigInt(reader.readUint8());
+    } else if (paramType === PARAM_NEW_GROUP_REQUEST) {
+      result.new_group_request = reader.readVarInt();
     } else {
       if (paramType % 2n === 0n) {
         const value = reader.readVarInt();
@@ -290,29 +1226,89 @@ function decodeParams(reader) {
       } else {
         const length = Number(reader.readVarInt());
         const bytes = reader.readBytes(length);
-        unknown.push({ id: `0x${paramType.toString(16)}`, length, raw_hex: bytesToHex(bytes) });
+        unknown.push({
+          id: `0x${paramType.toString(16)}`,
+          length,
+          raw_hex: bytesToHex(bytes)
+        });
       }
     }
   }
   if (unknown.length > 0) result.unknown = unknown;
   return result;
 }
+var TPROP_DELIVERY_TIMEOUT = 0x02n;
+var TPROP_MAX_CACHE_DURATION = 0x04n;
+var TPROP_IMMUTABLE_PROPERTIES = 0x0bn;
+var TPROP_DEFAULT_PUBLISHER_PRIORITY = 0x0en;
+var TPROP_DEFAULT_PUBLISHER_GROUP_ORDER = 0x22n;
+var TPROP_DYNAMIC_GROUPS = 0x30n;
 function encodeTrackProperties(props, writer) {
-  if (!props.unknown || props.unknown.length === 0) return;
-  const entries = props.unknown.map((u) => ({ type: BigInt(u.id), raw: u }));
+  const entries = [];
+  if (props.delivery_timeout !== void 0) {
+    entries.push({
+      type: TPROP_DELIVERY_TIMEOUT,
+      encode: (w) => w.writeVarInt(props.delivery_timeout)
+    });
+  }
+  if (props.max_cache_duration !== void 0) {
+    entries.push({
+      type: TPROP_MAX_CACHE_DURATION,
+      encode: (w) => w.writeVarInt(props.max_cache_duration)
+    });
+  }
+  if (props.immutable_properties !== void 0) {
+    entries.push({
+      type: TPROP_IMMUTABLE_PROPERTIES,
+      encode: (w) => {
+        const raw = hexToBytes(props.immutable_properties);
+        w.writeVarInt(BigInt(raw.byteLength));
+        w.writeBytes(raw);
+      }
+    });
+  }
+  if (props.default_publisher_priority !== void 0) {
+    entries.push({
+      type: TPROP_DEFAULT_PUBLISHER_PRIORITY,
+      encode: (w) => w.writeVarInt(props.default_publisher_priority)
+    });
+  }
+  if (props.default_publisher_group_order !== void 0) {
+    entries.push({
+      type: TPROP_DEFAULT_PUBLISHER_GROUP_ORDER,
+      encode: (w) => w.writeVarInt(props.default_publisher_group_order)
+    });
+  }
+  if (props.dynamic_groups !== void 0) {
+    entries.push({
+      type: TPROP_DYNAMIC_GROUPS,
+      encode: (w) => w.writeVarInt(props.dynamic_groups)
+    });
+  }
+  if (props.unknown) {
+    for (const u of props.unknown) {
+      const id = BigInt(u.id);
+      entries.push({
+        type: id,
+        encode: (w) => {
+          if (id % 2n === 0n) {
+            const raw = hexToBytes(u.raw_hex);
+            const tmpReader = new BufferReader(raw);
+            w.writeVarInt(tmpReader.readVarInt());
+          } else {
+            const raw = hexToBytes(u.raw_hex);
+            w.writeVarInt(BigInt(raw.byteLength));
+            w.writeBytes(raw);
+          }
+        }
+      });
+    }
+  }
   entries.sort((a, b) => a.type < b.type ? -1 : a.type > b.type ? 1 : 0);
   let prevType = 0n;
   for (const entry of entries) {
     writer.writeVarInt(entry.type - prevType);
-    if (entry.type % 2n === 0n) {
-      const raw = hexToBytes(entry.raw.raw_hex);
-      const tmpReader = new BufferReader(raw);
-      writer.writeVarInt(tmpReader.readVarInt());
-    } else {
-      const raw = hexToBytes(entry.raw.raw_hex);
-      writer.writeVarInt(BigInt(raw.byteLength));
-      writer.writeBytes(raw);
-    }
+    entry.encode(writer);
     prevType = entry.type;
   }
 }
@@ -326,18 +1322,38 @@ function decodeTrackProperties(reader, payloadEnd) {
     prevType = propType;
     if (propType % 2n === 0n) {
       const value = reader.readVarInt();
-      const tmpWriter = new BufferWriter(16);
-      tmpWriter.writeVarInt(value);
-      const raw = tmpWriter.finish();
-      unknown.push({
-        id: `0x${propType.toString(16)}`,
-        length: raw.byteLength,
-        raw_hex: bytesToHex(raw)
-      });
+      if (propType === TPROP_DELIVERY_TIMEOUT) {
+        result.delivery_timeout = value;
+      } else if (propType === TPROP_MAX_CACHE_DURATION) {
+        result.max_cache_duration = value;
+      } else if (propType === TPROP_DEFAULT_PUBLISHER_PRIORITY) {
+        result.default_publisher_priority = value;
+      } else if (propType === TPROP_DEFAULT_PUBLISHER_GROUP_ORDER) {
+        result.default_publisher_group_order = value;
+      } else if (propType === TPROP_DYNAMIC_GROUPS) {
+        result.dynamic_groups = value;
+      } else {
+        const tmpWriter = new BufferWriter(16);
+        tmpWriter.writeVarInt(value);
+        const raw = tmpWriter.finish();
+        unknown.push({
+          id: `0x${propType.toString(16)}`,
+          length: raw.byteLength,
+          raw_hex: bytesToHex(raw)
+        });
+      }
     } else {
       const length = Number(reader.readVarInt());
       const bytes = reader.readBytes(length);
-      unknown.push({ id: `0x${propType.toString(16)}`, length, raw_hex: bytesToHex(bytes) });
+      if (propType === TPROP_IMMUTABLE_PROPERTIES) {
+        result.immutable_properties = bytesToHex(bytes);
+      } else {
+        unknown.push({
+          id: `0x${propType.toString(16)}`,
+          length,
+          raw_hex: bytesToHex(bytes)
+        });
+      }
     }
   }
   if (unknown.length > 0) result.unknown = unknown;
@@ -476,7 +1492,12 @@ function decodeRequestUpdatePayload(r) {
   const request_id = r.readVarInt();
   const required_request_id_delta = r.readVarInt();
   const parameters = decodeParams(r);
-  return { type: "request_update", request_id, required_request_id_delta, parameters };
+  return {
+    type: "request_update",
+    request_id,
+    required_request_id_delta,
+    parameters
+  };
 }
 function decodePublishPayload(r, payloadEnd) {
   const request_id = r.readVarInt();
@@ -565,7 +1586,14 @@ function decodeFetchPayload(r) {
     const start_object = r.readVarInt();
     const end_group = r.readVarInt();
     const end_object = r.readVarInt();
-    standalone = { track_namespace, track_name, start_group, start_object, end_group, end_object };
+    standalone = {
+      track_namespace,
+      track_name,
+      start_group,
+      start_object,
+      end_group,
+      end_object
+    };
   } else {
     const joining_request_id = r.readVarInt();
     const joining_start = r.readVarInt();
@@ -588,7 +1616,14 @@ function decodeFetchOkPayload(r, payloadEnd) {
   const end_object = r.readVarInt();
   const parameters = decodeParams(r);
   const track_properties = decodeTrackProperties(r, payloadEnd);
-  return { type: "fetch_ok", end_of_track, end_group, end_object, parameters, track_properties };
+  return {
+    type: "fetch_ok",
+    end_of_track,
+    end_group,
+    end_object,
+    parameters,
+    track_properties
+  };
 }
 function decodeTrackStatusPayload(r) {
   const request_id = r.readVarInt();
@@ -627,11 +1662,11 @@ function encodeMessage(message) {
   }
   const payloadWriter = new BufferWriter();
   encodePayload(message, payloadWriter);
-  const payload = payloadWriter.finish();
+  const payload = payloadWriter.finishView();
   if (payload.byteLength > 65535) {
     throw new Error(`Payload too large for 16-bit length: ${payload.byteLength}`);
   }
-  const writer = new BufferWriter();
+  const writer = new BufferWriter(payload.byteLength + 16);
   writer.writeVarInt(typeId);
   writer.writeUint8(payload.byteLength >> 8 & 255);
   writer.writeUint8(payload.byteLength & 255);
@@ -732,357 +1767,37 @@ function decodeMessage(bytes) {
       message = decodeGoAwayPayload(payloadReader);
     } else {
       return {
-        ok: false,
-        error: new DecodeError(
-          "UNKNOWN_MESSAGE_TYPE",
-          `Unknown message type ID: 0x${typeId.toString(16)}`,
-          0
-        )
-      };
-    }
-    return { ok: true, value: message, bytesRead: reader.offset };
-  } catch (e) {
-    if (e instanceof DecodeError) {
-      return { ok: false, error: e };
-    }
-    throw e;
-  }
-}
-var FETCH_STREAM_TYPE = 0x05n;
-function encodeSubgroupStream(stream) {
-  const w = new BufferWriter();
-  const streamType = stream.headerType;
-  w.writeVarInt(BigInt(streamType));
-  const hasSubgroupField = (streamType & 4) !== 0;
-  const hasPriority = streamType < 48;
-  w.writeVarInt(stream.trackAlias);
-  w.writeVarInt(stream.groupId);
-  if (hasSubgroupField) {
-    w.writeVarInt(stream.subgroupId);
-  }
-  if (hasPriority) {
-    w.writeUint8(stream.publisherPriority);
-  }
-  let prevObjectId = -1n;
-  for (const obj of stream.objects) {
-    const delta = prevObjectId < 0n ? obj.objectId : obj.objectId - prevObjectId - 1n;
-    w.writeVarInt(delta);
-    w.writeVarInt(BigInt(obj.payloadLength));
-    if (obj.payloadLength === 0) {
-      w.writeVarInt(obj.status ?? 0n);
-    } else {
-      w.writeBytes(obj.payload);
-    }
-    prevObjectId = obj.objectId;
-  }
-  return w.finish();
-}
-function encodeDatagram(dg) {
-  const w = new BufferWriter();
-  const dgType = dg.datagramType;
-  w.writeVarInt(BigInt(dgType));
-  w.writeVarInt(dg.trackAlias);
-  w.writeVarInt(dg.groupId);
-  const objectIdAbsent = (dgType & 4) !== 0;
-  const isStatus = (dgType & 32) !== 0;
-  const defaultPriority = (dgType & 8) !== 0;
-  if (!objectIdAbsent) {
-    w.writeVarInt(dg.objectId);
-  }
-  if (!defaultPriority) {
-    w.writeUint8(dg.publisherPriority);
-  }
-  if (isStatus) {
-    w.writeVarInt(dg.objectStatus ?? 0n);
-  } else {
-    w.writeBytes(dg.payload);
-  }
-  return w.finish();
-}
-function encodeFetchStream(stream) {
-  const w = new BufferWriter();
-  w.writeVarInt(FETCH_STREAM_TYPE);
-  w.writeVarInt(stream.requestId);
-  for (const obj of stream.objects) {
-    w.writeUint8(obj.serializationFlags);
-    const flags = obj.serializationFlags;
-    if (flags & 8) w.writeVarInt(obj.groupId);
-    const subgroupEncoding = flags & 3;
-    if (subgroupEncoding === 3) w.writeVarInt(obj.subgroupId);
-    if (flags & 4) w.writeVarInt(obj.objectId);
-    if (flags & 16) w.writeUint8(obj.publisherPriority);
-    w.writeVarInt(BigInt(obj.payloadLength));
-    if (obj.payloadLength === 0) {
-      w.writeVarInt(obj.status ?? 0n);
-    } else {
-      w.writeBytes(obj.payload);
-    }
-  }
-  return w.finish();
-}
-function decodeSubgroupStream(bytes) {
-  try {
-    const r = new BufferReader(bytes);
-    const streamType = Number(r.readVarInt());
-    if (!(streamType >= 16 && streamType <= 29 || streamType >= 48 && streamType <= 61)) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected subgroup stream type 0x10-0x1D or 0x30-0x3D, got 0x${streamType.toString(16)}`,
-          0
-        )
-      };
-    }
-    const hasSubgroupField = (streamType & 4) !== 0;
-    const subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
-    const hasPriority = streamType < 48;
-    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 objects = [];
-    let prevObjectId = -1n;
-    let firstObject = true;
-    while (r.remaining > 0) {
-      const delta = r.readVarInt();
-      let objectId;
-      if (firstObject) {
-        objectId = delta;
-        if (subgroupIsFirstObjId && firstObject) {
-          subgroupId = objectId;
-        }
-        firstObject = false;
-      } else {
-        objectId = prevObjectId + 1n + delta;
-      }
-      const payloadLength = Number(r.readVarInt());
-      let payload;
-      let status;
-      if (payloadLength === 0) {
-        status = r.readVarInt();
-        payload = new Uint8Array(0);
-      } else {
-        payload = r.readBytes(payloadLength);
-      }
-      const obj = { type: "object", objectId, payloadLength, payload };
-      if (status !== void 0) obj.status = status;
-      objects.push(obj);
-      prevObjectId = objectId;
-    }
-    return {
-      ok: true,
-      value: {
-        type: "subgroup",
-        headerType: streamType,
-        trackAlias,
-        groupId,
-        subgroupId,
-        publisherPriority,
-        objects
-      },
-      bytesRead: r.offset
-    };
-  } catch (e) {
-    if (e instanceof DecodeError) return { ok: false, error: e };
-    throw e;
-  }
-}
-function decodeDatagram(bytes) {
-  try {
-    const r = new BufferReader(bytes);
-    const dgType = Number(r.readVarInt());
-    const objectIdAbsent = (dgType & 4) !== 0;
-    const endOfGroup = (dgType & 2) !== 0;
-    const isStatus = (dgType & 32) !== 0;
-    const defaultPriority = (dgType & 8) !== 0;
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    let objectId = 0n;
-    if (!objectIdAbsent) {
-      objectId = r.readVarInt();
-    }
-    let publisherPriority = 128;
-    if (!defaultPriority) {
-      publisherPriority = r.readUint8();
-    }
-    let objectStatus;
-    let payload;
-    if (isStatus) {
-      objectStatus = r.readVarInt();
-      payload = new Uint8Array(0);
-    } else {
-      payload = r.readBytes(r.remaining);
-    }
-    const payloadLength = payload.byteLength;
-    const result = {
-      type: "datagram",
-      datagramType: dgType,
-      trackAlias,
-      groupId,
-      objectId,
-      publisherPriority,
-      payloadLength,
-      payload
-    };
-    if (endOfGroup) result.endOfGroup = true;
-    if (objectStatus !== void 0)
-      result.objectStatus = objectStatus;
-    return { ok: true, value: result, bytesRead: r.offset };
-  } catch (e) {
-    if (e instanceof DecodeError) return { ok: false, error: e };
-    throw e;
-  }
-}
-function decodeFetchStream(bytes) {
-  try {
-    const r = new BufferReader(bytes);
-    const streamType = r.readVarInt();
-    if (streamType !== FETCH_STREAM_TYPE) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected fetch stream type 0x05, got 0x${streamType.toString(16)}`,
-          0
-        )
-      };
-    }
-    const requestId = r.readVarInt();
-    const objects = [];
-    let prevGroupId = 0n;
-    let prevSubgroupId = 0n;
-    let prevObjectId = 0n;
-    let prevPriority = 128;
-    let first = true;
-    while (r.remaining > 0) {
-      const flags = r.readUint8();
-      const subgroupEncoding = flags & 3;
-      const objectIdPresent = (flags & 4) !== 0;
-      const groupIdPresent = (flags & 8) !== 0;
-      const priorityPresent = (flags & 16) !== 0;
-      const extensionsPresent = (flags & 32) !== 0;
-      if (flags & 192) {
-        return {
-          ok: false,
-          error: new DecodeError(
-            "CONSTRAINT_VIOLATION",
-            "Reserved bits set in fetch object flags",
-            r.offset
-          )
-        };
-      }
-      let groupId = prevGroupId;
-      if (groupIdPresent) {
-        groupId = r.readVarInt();
-      } else if (first) {
-        return {
-          ok: false,
-          error: new DecodeError(
-            "CONSTRAINT_VIOLATION",
-            "First fetch object must include groupId",
-            r.offset
-          )
-        };
-      }
-      let subgroupId = prevSubgroupId;
-      if (subgroupEncoding === 0) {
-        subgroupId = 0n;
-      } else if (subgroupEncoding === 1) {
-        subgroupId = prevSubgroupId;
-      } else if (subgroupEncoding === 2) {
-        subgroupId = prevSubgroupId + 1n;
-      } else if (subgroupEncoding === 3) {
-        subgroupId = r.readVarInt();
-      }
-      let objectId = prevObjectId + 1n;
-      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();
-      }
-      if (extensionsPresent) {
-        const extLen = Number(r.readVarInt());
-        if (extLen > 0) {
-          r.readBytes(extLen);
-        }
-      }
-      const payloadLength = Number(r.readVarInt());
-      let payload;
-      let status;
-      if (payloadLength > 0) {
-        payload = r.readBytes(payloadLength);
-      } else {
-        status = r.readVarInt();
-        payload = new Uint8Array(0);
-      }
-      const obj = {
-        type: "object",
-        serializationFlags: flags,
-        groupId,
-        subgroupId,
-        objectId,
-        publisherPriority: prevPriority,
-        payloadLength,
-        payload
+        ok: false,
+        error: new DecodeError(
+          "UNKNOWN_MESSAGE_TYPE",
+          `Unknown message type ID: 0x${typeId.toString(16)}`,
+          0
+        )
       };
-      if (status !== void 0) obj.status = status;
-      objects.push(obj);
-      prevGroupId = groupId;
-      prevSubgroupId = subgroupId;
-      prevObjectId = objectId;
-      first = false;
     }
-    return {
-      ok: true,
-      value: { type: "fetch", requestId, objects },
-      bytesRead: r.offset
-    };
+    return { ok: true, value: message, bytesRead: reader.offset };
   } catch (e) {
-    if (e instanceof DecodeError) return { ok: false, error: e };
-    throw e;
-  }
-}
-function decodeDataStream(streamType, bytes) {
-  switch (streamType) {
-    case "subgroup":
-      return decodeSubgroupStream(bytes);
-    case "datagram":
-      return decodeDatagram(bytes);
-    case "fetch":
-      return decodeFetchStream(bytes);
-    default: {
-      const _exhaustive = streamType;
-      throw new Error(`Unknown stream type: ${_exhaustive}`);
+    if (e instanceof DecodeError) {
+      return { ok: false, error: e };
     }
+    throw e;
   }
 }
 function createStreamDecoder() {
   let buffer = new Uint8Array(0);
+  let offset = 0;
   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;
-      while (buffer.length > 0) {
-        const result = decodeMessage(buffer);
+      while (offset < buffer.length) {
+        const result = decodeMessage(buffer.subarray(offset));
         if (!result.ok) {
           if (result.error.code === "UNEXPECTED_END") {
             break;
@@ -1091,11 +1806,11 @@ function createStreamDecoder() {
           return;
         }
         controller.enqueue(result.value);
-        buffer = buffer.slice(result.bytesRead);
+        offset += result.bytesRead;
       }
     },
     flush(controller) {
-      if (buffer.length > 0) {
+      if (offset < buffer.length) {
         controller.error(
           new DecodeError("UNEXPECTED_END", "Stream ended with incomplete message data", 0)
         );
@@ -1103,246 +1818,9 @@ function createStreamDecoder() {
     }
   });
 }
-function createSubgroupStreamDecoder() {
-  let buffer = new Uint8Array(0);
-  let headerEmitted = false;
-  let prevObjectId = -1n;
-  let firstObject = true;
-  let _subgroupIsFirstObjId = false;
-  return new TransformStream({
-    transform(chunk, controller) {
-      const newBuffer = new Uint8Array(buffer.length + chunk.length);
-      newBuffer.set(buffer, 0);
-      newBuffer.set(chunk, buffer.length);
-      buffer = newBuffer;
-      if (!headerEmitted) {
-        try {
-          const r = new BufferReader(buffer);
-          const streamType = Number(r.readVarInt());
-          if (!(streamType >= 16 && streamType <= 29 || streamType >= 48 && streamType <= 61)) {
-            controller.error(
-              new DecodeError(
-                "CONSTRAINT_VIOLATION",
-                `Expected subgroup stream type, got 0x${streamType.toString(16)}`,
-                0
-              )
-            );
-            return;
-          }
-          const hasSubgroupField = (streamType & 4) !== 0;
-          _subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
-          const hasPriority = streamType < 48;
-          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;
-          buffer = buffer.slice(r.offset);
-        } catch (e) {
-          if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
-            return;
-          }
-          controller.error(e);
-          return;
-        }
-      }
-      while (buffer.length > 0) {
-        try {
-          const r = new BufferReader(buffer);
-          const delta = r.readVarInt();
-          let objectId;
-          if (firstObject) {
-            objectId = delta;
-            firstObject = false;
-          } else {
-            objectId = prevObjectId + 1n + delta;
-          }
-          const payloadLength = Number(r.readVarInt());
-          const payload = payloadLength > 0 ? r.readBytes(payloadLength) : new Uint8Array(0);
-          controller.enqueue({ type: "object", objectId, payloadLength, payload });
-          buffer = buffer.slice(r.offset);
-          prevObjectId = objectId;
-        } catch (e) {
-          if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
-            break;
-          }
-          controller.error(e);
-          return;
-        }
-      }
-    },
-    flush(controller) {
-      if (buffer.length > 0) {
-        controller.error(new DecodeError("UNEXPECTED_END", "Stream ended with incomplete data", 0));
-      }
-    }
-  });
-}
-function createFetchStreamDecoder() {
-  let buffer = new Uint8Array(0);
-  let headerEmitted = false;
-  return new TransformStream({
-    transform(chunk, controller) {
-      const newBuffer = new Uint8Array(buffer.length + chunk.length);
-      newBuffer.set(buffer, 0);
-      newBuffer.set(chunk, buffer.length);
-      buffer = newBuffer;
-      if (!headerEmitted) {
-        try {
-          const r = new BufferReader(buffer);
-          const streamType = r.readVarInt();
-          if (streamType !== FETCH_STREAM_TYPE) {
-            controller.error(
-              new DecodeError(
-                "CONSTRAINT_VIOLATION",
-                `Expected fetch stream type 0x05, got 0x${streamType.toString(16)}`,
-                0
-              )
-            );
-            return;
-          }
-          const requestId = r.readVarInt();
-          controller.enqueue({ type: "fetch_header", requestId });
-          headerEmitted = true;
-          buffer = buffer.slice(r.offset);
-        } catch (e) {
-          if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
-            return;
-          }
-          controller.error(e);
-          return;
-        }
-      }
-      while (buffer.length > 0) {
-        try {
-          const r = new BufferReader(buffer);
-          const flags = r.readUint8();
-          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();
-          if (extensionsPresent) {
-            const extLen = Number(r.readVarInt());
-            if (extLen > 0) r.readBytes(extLen);
-          }
-          const payloadLength = Number(r.readVarInt());
-          const payload = payloadLength > 0 ? r.readBytes(payloadLength) : new Uint8Array(0);
-          controller.enqueue({ type: "object", objectId, payloadLength, payload });
-          buffer = buffer.slice(r.offset);
-        } catch (e) {
-          if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
-            break;
-          }
-          controller.error(e);
-          return;
-        }
-      }
-    },
-    flush(controller) {
-      if (buffer.length > 0) {
-        controller.error(new DecodeError("UNEXPECTED_END", "Stream ended with incomplete data", 0));
-      }
-    }
-  });
-}
-function createDataStreamDecoder() {
-  let buffer = new Uint8Array(0);
-  let inner = null;
-  return new TransformStream({
-    transform(chunk, controller) {
-      const newBuffer = new Uint8Array(buffer.length + chunk.length);
-      newBuffer.set(buffer, 0);
-      newBuffer.set(chunk, buffer.length);
-      buffer = newBuffer;
-      if (inner === null) {
-        if (buffer.length === 0) return;
-        const firstByte = buffer[0];
-        if (firstByte >= 16 && firstByte <= 29 || firstByte >= 48 && firstByte <= 61) {
-          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;
-        }
-      }
-    },
-    flush(controller) {
-      if (buffer.length === 0) return;
-      const firstByte = buffer[0];
-      let result;
-      if (firstByte >= 16 && firstByte <= 29 || firstByte >= 48 && firstByte <= 61) {
-        result = decodeSubgroupStream(buffer);
-      } else if (firstByte === 5) {
-        result = decodeFetchStream(buffer);
-      } else {
-        controller.error(
-          new DecodeError(
-            "CONSTRAINT_VIOLATION",
-            `Unknown data stream type: 0x${firstByte.toString(16)}`,
-            0
-          )
-        );
-        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);
-        }
-      }
-    }
-  });
-}
 function createDraft17Codec() {
   return {
-    draft: "draft-ietf-moq-transport-17",
+    draft: "17",
     encodeMessage,
     decodeMessage,
     encodeSubgroupStream,
@@ -1384,8 +1862,6 @@ export {
   SETUP_OPT_MOQT_IMPLEMENTATION,
   MESSAGE_TYPE_MAP,
   MESSAGE_ID_MAP,
-  encodeMessage,
-  decodeMessage,
   encodeSubgroupStream,
   encodeDatagram,
   encodeFetchStream,
@@ -1393,9 +1869,11 @@ export {
   decodeDatagram,
   decodeFetchStream,
   decodeDataStream,
-  createStreamDecoder,
   createSubgroupStreamDecoder,
   createFetchStreamDecoder,
   createDataStreamDecoder,
+  encodeMessage,
+  decodeMessage,
+  createStreamDecoder,
   createDraft17Codec
 };