@moqtap/codec 0.8.0 → 0.8.1

package/dist/{chunk-5XZKO2U5.js → chunk-2XH6PHXR.js}

@@ -1103,6 +1103,33 @@ var PARAM_SUBSCRIPTION_FILTER = 0x21n;
 var PARAM_GROUP_ORDER = 0x22n;
 var PARAM_NEW_GROUP_REQUEST = 0x32n;
 var PARAM_TRACK_NAMESPACE_PREFIX = 0x34n;
+var PARAMETER_SCOPE = /* @__PURE__ */ new Map([
+  [0x02n, /* @__PURE__ */ new Set(["request_ok", "subscribe", "request_update"])],
+  [
+    0x03n,
+    /* @__PURE__ */ new Set([
+      "publish",
+      "subscribe",
+      "request_update",
+      "subscribe_namespace",
+      "subscribe_tracks",
+      "publish_namespace",
+      "track_status",
+      "fetch"
+    ])
+  ],
+  [0x04n, /* @__PURE__ */ new Set(["subscribe"])],
+  [0x06n, /* @__PURE__ */ new Set(["request_ok", "subscribe", "request_update"])],
+  [0x08n, /* @__PURE__ */ new Set(["subscribe_ok", "publish", "request_ok"])],
+  [0x09n, /* @__PURE__ */ new Set(["subscribe_ok", "publish", "request_ok"])],
+  [0x0an, /* @__PURE__ */ new Set(["fetch"])],
+  [0x10n, /* @__PURE__ */ new Set(["subscribe", "request_update", "publish", "request_ok", "subscribe_tracks"])],
+  [0x20n, /* @__PURE__ */ new Set(["subscribe", "fetch", "request_update", "request_ok"])],
+  [0x21n, /* @__PURE__ */ new Set(["subscribe", "request_ok", "request_update"])],
+  [0x22n, /* @__PURE__ */ new Set(["subscribe", "request_ok", "fetch"])],
+  [0x32n, /* @__PURE__ */ new Set(["request_ok", "subscribe", "request_update"])],
+  [0x34n, /* @__PURE__ */ new Set(["request_update"])]
+]);
 function encodeParams(params, writer) {
   const entries = [];
   if (params.object_delivery_timeout !== void 0) {
@@ -1144,13 +1171,12 @@ function encodeParams(params, writer) {
   if (params.largest_object !== void 0) {
     entries.push({
       type: PARAM_LARGEST_OBJECT,
+      // A Location is "Two consecutive varints (Group, Object)", which is a
+      // different value encoding from "Length-prefixed". Nothing states the
+      // length, so nothing writes one.
       encode: (w) => {
-        const tmpW = new MoqtBufferWriter(16);
-        tmpW.writeVarInt(params.largest_object.group);
-        tmpW.writeVarInt(params.largest_object.object);
-        const raw = tmpW.finish();
-        w.writeVarInt(BigInt(raw.byteLength));
-        w.writeBytes(raw);
+        w.writeVarInt(params.largest_object.group);
+        w.writeVarInt(params.largest_object.object);
       }
     });
   }
@@ -1207,12 +1233,11 @@ function encodeParams(params, writer) {
   if (params.track_namespace_prefix !== void 0) {
     entries.push({
       type: PARAM_TRACK_NAMESPACE_PREFIX,
+      // The parameter "uses the Track Namespace encoding", which is a tuple
+      // that states its own field count. That is not the Length-prefixed
+      // encoding, so there is no byte length ahead of it.
       encode: (w) => {
-        const tmpW = new MoqtBufferWriter(32);
-        encodeNamespaceTuple(params.track_namespace_prefix, tmpW);
-        const raw = tmpW.finish();
-        w.writeVarInt(BigInt(raw.byteLength));
-        w.writeBytes(raw);
+        encodeNamespaceTuple(params.track_namespace_prefix, w);
       }
     });
   }
@@ -1237,15 +1262,22 @@ function encodeParams(params, writer) {
     prevType = entry.type;
   }
 }
-function decodeParams(reader) {
+function decodeParams(reader, messageType) {
   const count = Number(reader.readVarInt());
   const result = {};
-  const unknown = [];
   let prevType = 0n;
   for (let i = 0; i < count; i++) {
     const delta = reader.readVarInt();
     const paramType = prevType + delta;
     prevType = paramType;
+    const scope = PARAMETER_SCOPE.get(paramType);
+    if (scope !== void 0 && !scope.has(messageType)) {
+      throw new DecodeError(
+        "CONSTRAINT_VIOLATION",
+        `Message Parameter 0x${paramType.toString(16)} may not appear in ${messageType}`,
+        reader.offset
+      );
+    }
     if (paramType === PARAM_OBJECT_DELIVERY_TIMEOUT) {
       result.object_delivery_timeout = reader.readVarInt();
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
@@ -1259,12 +1291,8 @@ function decodeParams(reader) {
     } else if (paramType === PARAM_EXPIRES) {
       result.expires = reader.readVarInt();
     } else if (paramType === PARAM_LARGEST_OBJECT) {
-      const length = Number(reader.readVarInt());
-      const startOff = reader.offset;
       const group = reader.readVarInt();
       const object = reader.readVarInt();
-      const consumed = reader.offset - startOff;
-      if (consumed < length) reader.readBytes(length - consumed);
       result.largest_object = { group, object };
     } else if (paramType === PARAM_FILL_TIMEOUT) {
       result.fill_timeout = reader.readVarInt();
@@ -1292,32 +1320,15 @@ function decodeParams(reader) {
     } else if (paramType === PARAM_NEW_GROUP_REQUEST) {
       result.new_group_request = reader.readVarInt();
     } else if (paramType === PARAM_TRACK_NAMESPACE_PREFIX) {
-      const length = Number(reader.readVarInt());
-      const bytes = reader.readBytes(length);
-      result.track_namespace_prefix = decodeNamespaceTuple(new MoqtBufferReader(bytes));
+      result.track_namespace_prefix = decodeNamespaceTuple(reader);
     } else {
-      if (paramType % 2n === 0n) {
-        const value = reader.readVarInt();
-        const tmpWriter = new MoqtBufferWriter(16);
-        tmpWriter.writeVarInt(value);
-        const raw = tmpWriter.finish();
-        unknown.push({
-          id: `0x${paramType.toString(16)}`,
-          length: raw.byteLength,
-          raw_hex: bytesToHex(raw)
-        });
-      } else {
-        const length = Number(reader.readVarInt());
-        const bytes = reader.readBytes(length);
-        unknown.push({
-          id: `0x${paramType.toString(16)}`,
-          length,
-          raw_hex: bytesToHex(bytes)
-        });
-      }
+      throw new DecodeError(
+        "INVALID_PARAMETER",
+        `Unknown Message Parameter type 0x${paramType.toString(16)}`,
+        reader.offset
+      );
     }
   }
-  if (unknown.length > 0) result.unknown = unknown;
   return result;
 }
 var TPROP_OBJECT_DELIVERY_TIMEOUT = 0x02n;
@@ -1579,7 +1590,7 @@ function decodeSubscribePayload(r) {
   const request_id = r.readVarInt();
   const track_namespace = r.readTuple();
   const track_name = r.readString();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "subscribe");
   return {
     type: "subscribe",
     request_id,
@@ -1590,13 +1601,13 @@ function decodeSubscribePayload(r) {
 }
 function decodeSubscribeOkPayload(r, payloadEnd) {
   const track_alias = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "subscribe_ok");
   const track_properties = decodeTrackProperties(r, payloadEnd);
   return { type: "subscribe_ok", track_alias, parameters, track_properties };
 }
 function decodeRequestUpdatePayload(r) {
   const request_id = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "request_update");
   return {
     type: "request_update",
     request_id,
@@ -1608,7 +1619,7 @@ function decodePublishPayload(r, payloadEnd) {
   const track_namespace = r.readTuple();
   const track_name = r.readString();
   const track_alias = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "publish");
   const track_properties = decodeTrackProperties(r, payloadEnd);
   return {
     type: "publish",
@@ -1629,7 +1640,7 @@ function decodePublishDonePayload(r) {
 function decodePublishNamespacePayload(r) {
   const request_id = r.readVarInt();
   const track_namespace = r.readTuple();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "publish_namespace");
   return {
     type: "publish_namespace",
     request_id,
@@ -1648,7 +1659,7 @@ function decodeNamespaceDonePayload(r) {
 function decodeSubscribeNamespacePayload(r) {
   const request_id = r.readVarInt();
   const namespace_prefix = r.readTuple();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "subscribe_namespace");
   return {
     type: "subscribe_namespace",
     request_id,
@@ -1659,7 +1670,7 @@ function decodeSubscribeNamespacePayload(r) {
 function decodeSubscribeTracksPayload(r) {
   const request_id = r.readVarInt();
   const namespace_prefix = r.readTuple();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "subscribe_tracks");
   return {
     type: "subscribe_tracks",
     request_id,
@@ -1701,7 +1712,7 @@ function decodeFetchPayload(r) {
     const joining_start = r.readVarInt();
     joining = { joining_request_id, joining_start };
   }
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "fetch");
   return {
     type: "fetch",
     request_id,
@@ -1715,7 +1726,7 @@ function decodeFetchOkPayload(r, payloadEnd) {
   const end_of_track = r.readUint8();
   const end_group = r.readVarInt();
   const end_object = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "fetch_ok");
   const track_properties = decodeTrackProperties(r, payloadEnd);
   return {
     type: "fetch_ok",
@@ -1730,7 +1741,7 @@ function decodeTrackStatusPayload(r) {
   const request_id = r.readVarInt();
   const track_namespace = r.readTuple();
   const track_name = r.readString();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "track_status");
   return {
     type: "track_status",
     request_id,
@@ -1740,7 +1751,7 @@ function decodeTrackStatusPayload(r) {
   };
 }
 function decodeRequestOkPayload(r, payloadEnd) {
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "request_ok");
   const track_properties = decodeTrackProperties(r, payloadEnd);
   return { type: "request_ok", parameters, track_properties };
 }

package/dist/{chunk-APTV6F72.js → chunk-3YAR3I3S.js}

@@ -1173,6 +1173,38 @@ function decodeRangeFilter(reader, hasProperty) {
   }
   return property_type !== void 0 ? { set_id, property_type, ranges } : { set_id, ranges };
 }
+var PARAMETER_SCOPE = /* @__PURE__ */ new Map([
+  [0x02n, /* @__PURE__ */ new Set(["request_ok", "subscribe", "request_update", "subscribe_tracks"])],
+  [
+    0x03n,
+    /* @__PURE__ */ new Set([
+      "publish",
+      "subscribe",
+      "request_update",
+      "subscribe_namespace",
+      "subscribe_tracks",
+      "publish_namespace",
+      "track_status",
+      "fetch"
+    ])
+  ],
+  [0x04n, /* @__PURE__ */ new Set(["subscribe", "subscribe_tracks"])],
+  [0x06n, /* @__PURE__ */ new Set(["request_ok", "subscribe", "request_update", "subscribe_tracks"])],
+  [0x08n, /* @__PURE__ */ new Set(["subscribe_ok", "publish", "request_ok"])],
+  [0x09n, /* @__PURE__ */ new Set(["subscribe_ok", "publish", "request_ok"])],
+  [0x0an, /* @__PURE__ */ new Set(["fetch"])],
+  [0x10n, /* @__PURE__ */ new Set(["subscribe", "request_update", "publish", "request_ok", "subscribe_tracks"])],
+  [0x20n, /* @__PURE__ */ new Set(["subscribe", "fetch", "request_update", "request_ok", "subscribe_tracks"])],
+  [0x21n, /* @__PURE__ */ new Set(["subscribe", "request_ok", "request_update", "subscribe_tracks"])],
+  [0x22n, /* @__PURE__ */ new Set(["subscribe", "subscribe_tracks", "fetch"])],
+  [0x25n, /* @__PURE__ */ new Set(["fetch", "subscribe", "subscribe_tracks", "request_ok", "request_update"])],
+  [0x26n, /* @__PURE__ */ new Set(["fetch", "subscribe", "subscribe_tracks", "request_ok", "request_update"])],
+  [0x27n, /* @__PURE__ */ new Set(["fetch", "subscribe", "subscribe_tracks", "request_ok", "request_update"])],
+  [0x28n, /* @__PURE__ */ new Set(["fetch", "subscribe", "subscribe_tracks", "request_ok", "request_update"])],
+  [0x29n, /* @__PURE__ */ new Set(["subscribe_tracks", "request_update"])],
+  [0x32n, /* @__PURE__ */ new Set(["request_ok", "subscribe", "request_update", "subscribe_tracks"])],
+  [0x34n, /* @__PURE__ */ new Set(["request_update"])]
+]);
 function encodeParams(params, writer) {
   const entries = [];
   if (params.object_delivery_timeout !== void 0) {
@@ -1214,13 +1246,12 @@ function encodeParams(params, writer) {
   if (params.largest_object !== void 0) {
     entries.push({
       type: PARAM_LARGEST_OBJECT,
+      // A Location is "Two consecutive varints (Group, Object)", which is a
+      // different value encoding from "Length-prefixed". Nothing states the
+      // length, so nothing writes one.
       encode: (w) => {
-        const tmpW = new MoqtBufferWriter(16);
-        tmpW.writeVarInt(params.largest_object.group);
-        tmpW.writeVarInt(params.largest_object.object);
-        const raw = tmpW.finish();
-        w.writeVarInt(BigInt(raw.byteLength));
-        w.writeBytes(raw);
+        w.writeVarInt(params.largest_object.group);
+        w.writeVarInt(params.largest_object.object);
       }
     });
   }
@@ -1307,12 +1338,11 @@ function encodeParams(params, writer) {
   if (params.track_namespace_prefix !== void 0) {
     entries.push({
       type: PARAM_TRACK_NAMESPACE_PREFIX,
+      // The parameter "uses the Track Namespace encoding", which is a tuple
+      // that states its own field count. That is not the Length-prefixed
+      // encoding, so there is no byte length ahead of it.
       encode: (w) => {
-        const tmpW = new MoqtBufferWriter(32);
-        encodeNamespaceTuple(params.track_namespace_prefix, tmpW);
-        const raw = tmpW.finish();
-        w.writeVarInt(BigInt(raw.byteLength));
-        w.writeBytes(raw);
+        encodeNamespaceTuple(params.track_namespace_prefix, w);
       }
     });
   }
@@ -1337,15 +1367,22 @@ function encodeParams(params, writer) {
     prevType = entry.type;
   }
 }
-function decodeParams(reader) {
+function decodeParams(reader, messageType) {
   const count = Number(reader.readVarInt());
   const result = {};
-  const unknown = [];
   let prevType = 0n;
   for (let i = 0; i < count; i++) {
     const delta = reader.readVarInt();
     const paramType = prevType + delta;
     prevType = paramType;
+    const scope = PARAMETER_SCOPE.get(paramType);
+    if (scope !== void 0 && !scope.has(messageType)) {
+      throw new DecodeError(
+        "CONSTRAINT_VIOLATION",
+        `Message Parameter 0x${paramType.toString(16)} may not appear in ${messageType}`,
+        reader.offset
+      );
+    }
     if (paramType === PARAM_OBJECT_DELIVERY_TIMEOUT) {
       result.object_delivery_timeout = reader.readVarInt();
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
@@ -1359,12 +1396,8 @@ function decodeParams(reader) {
     } else if (paramType === PARAM_EXPIRES) {
       result.expires = reader.readVarInt();
     } else if (paramType === PARAM_LARGEST_OBJECT) {
-      const length = Number(reader.readVarInt());
-      const startOff = reader.offset;
       const group = reader.readVarInt();
       const object = reader.readVarInt();
-      const consumed = reader.offset - startOff;
-      if (consumed < length) reader.readBytes(length - consumed);
       result.largest_object = { group, object };
     } else if (paramType === PARAM_FILL_TIMEOUT) {
       result.fill_timeout = reader.readVarInt();
@@ -1402,32 +1435,15 @@ function decodeParams(reader) {
     } else if (paramType === PARAM_NEW_GROUP_REQUEST) {
       result.new_group_request = reader.readVarInt();
     } else if (paramType === PARAM_TRACK_NAMESPACE_PREFIX) {
-      const length = Number(reader.readVarInt());
-      const bytes = reader.readBytes(length);
-      result.track_namespace_prefix = decodeNamespaceTuple(new MoqtBufferReader(bytes));
+      result.track_namespace_prefix = decodeNamespaceTuple(reader);
     } else {
-      if (paramType % 2n === 0n) {
-        const value = reader.readVarInt();
-        const tmpWriter = new MoqtBufferWriter(16);
-        tmpWriter.writeVarInt(value);
-        const raw = tmpWriter.finish();
-        unknown.push({
-          id: `0x${paramType.toString(16)}`,
-          length: raw.byteLength,
-          raw_hex: bytesToHex(raw)
-        });
-      } else {
-        const length = Number(reader.readVarInt());
-        const bytes = reader.readBytes(length);
-        unknown.push({
-          id: `0x${paramType.toString(16)}`,
-          length,
-          raw_hex: bytesToHex(bytes)
-        });
-      }
+      throw new DecodeError(
+        "INVALID_PARAMETER",
+        `Unknown Message Parameter type 0x${paramType.toString(16)}`,
+        reader.offset
+      );
     }
   }
-  if (unknown.length > 0) result.unknown = unknown;
   return result;
 }
 var TPROP_OBJECT_DELIVERY_TIMEOUT = 0x02n;
@@ -1686,7 +1702,7 @@ function decodeSubscribePayload(r) {
   const request_id = r.readVarInt();
   const track_namespace = r.readTuple();
   const track_name = r.readString();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "subscribe");
   return {
     type: "subscribe",
     request_id,
@@ -1697,13 +1713,13 @@ function decodeSubscribePayload(r) {
 }
 function decodeSubscribeOkPayload(r, payloadEnd) {
   const track_alias = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "subscribe_ok");
   const track_properties = decodeTrackProperties(r, payloadEnd);
   return { type: "subscribe_ok", track_alias, parameters, track_properties };
 }
 function decodeRequestUpdatePayload(r) {
   const request_id = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "request_update");
   return {
     type: "request_update",
     request_id,
@@ -1715,7 +1731,7 @@ function decodePublishPayload(r, payloadEnd) {
   const track_namespace = r.readTuple();
   const track_name = r.readString();
   const track_alias = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "publish");
   const track_properties = decodeTrackProperties(r, payloadEnd);
   return {
     type: "publish",
@@ -1736,7 +1752,7 @@ function decodePublishDonePayload(r) {
 function decodePublishNamespacePayload(r) {
   const request_id = r.readVarInt();
   const track_namespace = r.readTuple();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "publish_namespace");
   return {
     type: "publish_namespace",
     request_id,
@@ -1755,7 +1771,7 @@ function decodeNamespaceDonePayload(r) {
 function decodeSubscribeNamespacePayload(r) {
   const request_id = r.readVarInt();
   const namespace_prefix = r.readTuple();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "subscribe_namespace");
   return {
     type: "subscribe_namespace",
     request_id,
@@ -1766,7 +1782,7 @@ function decodeSubscribeNamespacePayload(r) {
 function decodeSubscribeTracksPayload(r) {
   const request_id = r.readVarInt();
   const namespace_prefix = r.readTuple();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "subscribe_tracks");
   return {
     type: "subscribe_tracks",
     request_id,
@@ -1808,7 +1824,7 @@ function decodeFetchPayload(r) {
     const joining_start = r.readVarInt();
     joining = { joining_request_id, joining_start };
   }
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "fetch");
   return {
     type: "fetch",
     request_id,
@@ -1822,7 +1838,7 @@ function decodeFetchOkPayload(r, payloadEnd) {
   const end_of_track = r.readUint8();
   const end_group = r.readVarInt();
   const end_object = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "fetch_ok");
   const track_properties = decodeTrackProperties(r, payloadEnd);
   return {
     type: "fetch_ok",
@@ -1837,7 +1853,7 @@ function decodeTrackStatusPayload(r) {
   const request_id = r.readVarInt();
   const track_namespace = r.readTuple();
   const track_name = r.readString();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "track_status");
   return {
     type: "track_status",
     request_id,
@@ -1847,7 +1863,7 @@ function decodeTrackStatusPayload(r) {
   };
 }
 function decodeRequestOkPayload(r, payloadEnd) {
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "request_ok");
   const track_properties = decodeTrackProperties(r, payloadEnd);
   return { type: "request_ok", parameters, track_properties };
 }

package/dist/{chunk-BQHLUT37.cjs → chunk-7ENEWAMZ.cjs}

@@ -1121,7 +1121,6 @@ function encodePublishNamespacePayload(msg, w) {
 }
 function encodePublishNamespaceOkPayload(msg, w) {
   w.writeVarInt(msg.request_id);
-  encodeMessageParams(msg.parameters, w);
 }
 function encodePublishNamespaceErrorPayload(msg, w) {
   w.writeVarInt(msg.request_id);
@@ -1143,7 +1142,6 @@ function encodeSubscribeNamespacePayload(msg, w) {
 }
 function encodeSubscribeNamespaceOkPayload(msg, w) {
   w.writeVarInt(msg.request_id);
-  encodeMessageParams(msg.parameters, w);
 }
 function encodeSubscribeNamespaceErrorPayload(msg, w) {
   w.writeVarInt(msg.request_id);
@@ -1431,8 +1429,7 @@ function decodePublishNamespacePayload(r) {
 }
 function decodePublishNamespaceOkPayload(r) {
   const request_id = r.readVarInt();
-  const parameters = decodeMessageParams(r);
-  return { type: "publish_namespace_ok", request_id, parameters };
+  return { type: "publish_namespace_ok", request_id };
 }
 function decodePublishNamespaceErrorPayload(r) {
   const request_id = r.readVarInt();
@@ -1473,8 +1470,7 @@ function decodeSubscribeNamespacePayload(r) {
 }
 function decodeSubscribeNamespaceOkPayload(r) {
   const request_id = r.readVarInt();
-  const parameters = decodeMessageParams(r);
-  return { type: "subscribe_namespace_ok", request_id, parameters };
+  return { type: "subscribe_namespace_ok", request_id };
 }
 function decodeSubscribeNamespaceErrorPayload(r) {
   const request_id = r.readVarInt();

package/dist/{chunk-MD2OA7SE.js → chunk-BV6MITLO.js}

@@ -108,11 +108,14 @@ function encodeDatagram(dg) {
   w.writeVarInt(dg.groupId);
   const extensionsPresent = (dgType & 1) !== 0;
   const objectIdAbsent = (dgType & 4) !== 0;
+  const defaultPriority = (dgType & 8) !== 0;
   const isStatus = (dgType & 32) !== 0;
   if (!objectIdAbsent) {
     w.writeVarInt(dg.objectId);
   }
-  w.writeUint8(dg.publisherPriority);
+  if (!defaultPriority) {
+    w.writeUint8(dg.publisherPriority);
+  }
   if (extensionsPresent) {
     const extData = dg.extensionData ?? new Uint8Array(0);
     w.writeVarInt(BigInt(extData.length));
@@ -154,18 +157,18 @@ function decodeSubgroupStream(bytes) {
   try {
     const r = new BufferReader(bytes);
     const streamType = Number(r.readVarInt());
-    if (!(streamType >= 16 && streamType <= 23 || streamType >= 48 && streamType <= 55)) {
+    if (!(streamType >= 16 && streamType <= 31 || streamType >= 48 && streamType <= 63) || (streamType & 6) === 6) {
       return {
         ok: false,
         error: new DecodeError(
           "CONSTRAINT_VIOLATION",
-          `Expected subgroup stream type 0x10-0x17/0x30-0x37, got 0x${streamType.toString(16)}`,
+          `Expected subgroup stream type 0x10-0x1F/0x30-0x3F, got 0x${streamType.toString(16)}`,
           0
         )
       };
     }
     const extensionsPresent = (streamType & 1) !== 0;
-    const endOfGroup = (streamType & 2) !== 0;
+    const endOfGroup = (streamType & 8) !== 0;
     const hasSubgroupField = (streamType & 4) !== 0;
     const hasPriority = streamType < 48;
     const trackAlias = r.readVarInt();
@@ -248,6 +251,7 @@ function decodeDatagram(bytes) {
     const extensionsPresent = (dgType & 1) !== 0;
     const objectIdAbsent = (dgType & 4) !== 0;
     const endOfGroup = (dgType & 2) !== 0;
+    const defaultPriority = (dgType & 8) !== 0;
     const isStatus = (dgType & 32) !== 0;
     const trackAlias = r.readVarInt();
     const groupId = r.readVarInt();
@@ -255,7 +259,10 @@ function decodeDatagram(bytes) {
     if (!objectIdAbsent) {
       objectId = r.readVarInt();
     }
-    const publisherPriority = r.readUint8();
+    let publisherPriority = 128;
+    if (!defaultPriority) {
+      publisherPriority = r.readUint8();
+    }
     let extensionData;
     if (extensionsPresent) {
       const extLen = Number(r.readVarInt());
@@ -472,7 +479,7 @@ function createSubgroupStreamDecoder() {
         try {
           const r = new BufferReader(buffer.subarray(offset));
           const streamType = Number(r.readVarInt());
-          if (!(streamType >= 16 && streamType <= 23 || streamType >= 48 && streamType <= 55)) {
+          if (!(streamType >= 16 && streamType <= 31 || streamType >= 48 && streamType <= 63)) {
             controller.error(
               new DecodeError(
                 "CONSTRAINT_VIOLATION",
@@ -667,7 +674,7 @@ function createDataStreamDecoder() {
       if (inner === null) {
         if (offset >= buffer.length) return;
         const firstByte = buffer[offset];
-        if (firstByte >= 16 && firstByte <= 23 || firstByte >= 48 && firstByte <= 55) {
+        if (firstByte >= 16 && firstByte <= 31 || firstByte >= 48 && firstByte <= 63) {
           const decoder = createSubgroupStreamDecoder();
           inner = decoder;
         } else if (firstByte === 5) {
@@ -690,7 +697,7 @@ function createDataStreamDecoder() {
       const view = buffer.subarray(offset);
       const firstByte = view[0];
       let result;
-      if (firstByte >= 16 && firstByte <= 23 || firstByte >= 48 && firstByte <= 55) {
+      if (firstByte >= 16 && firstByte <= 31 || firstByte >= 48 && firstByte <= 63) {
         result = decodeSubgroupStream(view);
       } else if (firstByte === 5) {
         result = decodeFetchStream(view);

package/dist/{chunk-B56AG5HU.cjs → chunk-EVCPBFSR.cjs}

@@ -46,7 +46,7 @@ function encodeDatagram(dg) {
     w.writeVarInt(extData.byteLength);
     if (extData.byteLength > 0) w.writeBytes(extData);
   }
-  const isStatus = dg.streamTypeId === 2 || dg.streamTypeId === 3;
+  const isStatus = dg.streamTypeId >= 4;
   if (isStatus) {
     w.writeVarInt(_nullishCoalesce(dg.objectStatus, () => ( 0n)));
   } else {
@@ -162,18 +162,19 @@ function decodeDatagram(bytes) {
   try {
     const r = new (0, _chunk4XLYCT5Qcjs.BufferReader)(bytes);
     const streamTypeId = Number(r.readVarInt());
-    if (streamTypeId < 0 || streamTypeId > 3) {
+    if (streamTypeId < 0 || streamTypeId > 5) {
       return {
         ok: false,
         error: new (0, _chunk4XLYCT5Qcjs.DecodeError)(
           "CONSTRAINT_VIOLATION",
-          `Expected datagram type 0x00-0x03, got 0x${streamTypeId.toString(16)}`,
+          `Expected datagram type 0x00-0x05, got 0x${streamTypeId.toString(16)}`,
           0
         )
       };
     }
     const extensionsPresent = (streamTypeId & 1) !== 0;
-    const isStatus = streamTypeId === 2 || streamTypeId === 3;
+    const endOfGroup = (streamTypeId & 2) !== 0 && streamTypeId < 4;
+    const isStatus = streamTypeId >= 4;
     const trackAlias = r.readVarInt();
     const groupId = r.readVarInt();
     const objectId = r.readVarInt();
@@ -202,6 +203,7 @@ function decodeDatagram(bytes) {
       payloadLength: payload.byteLength,
       payload
     };
+    if (endOfGroup) result.endOfGroup = true;
     if (extensionHeadersLength !== void 0)
       result.extensionHeadersLength = extensionHeadersLength;
     if (extensionData !== void 0)