@moqtap/codec 0.8.0 → 0.8.1

package/dist/{chunk-KNLPX3YA.js → chunk-H6DTAIWM.js}

@@ -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(dg.objectStatus ?? 0n);
   } else {
@@ -162,18 +162,19 @@ function decodeDatagram(bytes) {
   try {
     const r = new BufferReader(bytes);
     const streamTypeId = Number(r.readVarInt());
-    if (streamTypeId < 0 || streamTypeId > 3) {
+    if (streamTypeId < 0 || streamTypeId > 5) {
       return {
         ok: false,
         error: new 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)

package/dist/{chunk-J3ASFPCX.cjs → chunk-IADVBKEJ.cjs}

@@ -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 = _nullishCoalesce(dg.extensionData, () => ( new Uint8Array(0)));
     w.writeVarInt(BigInt(extData.length));
@@ -154,18 +157,18 @@ function decodeSubgroupStream(bytes) {
   try {
     const r = new (0, _chunk4XLYCT5Qcjs.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 (0, _chunk4XLYCT5Qcjs.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 (0, _chunk4XLYCT5Qcjs.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 (0, _chunk4XLYCT5Qcjs.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-I55J3KXD.js → chunk-NH4L6NIY.js}

@@ -1060,6 +1060,29 @@ var PARAM_SUBSCRIBER_PRIORITY = 0x20n;
 var PARAM_SUBSCRIPTION_FILTER = 0x21n;
 var PARAM_GROUP_ORDER = 0x22n;
 var PARAM_NEW_GROUP_REQUEST = 0x32n;
+var PARAMETER_SCOPE = /* @__PURE__ */ new Map([
+  [0x02n, /* @__PURE__ */ new Set(["publish_ok", "subscribe", "request_update"])],
+  [
+    0x03n,
+    /* @__PURE__ */ new Set([
+      "publish",
+      "subscribe",
+      "request_update",
+      "subscribe_namespace",
+      "publish_namespace",
+      "track_status",
+      "fetch"
+    ])
+  ],
+  [0x04n, /* @__PURE__ */ new Set(["subscribe"])],
+  [0x08n, /* @__PURE__ */ new Set(["subscribe_ok", "publish", "publish_ok", "request_ok"])],
+  [0x09n, /* @__PURE__ */ new Set(["subscribe_ok", "publish", "request_ok"])],
+  [0x10n, /* @__PURE__ */ new Set(["subscribe", "request_update", "publish", "publish_ok", "subscribe_namespace"])],
+  [0x20n, /* @__PURE__ */ new Set(["subscribe", "fetch", "request_update", "publish_ok"])],
+  [0x21n, /* @__PURE__ */ new Set(["subscribe", "publish_ok", "request_update"])],
+  [0x22n, /* @__PURE__ */ new Set(["subscribe", "publish_ok", "fetch"])],
+  [0x32n, /* @__PURE__ */ new Set(["publish_ok", "subscribe", "request_update"])]
+]);
 function encodeParams(params, writer) {
   const entries = [];
   if (params.delivery_timeout !== void 0) {
@@ -1166,15 +1189,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_DELIVERY_TIMEOUT) {
       result.delivery_timeout = reader.readVarInt();
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
@@ -1213,28 +1243,13 @@ function decodeParams(reader) {
     } else if (paramType === PARAM_NEW_GROUP_REQUEST) {
       result.new_group_request = reader.readVarInt();
     } else {
-      if (paramType % 2n === 0n) {
-        const value = reader.readVarInt();
-        const tmpWriter = new Draft17BufferWriter(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_DELIVERY_TIMEOUT = 0x02n;
@@ -1472,7 +1487,7 @@ function decodeSubscribePayload(r) {
   const required_request_id_delta = 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,
@@ -1484,14 +1499,14 @@ 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 required_request_id_delta = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "request_update");
   return {
     type: "request_update",
     request_id,
@@ -1505,7 +1520,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",
@@ -1519,7 +1534,7 @@ function decodePublishPayload(r, payloadEnd) {
   };
 }
 function decodePublishOkPayload(r) {
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "publish_ok");
   return { type: "publish_ok", parameters };
 }
 function decodePublishDonePayload(r) {
@@ -1532,7 +1547,7 @@ function decodePublishNamespacePayload(r) {
   const request_id = r.readVarInt();
   const required_request_id_delta = r.readVarInt();
   const track_namespace = r.readTuple();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "publish_namespace");
   return {
     type: "publish_namespace",
     request_id,
@@ -1554,7 +1569,7 @@ function decodeSubscribeNamespacePayload(r) {
   const required_request_id_delta = r.readVarInt();
   const namespace_prefix = r.readTuple();
   const subscribe_options = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "subscribe_namespace");
   return {
     type: "subscribe_namespace",
     request_id,
@@ -1599,7 +1614,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,
@@ -1614,7 +1629,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",
@@ -1630,7 +1645,7 @@ function decodeTrackStatusPayload(r) {
   const required_request_id_delta = 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,
@@ -1641,7 +1656,7 @@ function decodeTrackStatusPayload(r) {
   };
 }
 function decodeRequestOkPayload(r) {
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "request_ok");
   return { type: "request_ok", parameters };
 }
 function decodeRequestErrorPayload(r) {

package/dist/{chunk-EQAYMCXO.cjs → chunk-PU2KV7VP.cjs}

@@ -1060,6 +1060,29 @@ var PARAM_SUBSCRIBER_PRIORITY = 0x20n;
 var PARAM_SUBSCRIPTION_FILTER = 0x21n;
 var PARAM_GROUP_ORDER = 0x22n;
 var PARAM_NEW_GROUP_REQUEST = 0x32n;
+var PARAMETER_SCOPE = /* @__PURE__ */ new Map([
+  [0x02n, /* @__PURE__ */ new Set(["publish_ok", "subscribe", "request_update"])],
+  [
+    0x03n,
+    /* @__PURE__ */ new Set([
+      "publish",
+      "subscribe",
+      "request_update",
+      "subscribe_namespace",
+      "publish_namespace",
+      "track_status",
+      "fetch"
+    ])
+  ],
+  [0x04n, /* @__PURE__ */ new Set(["subscribe"])],
+  [0x08n, /* @__PURE__ */ new Set(["subscribe_ok", "publish", "publish_ok", "request_ok"])],
+  [0x09n, /* @__PURE__ */ new Set(["subscribe_ok", "publish", "request_ok"])],
+  [0x10n, /* @__PURE__ */ new Set(["subscribe", "request_update", "publish", "publish_ok", "subscribe_namespace"])],
+  [0x20n, /* @__PURE__ */ new Set(["subscribe", "fetch", "request_update", "publish_ok"])],
+  [0x21n, /* @__PURE__ */ new Set(["subscribe", "publish_ok", "request_update"])],
+  [0x22n, /* @__PURE__ */ new Set(["subscribe", "publish_ok", "fetch"])],
+  [0x32n, /* @__PURE__ */ new Set(["publish_ok", "subscribe", "request_update"])]
+]);
 function encodeParams(params, writer) {
   const entries = [];
   if (params.delivery_timeout !== void 0) {
@@ -1166,15 +1189,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 (0, _chunk4XLYCT5Qcjs.DecodeError)(
+        "CONSTRAINT_VIOLATION",
+        `Message Parameter 0x${paramType.toString(16)} may not appear in ${messageType}`,
+        reader.offset
+      );
+    }
     if (paramType === PARAM_DELIVERY_TIMEOUT) {
       result.delivery_timeout = reader.readVarInt();
     } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
@@ -1213,28 +1243,13 @@ function decodeParams(reader) {
     } else if (paramType === PARAM_NEW_GROUP_REQUEST) {
       result.new_group_request = reader.readVarInt();
     } else {
-      if (paramType % 2n === 0n) {
-        const value = reader.readVarInt();
-        const tmpWriter = new (0, _chunk4XLYCT5Qcjs.Draft17BufferWriter)(16);
-        tmpWriter.writeVarInt(value);
-        const raw = tmpWriter.finish();
-        unknown.push({
-          id: `0x${paramType.toString(16)}`,
-          length: raw.byteLength,
-          raw_hex: _chunk4XLYCT5Qcjs.bytesToHex.call(void 0, raw)
-        });
-      } else {
-        const length = Number(reader.readVarInt());
-        const bytes = reader.readBytes(length);
-        unknown.push({
-          id: `0x${paramType.toString(16)}`,
-          length,
-          raw_hex: _chunk4XLYCT5Qcjs.bytesToHex.call(void 0, bytes)
-        });
-      }
+      throw new (0, _chunk4XLYCT5Qcjs.DecodeError)(
+        "INVALID_PARAMETER",
+        `Unknown Message Parameter type 0x${paramType.toString(16)}`,
+        reader.offset
+      );
     }
   }
-  if (unknown.length > 0) result.unknown = unknown;
   return result;
 }
 var TPROP_DELIVERY_TIMEOUT = 0x02n;
@@ -1472,7 +1487,7 @@ function decodeSubscribePayload(r) {
   const required_request_id_delta = 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,
@@ -1484,14 +1499,14 @@ 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 required_request_id_delta = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "request_update");
   return {
     type: "request_update",
     request_id,
@@ -1505,7 +1520,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",
@@ -1519,7 +1534,7 @@ function decodePublishPayload(r, payloadEnd) {
   };
 }
 function decodePublishOkPayload(r) {
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "publish_ok");
   return { type: "publish_ok", parameters };
 }
 function decodePublishDonePayload(r) {
@@ -1532,7 +1547,7 @@ function decodePublishNamespacePayload(r) {
   const request_id = r.readVarInt();
   const required_request_id_delta = r.readVarInt();
   const track_namespace = r.readTuple();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "publish_namespace");
   return {
     type: "publish_namespace",
     request_id,
@@ -1554,7 +1569,7 @@ function decodeSubscribeNamespacePayload(r) {
   const required_request_id_delta = r.readVarInt();
   const namespace_prefix = r.readTuple();
   const subscribe_options = r.readVarInt();
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "subscribe_namespace");
   return {
     type: "subscribe_namespace",
     request_id,
@@ -1599,7 +1614,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,
@@ -1614,7 +1629,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",
@@ -1630,7 +1645,7 @@ function decodeTrackStatusPayload(r) {
   const required_request_id_delta = 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,
@@ -1641,7 +1656,7 @@ function decodeTrackStatusPayload(r) {
   };
 }
 function decodeRequestOkPayload(r) {
-  const parameters = decodeParams(r);
+  const parameters = decodeParams(r, "request_ok");
   return { type: "request_ok", parameters };
 }
 function decodeRequestErrorPayload(r) {