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/client.cjs CHANGED
@@ -131,6 +131,7 @@ var TerminationError = class extends MOQtailError {
131
131
 
132
132
  // src/model/common/pair.ts
133
133
  var MAX_VALUE_LENGTH = 2 ** 16 - 1;
134
+ var MAX_U64 = 2n ** 64n - 1n;
134
135
  var KeyValuePair = class _KeyValuePair {
135
136
  /**
136
137
  * The key/type identifier for this pair.
@@ -190,11 +191,29 @@ var KeyValuePair = class _KeyValuePair {
190
191
  }
191
192
  /**
192
193
  * Serializes this key-value pair to a frozen byte buffer.
194
+ * Equivalent to {@link KeyValuePair.serializeDelta} with `prevType = 0n`.
193
195
  * @returns The serialized buffer.
194
196
  */
195
197
  serialize() {
198
+ return this.serializeDelta(0n);
199
+ }
200
+ /**
201
+ * Serializes this pair's wire form, encoding the Type as a delta from
202
+ * `prevType` (the type of the previous KVP in the same list, or 0n if this
203
+ * is the first entry).
204
+ * @param prevType - The type of the previous KVP in the same list.
205
+ * @throws ProtocolViolationError if this pair's type is less than prevType
206
+ * (Delta Type is an unsigned varint, so the list must be sorted ascending).
207
+ */
208
+ serializeDelta(prevType) {
209
+ if (this.typeValue < prevType) {
210
+ throw new ProtocolViolationError(
211
+ "KeyValuePair.serializeDelta",
212
+ `type ${this.typeValue} is less than previous type ${prevType}; a KVP list must be sorted by ascending type to be delta-encoded`
213
+ );
214
+ }
196
215
  const buf = new ByteBuffer();
197
- buf.putVI(this.typeValue);
216
+ buf.putVI(this.typeValue - prevType);
198
217
  if (isVarInt(this)) {
199
218
  buf.putVI(this.value);
200
219
  } else if (isBytes(this)) {
@@ -204,13 +223,32 @@ var KeyValuePair = class _KeyValuePair {
204
223
  }
205
224
  /**
206
225
  * Deserializes a KeyValuePair from a buffer.
226
+ * Equivalent to {@link KeyValuePair.deserializeDelta} with `prevType = 0n`.
207
227
  * @param buf - The buffer to read from.
208
228
  * @returns The deserialized KeyValuePair.
209
229
  * @throws LengthExceedsMaxError if blob length exceeds 65535 bytes.
210
230
  * @throws NotEnoughBytesError if buffer does not contain enough bytes.
211
231
  */
212
232
  static deserialize(buf) {
213
- const typeValue = buf.getVI();
233
+ return _KeyValuePair.deserializeDelta(buf, 0n);
234
+ }
235
+ /**
236
+ * Deserializes a wire-form KVP whose Type field is a delta from `prevType`
237
+ * (the type of the previous KVP in the same list, or 0n if this is the
238
+ * first entry).
239
+ * @param buf - The buffer to read from.
240
+ * @param prevType - The type of the previous KVP in the same list.
241
+ * @throws ProtocolViolationError if prevType + delta exceeds 2^64 - 1.
242
+ */
243
+ static deserializeDelta(buf, prevType) {
244
+ const deltaType = buf.getVI();
245
+ const typeValue = prevType + deltaType;
246
+ if (typeValue > MAX_U64) {
247
+ throw new ProtocolViolationError(
248
+ "KeyValuePair.deserializeDelta",
249
+ `previous type ${prevType} plus delta type ${deltaType} exceeds 2^64 - 1`
250
+ );
251
+ }
214
252
  if (typeValue % 2n === 0n) {
215
253
  const value = buf.getVI();
216
254
  return new _KeyValuePair(typeValue, value);
@@ -245,6 +283,37 @@ var KeyValuePair = class _KeyValuePair {
245
283
  return false;
246
284
  }
247
285
  };
286
+ function serializeKvpList(items) {
287
+ const sorted = [...items].sort((a, b) => a.typeValue < b.typeValue ? -1 : a.typeValue > b.typeValue ? 1 : 0);
288
+ const buf = new ByteBuffer();
289
+ let prevType = 0n;
290
+ for (const kvp of sorted) {
291
+ buf.putBytes(kvp.serializeDelta(prevType).toUint8Array());
292
+ prevType = kvp.typeValue;
293
+ }
294
+ return buf.freeze();
295
+ }
296
+ function deserializeKvpList(buf, count) {
297
+ const n = typeof count === "bigint" ? Number(count) : count;
298
+ const items = new Array(n);
299
+ let prevType = 0n;
300
+ for (let i = 0; i < n; i++) {
301
+ const kvp = KeyValuePair.deserializeDelta(buf, prevType);
302
+ prevType = kvp.typeValue;
303
+ items[i] = kvp;
304
+ }
305
+ return items;
306
+ }
307
+ function deserializeKvpListUntilEmpty(buf) {
308
+ const items = [];
309
+ let prevType = 0n;
310
+ while (buf.remaining > 0) {
311
+ const kvp = KeyValuePair.deserializeDelta(buf, prevType);
312
+ prevType = kvp.typeValue;
313
+ items.push(kvp);
314
+ }
315
+ return items;
316
+ }
248
317
  function isVarInt(pair) {
249
318
  return pair.typeValue % 2n === 0n;
250
319
  }
@@ -847,13 +916,7 @@ var Datagram = class _Datagram {
847
916
  buf.putU8(this.publisherPriority);
848
917
  }
849
918
  if (ObjectDatagramType.hasExtensions(this.type)) {
850
- const extBuf = new ByteBuffer();
851
- if (this.extensionHeaders) {
852
- for (const header of this.extensionHeaders) {
853
- extBuf.putKeyValuePair(header);
854
- }
855
- }
856
- const extBytes = extBuf.toUint8Array();
919
+ const extBytes = this.extensionHeaders ? serializeKvpList(this.extensionHeaders).toUint8Array() : new Uint8Array(0);
857
920
  buf.putLengthPrefixedBytes(extBytes);
858
921
  }
859
922
  if (ObjectDatagramType.isStatus(this.type)) {
@@ -884,10 +947,7 @@ var Datagram = class _Datagram {
884
947
  if (ObjectDatagramType.hasExtensions(msgType)) {
885
948
  const extBytes = buf.getLengthPrefixedBytes();
886
949
  const headerBytes = new FrozenByteBuffer5(extBytes);
887
- extensionHeaders = [];
888
- while (headerBytes.remaining > 0) {
889
- extensionHeaders.push(headerBytes.getKeyValuePair());
890
- }
950
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
891
951
  }
892
952
  let payload = null;
893
953
  let objectStatus = null;
@@ -1054,9 +1114,7 @@ var FetchObject = class _FetchObject {
1054
1114
  if (hasObjectId) buf.putVI(this.objectId);
1055
1115
  if (hasPriority) buf.putU8(this.publisherPriority);
1056
1116
  if (hasExtensions) {
1057
- const extBuf = new ByteBuffer();
1058
- for (const h of this.extensionHeaders) extBuf.putKeyValuePair(h);
1059
- buf.putLengthPrefixedBytes(extBuf.toUint8Array());
1117
+ buf.putLengthPrefixedBytes(serializeKvpList(this.extensionHeaders).toUint8Array());
1060
1118
  }
1061
1119
  const payloadBytes = this.payload ?? new Uint8Array(0);
1062
1120
  buf.putLengthPrefixedBytes(payloadBytes);
@@ -1142,10 +1200,7 @@ var FetchObject = class _FetchObject {
1142
1200
  if (hasExtensions) {
1143
1201
  const extLen = buf.getNumberVI();
1144
1202
  const headerBytes = new FrozenByteBuffer5(buf.getBytes(extLen));
1145
- extensionHeaders = [];
1146
- while (headerBytes.remaining > 0) {
1147
- extensionHeaders.push(headerBytes.getKeyValuePair());
1148
- }
1203
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
1149
1204
  }
1150
1205
  const payloadLen = buf.getNumberVI();
1151
1206
  const payload = buf.getBytes(payloadLen);
@@ -1606,26 +1661,18 @@ var ImmutableExtensionsExtension = class _ImmutableExtensionsExtension {
1606
1661
  extensions;
1607
1662
  static TYPE = 11 /* ImmutableExtensions */;
1608
1663
  toKeyValuePair() {
1609
- const inner = new ByteBuffer();
1610
- for (const kvp of this.extensions) {
1611
- inner.putBytes(kvp.serialize().toUint8Array());
1612
- }
1613
- return KeyValuePair.tryNewBytes(_ImmutableExtensionsExtension.TYPE, inner.toUint8Array());
1664
+ return KeyValuePair.tryNewBytes(_ImmutableExtensionsExtension.TYPE, serializeKvpList(this.extensions).toUint8Array());
1614
1665
  }
1615
1666
  static fromKeyValuePair(pair) {
1616
1667
  if (Number(pair.typeValue) !== _ImmutableExtensionsExtension.TYPE || !(pair.value instanceof Uint8Array))
1617
1668
  return void 0;
1618
1669
  const buf = new FrozenByteBuffer5(pair.value);
1619
- const extensions = [];
1620
- while (buf.remaining > 0) {
1621
- const inner = KeyValuePair.deserialize(buf);
1622
- if (Number(inner.typeValue) === 11 /* ImmutableExtensions */) {
1623
- throw new ProtocolViolationError(
1624
- "ImmutableExtensionsExtension.fromKeyValuePair",
1625
- "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
1626
- );
1627
- }
1628
- extensions.push(inner);
1670
+ const extensions = deserializeKvpListUntilEmpty(buf);
1671
+ if (extensions.some((inner) => Number(inner.typeValue) === 11 /* ImmutableExtensions */)) {
1672
+ throw new ProtocolViolationError(
1673
+ "ImmutableExtensionsExtension.fromKeyValuePair",
1674
+ "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
1675
+ );
1629
1676
  }
1630
1677
  return new _ImmutableExtensionsExtension(extensions);
1631
1678
  }
@@ -1712,18 +1759,11 @@ var TrackExtension;
1712
1759
  }
1713
1760
  TrackExtension2.toKeyValuePair = toKeyValuePair;
1714
1761
  function deserializeAll(buf) {
1715
- const result = [];
1716
- while (buf.remaining > 0) {
1717
- const kvp = KeyValuePair.deserialize(buf);
1718
- result.push(fromKeyValuePair(kvp));
1719
- }
1720
- return result;
1762
+ return deserializeKvpListUntilEmpty(buf).map(fromKeyValuePair);
1721
1763
  }
1722
1764
  TrackExtension2.deserializeAll = deserializeAll;
1723
1765
  function serializeInto(exts, payload) {
1724
- for (const ext of exts) {
1725
- payload.putBytes(ext.toKeyValuePair().serialize().toUint8Array());
1726
- }
1766
+ payload.putBytes(serializeKvpList(exts.map((ext) => ext.toKeyValuePair())).toUint8Array());
1727
1767
  }
1728
1768
  TrackExtension2.serializeInto = serializeInto;
1729
1769
  function isDeliveryTimeout(ext) {
@@ -1764,26 +1804,21 @@ var ImmutableExtensionsObjectExtension = class _ImmutableExtensionsObjectExtensi
1764
1804
  extensions;
1765
1805
  static TYPE = 11 /* ImmutableExtensions */;
1766
1806
  toKeyValuePair() {
1767
- const inner = new ByteBuffer();
1768
- for (const kvp of this.extensions) {
1769
- inner.putBytes(kvp.serialize().toUint8Array());
1770
- }
1771
- return KeyValuePair.tryNewBytes(_ImmutableExtensionsObjectExtension.TYPE, inner.toUint8Array());
1807
+ return KeyValuePair.tryNewBytes(
1808
+ _ImmutableExtensionsObjectExtension.TYPE,
1809
+ serializeKvpList(this.extensions).toUint8Array()
1810
+ );
1772
1811
  }
1773
1812
  static fromKeyValuePair(pair) {
1774
1813
  if (Number(pair.typeValue) !== _ImmutableExtensionsObjectExtension.TYPE || !(pair.value instanceof Uint8Array))
1775
1814
  return void 0;
1776
1815
  const buf = new FrozenByteBuffer5(pair.value);
1777
- const extensions = [];
1778
- while (buf.remaining > 0) {
1779
- const inner = KeyValuePair.deserialize(buf);
1780
- if (Number(inner.typeValue) === 11 /* ImmutableExtensions */) {
1781
- throw new ProtocolViolationError(
1782
- "ImmutableExtensionsObjectExtension.fromKeyValuePair",
1783
- "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
1784
- );
1785
- }
1786
- extensions.push(inner);
1816
+ const extensions = deserializeKvpListUntilEmpty(buf);
1817
+ if (extensions.some((inner) => Number(inner.typeValue) === 11 /* ImmutableExtensions */)) {
1818
+ throw new ProtocolViolationError(
1819
+ "ImmutableExtensionsObjectExtension.fromKeyValuePair",
1820
+ "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
1821
+ );
1787
1822
  }
1788
1823
  return new _ImmutableExtensionsObjectExtension(extensions);
1789
1824
  }
@@ -1836,18 +1871,11 @@ var ObjectExtension;
1836
1871
  }
1837
1872
  ObjectExtension2.toKeyValuePair = toKeyValuePair;
1838
1873
  function deserializeAll(buf) {
1839
- const result = [];
1840
- while (buf.remaining > 0) {
1841
- const kvp = KeyValuePair.deserialize(buf);
1842
- result.push(fromKeyValuePair(kvp));
1843
- }
1844
- return result;
1874
+ return deserializeKvpListUntilEmpty(buf).map(fromKeyValuePair);
1845
1875
  }
1846
1876
  ObjectExtension2.deserializeAll = deserializeAll;
1847
1877
  function serializeInto(exts, payload) {
1848
- for (const ext of exts) {
1849
- payload.putBytes(ext.toKeyValuePair().serialize().toUint8Array());
1850
- }
1878
+ payload.putBytes(serializeKvpList(exts.map((ext) => ext.toKeyValuePair())).toUint8Array());
1851
1879
  }
1852
1880
  ObjectExtension2.serializeInto = serializeInto;
1853
1881
  function isImmutableExtensions(ext) {
@@ -1869,6 +1897,12 @@ var ObjectExtension;
1869
1897
  })(ObjectExtension || (ObjectExtension = {}));
1870
1898
 
1871
1899
  // src/model/data/subgroup_object.ts
1900
+ function normalizeExtensionHeaders(extensionHeaders) {
1901
+ if (extensionHeaders === null || extensionHeaders.length === 0) {
1902
+ return null;
1903
+ }
1904
+ return extensionHeaders;
1905
+ }
1872
1906
  var SubgroupObject = class _SubgroupObject {
1873
1907
  constructor(objectId, extensionHeaders, objectStatus, payload) {
1874
1908
  this.extensionHeaders = extensionHeaders;
@@ -1881,22 +1915,17 @@ var SubgroupObject = class _SubgroupObject {
1881
1915
  payload;
1882
1916
  objectId;
1883
1917
  static newWithStatus(objectId, extensionHeaders, objectStatus) {
1884
- return new _SubgroupObject(objectId, extensionHeaders, objectStatus, null);
1918
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), objectStatus, null);
1885
1919
  }
1886
1920
  static newWithPayload(objectId, extensionHeaders, payload) {
1887
- return new _SubgroupObject(objectId, extensionHeaders, null, payload);
1921
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), null, payload);
1888
1922
  }
1889
1923
  serialize(previousObjectId) {
1890
1924
  let objectIdDelta = previousObjectId ? this.objectId - previousObjectId - BigInt(1) : this.objectId;
1891
1925
  const buf = new ByteBuffer();
1892
1926
  buf.putVI(objectIdDelta);
1893
- const extensionHeaders = new ByteBuffer();
1894
- if (this.extensionHeaders) {
1895
- for (const header of this.extensionHeaders) {
1896
- extensionHeaders.putKeyValuePair(header);
1897
- }
1898
- const headerBytes = extensionHeaders.toUint8Array();
1899
- buf.putLengthPrefixedBytes(headerBytes);
1927
+ if (this.extensionHeaders !== null) {
1928
+ buf.putLengthPrefixedBytes(serializeKvpList(this.extensionHeaders).toUint8Array());
1900
1929
  }
1901
1930
  if (this.payload) {
1902
1931
  buf.putLengthPrefixedBytes(this.payload);
@@ -1911,12 +1940,9 @@ var SubgroupObject = class _SubgroupObject {
1911
1940
  let objectId = previousObjectId !== void 0 ? previousObjectId + objectDelta + BigInt(1) : objectDelta;
1912
1941
  let extensionHeaders = null;
1913
1942
  if (hasExtensions) {
1914
- extensionHeaders = [];
1915
1943
  const extLen = buf.getNumberVI();
1916
1944
  const headerBytes = new FrozenByteBuffer5(buf.getBytes(extLen));
1917
- while (headerBytes.remaining > 0) {
1918
- extensionHeaders.push(headerBytes.getKeyValuePair());
1919
- }
1945
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
1920
1946
  }
1921
1947
  const payloadLen = buf.getNumberVI();
1922
1948
  let objectStatus = null;
@@ -1926,7 +1952,7 @@ var SubgroupObject = class _SubgroupObject {
1926
1952
  } else {
1927
1953
  payload = buf.getBytes(payloadLen);
1928
1954
  }
1929
- return new _SubgroupObject(objectId, extensionHeaders, objectStatus, payload);
1955
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), objectStatus, payload);
1930
1956
  }
1931
1957
  };
1932
1958
 
@@ -2367,24 +2393,12 @@ var Header;
2367
2393
  buf.checkpoint();
2368
2394
  const type = buf.getNumberVI();
2369
2395
  buf.restore();
2370
- switch (type) {
2371
- case 5:
2372
- return FetchHeader.deserialize(buf);
2373
- case 16:
2374
- case 17:
2375
- case 18:
2376
- case 19:
2377
- case 20:
2378
- case 21:
2379
- case 24:
2380
- case 25:
2381
- case 26:
2382
- case 27:
2383
- case 28:
2384
- case 29:
2385
- return SubgroupHeader.deserialize(buf);
2386
- default:
2387
- throw new InvalidTypeError("Header::deserialize(type)", `Unknown header type: ${type}`);
2396
+ if (type === 5) {
2397
+ return FetchHeader.deserialize(buf);
2398
+ } else if ((type & SubgroupHeaderType.REQUIRED_BIT) !== 0 && (type & 192) === 0) {
2399
+ return SubgroupHeader.deserialize(buf);
2400
+ } else {
2401
+ throw new InvalidTypeError("Header::deserialize(type)", `Unknown header type: ${type}`);
2388
2402
  }
2389
2403
  }
2390
2404
  Header2.deserialize = deserialize;
@@ -3082,9 +3096,7 @@ var PublishNamespace = class _PublishNamespace {
3082
3096
  payload.putVI(this.requestId);
3083
3097
  payload.putTuple(this.trackNamespace);
3084
3098
  payload.putVI(this.parameters.length);
3085
- for (const param of this.parameters) {
3086
- payload.putKeyValuePair(param.toKeyValuePair());
3087
- }
3099
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3088
3100
  const payloadBytes = payload.toUint8Array();
3089
3101
  if (payloadBytes.length > 65535) {
3090
3102
  throw new LengthExceedsMaxError("PublishNamespace::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -3105,10 +3117,7 @@ var PublishNamespace = class _PublishNamespace {
3105
3117
  const requestId = buf.getVI();
3106
3118
  const trackNamespace = buf.getTuple();
3107
3119
  const paramCount = buf.getNumberVI();
3108
- const rawParams = new Array(paramCount);
3109
- for (let i = 0; i < paramCount; i++) {
3110
- rawParams[i] = buf.getKeyValuePair();
3111
- }
3120
+ const rawParams = deserializeKvpList(buf, paramCount);
3112
3121
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3113
3122
  return new _PublishNamespace(requestId, trackNamespace, parameters);
3114
3123
  }
@@ -3225,9 +3234,7 @@ var ClientSetup = class _ClientSetup {
3225
3234
  buf.putVI(32 /* ClientSetup */);
3226
3235
  const payload = new ByteBuffer();
3227
3236
  payload.putVI(this.setupParameters.length);
3228
- for (const param of this.setupParameters) {
3229
- payload.putKeyValuePair(param);
3230
- }
3237
+ payload.putBytes(serializeKvpList(this.setupParameters).toUint8Array());
3231
3238
  const payloadBytes = payload.toUint8Array();
3232
3239
  if (payloadBytes.length > 65535) {
3233
3240
  throw new LengthExceedsMaxError("ClientSetup::serialize(payload_length)", 65535, payloadBytes.length);
@@ -3238,10 +3245,7 @@ var ClientSetup = class _ClientSetup {
3238
3245
  }
3239
3246
  static parsePayload(buf) {
3240
3247
  const paramCount = buf.getNumberVI();
3241
- const setupParameters = new Array(paramCount);
3242
- for (let i = 0; i < paramCount; i++) {
3243
- setupParameters[i] = buf.getKeyValuePair();
3244
- }
3248
+ const setupParameters = deserializeKvpList(buf, paramCount);
3245
3249
  return new _ClientSetup(setupParameters);
3246
3250
  }
3247
3251
  };
@@ -3280,9 +3284,7 @@ var Fetch = class _Fetch {
3280
3284
  }
3281
3285
  }
3282
3286
  payload.putVI(this.parameters.length);
3283
- for (const param of this.parameters) {
3284
- payload.putKeyValuePair(param.toKeyValuePair());
3285
- }
3287
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3286
3288
  const payloadBytes = payload.toUint8Array();
3287
3289
  if (payloadBytes.length > 65535) {
3288
3290
  throw new LengthExceedsMaxError("Fetch::serialize(payload_length)", 65535, payloadBytes.length);
@@ -3321,10 +3323,7 @@ var Fetch = class _Fetch {
3321
3323
  throw new Error(`Unknown fetch type: ${fetchType}`);
3322
3324
  }
3323
3325
  const paramCount = buf.getNumberVI();
3324
- const rawParams = new Array(paramCount);
3325
- for (let i = 0; i < paramCount; i++) {
3326
- rawParams[i] = buf.getKeyValuePair();
3327
- }
3326
+ const rawParams = deserializeKvpList(buf, paramCount);
3328
3327
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3329
3328
  return new _Fetch(requestId, props, parameters);
3330
3329
  }
@@ -3380,9 +3379,7 @@ var FetchOk = class _FetchOk {
3380
3379
  payload.putU8(this.endOfTrack ? 1 : 0);
3381
3380
  payload.putLocation(this.endLocation);
3382
3381
  payload.putVI(this.parameters.length);
3383
- for (const param of this.parameters) {
3384
- payload.putKeyValuePair(param.toKeyValuePair());
3385
- }
3382
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3386
3383
  TrackExtension.serializeInto(this.trackExtensions, payload);
3387
3384
  const payloadBytes = payload.toUint8Array();
3388
3385
  if (payloadBytes.length > 65535) {
@@ -3411,10 +3408,7 @@ var FetchOk = class _FetchOk {
3411
3408
  }
3412
3409
  const endLocation = buf.getLocation();
3413
3410
  const paramCount = buf.getNumberVI();
3414
- const rawParams = new Array(paramCount);
3415
- for (let i = 0; i < paramCount; i++) {
3416
- rawParams[i] = buf.getKeyValuePair();
3417
- }
3411
+ const rawParams = deserializeKvpList(buf, paramCount);
3418
3412
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3419
3413
  const trackExtensions = TrackExtension.deserializeAll(buf);
3420
3414
  return new _FetchOk(requestId, endOfTrack, endLocation, parameters, trackExtensions);
@@ -3526,9 +3520,7 @@ var ServerSetup = class _ServerSetup {
3526
3520
  buf.putVI(33 /* ServerSetup */);
3527
3521
  const payload = new ByteBuffer();
3528
3522
  payload.putVI(this.setupParameters.length);
3529
- for (const param of this.setupParameters) {
3530
- payload.putKeyValuePair(param);
3531
- }
3523
+ payload.putBytes(serializeKvpList(this.setupParameters).toUint8Array());
3532
3524
  const payloadBytes = payload.toUint8Array();
3533
3525
  if (payloadBytes.length > 65535) {
3534
3526
  throw new LengthExceedsMaxError("ServerSetup::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -3539,10 +3531,7 @@ var ServerSetup = class _ServerSetup {
3539
3531
  }
3540
3532
  static parsePayload(buf) {
3541
3533
  const paramCount = buf.getNumberVI();
3542
- const setupParameters = new Array(paramCount);
3543
- for (let i = 0; i < paramCount; i++) {
3544
- setupParameters[i] = buf.getKeyValuePair();
3545
- }
3534
+ const setupParameters = deserializeKvpList(buf, paramCount);
3546
3535
  return new _ServerSetup(setupParameters);
3547
3536
  }
3548
3537
  };
@@ -3585,9 +3574,7 @@ var Subscribe = class _Subscribe {
3585
3574
  payload.putVI(this.requestId);
3586
3575
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
3587
3576
  payload.putVI(this.parameters.length);
3588
- for (const param of this.parameters) {
3589
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
3590
- }
3577
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3591
3578
  const payloadBytes = payload.toUint8Array();
3592
3579
  buf.putU16(payloadBytes.length);
3593
3580
  buf.putBytes(payloadBytes);
@@ -3598,8 +3585,7 @@ var Subscribe = class _Subscribe {
3598
3585
  const fullTrackName = buf.getFullTrackName();
3599
3586
  const paramCount = Number(buf.getVI());
3600
3587
  const parameters = [];
3601
- for (let i = 0; i < paramCount; i++) {
3602
- const kvp = KeyValuePair.deserialize(buf);
3588
+ for (const kvp of deserializeKvpList(buf, paramCount)) {
3603
3589
  const param = MessageParameter.fromKeyValuePair(kvp);
3604
3590
  if (param !== void 0) parameters.push(param);
3605
3591
  }
@@ -3676,9 +3662,7 @@ var Publish = class _Publish {
3676
3662
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
3677
3663
  payload.putVI(this.trackAlias);
3678
3664
  payload.putVI(this.parameters.length);
3679
- for (const param of this.parameters) {
3680
- payload.putKeyValuePair(param.toKeyValuePair());
3681
- }
3665
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3682
3666
  TrackExtension.serializeInto(this.trackExtensions, payload);
3683
3667
  const payloadBytes = payload.toUint8Array();
3684
3668
  if (payloadBytes.length > 65535) {
@@ -3693,10 +3677,7 @@ var Publish = class _Publish {
3693
3677
  const fullTrackName = buf.getFullTrackName();
3694
3678
  const trackAlias = buf.getVI();
3695
3679
  const paramCount = buf.getNumberVI();
3696
- const rawParams = new Array(paramCount);
3697
- for (let i = 0; i < paramCount; i++) {
3698
- rawParams[i] = buf.getKeyValuePair();
3699
- }
3680
+ const rawParams = deserializeKvpList(buf, paramCount);
3700
3681
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3701
3682
  const trackExtensions = TrackExtension.deserializeAll(buf);
3702
3683
  return new _Publish(requestId, fullTrackName, trackAlias, parameters, trackExtensions);
@@ -3720,9 +3701,7 @@ var PublishOk = class _PublishOk {
3720
3701
  const payload = new ByteBuffer();
3721
3702
  payload.putVI(this.requestId);
3722
3703
  payload.putVI(this.parameters.length);
3723
- for (const param of this.parameters) {
3724
- payload.putKeyValuePair(param.toKeyValuePair());
3725
- }
3704
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3726
3705
  const payloadBytes = payload.toUint8Array();
3727
3706
  if (payloadBytes.length > 65535) {
3728
3707
  throw new LengthExceedsMaxError("PublishOk::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -3734,10 +3713,7 @@ var PublishOk = class _PublishOk {
3734
3713
  static parsePayload(buf) {
3735
3714
  const requestId = buf.getVI();
3736
3715
  const paramCount = buf.getVI();
3737
- const kvps = [];
3738
- for (let i = 0; i < paramCount; i++) {
3739
- kvps.push(buf.getKeyValuePair());
3740
- }
3716
+ const kvps = deserializeKvpList(buf, paramCount);
3741
3717
  const parameters = MessageParameters.fromKeyValuePairs(kvps);
3742
3718
  return new _PublishOk(requestId, parameters);
3743
3719
  }
@@ -3765,9 +3741,7 @@ var SubscribeOk = class _SubscribeOk {
3765
3741
  payload.putVI(this.requestId);
3766
3742
  payload.putVI(this.trackAlias);
3767
3743
  payload.putVI(this.parameters.length);
3768
- for (const param of this.parameters) {
3769
- payload.putKeyValuePair(param.toKeyValuePair());
3770
- }
3744
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3771
3745
  TrackExtension.serializeInto(this.trackExtensions, payload);
3772
3746
  const payloadBytes = payload.toUint8Array();
3773
3747
  if (payloadBytes.length > 65535) {
@@ -3781,10 +3755,7 @@ var SubscribeOk = class _SubscribeOk {
3781
3755
  const requestId = buf.getVI();
3782
3756
  const trackAlias = buf.getVI();
3783
3757
  const paramCount = buf.getNumberVI();
3784
- const rawParams = new Array(paramCount);
3785
- for (let i = 0; i < paramCount; i++) {
3786
- rawParams[i] = buf.getKeyValuePair();
3787
- }
3758
+ const rawParams = deserializeKvpList(buf, paramCount);
3788
3759
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3789
3760
  const trackExtensions = TrackExtension.deserializeAll(buf);
3790
3761
  return new _SubscribeOk(requestId, trackAlias, parameters, trackExtensions);
@@ -3811,9 +3782,7 @@ var RequestUpdate = class _RequestUpdate {
3811
3782
  payload.putVI(this.requestId);
3812
3783
  payload.putVI(this.existingRequestId);
3813
3784
  payload.putVI(this.parameters.length);
3814
- for (const param of this.parameters) {
3815
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
3816
- }
3785
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3817
3786
  const payloadBytes = payload.toUint8Array();
3818
3787
  if (payloadBytes.length > 65535) {
3819
3788
  throw new LengthExceedsMaxError("RequestUpdate::serialize(payloadBytes)", 65535, payloadBytes.length);
@@ -3831,8 +3800,7 @@ var RequestUpdate = class _RequestUpdate {
3831
3800
  throw new CastingError("RequestUpdate.deserialize paramCount", "bigint", "number", `${paramCountBig}`);
3832
3801
  }
3833
3802
  const parameters = [];
3834
- for (let i = 0; i < paramCount; i++) {
3835
- const kvp = KeyValuePair.deserialize(buf);
3803
+ for (const kvp of deserializeKvpList(buf, paramCount)) {
3836
3804
  const param = MessageParameter.fromKeyValuePair(kvp);
3837
3805
  if (param !== void 0) parameters.push(param);
3838
3806
  }
@@ -3989,9 +3957,7 @@ var TrackStatus = class _TrackStatus {
3989
3957
  payload.putVI(this.endGroup);
3990
3958
  }
3991
3959
  payload.putVI(this.subscribeParameters.length);
3992
- for (const param of this.subscribeParameters) {
3993
- payload.putKeyValuePair(param.toKeyValuePair());
3994
- }
3960
+ payload.putBytes(serializeKvpList(this.subscribeParameters.map((p) => p.toKeyValuePair())).toUint8Array());
3995
3961
  const payloadBytes = payload.toUint8Array();
3996
3962
  buf.putU16(payloadBytes.length);
3997
3963
  buf.putBytes(payloadBytes);
@@ -4014,10 +3980,7 @@ var TrackStatus = class _TrackStatus {
4014
3980
  endGroup = buf.getVI();
4015
3981
  }
4016
3982
  const paramCount = Number(buf.getVI());
4017
- const rawParams = new Array(paramCount);
4018
- for (let i = 0; i < paramCount; i++) {
4019
- rawParams[i] = buf.getKeyValuePair();
4020
- }
3983
+ const rawParams = deserializeKvpList(buf, paramCount);
4021
3984
  const subscribeParameters = MessageParameters.fromKeyValuePairs(rawParams);
4022
3985
  return new _TrackStatus(
4023
3986
  requestId,
@@ -4135,9 +4098,7 @@ var SubscribeNamespace = class _SubscribeNamespace {
4135
4098
  payload.putTuple(this.trackNamespacePrefix);
4136
4099
  payload.putVI(this.subscribeOptions);
4137
4100
  payload.putVI(this.parameters.length);
4138
- for (const param of this.parameters) {
4139
- payload.putKeyValuePair(param.toKeyValuePair());
4140
- }
4101
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4141
4102
  const payloadBytes = payload.toUint8Array();
4142
4103
  if (payloadBytes.length > 65535) {
4143
4104
  throw new LengthExceedsMaxError("SubscribeNamespace::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -4151,10 +4112,7 @@ var SubscribeNamespace = class _SubscribeNamespace {
4151
4112
  const trackNamespacePrefix = buf.getTuple();
4152
4113
  const subscribeOptions = Number(buf.getVI());
4153
4114
  const paramCount = buf.getNumberVI();
4154
- const rawParams = new Array(paramCount);
4155
- for (let i = 0; i < paramCount; i++) {
4156
- rawParams[i] = buf.getKeyValuePair();
4157
- }
4115
+ const rawParams = deserializeKvpList(buf, paramCount);
4158
4116
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4159
4117
  return new _SubscribeNamespace(requestId, trackNamespacePrefix, subscribeOptions, parameters);
4160
4118
  }
@@ -4205,9 +4163,7 @@ var RequestOk = class _RequestOk {
4205
4163
  const payload = new ByteBuffer();
4206
4164
  payload.putVI(this.requestId);
4207
4165
  payload.putVI(BigInt(this.parameters.length));
4208
- for (const param of this.parameters) {
4209
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
4210
- }
4166
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4211
4167
  const payloadBytes = payload.toUint8Array();
4212
4168
  if (payloadBytes.length > 65535) {
4213
4169
  throw new LengthExceedsMaxError("RequestOk::serialize(payloadBytes)", 65535, payloadBytes.length);
@@ -4224,8 +4180,7 @@ var RequestOk = class _RequestOk {
4224
4180
  throw new CastingError("RequestOk.parsePayload numParams", "bigint", "number", `${numParamsBig}`);
4225
4181
  }
4226
4182
  const parameters = [];
4227
- for (let i = 0; i < numParams; i++) {
4228
- const kvp = KeyValuePair.deserialize(buf);
4183
+ for (const kvp of deserializeKvpList(buf, numParams)) {
4229
4184
  const param = MessageParameter.fromKeyValuePair(kvp);
4230
4185
  if (param !== void 0) parameters.push(param);
4231
4186
  }
@@ -4367,9 +4322,7 @@ var Switch = class _Switch {
4367
4322
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
4368
4323
  payload.putVI(this.subscriptionRequestId);
4369
4324
  payload.putVI(this.parameters.length);
4370
- for (const param of this.parameters) {
4371
- payload.putBytes(param.serialize().toUint8Array());
4372
- }
4325
+ payload.putBytes(serializeKvpList(this.parameters).toUint8Array());
4373
4326
  const payloadBytes = payload.toUint8Array();
4374
4327
  buf.putU16(payloadBytes.length);
4375
4328
  buf.putBytes(payloadBytes);
@@ -4380,10 +4333,7 @@ var Switch = class _Switch {
4380
4333
  const fullTrackName = buf.getFullTrackName();
4381
4334
  const subscriptionRequestId = buf.getVI();
4382
4335
  const paramCount = Number(buf.getVI());
4383
- const parameters = [];
4384
- for (let i = 0; i < paramCount; i++) {
4385
- parameters.push(KeyValuePair.deserialize(buf));
4386
- }
4336
+ const parameters = deserializeKvpList(buf, paramCount);
4387
4337
  return new _Switch(requestId, fullTrackName, subscriptionRequestId, parameters);
4388
4338
  }
4389
4339
  };
@@ -7003,7 +6953,6 @@ var MOQtailClient = class _MOQtailClient {
7003
6953
  * // Register the track for live subscription
7004
6954
  * client.addOrUpdateTrack({
7005
6955
  * fullTrackName: { namespace: ["camera"], name: "main" },
7006
- * forwardingPreference: ObjectForwardingPreference.Latest,
7007
6956
  * trackSource: { live: liveReadableStream },
7008
6957
  * publisherPriority: 0 // highest priority
7009
6958
  * });
@@ -7013,7 +6962,6 @@ var MOQtailClient = class _MOQtailClient {
7013
6962
  * const cache = new MemoryObjectCache(); // Caches are not yet fully supported
7014
6963
  * client.addOrUpdateTrack({
7015
6964
  * fullTrackName: { namespace: ["camera"], name: "main" },
7016
- * forwardingPreference: ObjectForwardingPreference.Latest,
7017
6965
  * trackSource: { live: liveReadableStream, past: cache },
7018
6966
  * publisherPriority: 8
7019
6967
  * });