@moqtap/codec 0.2.3 → 0.4.0

package/dist/{chunk-E6P74GDT.js → chunk-Z6U26IRI.js}

@@ -1,12 +1,10 @@
-import {
-  bytesToHex,
-  hexToBytes
-} from "./chunk-HDWJ2GDE.js";
 import {
   BufferReader,
   BufferWriter,
-  DecodeError
-} from "./chunk-7L43FE6P.js";
+  DecodeError,
+  bytesToHex,
+  hexToBytes
+} from "./chunk-VOU7PNHI.js";
 
 // src/drafts/draft17/messages.ts
 var MSG_REQUEST_UPDATE = 0x02n;
@@ -28,6 +26,7 @@ var MSG_PUBLISH = 0x1dn;
 var MSG_PUBLISH_OK = 0x1en;
 var MSG_SETUP = 0x2f00n;
 var SETUP_OPT_PATH = 0x01n;
+var SETUP_OPT_AUTHORIZATION_TOKEN = 0x03n;
 var SETUP_OPT_MAX_AUTH_TOKEN_CACHE_SIZE = 0x04n;
 var SETUP_OPT_AUTHORITY = 0x05n;
 var SETUP_OPT_MOQT_IMPLEMENTATION = 0x07n;
@@ -57,11 +56,56 @@ var MESSAGE_ID_MAP = new Map(
 
 // src/drafts/draft17/data-streams.ts
 var FETCH_STREAM_TYPE = 0x05n;
+var OBJPROP_PRIOR_GROUP_ID_GAP = 0x3cn;
+var OBJPROP_PRIOR_OBJECT_ID_GAP = 0x3en;
+var KNOWN_OBJ_PROPS = /* @__PURE__ */ new Map([
+  [OBJPROP_PRIOR_OBJECT_ID_GAP, "prior_object_id_gap"],
+  [OBJPROP_PRIOR_GROUP_ID_GAP, "prior_group_id_gap"]
+]);
+function decodeObjectProperties(r, propsLength) {
+  const endOff = r.offset + propsLength;
+  const props = {};
+  let prevType = 0n;
+  while (r.offset < endOff) {
+    const delta = r.readVarInt();
+    const propType = prevType + delta;
+    prevType = propType;
+    if (propType % 2n === 0n) {
+      const value = r.readVarInt();
+      const name = KNOWN_OBJ_PROPS.get(propType) ?? `0x${propType.toString(16)}`;
+      props[name] = value;
+    } else {
+      const length = Number(r.readVarInt());
+      r.readBytes(length);
+    }
+  }
+  return props;
+}
+function encodeObjectProperties(props, w) {
+  const reverseMap = /* @__PURE__ */ new Map();
+  for (const [id, name] of KNOWN_OBJ_PROPS) {
+    reverseMap.set(name, id);
+  }
+  const entries = [];
+  for (const [name, value] of Object.entries(props)) {
+    const typeId = reverseMap.get(name);
+    if (typeId !== void 0) {
+      entries.push({ type: typeId, value });
+    }
+  }
+  entries.sort((a, b) => a.type < b.type ? -1 : a.type > b.type ? 1 : 0);
+  let prevType = 0n;
+  for (const entry of entries) {
+    w.writeVarInt(entry.type - prevType);
+    w.writeVarInt(entry.value);
+    prevType = entry.type;
+  }
+}
 function encodeSubgroupStream(stream) {
   const w = new BufferWriter();
   const streamType = stream.headerType;
   w.writeVarInt(BigInt(streamType));
-  const extensionsPresent = (streamType & 1) !== 0;
+  const propertiesPresent = (streamType & 1) !== 0;
   const hasSubgroupField = (streamType & 4) !== 0;
   const hasPriority = streamType < 48;
   w.writeVarInt(stream.trackAlias);
@@ -76,9 +120,16 @@ function encodeSubgroupStream(stream) {
   for (const obj of stream.objects) {
     const delta = prevObjectId < 0n ? obj.objectId : obj.objectId - prevObjectId - 1n;
     w.writeVarInt(delta);
-    if (extensionsPresent) {
-      w.writeVarInt(BigInt(obj.extensionData.length));
-      if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+    if (propertiesPresent) {
+      if (obj.objectProperties && Object.keys(obj.objectProperties).length > 0) {
+        const tmpW = new BufferWriter(32);
+        encodeObjectProperties(obj.objectProperties, tmpW);
+        const raw = tmpW.finish();
+        w.writeVarInt(BigInt(raw.byteLength));
+        w.writeBytes(raw);
+      } else {
+        w.writeVarInt(0n);
+      }
     }
     w.writeVarInt(BigInt(obj.payloadLength));
     if (obj.payloadLength === 0) {
@@ -99,12 +150,24 @@ function encodeDatagram(dg) {
   const objectIdAbsent = (dgType & 4) !== 0;
   const isStatus = (dgType & 32) !== 0;
   const defaultPriority = (dgType & 8) !== 0;
+  const propertiesPresent = (dgType & 1) !== 0;
   if (!objectIdAbsent) {
     w.writeVarInt(dg.objectId);
   }
   if (!defaultPriority) {
     w.writeUint8(dg.publisherPriority);
   }
+  if (propertiesPresent) {
+    if (dg.objectProperties && Object.keys(dg.objectProperties).length > 0) {
+      const tmpW = new BufferWriter(32);
+      encodeObjectProperties(dg.objectProperties, tmpW);
+      const raw = tmpW.finish();
+      w.writeVarInt(BigInt(raw.byteLength));
+      w.writeBytes(raw);
+    } else {
+      w.writeVarInt(0n);
+    }
+  }
   if (isStatus) {
     w.writeVarInt(dg.objectStatus ?? 0n);
   } else {
@@ -123,6 +186,25 @@ function encodeFetchStream(stream) {
       w.writeVarInt(obj.groupId);
       w.writeVarInt(obj.objectId);
       w.writeVarInt(BigInt(obj.payloadLength));
+    } else if (flags & 64) {
+      if (flags & 8) w.writeVarInt(obj.groupId);
+      if (flags & 4) w.writeVarInt(obj.objectId);
+      if (flags & 16) w.writeUint8(obj.publisherPriority);
+      if (flags & 32) {
+        if (obj.objectProperties && Object.keys(obj.objectProperties).length > 0) {
+          const tmpW = new BufferWriter(32);
+          encodeObjectProperties(obj.objectProperties, tmpW);
+          const raw = tmpW.finish();
+          w.writeVarInt(BigInt(raw.byteLength));
+          w.writeBytes(raw);
+        } else {
+          w.writeVarInt(0n);
+        }
+      }
+      w.writeVarInt(BigInt(obj.payloadLength));
+      if (obj.payloadLength > 0) {
+        w.writeBytes(obj.payload);
+      }
     } else {
       if (flags & 8) w.writeVarInt(obj.groupId);
       const subgroupEncoding = flags & 3;
@@ -130,8 +212,15 @@ function encodeFetchStream(stream) {
       if (flags & 4) w.writeVarInt(obj.objectId);
       if (flags & 16) w.writeUint8(obj.publisherPriority);
       if (flags & 32) {
-        w.writeVarInt(BigInt(obj.extensionData.length));
-        if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+        if (obj.objectProperties && Object.keys(obj.objectProperties).length > 0) {
+          const tmpW = new BufferWriter(32);
+          encodeObjectProperties(obj.objectProperties, tmpW);
+          const raw = tmpW.finish();
+          w.writeVarInt(BigInt(raw.byteLength));
+          w.writeBytes(raw);
+        } else {
+          w.writeVarInt(0n);
+        }
       }
       w.writeVarInt(BigInt(obj.payloadLength));
       if (obj.payloadLength > 0) {
@@ -155,10 +244,11 @@ function decodeSubgroupStream(bytes) {
         )
       };
     }
-    const extensionsPresent = (streamType & 1) !== 0;
+    const propertiesPresent = (streamType & 1) !== 0;
     const hasSubgroupField = (streamType & 4) !== 0;
     const subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
     const hasPriority = streamType < 48;
+    const endOfGroup = (streamType & 8) !== 0;
     const trackAlias = r.readVarInt();
     const groupId = r.readVarInt();
     let subgroupId = 0n;
@@ -185,10 +275,13 @@ function decodeSubgroupStream(bytes) {
       } 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 extensionData = new Uint8Array(0);
+      let objectProperties;
+      if (propertiesPresent) {
+        const propsLen = Number(r.readVarInt());
+        if (propsLen > 0) {
+          objectProperties = decodeObjectProperties(r, propsLen);
+        }
       }
       const payloadLength = Number(r.readVarInt());
       let payload;
@@ -202,22 +295,34 @@ function decodeSubgroupStream(bytes) {
         payloadByteOffset = r.offset;
         payload = r.readBytesView(payloadLength);
       }
-      const obj = { type: "object", byteOffset, payloadByteOffset, objectId, payloadLength, payload, extensionData };
+      const obj = {
+        type: "object",
+        byteOffset,
+        payloadByteOffset,
+        objectId,
+        payloadLength,
+        payload,
+        extensionData
+      };
       if (status !== void 0) obj.status = status;
+      if (objectProperties !== void 0)
+        obj.objectProperties = objectProperties;
       objects.push(obj);
       prevObjectId = objectId;
     }
+    const result = {
+      type: "subgroup",
+      headerType: streamType,
+      trackAlias,
+      groupId,
+      subgroupId,
+      publisherPriority,
+      objects
+    };
+    if (endOfGroup) result.endOfGroup = true;
     return {
       ok: true,
-      value: {
-        type: "subgroup",
-        headerType: streamType,
-        trackAlias,
-        groupId,
-        subgroupId,
-        publisherPriority,
-        objects
-      },
+      value: result,
       bytesRead: r.offset
     };
   } catch (e) {
@@ -233,6 +338,7 @@ function decodeDatagram(bytes) {
     const endOfGroup = (dgType & 2) !== 0;
     const isStatus = (dgType & 32) !== 0;
     const defaultPriority = (dgType & 8) !== 0;
+    const propertiesPresent = (dgType & 1) !== 0;
     const trackAlias = r.readVarInt();
     const groupId = r.readVarInt();
     let objectId = 0n;
@@ -243,6 +349,13 @@ function decodeDatagram(bytes) {
     if (!defaultPriority) {
       publisherPriority = r.readUint8();
     }
+    let objectProperties;
+    if (propertiesPresent) {
+      const propsLen = Number(r.readVarInt());
+      if (propsLen > 0) {
+        objectProperties = decodeObjectProperties(r, propsLen);
+      }
+    }
     let objectStatus;
     let payload;
     if (isStatus) {
@@ -265,6 +378,8 @@ function decodeDatagram(bytes) {
     if (endOfGroup) result.endOfGroup = true;
     if (objectStatus !== void 0)
       result.objectStatus = objectStatus;
+    if (objectProperties !== void 0)
+      result.objectProperties = objectProperties;
     return { ok: true, value: result, bytesRead: r.offset };
   } catch (e) {
     if (e instanceof DecodeError) return { ok: false, error: e };
@@ -301,7 +416,7 @@ function decodeFetchStream(bytes) {
       let payloadLength;
       let payload;
       let payloadByteOffset;
-      let extensionData = new Uint8Array(0);
+      const extensionData = new Uint8Array(0);
       if (flags >= 128) {
         if (flags !== 140 && flags !== 268) {
           return {
@@ -318,22 +433,56 @@ function decodeFetchStream(bytes) {
         payloadLength = Number(r.readVarInt());
         payloadByteOffset = r.offset;
         payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
+      } else if (flags & 64) {
+        const objectIdPresent = (flags & 4) !== 0;
+        const groupIdPresent = (flags & 8) !== 0;
+        const priorityPresent = (flags & 16) !== 0;
+        const propsPresent = (flags & 32) !== 0;
+        if (groupIdPresent) {
+          groupId = r.readVarInt();
+        }
+        if (objectIdPresent) {
+          objectId = r.readVarInt();
+        }
+        if (priorityPresent) {
+          prevPriority = r.readUint8();
+        }
+        let objectProperties;
+        if (propsPresent) {
+          const propsLen = Number(r.readVarInt());
+          if (propsLen > 0) {
+            objectProperties = decodeObjectProperties(r, propsLen);
+          }
+        }
+        payloadLength = Number(r.readVarInt());
+        payloadByteOffset = r.offset;
+        payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
+        const obj2 = {
+          type: "object",
+          byteOffset,
+          payloadByteOffset,
+          serializationFlags: flags,
+          groupId,
+          subgroupId: 0n,
+          objectId,
+          publisherPriority: prevPriority,
+          payloadLength,
+          payload,
+          extensionData
+        };
+        if (objectProperties)
+          obj2.objectProperties = objectProperties;
+        objects.push(obj2);
+        prevGroupId = groupId;
+        prevObjectId = objectId;
+        first = false;
+        continue;
       } else {
         const subgroupEncoding = flags & 3;
         const objectIdPresent = (flags & 4) !== 0;
         const groupIdPresent = (flags & 8) !== 0;
         const priorityPresent = (flags & 16) !== 0;
-        const extensionsPresent = (flags & 32) !== 0;
-        if (flags & 64) {
-          return {
-            ok: false,
-            error: new DecodeError(
-              "CONSTRAINT_VIOLATION",
-              "Reserved bits set in fetch object flags",
-              r.offset
-            )
-          };
-        }
+        const propsPresent = (flags & 32) !== 0;
         if (groupIdPresent) {
           groupId = r.readVarInt();
         } else if (first) {
@@ -390,15 +539,38 @@ function decodeFetchStream(bytes) {
         if (priorityPresent) {
           prevPriority = r.readUint8();
         }
-        if (extensionsPresent) {
-          const extLen = Number(r.readVarInt());
-          if (extLen > 0) {
-            extensionData = r.readBytesView(extLen);
+        let objectProperties;
+        if (propsPresent) {
+          const propsLen = Number(r.readVarInt());
+          if (propsLen > 0) {
+            objectProperties = decodeObjectProperties(r, propsLen);
           }
         }
         payloadLength = Number(r.readVarInt());
         payloadByteOffset = r.offset;
         payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
+        if (objectProperties) {
+          const obj2 = {
+            type: "object",
+            byteOffset,
+            payloadByteOffset,
+            serializationFlags: flags,
+            groupId,
+            subgroupId,
+            objectId,
+            publisherPriority: prevPriority,
+            payloadLength,
+            payload,
+            extensionData
+          };
+          obj2.objectProperties = objectProperties;
+          objects.push(obj2);
+          prevGroupId = groupId;
+          prevSubgroupId = subgroupId;
+          prevObjectId = objectId;
+          first = false;
+          continue;
+        }
       }
       const obj = {
         type: "object",
@@ -525,7 +697,15 @@ function createSubgroupStreamDecoder() {
           const payloadLength = Number(r.readVarInt());
           const payloadByteOffset = r.offset;
           const payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
-          controller.enqueue({ type: "object", objectId, payloadLength, payload, extensionData, byteOffset: 0, payloadByteOffset });
+          controller.enqueue({
+            type: "object",
+            objectId,
+            payloadLength,
+            payload,
+            extensionData,
+            byteOffset: 0,
+            payloadByteOffset
+          });
           offset += r.offset;
           prevObjectId = objectId;
         } catch (e) {
@@ -606,7 +786,15 @@ function createFetchStreamDecoder() {
           const payloadLength = Number(r.readVarInt());
           const payloadByteOffset = r.offset;
           const payload = payloadLength > 0 ? r.readBytesView(payloadLength) : new Uint8Array(0);
-          controller.enqueue({ type: "object", objectId, payloadLength, payload, extensionData, byteOffset: 0, payloadByteOffset });
+          controller.enqueue({
+            type: "object",
+            objectId,
+            payloadLength,
+            payload,
+            extensionData,
+            byteOffset: 0,
+            payloadByteOffset
+          });
           offset += r.offset;
         } catch (e) {
           if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
@@ -722,6 +910,18 @@ function encodeSetupOptions(opts, writer) {
       }
     });
   }
+  if (opts.authorization_token !== void 0) {
+    entries.push({
+      type: SETUP_OPT_AUTHORIZATION_TOKEN,
+      encode: (w) => {
+        const tmpW = new BufferWriter(64);
+        encodeAuthorizationToken(opts.authorization_token, tmpW);
+        const raw = tmpW.finish();
+        w.writeVarInt(BigInt(raw.byteLength));
+        w.writeBytes(raw);
+      }
+    });
+  }
   if (opts.max_auth_token_cache_size !== void 0) {
     entries.push({
       type: SETUP_OPT_MAX_AUTH_TOKEN_CACHE_SIZE,
@@ -802,27 +1002,95 @@ function decodeSetupOptions(reader, payloadEnd) {
       const bytes = reader.readBytes(length);
       if (optType === SETUP_OPT_PATH) {
         result.path = textDecoder.decode(bytes);
+      } else if (optType === SETUP_OPT_AUTHORIZATION_TOKEN) {
+        result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes));
       } else if (optType === SETUP_OPT_AUTHORITY) {
         result.authority = textDecoder.decode(bytes);
       } else if (optType === SETUP_OPT_MOQT_IMPLEMENTATION) {
         result.moqt_implementation = textDecoder.decode(bytes);
       } else {
-        unknown.push({ id: `0x${optType.toString(16)}`, length, raw_hex: bytesToHex(bytes) });
+        unknown.push({
+          id: `0x${optType.toString(16)}`,
+          length,
+          raw_hex: bytesToHex(bytes)
+        });
       }
     }
   }
   if (unknown.length > 0) result.unknown = unknown;
   return result;
 }
+function encodeAuthorizationToken(token, w) {
+  const aliasType = Number(token.alias_type);
+  w.writeVarInt(token.alias_type);
+  if (aliasType === 0 || aliasType === 1 || aliasType === 2) {
+    w.writeVarInt(token.token_alias ?? 0n);
+  }
+  if (aliasType === 1 || aliasType === 3) {
+    w.writeVarInt(token.token_type ?? 0n);
+    const encoded = textEncoder.encode(token.token_value ?? "");
+    w.writeVarInt(BigInt(encoded.byteLength));
+    w.writeBytes(encoded);
+  }
+}
+function decodeAuthorizationToken(r) {
+  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 len = Number(r.readVarInt());
+    const bytes = r.readBytes(len);
+    result.token_value = textDecoder.decode(bytes);
+  }
+  return result;
+}
+var PARAM_DELIVERY_TIMEOUT = 0x02n;
+var PARAM_AUTHORIZATION_TOKEN = 0x03n;
+var PARAM_RENDEZVOUS_TIMEOUT = 0x04n;
 var PARAM_EXPIRES = 0x08n;
 var PARAM_LARGEST_OBJECT = 0x09n;
+var PARAM_FORWARD = 0x10n;
 var PARAM_SUBSCRIBER_PRIORITY = 0x20n;
 var PARAM_SUBSCRIPTION_FILTER = 0x21n;
 var PARAM_GROUP_ORDER = 0x22n;
+var PARAM_NEW_GROUP_REQUEST = 0x32n;
 function encodeParams(params, writer) {
   const entries = [];
+  if (params.delivery_timeout !== void 0) {
+    entries.push({
+      type: PARAM_DELIVERY_TIMEOUT,
+      encode: (w) => w.writeVarInt(params.delivery_timeout)
+    });
+  }
+  if (params.authorization_token !== void 0) {
+    entries.push({
+      type: PARAM_AUTHORIZATION_TOKEN,
+      encode: (w) => {
+        const tmpW = new BufferWriter(64);
+        encodeAuthorizationToken(params.authorization_token, tmpW);
+        const raw = tmpW.finish();
+        w.writeVarInt(BigInt(raw.byteLength));
+        w.writeBytes(raw);
+      }
+    });
+  }
+  if (params.rendezvous_timeout !== void 0) {
+    entries.push({
+      type: PARAM_RENDEZVOUS_TIMEOUT,
+      encode: (w) => w.writeVarInt(params.rendezvous_timeout)
+    });
+  }
   if (params.expires !== void 0) {
-    entries.push({ type: PARAM_EXPIRES, encode: (w) => w.writeVarInt(params.expires) });
+    entries.push({
+      type: PARAM_EXPIRES,
+      encode: (w) => w.writeVarInt(params.expires)
+    });
   }
   if (params.largest_object !== void 0) {
     entries.push({
@@ -833,6 +1101,12 @@ function encodeParams(params, writer) {
       }
     });
   }
+  if (params.forward !== void 0) {
+    entries.push({
+      type: PARAM_FORWARD,
+      encode: (w) => w.writeVarInt(params.forward)
+    });
+  }
   if (params.subscriber_priority !== void 0) {
     entries.push({
       type: PARAM_SUBSCRIBER_PRIORITY,
@@ -865,6 +1139,12 @@ function encodeParams(params, writer) {
       encode: (w) => w.writeUint8(Number(params.group_order))
     });
   }
+  if (params.new_group_request !== void 0) {
+    entries.push({
+      type: PARAM_NEW_GROUP_REQUEST,
+      encode: (w) => w.writeVarInt(params.new_group_request)
+    });
+  }
   if (params.unknown) {
     for (const u of params.unknown) {
       const id = BigInt(u.id);
@@ -895,7 +1175,15 @@ function decodeParams(reader) {
     const delta = reader.readVarInt();
     const paramType = prevType + delta;
     prevType = paramType;
-    if (paramType === PARAM_EXPIRES) {
+    if (paramType === PARAM_DELIVERY_TIMEOUT) {
+      result.delivery_timeout = reader.readVarInt();
+    } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
+      const length = Number(reader.readVarInt());
+      const bytes = reader.readBytes(length);
+      result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes));
+    } else if (paramType === PARAM_RENDEZVOUS_TIMEOUT) {
+      result.rendezvous_timeout = reader.readVarInt();
+    } else if (paramType === PARAM_EXPIRES) {
       result.expires = reader.readVarInt();
     } else if (paramType === PARAM_LARGEST_OBJECT) {
       const group = reader.readVarInt();
@@ -918,8 +1206,12 @@ function decodeParams(reader) {
       const consumed = reader.offset - startOff;
       if (consumed < length) reader.readBytes(length - consumed);
       result.subscription_filter = filter;
+    } else if (paramType === PARAM_FORWARD) {
+      result.forward = reader.readVarInt();
     } else if (paramType === PARAM_GROUP_ORDER) {
       result.group_order = BigInt(reader.readUint8());
+    } else if (paramType === PARAM_NEW_GROUP_REQUEST) {
+      result.new_group_request = reader.readVarInt();
     } else {
       if (paramType % 2n === 0n) {
         const value = reader.readVarInt();
@@ -934,29 +1226,89 @@ function decodeParams(reader) {
       } else {
         const length = Number(reader.readVarInt());
         const bytes = reader.readBytes(length);
-        unknown.push({ id: `0x${paramType.toString(16)}`, length, raw_hex: bytesToHex(bytes) });
+        unknown.push({
+          id: `0x${paramType.toString(16)}`,
+          length,
+          raw_hex: bytesToHex(bytes)
+        });
       }
     }
   }
   if (unknown.length > 0) result.unknown = unknown;
   return result;
 }
+var TPROP_DELIVERY_TIMEOUT = 0x02n;
+var TPROP_MAX_CACHE_DURATION = 0x04n;
+var TPROP_IMMUTABLE_PROPERTIES = 0x0bn;
+var TPROP_DEFAULT_PUBLISHER_PRIORITY = 0x0en;
+var TPROP_DEFAULT_PUBLISHER_GROUP_ORDER = 0x22n;
+var TPROP_DYNAMIC_GROUPS = 0x30n;
 function encodeTrackProperties(props, writer) {
-  if (!props.unknown || props.unknown.length === 0) return;
-  const entries = props.unknown.map((u) => ({ type: BigInt(u.id), raw: u }));
+  const entries = [];
+  if (props.delivery_timeout !== void 0) {
+    entries.push({
+      type: TPROP_DELIVERY_TIMEOUT,
+      encode: (w) => w.writeVarInt(props.delivery_timeout)
+    });
+  }
+  if (props.max_cache_duration !== void 0) {
+    entries.push({
+      type: TPROP_MAX_CACHE_DURATION,
+      encode: (w) => w.writeVarInt(props.max_cache_duration)
+    });
+  }
+  if (props.immutable_properties !== void 0) {
+    entries.push({
+      type: TPROP_IMMUTABLE_PROPERTIES,
+      encode: (w) => {
+        const raw = hexToBytes(props.immutable_properties);
+        w.writeVarInt(BigInt(raw.byteLength));
+        w.writeBytes(raw);
+      }
+    });
+  }
+  if (props.default_publisher_priority !== void 0) {
+    entries.push({
+      type: TPROP_DEFAULT_PUBLISHER_PRIORITY,
+      encode: (w) => w.writeVarInt(props.default_publisher_priority)
+    });
+  }
+  if (props.default_publisher_group_order !== void 0) {
+    entries.push({
+      type: TPROP_DEFAULT_PUBLISHER_GROUP_ORDER,
+      encode: (w) => w.writeVarInt(props.default_publisher_group_order)
+    });
+  }
+  if (props.dynamic_groups !== void 0) {
+    entries.push({
+      type: TPROP_DYNAMIC_GROUPS,
+      encode: (w) => w.writeVarInt(props.dynamic_groups)
+    });
+  }
+  if (props.unknown) {
+    for (const u of props.unknown) {
+      const id = BigInt(u.id);
+      entries.push({
+        type: id,
+        encode: (w) => {
+          if (id % 2n === 0n) {
+            const raw = hexToBytes(u.raw_hex);
+            const tmpReader = new BufferReader(raw);
+            w.writeVarInt(tmpReader.readVarInt());
+          } else {
+            const raw = hexToBytes(u.raw_hex);
+            w.writeVarInt(BigInt(raw.byteLength));
+            w.writeBytes(raw);
+          }
+        }
+      });
+    }
+  }
   entries.sort((a, b) => a.type < b.type ? -1 : a.type > b.type ? 1 : 0);
   let prevType = 0n;
   for (const entry of entries) {
     writer.writeVarInt(entry.type - prevType);
-    if (entry.type % 2n === 0n) {
-      const raw = hexToBytes(entry.raw.raw_hex);
-      const tmpReader = new BufferReader(raw);
-      writer.writeVarInt(tmpReader.readVarInt());
-    } else {
-      const raw = hexToBytes(entry.raw.raw_hex);
-      writer.writeVarInt(BigInt(raw.byteLength));
-      writer.writeBytes(raw);
-    }
+    entry.encode(writer);
     prevType = entry.type;
   }
 }
@@ -970,18 +1322,38 @@ function decodeTrackProperties(reader, payloadEnd) {
     prevType = propType;
     if (propType % 2n === 0n) {
       const value = reader.readVarInt();
-      const tmpWriter = new BufferWriter(16);
-      tmpWriter.writeVarInt(value);
-      const raw = tmpWriter.finish();
-      unknown.push({
-        id: `0x${propType.toString(16)}`,
-        length: raw.byteLength,
-        raw_hex: bytesToHex(raw)
-      });
+      if (propType === TPROP_DELIVERY_TIMEOUT) {
+        result.delivery_timeout = value;
+      } else if (propType === TPROP_MAX_CACHE_DURATION) {
+        result.max_cache_duration = value;
+      } else if (propType === TPROP_DEFAULT_PUBLISHER_PRIORITY) {
+        result.default_publisher_priority = value;
+      } else if (propType === TPROP_DEFAULT_PUBLISHER_GROUP_ORDER) {
+        result.default_publisher_group_order = value;
+      } else if (propType === TPROP_DYNAMIC_GROUPS) {
+        result.dynamic_groups = value;
+      } else {
+        const tmpWriter = new BufferWriter(16);
+        tmpWriter.writeVarInt(value);
+        const raw = tmpWriter.finish();
+        unknown.push({
+          id: `0x${propType.toString(16)}`,
+          length: raw.byteLength,
+          raw_hex: bytesToHex(raw)
+        });
+      }
     } else {
       const length = Number(reader.readVarInt());
       const bytes = reader.readBytes(length);
-      unknown.push({ id: `0x${propType.toString(16)}`, length, raw_hex: bytesToHex(bytes) });
+      if (propType === TPROP_IMMUTABLE_PROPERTIES) {
+        result.immutable_properties = bytesToHex(bytes);
+      } else {
+        unknown.push({
+          id: `0x${propType.toString(16)}`,
+          length,
+          raw_hex: bytesToHex(bytes)
+        });
+      }
     }
   }
   if (unknown.length > 0) result.unknown = unknown;
@@ -1120,7 +1492,12 @@ function decodeRequestUpdatePayload(r) {
   const request_id = r.readVarInt();
   const required_request_id_delta = r.readVarInt();
   const parameters = decodeParams(r);
-  return { type: "request_update", request_id, required_request_id_delta, parameters };
+  return {
+    type: "request_update",
+    request_id,
+    required_request_id_delta,
+    parameters
+  };
 }
 function decodePublishPayload(r, payloadEnd) {
   const request_id = r.readVarInt();
@@ -1209,7 +1586,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_request_id = r.readVarInt();
     const joining_start = r.readVarInt();
@@ -1232,7 +1616,14 @@ function decodeFetchOkPayload(r, payloadEnd) {
   const end_object = r.readVarInt();
   const parameters = decodeParams(r);
   const track_properties = decodeTrackProperties(r, payloadEnd);
-  return { type: "fetch_ok", end_of_track, end_group, end_object, parameters, track_properties };
+  return {
+    type: "fetch_ok",
+    end_of_track,
+    end_group,
+    end_object,
+    parameters,
+    track_properties
+  };
 }
 function decodeTrackStatusPayload(r) {
   const request_id = r.readVarInt();
@@ -1429,7 +1820,7 @@ function createStreamDecoder() {
 }
 function createDraft17Codec() {
   return {
-    draft: "draft-ietf-moq-transport-17",
+    draft: "17",
     encodeMessage,
     decodeMessage,
     encodeSubgroupStream,