@moqtap/codec 0.2.1 → 0.2.3

package/dist/{chunk-4RIXXEII.js → chunk-2ZT6CVSE.js}

@@ -1,8 +1,12 @@
+import {
+  bytesToHex,
+  hexToBytes
+} from "./chunk-HDWJ2GDE.js";
 import {
   BufferReader,
   BufferWriter,
   DecodeError
-} from "./chunk-A27S7HW7.js";
+} from "./chunk-7L43FE6P.js";
 
 // src/drafts/draft13/messages.ts
 var MSG_SUBSCRIBE_UPDATE = 0x02n;
@@ -80,21 +84,255 @@ var MESSAGE_ID_MAP = new Map(
   [...MESSAGE_TYPE_MAP.entries()].map(([id, name]) => [name, id])
 );
 
-// src/drafts/draft13/codec.ts
-function bytesToHex(bytes) {
-  let hex = "";
-  for (let i = 0; i < bytes.byteLength; i++) {
-    hex += bytes[i].toString(16).padStart(2, "0");
+// src/drafts/draft13/data-streams.ts
+var FETCH_STREAM_TYPE = 0x05n;
+function encodeSubgroupStream(stream) {
+  const w = new BufferWriter();
+  const typeId = stream.streamTypeId;
+  w.writeVarInt(BigInt(typeId));
+  const extensionsPresent = (typeId & 1) !== 0;
+  const hasSubgroupField = (typeId & 4) !== 0;
+  w.writeVarInt(stream.trackAlias);
+  w.writeVarInt(stream.groupId);
+  if (hasSubgroupField) w.writeVarInt(stream.subgroupId);
+  w.writeUint8(stream.publisherPriority);
+  for (const obj of stream.objects) {
+    w.writeVarInt(obj.objectId);
+    if (extensionsPresent) {
+      w.writeVarInt(BigInt(obj.extensionData.length));
+      if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+    }
+    w.writeVarInt(obj.payloadLength);
+    if (obj.payloadLength === 0) {
+      w.writeVarInt(obj.status ?? 0n);
+    } else {
+      w.writeBytes(obj.payload);
+    }
+  }
+  return w.finish();
+}
+function encodeDatagram(dg) {
+  const w = new BufferWriter();
+  w.writeVarInt(BigInt(dg.streamTypeId));
+  w.writeVarInt(dg.trackAlias);
+  w.writeVarInt(dg.groupId);
+  w.writeVarInt(dg.objectId);
+  w.writeUint8(dg.publisherPriority);
+  if (dg.streamTypeId === 2) {
+    w.writeVarInt(dg.objectStatus ?? 0n);
+  } else {
+    w.writeBytes(dg.payload);
   }
-  return hex;
+  return w.finish();
 }
-function hexToBytes(hex) {
-  const bytes = new Uint8Array(hex.length / 2);
-  for (let i = 0; i < hex.length; i += 2) {
-    bytes[i / 2] = parseInt(hex.substring(i, i + 2), 16);
+function encodeFetchStream(stream) {
+  const w = new BufferWriter();
+  w.writeVarInt(FETCH_STREAM_TYPE);
+  w.writeVarInt(stream.requestId);
+  for (const obj of stream.objects) {
+    w.writeVarInt(obj.groupId);
+    w.writeVarInt(obj.subgroupId);
+    w.writeVarInt(obj.objectId);
+    w.writeUint8(obj.publisherPriority);
+    w.writeVarInt(BigInt(obj.extensionData.length));
+    if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+    w.writeVarInt(obj.payloadLength);
+    w.writeBytes(obj.payload);
   }
-  return bytes;
+  return w.finish();
 }
+function decodeSubgroupStream(bytes) {
+  try {
+    const r = new BufferReader(bytes);
+    const streamTypeId = Number(r.readVarInt());
+    const validRange1 = streamTypeId >= 16 && streamTypeId <= 21;
+    const validRange2 = streamTypeId >= 24 && streamTypeId <= 29;
+    if (!validRange1 && !validRange2) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected subgroup type 0x10-0x15 or 0x18-0x1D, got 0x${streamTypeId.toString(16)}`,
+          0
+        )
+      };
+    }
+    const extensionsPresent = (streamTypeId & 1) !== 0;
+    const hasSubgroupField = (streamTypeId & 4) !== 0;
+    const subgroupIsFirstObjId = (streamTypeId & 2) !== 0 && !hasSubgroupField;
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    let subgroupId = 0n;
+    if (hasSubgroupField) subgroupId = r.readVarInt();
+    const publisherPriority = r.readUint8();
+    const objects = [];
+    let firstObject = true;
+    while (r.remaining > 0) {
+      const byteOffset = r.offset;
+      const objectId = r.readVarInt();
+      if (subgroupIsFirstObjId && firstObject) {
+        subgroupId = objectId;
+      }
+      firstObject = false;
+      let extensionData = new Uint8Array(0);
+      if (extensionsPresent) {
+        const extLen = Number(r.readVarInt());
+        extensionData = extLen > 0 ? r.readBytesView(extLen) : new Uint8Array(0);
+      }
+      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", byteOffset, payloadByteOffset, objectId, payloadLength, extensionData, payload };
+      if (status !== void 0) obj.status = status;
+      objects.push(obj);
+    }
+    return {
+      ok: true,
+      value: {
+        type: "subgroup",
+        streamTypeId,
+        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 streamTypeId = Number(r.readVarInt());
+    if (streamTypeId !== 0 && streamTypeId !== 2) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected datagram type 0x00 or 0x02, got 0x${streamTypeId.toString(16)}`,
+          0
+        )
+      };
+    }
+    const trackAlias = r.readVarInt();
+    const groupId = r.readVarInt();
+    const objectId = r.readVarInt();
+    const publisherPriority = r.readUint8();
+    let objectStatus;
+    let payload;
+    if (streamTypeId === 2) {
+      objectStatus = r.readVarInt();
+      payload = new Uint8Array(0);
+    } else {
+      payload = r.readBytesView(r.remaining);
+    }
+    const result = {
+      type: "datagram",
+      streamTypeId,
+      trackAlias,
+      groupId,
+      objectId,
+      publisherPriority,
+      payloadLength: payload.byteLength,
+      payload
+    };
+    if (objectStatus !== void 0)
+      result.objectStatus = objectStatus;
+    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 = r.readVarInt();
+    if (streamType !== FETCH_STREAM_TYPE) {
+      return {
+        ok: false,
+        error: new DecodeError(
+          "CONSTRAINT_VIOLATION",
+          `Expected fetch type 0x05, got 0x${streamType.toString(16)}`,
+          0
+        )
+      };
+    }
+    const requestId = 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 extensionHeadersLength = r.readVarInt();
+      const extensionData = extensionHeadersLength > 0n ? r.readBytesView(Number(extensionHeadersLength)) : new Uint8Array(0);
+      const payloadLength = Number(r.readVarInt());
+      let payload;
+      let objectStatus;
+      let payloadByteOffset;
+      if (payloadLength === 0) {
+        objectStatus = r.readVarInt();
+        payloadByteOffset = r.offset;
+        payload = new Uint8Array(0);
+      } else {
+        payloadByteOffset = r.offset;
+        payload = r.readBytesView(payloadLength);
+      }
+      const obj = {
+        type: "object",
+        byteOffset,
+        payloadByteOffset,
+        groupId,
+        subgroupId,
+        objectId,
+        publisherPriority,
+        extensionData,
+        payloadLength,
+        payload
+      };
+      if (objectStatus !== void 0)
+        obj.objectStatus = objectStatus;
+      objects.push(obj);
+    }
+    return { ok: true, value: { type: "fetch", requestId, objects }, bytesRead: r.offset };
+  } catch (e) {
+    if (e instanceof DecodeError) return { ok: false, error: e };
+    throw e;
+  }
+}
+function decodeDataStream(streamType, bytes) {
+  switch (streamType) {
+    case "subgroup":
+      return decodeSubgroupStream(bytes);
+    case "datagram":
+      return decodeDatagram(bytes);
+    case "fetch":
+      return decodeFetchStream(bytes);
+    default: {
+      const _ = streamType;
+      throw new Error(`Unknown: ${_}`);
+    }
+  }
+}
+
+// src/drafts/draft13/codec.ts
+var textEncoder = /* @__PURE__ */ new TextEncoder();
+var textDecoder = /* @__PURE__ */ new TextDecoder();
 function encodeSetupParams(params, w) {
   let count = 0;
   if (params.path !== void 0) count++;
@@ -103,7 +341,7 @@ function encodeSetupParams(params, w) {
   w.writeVarInt(count);
   if (params.path !== void 0) {
     w.writeVarInt(SETUP_PARAM_PATH);
-    const encoded = new TextEncoder().encode(params.path);
+    const encoded = textEncoder.encode(params.path);
     w.writeVarInt(encoded.byteLength);
     w.writeBytes(encoded);
   }
@@ -151,7 +389,7 @@ function decodeSetupParams(r) {
       const length = Number(r.readVarInt());
       const bytes = r.readBytes(length);
       if (paramType === SETUP_PARAM_PATH) {
-        result.path = new TextDecoder().decode(bytes);
+        result.path = textDecoder.decode(bytes);
       } else {
         unknown.push({ id: `0x${paramType.toString(16)}`, length, raw_hex: bytesToHex(bytes) });
       }
@@ -171,7 +409,7 @@ function encodeParams(params, w) {
     const tmpW = new BufferWriter(64);
     tmpW.writeVarInt(at.alias_type);
     tmpW.writeVarInt(at.token_type);
-    const tokenBytes = new TextEncoder().encode(at.token_value);
+    const tokenBytes = textEncoder.encode(at.token_value);
     tmpW.writeBytes(tokenBytes);
     const raw = tmpW.finish();
     w.writeVarInt(raw.byteLength);
@@ -228,7 +466,7 @@ function decodeParams(r) {
         result.authorization_token = {
           alias_type,
           token_type,
-          token_value: new TextDecoder().decode(tokenBytes)
+          token_value: textDecoder.decode(tokenBytes)
         };
       } else if (paramType === PARAM_DELIVERY_TIMEOUT) {
         const blob = r.readBytes(length);
@@ -865,18 +1103,14 @@ function encodeMessage(message) {
   if (typeId === void 0) throw new Error(`Unknown message type: ${message.type}`);
   const payloadWriter = new BufferWriter();
   encodePayload(message, payloadWriter);
-  const payload = payloadWriter.finish();
-  const writer = new BufferWriter();
+  const payload = payloadWriter.finishView();
+  const writer = new BufferWriter(payload.byteLength + 16);
   writer.writeVarInt(typeId);
-  if (VARINT_FRAMED_MESSAGES.has(typeId)) {
-    writer.writeVarInt(payload.byteLength);
-  } else {
-    if (payload.byteLength > 65535) {
-      throw new Error(`Payload too large for 16-bit length: ${payload.byteLength}`);
-    }
-    writer.writeUint8(payload.byteLength >> 8 & 255);
-    writer.writeUint8(payload.byteLength & 255);
+  if (payload.byteLength > 65535) {
+    throw new Error(`Payload too large for 16-bit length: ${payload.byteLength}`);
   }
+  writer.writeUint8(payload.byteLength >> 8 & 255);
+  writer.writeUint8(payload.byteLength & 255);
   writer.writeBytes(payload);
   return writer.finish();
 }
@@ -952,14 +1186,9 @@ function decodeMessage(bytes) {
   try {
     const reader = new BufferReader(bytes);
     const typeId = reader.readVarInt();
-    let payloadLength;
-    if (VARINT_FRAMED_MESSAGES.has(typeId)) {
-      payloadLength = Number(reader.readVarInt());
-    } else {
-      const lenHi = reader.readUint8();
-      const lenLo = reader.readUint8();
-      payloadLength = lenHi << 8 | lenLo;
-    }
+    const lenHi = reader.readUint8();
+    const lenLo = reader.readUint8();
+    const payloadLength = lenHi << 8 | lenLo;
     const payloadBytes = reader.readBytes(payloadLength);
     const payloadReader = new BufferReader(payloadBytes);
     const decoder = payloadDecoders.get(typeId);
@@ -980,229 +1209,32 @@ function decodeMessage(bytes) {
     throw e;
   }
 }
-var FETCH_STREAM_TYPE = 0x05n;
-function encodeSubgroupStream(stream) {
-  const w = new BufferWriter();
-  const typeId = stream.streamTypeId;
-  w.writeVarInt(BigInt(typeId));
-  w.writeVarInt(stream.trackAlias);
-  w.writeVarInt(stream.groupId);
-  if (typeId === 12) 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(BigInt(dg.streamTypeId));
-  w.writeVarInt(dg.trackAlias);
-  w.writeVarInt(dg.groupId);
-  w.writeVarInt(dg.objectId);
-  w.writeUint8(dg.publisherPriority);
-  if (dg.streamTypeId === 2) {
-    w.writeVarInt(dg.objectStatus ?? 0n);
-  } else {
-    w.writeBytes(dg.payload);
-  }
-  return w.finish();
-}
-function encodeFetchStream(stream) {
-  const w = new BufferWriter();
-  w.writeVarInt(FETCH_STREAM_TYPE);
-  w.writeVarInt(stream.requestId);
-  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.extensionHeadersLength);
-    w.writeVarInt(obj.payloadLength);
-    w.writeBytes(obj.payload);
-  }
-  return w.finish();
-}
-function decodeSubgroupStream(bytes) {
-  try {
-    const r = new BufferReader(bytes);
-    const streamTypeId = Number(r.readVarInt());
-    if (streamTypeId !== 8 && streamTypeId !== 12) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected subgroup type 0x08 or 0x0C, got 0x${streamTypeId.toString(16)}`,
-          0
-        )
-      };
-    }
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    let subgroupId = 0n;
-    if (streamTypeId === 12) subgroupId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    const objects = [];
-    while (r.remaining > 0) {
-      const objectId = r.readVarInt();
-      const payloadLength = Number(r.readVarInt());
-      let payload;
-      let status;
-      if (payloadLength === 0) {
-        status = r.readVarInt();
-        payload = new Uint8Array(0);
-      } else {
-        payload = r.readBytes(payloadLength);
-      }
-      const obj = { type: "object", objectId, payloadLength, payload };
-      if (status !== void 0) obj.status = status;
-      objects.push(obj);
-    }
-    return {
-      ok: true,
-      value: {
-        type: "subgroup",
-        streamTypeId,
-        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 streamTypeId = Number(r.readVarInt());
-    if (streamTypeId !== 0 && streamTypeId !== 2) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected datagram type 0x00 or 0x02, got 0x${streamTypeId.toString(16)}`,
-          0
-        )
-      };
-    }
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    const objectId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    let objectStatus;
-    let payload;
-    if (streamTypeId === 2) {
-      objectStatus = r.readVarInt();
-      payload = new Uint8Array(0);
-    } else {
-      payload = r.readBytes(r.remaining);
-    }
-    const result = {
-      type: "datagram",
-      streamTypeId,
-      trackAlias,
-      groupId,
-      objectId,
-      publisherPriority,
-      payloadLength: payload.byteLength,
-      payload
-    };
-    if (objectStatus !== void 0)
-      result.objectStatus = objectStatus;
-    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 = r.readVarInt();
-    if (streamType !== FETCH_STREAM_TYPE) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected fetch type 0x05, got 0x${streamType.toString(16)}`,
-          0
-        )
-      };
-    }
-    const requestId = r.readVarInt();
-    const objects = [];
-    while (r.remaining > 0) {
-      const groupId = r.readVarInt();
-      const subgroupId = r.readVarInt();
-      const objectId = r.readVarInt();
-      const publisherPriority = r.readUint8();
-      const extensionHeadersLength = r.readVarInt();
-      if (extensionHeadersLength > 0n) r.readBytes(Number(extensionHeadersLength));
-      const payloadLength = Number(r.readVarInt());
-      const payload = payloadLength > 0 ? r.readBytes(payloadLength) : new Uint8Array(0);
-      objects.push({
-        type: "object",
-        groupId,
-        subgroupId,
-        objectId,
-        publisherPriority,
-        extensionHeadersLength,
-        payloadLength,
-        payload
-      });
-    }
-    return { ok: true, value: { type: "fetch", requestId, objects }, bytesRead: r.offset };
-  } catch (e) {
-    if (e instanceof DecodeError) return { ok: false, error: e };
-    throw e;
-  }
-}
-function decodeDataStream(streamType, bytes) {
-  switch (streamType) {
-    case "subgroup":
-      return decodeSubgroupStream(bytes);
-    case "datagram":
-      return decodeDatagram(bytes);
-    case "fetch":
-      return decodeFetchStream(bytes);
-    default: {
-      const _ = streamType;
-      throw new Error(`Unknown: ${_}`);
-    }
-  }
-}
 function createStreamDecoder() {
   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 = decodeMessage(buffer);
+      while (offset < buffer.length) {
+        const result = decodeMessage(buffer.subarray(offset));
         if (!result.ok) {
           if (result.error.code === "UNEXPECTED_END") break;
           controller.error(result.error);
           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 data", 0));
     }
   });
@@ -1261,8 +1293,6 @@ export {
   VARINT_FRAMED_MESSAGES,
   MESSAGE_TYPE_MAP,
   MESSAGE_ID_MAP,
-  encodeMessage,
-  decodeMessage,
   encodeSubgroupStream,
   encodeDatagram,
   encodeFetchStream,
@@ -1270,6 +1300,8 @@ export {
   decodeDatagram,
   decodeFetchStream,
   decodeDataStream,
+  encodeMessage,
+  decodeMessage,
   createStreamDecoder,
   createDraft13Codec
 };