moqtail 0.11.0 → 0.12.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -129,6 +129,7 @@ var TerminationError = class extends MOQtailError {
129
129
 
130
130
  // src/model/common/pair.ts
131
131
  var MAX_VALUE_LENGTH = 2 ** 16 - 1;
132
+ var MAX_U64 = 2n ** 64n - 1n;
132
133
  var KeyValuePair = class _KeyValuePair {
133
134
  /**
134
135
  * The key/type identifier for this pair.
@@ -188,11 +189,29 @@ var KeyValuePair = class _KeyValuePair {
188
189
  }
189
190
  /**
190
191
  * Serializes this key-value pair to a frozen byte buffer.
192
+ * Equivalent to {@link KeyValuePair.serializeDelta} with `prevType = 0n`.
191
193
  * @returns The serialized buffer.
192
194
  */
193
195
  serialize() {
196
+ return this.serializeDelta(0n);
197
+ }
198
+ /**
199
+ * Serializes this pair's wire form, encoding the Type as a delta from
200
+ * `prevType` (the type of the previous KVP in the same list, or 0n if this
201
+ * is the first entry).
202
+ * @param prevType - The type of the previous KVP in the same list.
203
+ * @throws ProtocolViolationError if this pair's type is less than prevType
204
+ * (Delta Type is an unsigned varint, so the list must be sorted ascending).
205
+ */
206
+ serializeDelta(prevType) {
207
+ if (this.typeValue < prevType) {
208
+ throw new ProtocolViolationError(
209
+ "KeyValuePair.serializeDelta",
210
+ `type ${this.typeValue} is less than previous type ${prevType}; a KVP list must be sorted by ascending type to be delta-encoded`
211
+ );
212
+ }
194
213
  const buf = new ByteBuffer();
195
- buf.putVI(this.typeValue);
214
+ buf.putVI(this.typeValue - prevType);
196
215
  if (isVarInt(this)) {
197
216
  buf.putVI(this.value);
198
217
  } else if (isBytes(this)) {
@@ -202,13 +221,32 @@ var KeyValuePair = class _KeyValuePair {
202
221
  }
203
222
  /**
204
223
  * Deserializes a KeyValuePair from a buffer.
224
+ * Equivalent to {@link KeyValuePair.deserializeDelta} with `prevType = 0n`.
205
225
  * @param buf - The buffer to read from.
206
226
  * @returns The deserialized KeyValuePair.
207
227
  * @throws LengthExceedsMaxError if blob length exceeds 65535 bytes.
208
228
  * @throws NotEnoughBytesError if buffer does not contain enough bytes.
209
229
  */
210
230
  static deserialize(buf) {
211
- const typeValue = buf.getVI();
231
+ return _KeyValuePair.deserializeDelta(buf, 0n);
232
+ }
233
+ /**
234
+ * Deserializes a wire-form KVP whose Type field is a delta from `prevType`
235
+ * (the type of the previous KVP in the same list, or 0n if this is the
236
+ * first entry).
237
+ * @param buf - The buffer to read from.
238
+ * @param prevType - The type of the previous KVP in the same list.
239
+ * @throws ProtocolViolationError if prevType + delta exceeds 2^64 - 1.
240
+ */
241
+ static deserializeDelta(buf, prevType) {
242
+ const deltaType = buf.getVI();
243
+ const typeValue = prevType + deltaType;
244
+ if (typeValue > MAX_U64) {
245
+ throw new ProtocolViolationError(
246
+ "KeyValuePair.deserializeDelta",
247
+ `previous type ${prevType} plus delta type ${deltaType} exceeds 2^64 - 1`
248
+ );
249
+ }
212
250
  if (typeValue % 2n === 0n) {
213
251
  const value = buf.getVI();
214
252
  return new _KeyValuePair(typeValue, value);
@@ -243,6 +281,37 @@ var KeyValuePair = class _KeyValuePair {
243
281
  return false;
244
282
  }
245
283
  };
284
+ function serializeKvpList(items) {
285
+ const sorted = [...items].sort((a, b) => a.typeValue < b.typeValue ? -1 : a.typeValue > b.typeValue ? 1 : 0);
286
+ const buf = new ByteBuffer();
287
+ let prevType = 0n;
288
+ for (const kvp of sorted) {
289
+ buf.putBytes(kvp.serializeDelta(prevType).toUint8Array());
290
+ prevType = kvp.typeValue;
291
+ }
292
+ return buf.freeze();
293
+ }
294
+ function deserializeKvpList(buf, count) {
295
+ const n = typeof count === "bigint" ? Number(count) : count;
296
+ const items = new Array(n);
297
+ let prevType = 0n;
298
+ for (let i = 0; i < n; i++) {
299
+ const kvp = KeyValuePair.deserializeDelta(buf, prevType);
300
+ prevType = kvp.typeValue;
301
+ items[i] = kvp;
302
+ }
303
+ return items;
304
+ }
305
+ function deserializeKvpListUntilEmpty(buf) {
306
+ const items = [];
307
+ let prevType = 0n;
308
+ while (buf.remaining > 0) {
309
+ const kvp = KeyValuePair.deserializeDelta(buf, prevType);
310
+ prevType = kvp.typeValue;
311
+ items.push(kvp);
312
+ }
313
+ return items;
314
+ }
246
315
  function isVarInt(pair) {
247
316
  return pair.typeValue % 2n === 0n;
248
317
  }
@@ -845,13 +914,7 @@ var Datagram = class _Datagram {
845
914
  buf.putU8(this.publisherPriority);
846
915
  }
847
916
  if (ObjectDatagramType.hasExtensions(this.type)) {
848
- const extBuf = new ByteBuffer();
849
- if (this.extensionHeaders) {
850
- for (const header of this.extensionHeaders) {
851
- extBuf.putKeyValuePair(header);
852
- }
853
- }
854
- const extBytes = extBuf.toUint8Array();
917
+ const extBytes = this.extensionHeaders ? serializeKvpList(this.extensionHeaders).toUint8Array() : new Uint8Array(0);
855
918
  buf.putLengthPrefixedBytes(extBytes);
856
919
  }
857
920
  if (ObjectDatagramType.isStatus(this.type)) {
@@ -882,10 +945,7 @@ var Datagram = class _Datagram {
882
945
  if (ObjectDatagramType.hasExtensions(msgType)) {
883
946
  const extBytes = buf.getLengthPrefixedBytes();
884
947
  const headerBytes = new FrozenByteBuffer5(extBytes);
885
- extensionHeaders = [];
886
- while (headerBytes.remaining > 0) {
887
- extensionHeaders.push(headerBytes.getKeyValuePair());
888
- }
948
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
889
949
  }
890
950
  let payload = null;
891
951
  let objectStatus = null;
@@ -1057,9 +1117,7 @@ var FetchObject = class _FetchObject {
1057
1117
  if (hasObjectId) buf.putVI(this.objectId);
1058
1118
  if (hasPriority) buf.putU8(this.publisherPriority);
1059
1119
  if (hasExtensions) {
1060
- const extBuf = new ByteBuffer();
1061
- for (const h of this.extensionHeaders) extBuf.putKeyValuePair(h);
1062
- buf.putLengthPrefixedBytes(extBuf.toUint8Array());
1120
+ buf.putLengthPrefixedBytes(serializeKvpList(this.extensionHeaders).toUint8Array());
1063
1121
  }
1064
1122
  const payloadBytes = this.payload ?? new Uint8Array(0);
1065
1123
  buf.putLengthPrefixedBytes(payloadBytes);
@@ -1145,10 +1203,7 @@ var FetchObject = class _FetchObject {
1145
1203
  if (hasExtensions) {
1146
1204
  const extLen = buf.getNumberVI();
1147
1205
  const headerBytes = new FrozenByteBuffer5(buf.getBytes(extLen));
1148
- extensionHeaders = [];
1149
- while (headerBytes.remaining > 0) {
1150
- extensionHeaders.push(headerBytes.getKeyValuePair());
1151
- }
1206
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
1152
1207
  }
1153
1208
  const payloadLen = buf.getNumberVI();
1154
1209
  const payload = buf.getBytes(payloadLen);
@@ -1812,26 +1867,18 @@ var ImmutableExtensionsExtension = class _ImmutableExtensionsExtension {
1812
1867
  extensions;
1813
1868
  static TYPE = 11 /* ImmutableExtensions */;
1814
1869
  toKeyValuePair() {
1815
- const inner = new ByteBuffer();
1816
- for (const kvp of this.extensions) {
1817
- inner.putBytes(kvp.serialize().toUint8Array());
1818
- }
1819
- return KeyValuePair.tryNewBytes(_ImmutableExtensionsExtension.TYPE, inner.toUint8Array());
1870
+ return KeyValuePair.tryNewBytes(_ImmutableExtensionsExtension.TYPE, serializeKvpList(this.extensions).toUint8Array());
1820
1871
  }
1821
1872
  static fromKeyValuePair(pair) {
1822
1873
  if (Number(pair.typeValue) !== _ImmutableExtensionsExtension.TYPE || !(pair.value instanceof Uint8Array))
1823
1874
  return void 0;
1824
1875
  const buf = new FrozenByteBuffer5(pair.value);
1825
- const extensions = [];
1826
- while (buf.remaining > 0) {
1827
- const inner = KeyValuePair.deserialize(buf);
1828
- if (Number(inner.typeValue) === 11 /* ImmutableExtensions */) {
1829
- throw new ProtocolViolationError(
1830
- "ImmutableExtensionsExtension.fromKeyValuePair",
1831
- "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
1832
- );
1833
- }
1834
- extensions.push(inner);
1876
+ const extensions = deserializeKvpListUntilEmpty(buf);
1877
+ if (extensions.some((inner) => Number(inner.typeValue) === 11 /* ImmutableExtensions */)) {
1878
+ throw new ProtocolViolationError(
1879
+ "ImmutableExtensionsExtension.fromKeyValuePair",
1880
+ "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
1881
+ );
1835
1882
  }
1836
1883
  return new _ImmutableExtensionsExtension(extensions);
1837
1884
  }
@@ -1918,18 +1965,11 @@ var TrackExtension;
1918
1965
  }
1919
1966
  TrackExtension2.toKeyValuePair = toKeyValuePair;
1920
1967
  function deserializeAll(buf) {
1921
- const result = [];
1922
- while (buf.remaining > 0) {
1923
- const kvp = KeyValuePair.deserialize(buf);
1924
- result.push(fromKeyValuePair(kvp));
1925
- }
1926
- return result;
1968
+ return deserializeKvpListUntilEmpty(buf).map(fromKeyValuePair);
1927
1969
  }
1928
1970
  TrackExtension2.deserializeAll = deserializeAll;
1929
1971
  function serializeInto(exts, payload) {
1930
- for (const ext of exts) {
1931
- payload.putBytes(ext.toKeyValuePair().serialize().toUint8Array());
1932
- }
1972
+ payload.putBytes(serializeKvpList(exts.map((ext) => ext.toKeyValuePair())).toUint8Array());
1933
1973
  }
1934
1974
  TrackExtension2.serializeInto = serializeInto;
1935
1975
  function isDeliveryTimeout(ext) {
@@ -1970,26 +2010,21 @@ var ImmutableExtensionsObjectExtension = class _ImmutableExtensionsObjectExtensi
1970
2010
  extensions;
1971
2011
  static TYPE = 11 /* ImmutableExtensions */;
1972
2012
  toKeyValuePair() {
1973
- const inner = new ByteBuffer();
1974
- for (const kvp of this.extensions) {
1975
- inner.putBytes(kvp.serialize().toUint8Array());
1976
- }
1977
- return KeyValuePair.tryNewBytes(_ImmutableExtensionsObjectExtension.TYPE, inner.toUint8Array());
2013
+ return KeyValuePair.tryNewBytes(
2014
+ _ImmutableExtensionsObjectExtension.TYPE,
2015
+ serializeKvpList(this.extensions).toUint8Array()
2016
+ );
1978
2017
  }
1979
2018
  static fromKeyValuePair(pair) {
1980
2019
  if (Number(pair.typeValue) !== _ImmutableExtensionsObjectExtension.TYPE || !(pair.value instanceof Uint8Array))
1981
2020
  return void 0;
1982
2021
  const buf = new FrozenByteBuffer5(pair.value);
1983
- const extensions = [];
1984
- while (buf.remaining > 0) {
1985
- const inner = KeyValuePair.deserialize(buf);
1986
- if (Number(inner.typeValue) === 11 /* ImmutableExtensions */) {
1987
- throw new ProtocolViolationError(
1988
- "ImmutableExtensionsObjectExtension.fromKeyValuePair",
1989
- "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
1990
- );
1991
- }
1992
- extensions.push(inner);
2022
+ const extensions = deserializeKvpListUntilEmpty(buf);
2023
+ if (extensions.some((inner) => Number(inner.typeValue) === 11 /* ImmutableExtensions */)) {
2024
+ throw new ProtocolViolationError(
2025
+ "ImmutableExtensionsObjectExtension.fromKeyValuePair",
2026
+ "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
2027
+ );
1993
2028
  }
1994
2029
  return new _ImmutableExtensionsObjectExtension(extensions);
1995
2030
  }
@@ -2042,18 +2077,11 @@ var ObjectExtension;
2042
2077
  }
2043
2078
  ObjectExtension2.toKeyValuePair = toKeyValuePair;
2044
2079
  function deserializeAll(buf) {
2045
- const result = [];
2046
- while (buf.remaining > 0) {
2047
- const kvp = KeyValuePair.deserialize(buf);
2048
- result.push(fromKeyValuePair(kvp));
2049
- }
2050
- return result;
2080
+ return deserializeKvpListUntilEmpty(buf).map(fromKeyValuePair);
2051
2081
  }
2052
2082
  ObjectExtension2.deserializeAll = deserializeAll;
2053
2083
  function serializeInto(exts, payload) {
2054
- for (const ext of exts) {
2055
- payload.putBytes(ext.toKeyValuePair().serialize().toUint8Array());
2056
- }
2084
+ payload.putBytes(serializeKvpList(exts.map((ext) => ext.toKeyValuePair())).toUint8Array());
2057
2085
  }
2058
2086
  ObjectExtension2.serializeInto = serializeInto;
2059
2087
  function isImmutableExtensions(ext) {
@@ -2075,6 +2103,12 @@ var ObjectExtension;
2075
2103
  })(ObjectExtension || (ObjectExtension = {}));
2076
2104
 
2077
2105
  // src/model/data/subgroup_object.ts
2106
+ function normalizeExtensionHeaders(extensionHeaders) {
2107
+ if (extensionHeaders === null || extensionHeaders.length === 0) {
2108
+ return null;
2109
+ }
2110
+ return extensionHeaders;
2111
+ }
2078
2112
  var SubgroupObject = class _SubgroupObject {
2079
2113
  constructor(objectId, extensionHeaders, objectStatus, payload) {
2080
2114
  this.extensionHeaders = extensionHeaders;
@@ -2087,22 +2121,17 @@ var SubgroupObject = class _SubgroupObject {
2087
2121
  payload;
2088
2122
  objectId;
2089
2123
  static newWithStatus(objectId, extensionHeaders, objectStatus) {
2090
- return new _SubgroupObject(objectId, extensionHeaders, objectStatus, null);
2124
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), objectStatus, null);
2091
2125
  }
2092
2126
  static newWithPayload(objectId, extensionHeaders, payload) {
2093
- return new _SubgroupObject(objectId, extensionHeaders, null, payload);
2127
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), null, payload);
2094
2128
  }
2095
2129
  serialize(previousObjectId) {
2096
2130
  let objectIdDelta = previousObjectId ? this.objectId - previousObjectId - BigInt(1) : this.objectId;
2097
2131
  const buf = new ByteBuffer();
2098
2132
  buf.putVI(objectIdDelta);
2099
- const extensionHeaders = new ByteBuffer();
2100
- if (this.extensionHeaders) {
2101
- for (const header of this.extensionHeaders) {
2102
- extensionHeaders.putKeyValuePair(header);
2103
- }
2104
- const headerBytes = extensionHeaders.toUint8Array();
2105
- buf.putLengthPrefixedBytes(headerBytes);
2133
+ if (this.extensionHeaders !== null) {
2134
+ buf.putLengthPrefixedBytes(serializeKvpList(this.extensionHeaders).toUint8Array());
2106
2135
  }
2107
2136
  if (this.payload) {
2108
2137
  buf.putLengthPrefixedBytes(this.payload);
@@ -2117,12 +2146,9 @@ var SubgroupObject = class _SubgroupObject {
2117
2146
  let objectId = previousObjectId !== void 0 ? previousObjectId + objectDelta + BigInt(1) : objectDelta;
2118
2147
  let extensionHeaders = null;
2119
2148
  if (hasExtensions) {
2120
- extensionHeaders = [];
2121
2149
  const extLen = buf.getNumberVI();
2122
2150
  const headerBytes = new FrozenByteBuffer5(buf.getBytes(extLen));
2123
- while (headerBytes.remaining > 0) {
2124
- extensionHeaders.push(headerBytes.getKeyValuePair());
2125
- }
2151
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
2126
2152
  }
2127
2153
  const payloadLen = buf.getNumberVI();
2128
2154
  let objectStatus = null;
@@ -2132,7 +2158,7 @@ var SubgroupObject = class _SubgroupObject {
2132
2158
  } else {
2133
2159
  payload = buf.getBytes(payloadLen);
2134
2160
  }
2135
- return new _SubgroupObject(objectId, extensionHeaders, objectStatus, payload);
2161
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), objectStatus, payload);
2136
2162
  }
2137
2163
  };
2138
2164
 
@@ -2573,24 +2599,12 @@ var Header;
2573
2599
  buf.checkpoint();
2574
2600
  const type = buf.getNumberVI();
2575
2601
  buf.restore();
2576
- switch (type) {
2577
- case 5:
2578
- return FetchHeader.deserialize(buf);
2579
- case 16:
2580
- case 17:
2581
- case 18:
2582
- case 19:
2583
- case 20:
2584
- case 21:
2585
- case 24:
2586
- case 25:
2587
- case 26:
2588
- case 27:
2589
- case 28:
2590
- case 29:
2591
- return SubgroupHeader.deserialize(buf);
2592
- default:
2593
- throw new InvalidTypeError("Header::deserialize(type)", `Unknown header type: ${type}`);
2602
+ if (type === 5) {
2603
+ return FetchHeader.deserialize(buf);
2604
+ } else if ((type & SubgroupHeaderType.REQUIRED_BIT) !== 0 && (type & 192) === 0) {
2605
+ return SubgroupHeader.deserialize(buf);
2606
+ } else {
2607
+ throw new InvalidTypeError("Header::deserialize(type)", `Unknown header type: ${type}`);
2594
2608
  }
2595
2609
  }
2596
2610
  Header2.deserialize = deserialize;
@@ -3353,9 +3367,7 @@ var PublishNamespace = class _PublishNamespace {
3353
3367
  payload.putVI(this.requestId);
3354
3368
  payload.putTuple(this.trackNamespace);
3355
3369
  payload.putVI(this.parameters.length);
3356
- for (const param of this.parameters) {
3357
- payload.putKeyValuePair(param.toKeyValuePair());
3358
- }
3370
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3359
3371
  const payloadBytes = payload.toUint8Array();
3360
3372
  if (payloadBytes.length > 65535) {
3361
3373
  throw new LengthExceedsMaxError("PublishNamespace::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -3376,10 +3388,7 @@ var PublishNamespace = class _PublishNamespace {
3376
3388
  const requestId = buf.getVI();
3377
3389
  const trackNamespace = buf.getTuple();
3378
3390
  const paramCount = buf.getNumberVI();
3379
- const rawParams = new Array(paramCount);
3380
- for (let i = 0; i < paramCount; i++) {
3381
- rawParams[i] = buf.getKeyValuePair();
3382
- }
3391
+ const rawParams = deserializeKvpList(buf, paramCount);
3383
3392
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3384
3393
  return new _PublishNamespace(requestId, trackNamespace, parameters);
3385
3394
  }
@@ -3496,9 +3505,7 @@ var ClientSetup = class _ClientSetup {
3496
3505
  buf.putVI(32 /* ClientSetup */);
3497
3506
  const payload = new ByteBuffer();
3498
3507
  payload.putVI(this.setupParameters.length);
3499
- for (const param of this.setupParameters) {
3500
- payload.putKeyValuePair(param);
3501
- }
3508
+ payload.putBytes(serializeKvpList(this.setupParameters).toUint8Array());
3502
3509
  const payloadBytes = payload.toUint8Array();
3503
3510
  if (payloadBytes.length > 65535) {
3504
3511
  throw new LengthExceedsMaxError("ClientSetup::serialize(payload_length)", 65535, payloadBytes.length);
@@ -3509,10 +3516,7 @@ var ClientSetup = class _ClientSetup {
3509
3516
  }
3510
3517
  static parsePayload(buf) {
3511
3518
  const paramCount = buf.getNumberVI();
3512
- const setupParameters = new Array(paramCount);
3513
- for (let i = 0; i < paramCount; i++) {
3514
- setupParameters[i] = buf.getKeyValuePair();
3515
- }
3519
+ const setupParameters = deserializeKvpList(buf, paramCount);
3516
3520
  return new _ClientSetup(setupParameters);
3517
3521
  }
3518
3522
  };
@@ -3551,9 +3555,7 @@ var Fetch = class _Fetch {
3551
3555
  }
3552
3556
  }
3553
3557
  payload.putVI(this.parameters.length);
3554
- for (const param of this.parameters) {
3555
- payload.putKeyValuePair(param.toKeyValuePair());
3556
- }
3558
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3557
3559
  const payloadBytes = payload.toUint8Array();
3558
3560
  if (payloadBytes.length > 65535) {
3559
3561
  throw new LengthExceedsMaxError("Fetch::serialize(payload_length)", 65535, payloadBytes.length);
@@ -3592,10 +3594,7 @@ var Fetch = class _Fetch {
3592
3594
  throw new Error(`Unknown fetch type: ${fetchType}`);
3593
3595
  }
3594
3596
  const paramCount = buf.getNumberVI();
3595
- const rawParams = new Array(paramCount);
3596
- for (let i = 0; i < paramCount; i++) {
3597
- rawParams[i] = buf.getKeyValuePair();
3598
- }
3597
+ const rawParams = deserializeKvpList(buf, paramCount);
3599
3598
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3600
3599
  return new _Fetch(requestId, props, parameters);
3601
3600
  }
@@ -3651,9 +3650,7 @@ var FetchOk = class _FetchOk {
3651
3650
  payload.putU8(this.endOfTrack ? 1 : 0);
3652
3651
  payload.putLocation(this.endLocation);
3653
3652
  payload.putVI(this.parameters.length);
3654
- for (const param of this.parameters) {
3655
- payload.putKeyValuePair(param.toKeyValuePair());
3656
- }
3653
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3657
3654
  TrackExtension.serializeInto(this.trackExtensions, payload);
3658
3655
  const payloadBytes = payload.toUint8Array();
3659
3656
  if (payloadBytes.length > 65535) {
@@ -3682,10 +3679,7 @@ var FetchOk = class _FetchOk {
3682
3679
  }
3683
3680
  const endLocation = buf.getLocation();
3684
3681
  const paramCount = buf.getNumberVI();
3685
- const rawParams = new Array(paramCount);
3686
- for (let i = 0; i < paramCount; i++) {
3687
- rawParams[i] = buf.getKeyValuePair();
3688
- }
3682
+ const rawParams = deserializeKvpList(buf, paramCount);
3689
3683
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3690
3684
  const trackExtensions = TrackExtension.deserializeAll(buf);
3691
3685
  return new _FetchOk(requestId, endOfTrack, endLocation, parameters, trackExtensions);
@@ -3797,9 +3791,7 @@ var ServerSetup = class _ServerSetup {
3797
3791
  buf.putVI(33 /* ServerSetup */);
3798
3792
  const payload = new ByteBuffer();
3799
3793
  payload.putVI(this.setupParameters.length);
3800
- for (const param of this.setupParameters) {
3801
- payload.putKeyValuePair(param);
3802
- }
3794
+ payload.putBytes(serializeKvpList(this.setupParameters).toUint8Array());
3803
3795
  const payloadBytes = payload.toUint8Array();
3804
3796
  if (payloadBytes.length > 65535) {
3805
3797
  throw new LengthExceedsMaxError("ServerSetup::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -3810,10 +3802,7 @@ var ServerSetup = class _ServerSetup {
3810
3802
  }
3811
3803
  static parsePayload(buf) {
3812
3804
  const paramCount = buf.getNumberVI();
3813
- const setupParameters = new Array(paramCount);
3814
- for (let i = 0; i < paramCount; i++) {
3815
- setupParameters[i] = buf.getKeyValuePair();
3816
- }
3805
+ const setupParameters = deserializeKvpList(buf, paramCount);
3817
3806
  return new _ServerSetup(setupParameters);
3818
3807
  }
3819
3808
  };
@@ -3856,9 +3845,7 @@ var Subscribe = class _Subscribe {
3856
3845
  payload.putVI(this.requestId);
3857
3846
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
3858
3847
  payload.putVI(this.parameters.length);
3859
- for (const param of this.parameters) {
3860
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
3861
- }
3848
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3862
3849
  const payloadBytes = payload.toUint8Array();
3863
3850
  buf.putU16(payloadBytes.length);
3864
3851
  buf.putBytes(payloadBytes);
@@ -3869,8 +3856,7 @@ var Subscribe = class _Subscribe {
3869
3856
  const fullTrackName = buf.getFullTrackName();
3870
3857
  const paramCount = Number(buf.getVI());
3871
3858
  const parameters = [];
3872
- for (let i = 0; i < paramCount; i++) {
3873
- const kvp = KeyValuePair.deserialize(buf);
3859
+ for (const kvp of deserializeKvpList(buf, paramCount)) {
3874
3860
  const param = MessageParameter.fromKeyValuePair(kvp);
3875
3861
  if (param !== void 0) parameters.push(param);
3876
3862
  }
@@ -3947,9 +3933,7 @@ var Publish = class _Publish {
3947
3933
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
3948
3934
  payload.putVI(this.trackAlias);
3949
3935
  payload.putVI(this.parameters.length);
3950
- for (const param of this.parameters) {
3951
- payload.putKeyValuePair(param.toKeyValuePair());
3952
- }
3936
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3953
3937
  TrackExtension.serializeInto(this.trackExtensions, payload);
3954
3938
  const payloadBytes = payload.toUint8Array();
3955
3939
  if (payloadBytes.length > 65535) {
@@ -3964,10 +3948,7 @@ var Publish = class _Publish {
3964
3948
  const fullTrackName = buf.getFullTrackName();
3965
3949
  const trackAlias = buf.getVI();
3966
3950
  const paramCount = buf.getNumberVI();
3967
- const rawParams = new Array(paramCount);
3968
- for (let i = 0; i < paramCount; i++) {
3969
- rawParams[i] = buf.getKeyValuePair();
3970
- }
3951
+ const rawParams = deserializeKvpList(buf, paramCount);
3971
3952
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3972
3953
  const trackExtensions = TrackExtension.deserializeAll(buf);
3973
3954
  return new _Publish(requestId, fullTrackName, trackAlias, parameters, trackExtensions);
@@ -3991,9 +3972,7 @@ var PublishOk = class _PublishOk {
3991
3972
  const payload = new ByteBuffer();
3992
3973
  payload.putVI(this.requestId);
3993
3974
  payload.putVI(this.parameters.length);
3994
- for (const param of this.parameters) {
3995
- payload.putKeyValuePair(param.toKeyValuePair());
3996
- }
3975
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3997
3976
  const payloadBytes = payload.toUint8Array();
3998
3977
  if (payloadBytes.length > 65535) {
3999
3978
  throw new LengthExceedsMaxError("PublishOk::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -4005,10 +3984,7 @@ var PublishOk = class _PublishOk {
4005
3984
  static parsePayload(buf) {
4006
3985
  const requestId = buf.getVI();
4007
3986
  const paramCount = buf.getVI();
4008
- const kvps = [];
4009
- for (let i = 0; i < paramCount; i++) {
4010
- kvps.push(buf.getKeyValuePair());
4011
- }
3987
+ const kvps = deserializeKvpList(buf, paramCount);
4012
3988
  const parameters = MessageParameters.fromKeyValuePairs(kvps);
4013
3989
  return new _PublishOk(requestId, parameters);
4014
3990
  }
@@ -4036,9 +4012,7 @@ var SubscribeOk = class _SubscribeOk {
4036
4012
  payload.putVI(this.requestId);
4037
4013
  payload.putVI(this.trackAlias);
4038
4014
  payload.putVI(this.parameters.length);
4039
- for (const param of this.parameters) {
4040
- payload.putKeyValuePair(param.toKeyValuePair());
4041
- }
4015
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4042
4016
  TrackExtension.serializeInto(this.trackExtensions, payload);
4043
4017
  const payloadBytes = payload.toUint8Array();
4044
4018
  if (payloadBytes.length > 65535) {
@@ -4052,10 +4026,7 @@ var SubscribeOk = class _SubscribeOk {
4052
4026
  const requestId = buf.getVI();
4053
4027
  const trackAlias = buf.getVI();
4054
4028
  const paramCount = buf.getNumberVI();
4055
- const rawParams = new Array(paramCount);
4056
- for (let i = 0; i < paramCount; i++) {
4057
- rawParams[i] = buf.getKeyValuePair();
4058
- }
4029
+ const rawParams = deserializeKvpList(buf, paramCount);
4059
4030
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4060
4031
  const trackExtensions = TrackExtension.deserializeAll(buf);
4061
4032
  return new _SubscribeOk(requestId, trackAlias, parameters, trackExtensions);
@@ -4082,9 +4053,7 @@ var RequestUpdate = class _RequestUpdate {
4082
4053
  payload.putVI(this.requestId);
4083
4054
  payload.putVI(this.existingRequestId);
4084
4055
  payload.putVI(this.parameters.length);
4085
- for (const param of this.parameters) {
4086
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
4087
- }
4056
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4088
4057
  const payloadBytes = payload.toUint8Array();
4089
4058
  if (payloadBytes.length > 65535) {
4090
4059
  throw new LengthExceedsMaxError("RequestUpdate::serialize(payloadBytes)", 65535, payloadBytes.length);
@@ -4102,8 +4071,7 @@ var RequestUpdate = class _RequestUpdate {
4102
4071
  throw new CastingError("RequestUpdate.deserialize paramCount", "bigint", "number", `${paramCountBig}`);
4103
4072
  }
4104
4073
  const parameters = [];
4105
- for (let i = 0; i < paramCount; i++) {
4106
- const kvp = KeyValuePair.deserialize(buf);
4074
+ for (const kvp of deserializeKvpList(buf, paramCount)) {
4107
4075
  const param = MessageParameter.fromKeyValuePair(kvp);
4108
4076
  if (param !== void 0) parameters.push(param);
4109
4077
  }
@@ -4260,9 +4228,7 @@ var TrackStatus = class _TrackStatus {
4260
4228
  payload.putVI(this.endGroup);
4261
4229
  }
4262
4230
  payload.putVI(this.subscribeParameters.length);
4263
- for (const param of this.subscribeParameters) {
4264
- payload.putKeyValuePair(param.toKeyValuePair());
4265
- }
4231
+ payload.putBytes(serializeKvpList(this.subscribeParameters.map((p) => p.toKeyValuePair())).toUint8Array());
4266
4232
  const payloadBytes = payload.toUint8Array();
4267
4233
  buf.putU16(payloadBytes.length);
4268
4234
  buf.putBytes(payloadBytes);
@@ -4285,10 +4251,7 @@ var TrackStatus = class _TrackStatus {
4285
4251
  endGroup = buf.getVI();
4286
4252
  }
4287
4253
  const paramCount = Number(buf.getVI());
4288
- const rawParams = new Array(paramCount);
4289
- for (let i = 0; i < paramCount; i++) {
4290
- rawParams[i] = buf.getKeyValuePair();
4291
- }
4254
+ const rawParams = deserializeKvpList(buf, paramCount);
4292
4255
  const subscribeParameters = MessageParameters.fromKeyValuePairs(rawParams);
4293
4256
  return new _TrackStatus(
4294
4257
  requestId,
@@ -4406,9 +4369,7 @@ var SubscribeNamespace = class _SubscribeNamespace {
4406
4369
  payload.putTuple(this.trackNamespacePrefix);
4407
4370
  payload.putVI(this.subscribeOptions);
4408
4371
  payload.putVI(this.parameters.length);
4409
- for (const param of this.parameters) {
4410
- payload.putKeyValuePair(param.toKeyValuePair());
4411
- }
4372
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4412
4373
  const payloadBytes = payload.toUint8Array();
4413
4374
  if (payloadBytes.length > 65535) {
4414
4375
  throw new LengthExceedsMaxError("SubscribeNamespace::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -4422,10 +4383,7 @@ var SubscribeNamespace = class _SubscribeNamespace {
4422
4383
  const trackNamespacePrefix = buf.getTuple();
4423
4384
  const subscribeOptions = Number(buf.getVI());
4424
4385
  const paramCount = buf.getNumberVI();
4425
- const rawParams = new Array(paramCount);
4426
- for (let i = 0; i < paramCount; i++) {
4427
- rawParams[i] = buf.getKeyValuePair();
4428
- }
4386
+ const rawParams = deserializeKvpList(buf, paramCount);
4429
4387
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4430
4388
  return new _SubscribeNamespace(requestId, trackNamespacePrefix, subscribeOptions, parameters);
4431
4389
  }
@@ -4476,9 +4434,7 @@ var RequestOk = class _RequestOk {
4476
4434
  const payload = new ByteBuffer();
4477
4435
  payload.putVI(this.requestId);
4478
4436
  payload.putVI(BigInt(this.parameters.length));
4479
- for (const param of this.parameters) {
4480
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
4481
- }
4437
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4482
4438
  const payloadBytes = payload.toUint8Array();
4483
4439
  if (payloadBytes.length > 65535) {
4484
4440
  throw new LengthExceedsMaxError("RequestOk::serialize(payloadBytes)", 65535, payloadBytes.length);
@@ -4495,8 +4451,7 @@ var RequestOk = class _RequestOk {
4495
4451
  throw new CastingError("RequestOk.parsePayload numParams", "bigint", "number", `${numParamsBig}`);
4496
4452
  }
4497
4453
  const parameters = [];
4498
- for (let i = 0; i < numParams; i++) {
4499
- const kvp = KeyValuePair.deserialize(buf);
4454
+ for (const kvp of deserializeKvpList(buf, numParams)) {
4500
4455
  const param = MessageParameter.fromKeyValuePair(kvp);
4501
4456
  if (param !== void 0) parameters.push(param);
4502
4457
  }
@@ -4851,9 +4806,7 @@ var Switch = class _Switch {
4851
4806
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
4852
4807
  payload.putVI(this.subscriptionRequestId);
4853
4808
  payload.putVI(this.parameters.length);
4854
- for (const param of this.parameters) {
4855
- payload.putBytes(param.serialize().toUint8Array());
4856
- }
4809
+ payload.putBytes(serializeKvpList(this.parameters).toUint8Array());
4857
4810
  const payloadBytes = payload.toUint8Array();
4858
4811
  buf.putU16(payloadBytes.length);
4859
4812
  buf.putBytes(payloadBytes);
@@ -4864,10 +4817,7 @@ var Switch = class _Switch {
4864
4817
  const fullTrackName = buf.getFullTrackName();
4865
4818
  const subscriptionRequestId = buf.getVI();
4866
4819
  const paramCount = Number(buf.getVI());
4867
- const parameters = [];
4868
- for (let i = 0; i < paramCount; i++) {
4869
- parameters.push(KeyValuePair.deserialize(buf));
4870
- }
4820
+ const parameters = deserializeKvpList(buf, paramCount);
4871
4821
  return new _Switch(requestId, fullTrackName, subscriptionRequestId, parameters);
4872
4822
  }
4873
4823
  };
@@ -7495,7 +7445,6 @@ var MOQtailClient = class _MOQtailClient {
7495
7445
  * // Register the track for live subscription
7496
7446
  * client.addOrUpdateTrack({
7497
7447
  * fullTrackName: { namespace: ["camera"], name: "main" },
7498
- * forwardingPreference: ObjectForwardingPreference.Latest,
7499
7448
  * trackSource: { live: liveReadableStream },
7500
7449
  * publisherPriority: 0 // highest priority
7501
7450
  * });
@@ -7505,7 +7454,6 @@ var MOQtailClient = class _MOQtailClient {
7505
7454
  * const cache = new MemoryObjectCache(); // Caches are not yet fully supported
7506
7455
  * client.addOrUpdateTrack({
7507
7456
  * fullTrackName: { namespace: ["camera"], name: "main" },
7508
- * forwardingPreference: ObjectForwardingPreference.Latest,
7509
7457
  * trackSource: { live: liveReadableStream, past: cache },
7510
7458
  * publisherPriority: 8
7511
7459
  * });
@@ -8862,4 +8810,4 @@ var ClockNormalizer = class _ClockNormalizer {
8862
8810
  }
8863
8811
  };
8864
8812
 
8865
- export { AudioLevel, AuthorizationToken, BaseByteBuffer13 as BaseByteBuffer, ByteBuffer, CMSFCatalog, CaptureTimestamp, CastingError, ClientSetup, ClockNormalizer, ControlMessage, ControlMessageType, ControlStream, Datagram, DefaultPublisherGroupOrderExtension, DefaultPublisherPriorityExtension, DeliveryTimeout, DeliveryTimeoutExtension, DynamicGroupsExtension, EndOfRangeKind, Expires, ExtensionHeader, ExtensionHeaders, Fetch, FetchCancel, FetchHeader, FetchHeaderType, FetchObject, FetchOk, FetchPublication, FetchRequest, FetchType, FilterType, Forward, FrozenByteBuffer5 as FrozenByteBuffer, FullTrackName, GoAway, GroupOrder, GroupOrderParam, Header, HybridTrackSource, ImmutableExtensionsExtension, ImmutableExtensionsObjectExtension, InternalError, InvalidTypeError, InvalidUTF8Error, KeyValueFormattingError, KeyValuePair, LOCHeaderExtensionId, LargestObject, LengthExceedsMaxError, LiveTrackSource, Location, LogLevel, Logger, MAX_FULL_TRACK_NAME_LENGTH, MAX_NAMESPACE_TUPLE_COUNT, MAX_REASON_PHRASE_LEN, MOQtailClient, MOQtailError, MaxAuthTokenCacheSize, MaxCacheDurationExtension, MaxRequestId, MaxRequestId2 as MaxRequestIdParameter, MemoryObjectCache, MessageParameter, MessageParameterType, MessageParameters, MoqtObject, Namespace, NamespaceDone, NamespaceSubscribeOptions, NetworkTelemetry, NewGroupRequest, NotEnoughBytesError, ObjectDatagramType, ObjectExtension, ObjectForwardingPreference, ObjectStatus, Path, PriorGroupIdGapExtension, PriorObjectIdGapExtension, ProtocolViolationError, Publish, PublishDone, PublishDoneStatusCode, PublishNamespace, PublishNamespaceCancel, PublishNamespaceDone, PublishNamespaceRequest, PublishOk, PublishPublication, PublishRequest, ReasonPhrase, RecvDatagramStream, RecvStream, RequestError, RequestErrorCode, RequestIdError, RequestIdMap, RequestOk, RequestUpdate, RequestsBlocked, RingBufferObjectCache, SUPPORTED_VERSIONS, SendDatagramStream, SendStream, ServerSetup, SetupParameter, SetupParameterType, SetupParameters, StaticTrackSource, SubgroupHeader, SubgroupHeaderType, SubgroupObject, Subscribe, SubscribeNamespace, SubscribeNamespaceRequest, SubscribeOk, SubscribePublication, SubscribeRequest, SubscriberPriority, SubscriptionFilter, Switch, TerminationCode, TerminationError, TimeoutError, TokenAliasType, TrackExtension, TrackExtensionType, TrackNameError, TrackStatus, TrackStatusCode, TrackStatusRequest, Tuple, TupleField, UnknownObjectExtension, UnknownTrackExtension, Unsubscribe, UnsubscribeNamespace, VarIntOverflowError, VideoConfig, VideoFrameMarking, applyMessageParameterUpdate, controlMessageTypeFromBigInt, fetchTypeFromBigInt, filterTypeFromBigInt, groupOrderFromNumber, isBytes, isVarInt, locHeaderExtensionIdFromNumber, logger, messageParameterTypeFromNumber, publishDoneStatusCodeFromBigInt, requestErrorCodeFromBigInt, setLogEnabledModules, setLogLevel, setupParameterTypeFromNumber, tokenAliasTypeFromNumber, trackStatusCodeFromBigInt };
8813
+ export { AudioLevel, AuthorizationToken, BaseByteBuffer13 as BaseByteBuffer, ByteBuffer, CMSFCatalog, CaptureTimestamp, CastingError, ClientSetup, ClockNormalizer, ControlMessage, ControlMessageType, ControlStream, Datagram, DefaultPublisherGroupOrderExtension, DefaultPublisherPriorityExtension, DeliveryTimeout, DeliveryTimeoutExtension, DynamicGroupsExtension, EndOfRangeKind, Expires, ExtensionHeader, ExtensionHeaders, Fetch, FetchCancel, FetchHeader, FetchHeaderType, FetchObject, FetchOk, FetchPublication, FetchRequest, FetchType, FilterType, Forward, FrozenByteBuffer5 as FrozenByteBuffer, FullTrackName, GoAway, GroupOrder, GroupOrderParam, Header, HybridTrackSource, ImmutableExtensionsExtension, ImmutableExtensionsObjectExtension, InternalError, InvalidTypeError, InvalidUTF8Error, KeyValueFormattingError, KeyValuePair, LOCHeaderExtensionId, LargestObject, LengthExceedsMaxError, LiveTrackSource, Location, LogLevel, Logger, MAX_FULL_TRACK_NAME_LENGTH, MAX_NAMESPACE_TUPLE_COUNT, MAX_REASON_PHRASE_LEN, MOQtailClient, MOQtailError, MaxAuthTokenCacheSize, MaxCacheDurationExtension, MaxRequestId, MaxRequestId2 as MaxRequestIdParameter, MemoryObjectCache, MessageParameter, MessageParameterType, MessageParameters, MoqtObject, Namespace, NamespaceDone, NamespaceSubscribeOptions, NetworkTelemetry, NewGroupRequest, NotEnoughBytesError, ObjectDatagramType, ObjectExtension, ObjectForwardingPreference, ObjectStatus, Path, PriorGroupIdGapExtension, PriorObjectIdGapExtension, ProtocolViolationError, Publish, PublishDone, PublishDoneStatusCode, PublishNamespace, PublishNamespaceCancel, PublishNamespaceDone, PublishNamespaceRequest, PublishOk, PublishPublication, PublishRequest, ReasonPhrase, RecvDatagramStream, RecvStream, RequestError, RequestErrorCode, RequestIdError, RequestIdMap, RequestOk, RequestUpdate, RequestsBlocked, RingBufferObjectCache, SUPPORTED_VERSIONS, SendDatagramStream, SendStream, ServerSetup, SetupParameter, SetupParameterType, SetupParameters, StaticTrackSource, SubgroupHeader, SubgroupHeaderType, SubgroupObject, Subscribe, SubscribeNamespace, SubscribeNamespaceRequest, SubscribeOk, SubscribePublication, SubscribeRequest, SubscriberPriority, SubscriptionFilter, Switch, TerminationCode, TerminationError, TimeoutError, TokenAliasType, TrackExtension, TrackExtensionType, TrackNameError, TrackStatus, TrackStatusCode, TrackStatusRequest, Tuple, TupleField, UnknownObjectExtension, UnknownTrackExtension, Unsubscribe, UnsubscribeNamespace, VarIntOverflowError, VideoConfig, VideoFrameMarking, applyMessageParameterUpdate, controlMessageTypeFromBigInt, deserializeKvpList, deserializeKvpListUntilEmpty, fetchTypeFromBigInt, filterTypeFromBigInt, groupOrderFromNumber, isBytes, isVarInt, locHeaderExtensionIdFromNumber, logger, messageParameterTypeFromNumber, publishDoneStatusCodeFromBigInt, requestErrorCodeFromBigInt, serializeKvpList, setLogEnabledModules, setLogLevel, setupParameterTypeFromNumber, tokenAliasTypeFromNumber, trackStatusCodeFromBigInt };