@moqtap/codec 0.2.3 → 0.4.0

package/dist/{chunk-73MWUKSJ.js → chunk-2UTVXWFF.js}

@@ -1,75 +1,10 @@
-import {
-  bytesToHex,
-  hexToBytes
-} from "./chunk-HDWJ2GDE.js";
 import {
   BufferReader,
   BufferWriter,
-  DecodeError
-} from "./chunk-7L43FE6P.js";
-
-// src/drafts/draft11/messages.ts
-var MSG_SUBSCRIBE_UPDATE = 0x02n;
-var MSG_SUBSCRIBE = 0x03n;
-var MSG_SUBSCRIBE_OK = 0x04n;
-var MSG_SUBSCRIBE_ERROR = 0x05n;
-var MSG_ANNOUNCE = 0x06n;
-var MSG_ANNOUNCE_OK = 0x07n;
-var MSG_ANNOUNCE_ERROR = 0x08n;
-var MSG_UNANNOUNCE = 0x09n;
-var MSG_UNSUBSCRIBE = 0x0an;
-var MSG_SUBSCRIBE_DONE = 0x0bn;
-var MSG_ANNOUNCE_CANCEL = 0x0cn;
-var MSG_TRACK_STATUS_REQUEST = 0x0dn;
-var MSG_TRACK_STATUS = 0x0en;
-var MSG_GOAWAY = 0x10n;
-var MSG_SUBSCRIBE_ANNOUNCES = 0x11n;
-var MSG_SUBSCRIBE_ANNOUNCES_OK = 0x12n;
-var MSG_SUBSCRIBE_ANNOUNCES_ERROR = 0x13n;
-var MSG_UNSUBSCRIBE_ANNOUNCES = 0x14n;
-var MSG_MAX_REQUEST_ID = 0x15n;
-var MSG_FETCH = 0x16n;
-var MSG_FETCH_CANCEL = 0x17n;
-var MSG_FETCH_OK = 0x18n;
-var MSG_FETCH_ERROR = 0x19n;
-var MSG_REQUESTS_BLOCKED = 0x1an;
-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 = 0x02n;
-var MESSAGE_TYPE_MAP = /* @__PURE__ */ new Map([
-  [MSG_CLIENT_SETUP, "client_setup"],
-  [MSG_SERVER_SETUP, "server_setup"],
-  [MSG_SUBSCRIBE, "subscribe"],
-  [MSG_SUBSCRIBE_OK, "subscribe_ok"],
-  [MSG_SUBSCRIBE_ERROR, "subscribe_error"],
-  [MSG_SUBSCRIBE_UPDATE, "subscribe_update"],
-  [MSG_SUBSCRIBE_DONE, "subscribe_done"],
-  [MSG_UNSUBSCRIBE, "unsubscribe"],
-  [MSG_ANNOUNCE, "announce"],
-  [MSG_ANNOUNCE_OK, "announce_ok"],
-  [MSG_ANNOUNCE_ERROR, "announce_error"],
-  [MSG_UNANNOUNCE, "unannounce"],
-  [MSG_ANNOUNCE_CANCEL, "announce_cancel"],
-  [MSG_SUBSCRIBE_ANNOUNCES, "subscribe_announces"],
-  [MSG_SUBSCRIBE_ANNOUNCES_OK, "subscribe_announces_ok"],
-  [MSG_SUBSCRIBE_ANNOUNCES_ERROR, "subscribe_announces_error"],
-  [MSG_UNSUBSCRIBE_ANNOUNCES, "unsubscribe_announces"],
-  [MSG_FETCH, "fetch"],
-  [MSG_FETCH_OK, "fetch_ok"],
-  [MSG_FETCH_ERROR, "fetch_error"],
-  [MSG_FETCH_CANCEL, "fetch_cancel"],
-  [MSG_TRACK_STATUS_REQUEST, "track_status_request"],
-  [MSG_TRACK_STATUS, "track_status"],
-  [MSG_GOAWAY, "goaway"],
-  [MSG_MAX_REQUEST_ID, "max_request_id"],
-  [MSG_REQUESTS_BLOCKED, "requests_blocked"]
-]);
-var MESSAGE_ID_MAP = new Map(
-  [...MESSAGE_TYPE_MAP.entries()].map(([id, name]) => [name, id])
-);
+  DecodeError,
+  bytesToHex,
+  hexToBytes
+} from "./chunk-VOU7PNHI.js";
 
 // src/drafts/draft11/data-streams.ts
 var FETCH_STREAM_TYPE = 0x05n;
@@ -105,7 +40,14 @@ function encodeDatagram(dg) {
   w.writeVarInt(dg.groupId);
   w.writeVarInt(dg.objectId);
   w.writeUint8(dg.publisherPriority);
-  if (dg.streamTypeId === 2) {
+  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 === 2 || dg.streamTypeId === 3;
+  if (isStatus) {
     w.writeVarInt(dg.objectStatus ?? 0n);
   } else {
     w.writeBytes(dg.payload);
@@ -124,7 +66,12 @@ function encodeFetchStream(stream) {
     w.writeVarInt(BigInt(obj.extensionData.length));
     if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
     w.writeVarInt(obj.payloadLength);
-    w.writeBytes(obj.payload);
+    if (obj.payloadLength === 0) {
+      const status = obj.objectStatus;
+      w.writeVarInt(status ?? 0n);
+    } else {
+      w.writeBytes(obj.payload);
+    }
   }
   return w.finish();
 }
@@ -160,9 +107,10 @@ function decodeSubgroupStream(bytes) {
         firstObject = false;
       }
       let extensionData = new Uint8Array(0);
+      let extensionHeadersLength;
       if (extensionsPresent) {
-        const extLen = Number(r.readVarInt());
-        extensionData = extLen > 0 ? r.readBytesView(extLen) : new Uint8Array(0);
+        extensionHeadersLength = r.readVarInt();
+        extensionData = extensionHeadersLength > 0n ? r.readBytesView(Number(extensionHeadersLength)) : new Uint8Array(0);
       }
       const payloadLength = Number(r.readVarInt());
       let payload;
@@ -176,7 +124,17 @@ function decodeSubgroupStream(bytes) {
         payloadByteOffset = r.offset;
         payload = r.readBytesView(payloadLength);
       }
-      const obj = { type: "object", byteOffset, payloadByteOffset, objectId, extensionData, payloadLength, payload };
+      const obj = {
+        type: "object",
+        byteOffset,
+        payloadByteOffset,
+        objectId,
+        extensionData,
+        payloadLength,
+        payload
+      };
+      if (extensionHeadersLength !== void 0)
+        obj.extensionHeadersLength = extensionHeadersLength;
       if (status !== void 0) obj.status = status;
       objects.push(obj);
     }
@@ -202,23 +160,31 @@ function decodeDatagram(bytes) {
   try {
     const r = new BufferReader(bytes);
     const streamTypeId = Number(r.readVarInt());
-    if (streamTypeId !== 0 && streamTypeId !== 2) {
+    if (streamTypeId < 0 || streamTypeId > 3) {
       return {
         ok: false,
         error: new DecodeError(
           "CONSTRAINT_VIOLATION",
-          `Expected datagram type 0x00 or 0x02, got 0x${streamTypeId.toString(16)}`,
+          `Expected datagram type 0x00-0x03, got 0x${streamTypeId.toString(16)}`,
           0
         )
       };
     }
+    const extensionsPresent = (streamTypeId & 1) !== 0;
+    const isStatus = streamTypeId === 2 || streamTypeId === 3;
     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 (streamTypeId === 2) {
+    if (isStatus) {
       objectStatus = r.readVarInt();
       payload = new Uint8Array(0);
     } else {
@@ -234,6 +200,10 @@ function decodeDatagram(bytes) {
       payloadLength: payload.byteLength,
       payload
     };
+    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 };
@@ -295,7 +265,11 @@ function decodeFetchStream(bytes) {
         obj.objectStatus = objectStatus;
       objects.push(obj);
     }
-    return { ok: true, value: { type: "fetch", requestId, objects }, bytesRead: r.offset };
+    return {
+      ok: true,
+      value: { type: "fetch", requestId, objects },
+      bytesRead: r.offset
+    };
   } catch (e) {
     if (e instanceof DecodeError) return { ok: false, error: e };
     throw e;
@@ -316,6 +290,70 @@ function decodeDataStream(streamType, bytes) {
   }
 }
 
+// src/drafts/draft11/messages.ts
+var MSG_SUBSCRIBE_UPDATE = 0x02n;
+var MSG_SUBSCRIBE = 0x03n;
+var MSG_SUBSCRIBE_OK = 0x04n;
+var MSG_SUBSCRIBE_ERROR = 0x05n;
+var MSG_ANNOUNCE = 0x06n;
+var MSG_ANNOUNCE_OK = 0x07n;
+var MSG_ANNOUNCE_ERROR = 0x08n;
+var MSG_UNANNOUNCE = 0x09n;
+var MSG_UNSUBSCRIBE = 0x0an;
+var MSG_SUBSCRIBE_DONE = 0x0bn;
+var MSG_ANNOUNCE_CANCEL = 0x0cn;
+var MSG_TRACK_STATUS_REQUEST = 0x0dn;
+var MSG_TRACK_STATUS = 0x0en;
+var MSG_GOAWAY = 0x10n;
+var MSG_SUBSCRIBE_ANNOUNCES = 0x11n;
+var MSG_SUBSCRIBE_ANNOUNCES_OK = 0x12n;
+var MSG_SUBSCRIBE_ANNOUNCES_ERROR = 0x13n;
+var MSG_UNSUBSCRIBE_ANNOUNCES = 0x14n;
+var MSG_MAX_REQUEST_ID = 0x15n;
+var MSG_FETCH = 0x16n;
+var MSG_FETCH_CANCEL = 0x17n;
+var MSG_FETCH_OK = 0x18n;
+var MSG_FETCH_ERROR = 0x19n;
+var MSG_REQUESTS_BLOCKED = 0x1an;
+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 = 0x02n;
+var PARAM_MAX_CACHE_DURATION = 0x04n;
+var MESSAGE_TYPE_MAP = /* @__PURE__ */ new Map([
+  [MSG_CLIENT_SETUP, "client_setup"],
+  [MSG_SERVER_SETUP, "server_setup"],
+  [MSG_SUBSCRIBE, "subscribe"],
+  [MSG_SUBSCRIBE_OK, "subscribe_ok"],
+  [MSG_SUBSCRIBE_ERROR, "subscribe_error"],
+  [MSG_SUBSCRIBE_UPDATE, "subscribe_update"],
+  [MSG_SUBSCRIBE_DONE, "subscribe_done"],
+  [MSG_UNSUBSCRIBE, "unsubscribe"],
+  [MSG_ANNOUNCE, "announce"],
+  [MSG_ANNOUNCE_OK, "announce_ok"],
+  [MSG_ANNOUNCE_ERROR, "announce_error"],
+  [MSG_UNANNOUNCE, "unannounce"],
+  [MSG_ANNOUNCE_CANCEL, "announce_cancel"],
+  [MSG_SUBSCRIBE_ANNOUNCES, "subscribe_announces"],
+  [MSG_SUBSCRIBE_ANNOUNCES_OK, "subscribe_announces_ok"],
+  [MSG_SUBSCRIBE_ANNOUNCES_ERROR, "subscribe_announces_error"],
+  [MSG_UNSUBSCRIBE_ANNOUNCES, "unsubscribe_announces"],
+  [MSG_FETCH, "fetch"],
+  [MSG_FETCH_OK, "fetch_ok"],
+  [MSG_FETCH_ERROR, "fetch_error"],
+  [MSG_FETCH_CANCEL, "fetch_cancel"],
+  [MSG_TRACK_STATUS_REQUEST, "track_status_request"],
+  [MSG_TRACK_STATUS, "track_status"],
+  [MSG_GOAWAY, "goaway"],
+  [MSG_MAX_REQUEST_ID, "max_request_id"],
+  [MSG_REQUESTS_BLOCKED, "requests_blocked"]
+]);
+var MESSAGE_ID_MAP = new Map(
+  [...MESSAGE_TYPE_MAP.entries()].map(([id, name]) => [name, id])
+);
+
 // src/drafts/draft11/codec.ts
 var textEncoder = /* @__PURE__ */ new TextEncoder();
 var textDecoder = /* @__PURE__ */ new TextDecoder();
@@ -377,7 +415,11 @@ function decodeSetupParams(r) {
       if (paramType === SETUP_PARAM_PATH) {
         result.path = textDecoder.decode(bytes);
       } else {
-        unknown.push({ id: `0x${paramType.toString(16)}`, length, raw_hex: bytesToHex(bytes) });
+        unknown.push({
+          id: `0x${paramType.toString(16)}`,
+          length,
+          raw_hex: bytesToHex(bytes)
+        });
       }
     }
   }
@@ -388,6 +430,7 @@ 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.max_cache_duration !== void 0) count++;
   w.writeVarInt(count);
   if (params.authorization_token !== void 0) {
     w.writeVarInt(PARAM_AUTHORIZATION_TOKEN);
@@ -405,6 +448,10 @@ function encodeParams(params, w) {
     w.writeVarInt(PARAM_DELIVERY_TIMEOUT);
     w.writeVarInt(params.delivery_timeout);
   }
+  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) {
       const id = BigInt(u.id);
@@ -431,6 +478,8 @@ function decodeParams(r) {
       const value = r.readVarInt();
       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);
@@ -456,7 +505,11 @@ function decodeParams(r) {
         };
       } 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)
+        });
       }
     }
   }
@@ -478,7 +531,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);
@@ -494,7 +547,7 @@ function encodeSubscribePayload(msg, w) {
 function encodeSubscribeOkPayload(msg, w) {
   w.writeVarInt(msg.request_id);
   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);
@@ -566,7 +619,7 @@ function encodeUnsubscribeAnnouncesPayload(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) {
@@ -584,7 +637,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);
@@ -641,7 +694,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);
@@ -679,7 +732,7 @@ function decodeSubscribePayload(r) {
 function decodeSubscribeOkPayload(r) {
   const request_id = 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) {
@@ -704,7 +757,13 @@ function decodeSubscribeErrorPayload(r) {
   const error_code = r.readVarInt();
   const reason_phrase = r.readString();
   const track_alias = r.readVarInt();
-  return { type: "subscribe_error", request_id, error_code, reason_phrase, track_alias };
+  return {
+    type: "subscribe_error",
+    request_id,
+    error_code,
+    reason_phrase,
+    track_alias
+  };
 }
 function decodeSubscribeUpdatePayload(r) {
   const request_id = r.readVarInt();
@@ -730,7 +789,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();
@@ -766,7 +831,12 @@ function decodeSubscribeAnnouncesPayload(r) {
   const request_id = r.readVarInt();
   const track_namespace_prefix = r.readTuple();
   const parameters = decodeParams(r);
-  return { type: "subscribe_announces", request_id, track_namespace_prefix, parameters };
+  return {
+    type: "subscribe_announces",
+    request_id,
+    track_namespace_prefix,
+    parameters
+  };
 }
 function decodeSubscribeAnnouncesOkPayload(r) {
   const request_id = r.readVarInt();
@@ -776,7 +846,12 @@ function decodeSubscribeAnnouncesErrorPayload(r) {
   const request_id = r.readVarInt();
   const error_code = r.readVarInt();
   const reason_phrase = r.readString();
-  return { type: "subscribe_announces_error", request_id, error_code, reason_phrase };
+  return {
+    type: "subscribe_announces_error",
+    request_id,
+    error_code,
+    reason_phrase
+  };
 }
 function decodeUnsubscribeAnnouncesPayload(r) {
   const track_namespace_prefix = r.readTuple();
@@ -785,7 +860,7 @@ function decodeUnsubscribeAnnouncesPayload(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) {
@@ -800,7 +875,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();
@@ -820,7 +902,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();
@@ -849,7 +931,13 @@ function decodeTrackStatusRequestPayload(r) {
   const track_namespace = r.readTuple();
   const track_name = r.readString();
   const parameters = decodeParams(r);
-  return { type: "track_status_request", request_id, track_namespace, track_name, parameters };
+  return {
+    type: "track_status_request",
+    request_id,
+    track_namespace,
+    track_name,
+    parameters
+  };
 }
 function decodeTrackStatusPayload(r) {
   const request_id = r.readVarInt();
@@ -1040,7 +1128,7 @@ function createStreamDecoder() {
 }
 function createDraft11Codec() {
   return {
-    draft: "draft-ietf-moq-transport-11",
+    draft: "11",
     encodeMessage,
     decodeMessage,
     encodeSubgroupStream,
@@ -1055,6 +1143,13 @@ function createDraft11Codec() {
 }
 
 export {
+  encodeSubgroupStream,
+  encodeDatagram,
+  encodeFetchStream,
+  decodeSubgroupStream,
+  decodeDatagram,
+  decodeFetchStream,
+  decodeDataStream,
   MSG_SUBSCRIBE_UPDATE,
   MSG_SUBSCRIBE,
   MSG_SUBSCRIBE_OK,
@@ -1087,13 +1182,6 @@ export {
   PARAM_DELIVERY_TIMEOUT,
   MESSAGE_TYPE_MAP,
   MESSAGE_ID_MAP,
-  encodeSubgroupStream,
-  encodeDatagram,
-  encodeFetchStream,
-  decodeSubgroupStream,
-  decodeDatagram,
-  decodeFetchStream,
-  decodeDataStream,
   encodeMessage,
   decodeMessage,
   createStreamDecoder,