@moqtap/codec 0.2.2 → 0.3.0

package/dist/{chunk-NGVE2RZT.js → chunk-Y6KCSM3V.js}

@@ -1,8 +1,307 @@
 import {
   BufferReader,
   BufferWriter,
-  DecodeError
-} from "./chunk-A27S7HW7.js";
+  DecodeError,
+  bytesToHex,
+  hexToBytes
+} from "./chunk-VOU7PNHI.js";
+
+// src/drafts/draft09/data-streams.ts
+var SUBGROUP_STREAM_TYPE = 0x04n;
+var DATAGRAM_TYPE = 0x01n;
+var DATAGRAM_STATUS_TYPE = 0x02n;
+var FETCH_STREAM_TYPE = 0x05n;
+function encodeSubgroupStream(stream) {
+  const w = new BufferWriter();
+  w.writeVarInt(SUBGROUP_STREAM_TYPE);
+  w.writeVarInt(stream.trackAlias);
+  w.writeVarInt(stream.groupId);
+  w.writeVarInt(stream.subgroupId);
+  w.writeUint8(stream.publisherPriority);
+  for (const obj of stream.objects) {
+    w.writeVarInt(obj.objectId);
+    w.writeVarInt(obj.extensionHeadersLength);
+    if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+    w.writeVarInt(obj.payloadLength);
+    if (obj.payloadLength === 0 && obj.status !== void 0) {
+      w.writeVarInt(obj.status);
+    } else {
+      w.writeBytes(obj.payload);
+    }
+  }
+  return w.finish();
+}
+function encodeDatagram(dg) {
+  const w = new BufferWriter();
+  w.writeVarInt(DATAGRAM_TYPE);
+  w.writeVarInt(dg.trackAlias);
+  w.writeVarInt(dg.groupId);
+  w.writeVarInt(dg.objectId);
+  w.writeUint8(dg.publisherPriority);
+  w.writeVarInt(dg.extensionHeadersLength);
+  if (dg.extensionData.length > 0) w.writeBytes(dg.extensionData);
+  w.writeBytes(dg.payload);
+  return w.finish();
+}
+function encodeDatagramStatus(dg) {
+  const w = new BufferWriter();
+  w.writeVarInt(DATAGRAM_STATUS_TYPE);
+  w.writeVarInt(dg.trackAlias);
+  w.writeVarInt(dg.groupId);
+  w.writeVarInt(dg.objectId);
+  w.writeUint8(dg.publisherPriority);
+  w.writeVarInt(dg.extensionHeadersLength);
+  if (dg.extensionData.length > 0) w.writeBytes(dg.extensionData);
+  w.writeVarInt(dg.objectStatus);
+  return w.finish();
+}
+function encodeFetchStream(stream) {
+  const w = new BufferWriter();
+  w.writeVarInt(FETCH_STREAM_TYPE);
+  w.writeVarInt(stream.subscribeId);
+  for (const obj of stream.objects) {
+    w.writeVarInt(obj.groupId);
+    w.writeVarInt(obj.subgroupId);
+    w.writeVarInt(obj.objectId);
+    w.writeUint8(obj.publisherPriority);
+    w.writeVarInt(obj.extensionHeadersLength);
+    if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+    w.writeVarInt(obj.payloadLength);
+    if (obj.payloadLength === 0 && obj.status !== void 0) {
+      w.writeVarInt(obj.status);
+    } else {
+      w.writeBytes(obj.payload);
+    }
+  }
+  return w.finish();
+}
+function decodeSubgroupStream(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const streamType = Number(r.readVarInt());
+    if (streamType !== 4) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected subgroup type 0x04, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    const subgroupId = r.readVarInt();
+    const publisherPriority = r.readUint8();
+    const objects = [];
+    while (r.remaining > 0) {
+      const byteOffset = r.offset;
+      const objectId = r.readVarInt();
+      const extensionHeadersLength = r.readVarInt();
+      const extensionData = extensionHeadersLength > 0n ? r.readBytesView(Number(extensionHeadersLength)) : 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,
+        extensionHeadersLength,
+        extensionData,
+        payloadLength,
+        payload
+      };
+      if (status !== void 0) obj.status = status;
+      objects.push(obj);
+    }
+    return {
+      ok: true,
+      value: {
+        type: "subgroup",
+        streamTypeId: 4,
+        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 streamType = Number(r.readVarInt());
+    if (streamType !== 1) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected datagram type 0x01, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    const objectId = r.readVarInt();
+    const publisherPriority = r.readUint8();
+    const extensionHeadersLength = r.readVarInt();
+    const extensionData = extensionHeadersLength > 0n ? r.readBytesView(Number(extensionHeadersLength)) : new Uint8Array(0);
+    const payload = r.remaining > 0 ? r.readBytesView(r.remaining) : new Uint8Array(0);
+    return {
+      ok: true,
+      value: {
+        type: "datagram",
+        streamTypeId: 1,
+        trackAlias,
+        groupId,
+        objectId,
+        publisherPriority,
+        extensionHeadersLength,
+        extensionData,
+        payload
+      },
+      bytesRead: r.offset
+    };
+  } catch (e) {
+    if (e instanceof DecodeError) return { ok: false, error: e };
+    throw e;
+  }
+}
+function decodeDatagramStatus(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const streamType = Number(r.readVarInt());
+    if (streamType !== 2) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected datagram_status type 0x02, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    const objectId = r.readVarInt();
+    const publisherPriority = r.readUint8();
+    const extensionHeadersLength = r.readVarInt();
+    const extensionData = extensionHeadersLength > 0n ? r.readBytesView(Number(extensionHeadersLength)) : new Uint8Array(0);
+    const objectStatus = r.readVarInt();
+    return {
+      ok: true,
+      value: {
+        type: "datagram_status",
+        streamTypeId: 2,
+        trackAlias,
+        groupId,
+        objectId,
+        publisherPriority,
+        extensionHeadersLength,
+        extensionData,
+        objectStatus
+      },
+      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 type 0x05, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const subscribeId = r.readVarInt();
+    const objects = [];
+    while (r.remaining > 0) {
+      const byteOffset = r.offset;
+      const groupId = r.readVarInt();
+      const subgroupId = r.readVarInt();
+      const objectId = r.readVarInt();
+      const publisherPriority = r.readUint8();
+      const extensionHeadersLength = r.readVarInt();
+      const extensionData = extensionHeadersLength > 0n ? r.readBytesView(Number(extensionHeadersLength)) : 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,
+        groupId,
+        subgroupId,
+        objectId,
+        publisherPriority,
+        extensionHeadersLength,
+        extensionData,
+        payloadLength,
+        payload
+      };
+      if (status !== void 0) obj.status = status;
+      objects.push(obj);
+    }
+    return {
+      ok: true,
+      value: { type: "fetch", subscribeId, 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 "datagram_status":
+      return decodeDatagramStatus(bytes);
+    case "fetch":
+      return decodeFetchStream(bytes);
+    default: {
+      const _ = streamType;
+      throw new Error(`Unknown: ${_}`);
+    }
+  }
+}
 
 // src/drafts/draft09/messages.ts
 var MSG_SUBSCRIBE_UPDATE = 0x02n;
@@ -69,20 +368,8 @@ var MESSAGE_ID_MAP = new Map(
 );
 
 // src/drafts/draft09/codec.ts
-function bytesToHex(bytes) {
-  let hex = "";
-  for (let i = 0; i < bytes.byteLength; i++) {
-    hex += bytes[i].toString(16).padStart(2, "0");
-  }
-  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;
-}
+var textEncoder = /* @__PURE__ */ new TextEncoder();
+var textDecoder = /* @__PURE__ */ new TextDecoder();
 function encodeSetupParams(params, w) {
   let count = 0;
   if (params.path !== void 0) count++;
@@ -91,7 +378,7 @@ function encodeSetupParams(params, w) {
   w.writeVarInt(count);
   if (params.path !== void 0) {
     w.writeVarInt(SETUP_PARAM_PATH);
-    const encoded = new TextEncoder().encode(params.path);
+    const encoded = textEncoder.encode(params.path);
     w.writeVarInt(encoded.byteLength);
     w.writeBytes(encoded);
   }
@@ -121,14 +408,18 @@ function decodeSetupParams(r) {
     const length = Number(r.readVarInt());
     if (paramType === SETUP_PARAM_PATH) {
       const bytes = r.readBytes(length);
-      result.path = new TextDecoder().decode(bytes);
+      result.path = textDecoder.decode(bytes);
     } else if (paramType === SETUP_PARAM_MAX_SUBSCRIBE_ID) {
       const blob = r.readBytes(length);
       const tmpReader = new BufferReader(blob);
       result.max_subscribe_id = tmpReader.readVarInt();
     } else {
       const bytes = r.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;
@@ -142,7 +433,7 @@ function encodeParams(params, w) {
   w.writeVarInt(count);
   if (params.authorization_info !== void 0) {
     w.writeVarInt(PARAM_AUTHORIZATION_INFO);
-    const encoded = new TextEncoder().encode(params.authorization_info);
+    const encoded = textEncoder.encode(params.authorization_info);
     w.writeVarInt(encoded.byteLength);
     w.writeBytes(encoded);
   }
@@ -180,7 +471,7 @@ function decodeParams(r) {
     const length = Number(r.readVarInt());
     if (paramType === PARAM_AUTHORIZATION_INFO) {
       const bytes = r.readBytes(length);
-      result.authorization_info = new TextDecoder().decode(bytes);
+      result.authorization_info = textDecoder.decode(bytes);
     } else if (paramType === PARAM_DELIVERY_TIMEOUT) {
       const blob = r.readBytes(length);
       const tmpReader = new BufferReader(blob);
@@ -191,7 +482,11 @@ function decodeParams(r) {
       result.max_cache_duration = tmpReader.readVarInt();
     } else {
       const bytes = r.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;
@@ -431,7 +726,13 @@ function decodeSubscribeErrorPayload(r) {
   const error_code = r.readVarInt();
   const reason_phrase = r.readString();
   const track_alias = r.readVarInt();
-  return { type: "subscribe_error", subscribe_id, error_code, reason_phrase, track_alias };
+  return {
+    type: "subscribe_error",
+    subscribe_id,
+    error_code,
+    reason_phrase,
+    track_alias
+  };
 }
 function decodeSubscribeUpdatePayload(r) {
   const subscribe_id = r.readVarInt();
@@ -455,7 +756,13 @@ function decodeSubscribeDonePayload(r) {
   const status_code = r.readVarInt();
   const stream_count = r.readVarInt();
   const reason_phrase = r.readString();
-  return { type: "subscribe_done", subscribe_id, status_code, stream_count, reason_phrase };
+  return {
+    type: "subscribe_done",
+    subscribe_id,
+    status_code,
+    stream_count,
+    reason_phrase
+  };
 }
 function decodeUnsubscribePayload(r) {
   const subscribe_id = r.readVarInt();
@@ -499,7 +806,12 @@ function decodeSubscribeAnnouncesErrorPayload(r) {
   const track_namespace_prefix = r.readTuple();
   const error_code = r.readVarInt();
   const reason_phrase = r.readString();
-  return { type: "subscribe_announces_error", track_namespace_prefix, error_code, reason_phrase };
+  return {
+    type: "subscribe_announces_error",
+    track_namespace_prefix,
+    error_code,
+    reason_phrase
+  };
 }
 function decodeUnsubscribeAnnouncesPayload(r) {
   const track_namespace_prefix = r.readTuple();
@@ -523,7 +835,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_subscribe_id = r.readVarInt();
     const preceding_group_offset = r.readVarInt();
@@ -596,442 +915,168 @@ function decodeMaxSubscribeIdPayload(r) {
   const subscribe_id = r.readVarInt();
   return { type: "max_subscribe_id", subscribe_id };
 }
-function decodeSubscribesBlockedPayload(r) {
-  const maximum_subscribe_id = r.readVarInt();
-  return { type: "subscribes_blocked", maximum_subscribe_id };
-}
-var payloadDecoders = /* @__PURE__ */ new Map([
-  [MSG_CLIENT_SETUP, decodeClientSetupPayload],
-  [MSG_SERVER_SETUP, decodeServerSetupPayload],
-  [MSG_SUBSCRIBE, decodeSubscribePayload],
-  [MSG_SUBSCRIBE_OK, decodeSubscribeOkPayload],
-  [MSG_SUBSCRIBE_ERROR, decodeSubscribeErrorPayload],
-  [MSG_SUBSCRIBE_UPDATE, decodeSubscribeUpdatePayload],
-  [MSG_SUBSCRIBE_DONE, decodeSubscribeDonePayload],
-  [MSG_UNSUBSCRIBE, decodeUnsubscribePayload],
-  [MSG_ANNOUNCE, decodeAnnouncePayload],
-  [MSG_ANNOUNCE_OK, decodeAnnounceOkPayload],
-  [MSG_ANNOUNCE_ERROR, decodeAnnounceErrorPayload],
-  [MSG_UNANNOUNCE, decodeUnannouncePayload],
-  [MSG_ANNOUNCE_CANCEL, decodeAnnounceCancelPayload],
-  [MSG_SUBSCRIBE_ANNOUNCES, decodeSubscribeAnnouncesPayload],
-  [MSG_SUBSCRIBE_ANNOUNCES_OK, decodeSubscribeAnnouncesOkPayload],
-  [MSG_SUBSCRIBE_ANNOUNCES_ERROR, decodeSubscribeAnnouncesErrorPayload],
-  [MSG_UNSUBSCRIBE_ANNOUNCES, decodeUnsubscribeAnnouncesPayload],
-  [MSG_FETCH, decodeFetchPayload],
-  [MSG_FETCH_OK, decodeFetchOkPayload],
-  [MSG_FETCH_ERROR, decodeFetchErrorPayload],
-  [MSG_FETCH_CANCEL, decodeFetchCancelPayload],
-  [MSG_TRACK_STATUS_REQUEST, decodeTrackStatusRequestPayload],
-  [MSG_TRACK_STATUS, decodeTrackStatusPayload],
-  [MSG_GOAWAY, decodeGoAwayPayload],
-  [MSG_MAX_SUBSCRIBE_ID, decodeMaxSubscribeIdPayload],
-  [MSG_SUBSCRIBES_BLOCKED, decodeSubscribesBlockedPayload]
-]);
-function encodeMessage(message) {
-  const typeId = MESSAGE_ID_MAP.get(message.type);
-  if (typeId === void 0) throw new Error(`Unknown message type: ${message.type}`);
-  const payloadWriter = new BufferWriter();
-  encodePayload(message, payloadWriter);
-  const payload = payloadWriter.finish();
-  const writer = new BufferWriter();
-  writer.writeVarInt(typeId);
-  writer.writeVarInt(payload.byteLength);
-  writer.writeBytes(payload);
-  return writer.finish();
-}
-function encodePayload(msg, w) {
-  switch (msg.type) {
-    case "client_setup":
-      return encodeClientSetupPayload(msg, w);
-    case "server_setup":
-      return encodeServerSetupPayload(msg, w);
-    case "subscribe":
-      return encodeSubscribePayload(msg, w);
-    case "subscribe_ok":
-      return encodeSubscribeOkPayload(msg, w);
-    case "subscribe_error":
-      return encodeSubscribeErrorPayload(msg, w);
-    case "subscribe_update":
-      return encodeSubscribeUpdatePayload(msg, w);
-    case "subscribe_done":
-      return encodeSubscribeDonePayload(msg, w);
-    case "unsubscribe":
-      return encodeUnsubscribePayload(msg, w);
-    case "announce":
-      return encodeAnnouncePayload(msg, w);
-    case "announce_ok":
-      return encodeAnnounceOkPayload(msg, w);
-    case "announce_error":
-      return encodeAnnounceErrorPayload(msg, w);
-    case "unannounce":
-      return encodeUnannouncePayload(msg, w);
-    case "announce_cancel":
-      return encodeAnnounceCancelPayload(msg, w);
-    case "subscribe_announces":
-      return encodeSubscribeAnnouncesPayload(msg, w);
-    case "subscribe_announces_ok":
-      return encodeSubscribeAnnouncesOkPayload(msg, w);
-    case "subscribe_announces_error":
-      return encodeSubscribeAnnouncesErrorPayload(msg, w);
-    case "unsubscribe_announces":
-      return encodeUnsubscribeAnnouncesPayload(msg, w);
-    case "fetch":
-      return encodeFetchPayload(msg, w);
-    case "fetch_ok":
-      return encodeFetchOkPayload(msg, w);
-    case "fetch_error":
-      return encodeFetchErrorPayload(msg, w);
-    case "fetch_cancel":
-      return encodeFetchCancelPayload(msg, w);
-    case "track_status_request":
-      return encodeTrackStatusRequestPayload(msg, w);
-    case "track_status":
-      return encodeTrackStatusPayload(msg, w);
-    case "goaway":
-      return encodeGoAwayPayload(msg, w);
-    case "max_subscribe_id":
-      return encodeMaxSubscribeIdPayload(msg, w);
-    case "subscribes_blocked":
-      return encodeSubscribesBlockedPayload(msg, w);
-    default: {
-      const _exhaustive = msg;
-      throw new Error(`Unhandled message type: ${_exhaustive.type}`);
-    }
-  }
-}
-function decodeMessage(bytes) {
-  try {
-    const reader = new BufferReader(bytes);
-    const typeId = reader.readVarInt();
-    const payloadLength = Number(reader.readVarInt());
-    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 SUBGROUP_STREAM_TYPE = 0x04n;
-var DATAGRAM_TYPE = 0x01n;
-var DATAGRAM_STATUS_TYPE = 0x02n;
-var FETCH_STREAM_TYPE = 0x05n;
-function encodeSubgroupStream(stream) {
-  const w = new BufferWriter();
-  w.writeVarInt(SUBGROUP_STREAM_TYPE);
-  w.writeVarInt(stream.trackAlias);
-  w.writeVarInt(stream.groupId);
-  w.writeVarInt(stream.subgroupId);
-  w.writeUint8(stream.publisherPriority);
-  for (const obj of stream.objects) {
-    w.writeVarInt(obj.objectId);
-    w.writeVarInt(0n);
-    w.writeVarInt(obj.payloadLength);
-    if (obj.payloadLength === 0 && obj.status !== void 0) {
-      w.writeVarInt(obj.status);
-    } else {
-      w.writeBytes(obj.payload);
-    }
-  }
-  return w.finish();
-}
-function encodeDatagram(dg) {
-  const w = new BufferWriter();
-  w.writeVarInt(DATAGRAM_TYPE);
-  w.writeVarInt(dg.trackAlias);
-  w.writeVarInt(dg.groupId);
-  w.writeVarInt(dg.objectId);
-  w.writeUint8(dg.publisherPriority);
-  w.writeVarInt(0n);
-  w.writeBytes(dg.payload);
-  return w.finish();
-}
-function encodeDatagramStatus(dg) {
-  const w = new BufferWriter();
-  w.writeVarInt(DATAGRAM_STATUS_TYPE);
-  w.writeVarInt(dg.trackAlias);
-  w.writeVarInt(dg.groupId);
-  w.writeVarInt(dg.objectId);
-  w.writeUint8(dg.publisherPriority);
-  w.writeVarInt(0n);
-  w.writeVarInt(dg.objectStatus);
-  return w.finish();
-}
-function encodeFetchStream(stream) {
-  const w = new BufferWriter();
-  w.writeVarInt(FETCH_STREAM_TYPE);
-  w.writeVarInt(stream.subscribeId);
-  for (const obj of stream.objects) {
-    w.writeVarInt(obj.groupId);
-    w.writeVarInt(obj.subgroupId);
-    w.writeVarInt(obj.objectId);
-    w.writeUint8(obj.publisherPriority);
-    w.writeVarInt(0n);
-    w.writeVarInt(obj.payloadLength);
-    if (obj.payloadLength === 0 && obj.status !== void 0) {
-      w.writeVarInt(obj.status);
-    } else {
-      w.writeBytes(obj.payload);
-    }
-  }
-  return w.finish();
-}
-function decodeSubgroupStream(bytes) {
-  try {
-    const r = new BufferReader(bytes);
-    const streamType = Number(r.readVarInt());
-    if (streamType !== 4) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected subgroup type 0x04, got 0x${streamType.toString(16)}`,
-          0
-        )
-      };
-    }
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    const subgroupId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    const objects = [];
-    while (r.remaining > 0) {
-      const objectId = r.readVarInt();
-      const extensionHeadersLength = r.readVarInt();
-      if (extensionHeadersLength > 0n) {
-        r.readBytes(Number(extensionHeadersLength));
-      }
-      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,
-        extensionHeadersLength,
-        payloadLength,
-        payload
-      };
-      if (status !== void 0) obj.status = status;
-      objects.push(obj);
-    }
-    return {
-      ok: true,
-      value: {
-        type: "subgroup",
-        streamTypeId: 4,
-        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 streamType = Number(r.readVarInt());
-    if (streamType !== 1) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected datagram type 0x01, got 0x${streamType.toString(16)}`,
-          0
-        )
-      };
-    }
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    const objectId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    const extensionHeadersLength = r.readVarInt();
-    if (extensionHeadersLength > 0n) {
-      r.readBytes(Number(extensionHeadersLength));
-    }
-    const payload = r.remaining > 0 ? r.readBytes(r.remaining) : new Uint8Array(0);
-    return {
-      ok: true,
-      value: {
-        type: "datagram",
-        streamTypeId: 1,
-        trackAlias,
-        groupId,
-        objectId,
-        publisherPriority,
-        extensionHeadersLength,
-        payload
-      },
-      bytesRead: r.offset
-    };
-  } catch (e) {
-    if (e instanceof DecodeError) return { ok: false, error: e };
-    throw e;
-  }
+function decodeSubscribesBlockedPayload(r) {
+  const maximum_subscribe_id = r.readVarInt();
+  return { type: "subscribes_blocked", maximum_subscribe_id };
 }
-function decodeDatagramStatus(bytes) {
-  try {
-    const r = new BufferReader(bytes);
-    const streamType = Number(r.readVarInt());
-    if (streamType !== 2) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected datagram_status type 0x02, got 0x${streamType.toString(16)}`,
-          0
-        )
-      };
-    }
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    const objectId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    const extensionHeadersLength = r.readVarInt();
-    if (extensionHeadersLength > 0n) {
-      r.readBytes(Number(extensionHeadersLength));
+var payloadDecoders = /* @__PURE__ */ new Map([
+  [MSG_CLIENT_SETUP, decodeClientSetupPayload],
+  [MSG_SERVER_SETUP, decodeServerSetupPayload],
+  [MSG_SUBSCRIBE, decodeSubscribePayload],
+  [MSG_SUBSCRIBE_OK, decodeSubscribeOkPayload],
+  [MSG_SUBSCRIBE_ERROR, decodeSubscribeErrorPayload],
+  [MSG_SUBSCRIBE_UPDATE, decodeSubscribeUpdatePayload],
+  [MSG_SUBSCRIBE_DONE, decodeSubscribeDonePayload],
+  [MSG_UNSUBSCRIBE, decodeUnsubscribePayload],
+  [MSG_ANNOUNCE, decodeAnnouncePayload],
+  [MSG_ANNOUNCE_OK, decodeAnnounceOkPayload],
+  [MSG_ANNOUNCE_ERROR, decodeAnnounceErrorPayload],
+  [MSG_UNANNOUNCE, decodeUnannouncePayload],
+  [MSG_ANNOUNCE_CANCEL, decodeAnnounceCancelPayload],
+  [MSG_SUBSCRIBE_ANNOUNCES, decodeSubscribeAnnouncesPayload],
+  [MSG_SUBSCRIBE_ANNOUNCES_OK, decodeSubscribeAnnouncesOkPayload],
+  [MSG_SUBSCRIBE_ANNOUNCES_ERROR, decodeSubscribeAnnouncesErrorPayload],
+  [MSG_UNSUBSCRIBE_ANNOUNCES, decodeUnsubscribeAnnouncesPayload],
+  [MSG_FETCH, decodeFetchPayload],
+  [MSG_FETCH_OK, decodeFetchOkPayload],
+  [MSG_FETCH_ERROR, decodeFetchErrorPayload],
+  [MSG_FETCH_CANCEL, decodeFetchCancelPayload],
+  [MSG_TRACK_STATUS_REQUEST, decodeTrackStatusRequestPayload],
+  [MSG_TRACK_STATUS, decodeTrackStatusPayload],
+  [MSG_GOAWAY, decodeGoAwayPayload],
+  [MSG_MAX_SUBSCRIBE_ID, decodeMaxSubscribeIdPayload],
+  [MSG_SUBSCRIBES_BLOCKED, decodeSubscribesBlockedPayload]
+]);
+function encodeMessage(message) {
+  const typeId = MESSAGE_ID_MAP.get(message.type);
+  if (typeId === void 0) throw new Error(`Unknown message type: ${message.type}`);
+  const payloadWriter = new BufferWriter();
+  encodePayload(message, payloadWriter);
+  const payload = payloadWriter.finishView();
+  const writer = new BufferWriter(payload.byteLength + 16);
+  writer.writeVarInt(typeId);
+  writer.writeVarInt(payload.byteLength);
+  writer.writeBytes(payload);
+  return writer.finish();
+}
+function encodePayload(msg, w) {
+  switch (msg.type) {
+    case "client_setup":
+      return encodeClientSetupPayload(msg, w);
+    case "server_setup":
+      return encodeServerSetupPayload(msg, w);
+    case "subscribe":
+      return encodeSubscribePayload(msg, w);
+    case "subscribe_ok":
+      return encodeSubscribeOkPayload(msg, w);
+    case "subscribe_error":
+      return encodeSubscribeErrorPayload(msg, w);
+    case "subscribe_update":
+      return encodeSubscribeUpdatePayload(msg, w);
+    case "subscribe_done":
+      return encodeSubscribeDonePayload(msg, w);
+    case "unsubscribe":
+      return encodeUnsubscribePayload(msg, w);
+    case "announce":
+      return encodeAnnouncePayload(msg, w);
+    case "announce_ok":
+      return encodeAnnounceOkPayload(msg, w);
+    case "announce_error":
+      return encodeAnnounceErrorPayload(msg, w);
+    case "unannounce":
+      return encodeUnannouncePayload(msg, w);
+    case "announce_cancel":
+      return encodeAnnounceCancelPayload(msg, w);
+    case "subscribe_announces":
+      return encodeSubscribeAnnouncesPayload(msg, w);
+    case "subscribe_announces_ok":
+      return encodeSubscribeAnnouncesOkPayload(msg, w);
+    case "subscribe_announces_error":
+      return encodeSubscribeAnnouncesErrorPayload(msg, w);
+    case "unsubscribe_announces":
+      return encodeUnsubscribeAnnouncesPayload(msg, w);
+    case "fetch":
+      return encodeFetchPayload(msg, w);
+    case "fetch_ok":
+      return encodeFetchOkPayload(msg, w);
+    case "fetch_error":
+      return encodeFetchErrorPayload(msg, w);
+    case "fetch_cancel":
+      return encodeFetchCancelPayload(msg, w);
+    case "track_status_request":
+      return encodeTrackStatusRequestPayload(msg, w);
+    case "track_status":
+      return encodeTrackStatusPayload(msg, w);
+    case "goaway":
+      return encodeGoAwayPayload(msg, w);
+    case "max_subscribe_id":
+      return encodeMaxSubscribeIdPayload(msg, w);
+    case "subscribes_blocked":
+      return encodeSubscribesBlockedPayload(msg, w);
+    default: {
+      const _exhaustive = msg;
+      throw new Error(`Unhandled message type: ${_exhaustive.type}`);
     }
-    const objectStatus = r.readVarInt();
-    return {
-      ok: true,
-      value: {
-        type: "datagram_status",
-        streamTypeId: 2,
-        trackAlias,
-        groupId,
-        objectId,
-        publisherPriority,
-        extensionHeadersLength,
-        objectStatus
-      },
-      bytesRead: r.offset
-    };
-  } catch (e) {
-    if (e instanceof DecodeError) return { ok: false, error: e };
-    throw e;
   }
 }
-function decodeFetchStream(bytes) {
+function decodeMessage(bytes) {
   try {
-    const r = new BufferReader(bytes);
-    const streamType = r.readVarInt();
-    if (streamType !== FETCH_STREAM_TYPE) {
+    const reader = new BufferReader(bytes);
+    const typeId = reader.readVarInt();
+    const payloadLength = Number(reader.readVarInt());
+    const payloadBytes = reader.readBytes(payloadLength);
+    const payloadReader = new BufferReader(payloadBytes);
+    const decoder = payloadDecoders.get(typeId);
+    if (!decoder) {
       return {
         ok: false,
         error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected fetch type 0x05, got 0x${streamType.toString(16)}`,
+          "UNKNOWN_MESSAGE_TYPE",
+          `Unknown message type ID: 0x${typeId.toString(16)}`,
           0
         )
       };
     }
-    const subscribeId = r.readVarInt();
-    const objects = [];
-    while (r.remaining > 0) {
-      const groupId = r.readVarInt();
-      const subgroupId = r.readVarInt();
-      const objectId = r.readVarInt();
-      const publisherPriority = r.readUint8();
-      const extensionHeadersLength = r.readVarInt();
-      if (extensionHeadersLength > 0n) {
-        r.readBytes(Number(extensionHeadersLength));
-      }
-      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",
-        groupId,
-        subgroupId,
-        objectId,
-        publisherPriority,
-        extensionHeadersLength,
-        payloadLength,
-        payload
-      };
-      if (status !== void 0) obj.status = status;
-      objects.push(obj);
-    }
-    return { ok: true, value: { type: "fetch", subscribeId, 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 "datagram_status":
-      return decodeDatagramStatus(bytes);
-    case "fetch":
-      return decodeFetchStream(bytes);
-    default: {
-      const _ = streamType;
-      throw new Error(`Unknown: ${_}`);
-    }
-  }
-}
 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;
           controller.error(result.error);
           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 data", 0));
     }
   });
 }
 function createDraft09Codec() {
   return {
-    draft: "draft-ietf-moq-transport-09",
+    draft: "09",
     encodeMessage,
     decodeMessage,
     encodeSubgroupStream,
@@ -1048,6 +1093,15 @@ function createDraft09Codec() {
 }
 
 export {
+  encodeSubgroupStream,
+  encodeDatagram,
+  encodeDatagramStatus,
+  encodeFetchStream,
+  decodeSubgroupStream,
+  decodeDatagram,
+  decodeDatagramStatus,
+  decodeFetchStream,
+  decodeDataStream,
   MSG_SUBSCRIBE_UPDATE,
   MSG_SUBSCRIBE,
   MSG_SUBSCRIBE_OK,
@@ -1083,15 +1137,6 @@ export {
   MESSAGE_ID_MAP,
   encodeMessage,
   decodeMessage,
-  encodeSubgroupStream,
-  encodeDatagram,
-  encodeDatagramStatus,
-  encodeFetchStream,
-  decodeSubgroupStream,
-  decodeDatagram,
-  decodeDatagramStatus,
-  decodeFetchStream,
-  decodeDataStream,
   createStreamDecoder,
   createDraft09Codec
 };