@moqtap/codec 0.1.0 → 0.2.0

package/dist/{chunk-WNTXF3DE.cjs → chunk-7IVGHMKJ.cjs}

@@ -1,8 +1,8 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
 
 
 
-var _chunk2NARXGVAcjs = require('./chunk-2NARXGVA.cjs');
+var _chunkFWISIR26cjs = require('./chunk-FWISIR26.cjs');
 
 // src/drafts/draft07/messages.ts
 var MESSAGE_TYPE_IDS = {
@@ -49,17 +49,17 @@ for (const [name, id] of Object.entries(MESSAGE_TYPE_IDS)) {
 
 // src/drafts/draft07/varint.ts
 function encodeVarInt(value) {
-  const writer = new (0, _chunk2NARXGVAcjs.BufferWriter)(8);
+  const writer = new (0, _chunkFWISIR26cjs.BufferWriter)(8);
   writer.writeVarInt(value);
   return writer.finish();
 }
 function decodeVarInt(bytes, offset = 0) {
   try {
-    const reader = new (0, _chunk2NARXGVAcjs.BufferReader)(bytes, offset);
+    const reader = new (0, _chunkFWISIR26cjs.BufferReader)(bytes, offset);
     const value = reader.readVarInt();
     return { ok: true, value, bytesRead: reader.offset - offset };
   } catch (e) {
-    if (e instanceof _chunk2NARXGVAcjs.DecodeError) {
+    if (e instanceof _chunkFWISIR26cjs.DecodeError) {
       return { ok: false, error: e };
     }
     throw e;
@@ -97,7 +97,11 @@ function readGroupOrder(reader) {
   const wire = reader.readUint8();
   const value = WIRE_TO_GROUP_ORDER.get(wire);
   if (value === void 0) {
-    throw new (0, _chunk2NARXGVAcjs.DecodeError)("CONSTRAINT_VIOLATION", `Invalid group order value: ${wire}`, reader.offset - 1);
+    throw new (0, _chunkFWISIR26cjs.DecodeError)(
+      "CONSTRAINT_VIOLATION",
+      `Invalid group order value: ${wire}`,
+      reader.offset - 1
+    );
   }
   return value;
 }
@@ -255,50 +259,44 @@ function encodeFetchError(msg, writer) {
 function encodeFetchCancel(msg, writer) {
   writer.writeVarInt(msg.subscribeId);
 }
+function encodeObjectPayload(msg, writer) {
+  if (msg.payload.byteLength === 0) {
+    writer.writeVarInt(0);
+    writer.writeVarInt(_nullishCoalesce(msg.objectStatus, () => ( 0)));
+  } else {
+    writer.writeVarInt(msg.payload.byteLength);
+    writer.writeBytes(msg.payload);
+  }
+}
 function encodeObjectStream(msg, writer) {
   writer.writeVarInt(MESSAGE_TYPE_IDS.object_stream);
-  writer.writeVarInt(msg.subscribeId);
   writer.writeVarInt(msg.trackAlias);
   writer.writeVarInt(msg.groupId);
   writer.writeVarInt(msg.objectId);
   writer.writeUint8(msg.publisherPriority);
-  if (msg.objectStatus !== void 0) {
-    writer.writeVarInt(msg.objectStatus);
-  } else {
-    writer.writeVarInt(0);
-  }
-  writer.writeBytes(msg.payload);
+  encodeObjectPayload(msg, writer);
 }
 function encodeObjectDatagram(msg, writer) {
   writer.writeVarInt(MESSAGE_TYPE_IDS.object_datagram);
-  writer.writeVarInt(msg.subscribeId);
   writer.writeVarInt(msg.trackAlias);
   writer.writeVarInt(msg.groupId);
   writer.writeVarInt(msg.objectId);
   writer.writeUint8(msg.publisherPriority);
-  if (msg.objectStatus !== void 0) {
-    writer.writeVarInt(msg.objectStatus);
-  } else {
-    writer.writeVarInt(0);
-  }
-  writer.writeBytes(msg.payload);
+  encodeObjectPayload(msg, writer);
 }
 function encodeStreamHeaderTrack(msg, writer) {
   writer.writeVarInt(MESSAGE_TYPE_IDS.stream_header_track);
-  writer.writeVarInt(msg.subscribeId);
   writer.writeVarInt(msg.trackAlias);
   writer.writeUint8(msg.publisherPriority);
 }
 function encodeStreamHeaderGroup(msg, writer) {
   writer.writeVarInt(MESSAGE_TYPE_IDS.stream_header_group);
-  writer.writeVarInt(msg.subscribeId);
   writer.writeVarInt(msg.trackAlias);
   writer.writeVarInt(msg.groupId);
   writer.writeUint8(msg.publisherPriority);
 }
 function encodeStreamHeaderSubgroup(msg, writer) {
   writer.writeVarInt(MESSAGE_TYPE_IDS.stream_header_subgroup);
-  writer.writeVarInt(msg.subscribeId);
   writer.writeVarInt(msg.trackAlias);
   writer.writeVarInt(msg.groupId);
   writer.writeVarInt(msg.subgroupId);
@@ -341,7 +339,11 @@ var dataStreamEncoders = {
 function decodeClientSetup(reader) {
   const numVersions = reader.readVarInt();
   if (numVersions === 0n) {
-    throw new (0, _chunk2NARXGVAcjs.DecodeError)("CONSTRAINT_VIOLATION", "supported_versions must not be empty", reader.offset);
+    throw new (0, _chunkFWISIR26cjs.DecodeError)(
+      "CONSTRAINT_VIOLATION",
+      "supported_versions must not be empty",
+      reader.offset
+    );
   }
   const supportedVersions = [];
   for (let i = 0n; i < numVersions; i++) {
@@ -365,7 +367,11 @@ function decodeSubscribe(reader) {
   const filterTypeWire = reader.readVarInt();
   const filterType = WIRE_TO_FILTER_TYPE.get(filterTypeWire);
   if (filterType === void 0) {
-    throw new (0, _chunk2NARXGVAcjs.DecodeError)("CONSTRAINT_VIOLATION", `Invalid filter type: ${filterTypeWire}`, reader.offset);
+    throw new (0, _chunkFWISIR26cjs.DecodeError)(
+      "CONSTRAINT_VIOLATION",
+      `Invalid filter type: ${filterTypeWire}`,
+      reader.offset
+    );
   }
   const base = {
     type: "subscribe",
@@ -405,10 +411,26 @@ function decodeSubscribeOk(reader) {
     const largestGroupId = reader.readVarInt();
     const largestObjectId = reader.readVarInt();
     const parameters2 = reader.readParameters();
-    return { type: "subscribe_ok", subscribeId, expires, groupOrder, contentExists, largestGroupId, largestObjectId, parameters: parameters2 };
+    return {
+      type: "subscribe_ok",
+      subscribeId,
+      expires,
+      groupOrder,
+      contentExists,
+      largestGroupId,
+      largestObjectId,
+      parameters: parameters2
+    };
   }
   const parameters = reader.readParameters();
-  return { type: "subscribe_ok", subscribeId, expires, groupOrder, contentExists, parameters };
+  return {
+    type: "subscribe_ok",
+    subscribeId,
+    expires,
+    groupOrder,
+    contentExists,
+    parameters
+  };
 }
 function decodeSubscribeError(reader) {
   const subscribeId = reader.readVarInt();
@@ -426,7 +448,15 @@ function decodeSubscribeDone(reader) {
   if (contentExists) {
     const finalGroupId = reader.readVarInt();
     const finalObjectId = reader.readVarInt();
-    return { type: "subscribe_done", subscribeId, statusCode, reasonPhrase, contentExists, finalGroupId, finalObjectId };
+    return {
+      type: "subscribe_done",
+      subscribeId,
+      statusCode,
+      reasonPhrase,
+      contentExists,
+      finalGroupId,
+      finalObjectId
+    };
   }
   return { type: "subscribe_done", subscribeId, statusCode, reasonPhrase, contentExists };
 }
@@ -438,7 +468,16 @@ function decodeSubscribeUpdate(reader) {
   const endObject = reader.readVarInt();
   const subscriberPriority = reader.readUint8();
   const parameters = reader.readParameters();
-  return { type: "subscribe_update", subscribeId, startGroup, startObject, endGroup, endObject, subscriberPriority, parameters };
+  return {
+    type: "subscribe_update",
+    subscribeId,
+    startGroup,
+    startObject,
+    endGroup,
+    endObject,
+    subscriberPriority,
+    parameters
+  };
 }
 function decodeUnsubscribe(reader) {
   const subscribeId = reader.readVarInt();
@@ -520,7 +559,19 @@ function decodeFetch(reader) {
   const endGroup = reader.readVarInt();
   const endObject = reader.readVarInt();
   const parameters = reader.readParameters();
-  return { type: "fetch", subscribeId, trackNamespace, trackName, subscriberPriority, groupOrder, startGroup, startObject, endGroup, endObject, parameters };
+  return {
+    type: "fetch",
+    subscribeId,
+    trackNamespace,
+    trackName,
+    subscriberPriority,
+    groupOrder,
+    startGroup,
+    startObject,
+    endGroup,
+    endObject,
+    parameters
+  };
 }
 function decodeFetchOk(reader) {
   const subscribeId = reader.readVarInt();
@@ -530,7 +581,15 @@ function decodeFetchOk(reader) {
   const largestGroupId = reader.readVarInt();
   const largestObjectId = reader.readVarInt();
   const parameters = reader.readParameters();
-  return { type: "fetch_ok", subscribeId, groupOrder, endOfTrack, largestGroupId, largestObjectId, parameters };
+  return {
+    type: "fetch_ok",
+    subscribeId,
+    groupOrder,
+    endOfTrack,
+    largestGroupId,
+    largestObjectId,
+    parameters
+  };
 }
 function decodeFetchError(reader) {
   const subscribeId = reader.readVarInt();
@@ -543,53 +602,84 @@ function decodeFetchCancel(reader) {
   return { type: "fetch_cancel", subscribeId };
 }
 function decodeObjectStream(reader) {
-  const subscribeId = reader.readVarInt();
   const trackAlias = reader.readVarInt();
   const groupId = reader.readVarInt();
   const objectId = reader.readVarInt();
   const publisherPriority = reader.readUint8();
-  const objectStatusRaw = Number(reader.readVarInt());
-  const payload = reader.readBytes(reader.remaining);
-  const base = { type: "object_stream", subscribeId, trackAlias, groupId, objectId, publisherPriority, payload };
-  if (objectStatusRaw !== 0) {
-    return { ...base, objectStatus: objectStatusRaw };
+  const payloadLength = Number(reader.readVarInt());
+  if (payloadLength === 0) {
+    const objectStatus = reader.remaining > 0 ? Number(reader.readVarInt()) : 0;
+    return {
+      type: "object_stream",
+      trackAlias,
+      groupId,
+      objectId,
+      publisherPriority,
+      objectStatus,
+      payload: new Uint8Array(0)
+    };
   }
-  return base;
+  const payload = reader.readBytes(payloadLength);
+  return {
+    type: "object_stream",
+    trackAlias,
+    groupId,
+    objectId,
+    publisherPriority,
+    payload
+  };
 }
 function decodeObjectDatagram(reader) {
-  const subscribeId = reader.readVarInt();
   const trackAlias = reader.readVarInt();
   const groupId = reader.readVarInt();
   const objectId = reader.readVarInt();
   const publisherPriority = reader.readUint8();
-  const objectStatusRaw = Number(reader.readVarInt());
-  const payload = reader.readBytes(reader.remaining);
-  const base = { type: "object_datagram", subscribeId, trackAlias, groupId, objectId, publisherPriority, payload };
-  if (objectStatusRaw !== 0) {
-    return { ...base, objectStatus: objectStatusRaw };
+  const payloadLength = Number(reader.readVarInt());
+  if (payloadLength === 0) {
+    const objectStatus = reader.remaining > 0 ? Number(reader.readVarInt()) : 0;
+    return {
+      type: "object_datagram",
+      trackAlias,
+      groupId,
+      objectId,
+      publisherPriority,
+      objectStatus,
+      payload: new Uint8Array(0)
+    };
   }
-  return base;
+  const payload = reader.readBytes(payloadLength);
+  return {
+    type: "object_datagram",
+    trackAlias,
+    groupId,
+    objectId,
+    publisherPriority,
+    payload
+  };
 }
 function decodeStreamHeaderTrack(reader) {
-  const subscribeId = reader.readVarInt();
   const trackAlias = reader.readVarInt();
   const publisherPriority = reader.readUint8();
-  return { type: "stream_header_track", subscribeId, trackAlias, publisherPriority };
+  return { type: "stream_header_track", trackAlias, publisherPriority };
 }
 function decodeStreamHeaderGroup(reader) {
-  const subscribeId = reader.readVarInt();
   const trackAlias = reader.readVarInt();
   const groupId = reader.readVarInt();
   const publisherPriority = reader.readUint8();
-  return { type: "stream_header_group", subscribeId, trackAlias, groupId, publisherPriority };
+  return { type: "stream_header_group", trackAlias, groupId, publisherPriority };
 }
 function decodeStreamHeaderSubgroup(reader) {
-  const subscribeId = reader.readVarInt();
   const trackAlias = reader.readVarInt();
   const groupId = reader.readVarInt();
   const subgroupId = reader.readVarInt();
   const publisherPriority = reader.readUint8();
-  return { type: "stream_header_subgroup", subscribeId, trackAlias, groupId, subgroupId, publisherPriority };
+  return {
+    type: "stream_header_subgroup",
+    trackAlias,
+    groupId,
+    subgroupId,
+    publisherPriority
+  };
 }
 var controlDecoders = /* @__PURE__ */ new Map([
   [MESSAGE_TYPE_IDS.client_setup, decodeClientSetup],
@@ -655,7 +745,7 @@ var MESSAGE_TYPE_TO_WIRE = {
 function encodeMessageImpl(message) {
   const dataEncoder = dataStreamEncoders[message.type];
   if (dataEncoder) {
-    const writer = new (0, _chunk2NARXGVAcjs.BufferWriter)();
+    const writer = new (0, _chunkFWISIR26cjs.BufferWriter)();
     dataEncoder(message, writer);
     return writer.finish();
   }
@@ -663,10 +753,10 @@ function encodeMessageImpl(message) {
   if (!controlEncoder) {
     throw new Error(`Unknown message type: ${message.type}`);
   }
-  const payloadWriter = new (0, _chunk2NARXGVAcjs.BufferWriter)();
+  const payloadWriter = new (0, _chunkFWISIR26cjs.BufferWriter)();
   controlEncoder(message, payloadWriter);
   const payload = payloadWriter.finish();
-  const frameWriter = new (0, _chunk2NARXGVAcjs.BufferWriter)();
+  const frameWriter = new (0, _chunkFWISIR26cjs.BufferWriter)();
   frameWriter.writeVarInt(MESSAGE_TYPE_TO_WIRE[message.type]);
   frameWriter.writeVarInt(payload.byteLength);
   frameWriter.writeBytes(payload);
@@ -674,25 +764,33 @@ function encodeMessageImpl(message) {
 }
 function decodeMessageImpl(bytes) {
   try {
-    const reader = new (0, _chunk2NARXGVAcjs.BufferReader)(bytes, 0);
+    const reader = new (0, _chunkFWISIR26cjs.BufferReader)(bytes, 0);
     const typeId = reader.readVarInt();
     if (DATA_STREAM_TYPE_IDS.has(typeId)) {
       const decoder2 = dataStreamDecoders.get(typeId);
       if (!decoder2) {
         return {
           ok: false,
-          error: new (0, _chunk2NARXGVAcjs.DecodeError)("UNKNOWN_MESSAGE_TYPE", `Unknown data stream type ID: 0x${typeId.toString(16)}`, 0)
+          error: new (0, _chunkFWISIR26cjs.DecodeError)(
+            "UNKNOWN_MESSAGE_TYPE",
+            `Unknown data stream type ID: 0x${typeId.toString(16)}`,
+            0
+          )
         };
       }
       const message2 = decoder2(reader);
       return { ok: true, value: message2, bytesRead: reader.offset };
     }
     const payloadLength = Number(reader.readVarInt());
-    const headerBytes = reader.offset;
+    const _headerBytes = reader.offset;
     if (reader.remaining < payloadLength) {
       return {
         ok: false,
-        error: new (0, _chunk2NARXGVAcjs.DecodeError)("UNEXPECTED_END", `Not enough bytes for payload: need ${payloadLength}, have ${reader.remaining}`, reader.offset)
+        error: new (0, _chunkFWISIR26cjs.DecodeError)(
+          "UNEXPECTED_END",
+          `Not enough bytes for payload: need ${payloadLength}, have ${reader.remaining}`,
+          reader.offset
+        )
       };
     }
     const payloadBytes = reader.readBytes(payloadLength);
@@ -701,14 +799,18 @@ function decodeMessageImpl(bytes) {
     if (!decoder) {
       return {
         ok: false,
-        error: new (0, _chunk2NARXGVAcjs.DecodeError)("UNKNOWN_MESSAGE_TYPE", `Unknown message type ID: 0x${typeId.toString(16)}`, 0)
+        error: new (0, _chunkFWISIR26cjs.DecodeError)(
+          "UNKNOWN_MESSAGE_TYPE",
+          `Unknown message type ID: 0x${typeId.toString(16)}`,
+          0
+        )
       };
     }
-    const payloadReader = new (0, _chunk2NARXGVAcjs.BufferReader)(payloadBytes, 0);
+    const payloadReader = new (0, _chunkFWISIR26cjs.BufferReader)(payloadBytes, 0);
     const message = decoder(payloadReader);
     return { ok: true, value: message, bytesRead: totalBytesRead };
   } catch (e) {
-    if (e instanceof _chunk2NARXGVAcjs.DecodeError) {
+    if (e instanceof _chunkFWISIR26cjs.DecodeError) {
       return { ok: false, error: e };
     }
     throw e;
@@ -738,7 +840,7 @@ function createStreamDecoderImpl() {
     flush(controller) {
       if (buffer.length > 0) {
         controller.error(
-          new (0, _chunk2NARXGVAcjs.DecodeError)("UNEXPECTED_END", "Stream ended with incomplete message data", 0)
+          new (0, _chunkFWISIR26cjs.DecodeError)("UNEXPECTED_END", "Stream ended with incomplete message data", 0)
         );
       }
     }

package/dist/{chunk-YBSEOSSP.js → chunk-A27S7HW7.js}

@@ -35,7 +35,11 @@ var BufferReader = class {
   }
   readBytes(length) {
     if (this.remaining < length) {
-      throw new DecodeError("UNEXPECTED_END", `Not enough bytes: need ${length}, have ${this.remaining}`, this.pos);
+      throw new DecodeError(
+        "UNEXPECTED_END",
+        `Not enough bytes: need ${length}, have ${this.remaining}`,
+        this.pos
+      );
     }
     const slice = this.buffer.slice(this.pos, this.pos + length);
     this.pos += length;