@moqtap/codec 0.2.2 → 0.3.0

package/dist/{chunk-4RIXXEII.js → chunk-4IVZZOY3.js}

@@ -1,8 +1,298 @@
 import {
   BufferReader,
   BufferWriter,
-  DecodeError
-} from "./chunk-A27S7HW7.js";
+  DecodeError,
+  bytesToHex,
+  hexToBytes
+} from "./chunk-VOU7PNHI.js";
+
+// src/drafts/draft13/data-streams.ts
+var FETCH_STREAM_TYPE = 0x05n;
+function encodeSubgroupStream(stream) {
+  const w = new BufferWriter();
+  const typeId = stream.streamTypeId;
+  w.writeVarInt(BigInt(typeId));
+  const extensionsPresent = (typeId & 1) !== 0;
+  const hasSubgroupField = (typeId & 4) !== 0;
+  w.writeVarInt(stream.trackAlias);
+  w.writeVarInt(stream.groupId);
+  if (hasSubgroupField) w.writeVarInt(stream.subgroupId);
+  w.writeUint8(stream.publisherPriority);
+  for (const obj of stream.objects) {
+    w.writeVarInt(obj.objectId);
+    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);
+    }
+  }
+  return w.finish();
+}
+function encodeDatagram(dg) {
+  const w = new BufferWriter();
+  w.writeVarInt(BigInt(dg.streamTypeId));
+  w.writeVarInt(dg.trackAlias);
+  w.writeVarInt(dg.groupId);
+  w.writeVarInt(dg.objectId);
+  w.writeUint8(dg.publisherPriority);
+  const extensionsPresent = (dg.streamTypeId & 1) !== 0;
+  if (extensionsPresent) {
+    const extData = dg.extensionData ?? new Uint8Array(0);
+    w.writeVarInt(extData.byteLength);
+    if (extData.byteLength > 0) w.writeBytes(extData);
+  }
+  const isStatus = dg.streamTypeId >= 4;
+  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);
+    w.writeVarInt(obj.payloadLength);
+    if (obj.payloadLength === 0) {
+      const status = obj.objectStatus;
+      w.writeVarInt(status ?? 0n);
+    } else {
+      w.writeBytes(obj.payload);
+    }
+  }
+  return w.finish();
+}
+function decodeSubgroupStream(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const streamTypeId = Number(r.readVarInt());
+    const validRange1 = streamTypeId >= 16 && streamTypeId <= 21;
+    const validRange2 = streamTypeId >= 24 && streamTypeId <= 29;
+    if (!validRange1 && !validRange2) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected subgroup type 0x10-0x15 or 0x18-0x1D, got 0x${streamTypeId.toString(16)}`,
+          0
+        )
+      };
+    }
+    const extensionsPresent = (streamTypeId & 1) !== 0;
+    const hasSubgroupField = (streamTypeId & 4) !== 0;
+    const subgroupIsFirstObjId = (streamTypeId & 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 firstObject = true;
+    while (r.remaining > 0) {
+      const byteOffset = r.offset;
+      const objectId = r.readVarInt();
+      if (subgroupIsFirstObjId && firstObject) {
+        subgroupId = objectId;
+      }
+      firstObject = false;
+      let extensionData = new Uint8Array(0);
+      let extensionHeadersLength;
+      if (extensionsPresent) {
+        extensionHeadersLength = r.readVarInt();
+        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,
+        payloadLength,
+        extensionData,
+        payload
+      };
+      if (extensionHeadersLength !== void 0)
+        obj.extensionHeadersLength = extensionHeadersLength;
+      if (status !== void 0) obj.status = status;
+      objects.push(obj);
+    }
+    return {
+      ok: true,
+      value: {
+        type: "subgroup",
+        streamTypeId,
+        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 streamTypeId = Number(r.readVarInt());
+    if (streamTypeId < 0 || streamTypeId > 5) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected datagram type 0x00-0x05, got 0x${streamTypeId.toString(16)}`,
+          0
+        )
+      };
+    }
+    const extensionsPresent = (streamTypeId & 1) !== 0;
+    const endOfGroup = (streamTypeId & 2) !== 0 && streamTypeId < 4;
+    const isStatus = streamTypeId >= 4;
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    const objectId = r.readVarInt();
+    const publisherPriority = r.readUint8();
+    let extensionHeadersLength;
+    let extensionData;
+    if (extensionsPresent) {
+      extensionHeadersLength = r.readVarInt();
+      extensionData = extensionHeadersLength > 0n ? r.readBytesView(Number(extensionHeadersLength)) : new Uint8Array(0);
+    }
+    let objectStatus;
+    let payload;
+    if (isStatus) {
+      objectStatus = r.readVarInt();
+      payload = new Uint8Array(0);
+    } else {
+      payload = r.readBytesView(r.remaining);
+    }
+    const result = {
+      type: "datagram",
+      streamTypeId,
+      trackAlias,
+      groupId,
+      objectId,
+      publisherPriority,
+      payloadLength: payload.byteLength,
+      payload
+    };
+    if (endOfGroup) result.endOfGroup = true;
+    if (extensionHeadersLength !== void 0)
+      result.extensionHeadersLength = extensionHeadersLength;
+    if (extensionData !== void 0)
+      result.extensionData = extensionData;
+    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 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 extensionHeadersLength = r.readVarInt();
+      const extensionData = extensionHeadersLength > 0n ? r.readBytesView(Number(extensionHeadersLength)) : new Uint8Array(0);
+      const payloadLength = Number(r.readVarInt());
+      let payload;
+      let objectStatus;
+      let payloadByteOffset;
+      if (payloadLength === 0) {
+        objectStatus = 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 (objectStatus !== void 0)
+        obj.objectStatus = objectStatus;
+      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 _ = streamType;
+      throw new Error(`Unknown: ${_}`);
+    }
+  }
+}
 
 // src/drafts/draft13/messages.ts
 var MSG_SUBSCRIBE_UPDATE = 0x02n;
@@ -37,8 +327,11 @@ var MSG_CLIENT_SETUP = 0x20n;
 var MSG_SERVER_SETUP = 0x21n;
 var SETUP_PARAM_PATH = 0x01n;
 var SETUP_PARAM_MAX_REQUEST_ID = 0x02n;
-var PARAM_AUTHORIZATION_TOKEN = 0x01n;
-var PARAM_DELIVERY_TIMEOUT = 0x03n;
+var PARAM_DELIVERY_TIMEOUT = 0x02n;
+var PARAM_AUTHORIZATION_TOKEN = 0x03n;
+var PARAM_MAX_CACHE_DURATION = 0x04n;
+var SETUP_PARAM_AUTHORIZATION_TOKEN = 0x03n;
+var SETUP_PARAM_MAX_AUTH_TOKEN_CACHE_SIZE = 0x04n;
 var VARINT_FRAMED_MESSAGES = /* @__PURE__ */ new Set([
   MSG_PUBLISH,
   MSG_PUBLISH_OK,
@@ -81,29 +374,51 @@ var MESSAGE_ID_MAP = new Map(
 );
 
 // src/drafts/draft13/codec.ts
-function bytesToHex(bytes) {
-  let hex = "";
-  for (let i = 0; i < bytes.byteLength; i++) {
-    hex += bytes[i].toString(16).padStart(2, "0");
+var textEncoder = /* @__PURE__ */ new TextEncoder();
+var textDecoder = /* @__PURE__ */ new TextDecoder();
+function encodeAuthorizationToken(at, w) {
+  const tmpW = new BufferWriter(64);
+  tmpW.writeVarInt(at.alias_type);
+  const aliasType = Number(at.alias_type);
+  if (aliasType === 0 || aliasType === 1 || aliasType === 2) {
+    tmpW.writeVarInt(at.token_alias ?? 0n);
   }
-  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);
+  if (aliasType === 1 || aliasType === 3) {
+    tmpW.writeVarInt(at.token_type ?? 0n);
+    const tokenBytes = textEncoder.encode(at.token_value ?? "");
+    tmpW.writeBytes(tokenBytes);
+  }
+  const raw = tmpW.finish();
+  w.writeVarInt(raw.byteLength);
+  w.writeBytes(raw);
+}
+function decodeAuthorizationToken(r, length) {
+  const startOff = r.offset;
+  const alias_type = r.readVarInt();
+  const aliasType = Number(alias_type);
+  const result = { alias_type };
+  if (aliasType === 0 || aliasType === 1 || aliasType === 2) {
+    result.token_alias = r.readVarInt();
+  }
+  if (aliasType === 1 || aliasType === 3) {
+    result.token_type = r.readVarInt();
+    const tokenBytesLen = length - (r.offset - startOff);
+    const tokenBytes = r.readBytes(tokenBytesLen);
+    result.token_value = textDecoder.decode(tokenBytes);
   }
-  return bytes;
+  return result;
 }
 function encodeSetupParams(params, w) {
   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.unknown) count += params.unknown.length;
   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);
   }
@@ -111,6 +426,14 @@ function encodeSetupParams(params, w) {
     w.writeVarInt(SETUP_PARAM_MAX_REQUEST_ID);
     w.writeVarInt(params.max_request_id);
   }
+  if (params.authorization_token !== void 0) {
+    w.writeVarInt(SETUP_PARAM_AUTHORIZATION_TOKEN);
+    encodeAuthorizationToken(params.authorization_token, w);
+  }
+  if (params.max_auth_token_cache_size !== void 0) {
+    w.writeVarInt(SETUP_PARAM_MAX_AUTH_TOKEN_CACHE_SIZE);
+    w.writeVarInt(params.max_auth_token_cache_size);
+  }
   if (params.unknown) {
     for (const u of params.unknown) {
       const id = BigInt(u.id);
@@ -137,6 +460,8 @@ function decodeSetupParams(r) {
       const value = r.readVarInt();
       if (paramType === SETUP_PARAM_MAX_REQUEST_ID) {
         result.max_request_id = value;
+      } else if (paramType === SETUP_PARAM_MAX_AUTH_TOKEN_CACHE_SIZE) {
+        result.max_auth_token_cache_size = value;
       } else {
         const tmpW = new BufferWriter(16);
         tmpW.writeVarInt(value);
@@ -149,11 +474,18 @@ function decodeSetupParams(r) {
       }
     } else {
       const length = Number(r.readVarInt());
-      const bytes = r.readBytes(length);
       if (paramType === SETUP_PARAM_PATH) {
-        result.path = new TextDecoder().decode(bytes);
+        const bytes = r.readBytes(length);
+        result.path = textDecoder.decode(bytes);
+      } else if (paramType === SETUP_PARAM_AUTHORIZATION_TOKEN) {
+        result.authorization_token = decodeAuthorizationToken(r, length);
       } else {
-        unknown.push({ id: `0x${paramType.toString(16)}`, length, raw_hex: bytesToHex(bytes) });
+        const bytes = r.readBytes(length);
+        unknown.push({
+          id: `0x${paramType.toString(16)}`,
+          length,
+          raw_hex: bytesToHex(bytes)
+        });
       }
     }
   }
@@ -162,28 +494,21 @@ function decodeSetupParams(r) {
 }
 function encodeParams(params, w) {
   let count = params.unknown ? params.unknown.length : 0;
-  if (params.authorization_token !== void 0) count++;
   if (params.delivery_timeout !== void 0) count++;
+  if (params.authorization_token !== void 0) count++;
+  if (params.max_cache_duration !== void 0) count++;
   w.writeVarInt(count);
+  if (params.delivery_timeout !== void 0) {
+    w.writeVarInt(PARAM_DELIVERY_TIMEOUT);
+    w.writeVarInt(params.delivery_timeout);
+  }
   if (params.authorization_token !== void 0) {
     w.writeVarInt(PARAM_AUTHORIZATION_TOKEN);
-    const at = params.authorization_token;
-    const tmpW = new BufferWriter(64);
-    tmpW.writeVarInt(at.alias_type);
-    tmpW.writeVarInt(at.token_type);
-    const tokenBytes = new TextEncoder().encode(at.token_value);
-    tmpW.writeBytes(tokenBytes);
-    const raw = tmpW.finish();
-    w.writeVarInt(raw.byteLength);
-    w.writeBytes(raw);
+    encodeAuthorizationToken(params.authorization_token, w);
   }
-  if (params.delivery_timeout !== void 0) {
-    w.writeVarInt(PARAM_DELIVERY_TIMEOUT);
-    const tmpW = new BufferWriter(16);
-    tmpW.writeVarInt(params.delivery_timeout);
-    const raw = tmpW.finish();
-    w.writeVarInt(raw.byteLength);
-    w.writeBytes(raw);
+  if (params.max_cache_duration !== void 0) {
+    w.writeVarInt(PARAM_MAX_CACHE_DURATION);
+    w.writeVarInt(params.max_cache_duration);
   }
   if (params.unknown) {
     for (const u of params.unknown) {
@@ -209,34 +534,31 @@ function decodeParams(r) {
     const paramType = r.readVarInt();
     if (paramType % 2n === 0n) {
       const value = r.readVarInt();
-      const tmpW = new BufferWriter(16);
-      tmpW.writeVarInt(value);
-      const raw = tmpW.finish();
-      unknown.push({
-        id: `0x${paramType.toString(16)}`,
-        length: raw.byteLength,
-        raw_hex: bytesToHex(raw)
-      });
+      if (paramType === PARAM_DELIVERY_TIMEOUT) {
+        result.delivery_timeout = value;
+      } else if (paramType === PARAM_MAX_CACHE_DURATION) {
+        result.max_cache_duration = value;
+      } else {
+        const tmpW = new BufferWriter(16);
+        tmpW.writeVarInt(value);
+        const raw = tmpW.finish();
+        unknown.push({
+          id: `0x${paramType.toString(16)}`,
+          length: raw.byteLength,
+          raw_hex: bytesToHex(raw)
+        });
+      }
     } else {
       const length = Number(r.readVarInt());
-      const startOff = r.offset;
       if (paramType === PARAM_AUTHORIZATION_TOKEN) {
-        const alias_type = r.readVarInt();
-        const token_type = r.readVarInt();
-        const tokenBytesLen = length - (r.offset - startOff);
-        const tokenBytes = r.readBytes(tokenBytesLen);
-        result.authorization_token = {
-          alias_type,
-          token_type,
-          token_value: new TextDecoder().decode(tokenBytes)
-        };
-      } else if (paramType === PARAM_DELIVERY_TIMEOUT) {
-        const blob = r.readBytes(length);
-        const tmpReader = new BufferReader(blob);
-        result.delivery_timeout = tmpReader.readVarInt();
+        result.authorization_token = decodeAuthorizationToken(r, length);
       } 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)
+        });
       }
     }
   }
@@ -257,7 +579,7 @@ function encodeSubscribePayload(msg, w) {
   w.writeTuple(msg.track_namespace);
   w.writeString(msg.track_name);
   w.writeUint8(msg.subscriber_priority);
-  w.writeVarInt(msg.group_order);
+  w.writeUint8(msg.group_order);
   w.writeVarInt(msg.forward);
   w.writeVarInt(msg.filter_type);
   const ft = Number(msg.filter_type);
@@ -274,7 +596,7 @@ function encodeSubscribeOkPayload(msg, w) {
   w.writeVarInt(msg.request_id);
   w.writeVarInt(msg.track_alias);
   w.writeVarInt(msg.expires);
-  w.writeVarInt(msg.group_order);
+  w.writeUint8(msg.group_order);
   w.writeVarInt(msg.content_exists);
   if (msg.content_exists === 1n && msg.largest_location) {
     w.writeVarInt(msg.largest_location.group);
@@ -347,7 +669,7 @@ function encodePublishPayload(msg, w) {
   w.writeTuple(msg.track_namespace);
   w.writeString(msg.track_name);
   w.writeVarInt(msg.track_alias);
-  w.writeVarInt(msg.group_order);
+  w.writeUint8(msg.group_order);
   w.writeVarInt(msg.content_exists);
   if (msg.content_exists === 1n && msg.largest_location) {
     w.writeVarInt(msg.largest_location.group);
@@ -360,7 +682,7 @@ function encodePublishOkPayload(msg, w) {
   w.writeVarInt(msg.request_id);
   w.writeVarInt(msg.forward);
   w.writeUint8(msg.subscriber_priority);
-  w.writeVarInt(msg.group_order);
+  w.writeUint8(msg.group_order);
   w.writeVarInt(msg.filter_type);
   const ft = Number(msg.filter_type);
   if (ft === 3 || ft === 4) {
@@ -380,7 +702,7 @@ function encodePublishErrorPayload(msg, w) {
 function encodeFetchPayload(msg, w) {
   w.writeVarInt(msg.request_id);
   w.writeUint8(msg.subscriber_priority);
-  w.writeVarInt(msg.group_order);
+  w.writeUint8(msg.group_order);
   w.writeVarInt(msg.fetch_type);
   const ft = Number(msg.fetch_type);
   if (ft === 1 && msg.standalone) {
@@ -398,7 +720,7 @@ function encodeFetchPayload(msg, w) {
 }
 function encodeFetchOkPayload(msg, w) {
   w.writeVarInt(msg.request_id);
-  w.writeVarInt(msg.group_order);
+  w.writeUint8(msg.group_order);
   w.writeVarInt(msg.end_of_track);
   w.writeVarInt(msg.end_location.group);
   w.writeVarInt(msg.end_location.object);
@@ -417,7 +739,7 @@ function encodeTrackStatusPayload(msg, w) {
   w.writeTuple(msg.track_namespace);
   w.writeString(msg.track_name);
   w.writeUint8(msg.subscriber_priority);
-  w.writeVarInt(msg.group_order);
+  w.writeUint8(msg.group_order);
   w.writeVarInt(msg.forward);
   w.writeVarInt(msg.filter_type);
   const ft = Number(msg.filter_type);
@@ -434,7 +756,7 @@ function encodeTrackStatusOkPayload(msg, w) {
   w.writeVarInt(msg.request_id);
   w.writeVarInt(msg.track_alias);
   w.writeVarInt(msg.expires);
-  w.writeVarInt(msg.group_order);
+  w.writeUint8(msg.group_order);
   w.writeVarInt(msg.content_exists);
   if (msg.content_exists === 1n && msg.largest_location) {
     w.writeVarInt(msg.largest_location.group);
@@ -476,7 +798,7 @@ function decodeSubscribePayload(r) {
   const track_namespace = r.readTuple();
   const track_name = r.readString();
   const subscriber_priority = r.readUint8();
-  const group_order = r.readVarInt();
+  const group_order = r.readUint8();
   const forward = r.readVarInt();
   const filter_type = r.readVarInt();
   const ft = Number(filter_type);
@@ -514,7 +836,7 @@ function decodeSubscribeOkPayload(r) {
   const request_id = r.readVarInt();
   const track_alias = r.readVarInt();
   const expires = r.readVarInt();
-  const group_order = r.readVarInt();
+  const group_order = r.readUint8();
   const content_exists = r.readVarInt();
   let largest_location;
   if (content_exists === 1n) {
@@ -565,7 +887,13 @@ function decodeSubscribeDonePayload(r) {
   const status_code = r.readVarInt();
   const stream_count = r.readVarInt();
   const reason_phrase = r.readString();
-  return { type: "subscribe_done", request_id, status_code, stream_count, reason_phrase };
+  return {
+    type: "subscribe_done",
+    request_id,
+    status_code,
+    stream_count,
+    reason_phrase
+  };
 }
 function decodeUnsubscribePayload(r) {
   const request_id = r.readVarInt();
@@ -601,7 +929,12 @@ function decodeSubscribeNamespacePayload(r) {
   const request_id = r.readVarInt();
   const track_namespace_prefix = r.readTuple();
   const parameters = decodeParams(r);
-  return { type: "subscribe_namespace", request_id, track_namespace_prefix, parameters };
+  return {
+    type: "subscribe_namespace",
+    request_id,
+    track_namespace_prefix,
+    parameters
+  };
 }
 function decodeSubscribeNamespaceOkPayload(r) {
   const request_id = r.readVarInt();
@@ -611,7 +944,12 @@ function decodeSubscribeNamespaceErrorPayload(r) {
   const request_id = r.readVarInt();
   const error_code = r.readVarInt();
   const reason_phrase = r.readString();
-  return { type: "subscribe_namespace_error", request_id, error_code, reason_phrase };
+  return {
+    type: "subscribe_namespace_error",
+    request_id,
+    error_code,
+    reason_phrase
+  };
 }
 function decodeUnsubscribeNamespacePayload(r) {
   const track_namespace_prefix = r.readTuple();
@@ -622,7 +960,7 @@ function decodePublishPayload(r) {
   const track_namespace = r.readTuple();
   const track_name = r.readString();
   const track_alias = r.readVarInt();
-  const group_order = r.readVarInt();
+  const group_order = r.readUint8();
   const content_exists = r.readVarInt();
   let largest_location;
   if (content_exists === 1n) {
@@ -650,7 +988,7 @@ function decodePublishOkPayload(r) {
   const request_id = r.readVarInt();
   const forward = r.readVarInt();
   const subscriber_priority = r.readUint8();
-  const group_order = r.readVarInt();
+  const group_order = r.readUint8();
   const filter_type = r.readVarInt();
   const ft = Number(filter_type);
   let start_group;
@@ -687,7 +1025,7 @@ function decodePublishErrorPayload(r) {
 function decodeFetchPayload(r) {
   const request_id = r.readVarInt();
   const subscriber_priority = r.readUint8();
-  const group_order = r.readVarInt();
+  const group_order = r.readUint8();
   const fetch_type = r.readVarInt();
   const ft = Number(fetch_type);
   if (ft < 1 || ft > 3) {
@@ -702,7 +1040,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 joining_start = r.readVarInt();
@@ -722,7 +1067,7 @@ function decodeFetchPayload(r) {
 }
 function decodeFetchOkPayload(r) {
   const request_id = r.readVarInt();
-  const group_order = r.readVarInt();
+  const group_order = r.readUint8();
   const end_of_track = r.readVarInt();
   const group = r.readVarInt();
   const object = r.readVarInt();
@@ -751,7 +1096,7 @@ function decodeTrackStatusPayload(r) {
   const track_namespace = r.readTuple();
   const track_name = r.readString();
   const subscriber_priority = r.readUint8();
-  const group_order = r.readVarInt();
+  const group_order = r.readUint8();
   const forward = r.readVarInt();
   const filter_type = r.readVarInt();
   const ft = Number(filter_type);
@@ -789,7 +1134,7 @@ function decodeTrackStatusOkPayload(r) {
   const request_id = r.readVarInt();
   const track_alias = r.readVarInt();
   const expires = r.readVarInt();
-  const group_order = r.readVarInt();
+  const group_order = r.readUint8();
   const content_exists = r.readVarInt();
   let largest_location;
   if (content_exists === 1n) {
@@ -865,18 +1210,14 @@ function encodeMessage(message) {
   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();
+  const payload = payloadWriter.finishView();
+  const writer = new BufferWriter(payload.byteLength + 16);
   writer.writeVarInt(typeId);
-  if (VARINT_FRAMED_MESSAGES.has(typeId)) {
-    writer.writeVarInt(payload.byteLength);
-  } else {
-    if (payload.byteLength > 65535) {
-      throw new Error(`Payload too large for 16-bit length: ${payload.byteLength}`);
-    }
-    writer.writeUint8(payload.byteLength >> 8 & 255);
-    writer.writeUint8(payload.byteLength & 255);
+  if (payload.byteLength > 65535) {
+    throw new Error(`Payload too large for 16-bit length: ${payload.byteLength}`);
   }
+  writer.writeUint8(payload.byteLength >> 8 & 255);
+  writer.writeUint8(payload.byteLength & 255);
   writer.writeBytes(payload);
   return writer.finish();
 }
@@ -952,14 +1293,9 @@ function decodeMessage(bytes) {
   try {
     const reader = new BufferReader(bytes);
     const typeId = reader.readVarInt();
-    let payloadLength;
-    if (VARINT_FRAMED_MESSAGES.has(typeId)) {
-      payloadLength = Number(reader.readVarInt());
-    } else {
-      const lenHi = reader.readUint8();
-      const lenLo = reader.readUint8();
-      payloadLength = lenHi << 8 | lenLo;
-    }
+    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);
@@ -980,236 +1316,39 @@ function decodeMessage(bytes) {
     throw e;
   }
 }
-var FETCH_STREAM_TYPE = 0x05n;
-function encodeSubgroupStream(stream) {
-  const w = new BufferWriter();
-  const typeId = stream.streamTypeId;
-  w.writeVarInt(BigInt(typeId));
-  w.writeVarInt(stream.trackAlias);
-  w.writeVarInt(stream.groupId);
-  if (typeId === 12) w.writeVarInt(stream.subgroupId);
-  w.writeUint8(stream.publisherPriority);
-  for (const obj of stream.objects) {
-    w.writeVarInt(obj.objectId);
-    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(BigInt(dg.streamTypeId));
-  w.writeVarInt(dg.trackAlias);
-  w.writeVarInt(dg.groupId);
-  w.writeVarInt(dg.objectId);
-  w.writeUint8(dg.publisherPriority);
-  if (dg.streamTypeId === 2) {
-    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(obj.extensionHeadersLength);
-    w.writeVarInt(obj.payloadLength);
-    w.writeBytes(obj.payload);
-  }
-  return w.finish();
-}
-function decodeSubgroupStream(bytes) {
-  try {
-    const r = new BufferReader(bytes);
-    const streamTypeId = Number(r.readVarInt());
-    if (streamTypeId !== 8 && streamTypeId !== 12) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected subgroup type 0x08 or 0x0C, got 0x${streamTypeId.toString(16)}`,
-          0
-        )
-      };
-    }
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    let subgroupId = 0n;
-    if (streamTypeId === 12) subgroupId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    const objects = [];
-    while (r.remaining > 0) {
-      const objectId = r.readVarInt();
-      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);
-    }
-    return {
-      ok: true,
-      value: {
-        type: "subgroup",
-        streamTypeId,
-        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 streamTypeId = Number(r.readVarInt());
-    if (streamTypeId !== 0 && streamTypeId !== 2) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected datagram type 0x00 or 0x02, got 0x${streamTypeId.toString(16)}`,
-          0
-        )
-      };
-    }
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    const objectId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    let objectStatus;
-    let payload;
-    if (streamTypeId === 2) {
-      objectStatus = r.readVarInt();
-      payload = new Uint8Array(0);
-    } else {
-      payload = r.readBytes(r.remaining);
-    }
-    const result = {
-      type: "datagram",
-      streamTypeId,
-      trackAlias,
-      groupId,
-      objectId,
-      publisherPriority,
-      payloadLength: payload.byteLength,
-      payload
-    };
-    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 type 0x05, got 0x${streamType.toString(16)}`,
-          0
-        )
-      };
-    }
-    const requestId = 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());
-      const payload = payloadLength > 0 ? r.readBytes(payloadLength) : new Uint8Array(0);
-      objects.push({
-        type: "object",
-        groupId,
-        subgroupId,
-        objectId,
-        publisherPriority,
-        extensionHeadersLength,
-        payloadLength,
-        payload
-      });
-    }
-    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 _ = 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 createDraft13Codec() {
   return {
-    draft: "draft-ietf-moq-transport-13",
+    draft: "13",
     encodeMessage,
     decodeMessage,
     encodeSubgroupStream,
@@ -1224,6 +1363,13 @@ function createDraft13Codec() {
 }
 
 export {
+  encodeSubgroupStream,
+  encodeDatagram,
+  encodeFetchStream,
+  decodeSubgroupStream,
+  decodeDatagram,
+  decodeFetchStream,
+  decodeDataStream,
   MSG_SUBSCRIBE_UPDATE,
   MSG_SUBSCRIBE,
   MSG_SUBSCRIBE_OK,
@@ -1256,20 +1402,13 @@ export {
   MSG_SERVER_SETUP,
   SETUP_PARAM_PATH,
   SETUP_PARAM_MAX_REQUEST_ID,
-  PARAM_AUTHORIZATION_TOKEN,
   PARAM_DELIVERY_TIMEOUT,
+  PARAM_AUTHORIZATION_TOKEN,
   VARINT_FRAMED_MESSAGES,
   MESSAGE_TYPE_MAP,
   MESSAGE_ID_MAP,
   encodeMessage,
   decodeMessage,
-  encodeSubgroupStream,
-  encodeDatagram,
-  encodeFetchStream,
-  decodeSubgroupStream,
-  decodeDatagram,
-  decodeFetchStream,
-  decodeDataStream,
   createStreamDecoder,
   createDraft13Codec
 };