@moqtap/codec 0.2.2 → 0.2.3

package/dist/{chunk-U2B3B42P.js → chunk-MC7W6PMI.js}

@@ -1,8 +1,12 @@
+import {
+  bytesToHex,
+  hexToBytes
+} from "./chunk-HDWJ2GDE.js";
 import {
   BufferReader,
   BufferWriter,
   DecodeError
-} from "./chunk-A27S7HW7.js";
+} from "./chunk-7L43FE6P.js";
 
 // src/drafts/draft14/messages.ts
 var MSG_SUBSCRIBE_UPDATE = 0x02n;
@@ -74,21 +78,666 @@ var MESSAGE_ID_MAP = new Map(
   [...MESSAGE_TYPE_MAP.entries()].map(([id, name]) => [name, id])
 );
 
-// src/drafts/draft14/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/draft14/data-streams.ts
+var FETCH_STREAM_TYPE = 0x05n;
+function isValidSubgroupType(t) {
+  return t >= 16 && t <= 21 || t >= 24 && t <= 29;
+}
+function encodeSubgroupStream(stream) {
+  const w = new BufferWriter();
+  w.writeVarInt(BigInt(stream.headerType));
+  w.writeVarInt(stream.trackAlias);
+  w.writeVarInt(stream.groupId);
+  const hasSubgroupField = (stream.headerType & 4) !== 0;
+  const extensionsPresent = (stream.headerType & 1) !== 0;
+  if (hasSubgroupField) {
+    w.writeVarInt(stream.subgroupId);
+  }
+  w.writeUint8(stream.publisherPriority);
+  let prevObjectId = -1n;
+  let first = true;
+  for (const obj of stream.objects) {
+    const delta = first ? obj.objectId : obj.objectId - prevObjectId - 1n;
+    w.writeVarInt(delta);
+    first = false;
+    prevObjectId = obj.objectId;
+    if (extensionsPresent) {
+      w.writeVarInt(BigInt(obj.extensionData.length));
+      if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+    }
+    if (obj.payloadLength === 0) {
+      w.writeVarInt(0);
+      w.writeVarInt(obj.status ?? 0n);
+    } else {
+      w.writeVarInt(obj.payloadLength);
+      w.writeBytes(obj.payload);
+    }
+  }
+  return w.finish();
+}
+function encodeDatagram(dg) {
+  const w = new BufferWriter();
+  w.writeVarInt(BigInt(dg.datagramType));
+  w.writeVarInt(dg.trackAlias);
+  w.writeVarInt(dg.groupId);
+  const objectIdPresent = (dg.datagramType & 4) === 0;
+  const isStatus = dg.datagramType >= 32;
+  const extensionsPresent = (dg.datagramType & 1) !== 0;
+  if (objectIdPresent) {
+    w.writeVarInt(dg.objectId);
+  }
+  w.writeUint8(dg.publisherPriority);
+  if (extensionsPresent) {
+    w.writeVarInt(0);
+  }
+  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(obj.groupId);
+    w.writeVarInt(obj.subgroupId);
+    w.writeVarInt(obj.objectId);
+    w.writeUint8(obj.publisherPriority);
+    w.writeVarInt(BigInt(obj.extensionData.length));
+    if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+    if (obj.payloadLength === 0) {
+      w.writeVarInt(0);
+      w.writeVarInt(obj.status ?? 0n);
+    } else {
+      w.writeVarInt(obj.payloadLength);
+      w.writeBytes(obj.payload);
+    }
+  }
+  return w.finish();
+}
+function decodeSubgroupStream(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const streamType = Number(r.readVarInt());
+    if (!isValidSubgroupType(streamType)) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected subgroup stream type 0x10-0x1D, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const extensionsPresent = (streamType & 1) !== 0;
+    const hasSubgroupField = (streamType & 4) !== 0;
+    const subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    let subgroupId = 0n;
+    if (hasSubgroupField) {
+      subgroupId = r.readVarInt();
+    }
+    const 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) {
+          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, payload, extensionData };
+      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;
   }
-  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);
+function decodeDatagram(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const dgType = Number(r.readVarInt());
+    const validDatagram = dgType >= 0 && dgType <= 7 || dgType === 32 || dgType === 33;
+    if (!validDatagram) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected datagram type 0x00-0x07 or 0x20-0x21, got 0x${dgType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const objectIdPresent = (dgType & 4) === 0;
+    const endOfGroup = (dgType & 2) !== 0;
+    const extensionsPresent = (dgType & 1) !== 0;
+    const isStatus = dgType >= 32;
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    let objectId = 0n;
+    if (objectIdPresent) {
+      objectId = r.readVarInt();
+    }
+    const publisherPriority = r.readUint8();
+    if (extensionsPresent) {
+      const extLen = Number(r.readVarInt());
+      if (extLen > 0) {
+        r.readBytesView(extLen);
+      }
+    }
+    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;
+    return { ok: true, value: result, bytesRead: r.offset };
+  } catch (e) {
+    if (e instanceof DecodeError) return { ok: false, error: e };
+    throw e;
   }
-  return bytes;
 }
+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 = [];
+    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 extLen = Number(r.readVarInt());
+      const 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,
+        groupId,
+        subgroupId,
+        objectId,
+        publisherPriority,
+        payloadLength,
+        payload,
+        extensionData
+      };
+      if (status !== void 0) obj.status = status;
+      objects.push(obj);
+    }
+    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 extensionsPresent = false;
+  let prevObjectId = -1n;
+  let firstObject = true;
+  return new TransformStream({
+    transform(chunk, controller) {
+      if (offset > 0) {
+        buffer = buffer.subarray(offset);
+        offset = 0;
+      }
+      const newBuffer = new Uint8Array(buffer.length + chunk.length);
+      newBuffer.set(buffer, 0);
+      newBuffer.set(chunk, buffer.length);
+      buffer = newBuffer;
+      if (!headerEmitted) {
+        try {
+          const r = new BufferReader(buffer.subarray(offset));
+          const streamType = Number(r.readVarInt());
+          if (!isValidSubgroupType(streamType)) {
+            controller.error(
+              new DecodeError(
+                "CONSTRAINT_VIOLATION",
+                `Expected subgroup stream type 0x10-0x1D, got 0x${streamType.toString(16)}`,
+                0
+              )
+            );
+            return;
+          }
+          extensionsPresent = (streamType & 1) !== 0;
+          const hasSubgroupField = (streamType & 4) !== 0;
+          const trackAlias = r.readVarInt();
+          const groupId = r.readVarInt();
+          let subgroupId = 0n;
+          if (hasSubgroupField) {
+            subgroupId = r.readVarInt();
+          }
+          const publisherPriority = r.readUint8();
+          controller.enqueue({
+            type: "subgroup_header",
+            headerType: streamType,
+            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 byteOffset = r.offset;
+          const delta = r.readVarInt();
+          const objectId = firstObject ? delta : prevObjectId + 1n + delta;
+          firstObject = false;
+          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, payload, extensionData };
+          if (status !== void 0) obj.status = status;
+          controller.enqueue(obj);
+          prevObjectId = objectId;
+          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 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 byteOffset = r.offset;
+          const groupId = r.readVarInt();
+          const subgroupId = r.readVarInt();
+          const objectId = r.readVarInt();
+          const publisherPriority = r.readUint8();
+          const extLen = Number(r.readVarInt());
+          const 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,
+            groupId,
+            subgroupId,
+            objectId,
+            publisherPriority,
+            payloadLength,
+            payload,
+            extensionData
+          };
+          if (status !== void 0) obj.status = status;
+          controller.enqueue(obj);
+          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 detectedType = null;
+  let headerEmitted = false;
+  let extensionsPresent = false;
+  let prevObjectId = -1n;
+  let firstObject = true;
+  return new TransformStream({
+    transform(chunk, controller) {
+      if (offset > 0) {
+        buffer = buffer.subarray(offset);
+        offset = 0;
+      }
+      const newBuffer = new Uint8Array(buffer.length + chunk.length);
+      newBuffer.set(buffer, 0);
+      newBuffer.set(chunk, buffer.length);
+      buffer = newBuffer;
+      if (detectedType === null) {
+        try {
+          const r = new BufferReader(buffer.subarray(offset));
+          const streamType = Number(r.readVarInt());
+          if (isValidSubgroupType(streamType)) {
+            detectedType = "subgroup";
+          } else if (streamType === 5) {
+            detectedType = "fetch";
+          } else {
+            controller.error(
+              new DecodeError(
+                "CONSTRAINT_VIOLATION",
+                `Unknown data stream type: 0x${streamType.toString(16)}`,
+                0
+              )
+            );
+            return;
+          }
+        } catch (e) {
+          if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
+            return;
+          }
+          controller.error(e);
+          return;
+        }
+      }
+      if (detectedType === "subgroup") {
+        if (!headerEmitted) {
+          try {
+            const r = new BufferReader(buffer.subarray(offset));
+            const streamType = Number(r.readVarInt());
+            extensionsPresent = (streamType & 1) !== 0;
+            const hasSubgroupField = (streamType & 4) !== 0;
+            const trackAlias = r.readVarInt();
+            const groupId = r.readVarInt();
+            let subgroupId = 0n;
+            if (hasSubgroupField) subgroupId = r.readVarInt();
+            const publisherPriority = r.readUint8();
+            controller.enqueue({
+              type: "subgroup_header",
+              headerType: streamType,
+              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 byteOffset = r.offset;
+            const delta = r.readVarInt();
+            const objectId = firstObject ? delta : prevObjectId + 1n + delta;
+            firstObject = false;
+            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, payload, extensionData };
+            if (status !== void 0)
+              obj.status = status;
+            controller.enqueue(obj);
+            prevObjectId = objectId;
+            offset += r.offset;
+          } catch (e) {
+            if (e instanceof DecodeError && e.code === "UNEXPECTED_END") break;
+            controller.error(e);
+            return;
+          }
+        }
+      } else {
+        if (!headerEmitted) {
+          try {
+            const r = new BufferReader(buffer.subarray(offset));
+            r.readVarInt();
+            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 byteOffset = r.offset;
+            const groupId = r.readVarInt();
+            const subgroupId = r.readVarInt();
+            const objectId = r.readVarInt();
+            const publisherPriority = r.readUint8();
+            const extLen = Number(r.readVarInt());
+            const 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, payload, extensionData };
+            if (status !== void 0)
+              obj.status = status;
+            controller.enqueue(obj);
+            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));
+      }
+    }
+  });
+}
+
+// src/drafts/draft14/codec.ts
+var textEncoder = /* @__PURE__ */ new TextEncoder();
+var textDecoder = /* @__PURE__ */ new TextDecoder();
 function encodeParams(params, writer) {
   let count = 0;
   if (params.role !== void 0) count++;
@@ -102,7 +751,7 @@ function encodeParams(params, writer) {
   }
   if (params.path !== void 0) {
     writer.writeVarInt(PARAM_PATH);
-    const encoded = new TextEncoder().encode(params.path);
+    const encoded = textEncoder.encode(params.path);
     writer.writeVarInt(encoded.byteLength);
     writer.writeBytes(encoded);
   }
@@ -146,7 +795,7 @@ function decodeParams(reader) {
       const length = Number(reader.readVarInt());
       const bytes = reader.readBytes(length);
       if (paramType === PARAM_PATH) {
-        result.path = new TextDecoder().decode(bytes);
+        result.path = textDecoder.decode(bytes);
       } else {
         unknown.push({
           id: `0x${paramType.toString(16)}`,
@@ -642,11 +1291,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);
@@ -704,195 +1353,67 @@ function encodePayload(msg, w) {
     case "fetch_cancel":
       return encodeFetchCancelPayload(msg, w);
     case "track_status":
-      return encodeTrackStatusPayload(msg, w);
-    case "track_status_ok":
-      return encodeTrackStatusOkPayload(msg, w);
-    case "track_status_error":
-      return encodeTrackStatusErrorPayload(msg, w);
-    case "goaway":
-      return encodeGoAwayPayload(msg, w);
-    case "max_request_id":
-      return encodeMaxRequestIdPayload(msg, w);
-    case "requests_blocked":
-      return encodeRequestsBlockedPayload(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 lenHi = reader.readUint8();
-    const lenLo = reader.readUint8();
-    const payloadLength = lenHi << 8 | lenLo;
-    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;
-  }
-}
-function encodeSubgroupStream(stream) {
-  const w = new BufferWriter();
-  w.writeVarInt(0n);
-  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.payloadLength);
-    w.writeBytes(obj.payload);
-  }
-  return w.finish();
-}
-function encodeDatagram(dg) {
-  const w = new BufferWriter();
-  w.writeVarInt(dg.trackAlias);
-  w.writeVarInt(dg.groupId);
-  w.writeVarInt(dg.objectId);
-  w.writeVarInt(dg.payloadLength);
-  w.writeBytes(dg.payload);
-  return w.finish();
-}
-function encodeFetchStream(stream) {
-  const w = new BufferWriter();
-  w.writeVarInt(2n);
-  w.writeVarInt(stream.subscribeRequestId);
-  for (const obj of stream.objects) {
-    w.writeVarInt(obj.objectId);
-    w.writeVarInt(obj.payloadLength);
-    w.writeBytes(obj.payload);
-  }
-  return w.finish();
-}
-function decodeSubgroupStream(bytes) {
-  try {
-    const r = new BufferReader(bytes);
-    const streamType = r.readVarInt();
-    if (streamType !== 0n) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected subgroup stream type 0, got ${streamType}`,
-          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 payloadLength = Number(r.readVarInt());
-      const payload = r.readBytes(payloadLength);
-      objects.push({ type: "object", objectId, payloadLength, payload });
-    }
-    return {
-      ok: true,
-      value: { type: "subgroup", 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 trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    const objectId = r.readVarInt();
-    const payloadLength = Number(r.readVarInt());
-    const payload = r.readBytes(payloadLength);
-    return {
-      ok: true,
-      value: { type: "datagram", trackAlias, groupId, objectId, payloadLength, payload },
-      bytesRead: r.offset
-    };
-  } catch (e) {
-    if (e instanceof DecodeError) return { ok: false, error: e };
-    throw e;
+      return encodeTrackStatusPayload(msg, w);
+    case "track_status_ok":
+      return encodeTrackStatusOkPayload(msg, w);
+    case "track_status_error":
+      return encodeTrackStatusErrorPayload(msg, w);
+    case "goaway":
+      return encodeGoAwayPayload(msg, w);
+    case "max_request_id":
+      return encodeMaxRequestIdPayload(msg, w);
+    case "requests_blocked":
+      return encodeRequestsBlockedPayload(msg, w);
+    default: {
+      const _exhaustive = msg;
+      throw new Error(`Unhandled message type: ${_exhaustive.type}`);
+    }
   }
 }
-function decodeFetchStream(bytes) {
+function decodeMessage(bytes) {
   try {
-    const r = new BufferReader(bytes);
-    const streamType = r.readVarInt();
-    if (streamType !== 2n) {
+    const reader = new BufferReader(bytes);
+    const typeId = reader.readVarInt();
+    const lenHi = reader.readUint8();
+    const lenLo = reader.readUint8();
+    const payloadLength = lenHi << 8 | lenLo;
+    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 stream type 2, got ${streamType}`,
+          "UNKNOWN_MESSAGE_TYPE",
+          `Unknown message type ID: 0x${typeId.toString(16)}`,
           0
         )
       };
     }
-    const subscribeRequestId = r.readVarInt();
-    const objects = [];
-    while (r.remaining > 0) {
-      const objectId = r.readVarInt();
-      const payloadLength = Number(r.readVarInt());
-      const payload = r.readBytes(payloadLength);
-      objects.push({ type: "object", objectId, payloadLength, payload });
-    }
-    return {
-      ok: true,
-      value: { type: "fetch", subscribeRequestId, 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;
@@ -901,11 +1422,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)
         );
@@ -913,239 +1434,6 @@ function createStreamDecoder() {
     }
   });
 }
-function createSubgroupStreamDecoder() {
-  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 !== 0n) {
-            controller.error(
-              new DecodeError(
-                "CONSTRAINT_VIOLATION",
-                `Expected subgroup stream type 0, got ${streamType}`,
-                0
-              )
-            );
-            return;
-          }
-          const trackAlias = r.readVarInt();
-          const groupId = r.readVarInt();
-          const subgroupId = r.readVarInt();
-          const 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 objectId = r.readVarInt();
-          const payloadLength = Number(r.readVarInt());
-          const payload = r.readBytes(payloadLength);
-          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 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 !== 2n) {
-            controller.error(
-              new DecodeError(
-                "CONSTRAINT_VIOLATION",
-                `Expected fetch stream type 2, got ${streamType}`,
-                0
-              )
-            );
-            return;
-          }
-          const subscribeRequestId = r.readVarInt();
-          controller.enqueue({
-            type: "fetch_header",
-            subscribeRequestId
-          });
-          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 objectId = r.readVarInt();
-          const payloadLength = Number(r.readVarInt());
-          const payload = r.readBytes(payloadLength);
-          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 detectedType = null;
-  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 (detectedType === null) {
-        try {
-          const r = new BufferReader(buffer);
-          const streamType = r.readVarInt();
-          if (streamType === 0n) {
-            detectedType = "subgroup";
-          } else if (streamType === 2n) {
-            detectedType = "fetch";
-          } else {
-            controller.error(
-              new DecodeError("CONSTRAINT_VIOLATION", `Unknown data stream type: ${streamType}`, 0)
-            );
-            return;
-          }
-        } catch (e) {
-          if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
-            return;
-          }
-          controller.error(e);
-          return;
-        }
-      }
-      if (detectedType === "subgroup") {
-        if (!headerEmitted) {
-          try {
-            const r = new BufferReader(buffer);
-            r.readVarInt();
-            const trackAlias = r.readVarInt();
-            const groupId = r.readVarInt();
-            const subgroupId = r.readVarInt();
-            const 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;
-          }
-        }
-      } else {
-        if (!headerEmitted) {
-          try {
-            const r = new BufferReader(buffer);
-            r.readVarInt();
-            const subscribeRequestId = r.readVarInt();
-            controller.enqueue({
-              type: "fetch_header",
-              subscribeRequestId
-            });
-            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 objectId = r.readVarInt();
-          const payloadLength = Number(r.readVarInt());
-          const payload = r.readBytes(payloadLength);
-          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 createDraft14Codec() {
   return {
     draft: "draft-ietf-moq-transport-14",
@@ -1201,8 +1489,6 @@ export {
   PARAM_MAX_REQUEST_ID,
   MESSAGE_TYPE_MAP,
   MESSAGE_ID_MAP,
-  encodeMessage,
-  decodeMessage,
   encodeSubgroupStream,
   encodeDatagram,
   encodeFetchStream,
@@ -1210,9 +1496,11 @@ export {
   decodeDatagram,
   decodeFetchStream,
   decodeDataStream,
-  createStreamDecoder,
   createSubgroupStreamDecoder,
   createFetchStreamDecoder,
   createDataStreamDecoder,
+  encodeMessage,
+  decodeMessage,
+  createStreamDecoder,
   createDraft14Codec
 };