@moqtap/codec 0.2.2 → 0.3.0

package/dist/{chunk-LH4NTURO.js → chunk-Q46ZURKX.js}

@@ -1,8 +1,10 @@
 import {
   BufferReader,
   BufferWriter,
-  DecodeError
-} from "./chunk-A27S7HW7.js";
+  DecodeError,
+  bytesToHex,
+  hexToBytes
+} from "./chunk-VOU7PNHI.js";
 
 // src/drafts/draft16/messages.ts
 var MSG_REQUEST_UPDATE = 0x02n;
@@ -31,6 +33,7 @@ var MSG_CLIENT_SETUP = 0x20n;
 var MSG_SERVER_SETUP = 0x21n;
 var SETUP_PARAM_PATH = 0x01n;
 var SETUP_PARAM_MAX_REQUEST_ID = 0x02n;
+var SETUP_PARAM_AUTHORIZATION_TOKEN = 0x03n;
 var SETUP_PARAM_MAX_AUTH_TOKEN_CACHE_SIZE = 0x04n;
 var SETUP_PARAM_AUTHORITY = 0x05n;
 var SETUP_PARAM_MOQT_IMPLEMENTATION = 0x07n;
@@ -64,25 +67,716 @@ var MESSAGE_ID_MAP = new Map(
   [...MESSAGE_TYPE_MAP.entries()].map(([id, name]) => [name, id])
 );
 
-// src/drafts/draft16/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/draft16/data-streams.ts
+var FETCH_STREAM_TYPE = 0x05n;
+function encodeSubgroupStream(stream) {
+  const w = new BufferWriter();
+  const streamType = stream.headerType;
+  w.writeVarInt(BigInt(streamType));
+  const extensionsPresent = (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);
+  }
+  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 (extensionsPresent) {
+      w.writeVarInt(BigInt(obj.extensionData.length));
+      if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+    }
+    w.writeVarInt(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 extensionsPresent = (dgType & 1) !== 0;
+  const objectIdAbsent = (dgType & 4) !== 0;
+  const defaultPriority = (dgType & 8) !== 0;
+  const isStatus = (dgType & 32) !== 0;
+  if (!objectIdAbsent) {
+    w.writeVarInt(dg.objectId);
+  }
+  if (!defaultPriority) {
+    w.writeUint8(dg.publisherPriority);
+  }
+  if (extensionsPresent) {
+    const extData = dg.extensionData ?? new Uint8Array(0);
+    w.writeVarInt(BigInt(extData.length));
+    if (extData.length > 0) w.writeBytes(extData);
+  }
+  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 & 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) {
+        w.writeVarInt(BigInt(obj.extensionData.length));
+        if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+      }
+      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 <= 31 || streamType >= 48 && streamType <= 63) || (streamType & 6) === 6) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected subgroup stream type 0x10-0x1F/0x30-0x3F, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const extensionsPresent = (streamType & 1) !== 0;
+    const hasSubgroupField = (streamType & 4) !== 0;
+    const subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
+    const endOfGroup = (streamType & 8) !== 0;
+    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 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;
+      }
+      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());
+      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,
+        extensionData,
+        payload
+      };
+      if (status !== void 0) obj.status = status;
+      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;
   }
-  return hex;
 }
-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 decodeDatagram(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const dgType = Number(r.readVarInt());
+    const extensionsPresent = (dgType & 1) !== 0;
+    const objectIdAbsent = (dgType & 4) !== 0;
+    const endOfGroup = (dgType & 2) !== 0;
+    const defaultPriority = (dgType & 8) !== 0;
+    const isStatus = (dgType & 32) !== 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 extensionData;
+    if (extensionsPresent) {
+      const extLen = Number(r.readVarInt());
+      extensionData = extLen > 0 ? r.readBytesView(extLen) : new Uint8Array(0);
+    }
+    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 (extensionData !== void 0)
+      result.extensionData = extensionData;
+    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;
+      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());
+        const payloadByteOffset = r.offset;
+        payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
+        objects.push({
+          type: "object",
+          byteOffset,
+          payloadByteOffset,
+          serializationFlags: flags,
+          groupId,
+          subgroupId,
+          objectId,
+          publisherPriority: prevPriority,
+          payloadLength,
+          extensionData: new Uint8Array(0),
+          payload
+        });
+      } else {
+        const datagramForwarding = (flags & 64) !== 0;
+        const subgroupEncoding = datagramForwarding ? -1 : flags & 3;
+        const objectIdPresent = (flags & 4) !== 0;
+        const groupIdPresent = (flags & 8) !== 0;
+        const priorityPresent = (flags & 16) !== 0;
+        const extensionsPresent = (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 (datagramForwarding) {
+        } else 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
+              )
+            };
+          }
+        } 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 {
+          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 extensionData = new Uint8Array(0);
+        if (extensionsPresent) {
+          const extLen = Number(r.readVarInt());
+          extensionData = extLen > 0 ? r.readBytesView(extLen) : new Uint8Array(0);
+        }
+        payloadLength = Number(r.readVarInt());
+        const payloadByteOffset = r.offset;
+        payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
+        objects.push({
+          type: "object",
+          byteOffset,
+          payloadByteOffset,
+          serializationFlags: flags,
+          groupId,
+          subgroupId,
+          objectId,
+          publisherPriority: prevPriority,
+          payloadLength,
+          extensionData,
+          payload
+        });
+      }
+      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 <= 31 || streamType >= 48 && streamType <= 63)) {
+            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());
+          let payloadByteOffset;
+          let status;
+          if (payloadLength === 0) {
+            status = r.readVarInt();
+            payloadByteOffset = r.offset;
+          } else {
+            payloadByteOffset = r.offset;
+          }
+          const payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
+          const obj = {
+            type: "object",
+            byteOffset: 0,
+            payloadByteOffset,
+            objectId,
+            payloadLength,
+            payload,
+            extensionData
+          };
+          if (status !== void 0) obj.status = status;
+          controller.enqueue(obj);
+          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 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",
+            byteOffset: 0,
+            payloadByteOffset,
+            objectId,
+            payloadLength,
+            payload,
+            extensionData
+          });
+          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 <= 31 || firstByte >= 48 && firstByte <= 63) {
+          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 <= 31 || firstByte >= 48 && firstByte <= 63) {
+        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/draft16/codec.ts
+var textEncoder = /* @__PURE__ */ new TextEncoder();
+var textDecoder = /* @__PURE__ */ new TextDecoder();
 function encodeSetupParams(params, writer) {
   let count = 0;
   if (params.path !== void 0) count++;
   if (params.max_request_id !== void 0) count++;
+  if (params.authorization_token !== void 0) count++;
   if (params.max_auth_token_cache_size !== void 0) count++;
   if (params.authority !== void 0) count++;
   if (params.moqt_implementation !== void 0) count++;
@@ -90,7 +784,7 @@ function encodeSetupParams(params, writer) {
   writer.writeVarInt(count);
   if (params.path !== void 0) {
     writer.writeVarInt(SETUP_PARAM_PATH);
-    const encoded = new TextEncoder().encode(params.path);
+    const encoded = textEncoder.encode(params.path);
     writer.writeVarInt(encoded.byteLength);
     writer.writeBytes(encoded);
   }
@@ -98,19 +792,27 @@ function encodeSetupParams(params, writer) {
     writer.writeVarInt(SETUP_PARAM_MAX_REQUEST_ID);
     writer.writeVarInt(params.max_request_id);
   }
+  if (params.authorization_token !== void 0) {
+    writer.writeVarInt(SETUP_PARAM_AUTHORIZATION_TOKEN);
+    const tmpW = new BufferWriter(64);
+    encodeAuthorizationToken(params.authorization_token, tmpW);
+    const raw = tmpW.finish();
+    writer.writeVarInt(raw.byteLength);
+    writer.writeBytes(raw);
+  }
   if (params.max_auth_token_cache_size !== void 0) {
     writer.writeVarInt(SETUP_PARAM_MAX_AUTH_TOKEN_CACHE_SIZE);
     writer.writeVarInt(params.max_auth_token_cache_size);
   }
   if (params.authority !== void 0) {
     writer.writeVarInt(SETUP_PARAM_AUTHORITY);
-    const encoded = new TextEncoder().encode(params.authority);
+    const encoded = textEncoder.encode(params.authority);
     writer.writeVarInt(encoded.byteLength);
     writer.writeBytes(encoded);
   }
   if (params.moqt_implementation !== void 0) {
     writer.writeVarInt(SETUP_PARAM_MOQT_IMPLEMENTATION);
-    const encoded = new TextEncoder().encode(params.moqt_implementation);
+    const encoded = textEncoder.encode(params.moqt_implementation);
     writer.writeVarInt(encoded.byteLength);
     writer.writeBytes(encoded);
   }
@@ -157,11 +859,13 @@ function decodeSetupParams(reader) {
       const length = Number(reader.readVarInt());
       const bytes = reader.readBytes(length);
       if (paramType === SETUP_PARAM_PATH) {
-        result.path = new TextDecoder().decode(bytes);
+        result.path = textDecoder.decode(bytes);
+      } else if (paramType === SETUP_PARAM_AUTHORIZATION_TOKEN) {
+        result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes));
       } else if (paramType === SETUP_PARAM_AUTHORITY) {
-        result.authority = new TextDecoder().decode(bytes);
+        result.authority = textDecoder.decode(bytes);
       } else if (paramType === SETUP_PARAM_MOQT_IMPLEMENTATION) {
-        result.moqt_implementation = new TextDecoder().decode(bytes);
+        result.moqt_implementation = textDecoder.decode(bytes);
       } else {
         unknown.push({
           id: `0x${paramType.toString(16)}`,
@@ -176,19 +880,144 @@ function decodeSetupParams(reader) {
   }
   return result;
 }
+function encodeAuthorizationToken(token, w) {
+  w.writeVarInt(token.alias_type);
+  const aliasType = Number(token.alias_type);
+  if (aliasType === 0 || aliasType === 1) {
+    w.writeVarInt(token.token_alias);
+  }
+  if (aliasType === 1 || aliasType === 3) {
+    w.writeVarInt(token.token_type);
+    const tokenBytes = hexToBytes(token.token_value_hex);
+    w.writeBytes(tokenBytes);
+  }
+}
+function decodeAuthorizationToken(r) {
+  const alias_type = r.readVarInt();
+  const aliasType = Number(alias_type);
+  const result = { alias_type };
+  if (aliasType === 0 || aliasType === 1) {
+    result.token_alias = r.readVarInt();
+  }
+  if (aliasType === 1 || aliasType === 3) {
+    result.token_type = r.readVarInt();
+    const tokenBytes = r.readBytesView(r.remaining);
+    result.token_value_hex = bytesToHex(tokenBytes);
+  }
+  return result;
+}
+var PARAM_DELIVERY_TIMEOUT = 0x02n;
+var PARAM_AUTHORIZATION_TOKEN = 0x03n;
+var PARAM_MAX_CACHE_DURATION = 0x04n;
 var PARAM_EXPIRES = 0x08n;
 var PARAM_LARGEST_OBJECT = 0x09n;
+var PARAM_PUBLISHER_PRIORITY = 0x0en;
+var PARAM_FORWARD = 0x10n;
 var PARAM_SUBSCRIBER_PRIORITY = 0x20n;
 var PARAM_SUBSCRIPTION_FILTER = 0x21n;
 var PARAM_GROUP_ORDER = 0x22n;
+var PARAM_DYNAMIC_GROUPS = 0x30n;
+var PARAM_NEW_GROUP_REQUEST = 0x32n;
+var TRACK_EXT_DELIVERY_TIMEOUT = 0x02n;
+var TRACK_EXT_MAX_CACHE_DURATION = 0x04n;
+var TRACK_EXT_DEFAULT_PUBLISHER_PRIORITY = 0x0en;
+function encodeTrackExtensions(ext, writer) {
+  if (ext.delivery_timeout !== void 0) {
+    writer.writeVarInt(TRACK_EXT_DELIVERY_TIMEOUT);
+    writer.writeVarInt(ext.delivery_timeout);
+  }
+  if (ext.max_cache_duration !== void 0) {
+    writer.writeVarInt(TRACK_EXT_MAX_CACHE_DURATION);
+    writer.writeVarInt(ext.max_cache_duration);
+  }
+  if (ext.default_publisher_priority !== void 0) {
+    writer.writeVarInt(TRACK_EXT_DEFAULT_PUBLISHER_PRIORITY);
+    writer.writeVarInt(ext.default_publisher_priority);
+  }
+  if (ext.unknown) {
+    for (const u of ext.unknown) {
+      const id = BigInt(u.id);
+      writer.writeVarInt(id);
+      if (id % 2n === 0n) {
+        const raw = hexToBytes(u.raw_hex);
+        const tmpReader = new BufferReader(raw);
+        const value = tmpReader.readVarInt();
+        writer.writeVarInt(value);
+      } else {
+        const raw = hexToBytes(u.raw_hex);
+        writer.writeVarInt(raw.byteLength);
+        writer.writeBytes(raw);
+      }
+    }
+  }
+}
+function decodeTrackExtensions(reader) {
+  const result = {};
+  const unknown = [];
+  while (reader.remaining > 0) {
+    const extType = reader.readVarInt();
+    if (extType === TRACK_EXT_DELIVERY_TIMEOUT) {
+      result.delivery_timeout = reader.readVarInt();
+    } else if (extType === TRACK_EXT_MAX_CACHE_DURATION) {
+      result.max_cache_duration = reader.readVarInt();
+    } else if (extType === TRACK_EXT_DEFAULT_PUBLISHER_PRIORITY) {
+      result.default_publisher_priority = reader.readVarInt();
+    } else if (extType % 2n === 0n) {
+      const value = reader.readVarInt();
+      const tmpWriter = new BufferWriter(16);
+      tmpWriter.writeVarInt(value);
+      const raw = tmpWriter.finish();
+      unknown.push({
+        id: `0x${extType.toString(16)}`,
+        length: raw.byteLength,
+        raw_hex: bytesToHex(raw)
+      });
+    } else {
+      const length = Number(reader.readVarInt());
+      const bytes = reader.readBytes(length);
+      unknown.push({
+        id: `0x${extType.toString(16)}`,
+        length,
+        raw_hex: bytesToHex(bytes)
+      });
+    }
+  }
+  if (unknown.length > 0) {
+    result.unknown = unknown;
+  }
+  return result;
+}
 function encodeParams(params, writer) {
   let count = params.unknown ? params.unknown.length : 0;
+  if (params.delivery_timeout !== void 0) count++;
+  if (params.authorization_token !== void 0) count++;
+  if (params.max_cache_duration !== void 0) count++;
   if (params.expires !== void 0) count++;
   if (params.largest_object !== void 0) count++;
+  if (params.publisher_priority !== void 0) count++;
+  if (params.forward !== void 0) count++;
   if (params.subscriber_priority !== void 0) count++;
   if (params.subscription_filter !== void 0) count++;
   if (params.group_order !== void 0) count++;
+  if (params.dynamic_groups !== void 0) count++;
+  if (params.new_group_request !== void 0) count++;
   writer.writeVarInt(count);
+  if (params.delivery_timeout !== void 0) {
+    writer.writeVarInt(PARAM_DELIVERY_TIMEOUT);
+    writer.writeVarInt(params.delivery_timeout);
+  }
+  if (params.authorization_token !== void 0) {
+    writer.writeVarInt(PARAM_AUTHORIZATION_TOKEN);
+    const tmpW = new BufferWriter(64);
+    encodeAuthorizationToken(params.authorization_token, tmpW);
+    const raw = tmpW.finish();
+    writer.writeVarInt(raw.byteLength);
+    writer.writeBytes(raw);
+  }
+  if (params.max_cache_duration !== void 0) {
+    writer.writeVarInt(PARAM_MAX_CACHE_DURATION);
+    writer.writeVarInt(params.max_cache_duration);
+  }
   if (params.expires !== void 0) {
     writer.writeVarInt(PARAM_EXPIRES);
     writer.writeVarInt(params.expires);
@@ -202,6 +1031,14 @@ function encodeParams(params, writer) {
     writer.writeVarInt(raw.byteLength);
     writer.writeBytes(raw);
   }
+  if (params.publisher_priority !== void 0) {
+    writer.writeVarInt(PARAM_PUBLISHER_PRIORITY);
+    writer.writeVarInt(params.publisher_priority);
+  }
+  if (params.forward !== void 0) {
+    writer.writeVarInt(PARAM_FORWARD);
+    writer.writeVarInt(params.forward);
+  }
   if (params.subscriber_priority !== void 0) {
     writer.writeVarInt(PARAM_SUBSCRIBER_PRIORITY);
     writer.writeVarInt(params.subscriber_priority);
@@ -226,6 +1063,14 @@ function encodeParams(params, writer) {
     writer.writeVarInt(PARAM_GROUP_ORDER);
     writer.writeVarInt(params.group_order);
   }
+  if (params.dynamic_groups !== void 0) {
+    writer.writeVarInt(PARAM_DYNAMIC_GROUPS);
+    writer.writeVarInt(params.dynamic_groups);
+  }
+  if (params.new_group_request !== void 0) {
+    writer.writeVarInt(PARAM_NEW_GROUP_REQUEST);
+    writer.writeVarInt(params.new_group_request);
+  }
   if (params.unknown) {
     for (const u of params.unknown) {
       const id = BigInt(u.id);
@@ -249,12 +1094,28 @@ function decodeParams(reader) {
   const unknown = [];
   for (let i = 0; i < count; i++) {
     const paramType = reader.readVarInt();
-    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 tokenBytes = reader.readBytes(length);
+      result.authorization_token = decodeAuthorizationToken(new BufferReader(tokenBytes));
+    } else if (paramType === PARAM_MAX_CACHE_DURATION) {
+      result.max_cache_duration = reader.readVarInt();
+    } else if (paramType === PARAM_EXPIRES) {
       result.expires = reader.readVarInt();
+    } else if (paramType === PARAM_PUBLISHER_PRIORITY) {
+      result.publisher_priority = reader.readVarInt();
+    } else if (paramType === PARAM_FORWARD) {
+      result.forward = reader.readVarInt();
     } else if (paramType === PARAM_SUBSCRIBER_PRIORITY) {
       result.subscriber_priority = reader.readVarInt();
     } else if (paramType === PARAM_GROUP_ORDER) {
       result.group_order = reader.readVarInt();
+    } else if (paramType === PARAM_DYNAMIC_GROUPS) {
+      result.dynamic_groups = reader.readVarInt();
+    } else if (paramType === PARAM_NEW_GROUP_REQUEST) {
+      result.new_group_request = reader.readVarInt();
     } else if (paramType === PARAM_LARGEST_OBJECT) {
       const length = Number(reader.readVarInt());
       const startOff = reader.offset;
@@ -319,6 +1180,7 @@ function encodeSubscribeOkPayload(msg, w) {
   w.writeVarInt(msg.request_id);
   w.writeVarInt(msg.track_alias);
   encodeParams(msg.parameters, w);
+  if (msg.track_extensions) encodeTrackExtensions(msg.track_extensions, w);
 }
 function encodeRequestUpdatePayload(msg, w) {
   w.writeVarInt(msg.request_id);
@@ -334,6 +1196,7 @@ function encodePublishPayload(msg, w) {
   w.writeString(msg.track_name);
   w.writeVarInt(msg.track_alias);
   encodeParams(msg.parameters, w);
+  if (msg.track_extensions) encodeTrackExtensions(msg.track_extensions, w);
 }
 function encodePublishOkPayload(msg, w) {
   w.writeVarInt(msg.request_id);
@@ -393,6 +1256,7 @@ function encodeFetchOkPayload(msg, w) {
   w.writeVarInt(msg.end_group);
   w.writeVarInt(msg.end_object);
   encodeParams(msg.parameters, w);
+  if (msg.track_extensions) encodeTrackExtensions(msg.track_extensions, w);
 }
 function encodeFetchCancelPayload(msg, w) {
   w.writeVarInt(msg.request_id);
@@ -435,13 +1299,28 @@ function decodeSubscribePayload(r) {
   const track_namespace = r.readTuple();
   const track_name = r.readString();
   const parameters = decodeParams(r);
-  return { type: "subscribe", request_id, track_namespace, track_name, parameters };
+  return {
+    type: "subscribe",
+    request_id,
+    track_namespace,
+    track_name,
+    parameters
+  };
 }
 function decodeSubscribeOkPayload(r) {
   const request_id = r.readVarInt();
   const track_alias = r.readVarInt();
   const parameters = decodeParams(r);
-  return { type: "subscribe_ok", request_id, track_alias, parameters };
+  const result = {
+    type: "subscribe_ok",
+    request_id,
+    track_alias,
+    parameters
+  };
+  if (r.remaining > 0) {
+    result.track_extensions = decodeTrackExtensions(r);
+  }
+  return result;
 }
 function decodeRequestUpdatePayload(r) {
   const request_id = r.readVarInt();
@@ -459,7 +1338,18 @@ function decodePublishPayload(r) {
   const track_name = r.readString();
   const track_alias = r.readVarInt();
   const parameters = decodeParams(r);
-  return { type: "publish", request_id, track_namespace, track_name, track_alias, parameters };
+  const result = {
+    type: "publish",
+    request_id,
+    track_namespace,
+    track_name,
+    track_alias,
+    parameters
+  };
+  if (r.remaining > 0) {
+    result.track_extensions = decodeTrackExtensions(r);
+  }
+  return result;
 }
 function decodePublishOkPayload(r) {
   const request_id = r.readVarInt();
@@ -471,7 +1361,13 @@ function decodePublishDonePayload(r) {
   const status_code = r.readVarInt();
   const stream_count = r.readVarInt();
   const reason_phrase = r.readString();
-  return { type: "publish_done", request_id, status_code, stream_count, reason_phrase };
+  return {
+    type: "publish_done",
+    request_id,
+    status_code,
+    stream_count,
+    reason_phrase
+  };
 }
 function decodePublishNamespacePayload(r) {
   const request_id = r.readVarInt();
@@ -487,7 +1383,12 @@ function decodePublishNamespaceCancelPayload(r) {
   const request_id = r.readVarInt();
   const error_code = r.readVarInt();
   const reason_phrase = r.readString();
-  return { type: "publish_namespace_cancel", request_id, error_code, reason_phrase };
+  return {
+    type: "publish_namespace_cancel",
+    request_id,
+    error_code,
+    reason_phrase
+  };
 }
 function decodeSubscribeNamespacePayload(r) {
   const request_id = r.readVarInt();
@@ -526,7 +1427,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();
@@ -548,7 +1456,18 @@ function decodeFetchOkPayload(r) {
   const end_group = r.readVarInt();
   const end_object = r.readVarInt();
   const parameters = decodeParams(r);
-  return { type: "fetch_ok", request_id, end_of_track, end_group, end_object, parameters };
+  const result = {
+    type: "fetch_ok",
+    request_id,
+    end_of_track,
+    end_group,
+    end_object,
+    parameters
+  };
+  if (r.remaining > 0) {
+    result.track_extensions = decodeTrackExtensions(r);
+  }
+  return result;
 }
 function decodeFetchCancelPayload(r) {
   const request_id = r.readVarInt();
@@ -559,7 +1478,13 @@ function decodeTrackStatusPayload(r) {
   const track_namespace = r.readTuple();
   const track_name = r.readString();
   const parameters = decodeParams(r);
-  return { type: "track_status", request_id, track_namespace, track_name, parameters };
+  return {
+    type: "track_status",
+    request_id,
+    track_namespace,
+    track_name,
+    parameters
+  };
 }
 function decodeRequestOkPayload(r) {
   const request_id = r.readVarInt();
@@ -571,7 +1496,13 @@ function decodeRequestErrorPayload(r) {
   const error_code = r.readVarInt();
   const retry_interval = r.readVarInt();
   const reason_phrase = r.readString();
-  return { type: "request_error", request_id, error_code, retry_interval, reason_phrase };
+  return {
+    type: "request_error",
+    request_id,
+    error_code,
+    retry_interval,
+    reason_phrase
+  };
 }
 function decodeGoAwayPayload(r) {
   const new_session_uri = r.readString();
@@ -618,11 +1549,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);
@@ -695,347 +1626,40 @@ function decodeMessage(bytes) {
     const payloadBytes = reader.readBytes(payloadLength);
     const payloadReader = new BufferReader(payloadBytes);
     const decoder = payloadDecoders.get(typeId);
-    if (!decoder) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "UNKNOWN_MESSAGE_TYPE",
-          `Unknown message type ID: 0x${typeId.toString(16)}`,
-          0
-        )
-      };
-    }
-    const message = decoder(payloadReader);
-    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(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;
-  if (!objectIdAbsent) {
-    w.writeVarInt(dg.objectId);
-  }
-  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(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 trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    let objectId = 0n;
-    if (!objectIdAbsent) {
-      objectId = r.readVarInt();
-    }
-    const 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 === 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
+    if (!decoder) {
+      return {
+        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
-    };
+    const message = decoder(payloadReader);
+    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;
@@ -1044,11 +1668,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)
         );
@@ -1056,246 +1680,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 createDraft16Codec() {
   return {
-    draft: "draft-ietf-moq-transport-16",
+    draft: "16",
     encodeMessage,
     decodeMessage,
     encodeSubgroupStream,
@@ -1344,8 +1731,6 @@ export {
   SETUP_PARAM_MOQT_IMPLEMENTATION,
   MESSAGE_TYPE_MAP,
   MESSAGE_ID_MAP,
-  encodeMessage,
-  decodeMessage,
   encodeSubgroupStream,
   encodeDatagram,
   encodeFetchStream,
@@ -1353,9 +1738,11 @@ export {
   decodeDatagram,
   decodeFetchStream,
   decodeDataStream,
-  createStreamDecoder,
   createSubgroupStreamDecoder,
   createFetchStreamDecoder,
   createDataStreamDecoder,
+  encodeMessage,
+  decodeMessage,
+  createStreamDecoder,
   createDraft16Codec
 };