@moqtap/codec 0.2.1 → 0.2.3

package/dist/{chunk-MFAP7R6L.js → chunk-MRJWLGYH.js}

@@ -3,7 +3,7 @@ import {
   SERVER_ONLY_MESSAGES,
   getLegalIncoming,
   getLegalOutgoing
-} from "./chunk-KFTCU2P6.js";
+} from "./chunk-C6KUWLQC.js";
 
 // src/drafts/draft07/session-fsm.ts
 function violation(code, message, currentPhase, offendingMessage) {

package/dist/{chunk-RWQ43Z4F.cjs → chunk-MZ7VU52O.cjs}

@@ -27,10 +27,7 @@ var CONTROL_MESSAGES = /* @__PURE__ */ new Set([
   "fetch_cancel"
 ]);
 var DATA_MESSAGES = /* @__PURE__ */ new Set([
-  "object_stream",
   "object_datagram",
-  "stream_header_track",
-  "stream_header_group",
   "stream_header_subgroup"
 ]);
 var CLIENT_ONLY_MESSAGES = /* @__PURE__ */ new Set([

package/dist/{chunk-TMNGRIPL.js → chunk-N2KBF5Q2.js}

@@ -2,7 +2,7 @@ import {
   BufferReader,
   BufferWriter,
   DecodeError
-} from "./chunk-A27S7HW7.js";
+} from "./chunk-7L43FE6P.js";
 
 // src/drafts/draft07/messages.ts
 var MESSAGE_TYPE_IDS = {
@@ -32,13 +32,12 @@ var MESSAGE_TYPE_IDS = {
   fetch_error: 0x19n,
   client_setup: 0x40n,
   server_setup: 0x41n,
-  // Data stream messages
-  object_stream: 0x00n,
+  // Data stream messages (Section 7, Table 5)
   object_datagram: 0x01n,
-  stream_header_track: 0x50n,
-  stream_header_group: 0x51n,
-  stream_header_subgroup: 0x04n
+  stream_header_subgroup: 0x04n,
   // Note: same ID as subscribe_ok but used on data streams, context disambiguates
+  fetch_header: 0x05n
+  // Note: same ID as subscribe_error but used on data streams, context disambiguates
 };
 var MESSAGE_ID_TO_TYPE = /* @__PURE__ */ new Map();
 for (const [name, id] of Object.entries(MESSAGE_TYPE_IDS)) {
@@ -49,9 +48,37 @@ for (const [name, id] of Object.entries(MESSAGE_TYPE_IDS)) {
 
 // src/drafts/draft07/varint.ts
 function encodeVarInt(value) {
-  const writer = new BufferWriter(8);
-  writer.writeVarInt(value);
-  return writer.finish();
+  const v = BigInt(value);
+  if (v < 0n) throw new Error("VarInt value must be non-negative");
+  if (v < 0x40n) {
+    const buf = new Uint8Array(1);
+    buf[0] = Number(v);
+    return buf;
+  }
+  if (v < 0x4000n) {
+    const buf = new Uint8Array(2);
+    const n = Number(v) | 16384;
+    buf[0] = n >> 8;
+    buf[1] = n & 255;
+    return buf;
+  }
+  if (v < 0x40000000n) {
+    const buf = new Uint8Array(4);
+    const n = Number(v) | 2147483648;
+    buf[0] = n >>> 24 & 255;
+    buf[1] = n >>> 16 & 255;
+    buf[2] = n >>> 8 & 255;
+    buf[3] = n & 255;
+    return buf;
+  }
+  if (v < 0x4000000000000000n) {
+    const buf = new Uint8Array(8);
+    const tagged = v | 0xc000000000000000n;
+    const view = new DataView(buf.buffer);
+    view.setBigUint64(0, tagged);
+    return buf;
+  }
+  throw new Error("VarInt value exceeds 62-bit range");
 }
 function decodeVarInt(bytes, offset = 0) {
   try {
@@ -66,6 +93,227 @@ function decodeVarInt(bytes, offset = 0) {
   }
 }
 
+// src/drafts/draft07/data-streams.ts
+var SUBGROUP_STREAM_TYPE = 0x04n;
+var FETCH_STREAM_TYPE = 0x05n;
+var DATAGRAM_TYPE = 0x01n;
+function encodeSubgroupStream(stream) {
+  const w = new BufferWriter();
+  w.writeVarInt(SUBGROUP_STREAM_TYPE);
+  w.writeVarInt(stream.trackAlias);
+  w.writeVarInt(stream.groupId);
+  w.writeVarInt(stream.subgroupId);
+  w.writeUint8(stream.publisherPriority);
+  for (const obj of stream.objects) {
+    w.writeVarInt(obj.objectId);
+    w.writeVarInt(obj.payloadLength);
+    if (obj.payloadLength === 0 && obj.status !== void 0) {
+      w.writeVarInt(obj.status);
+    } else {
+      w.writeBytes(obj.payload);
+    }
+  }
+  return w.finish();
+}
+function encodeDatagram(dg) {
+  const w = new BufferWriter();
+  w.writeVarInt(DATAGRAM_TYPE);
+  w.writeVarInt(dg.trackAlias);
+  w.writeVarInt(dg.groupId);
+  w.writeVarInt(dg.objectId);
+  w.writeUint8(dg.publisherPriority);
+  w.writeVarInt(dg.payloadLength);
+  if (dg.payloadLength === 0 && dg.status !== void 0) {
+    w.writeVarInt(dg.status);
+  } else {
+    w.writeBytes(dg.payload);
+  }
+  return w.finish();
+}
+function encodeFetchStream(stream) {
+  const w = new BufferWriter();
+  w.writeVarInt(FETCH_STREAM_TYPE);
+  w.writeVarInt(stream.subscribeId);
+  for (const obj of stream.objects) {
+    w.writeVarInt(obj.groupId);
+    w.writeVarInt(obj.subgroupId);
+    w.writeVarInt(obj.objectId);
+    w.writeUint8(obj.publisherPriority);
+    w.writeVarInt(obj.payloadLength);
+    if (obj.payloadLength === 0 && obj.status !== void 0) {
+      w.writeVarInt(obj.status);
+    } else {
+      w.writeBytes(obj.payload);
+    }
+  }
+  return w.finish();
+}
+function decodeSubgroupStream(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const streamType = Number(r.readVarInt());
+    if (streamType !== 4) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected subgroup type 0x04, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    const subgroupId = r.readVarInt();
+    const publisherPriority = r.readUint8();
+    const objects = [];
+    while (r.remaining > 0) {
+      const byteOffset = r.offset;
+      const objectId = r.readVarInt();
+      const payloadLength = Number(r.readVarInt());
+      let payload;
+      let status;
+      let payloadByteOffset;
+      if (payloadLength === 0) {
+        status = r.readVarInt();
+        payloadByteOffset = r.offset;
+        payload = new Uint8Array(0);
+      } else {
+        payloadByteOffset = r.offset;
+        payload = r.readBytesView(payloadLength);
+      }
+      const obj = {
+        type: "object",
+        objectId,
+        payloadLength,
+        payload,
+        byteOffset,
+        payloadByteOffset
+      };
+      if (status !== void 0) obj.status = status;
+      objects.push(obj);
+    }
+    return {
+      ok: true,
+      value: {
+        type: "subgroup",
+        streamTypeId: 4,
+        trackAlias,
+        groupId,
+        subgroupId,
+        publisherPriority,
+        objects
+      },
+      bytesRead: r.offset
+    };
+  } catch (e) {
+    if (e instanceof DecodeError) return { ok: false, error: e };
+    throw e;
+  }
+}
+function decodeDatagram(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const streamType = Number(r.readVarInt());
+    if (streamType !== 1) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected datagram type 0x01, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    const objectId = r.readVarInt();
+    const publisherPriority = r.readUint8();
+    const payloadLength = Number(r.readVarInt());
+    let status;
+    let payload;
+    if (payloadLength === 0) {
+      status = r.readVarInt();
+      payload = new Uint8Array(0);
+    } else {
+      payload = r.readBytesView(payloadLength);
+    }
+    const result = {
+      type: "datagram",
+      streamTypeId: 1,
+      trackAlias,
+      groupId,
+      objectId,
+      publisherPriority,
+      payloadLength,
+      payload
+    };
+    if (status !== void 0) result.status = status;
+    return { ok: true, value: result, bytesRead: r.offset };
+  } catch (e) {
+    if (e instanceof DecodeError) return { ok: false, error: e };
+    throw e;
+  }
+}
+function decodeFetchStream(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const streamType = Number(r.readVarInt());
+    if (streamType !== 5) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected fetch type 0x05, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const subscribeId = r.readVarInt();
+    const objects = [];
+    while (r.remaining > 0) {
+      const byteOffset = r.offset;
+      const groupId = r.readVarInt();
+      const subgroupId = r.readVarInt();
+      const objectId = r.readVarInt();
+      const publisherPriority = r.readUint8();
+      const payloadLength = Number(r.readVarInt());
+      let payload;
+      let status;
+      let payloadByteOffset;
+      if (payloadLength === 0) {
+        status = r.readVarInt();
+        payloadByteOffset = r.offset;
+        payload = new Uint8Array(0);
+      } else {
+        payloadByteOffset = r.offset;
+        payload = r.readBytesView(payloadLength);
+      }
+      const obj = {
+        type: "object",
+        groupId,
+        subgroupId,
+        objectId,
+        publisherPriority,
+        payloadLength,
+        payload,
+        byteOffset,
+        payloadByteOffset
+      };
+      if (status !== void 0) obj.status = status;
+      objects.push(obj);
+    }
+    return {
+      ok: true,
+      value: { type: "fetch", subscribeId, objects },
+      bytesRead: r.offset
+    };
+  } catch (e) {
+    if (e instanceof DecodeError) return { ok: false, error: e };
+    throw e;
+  }
+}
+
 // src/drafts/draft07/codec.ts
 var FILTER_TYPE_TO_WIRE = {
   latest_group: 1n,
@@ -106,10 +354,7 @@ function readGroupOrder(reader) {
   return value;
 }
 var DATA_STREAM_TYPE_IDS = /* @__PURE__ */ new Set([
-  MESSAGE_TYPE_IDS.object_stream,
-  MESSAGE_TYPE_IDS.object_datagram,
-  MESSAGE_TYPE_IDS.stream_header_track,
-  MESSAGE_TYPE_IDS.stream_header_group
+  MESSAGE_TYPE_IDS.object_datagram
 ]);
 function encodeClientSetup(msg, writer) {
   writer.writeVarInt(msg.supportedVersions.length);
@@ -268,14 +513,6 @@ function encodeObjectPayload(msg, writer) {
     writer.writeBytes(msg.payload);
   }
 }
-function encodeObjectStream(msg, writer) {
-  writer.writeVarInt(MESSAGE_TYPE_IDS.object_stream);
-  writer.writeVarInt(msg.trackAlias);
-  writer.writeVarInt(msg.groupId);
-  writer.writeVarInt(msg.objectId);
-  writer.writeUint8(msg.publisherPriority);
-  encodeObjectPayload(msg, writer);
-}
 function encodeObjectDatagram(msg, writer) {
   writer.writeVarInt(MESSAGE_TYPE_IDS.object_datagram);
   writer.writeVarInt(msg.trackAlias);
@@ -284,24 +521,6 @@ function encodeObjectDatagram(msg, writer) {
   writer.writeUint8(msg.publisherPriority);
   encodeObjectPayload(msg, writer);
 }
-function encodeStreamHeaderTrack(msg, writer) {
-  writer.writeVarInt(MESSAGE_TYPE_IDS.stream_header_track);
-  writer.writeVarInt(msg.trackAlias);
-  writer.writeUint8(msg.publisherPriority);
-}
-function encodeStreamHeaderGroup(msg, writer) {
-  writer.writeVarInt(MESSAGE_TYPE_IDS.stream_header_group);
-  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.trackAlias);
-  writer.writeVarInt(msg.groupId);
-  writer.writeVarInt(msg.subgroupId);
-  writer.writeUint8(msg.publisherPriority);
-}
 var controlEncoders = {
   client_setup: encodeClientSetup,
   server_setup: encodeServerSetup,
@@ -330,11 +549,7 @@ var controlEncoders = {
   fetch_cancel: encodeFetchCancel
 };
 var dataStreamEncoders = {
-  object_stream: encodeObjectStream,
-  object_datagram: encodeObjectDatagram,
-  stream_header_track: encodeStreamHeaderTrack,
-  stream_header_group: encodeStreamHeaderGroup,
-  stream_header_subgroup: encodeStreamHeaderSubgroup
+  object_datagram: encodeObjectDatagram
 };
 function decodeClientSetup(reader) {
   const numVersions = reader.readVarInt();
@@ -601,34 +816,6 @@ function decodeFetchCancel(reader) {
   const subscribeId = reader.readVarInt();
   return { type: "fetch_cancel", subscribeId };
 }
-function decodeObjectStream(reader) {
-  const trackAlias = reader.readVarInt();
-  const groupId = reader.readVarInt();
-  const objectId = reader.readVarInt();
-  const publisherPriority = reader.readUint8();
-  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)
-    };
-  }
-  const payload = reader.readBytes(payloadLength);
-  return {
-    type: "object_stream",
-    trackAlias,
-    groupId,
-    objectId,
-    publisherPriority,
-    payload
-  };
-}
 function decodeObjectDatagram(reader) {
   const trackAlias = reader.readVarInt();
   const groupId = reader.readVarInt();
@@ -647,7 +834,7 @@ function decodeObjectDatagram(reader) {
       payload: new Uint8Array(0)
     };
   }
-  const payload = reader.readBytes(payloadLength);
+  const payload = reader.readBytesView(payloadLength);
   return {
     type: "object_datagram",
     trackAlias,
@@ -657,30 +844,6 @@ function decodeObjectDatagram(reader) {
     payload
   };
 }
-function decodeStreamHeaderTrack(reader) {
-  const trackAlias = reader.readVarInt();
-  const publisherPriority = reader.readUint8();
-  return { type: "stream_header_track", trackAlias, publisherPriority };
-}
-function decodeStreamHeaderGroup(reader) {
-  const trackAlias = reader.readVarInt();
-  const groupId = reader.readVarInt();
-  const publisherPriority = reader.readUint8();
-  return { type: "stream_header_group", trackAlias, groupId, publisherPriority };
-}
-function decodeStreamHeaderSubgroup(reader) {
-  const trackAlias = reader.readVarInt();
-  const groupId = reader.readVarInt();
-  const subgroupId = reader.readVarInt();
-  const publisherPriority = reader.readUint8();
-  return {
-    type: "stream_header_subgroup",
-    trackAlias,
-    groupId,
-    subgroupId,
-    publisherPriority
-  };
-}
 var controlDecoders = /* @__PURE__ */ new Map([
   [MESSAGE_TYPE_IDS.client_setup, decodeClientSetup],
   [MESSAGE_TYPE_IDS.server_setup, decodeServerSetup],
@@ -709,11 +872,7 @@ var controlDecoders = /* @__PURE__ */ new Map([
   [MESSAGE_TYPE_IDS.fetch_cancel, decodeFetchCancel]
 ]);
 var dataStreamDecoders = /* @__PURE__ */ new Map([
-  [MESSAGE_TYPE_IDS.object_stream, decodeObjectStream],
-  [MESSAGE_TYPE_IDS.object_datagram, decodeObjectDatagram],
-  [MESSAGE_TYPE_IDS.stream_header_track, decodeStreamHeaderTrack],
-  [MESSAGE_TYPE_IDS.stream_header_group, decodeStreamHeaderGroup],
-  [MESSAGE_TYPE_IDS.stream_header_subgroup, decodeStreamHeaderSubgroup]
+  [MESSAGE_TYPE_IDS.object_datagram, decodeObjectDatagram]
 ]);
 var MESSAGE_TYPE_TO_WIRE = {
   client_setup: MESSAGE_TYPE_IDS.client_setup,
@@ -755,8 +914,8 @@ function encodeMessageImpl(message) {
   }
   const payloadWriter = new BufferWriter();
   controlEncoder(message, payloadWriter);
-  const payload = payloadWriter.finish();
-  const frameWriter = new BufferWriter();
+  const payload = payloadWriter.finishView();
+  const frameWriter = new BufferWriter(payload.byteLength + 16);
   frameWriter.writeVarInt(MESSAGE_TYPE_TO_WIRE[message.type]);
   frameWriter.writeVarInt(payload.byteLength);
   frameWriter.writeBytes(payload);
@@ -818,14 +977,19 @@ function decodeMessageImpl(bytes) {
 }
 function createStreamDecoderImpl() {
   let buffer = new Uint8Array(0);
+  let offset = 0;
   return new TransformStream({
     transform(chunk, controller) {
+      if (offset > 0) {
+        buffer = buffer.subarray(offset);
+        offset = 0;
+      }
       const newBuffer = new Uint8Array(buffer.length + chunk.length);
       newBuffer.set(buffer, 0);
       newBuffer.set(chunk, buffer.length);
       buffer = newBuffer;
-      while (buffer.length > 0) {
-        const result = decodeMessageImpl(buffer);
+      while (offset < buffer.length) {
+        const result = decodeMessageImpl(buffer.subarray(offset));
         if (!result.ok) {
           if (result.error.code === "UNEXPECTED_END") {
             break;
@@ -834,11 +998,11 @@ function createStreamDecoderImpl() {
           return;
         }
         controller.enqueue(result.value);
-        buffer = buffer.slice(result.bytesRead);
+        offset += result.bytesRead;
       }
     },
     flush(controller) {
-      if (buffer.length > 0) {
+      if (offset < buffer.length) {
         controller.error(
           new DecodeError("UNEXPECTED_END", "Stream ended with incomplete message data", 0)
         );
@@ -853,7 +1017,13 @@ function createDraft07Codec() {
     decodeMessage: decodeMessageImpl,
     encodeVarInt,
     decodeVarInt,
-    createStreamDecoder: createStreamDecoderImpl
+    createStreamDecoder: createStreamDecoderImpl,
+    encodeSubgroupStream,
+    decodeSubgroupStream,
+    encodeDatagram,
+    decodeDatagram,
+    encodeFetchStream,
+    decodeFetchStream
   };
 }
 
@@ -862,5 +1032,11 @@ export {
   MESSAGE_ID_TO_TYPE,
   encodeVarInt,
   decodeVarInt,
+  encodeSubgroupStream,
+  encodeDatagram,
+  encodeFetchStream,
+  decodeSubgroupStream,
+  decodeDatagram,
+  decodeFetchStream,
   createDraft07Codec
 };