@moqtap/codec 0.2.3 → 0.4.0

package/dist/{chunk-U3IPZYPX.js → chunk-XS77RBY7.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/draft15/messages.ts
 var MSG_SUBSCRIBE_UPDATE = 0x02n;
@@ -34,6 +32,7 @@ var MSG_CLIENT_SETUP = 0x20n;
 var MSG_SERVER_SETUP = 0x21n;
 var SETUP_PARAM_PATH = 0x01n;
 var SETUP_PARAM_MAX_REQUEST_ID = 0x02n;
+var SETUP_PARAM_AUTHORIZATION_TOKEN = 0x03n;
 var SETUP_PARAM_MAX_AUTH_TOKEN_CACHE_SIZE = 0x04n;
 var SETUP_PARAM_AUTHORITY = 0x05n;
 var SETUP_PARAM_MOQT_IMPLEMENTATION = 0x07n;
@@ -107,12 +106,18 @@ function encodeDatagram(dg) {
   w.writeVarInt(BigInt(dgType));
   w.writeVarInt(dg.trackAlias);
   w.writeVarInt(dg.groupId);
+  const extensionsPresent = (dgType & 1) !== 0;
   const objectIdAbsent = (dgType & 4) !== 0;
   const isStatus = (dgType & 32) !== 0;
   if (!objectIdAbsent) {
     w.writeVarInt(dg.objectId);
   }
   w.writeUint8(dg.publisherPriority);
+  if (extensionsPresent) {
+    const extData = dg.extensionData ?? new Uint8Array(0);
+    w.writeVarInt(BigInt(extData.length));
+    if (extData.length > 0) w.writeBytes(extData);
+  }
   if (isStatus) {
     w.writeVarInt(dg.objectStatus ?? 0n);
   } else {
@@ -149,19 +154,19 @@ function decodeSubgroupStream(bytes) {
   try {
     const r = new BufferReader(bytes);
     const streamType = Number(r.readVarInt());
-    if (!(streamType >= 16 && streamType <= 29 || streamType >= 48 && streamType <= 61) || (streamType & 6) === 6) {
+    if (!(streamType >= 16 && streamType <= 23 || streamType >= 48 && streamType <= 55)) {
       return {
         ok: false,
         error: new DecodeError(
           "CONSTRAINT_VIOLATION",
-          `Expected subgroup stream type 0x10-0x15/0x18-0x1D/0x30-0x35/0x38-0x3D, got 0x${streamType.toString(16)}`,
+          `Expected subgroup stream type 0x10-0x17/0x30-0x37, got 0x${streamType.toString(16)}`,
           0
         )
       };
     }
     const extensionsPresent = (streamType & 1) !== 0;
+    const endOfGroup = (streamType & 2) !== 0;
     const hasSubgroupField = (streamType & 4) !== 0;
-    const subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
     const hasPriority = streamType < 48;
     const trackAlias = r.readVarInt();
     const groupId = r.readVarInt();
@@ -182,9 +187,6 @@ function decodeSubgroupStream(bytes) {
       let objectId;
       if (firstObject) {
         objectId = delta;
-        if (subgroupIsFirstObjId && firstObject) {
-          subgroupId = objectId;
-        }
         firstObject = false;
       } else {
         objectId = prevObjectId + 1n + delta;
@@ -206,22 +208,32 @@ function decodeSubgroupStream(bytes) {
         payloadByteOffset = r.offset;
         payload = r.readBytesView(payloadLength);
       }
-      const obj = { type: "object", byteOffset, payloadByteOffset, objectId, payloadLength, extensionData, payload };
+      const obj = {
+        type: "object",
+        byteOffset,
+        payloadByteOffset,
+        objectId,
+        payloadLength,
+        extensionData,
+        payload
+      };
       if (status !== void 0) obj.status = status;
       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 +245,7 @@ function decodeDatagram(bytes) {
   try {
     const r = new BufferReader(bytes);
     const dgType = Number(r.readVarInt());
+    const extensionsPresent = (dgType & 1) !== 0;
     const objectIdAbsent = (dgType & 4) !== 0;
     const endOfGroup = (dgType & 2) !== 0;
     const isStatus = (dgType & 32) !== 0;
@@ -243,6 +256,11 @@ function decodeDatagram(bytes) {
       objectId = r.readVarInt();
     }
     const publisherPriority = r.readUint8();
+    let extensionData;
+    if (extensionsPresent) {
+      const extLen = Number(r.readVarInt());
+      extensionData = extLen > 0 ? r.readBytesView(extLen) : new Uint8Array(0);
+    }
     let objectStatus;
     let payload;
     if (isStatus) {
@@ -265,6 +283,8 @@ function decodeDatagram(bytes) {
     if (endOfGroup) result.endOfGroup = true;
     if (objectStatus !== void 0)
       result.objectStatus = objectStatus;
+    if (extensionData !== void 0)
+      result.extensionData = extensionData;
     return { ok: true, value: result, bytesRead: r.offset };
   } catch (e) {
     if (e instanceof DecodeError) return { ok: false, error: e };
@@ -452,7 +472,7 @@ function createSubgroupStreamDecoder() {
         try {
           const r = new BufferReader(buffer.subarray(offset));
           const streamType = Number(r.readVarInt());
-          if (!(streamType >= 16 && streamType <= 29 || streamType >= 48 && streamType <= 61)) {
+          if (!(streamType >= 16 && streamType <= 23 || streamType >= 48 && streamType <= 55)) {
             controller.error(
               new DecodeError(
                 "CONSTRAINT_VIOLATION",
@@ -464,7 +484,7 @@ function createSubgroupStreamDecoder() {
           }
           _extensionsPresent = (streamType & 1) !== 0;
           const hasSubgroupField = (streamType & 4) !== 0;
-          _subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
+          _subgroupIsFirstObjId = false;
           const hasPriority = streamType < 48;
           const trackAlias = r.readVarInt();
           const groupId = r.readVarInt();
@@ -513,7 +533,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", byteOffset, payloadByteOffset, objectId, payloadLength, extensionData, payload });
+          controller.enqueue({
+            type: "object",
+            byteOffset,
+            payloadByteOffset,
+            objectId,
+            payloadLength,
+            extensionData,
+            payload
+          });
           offset += r.offset;
           prevObjectId = objectId;
         } catch (e) {
@@ -594,7 +622,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, extensionData, payload, byteOffset: 0, payloadByteOffset });
+          controller.enqueue({
+            type: "object",
+            objectId,
+            payloadLength,
+            extensionData,
+            payload,
+            byteOffset: 0,
+            payloadByteOffset
+          });
           offset += r.offset;
         } catch (e) {
           if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
@@ -631,7 +667,7 @@ function createDataStreamDecoder() {
       if (inner === null) {
         if (offset >= buffer.length) return;
         const firstByte = buffer[offset];
-        if (firstByte >= 16 && firstByte <= 29 || firstByte >= 48 && firstByte <= 61) {
+        if (firstByte >= 16 && firstByte <= 23 || firstByte >= 48 && firstByte <= 55) {
           const decoder = createSubgroupStreamDecoder();
           inner = decoder;
         } else if (firstByte === 5) {
@@ -654,7 +690,7 @@ function createDataStreamDecoder() {
       const view = buffer.subarray(offset);
       const firstByte = view[0];
       let result;
-      if (firstByte >= 16 && firstByte <= 29 || firstByte >= 48 && firstByte <= 61) {
+      if (firstByte >= 16 && firstByte <= 23 || firstByte >= 48 && firstByte <= 55) {
         result = decodeSubgroupStream(view);
       } else if (firstByte === 5) {
         result = decodeFetchStream(view);
@@ -704,6 +740,7 @@ function encodeSetupParams(params, writer) {
   let count = 0;
   if (params.path !== void 0) count++;
   if (params.max_request_id !== void 0) count++;
+  if (params.authorization_token !== void 0) count++;
   if (params.max_auth_token_cache_size !== void 0) count++;
   if (params.authority !== void 0) count++;
   if (params.moqt_implementation !== void 0) count++;
@@ -719,6 +756,14 @@ function encodeSetupParams(params, writer) {
     writer.writeVarInt(SETUP_PARAM_MAX_REQUEST_ID);
     writer.writeVarInt(params.max_request_id);
   }
+  if (params.authorization_token !== void 0) {
+    writer.writeVarInt(SETUP_PARAM_AUTHORIZATION_TOKEN);
+    const tmpW = new BufferWriter(64);
+    encodeAuthorizationToken(params.authorization_token, tmpW);
+    const raw = tmpW.finish();
+    writer.writeVarInt(raw.byteLength);
+    writer.writeBytes(raw);
+  }
   if (params.max_auth_token_cache_size !== void 0) {
     writer.writeVarInt(SETUP_PARAM_MAX_AUTH_TOKEN_CACHE_SIZE);
     writer.writeVarInt(params.max_auth_token_cache_size);
@@ -779,6 +824,8 @@ function decodeSetupParams(reader) {
       const bytes = reader.readBytes(length);
       if (paramType === SETUP_PARAM_PATH) {
         result.path = textDecoder.decode(bytes);
+      } else if (paramType === SETUP_PARAM_AUTHORIZATION_TOKEN) {
+        result.authorization_token = decodeAuthorizationToken(new BufferReader(bytes));
       } else if (paramType === SETUP_PARAM_AUTHORITY) {
         result.authority = textDecoder.decode(bytes);
       } else if (paramType === SETUP_PARAM_MOQT_IMPLEMENTATION) {
@@ -797,19 +844,75 @@ function decodeSetupParams(reader) {
   }
   return result;
 }
+function encodeAuthorizationToken(token, w) {
+  w.writeVarInt(token.alias_type);
+  const aliasType = Number(token.alias_type);
+  if (aliasType === 0 || aliasType === 1) {
+    w.writeVarInt(token.token_alias);
+  }
+  if (aliasType === 1 || aliasType === 3) {
+    w.writeVarInt(token.token_type);
+    const tokenBytes = hexToBytes(token.token_value_hex);
+    w.writeBytes(tokenBytes);
+  }
+}
+function decodeAuthorizationToken(r) {
+  const alias_type = r.readVarInt();
+  const aliasType = Number(alias_type);
+  const result = { alias_type };
+  if (aliasType === 0 || aliasType === 1) {
+    result.token_alias = r.readVarInt();
+  }
+  if (aliasType === 1 || aliasType === 3) {
+    result.token_type = r.readVarInt();
+    const tokenBytes = r.readBytesView(r.remaining);
+    result.token_value_hex = bytesToHex(tokenBytes);
+  }
+  return result;
+}
+var PARAM_DELIVERY_TIMEOUT = 0x02n;
+var PARAM_AUTHORIZATION_TOKEN = 0x03n;
+var PARAM_MAX_CACHE_DURATION = 0x04n;
 var PARAM_EXPIRES = 0x08n;
 var PARAM_LARGEST_OBJECT = 0x09n;
+var PARAM_PUBLISHER_PRIORITY = 0x0en;
+var PARAM_FORWARD = 0x10n;
 var PARAM_SUBSCRIBER_PRIORITY = 0x20n;
 var PARAM_SUBSCRIPTION_FILTER = 0x21n;
 var PARAM_GROUP_ORDER = 0x22n;
+var PARAM_DYNAMIC_GROUPS = 0x30n;
+var PARAM_NEW_GROUP_REQUEST = 0x32n;
 function encodeParams(params, writer) {
   let count = params.unknown ? params.unknown.length : 0;
+  if (params.delivery_timeout !== void 0) count++;
+  if (params.authorization_token !== void 0) count++;
+  if (params.max_cache_duration !== void 0) count++;
   if (params.expires !== void 0) count++;
   if (params.largest_object !== void 0) count++;
+  if (params.publisher_priority !== void 0) count++;
+  if (params.forward !== void 0) count++;
   if (params.subscriber_priority !== void 0) count++;
   if (params.subscription_filter !== void 0) count++;
   if (params.group_order !== void 0) count++;
+  if (params.dynamic_groups !== void 0) count++;
+  if (params.new_group_request !== void 0) count++;
   writer.writeVarInt(count);
+  if (params.delivery_timeout !== void 0) {
+    writer.writeVarInt(PARAM_DELIVERY_TIMEOUT);
+    writer.writeVarInt(params.delivery_timeout);
+  }
+  if (params.authorization_token !== void 0) {
+    writer.writeVarInt(PARAM_AUTHORIZATION_TOKEN);
+    const tmpW = new BufferWriter(64);
+    encodeAuthorizationToken(params.authorization_token, tmpW);
+    const raw = tmpW.finish();
+    writer.writeVarInt(raw.byteLength);
+    writer.writeBytes(raw);
+  }
+  if (params.max_cache_duration !== void 0) {
+    writer.writeVarInt(PARAM_MAX_CACHE_DURATION);
+    writer.writeVarInt(params.max_cache_duration);
+  }
   if (params.expires !== void 0) {
     writer.writeVarInt(PARAM_EXPIRES);
     writer.writeVarInt(params.expires);
@@ -823,6 +926,14 @@ function encodeParams(params, writer) {
     writer.writeVarInt(raw.byteLength);
     writer.writeBytes(raw);
   }
+  if (params.publisher_priority !== void 0) {
+    writer.writeVarInt(PARAM_PUBLISHER_PRIORITY);
+    writer.writeVarInt(params.publisher_priority);
+  }
+  if (params.forward !== void 0) {
+    writer.writeVarInt(PARAM_FORWARD);
+    writer.writeVarInt(params.forward);
+  }
   if (params.subscriber_priority !== void 0) {
     writer.writeVarInt(PARAM_SUBSCRIBER_PRIORITY);
     writer.writeVarInt(params.subscriber_priority);
@@ -847,6 +958,14 @@ function encodeParams(params, writer) {
     writer.writeVarInt(PARAM_GROUP_ORDER);
     writer.writeVarInt(params.group_order);
   }
+  if (params.dynamic_groups !== void 0) {
+    writer.writeVarInt(PARAM_DYNAMIC_GROUPS);
+    writer.writeVarInt(params.dynamic_groups);
+  }
+  if (params.new_group_request !== void 0) {
+    writer.writeVarInt(PARAM_NEW_GROUP_REQUEST);
+    writer.writeVarInt(params.new_group_request);
+  }
   if (params.unknown) {
     for (const u of params.unknown) {
       const id = BigInt(u.id);
@@ -870,12 +989,28 @@ function decodeParams(reader) {
   const unknown = [];
   for (let i = 0; i < count; i++) {
     const paramType = reader.readVarInt();
-    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 tokenBytes = reader.readBytes(length);
+      result.authorization_token = decodeAuthorizationToken(new BufferReader(tokenBytes));
+    } else if (paramType === PARAM_MAX_CACHE_DURATION) {
+      result.max_cache_duration = reader.readVarInt();
+    } else if (paramType === PARAM_EXPIRES) {
       result.expires = reader.readVarInt();
+    } else if (paramType === PARAM_PUBLISHER_PRIORITY) {
+      result.publisher_priority = reader.readVarInt();
+    } else if (paramType === PARAM_FORWARD) {
+      result.forward = reader.readVarInt();
     } else if (paramType === PARAM_SUBSCRIBER_PRIORITY) {
       result.subscriber_priority = reader.readVarInt();
     } else if (paramType === PARAM_GROUP_ORDER) {
       result.group_order = reader.readVarInt();
+    } else if (paramType === PARAM_DYNAMIC_GROUPS) {
+      result.dynamic_groups = reader.readVarInt();
+    } else if (paramType === PARAM_NEW_GROUP_REQUEST) {
+      result.new_group_request = reader.readVarInt();
     } else if (paramType === PARAM_LARGEST_OBJECT) {
       const length = Number(reader.readVarInt());
       const startOff = reader.offset;
@@ -1051,7 +1186,13 @@ function decodeSubscribePayload(r) {
   const track_namespace = r.readTuple();
   const track_name = r.readString();
   const parameters = decodeParams(r);
-  return { type: "subscribe", request_id, track_namespace, track_name, parameters };
+  return {
+    type: "subscribe",
+    request_id,
+    track_namespace,
+    track_name,
+    parameters
+  };
 }
 function decodeSubscribeOkPayload(r) {
   const request_id = r.readVarInt();
@@ -1063,7 +1204,12 @@ function decodeSubscribeUpdatePayload(r) {
   const request_id = r.readVarInt();
   const subscription_request_id = r.readVarInt();
   const parameters = decodeParams(r);
-  return { type: "subscribe_update", request_id, subscription_request_id, parameters };
+  return {
+    type: "subscribe_update",
+    request_id,
+    subscription_request_id,
+    parameters
+  };
 }
 function decodeUnsubscribePayload(r) {
   const request_id = r.readVarInt();
@@ -1075,7 +1221,14 @@ function decodePublishPayload(r) {
   const track_name = r.readString();
   const track_alias = r.readVarInt();
   const parameters = decodeParams(r);
-  return { type: "publish", request_id, track_namespace, track_name, track_alias, parameters };
+  return {
+    type: "publish",
+    request_id,
+    track_namespace,
+    track_name,
+    track_alias,
+    parameters
+  };
 }
 function decodePublishOkPayload(r) {
   const request_id = r.readVarInt();
@@ -1087,7 +1240,13 @@ function decodePublishDonePayload(r) {
   const status_code = r.readVarInt();
   const stream_count = r.readVarInt();
   const reason_phrase = r.readString();
-  return { type: "publish_done", request_id, status_code, stream_count, reason_phrase };
+  return {
+    type: "publish_done",
+    request_id,
+    status_code,
+    stream_count,
+    reason_phrase
+  };
 }
 function decodePublishNamespacePayload(r) {
   const request_id = r.readVarInt();
@@ -1103,13 +1262,23 @@ function decodePublishNamespaceCancelPayload(r) {
   const track_namespace = r.readTuple();
   const error_code = r.readVarInt();
   const reason_phrase = r.readString();
-  return { type: "publish_namespace_cancel", track_namespace, error_code, reason_phrase };
+  return {
+    type: "publish_namespace_cancel",
+    track_namespace,
+    error_code,
+    reason_phrase
+  };
 }
 function decodeSubscribeNamespacePayload(r) {
   const request_id = r.readVarInt();
   const namespace_prefix = r.readTuple();
   const parameters = decodeParams(r);
-  return { type: "subscribe_namespace", request_id, namespace_prefix, parameters };
+  return {
+    type: "subscribe_namespace",
+    request_id,
+    namespace_prefix,
+    parameters
+  };
 }
 function decodeUnsubscribeNamespacePayload(r) {
   const request_id = r.readVarInt();
@@ -1131,7 +1300,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();
@@ -1153,7 +1329,14 @@ function decodeFetchOkPayload(r) {
   const end_group = r.readVarInt();
   const end_object = r.readVarInt();
   const parameters = decodeParams(r);
-  return { type: "fetch_ok", request_id, end_of_track, end_group, end_object, parameters };
+  return {
+    type: "fetch_ok",
+    request_id,
+    end_of_track,
+    end_group,
+    end_object,
+    parameters
+  };
 }
 function decodeFetchCancelPayload(r) {
   const request_id = r.readVarInt();
@@ -1164,7 +1347,13 @@ function decodeTrackStatusPayload(r) {
   const track_namespace = r.readTuple();
   const track_name = r.readString();
   const parameters = decodeParams(r);
-  return { type: "track_status", request_id, track_namespace, track_name, parameters };
+  return {
+    type: "track_status",
+    request_id,
+    track_namespace,
+    track_name,
+    parameters
+  };
 }
 function decodeRequestOkPayload(r) {
   const request_id = r.readVarInt();
@@ -1352,7 +1541,7 @@ function createStreamDecoder() {
 }
 function createDraft15Codec() {
   return {
-    draft: "draft-ietf-moq-transport-15",
+    draft: "15",
     encodeMessage,
     decodeMessage,
     encodeSubgroupStream,