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/model.js CHANGED
@@ -342,6 +342,7 @@ var TerminationError = class extends MOQtailError {
342
342
 
343
343
  // src/model/common/pair.ts
344
344
  var MAX_VALUE_LENGTH = 2 ** 16 - 1;
345
+ var MAX_U64 = 2n ** 64n - 1n;
345
346
  var KeyValuePair = class _KeyValuePair {
346
347
  /**
347
348
  * The key/type identifier for this pair.
@@ -401,11 +402,29 @@ var KeyValuePair = class _KeyValuePair {
401
402
  }
402
403
  /**
403
404
  * Serializes this key-value pair to a frozen byte buffer.
405
+ * Equivalent to {@link KeyValuePair.serializeDelta} with `prevType = 0n`.
404
406
  * @returns The serialized buffer.
405
407
  */
406
408
  serialize() {
409
+ return this.serializeDelta(0n);
410
+ }
411
+ /**
412
+ * Serializes this pair's wire form, encoding the Type as a delta from
413
+ * `prevType` (the type of the previous KVP in the same list, or 0n if this
414
+ * is the first entry).
415
+ * @param prevType - The type of the previous KVP in the same list.
416
+ * @throws ProtocolViolationError if this pair's type is less than prevType
417
+ * (Delta Type is an unsigned varint, so the list must be sorted ascending).
418
+ */
419
+ serializeDelta(prevType) {
420
+ if (this.typeValue < prevType) {
421
+ throw new ProtocolViolationError(
422
+ "KeyValuePair.serializeDelta",
423
+ `type ${this.typeValue} is less than previous type ${prevType}; a KVP list must be sorted by ascending type to be delta-encoded`
424
+ );
425
+ }
407
426
  const buf = new ByteBuffer();
408
- buf.putVI(this.typeValue);
427
+ buf.putVI(this.typeValue - prevType);
409
428
  if (isVarInt(this)) {
410
429
  buf.putVI(this.value);
411
430
  } else if (isBytes(this)) {
@@ -415,13 +434,32 @@ var KeyValuePair = class _KeyValuePair {
415
434
  }
416
435
  /**
417
436
  * Deserializes a KeyValuePair from a buffer.
437
+ * Equivalent to {@link KeyValuePair.deserializeDelta} with `prevType = 0n`.
418
438
  * @param buf - The buffer to read from.
419
439
  * @returns The deserialized KeyValuePair.
420
440
  * @throws LengthExceedsMaxError if blob length exceeds 65535 bytes.
421
441
  * @throws NotEnoughBytesError if buffer does not contain enough bytes.
422
442
  */
423
443
  static deserialize(buf) {
424
- const typeValue = buf.getVI();
444
+ return _KeyValuePair.deserializeDelta(buf, 0n);
445
+ }
446
+ /**
447
+ * Deserializes a wire-form KVP whose Type field is a delta from `prevType`
448
+ * (the type of the previous KVP in the same list, or 0n if this is the
449
+ * first entry).
450
+ * @param buf - The buffer to read from.
451
+ * @param prevType - The type of the previous KVP in the same list.
452
+ * @throws ProtocolViolationError if prevType + delta exceeds 2^64 - 1.
453
+ */
454
+ static deserializeDelta(buf, prevType) {
455
+ const deltaType = buf.getVI();
456
+ const typeValue = prevType + deltaType;
457
+ if (typeValue > MAX_U64) {
458
+ throw new ProtocolViolationError(
459
+ "KeyValuePair.deserializeDelta",
460
+ `previous type ${prevType} plus delta type ${deltaType} exceeds 2^64 - 1`
461
+ );
462
+ }
425
463
  if (typeValue % 2n === 0n) {
426
464
  const value = buf.getVI();
427
465
  return new _KeyValuePair(typeValue, value);
@@ -456,6 +494,37 @@ var KeyValuePair = class _KeyValuePair {
456
494
  return false;
457
495
  }
458
496
  };
497
+ function serializeKvpList(items) {
498
+ const sorted = [...items].sort((a, b) => a.typeValue < b.typeValue ? -1 : a.typeValue > b.typeValue ? 1 : 0);
499
+ const buf = new ByteBuffer();
500
+ let prevType = 0n;
501
+ for (const kvp of sorted) {
502
+ buf.putBytes(kvp.serializeDelta(prevType).toUint8Array());
503
+ prevType = kvp.typeValue;
504
+ }
505
+ return buf.freeze();
506
+ }
507
+ function deserializeKvpList(buf, count) {
508
+ const n = typeof count === "bigint" ? Number(count) : count;
509
+ const items = new Array(n);
510
+ let prevType = 0n;
511
+ for (let i = 0; i < n; i++) {
512
+ const kvp = KeyValuePair.deserializeDelta(buf, prevType);
513
+ prevType = kvp.typeValue;
514
+ items[i] = kvp;
515
+ }
516
+ return items;
517
+ }
518
+ function deserializeKvpListUntilEmpty(buf) {
519
+ const items = [];
520
+ let prevType = 0n;
521
+ while (buf.remaining > 0) {
522
+ const kvp = KeyValuePair.deserializeDelta(buf, prevType);
523
+ prevType = kvp.typeValue;
524
+ items.push(kvp);
525
+ }
526
+ return items;
527
+ }
459
528
  function isVarInt(pair) {
460
529
  return pair.typeValue % 2n === 0n;
461
530
  }
@@ -1058,13 +1127,7 @@ var Datagram = class _Datagram {
1058
1127
  buf.putU8(this.publisherPriority);
1059
1128
  }
1060
1129
  if (ObjectDatagramType.hasExtensions(this.type)) {
1061
- const extBuf = new ByteBuffer();
1062
- if (this.extensionHeaders) {
1063
- for (const header of this.extensionHeaders) {
1064
- extBuf.putKeyValuePair(header);
1065
- }
1066
- }
1067
- const extBytes = extBuf.toUint8Array();
1130
+ const extBytes = this.extensionHeaders ? serializeKvpList(this.extensionHeaders).toUint8Array() : new Uint8Array(0);
1068
1131
  buf.putLengthPrefixedBytes(extBytes);
1069
1132
  }
1070
1133
  if (ObjectDatagramType.isStatus(this.type)) {
@@ -1095,10 +1158,7 @@ var Datagram = class _Datagram {
1095
1158
  if (ObjectDatagramType.hasExtensions(msgType)) {
1096
1159
  const extBytes = buf.getLengthPrefixedBytes();
1097
1160
  const headerBytes = new FrozenByteBuffer5(extBytes);
1098
- extensionHeaders = [];
1099
- while (headerBytes.remaining > 0) {
1100
- extensionHeaders.push(headerBytes.getKeyValuePair());
1101
- }
1161
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
1102
1162
  }
1103
1163
  let payload = null;
1104
1164
  let objectStatus = null;
@@ -1270,9 +1330,7 @@ var FetchObject = class _FetchObject {
1270
1330
  if (hasObjectId) buf.putVI(this.objectId);
1271
1331
  if (hasPriority) buf.putU8(this.publisherPriority);
1272
1332
  if (hasExtensions) {
1273
- const extBuf = new ByteBuffer();
1274
- for (const h of this.extensionHeaders) extBuf.putKeyValuePair(h);
1275
- buf.putLengthPrefixedBytes(extBuf.toUint8Array());
1333
+ buf.putLengthPrefixedBytes(serializeKvpList(this.extensionHeaders).toUint8Array());
1276
1334
  }
1277
1335
  const payloadBytes = this.payload ?? new Uint8Array(0);
1278
1336
  buf.putLengthPrefixedBytes(payloadBytes);
@@ -1358,10 +1416,7 @@ var FetchObject = class _FetchObject {
1358
1416
  if (hasExtensions) {
1359
1417
  const extLen = buf.getNumberVI();
1360
1418
  const headerBytes = new FrozenByteBuffer5(buf.getBytes(extLen));
1361
- extensionHeaders = [];
1362
- while (headerBytes.remaining > 0) {
1363
- extensionHeaders.push(headerBytes.getKeyValuePair());
1364
- }
1419
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
1365
1420
  }
1366
1421
  const payloadLen = buf.getNumberVI();
1367
1422
  const payload = buf.getBytes(payloadLen);
@@ -2025,26 +2080,18 @@ var ImmutableExtensionsExtension = class _ImmutableExtensionsExtension {
2025
2080
  extensions;
2026
2081
  static TYPE = 11 /* ImmutableExtensions */;
2027
2082
  toKeyValuePair() {
2028
- const inner = new ByteBuffer();
2029
- for (const kvp of this.extensions) {
2030
- inner.putBytes(kvp.serialize().toUint8Array());
2031
- }
2032
- return KeyValuePair.tryNewBytes(_ImmutableExtensionsExtension.TYPE, inner.toUint8Array());
2083
+ return KeyValuePair.tryNewBytes(_ImmutableExtensionsExtension.TYPE, serializeKvpList(this.extensions).toUint8Array());
2033
2084
  }
2034
2085
  static fromKeyValuePair(pair) {
2035
2086
  if (Number(pair.typeValue) !== _ImmutableExtensionsExtension.TYPE || !(pair.value instanceof Uint8Array))
2036
2087
  return void 0;
2037
2088
  const buf = new FrozenByteBuffer5(pair.value);
2038
- const extensions = [];
2039
- while (buf.remaining > 0) {
2040
- const inner = KeyValuePair.deserialize(buf);
2041
- if (Number(inner.typeValue) === 11 /* ImmutableExtensions */) {
2042
- throw new ProtocolViolationError(
2043
- "ImmutableExtensionsExtension.fromKeyValuePair",
2044
- "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
2045
- );
2046
- }
2047
- extensions.push(inner);
2089
+ const extensions = deserializeKvpListUntilEmpty(buf);
2090
+ if (extensions.some((inner) => Number(inner.typeValue) === 11 /* ImmutableExtensions */)) {
2091
+ throw new ProtocolViolationError(
2092
+ "ImmutableExtensionsExtension.fromKeyValuePair",
2093
+ "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
2094
+ );
2048
2095
  }
2049
2096
  return new _ImmutableExtensionsExtension(extensions);
2050
2097
  }
@@ -2131,18 +2178,11 @@ var TrackExtension;
2131
2178
  }
2132
2179
  TrackExtension2.toKeyValuePair = toKeyValuePair;
2133
2180
  function deserializeAll(buf) {
2134
- const result = [];
2135
- while (buf.remaining > 0) {
2136
- const kvp = KeyValuePair.deserialize(buf);
2137
- result.push(fromKeyValuePair(kvp));
2138
- }
2139
- return result;
2181
+ return deserializeKvpListUntilEmpty(buf).map(fromKeyValuePair);
2140
2182
  }
2141
2183
  TrackExtension2.deserializeAll = deserializeAll;
2142
2184
  function serializeInto(exts, payload) {
2143
- for (const ext of exts) {
2144
- payload.putBytes(ext.toKeyValuePair().serialize().toUint8Array());
2145
- }
2185
+ payload.putBytes(serializeKvpList(exts.map((ext) => ext.toKeyValuePair())).toUint8Array());
2146
2186
  }
2147
2187
  TrackExtension2.serializeInto = serializeInto;
2148
2188
  function isDeliveryTimeout(ext) {
@@ -2183,26 +2223,21 @@ var ImmutableExtensionsObjectExtension = class _ImmutableExtensionsObjectExtensi
2183
2223
  extensions;
2184
2224
  static TYPE = 11 /* ImmutableExtensions */;
2185
2225
  toKeyValuePair() {
2186
- const inner = new ByteBuffer();
2187
- for (const kvp of this.extensions) {
2188
- inner.putBytes(kvp.serialize().toUint8Array());
2189
- }
2190
- return KeyValuePair.tryNewBytes(_ImmutableExtensionsObjectExtension.TYPE, inner.toUint8Array());
2226
+ return KeyValuePair.tryNewBytes(
2227
+ _ImmutableExtensionsObjectExtension.TYPE,
2228
+ serializeKvpList(this.extensions).toUint8Array()
2229
+ );
2191
2230
  }
2192
2231
  static fromKeyValuePair(pair) {
2193
2232
  if (Number(pair.typeValue) !== _ImmutableExtensionsObjectExtension.TYPE || !(pair.value instanceof Uint8Array))
2194
2233
  return void 0;
2195
2234
  const buf = new FrozenByteBuffer5(pair.value);
2196
- const extensions = [];
2197
- while (buf.remaining > 0) {
2198
- const inner = KeyValuePair.deserialize(buf);
2199
- if (Number(inner.typeValue) === 11 /* ImmutableExtensions */) {
2200
- throw new ProtocolViolationError(
2201
- "ImmutableExtensionsObjectExtension.fromKeyValuePair",
2202
- "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
2203
- );
2204
- }
2205
- extensions.push(inner);
2235
+ const extensions = deserializeKvpListUntilEmpty(buf);
2236
+ if (extensions.some((inner) => Number(inner.typeValue) === 11 /* ImmutableExtensions */)) {
2237
+ throw new ProtocolViolationError(
2238
+ "ImmutableExtensionsObjectExtension.fromKeyValuePair",
2239
+ "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
2240
+ );
2206
2241
  }
2207
2242
  return new _ImmutableExtensionsObjectExtension(extensions);
2208
2243
  }
@@ -2255,18 +2290,11 @@ var ObjectExtension;
2255
2290
  }
2256
2291
  ObjectExtension2.toKeyValuePair = toKeyValuePair;
2257
2292
  function deserializeAll(buf) {
2258
- const result = [];
2259
- while (buf.remaining > 0) {
2260
- const kvp = KeyValuePair.deserialize(buf);
2261
- result.push(fromKeyValuePair(kvp));
2262
- }
2263
- return result;
2293
+ return deserializeKvpListUntilEmpty(buf).map(fromKeyValuePair);
2264
2294
  }
2265
2295
  ObjectExtension2.deserializeAll = deserializeAll;
2266
2296
  function serializeInto(exts, payload) {
2267
- for (const ext of exts) {
2268
- payload.putBytes(ext.toKeyValuePair().serialize().toUint8Array());
2269
- }
2297
+ payload.putBytes(serializeKvpList(exts.map((ext) => ext.toKeyValuePair())).toUint8Array());
2270
2298
  }
2271
2299
  ObjectExtension2.serializeInto = serializeInto;
2272
2300
  function isImmutableExtensions(ext) {
@@ -2288,6 +2316,12 @@ var ObjectExtension;
2288
2316
  })(ObjectExtension || (ObjectExtension = {}));
2289
2317
 
2290
2318
  // src/model/data/subgroup_object.ts
2319
+ function normalizeExtensionHeaders(extensionHeaders) {
2320
+ if (extensionHeaders === null || extensionHeaders.length === 0) {
2321
+ return null;
2322
+ }
2323
+ return extensionHeaders;
2324
+ }
2291
2325
  var SubgroupObject = class _SubgroupObject {
2292
2326
  constructor(objectId, extensionHeaders, objectStatus, payload) {
2293
2327
  this.extensionHeaders = extensionHeaders;
@@ -2300,22 +2334,17 @@ var SubgroupObject = class _SubgroupObject {
2300
2334
  payload;
2301
2335
  objectId;
2302
2336
  static newWithStatus(objectId, extensionHeaders, objectStatus) {
2303
- return new _SubgroupObject(objectId, extensionHeaders, objectStatus, null);
2337
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), objectStatus, null);
2304
2338
  }
2305
2339
  static newWithPayload(objectId, extensionHeaders, payload) {
2306
- return new _SubgroupObject(objectId, extensionHeaders, null, payload);
2340
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), null, payload);
2307
2341
  }
2308
2342
  serialize(previousObjectId) {
2309
2343
  let objectIdDelta = previousObjectId ? this.objectId - previousObjectId - BigInt(1) : this.objectId;
2310
2344
  const buf = new ByteBuffer();
2311
2345
  buf.putVI(objectIdDelta);
2312
- const extensionHeaders = new ByteBuffer();
2313
- if (this.extensionHeaders) {
2314
- for (const header of this.extensionHeaders) {
2315
- extensionHeaders.putKeyValuePair(header);
2316
- }
2317
- const headerBytes = extensionHeaders.toUint8Array();
2318
- buf.putLengthPrefixedBytes(headerBytes);
2346
+ if (this.extensionHeaders !== null) {
2347
+ buf.putLengthPrefixedBytes(serializeKvpList(this.extensionHeaders).toUint8Array());
2319
2348
  }
2320
2349
  if (this.payload) {
2321
2350
  buf.putLengthPrefixedBytes(this.payload);
@@ -2330,12 +2359,9 @@ var SubgroupObject = class _SubgroupObject {
2330
2359
  let objectId = previousObjectId !== void 0 ? previousObjectId + objectDelta + BigInt(1) : objectDelta;
2331
2360
  let extensionHeaders = null;
2332
2361
  if (hasExtensions) {
2333
- extensionHeaders = [];
2334
2362
  const extLen = buf.getNumberVI();
2335
2363
  const headerBytes = new FrozenByteBuffer5(buf.getBytes(extLen));
2336
- while (headerBytes.remaining > 0) {
2337
- extensionHeaders.push(headerBytes.getKeyValuePair());
2338
- }
2364
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
2339
2365
  }
2340
2366
  const payloadLen = buf.getNumberVI();
2341
2367
  let objectStatus = null;
@@ -2345,7 +2371,7 @@ var SubgroupObject = class _SubgroupObject {
2345
2371
  } else {
2346
2372
  payload = buf.getBytes(payloadLen);
2347
2373
  }
2348
- return new _SubgroupObject(objectId, extensionHeaders, objectStatus, payload);
2374
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), objectStatus, payload);
2349
2375
  }
2350
2376
  };
2351
2377
 
@@ -2786,24 +2812,12 @@ var Header;
2786
2812
  buf.checkpoint();
2787
2813
  const type = buf.getNumberVI();
2788
2814
  buf.restore();
2789
- switch (type) {
2790
- case 5:
2791
- return FetchHeader.deserialize(buf);
2792
- case 16:
2793
- case 17:
2794
- case 18:
2795
- case 19:
2796
- case 20:
2797
- case 21:
2798
- case 24:
2799
- case 25:
2800
- case 26:
2801
- case 27:
2802
- case 28:
2803
- case 29:
2804
- return SubgroupHeader.deserialize(buf);
2805
- default:
2806
- throw new InvalidTypeError("Header::deserialize(type)", `Unknown header type: ${type}`);
2815
+ if (type === 5) {
2816
+ return FetchHeader.deserialize(buf);
2817
+ } else if ((type & SubgroupHeaderType.REQUIRED_BIT) !== 0 && (type & 192) === 0) {
2818
+ return SubgroupHeader.deserialize(buf);
2819
+ } else {
2820
+ throw new InvalidTypeError("Header::deserialize(type)", `Unknown header type: ${type}`);
2807
2821
  }
2808
2822
  }
2809
2823
  Header2.deserialize = deserialize;
@@ -3566,9 +3580,7 @@ var PublishNamespace = class _PublishNamespace {
3566
3580
  payload.putVI(this.requestId);
3567
3581
  payload.putTuple(this.trackNamespace);
3568
3582
  payload.putVI(this.parameters.length);
3569
- for (const param of this.parameters) {
3570
- payload.putKeyValuePair(param.toKeyValuePair());
3571
- }
3583
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3572
3584
  const payloadBytes = payload.toUint8Array();
3573
3585
  if (payloadBytes.length > 65535) {
3574
3586
  throw new LengthExceedsMaxError("PublishNamespace::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -3589,10 +3601,7 @@ var PublishNamespace = class _PublishNamespace {
3589
3601
  const requestId = buf.getVI();
3590
3602
  const trackNamespace = buf.getTuple();
3591
3603
  const paramCount = buf.getNumberVI();
3592
- const rawParams = new Array(paramCount);
3593
- for (let i = 0; i < paramCount; i++) {
3594
- rawParams[i] = buf.getKeyValuePair();
3595
- }
3604
+ const rawParams = deserializeKvpList(buf, paramCount);
3596
3605
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3597
3606
  return new _PublishNamespace(requestId, trackNamespace, parameters);
3598
3607
  }
@@ -3636,9 +3645,7 @@ var Subscribe = class _Subscribe {
3636
3645
  payload.putVI(this.requestId);
3637
3646
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
3638
3647
  payload.putVI(this.parameters.length);
3639
- for (const param of this.parameters) {
3640
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
3641
- }
3648
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3642
3649
  const payloadBytes = payload.toUint8Array();
3643
3650
  buf.putU16(payloadBytes.length);
3644
3651
  buf.putBytes(payloadBytes);
@@ -3649,8 +3656,7 @@ var Subscribe = class _Subscribe {
3649
3656
  const fullTrackName = buf.getFullTrackName();
3650
3657
  const paramCount = Number(buf.getVI());
3651
3658
  const parameters = [];
3652
- for (let i = 0; i < paramCount; i++) {
3653
- const kvp = KeyValuePair.deserialize(buf);
3659
+ for (const kvp of deserializeKvpList(buf, paramCount)) {
3654
3660
  const param = MessageParameter.fromKeyValuePair(kvp);
3655
3661
  if (param !== void 0) parameters.push(param);
3656
3662
  }
@@ -3678,9 +3684,7 @@ var Switch = class _Switch {
3678
3684
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
3679
3685
  payload.putVI(this.subscriptionRequestId);
3680
3686
  payload.putVI(this.parameters.length);
3681
- for (const param of this.parameters) {
3682
- payload.putBytes(param.serialize().toUint8Array());
3683
- }
3687
+ payload.putBytes(serializeKvpList(this.parameters).toUint8Array());
3684
3688
  const payloadBytes = payload.toUint8Array();
3685
3689
  buf.putU16(payloadBytes.length);
3686
3690
  buf.putBytes(payloadBytes);
@@ -3691,10 +3695,7 @@ var Switch = class _Switch {
3691
3695
  const fullTrackName = buf.getFullTrackName();
3692
3696
  const subscriptionRequestId = buf.getVI();
3693
3697
  const paramCount = Number(buf.getVI());
3694
- const parameters = [];
3695
- for (let i = 0; i < paramCount; i++) {
3696
- parameters.push(KeyValuePair.deserialize(buf));
3697
- }
3698
+ const parameters = deserializeKvpList(buf, paramCount);
3698
3699
  return new _Switch(requestId, fullTrackName, subscriptionRequestId, parameters);
3699
3700
  }
3700
3701
  };
@@ -3810,9 +3811,7 @@ var ClientSetup = class _ClientSetup {
3810
3811
  buf.putVI(32 /* ClientSetup */);
3811
3812
  const payload = new ByteBuffer();
3812
3813
  payload.putVI(this.setupParameters.length);
3813
- for (const param of this.setupParameters) {
3814
- payload.putKeyValuePair(param);
3815
- }
3814
+ payload.putBytes(serializeKvpList(this.setupParameters).toUint8Array());
3816
3815
  const payloadBytes = payload.toUint8Array();
3817
3816
  if (payloadBytes.length > 65535) {
3818
3817
  throw new LengthExceedsMaxError("ClientSetup::serialize(payload_length)", 65535, payloadBytes.length);
@@ -3823,10 +3822,7 @@ var ClientSetup = class _ClientSetup {
3823
3822
  }
3824
3823
  static parsePayload(buf) {
3825
3824
  const paramCount = buf.getNumberVI();
3826
- const setupParameters = new Array(paramCount);
3827
- for (let i = 0; i < paramCount; i++) {
3828
- setupParameters[i] = buf.getKeyValuePair();
3829
- }
3825
+ const setupParameters = deserializeKvpList(buf, paramCount);
3830
3826
  return new _ClientSetup(setupParameters);
3831
3827
  }
3832
3828
  };
@@ -3865,9 +3861,7 @@ var Fetch = class _Fetch {
3865
3861
  }
3866
3862
  }
3867
3863
  payload.putVI(this.parameters.length);
3868
- for (const param of this.parameters) {
3869
- payload.putKeyValuePair(param.toKeyValuePair());
3870
- }
3864
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3871
3865
  const payloadBytes = payload.toUint8Array();
3872
3866
  if (payloadBytes.length > 65535) {
3873
3867
  throw new LengthExceedsMaxError("Fetch::serialize(payload_length)", 65535, payloadBytes.length);
@@ -3906,10 +3900,7 @@ var Fetch = class _Fetch {
3906
3900
  throw new Error(`Unknown fetch type: ${fetchType}`);
3907
3901
  }
3908
3902
  const paramCount = buf.getNumberVI();
3909
- const rawParams = new Array(paramCount);
3910
- for (let i = 0; i < paramCount; i++) {
3911
- rawParams[i] = buf.getKeyValuePair();
3912
- }
3903
+ const rawParams = deserializeKvpList(buf, paramCount);
3913
3904
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3914
3905
  return new _Fetch(requestId, props, parameters);
3915
3906
  }
@@ -3965,9 +3956,7 @@ var FetchOk = class _FetchOk {
3965
3956
  payload.putU8(this.endOfTrack ? 1 : 0);
3966
3957
  payload.putLocation(this.endLocation);
3967
3958
  payload.putVI(this.parameters.length);
3968
- for (const param of this.parameters) {
3969
- payload.putKeyValuePair(param.toKeyValuePair());
3970
- }
3959
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3971
3960
  TrackExtension.serializeInto(this.trackExtensions, payload);
3972
3961
  const payloadBytes = payload.toUint8Array();
3973
3962
  if (payloadBytes.length > 65535) {
@@ -3996,10 +3985,7 @@ var FetchOk = class _FetchOk {
3996
3985
  }
3997
3986
  const endLocation = buf.getLocation();
3998
3987
  const paramCount = buf.getNumberVI();
3999
- const rawParams = new Array(paramCount);
4000
- for (let i = 0; i < paramCount; i++) {
4001
- rawParams[i] = buf.getKeyValuePair();
4002
- }
3988
+ const rawParams = deserializeKvpList(buf, paramCount);
4003
3989
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4004
3990
  const trackExtensions = TrackExtension.deserializeAll(buf);
4005
3991
  return new _FetchOk(requestId, endOfTrack, endLocation, parameters, trackExtensions);
@@ -4111,9 +4097,7 @@ var ServerSetup = class _ServerSetup {
4111
4097
  buf.putVI(33 /* ServerSetup */);
4112
4098
  const payload = new ByteBuffer();
4113
4099
  payload.putVI(this.setupParameters.length);
4114
- for (const param of this.setupParameters) {
4115
- payload.putKeyValuePair(param);
4116
- }
4100
+ payload.putBytes(serializeKvpList(this.setupParameters).toUint8Array());
4117
4101
  const payloadBytes = payload.toUint8Array();
4118
4102
  if (payloadBytes.length > 65535) {
4119
4103
  throw new LengthExceedsMaxError("ServerSetup::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -4124,10 +4108,7 @@ var ServerSetup = class _ServerSetup {
4124
4108
  }
4125
4109
  static parsePayload(buf) {
4126
4110
  const paramCount = buf.getNumberVI();
4127
- const setupParameters = new Array(paramCount);
4128
- for (let i = 0; i < paramCount; i++) {
4129
- setupParameters[i] = buf.getKeyValuePair();
4130
- }
4111
+ const setupParameters = deserializeKvpList(buf, paramCount);
4131
4112
  return new _ServerSetup(setupParameters);
4132
4113
  }
4133
4114
  };
@@ -4201,9 +4182,7 @@ var Publish = class _Publish {
4201
4182
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
4202
4183
  payload.putVI(this.trackAlias);
4203
4184
  payload.putVI(this.parameters.length);
4204
- for (const param of this.parameters) {
4205
- payload.putKeyValuePair(param.toKeyValuePair());
4206
- }
4185
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4207
4186
  TrackExtension.serializeInto(this.trackExtensions, payload);
4208
4187
  const payloadBytes = payload.toUint8Array();
4209
4188
  if (payloadBytes.length > 65535) {
@@ -4218,10 +4197,7 @@ var Publish = class _Publish {
4218
4197
  const fullTrackName = buf.getFullTrackName();
4219
4198
  const trackAlias = buf.getVI();
4220
4199
  const paramCount = buf.getNumberVI();
4221
- const rawParams = new Array(paramCount);
4222
- for (let i = 0; i < paramCount; i++) {
4223
- rawParams[i] = buf.getKeyValuePair();
4224
- }
4200
+ const rawParams = deserializeKvpList(buf, paramCount);
4225
4201
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4226
4202
  const trackExtensions = TrackExtension.deserializeAll(buf);
4227
4203
  return new _Publish(requestId, fullTrackName, trackAlias, parameters, trackExtensions);
@@ -4245,9 +4221,7 @@ var PublishOk = class _PublishOk {
4245
4221
  const payload = new ByteBuffer();
4246
4222
  payload.putVI(this.requestId);
4247
4223
  payload.putVI(this.parameters.length);
4248
- for (const param of this.parameters) {
4249
- payload.putKeyValuePair(param.toKeyValuePair());
4250
- }
4224
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4251
4225
  const payloadBytes = payload.toUint8Array();
4252
4226
  if (payloadBytes.length > 65535) {
4253
4227
  throw new LengthExceedsMaxError("PublishOk::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -4259,10 +4233,7 @@ var PublishOk = class _PublishOk {
4259
4233
  static parsePayload(buf) {
4260
4234
  const requestId = buf.getVI();
4261
4235
  const paramCount = buf.getVI();
4262
- const kvps = [];
4263
- for (let i = 0; i < paramCount; i++) {
4264
- kvps.push(buf.getKeyValuePair());
4265
- }
4236
+ const kvps = deserializeKvpList(buf, paramCount);
4266
4237
  const parameters = MessageParameters.fromKeyValuePairs(kvps);
4267
4238
  return new _PublishOk(requestId, parameters);
4268
4239
  }
@@ -4290,9 +4261,7 @@ var SubscribeOk = class _SubscribeOk {
4290
4261
  payload.putVI(this.requestId);
4291
4262
  payload.putVI(this.trackAlias);
4292
4263
  payload.putVI(this.parameters.length);
4293
- for (const param of this.parameters) {
4294
- payload.putKeyValuePair(param.toKeyValuePair());
4295
- }
4264
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4296
4265
  TrackExtension.serializeInto(this.trackExtensions, payload);
4297
4266
  const payloadBytes = payload.toUint8Array();
4298
4267
  if (payloadBytes.length > 65535) {
@@ -4306,10 +4275,7 @@ var SubscribeOk = class _SubscribeOk {
4306
4275
  const requestId = buf.getVI();
4307
4276
  const trackAlias = buf.getVI();
4308
4277
  const paramCount = buf.getNumberVI();
4309
- const rawParams = new Array(paramCount);
4310
- for (let i = 0; i < paramCount; i++) {
4311
- rawParams[i] = buf.getKeyValuePair();
4312
- }
4278
+ const rawParams = deserializeKvpList(buf, paramCount);
4313
4279
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4314
4280
  const trackExtensions = TrackExtension.deserializeAll(buf);
4315
4281
  return new _SubscribeOk(requestId, trackAlias, parameters, trackExtensions);
@@ -4336,9 +4302,7 @@ var RequestUpdate = class _RequestUpdate {
4336
4302
  payload.putVI(this.requestId);
4337
4303
  payload.putVI(this.existingRequestId);
4338
4304
  payload.putVI(this.parameters.length);
4339
- for (const param of this.parameters) {
4340
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
4341
- }
4305
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4342
4306
  const payloadBytes = payload.toUint8Array();
4343
4307
  if (payloadBytes.length > 65535) {
4344
4308
  throw new LengthExceedsMaxError("RequestUpdate::serialize(payloadBytes)", 65535, payloadBytes.length);
@@ -4356,8 +4320,7 @@ var RequestUpdate = class _RequestUpdate {
4356
4320
  throw new CastingError("RequestUpdate.deserialize paramCount", "bigint", "number", `${paramCountBig}`);
4357
4321
  }
4358
4322
  const parameters = [];
4359
- for (let i = 0; i < paramCount; i++) {
4360
- const kvp = KeyValuePair.deserialize(buf);
4323
+ for (const kvp of deserializeKvpList(buf, paramCount)) {
4361
4324
  const param = MessageParameter.fromKeyValuePair(kvp);
4362
4325
  if (param !== void 0) parameters.push(param);
4363
4326
  }
@@ -4514,9 +4477,7 @@ var TrackStatus = class _TrackStatus {
4514
4477
  payload.putVI(this.endGroup);
4515
4478
  }
4516
4479
  payload.putVI(this.subscribeParameters.length);
4517
- for (const param of this.subscribeParameters) {
4518
- payload.putKeyValuePair(param.toKeyValuePair());
4519
- }
4480
+ payload.putBytes(serializeKvpList(this.subscribeParameters.map((p) => p.toKeyValuePair())).toUint8Array());
4520
4481
  const payloadBytes = payload.toUint8Array();
4521
4482
  buf.putU16(payloadBytes.length);
4522
4483
  buf.putBytes(payloadBytes);
@@ -4539,10 +4500,7 @@ var TrackStatus = class _TrackStatus {
4539
4500
  endGroup = buf.getVI();
4540
4501
  }
4541
4502
  const paramCount = Number(buf.getVI());
4542
- const rawParams = new Array(paramCount);
4543
- for (let i = 0; i < paramCount; i++) {
4544
- rawParams[i] = buf.getKeyValuePair();
4545
- }
4503
+ const rawParams = deserializeKvpList(buf, paramCount);
4546
4504
  const subscribeParameters = MessageParameters.fromKeyValuePairs(rawParams);
4547
4505
  return new _TrackStatus(
4548
4506
  requestId,
@@ -4660,9 +4618,7 @@ var SubscribeNamespace = class _SubscribeNamespace {
4660
4618
  payload.putTuple(this.trackNamespacePrefix);
4661
4619
  payload.putVI(this.subscribeOptions);
4662
4620
  payload.putVI(this.parameters.length);
4663
- for (const param of this.parameters) {
4664
- payload.putKeyValuePair(param.toKeyValuePair());
4665
- }
4621
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4666
4622
  const payloadBytes = payload.toUint8Array();
4667
4623
  if (payloadBytes.length > 65535) {
4668
4624
  throw new LengthExceedsMaxError("SubscribeNamespace::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -4676,10 +4632,7 @@ var SubscribeNamespace = class _SubscribeNamespace {
4676
4632
  const trackNamespacePrefix = buf.getTuple();
4677
4633
  const subscribeOptions = Number(buf.getVI());
4678
4634
  const paramCount = buf.getNumberVI();
4679
- const rawParams = new Array(paramCount);
4680
- for (let i = 0; i < paramCount; i++) {
4681
- rawParams[i] = buf.getKeyValuePair();
4682
- }
4635
+ const rawParams = deserializeKvpList(buf, paramCount);
4683
4636
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4684
4637
  return new _SubscribeNamespace(requestId, trackNamespacePrefix, subscribeOptions, parameters);
4685
4638
  }
@@ -4730,9 +4683,7 @@ var RequestOk = class _RequestOk {
4730
4683
  const payload = new ByteBuffer();
4731
4684
  payload.putVI(this.requestId);
4732
4685
  payload.putVI(BigInt(this.parameters.length));
4733
- for (const param of this.parameters) {
4734
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
4735
- }
4686
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4736
4687
  const payloadBytes = payload.toUint8Array();
4737
4688
  if (payloadBytes.length > 65535) {
4738
4689
  throw new LengthExceedsMaxError("RequestOk::serialize(payloadBytes)", 65535, payloadBytes.length);
@@ -4749,8 +4700,7 @@ var RequestOk = class _RequestOk {
4749
4700
  throw new CastingError("RequestOk.parsePayload numParams", "bigint", "number", `${numParamsBig}`);
4750
4701
  }
4751
4702
  const parameters = [];
4752
- for (let i = 0; i < numParams; i++) {
4753
- const kvp = KeyValuePair.deserialize(buf);
4703
+ for (const kvp of deserializeKvpList(buf, numParams)) {
4754
4704
  const param = MessageParameter.fromKeyValuePair(kvp);
4755
4705
  if (param !== void 0) parameters.push(param);
4756
4706
  }
@@ -4986,4 +4936,4 @@ var SetupParameters = class {
4986
4936
  }
4987
4937
  };
4988
4938
 
4989
- export { AudioLevel, AuthorizationToken, BaseByteBuffer13 as BaseByteBuffer, ByteBuffer, CMSFCatalog, CaptureTimestamp, CastingError, ClientSetup, ControlMessage, ControlMessageType, Datagram, DefaultPublisherGroupOrderExtension, DefaultPublisherPriorityExtension, DeliveryTimeout, DeliveryTimeoutExtension, DynamicGroupsExtension, EndOfRangeKind, Expires, ExtensionHeader, ExtensionHeaders, Fetch, FetchCancel, FetchHeader, FetchHeaderType, FetchObject, FetchOk, FetchType, FilterType, Forward, FrozenByteBuffer5 as FrozenByteBuffer, FullTrackName, GoAway, GroupOrder, GroupOrderParam, Header, ImmutableExtensionsExtension, ImmutableExtensionsObjectExtension, InternalError, InvalidTypeError, InvalidUTF8Error, KeyValueFormattingError, KeyValuePair, LOCHeaderExtensionId, LargestObject, LengthExceedsMaxError, Location, MAX_FULL_TRACK_NAME_LENGTH, MAX_NAMESPACE_TUPLE_COUNT, MAX_REASON_PHRASE_LEN, MOQtailError, MaxAuthTokenCacheSize, MaxCacheDurationExtension, MaxRequestId, MaxRequestId2 as MaxRequestIdParameter, MessageParameter, MessageParameterType, MessageParameters, MoqtObject, Namespace, NamespaceDone, NamespaceSubscribeOptions, NewGroupRequest, NotEnoughBytesError, ObjectDatagramType, ObjectExtension, ObjectForwardingPreference, ObjectStatus, Path, PriorGroupIdGapExtension, PriorObjectIdGapExtension, ProtocolViolationError, Publish, PublishDone, PublishDoneStatusCode, PublishNamespace, PublishNamespaceCancel, PublishNamespaceDone, PublishOk, ReasonPhrase, RequestError, RequestErrorCode, RequestIdError, RequestIdMap, RequestOk, RequestUpdate, RequestsBlocked, SUPPORTED_VERSIONS, ServerSetup, SetupParameter, SetupParameterType, SetupParameters, SubgroupHeader, SubgroupHeaderType, SubgroupObject, Subscribe, SubscribeNamespace, SubscribeOk, SubscriberPriority, SubscriptionFilter, Switch, TerminationCode, TerminationError, TimeoutError, TokenAliasType, TrackExtension, TrackExtensionType, TrackNameError, TrackStatus, TrackStatusCode, Tuple, TupleField, UnknownObjectExtension, UnknownTrackExtension, Unsubscribe, UnsubscribeNamespace, VarIntOverflowError, VideoConfig, VideoFrameMarking, applyMessageParameterUpdate, controlMessageTypeFromBigInt, fetchTypeFromBigInt, filterTypeFromBigInt, groupOrderFromNumber, isBytes, isVarInt, locHeaderExtensionIdFromNumber, messageParameterTypeFromNumber, publishDoneStatusCodeFromBigInt, requestErrorCodeFromBigInt, setupParameterTypeFromNumber, tokenAliasTypeFromNumber, trackStatusCodeFromBigInt };
4939
+ export { AudioLevel, AuthorizationToken, BaseByteBuffer13 as BaseByteBuffer, ByteBuffer, CMSFCatalog, CaptureTimestamp, CastingError, ClientSetup, ControlMessage, ControlMessageType, Datagram, DefaultPublisherGroupOrderExtension, DefaultPublisherPriorityExtension, DeliveryTimeout, DeliveryTimeoutExtension, DynamicGroupsExtension, EndOfRangeKind, Expires, ExtensionHeader, ExtensionHeaders, Fetch, FetchCancel, FetchHeader, FetchHeaderType, FetchObject, FetchOk, FetchType, FilterType, Forward, FrozenByteBuffer5 as FrozenByteBuffer, FullTrackName, GoAway, GroupOrder, GroupOrderParam, Header, ImmutableExtensionsExtension, ImmutableExtensionsObjectExtension, InternalError, InvalidTypeError, InvalidUTF8Error, KeyValueFormattingError, KeyValuePair, LOCHeaderExtensionId, LargestObject, LengthExceedsMaxError, Location, MAX_FULL_TRACK_NAME_LENGTH, MAX_NAMESPACE_TUPLE_COUNT, MAX_REASON_PHRASE_LEN, MOQtailError, MaxAuthTokenCacheSize, MaxCacheDurationExtension, MaxRequestId, MaxRequestId2 as MaxRequestIdParameter, MessageParameter, MessageParameterType, MessageParameters, MoqtObject, Namespace, NamespaceDone, NamespaceSubscribeOptions, NewGroupRequest, NotEnoughBytesError, ObjectDatagramType, ObjectExtension, ObjectForwardingPreference, ObjectStatus, Path, PriorGroupIdGapExtension, PriorObjectIdGapExtension, ProtocolViolationError, Publish, PublishDone, PublishDoneStatusCode, PublishNamespace, PublishNamespaceCancel, PublishNamespaceDone, PublishOk, ReasonPhrase, RequestError, RequestErrorCode, RequestIdError, RequestIdMap, RequestOk, RequestUpdate, RequestsBlocked, SUPPORTED_VERSIONS, ServerSetup, SetupParameter, SetupParameterType, SetupParameters, SubgroupHeader, SubgroupHeaderType, SubgroupObject, Subscribe, SubscribeNamespace, SubscribeOk, SubscriberPriority, SubscriptionFilter, Switch, TerminationCode, TerminationError, TimeoutError, TokenAliasType, TrackExtension, TrackExtensionType, TrackNameError, TrackStatus, TrackStatusCode, Tuple, TupleField, UnknownObjectExtension, UnknownTrackExtension, Unsubscribe, UnsubscribeNamespace, VarIntOverflowError, VideoConfig, VideoFrameMarking, applyMessageParameterUpdate, controlMessageTypeFromBigInt, deserializeKvpList, deserializeKvpListUntilEmpty, fetchTypeFromBigInt, filterTypeFromBigInt, groupOrderFromNumber, isBytes, isVarInt, locHeaderExtensionIdFromNumber, messageParameterTypeFromNumber, publishDoneStatusCodeFromBigInt, requestErrorCodeFromBigInt, serializeKvpList, setupParameterTypeFromNumber, tokenAliasTypeFromNumber, trackStatusCodeFromBigInt };