@moqtap/codec 0.9.0 → 0.11.0

package/src/drafts/draft20/index.ts

@@ -31,6 +31,8 @@ export const PROTOCOL_STRING = 'moqt-20'
  */
 export const DRAFT_VERSION = 0xff000014n
 
+export type { AuthRedaction } from '../../core/auth-redaction.js'
+export { REDACTION_FILL } from '../../core/auth-redaction.js'
 export type { Draft20Codec } from './codec.js'
 export {
   createDataStreamDecoder,
@@ -47,6 +49,7 @@ export {
   encodeFetchStream,
   encodeMessage,
   encodeSubgroupStream,
+  redactAuthTokens,
   UNKNOWN_STREAM_COUNT,
 } from './codec.js'
 export type {

package/src/drafts/draft20/types.ts

@@ -18,7 +18,7 @@ export interface AuthorizationToken {
 // Setup options (KVP encoding, no count prefix) — unchanged from draft-19
 export interface Draft20SetupOptions {
   path?: string // 0x01 odd
-  authorization_token?: AuthorizationToken // 0x03 odd
+  authorization_token?: readonly AuthorizationToken[] // 0x03 odd
   max_auth_token_cache_size?: bigint // 0x04 even
   authority?: string // 0x05 odd
   max_filter_ranges?: bigint // 0x06 even
@@ -28,7 +28,7 @@ export interface Draft20SetupOptions {
 }
 
 /**
- * LOCATION_FILTER (0x21) — restructured in draft-20 (Section 5.1.2).
+ * LOCATION_FILTER (0x21) — draft-20 Section 5.1.2.
  *
  * The draft-19 `Filter Type` discriminator (0x1 Next Group Start / 0x2 Largest
  * Object / 0x3 AbsoluteStart / 0x4 AbsoluteRange) is gone; the shape is the
@@ -95,16 +95,19 @@ export interface Draft20FillParameters {
   subscriber_priority?: bigint // 0x20 uint8
   location_filter?: LocationFilter // 0x21 length-prefixed — selects the FILL range
   group_order?: bigint // 0x22 uint8
-  subgroup_filter?: RangeFilter // 0x25 length-prefixed
-  objectid_filter?: RangeFilter // 0x26 length-prefixed
-  priority_filter?: RangeFilter // 0x27 length-prefixed
-  object_property_filter?: RangeFilter // 0x28 length-prefixed
+  // Section 5.1.4 permits each of the five more than once in a message: a
+  // filter parameter carries one SetID, so two alternatives over the same
+  // field need two parameters. A single filter is a one-element list.
+  subgroup_filter?: readonly RangeFilter[] // 0x25 length-prefixed
+  objectid_filter?: readonly RangeFilter[] // 0x26 length-prefixed
+  priority_filter?: readonly RangeFilter[] // 0x27 length-prefixed
+  object_property_filter?: readonly RangeFilter[] // 0x28 length-prefixed
 }
 
 // Message Parameters (delta-encoded types, count-prefixed)
 export interface Draft20Params {
   object_delivery_timeout?: bigint // 0x02 varint
-  authorization_token?: AuthorizationToken // 0x03 length-prefixed nested
+  authorization_token?: readonly AuthorizationToken[] // 0x03 length-prefixed nested
   rendezvous_timeout?: bigint // 0x04 varint
   subgroup_delivery_timeout?: bigint // 0x06 varint
   expires?: bigint // 0x08 varint
@@ -112,14 +115,17 @@ export interface Draft20Params {
   fill_timeout?: bigint // 0x0a varint
   forward?: bigint // 0x10 uint8
   subscriber_priority?: bigint // 0x20 uint8
-  location_filter?: LocationFilter // 0x21 length-prefixed (restructured in draft-20)
+  location_filter?: LocationFilter // 0x21 length-prefixed; see LocationFilter for the draft-20 shape
   group_order?: bigint // 0x22 uint8
   fill_parameters?: Draft20FillParameters // 0x23 length-prefixed nested (NEW in draft-20)
-  subgroup_filter?: RangeFilter // 0x25 length-prefixed
-  objectid_filter?: RangeFilter // 0x26 length-prefixed
-  priority_filter?: RangeFilter // 0x27 length-prefixed
-  object_property_filter?: RangeFilter // 0x28 length-prefixed
-  track_property_filter?: RangeFilter // 0x29 length-prefixed
+  // Section 5.1.4 permits each of the five more than once in a message: a
+  // filter parameter carries one SetID, so two alternatives over the same
+  // field need two parameters. A single filter is a one-element list.
+  subgroup_filter?: readonly RangeFilter[] // 0x25 length-prefixed
+  objectid_filter?: readonly RangeFilter[] // 0x26 length-prefixed
+  priority_filter?: readonly RangeFilter[] // 0x27 length-prefixed
+  object_property_filter?: readonly RangeFilter[] // 0x28 length-prefixed
+  track_property_filter?: readonly RangeFilter[] // 0x29 length-prefixed
   new_group_request?: bigint // 0x32 varint
   track_namespace_prefix?: string[] // 0x34 Track Namespace encoding
   include_properties?: bigint // 0x35 uint8, 0 or 1, default 1 (NEW in draft-20)
@@ -440,10 +446,22 @@ export type Draft20DataStream = SubgroupStream | DatagramObject | FetchStream
 // Streaming data stream decoder types
 export interface SubgroupStreamHeader {
   readonly type: 'subgroup_header'
+  /**
+   * SUBGROUP_HEADER `Type Flags`, the same value `SubgroupStream.headerType`
+   * carries. It is reported so the incremental decoder does not drop the flags
+   * the header encodes, which is what lets a consumer tell the modes apart.
+   */
+  readonly headerType: number
   readonly trackAlias: bigint
   readonly groupId: bigint
+  /**
+   * Under Subgroup Mode 0b01 this is the first Object's ID, which is why the
+   * header is not emitted until that Object has been read.
+   */
   readonly subgroupId: bigint
   readonly publisherPriority: number
+  readonly endOfGroup?: boolean
+  readonly firstObject?: boolean
 }
 
 export interface FetchStreamHeader {

package/dist/codec-BJ7BHuiZ.d.ts

@@ -1,18 +0,0 @@
-import { B as BaseCodec, b as DecodeResult } from './types-DG5_iKuv.js';
-import { D as Draft07Message, S as SubgroupStream, b as DatagramObject, F as FetchStream } from './types-Dl4IaAHR.js';
-
-interface Draft07Codec extends BaseCodec<Draft07Message> {
-    readonly draft: '07';
-    encodeVarInt(value: number | bigint): Uint8Array;
-    decodeVarInt(bytes: Uint8Array, offset?: number): DecodeResult<bigint>;
-    encodeSubgroupStream(stream: SubgroupStream): Uint8Array;
-    decodeSubgroupStream(bytes: Uint8Array): DecodeResult<SubgroupStream>;
-    encodeDatagram(dg: DatagramObject): Uint8Array;
-    decodeDatagram(bytes: Uint8Array): DecodeResult<DatagramObject>;
-    encodeFetchStream(stream: FetchStream): Uint8Array;
-    decodeFetchStream(bytes: Uint8Array): DecodeResult<FetchStream>;
-    createStreamDecoder(): TransformStream<Uint8Array, Draft07Message>;
-}
-declare function createDraft07Codec(): Draft07Codec;
-
-export { type Draft07Codec as D, createDraft07Codec as c };

package/dist/codec-C6Mx4bwz.d.cts

@@ -1,18 +0,0 @@
-import { B as BaseCodec, b as DecodeResult } from './types-DG5_iKuv.cjs';
-import { D as Draft07Message, S as SubgroupStream, b as DatagramObject, F as FetchStream } from './types-Dl4IaAHR.cjs';
-
-interface Draft07Codec extends BaseCodec<Draft07Message> {
-    readonly draft: '07';
-    encodeVarInt(value: number | bigint): Uint8Array;
-    decodeVarInt(bytes: Uint8Array, offset?: number): DecodeResult<bigint>;
-    encodeSubgroupStream(stream: SubgroupStream): Uint8Array;
-    decodeSubgroupStream(bytes: Uint8Array): DecodeResult<SubgroupStream>;
-    encodeDatagram(dg: DatagramObject): Uint8Array;
-    decodeDatagram(bytes: Uint8Array): DecodeResult<DatagramObject>;
-    encodeFetchStream(stream: FetchStream): Uint8Array;
-    decodeFetchStream(bytes: Uint8Array): DecodeResult<FetchStream>;
-    createStreamDecoder(): TransformStream<Uint8Array, Draft07Message>;
-}
-declare function createDraft07Codec(): Draft07Codec;
-
-export { type Draft07Codec as D, createDraft07Codec as c };