@moqtap/codec 0.9.0 → 0.11.0

package/dist/{chunk-XQGEOFGE.js → chunk-WCRLAKDW.js}

@@ -3,8 +3,10 @@ import {
   BufferWriter,
   DecodeError,
   bytesToHex,
-  hexToBytes
-} from "./chunk-KLPWJU6W.js";
+  hexToBytes,
+  recordAuthValueSpan,
+  redactWith
+} from "./chunk-YRZQVNZO.js";
 
 // src/drafts/draft14/messages.ts
 var MSG_SUBSCRIBE_UPDATE = 0x02n;
@@ -177,87 +179,95 @@ function encodeFetchStream(stream) {
   }
   return w.finish();
 }
+function readSubgroupHeader(r) {
+  const streamType = Number(r.readVarInt());
+  if (!isValidSubgroupType(streamType)) {
+    throw new DecodeError(
+      "CONSTRAINT_VIOLATION",
+      `Expected subgroup stream type 0x10-0x1D, got 0x${streamType.toString(16)}`,
+      0
+    );
+  }
+  const extensionsPresent = (streamType & 1) !== 0;
+  const hasSubgroupField = (streamType & 4) !== 0;
+  const subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
+  const trackAlias = r.readVarInt();
+  const groupId = r.readVarInt();
+  let subgroupId = 0n;
+  if (hasSubgroupField) {
+    subgroupId = r.readVarInt();
+  }
+  const publisherPriority = r.readUint8();
+  return {
+    streamType,
+    extensionsPresent,
+    subgroupIsFirstObjId,
+    trackAlias,
+    groupId,
+    subgroupId,
+    publisherPriority
+  };
+}
+function readSubgroupObject(r, extensionsPresent, isFirst, prevObjectId, base) {
+  const byteOffset = base + r.offset;
+  const delta = r.readVarInt();
+  const objectId = isFirst ? delta : prevObjectId + 1n + delta;
+  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 = base + r.offset;
+    payload = new Uint8Array(0);
+  } else {
+    payloadByteOffset = base + r.offset;
+    payload = r.readBytesView(payloadLength);
+  }
+  const obj = {
+    type: "object",
+    byteOffset,
+    payloadByteOffset,
+    objectId,
+    payloadLength,
+    payload,
+    extensionData
+  };
+  if (status !== void 0) obj.status = status;
+  return obj;
+}
 function decodeSubgroupStream(bytes) {
   try {
     const r = new BufferReader(bytes);
-    const streamType = Number(r.readVarInt());
-    if (!isValidSubgroupType(streamType)) {
-      return {
-        ok: false,
-        error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected subgroup stream type 0x10-0x1D, got 0x${streamType.toString(16)}`,
-          0
-        )
-      };
-    }
-    const extensionsPresent = (streamType & 1) !== 0;
-    const hasSubgroupField = (streamType & 4) !== 0;
-    const subgroupIsFirstObjId = (streamType & 2) !== 0 && !hasSubgroupField;
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    let subgroupId = 0n;
-    if (hasSubgroupField) {
-      subgroupId = r.readVarInt();
-    }
-    const publisherPriority = r.readUint8();
+    const h = readSubgroupHeader(r);
     const objects = [];
     let prevObjectId = -1n;
-    let firstObject = true;
+    let isFirst = true;
+    let subgroupId = h.subgroupId;
     while (r.remaining > 0) {
-      const byteOffset = r.offset;
-      const delta = r.readVarInt();
-      let objectId;
-      if (firstObject) {
-        objectId = delta;
-        if (subgroupIsFirstObjId) {
-          subgroupId = objectId;
-        }
-        firstObject = false;
-      } else {
-        objectId = prevObjectId + 1n + delta;
-      }
-      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,
-        payload,
-        extensionData
-      };
-      if (status !== void 0) obj.status = status;
+      const obj = readSubgroupObject(r, h.extensionsPresent, isFirst, prevObjectId, 0);
+      if (isFirst && h.subgroupIsFirstObjId) subgroupId = obj.objectId;
+      isFirst = false;
       objects.push(obj);
-      prevObjectId = objectId;
+      prevObjectId = obj.objectId;
     }
+    const result = {
+      type: "subgroup",
+      headerType: h.streamType,
+      trackAlias: h.trackAlias,
+      groupId: h.groupId,
+      subgroupId,
+      publisherPriority: h.publisherPriority,
+      objects
+    };
     return {
       ok: true,
-      value: {
-        type: "subgroup",
-        headerType: streamType,
-        trackAlias,
-        groupId,
-        subgroupId,
-        publisherPriority,
-        objects
-      },
+      value: result,
       bytesRead: r.offset
     };
   } catch (e) {
@@ -326,6 +336,44 @@ function decodeDatagram(bytes) {
     throw e;
   }
 }
+function newFetchObjectState() {
+  return {};
+}
+function readFetchObject(r, base, _st) {
+  const byteOffset = base + r.offset;
+  const groupId = r.readVarInt();
+  const subgroupId = r.readVarInt();
+  const objectId = r.readVarInt();
+  const publisherPriority = r.readUint8();
+  const extLen = Number(r.readVarInt());
+  const 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 = base + r.offset;
+    payload = new Uint8Array(0);
+  } else {
+    payloadByteOffset = base + r.offset;
+    payload = r.readBytesView(payloadLength);
+  }
+  const obj = {
+    type: "object",
+    byteOffset,
+    payloadByteOffset,
+    groupId,
+    subgroupId,
+    objectId,
+    publisherPriority,
+    payloadLength,
+    payload,
+    extensionData
+  };
+  if (status !== void 0) obj.status = status;
+  return obj;
+}
 function decodeFetchStream(bytes) {
   try {
     const r = new BufferReader(bytes);
@@ -342,40 +390,9 @@ function decodeFetchStream(bytes) {
     }
     const requestId = r.readVarInt();
     const objects = [];
+    const st = newFetchObjectState();
     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 extLen = Number(r.readVarInt());
-      const 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,
-        groupId,
-        subgroupId,
-        objectId,
-        publisherPriority,
-        payloadLength,
-        payload,
-        extensionData
-      };
-      if (status !== void 0) obj.status = status;
-      objects.push(obj);
+      objects.push(readFetchObject(r, 0, st));
     }
     return {
       ok: true,
@@ -401,56 +418,68 @@ function decodeDataStream(streamType, bytes) {
     }
   }
 }
+var StreamBuffer = class {
+  buf = new Uint8Array(0);
+  /** Bytes written into `buf`. */
+  len = 0;
+  /** Consumed prefix of `buf`; `base + offset` is the position in the stream. */
+  offset = 0;
+  /** Absolute position of `buf[0]` within the stream. */
+  base = 0;
+  get unread() {
+    return this.len - this.offset;
+  }
+  append(chunk) {
+    if (this.len + chunk.length > this.buf.length) {
+      const live = this.len - this.offset;
+      const needed = live + chunk.length;
+      let cap = Math.max(4096, this.buf.length);
+      while (cap < needed * 2) cap *= 2;
+      const next = new Uint8Array(cap);
+      next.set(this.buf.subarray(this.offset, this.len), 0);
+      this.buf = next;
+      this.base += this.offset;
+      this.len = live;
+      this.offset = 0;
+    }
+    this.buf.set(chunk, this.len);
+    this.len += chunk.length;
+  }
+  /**
+   * The written bytes, for a reader positioned at `offset`. Bounded by `len`
+   * rather than by capacity, so `BufferReader.remaining` counts real bytes and
+   * not the spare room after them.
+   */
+  written() {
+    return this.buf.subarray(0, this.len);
+  }
+};
 function createSubgroupStreamDecoder() {
-  let buffer = new Uint8Array(0);
-  let offset = 0;
+  const b = new StreamBuffer();
+  let header = null;
   let headerEmitted = false;
-  let extensionsPresent = false;
   let prevObjectId = -1n;
-  let firstObject = true;
+  let isFirst = true;
+  function emitHeader(controller, h, subgroupId) {
+    controller.enqueue({
+      type: "subgroup_header",
+      headerType: h.streamType,
+      trackAlias: h.trackAlias,
+      groupId: h.groupId,
+      subgroupId,
+      publisherPriority: h.publisherPriority
+    });
+    headerEmitted = true;
+  }
   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;
-      if (!headerEmitted) {
+      b.append(chunk);
+      const view = b.written();
+      if (header === null) {
         try {
-          const r = new BufferReader(buffer.subarray(offset));
-          const streamType = Number(r.readVarInt());
-          if (!isValidSubgroupType(streamType)) {
-            controller.error(
-              new DecodeError(
-                "CONSTRAINT_VIOLATION",
-                `Expected subgroup stream type 0x10-0x1D, got 0x${streamType.toString(16)}`,
-                0
-              )
-            );
-            return;
-          }
-          extensionsPresent = (streamType & 1) !== 0;
-          const hasSubgroupField = (streamType & 4) !== 0;
-          const trackAlias = r.readVarInt();
-          const groupId = r.readVarInt();
-          let subgroupId = 0n;
-          if (hasSubgroupField) {
-            subgroupId = r.readVarInt();
-          }
-          const publisherPriority = r.readUint8();
-          controller.enqueue({
-            type: "subgroup_header",
-            headerType: streamType,
-            trackAlias,
-            groupId,
-            subgroupId,
-            publisherPriority
-          });
-          headerEmitted = true;
-          offset += r.offset;
+          const hr = new BufferReader(view, b.offset);
+          header = readSubgroupHeader(hr);
+          b.offset = hr.offset;
         } catch (e) {
           if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
             return;
@@ -458,78 +487,51 @@ function createSubgroupStreamDecoder() {
           controller.error(e);
           return;
         }
+        if (!header.subgroupIsFirstObjId) emitHeader(controller, header, header.subgroupId);
       }
-      while (offset < buffer.length) {
+      const h = header;
+      if (h === null) return;
+      const r = new BufferReader(view, b.offset);
+      while (r.remaining > 0) {
+        const start = r.offset;
+        let obj;
         try {
-          const r = new BufferReader(buffer.subarray(offset));
-          const byteOffset = r.offset;
-          const delta = r.readVarInt();
-          const objectId = firstObject ? delta : prevObjectId + 1n + delta;
-          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,
-            payload,
-            extensionData
-          };
-          if (status !== void 0) obj.status = status;
-          controller.enqueue(obj);
-          prevObjectId = objectId;
-          offset += r.offset;
+          obj = readSubgroupObject(r, h.extensionsPresent, isFirst, prevObjectId, b.base);
         } catch (e) {
           if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
-            break;
+            b.offset = start;
+            return;
           }
           controller.error(e);
           return;
         }
+        if (!headerEmitted) emitHeader(controller, h, obj.objectId);
+        isFirst = false;
+        b.offset = r.offset;
+        prevObjectId = obj.objectId;
+        controller.enqueue(obj);
       }
     },
     flush(controller) {
-      if (offset < buffer.length) {
+      if (header !== null && !headerEmitted) emitHeader(controller, header, 0n);
+      if (b.unread > 0) {
         controller.error(new DecodeError("UNEXPECTED_END", "Stream ended with incomplete data", 0));
       }
     }
   });
 }
 function createFetchStreamDecoder() {
-  let buffer = new Uint8Array(0);
-  let offset = 0;
+  const b = new StreamBuffer();
   let headerEmitted = false;
+  const st = newFetchObjectState();
   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;
+      b.append(chunk);
+      const view = b.written();
       if (!headerEmitted) {
         try {
-          const r = new BufferReader(buffer.subarray(offset));
-          const streamType = r.readVarInt();
+          const r2 = new BufferReader(view, b.offset);
+          const streamType = r2.readVarInt();
           if (streamType !== FETCH_STREAM_TYPE) {
             controller.error(
               new DecodeError(
@@ -540,10 +542,10 @@ function createFetchStreamDecoder() {
             );
             return;
           }
-          const requestId = r.readVarInt();
+          const requestId = r2.readVarInt();
           controller.enqueue({ type: "fetch_header", requestId });
           headerEmitted = true;
-          offset += r.offset;
+          b.offset = r2.offset;
         } catch (e) {
           if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
             return;
@@ -552,54 +554,26 @@ function createFetchStreamDecoder() {
           return;
         }
       }
-      while (offset < buffer.length) {
+      const r = new BufferReader(view, b.offset);
+      while (r.remaining > 0) {
+        const start = r.offset;
+        let obj;
         try {
-          const r = new BufferReader(buffer.subarray(offset));
-          const byteOffset = r.offset;
-          const groupId = r.readVarInt();
-          const subgroupId = r.readVarInt();
-          const objectId = r.readVarInt();
-          const publisherPriority = r.readUint8();
-          const extLen = Number(r.readVarInt());
-          const 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,
-            groupId,
-            subgroupId,
-            objectId,
-            publisherPriority,
-            payloadLength,
-            payload,
-            extensionData
-          };
-          if (status !== void 0) obj.status = status;
-          controller.enqueue(obj);
-          offset += r.offset;
+          obj = readFetchObject(r, b.base, st);
         } catch (e) {
           if (e instanceof DecodeError && e.code === "UNEXPECTED_END") {
-            break;
+            b.offset = start;
+            return;
           }
           controller.error(e);
           return;
         }
+        b.offset = r.offset;
+        controller.enqueue(obj);
       }
     },
     flush(controller) {
-      if (offset < buffer.length) {
+      if (b.unread > 0) {
         controller.error(new DecodeError("UNEXPECTED_END", "Stream ended with incomplete data", 0));
       }
     }
@@ -801,7 +775,7 @@ function encodeSetupParams(params, writer) {
   if (params.role !== void 0) count++;
   if (params.path !== void 0) count++;
   if (params.max_request_id !== void 0) count++;
-  if (params.authorization_token !== void 0) count++;
+  count += params.authorization_token?.length ?? 0;
   if (params.authority !== void 0) count++;
   if (params.max_auth_token_cache_size !== void 0) count++;
   if (params.moqt_implementation !== void 0) count++;
@@ -821,9 +795,9 @@ function encodeSetupParams(params, writer) {
     writer.writeVarInt(PARAM_MAX_REQUEST_ID);
     writer.writeVarInt(params.max_request_id);
   }
-  if (params.authorization_token !== void 0) {
+  for (const token of params.authorization_token ?? []) {
     writer.writeVarInt(PARAM_AUTHORIZATION_TOKEN);
-    const tok = params.authorization_token;
+    const tok = token;
     const tmpWriter = new BufferWriter(64);
     tmpWriter.writeVarInt(tok.alias_type);
     if (tok.token_type !== void 0) {
@@ -901,11 +875,15 @@ function decodeSetupParams(reader) {
         if (tokenReader.remaining > 0) {
           tok.token_type = tokenReader.readVarInt();
           if (tokenReader.remaining > 0) {
-            const tokenValue = tokenReader.readBytesView(tokenReader.remaining);
-            tok.token_value = new Uint8Array(tokenValue);
+            const value = new Uint8Array(tokenReader.readBytesView(tokenReader.remaining));
+            tok.token_value = value;
+            noteAuthTokenValue(reader.offset - length, length, value);
           }
         }
-        result.authorization_token = tok;
+        result.authorization_token = [
+          ...result.authorization_token ?? [],
+          tok
+        ];
       } else if (paramType === PARAM_AUTHORITY) {
         result.authority = textDecoder.decode(bytes);
       } else if (paramType === PARAM_MOQT_IMPLEMENTATION) {
@@ -925,7 +903,7 @@ function decodeSetupParams(reader) {
 function encodeMessageParams(params, writer) {
   let count = 0;
   if (params.delivery_timeout !== void 0) count++;
-  if (params.authorization_token !== void 0) count++;
+  count += params.authorization_token?.length ?? 0;
   if (params.max_cache_duration !== void 0) count++;
   if (params.unknown) count += params.unknown.length;
   writer.writeVarInt(count);
@@ -933,9 +911,9 @@ function encodeMessageParams(params, writer) {
     writer.writeVarInt(PARAM_DELIVERY_TIMEOUT);
     writer.writeVarInt(params.delivery_timeout);
   }
-  if (params.authorization_token !== void 0) {
+  for (const token of params.authorization_token ?? []) {
     writer.writeVarInt(PARAM_AUTHORIZATION_TOKEN);
-    const tok = params.authorization_token;
+    const tok = token;
     const tmpWriter = new BufferWriter(64);
     tmpWriter.writeVarInt(tok.alias_type);
     if (tok.token_type !== void 0) {
@@ -997,11 +975,15 @@ function decodeMessageParams(reader) {
         if (tokenReader.remaining > 0) {
           tok.token_type = tokenReader.readVarInt();
           if (tokenReader.remaining > 0) {
-            const tokenValue = tokenReader.readBytesView(tokenReader.remaining);
-            tok.token_value = new Uint8Array(tokenValue);
+            const value = new Uint8Array(tokenReader.readBytesView(tokenReader.remaining));
+            tok.token_value = value;
+            noteAuthTokenValue(reader.offset - length, length, value);
           }
         }
-        result.authorization_token = tok;
+        result.authorization_token = [
+          ...result.authorization_token ?? [],
+          tok
+        ];
       } else {
         unknown.push({
           id: `0x${paramType.toString(16)}`,
@@ -1832,6 +1814,23 @@ function createDraft14Codec() {
     createDataStreamDecoder
   };
 }
+function noteAuthTokenValue(valueStart, valueLength, value) {
+  if (value === void 0 || value.byteLength === 0) return;
+  recordAuthValueSpan(valueStart + valueLength - value.byteLength, value.byteLength);
+}
+function redactAuthTokens(bytes) {
+  let payloadStart;
+  try {
+    const probe = new BufferReader(bytes);
+    probe.readVarInt();
+    probe.readUint8();
+    probe.readUint8();
+    payloadStart = probe.offset;
+  } catch {
+    return { bytes, redacted: 0, incomplete: false, decoded: false };
+  }
+  return redactWith(bytes, payloadStart, () => decodeMessage(bytes).ok);
+}
 
 export {
   MSG_SUBSCRIBE_UPDATE,
@@ -1886,5 +1885,6 @@ export {
   encodeMessage,
   decodeMessage,
   createStreamDecoder,
-  createDraft14Codec
+  createDraft14Codec,
+  redactAuthTokens
 };