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.cjs CHANGED
@@ -344,6 +344,7 @@ var TerminationError = class extends MOQtailError {
344
344
 
345
345
  // src/model/common/pair.ts
346
346
  var MAX_VALUE_LENGTH = 2 ** 16 - 1;
347
+ var MAX_U64 = 2n ** 64n - 1n;
347
348
  var KeyValuePair = class _KeyValuePair {
348
349
  /**
349
350
  * The key/type identifier for this pair.
@@ -403,11 +404,29 @@ var KeyValuePair = class _KeyValuePair {
403
404
  }
404
405
  /**
405
406
  * Serializes this key-value pair to a frozen byte buffer.
407
+ * Equivalent to {@link KeyValuePair.serializeDelta} with `prevType = 0n`.
406
408
  * @returns The serialized buffer.
407
409
  */
408
410
  serialize() {
411
+ return this.serializeDelta(0n);
412
+ }
413
+ /**
414
+ * Serializes this pair's wire form, encoding the Type as a delta from
415
+ * `prevType` (the type of the previous KVP in the same list, or 0n if this
416
+ * is the first entry).
417
+ * @param prevType - The type of the previous KVP in the same list.
418
+ * @throws ProtocolViolationError if this pair's type is less than prevType
419
+ * (Delta Type is an unsigned varint, so the list must be sorted ascending).
420
+ */
421
+ serializeDelta(prevType) {
422
+ if (this.typeValue < prevType) {
423
+ throw new ProtocolViolationError(
424
+ "KeyValuePair.serializeDelta",
425
+ `type ${this.typeValue} is less than previous type ${prevType}; a KVP list must be sorted by ascending type to be delta-encoded`
426
+ );
427
+ }
409
428
  const buf = new ByteBuffer();
410
- buf.putVI(this.typeValue);
429
+ buf.putVI(this.typeValue - prevType);
411
430
  if (isVarInt(this)) {
412
431
  buf.putVI(this.value);
413
432
  } else if (isBytes(this)) {
@@ -417,13 +436,32 @@ var KeyValuePair = class _KeyValuePair {
417
436
  }
418
437
  /**
419
438
  * Deserializes a KeyValuePair from a buffer.
439
+ * Equivalent to {@link KeyValuePair.deserializeDelta} with `prevType = 0n`.
420
440
  * @param buf - The buffer to read from.
421
441
  * @returns The deserialized KeyValuePair.
422
442
  * @throws LengthExceedsMaxError if blob length exceeds 65535 bytes.
423
443
  * @throws NotEnoughBytesError if buffer does not contain enough bytes.
424
444
  */
425
445
  static deserialize(buf) {
426
- const typeValue = buf.getVI();
446
+ return _KeyValuePair.deserializeDelta(buf, 0n);
447
+ }
448
+ /**
449
+ * Deserializes a wire-form KVP whose Type field is a delta from `prevType`
450
+ * (the type of the previous KVP in the same list, or 0n if this is the
451
+ * first entry).
452
+ * @param buf - The buffer to read from.
453
+ * @param prevType - The type of the previous KVP in the same list.
454
+ * @throws ProtocolViolationError if prevType + delta exceeds 2^64 - 1.
455
+ */
456
+ static deserializeDelta(buf, prevType) {
457
+ const deltaType = buf.getVI();
458
+ const typeValue = prevType + deltaType;
459
+ if (typeValue > MAX_U64) {
460
+ throw new ProtocolViolationError(
461
+ "KeyValuePair.deserializeDelta",
462
+ `previous type ${prevType} plus delta type ${deltaType} exceeds 2^64 - 1`
463
+ );
464
+ }
427
465
  if (typeValue % 2n === 0n) {
428
466
  const value = buf.getVI();
429
467
  return new _KeyValuePair(typeValue, value);
@@ -458,6 +496,37 @@ var KeyValuePair = class _KeyValuePair {
458
496
  return false;
459
497
  }
460
498
  };
499
+ function serializeKvpList(items) {
500
+ const sorted = [...items].sort((a, b) => a.typeValue < b.typeValue ? -1 : a.typeValue > b.typeValue ? 1 : 0);
501
+ const buf = new ByteBuffer();
502
+ let prevType = 0n;
503
+ for (const kvp of sorted) {
504
+ buf.putBytes(kvp.serializeDelta(prevType).toUint8Array());
505
+ prevType = kvp.typeValue;
506
+ }
507
+ return buf.freeze();
508
+ }
509
+ function deserializeKvpList(buf, count) {
510
+ const n = typeof count === "bigint" ? Number(count) : count;
511
+ const items = new Array(n);
512
+ let prevType = 0n;
513
+ for (let i = 0; i < n; i++) {
514
+ const kvp = KeyValuePair.deserializeDelta(buf, prevType);
515
+ prevType = kvp.typeValue;
516
+ items[i] = kvp;
517
+ }
518
+ return items;
519
+ }
520
+ function deserializeKvpListUntilEmpty(buf) {
521
+ const items = [];
522
+ let prevType = 0n;
523
+ while (buf.remaining > 0) {
524
+ const kvp = KeyValuePair.deserializeDelta(buf, prevType);
525
+ prevType = kvp.typeValue;
526
+ items.push(kvp);
527
+ }
528
+ return items;
529
+ }
461
530
  function isVarInt(pair) {
462
531
  return pair.typeValue % 2n === 0n;
463
532
  }
@@ -1060,13 +1129,7 @@ var Datagram = class _Datagram {
1060
1129
  buf.putU8(this.publisherPriority);
1061
1130
  }
1062
1131
  if (exports.ObjectDatagramType.hasExtensions(this.type)) {
1063
- const extBuf = new ByteBuffer();
1064
- if (this.extensionHeaders) {
1065
- for (const header of this.extensionHeaders) {
1066
- extBuf.putKeyValuePair(header);
1067
- }
1068
- }
1069
- const extBytes = extBuf.toUint8Array();
1132
+ const extBytes = this.extensionHeaders ? serializeKvpList(this.extensionHeaders).toUint8Array() : new Uint8Array(0);
1070
1133
  buf.putLengthPrefixedBytes(extBytes);
1071
1134
  }
1072
1135
  if (exports.ObjectDatagramType.isStatus(this.type)) {
@@ -1097,10 +1160,7 @@ var Datagram = class _Datagram {
1097
1160
  if (exports.ObjectDatagramType.hasExtensions(msgType)) {
1098
1161
  const extBytes = buf.getLengthPrefixedBytes();
1099
1162
  const headerBytes = new FrozenByteBuffer5(extBytes);
1100
- extensionHeaders = [];
1101
- while (headerBytes.remaining > 0) {
1102
- extensionHeaders.push(headerBytes.getKeyValuePair());
1103
- }
1163
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
1104
1164
  }
1105
1165
  let payload = null;
1106
1166
  let objectStatus = null;
@@ -1272,9 +1332,7 @@ var FetchObject = class _FetchObject {
1272
1332
  if (hasObjectId) buf.putVI(this.objectId);
1273
1333
  if (hasPriority) buf.putU8(this.publisherPriority);
1274
1334
  if (hasExtensions) {
1275
- const extBuf = new ByteBuffer();
1276
- for (const h of this.extensionHeaders) extBuf.putKeyValuePair(h);
1277
- buf.putLengthPrefixedBytes(extBuf.toUint8Array());
1335
+ buf.putLengthPrefixedBytes(serializeKvpList(this.extensionHeaders).toUint8Array());
1278
1336
  }
1279
1337
  const payloadBytes = this.payload ?? new Uint8Array(0);
1280
1338
  buf.putLengthPrefixedBytes(payloadBytes);
@@ -1360,10 +1418,7 @@ var FetchObject = class _FetchObject {
1360
1418
  if (hasExtensions) {
1361
1419
  const extLen = buf.getNumberVI();
1362
1420
  const headerBytes = new FrozenByteBuffer5(buf.getBytes(extLen));
1363
- extensionHeaders = [];
1364
- while (headerBytes.remaining > 0) {
1365
- extensionHeaders.push(headerBytes.getKeyValuePair());
1366
- }
1421
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
1367
1422
  }
1368
1423
  const payloadLen = buf.getNumberVI();
1369
1424
  const payload = buf.getBytes(payloadLen);
@@ -2027,26 +2082,18 @@ var ImmutableExtensionsExtension = class _ImmutableExtensionsExtension {
2027
2082
  extensions;
2028
2083
  static TYPE = 11 /* ImmutableExtensions */;
2029
2084
  toKeyValuePair() {
2030
- const inner = new ByteBuffer();
2031
- for (const kvp of this.extensions) {
2032
- inner.putBytes(kvp.serialize().toUint8Array());
2033
- }
2034
- return KeyValuePair.tryNewBytes(_ImmutableExtensionsExtension.TYPE, inner.toUint8Array());
2085
+ return KeyValuePair.tryNewBytes(_ImmutableExtensionsExtension.TYPE, serializeKvpList(this.extensions).toUint8Array());
2035
2086
  }
2036
2087
  static fromKeyValuePair(pair) {
2037
2088
  if (Number(pair.typeValue) !== _ImmutableExtensionsExtension.TYPE || !(pair.value instanceof Uint8Array))
2038
2089
  return void 0;
2039
2090
  const buf = new FrozenByteBuffer5(pair.value);
2040
- const extensions = [];
2041
- while (buf.remaining > 0) {
2042
- const inner = KeyValuePair.deserialize(buf);
2043
- if (Number(inner.typeValue) === 11 /* ImmutableExtensions */) {
2044
- throw new ProtocolViolationError(
2045
- "ImmutableExtensionsExtension.fromKeyValuePair",
2046
- "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
2047
- );
2048
- }
2049
- extensions.push(inner);
2091
+ const extensions = deserializeKvpListUntilEmpty(buf);
2092
+ if (extensions.some((inner) => Number(inner.typeValue) === 11 /* ImmutableExtensions */)) {
2093
+ throw new ProtocolViolationError(
2094
+ "ImmutableExtensionsExtension.fromKeyValuePair",
2095
+ "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
2096
+ );
2050
2097
  }
2051
2098
  return new _ImmutableExtensionsExtension(extensions);
2052
2099
  }
@@ -2133,18 +2180,11 @@ exports.TrackExtension = void 0;
2133
2180
  }
2134
2181
  TrackExtension2.toKeyValuePair = toKeyValuePair;
2135
2182
  function deserializeAll(buf) {
2136
- const result = [];
2137
- while (buf.remaining > 0) {
2138
- const kvp = KeyValuePair.deserialize(buf);
2139
- result.push(fromKeyValuePair(kvp));
2140
- }
2141
- return result;
2183
+ return deserializeKvpListUntilEmpty(buf).map(fromKeyValuePair);
2142
2184
  }
2143
2185
  TrackExtension2.deserializeAll = deserializeAll;
2144
2186
  function serializeInto(exts, payload) {
2145
- for (const ext of exts) {
2146
- payload.putBytes(ext.toKeyValuePair().serialize().toUint8Array());
2147
- }
2187
+ payload.putBytes(serializeKvpList(exts.map((ext) => ext.toKeyValuePair())).toUint8Array());
2148
2188
  }
2149
2189
  TrackExtension2.serializeInto = serializeInto;
2150
2190
  function isDeliveryTimeout(ext) {
@@ -2185,26 +2225,21 @@ var ImmutableExtensionsObjectExtension = class _ImmutableExtensionsObjectExtensi
2185
2225
  extensions;
2186
2226
  static TYPE = 11 /* ImmutableExtensions */;
2187
2227
  toKeyValuePair() {
2188
- const inner = new ByteBuffer();
2189
- for (const kvp of this.extensions) {
2190
- inner.putBytes(kvp.serialize().toUint8Array());
2191
- }
2192
- return KeyValuePair.tryNewBytes(_ImmutableExtensionsObjectExtension.TYPE, inner.toUint8Array());
2228
+ return KeyValuePair.tryNewBytes(
2229
+ _ImmutableExtensionsObjectExtension.TYPE,
2230
+ serializeKvpList(this.extensions).toUint8Array()
2231
+ );
2193
2232
  }
2194
2233
  static fromKeyValuePair(pair) {
2195
2234
  if (Number(pair.typeValue) !== _ImmutableExtensionsObjectExtension.TYPE || !(pair.value instanceof Uint8Array))
2196
2235
  return void 0;
2197
2236
  const buf = new FrozenByteBuffer5(pair.value);
2198
- const extensions = [];
2199
- while (buf.remaining > 0) {
2200
- const inner = KeyValuePair.deserialize(buf);
2201
- if (Number(inner.typeValue) === 11 /* ImmutableExtensions */) {
2202
- throw new ProtocolViolationError(
2203
- "ImmutableExtensionsObjectExtension.fromKeyValuePair",
2204
- "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
2205
- );
2206
- }
2207
- extensions.push(inner);
2237
+ const extensions = deserializeKvpListUntilEmpty(buf);
2238
+ if (extensions.some((inner) => Number(inner.typeValue) === 11 /* ImmutableExtensions */)) {
2239
+ throw new ProtocolViolationError(
2240
+ "ImmutableExtensionsObjectExtension.fromKeyValuePair",
2241
+ "ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
2242
+ );
2208
2243
  }
2209
2244
  return new _ImmutableExtensionsObjectExtension(extensions);
2210
2245
  }
@@ -2257,18 +2292,11 @@ exports.ObjectExtension = void 0;
2257
2292
  }
2258
2293
  ObjectExtension2.toKeyValuePair = toKeyValuePair;
2259
2294
  function deserializeAll(buf) {
2260
- const result = [];
2261
- while (buf.remaining > 0) {
2262
- const kvp = KeyValuePair.deserialize(buf);
2263
- result.push(fromKeyValuePair(kvp));
2264
- }
2265
- return result;
2295
+ return deserializeKvpListUntilEmpty(buf).map(fromKeyValuePair);
2266
2296
  }
2267
2297
  ObjectExtension2.deserializeAll = deserializeAll;
2268
2298
  function serializeInto(exts, payload) {
2269
- for (const ext of exts) {
2270
- payload.putBytes(ext.toKeyValuePair().serialize().toUint8Array());
2271
- }
2299
+ payload.putBytes(serializeKvpList(exts.map((ext) => ext.toKeyValuePair())).toUint8Array());
2272
2300
  }
2273
2301
  ObjectExtension2.serializeInto = serializeInto;
2274
2302
  function isImmutableExtensions(ext) {
@@ -2290,6 +2318,12 @@ exports.ObjectExtension = void 0;
2290
2318
  })(exports.ObjectExtension || (exports.ObjectExtension = {}));
2291
2319
 
2292
2320
  // src/model/data/subgroup_object.ts
2321
+ function normalizeExtensionHeaders(extensionHeaders) {
2322
+ if (extensionHeaders === null || extensionHeaders.length === 0) {
2323
+ return null;
2324
+ }
2325
+ return extensionHeaders;
2326
+ }
2293
2327
  var SubgroupObject = class _SubgroupObject {
2294
2328
  constructor(objectId, extensionHeaders, objectStatus, payload) {
2295
2329
  this.extensionHeaders = extensionHeaders;
@@ -2302,22 +2336,17 @@ var SubgroupObject = class _SubgroupObject {
2302
2336
  payload;
2303
2337
  objectId;
2304
2338
  static newWithStatus(objectId, extensionHeaders, objectStatus) {
2305
- return new _SubgroupObject(objectId, extensionHeaders, objectStatus, null);
2339
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), objectStatus, null);
2306
2340
  }
2307
2341
  static newWithPayload(objectId, extensionHeaders, payload) {
2308
- return new _SubgroupObject(objectId, extensionHeaders, null, payload);
2342
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), null, payload);
2309
2343
  }
2310
2344
  serialize(previousObjectId) {
2311
2345
  let objectIdDelta = previousObjectId ? this.objectId - previousObjectId - BigInt(1) : this.objectId;
2312
2346
  const buf = new ByteBuffer();
2313
2347
  buf.putVI(objectIdDelta);
2314
- const extensionHeaders = new ByteBuffer();
2315
- if (this.extensionHeaders) {
2316
- for (const header of this.extensionHeaders) {
2317
- extensionHeaders.putKeyValuePair(header);
2318
- }
2319
- const headerBytes = extensionHeaders.toUint8Array();
2320
- buf.putLengthPrefixedBytes(headerBytes);
2348
+ if (this.extensionHeaders !== null) {
2349
+ buf.putLengthPrefixedBytes(serializeKvpList(this.extensionHeaders).toUint8Array());
2321
2350
  }
2322
2351
  if (this.payload) {
2323
2352
  buf.putLengthPrefixedBytes(this.payload);
@@ -2332,12 +2361,9 @@ var SubgroupObject = class _SubgroupObject {
2332
2361
  let objectId = previousObjectId !== void 0 ? previousObjectId + objectDelta + BigInt(1) : objectDelta;
2333
2362
  let extensionHeaders = null;
2334
2363
  if (hasExtensions) {
2335
- extensionHeaders = [];
2336
2364
  const extLen = buf.getNumberVI();
2337
2365
  const headerBytes = new FrozenByteBuffer5(buf.getBytes(extLen));
2338
- while (headerBytes.remaining > 0) {
2339
- extensionHeaders.push(headerBytes.getKeyValuePair());
2340
- }
2366
+ extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
2341
2367
  }
2342
2368
  const payloadLen = buf.getNumberVI();
2343
2369
  let objectStatus = null;
@@ -2347,7 +2373,7 @@ var SubgroupObject = class _SubgroupObject {
2347
2373
  } else {
2348
2374
  payload = buf.getBytes(payloadLen);
2349
2375
  }
2350
- return new _SubgroupObject(objectId, extensionHeaders, objectStatus, payload);
2376
+ return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), objectStatus, payload);
2351
2377
  }
2352
2378
  };
2353
2379
 
@@ -2788,24 +2814,12 @@ exports.Header = void 0;
2788
2814
  buf.checkpoint();
2789
2815
  const type = buf.getNumberVI();
2790
2816
  buf.restore();
2791
- switch (type) {
2792
- case 5:
2793
- return FetchHeader.deserialize(buf);
2794
- case 16:
2795
- case 17:
2796
- case 18:
2797
- case 19:
2798
- case 20:
2799
- case 21:
2800
- case 24:
2801
- case 25:
2802
- case 26:
2803
- case 27:
2804
- case 28:
2805
- case 29:
2806
- return SubgroupHeader.deserialize(buf);
2807
- default:
2808
- throw new InvalidTypeError("Header::deserialize(type)", `Unknown header type: ${type}`);
2817
+ if (type === 5) {
2818
+ return FetchHeader.deserialize(buf);
2819
+ } else if ((type & exports.SubgroupHeaderType.REQUIRED_BIT) !== 0 && (type & 192) === 0) {
2820
+ return SubgroupHeader.deserialize(buf);
2821
+ } else {
2822
+ throw new InvalidTypeError("Header::deserialize(type)", `Unknown header type: ${type}`);
2809
2823
  }
2810
2824
  }
2811
2825
  Header2.deserialize = deserialize;
@@ -3568,9 +3582,7 @@ var PublishNamespace = class _PublishNamespace {
3568
3582
  payload.putVI(this.requestId);
3569
3583
  payload.putTuple(this.trackNamespace);
3570
3584
  payload.putVI(this.parameters.length);
3571
- for (const param of this.parameters) {
3572
- payload.putKeyValuePair(param.toKeyValuePair());
3573
- }
3585
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3574
3586
  const payloadBytes = payload.toUint8Array();
3575
3587
  if (payloadBytes.length > 65535) {
3576
3588
  throw new LengthExceedsMaxError("PublishNamespace::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -3591,10 +3603,7 @@ var PublishNamespace = class _PublishNamespace {
3591
3603
  const requestId = buf.getVI();
3592
3604
  const trackNamespace = buf.getTuple();
3593
3605
  const paramCount = buf.getNumberVI();
3594
- const rawParams = new Array(paramCount);
3595
- for (let i = 0; i < paramCount; i++) {
3596
- rawParams[i] = buf.getKeyValuePair();
3597
- }
3606
+ const rawParams = deserializeKvpList(buf, paramCount);
3598
3607
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3599
3608
  return new _PublishNamespace(requestId, trackNamespace, parameters);
3600
3609
  }
@@ -3638,9 +3647,7 @@ var Subscribe = class _Subscribe {
3638
3647
  payload.putVI(this.requestId);
3639
3648
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
3640
3649
  payload.putVI(this.parameters.length);
3641
- for (const param of this.parameters) {
3642
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
3643
- }
3650
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3644
3651
  const payloadBytes = payload.toUint8Array();
3645
3652
  buf.putU16(payloadBytes.length);
3646
3653
  buf.putBytes(payloadBytes);
@@ -3651,8 +3658,7 @@ var Subscribe = class _Subscribe {
3651
3658
  const fullTrackName = buf.getFullTrackName();
3652
3659
  const paramCount = Number(buf.getVI());
3653
3660
  const parameters = [];
3654
- for (let i = 0; i < paramCount; i++) {
3655
- const kvp = KeyValuePair.deserialize(buf);
3661
+ for (const kvp of deserializeKvpList(buf, paramCount)) {
3656
3662
  const param = exports.MessageParameter.fromKeyValuePair(kvp);
3657
3663
  if (param !== void 0) parameters.push(param);
3658
3664
  }
@@ -3680,9 +3686,7 @@ var Switch = class _Switch {
3680
3686
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
3681
3687
  payload.putVI(this.subscriptionRequestId);
3682
3688
  payload.putVI(this.parameters.length);
3683
- for (const param of this.parameters) {
3684
- payload.putBytes(param.serialize().toUint8Array());
3685
- }
3689
+ payload.putBytes(serializeKvpList(this.parameters).toUint8Array());
3686
3690
  const payloadBytes = payload.toUint8Array();
3687
3691
  buf.putU16(payloadBytes.length);
3688
3692
  buf.putBytes(payloadBytes);
@@ -3693,10 +3697,7 @@ var Switch = class _Switch {
3693
3697
  const fullTrackName = buf.getFullTrackName();
3694
3698
  const subscriptionRequestId = buf.getVI();
3695
3699
  const paramCount = Number(buf.getVI());
3696
- const parameters = [];
3697
- for (let i = 0; i < paramCount; i++) {
3698
- parameters.push(KeyValuePair.deserialize(buf));
3699
- }
3700
+ const parameters = deserializeKvpList(buf, paramCount);
3700
3701
  return new _Switch(requestId, fullTrackName, subscriptionRequestId, parameters);
3701
3702
  }
3702
3703
  };
@@ -3812,9 +3813,7 @@ var ClientSetup = class _ClientSetup {
3812
3813
  buf.putVI(32 /* ClientSetup */);
3813
3814
  const payload = new ByteBuffer();
3814
3815
  payload.putVI(this.setupParameters.length);
3815
- for (const param of this.setupParameters) {
3816
- payload.putKeyValuePair(param);
3817
- }
3816
+ payload.putBytes(serializeKvpList(this.setupParameters).toUint8Array());
3818
3817
  const payloadBytes = payload.toUint8Array();
3819
3818
  if (payloadBytes.length > 65535) {
3820
3819
  throw new LengthExceedsMaxError("ClientSetup::serialize(payload_length)", 65535, payloadBytes.length);
@@ -3825,10 +3824,7 @@ var ClientSetup = class _ClientSetup {
3825
3824
  }
3826
3825
  static parsePayload(buf) {
3827
3826
  const paramCount = buf.getNumberVI();
3828
- const setupParameters = new Array(paramCount);
3829
- for (let i = 0; i < paramCount; i++) {
3830
- setupParameters[i] = buf.getKeyValuePair();
3831
- }
3827
+ const setupParameters = deserializeKvpList(buf, paramCount);
3832
3828
  return new _ClientSetup(setupParameters);
3833
3829
  }
3834
3830
  };
@@ -3867,9 +3863,7 @@ var Fetch = class _Fetch {
3867
3863
  }
3868
3864
  }
3869
3865
  payload.putVI(this.parameters.length);
3870
- for (const param of this.parameters) {
3871
- payload.putKeyValuePair(param.toKeyValuePair());
3872
- }
3866
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3873
3867
  const payloadBytes = payload.toUint8Array();
3874
3868
  if (payloadBytes.length > 65535) {
3875
3869
  throw new LengthExceedsMaxError("Fetch::serialize(payload_length)", 65535, payloadBytes.length);
@@ -3908,10 +3902,7 @@ var Fetch = class _Fetch {
3908
3902
  throw new Error(`Unknown fetch type: ${fetchType}`);
3909
3903
  }
3910
3904
  const paramCount = buf.getNumberVI();
3911
- const rawParams = new Array(paramCount);
3912
- for (let i = 0; i < paramCount; i++) {
3913
- rawParams[i] = buf.getKeyValuePair();
3914
- }
3905
+ const rawParams = deserializeKvpList(buf, paramCount);
3915
3906
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
3916
3907
  return new _Fetch(requestId, props, parameters);
3917
3908
  }
@@ -3967,9 +3958,7 @@ var FetchOk = class _FetchOk {
3967
3958
  payload.putU8(this.endOfTrack ? 1 : 0);
3968
3959
  payload.putLocation(this.endLocation);
3969
3960
  payload.putVI(this.parameters.length);
3970
- for (const param of this.parameters) {
3971
- payload.putKeyValuePair(param.toKeyValuePair());
3972
- }
3961
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
3973
3962
  exports.TrackExtension.serializeInto(this.trackExtensions, payload);
3974
3963
  const payloadBytes = payload.toUint8Array();
3975
3964
  if (payloadBytes.length > 65535) {
@@ -3998,10 +3987,7 @@ var FetchOk = class _FetchOk {
3998
3987
  }
3999
3988
  const endLocation = buf.getLocation();
4000
3989
  const paramCount = buf.getNumberVI();
4001
- const rawParams = new Array(paramCount);
4002
- for (let i = 0; i < paramCount; i++) {
4003
- rawParams[i] = buf.getKeyValuePair();
4004
- }
3990
+ const rawParams = deserializeKvpList(buf, paramCount);
4005
3991
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4006
3992
  const trackExtensions = exports.TrackExtension.deserializeAll(buf);
4007
3993
  return new _FetchOk(requestId, endOfTrack, endLocation, parameters, trackExtensions);
@@ -4113,9 +4099,7 @@ var ServerSetup = class _ServerSetup {
4113
4099
  buf.putVI(33 /* ServerSetup */);
4114
4100
  const payload = new ByteBuffer();
4115
4101
  payload.putVI(this.setupParameters.length);
4116
- for (const param of this.setupParameters) {
4117
- payload.putKeyValuePair(param);
4118
- }
4102
+ payload.putBytes(serializeKvpList(this.setupParameters).toUint8Array());
4119
4103
  const payloadBytes = payload.toUint8Array();
4120
4104
  if (payloadBytes.length > 65535) {
4121
4105
  throw new LengthExceedsMaxError("ServerSetup::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -4126,10 +4110,7 @@ var ServerSetup = class _ServerSetup {
4126
4110
  }
4127
4111
  static parsePayload(buf) {
4128
4112
  const paramCount = buf.getNumberVI();
4129
- const setupParameters = new Array(paramCount);
4130
- for (let i = 0; i < paramCount; i++) {
4131
- setupParameters[i] = buf.getKeyValuePair();
4132
- }
4113
+ const setupParameters = deserializeKvpList(buf, paramCount);
4133
4114
  return new _ServerSetup(setupParameters);
4134
4115
  }
4135
4116
  };
@@ -4203,9 +4184,7 @@ var Publish = class _Publish {
4203
4184
  payload.putBytes(this.fullTrackName.serialize().toUint8Array());
4204
4185
  payload.putVI(this.trackAlias);
4205
4186
  payload.putVI(this.parameters.length);
4206
- for (const param of this.parameters) {
4207
- payload.putKeyValuePair(param.toKeyValuePair());
4208
- }
4187
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4209
4188
  exports.TrackExtension.serializeInto(this.trackExtensions, payload);
4210
4189
  const payloadBytes = payload.toUint8Array();
4211
4190
  if (payloadBytes.length > 65535) {
@@ -4220,10 +4199,7 @@ var Publish = class _Publish {
4220
4199
  const fullTrackName = buf.getFullTrackName();
4221
4200
  const trackAlias = buf.getVI();
4222
4201
  const paramCount = buf.getNumberVI();
4223
- const rawParams = new Array(paramCount);
4224
- for (let i = 0; i < paramCount; i++) {
4225
- rawParams[i] = buf.getKeyValuePair();
4226
- }
4202
+ const rawParams = deserializeKvpList(buf, paramCount);
4227
4203
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4228
4204
  const trackExtensions = exports.TrackExtension.deserializeAll(buf);
4229
4205
  return new _Publish(requestId, fullTrackName, trackAlias, parameters, trackExtensions);
@@ -4247,9 +4223,7 @@ var PublishOk = class _PublishOk {
4247
4223
  const payload = new ByteBuffer();
4248
4224
  payload.putVI(this.requestId);
4249
4225
  payload.putVI(this.parameters.length);
4250
- for (const param of this.parameters) {
4251
- payload.putKeyValuePair(param.toKeyValuePair());
4252
- }
4226
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4253
4227
  const payloadBytes = payload.toUint8Array();
4254
4228
  if (payloadBytes.length > 65535) {
4255
4229
  throw new LengthExceedsMaxError("PublishOk::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -4261,10 +4235,7 @@ var PublishOk = class _PublishOk {
4261
4235
  static parsePayload(buf) {
4262
4236
  const requestId = buf.getVI();
4263
4237
  const paramCount = buf.getVI();
4264
- const kvps = [];
4265
- for (let i = 0; i < paramCount; i++) {
4266
- kvps.push(buf.getKeyValuePair());
4267
- }
4238
+ const kvps = deserializeKvpList(buf, paramCount);
4268
4239
  const parameters = MessageParameters.fromKeyValuePairs(kvps);
4269
4240
  return new _PublishOk(requestId, parameters);
4270
4241
  }
@@ -4292,9 +4263,7 @@ var SubscribeOk = class _SubscribeOk {
4292
4263
  payload.putVI(this.requestId);
4293
4264
  payload.putVI(this.trackAlias);
4294
4265
  payload.putVI(this.parameters.length);
4295
- for (const param of this.parameters) {
4296
- payload.putKeyValuePair(param.toKeyValuePair());
4297
- }
4266
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4298
4267
  exports.TrackExtension.serializeInto(this.trackExtensions, payload);
4299
4268
  const payloadBytes = payload.toUint8Array();
4300
4269
  if (payloadBytes.length > 65535) {
@@ -4308,10 +4277,7 @@ var SubscribeOk = class _SubscribeOk {
4308
4277
  const requestId = buf.getVI();
4309
4278
  const trackAlias = buf.getVI();
4310
4279
  const paramCount = buf.getNumberVI();
4311
- const rawParams = new Array(paramCount);
4312
- for (let i = 0; i < paramCount; i++) {
4313
- rawParams[i] = buf.getKeyValuePair();
4314
- }
4280
+ const rawParams = deserializeKvpList(buf, paramCount);
4315
4281
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4316
4282
  const trackExtensions = exports.TrackExtension.deserializeAll(buf);
4317
4283
  return new _SubscribeOk(requestId, trackAlias, parameters, trackExtensions);
@@ -4338,9 +4304,7 @@ var RequestUpdate = class _RequestUpdate {
4338
4304
  payload.putVI(this.requestId);
4339
4305
  payload.putVI(this.existingRequestId);
4340
4306
  payload.putVI(this.parameters.length);
4341
- for (const param of this.parameters) {
4342
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
4343
- }
4307
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4344
4308
  const payloadBytes = payload.toUint8Array();
4345
4309
  if (payloadBytes.length > 65535) {
4346
4310
  throw new LengthExceedsMaxError("RequestUpdate::serialize(payloadBytes)", 65535, payloadBytes.length);
@@ -4358,8 +4322,7 @@ var RequestUpdate = class _RequestUpdate {
4358
4322
  throw new CastingError("RequestUpdate.deserialize paramCount", "bigint", "number", `${paramCountBig}`);
4359
4323
  }
4360
4324
  const parameters = [];
4361
- for (let i = 0; i < paramCount; i++) {
4362
- const kvp = KeyValuePair.deserialize(buf);
4325
+ for (const kvp of deserializeKvpList(buf, paramCount)) {
4363
4326
  const param = exports.MessageParameter.fromKeyValuePair(kvp);
4364
4327
  if (param !== void 0) parameters.push(param);
4365
4328
  }
@@ -4516,9 +4479,7 @@ var TrackStatus = class _TrackStatus {
4516
4479
  payload.putVI(this.endGroup);
4517
4480
  }
4518
4481
  payload.putVI(this.subscribeParameters.length);
4519
- for (const param of this.subscribeParameters) {
4520
- payload.putKeyValuePair(param.toKeyValuePair());
4521
- }
4482
+ payload.putBytes(serializeKvpList(this.subscribeParameters.map((p) => p.toKeyValuePair())).toUint8Array());
4522
4483
  const payloadBytes = payload.toUint8Array();
4523
4484
  buf.putU16(payloadBytes.length);
4524
4485
  buf.putBytes(payloadBytes);
@@ -4541,10 +4502,7 @@ var TrackStatus = class _TrackStatus {
4541
4502
  endGroup = buf.getVI();
4542
4503
  }
4543
4504
  const paramCount = Number(buf.getVI());
4544
- const rawParams = new Array(paramCount);
4545
- for (let i = 0; i < paramCount; i++) {
4546
- rawParams[i] = buf.getKeyValuePair();
4547
- }
4505
+ const rawParams = deserializeKvpList(buf, paramCount);
4548
4506
  const subscribeParameters = MessageParameters.fromKeyValuePairs(rawParams);
4549
4507
  return new _TrackStatus(
4550
4508
  requestId,
@@ -4662,9 +4620,7 @@ var SubscribeNamespace = class _SubscribeNamespace {
4662
4620
  payload.putTuple(this.trackNamespacePrefix);
4663
4621
  payload.putVI(this.subscribeOptions);
4664
4622
  payload.putVI(this.parameters.length);
4665
- for (const param of this.parameters) {
4666
- payload.putKeyValuePair(param.toKeyValuePair());
4667
- }
4623
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4668
4624
  const payloadBytes = payload.toUint8Array();
4669
4625
  if (payloadBytes.length > 65535) {
4670
4626
  throw new LengthExceedsMaxError("SubscribeNamespace::serialize(payloadBytes.length)", 65535, payloadBytes.length);
@@ -4678,10 +4634,7 @@ var SubscribeNamespace = class _SubscribeNamespace {
4678
4634
  const trackNamespacePrefix = buf.getTuple();
4679
4635
  const subscribeOptions = Number(buf.getVI());
4680
4636
  const paramCount = buf.getNumberVI();
4681
- const rawParams = new Array(paramCount);
4682
- for (let i = 0; i < paramCount; i++) {
4683
- rawParams[i] = buf.getKeyValuePair();
4684
- }
4637
+ const rawParams = deserializeKvpList(buf, paramCount);
4685
4638
  const parameters = MessageParameters.fromKeyValuePairs(rawParams);
4686
4639
  return new _SubscribeNamespace(requestId, trackNamespacePrefix, subscribeOptions, parameters);
4687
4640
  }
@@ -4732,9 +4685,7 @@ var RequestOk = class _RequestOk {
4732
4685
  const payload = new ByteBuffer();
4733
4686
  payload.putVI(this.requestId);
4734
4687
  payload.putVI(BigInt(this.parameters.length));
4735
- for (const param of this.parameters) {
4736
- payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
4737
- }
4688
+ payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
4738
4689
  const payloadBytes = payload.toUint8Array();
4739
4690
  if (payloadBytes.length > 65535) {
4740
4691
  throw new LengthExceedsMaxError("RequestOk::serialize(payloadBytes)", 65535, payloadBytes.length);
@@ -4751,8 +4702,7 @@ var RequestOk = class _RequestOk {
4751
4702
  throw new CastingError("RequestOk.parsePayload numParams", "bigint", "number", `${numParamsBig}`);
4752
4703
  }
4753
4704
  const parameters = [];
4754
- for (let i = 0; i < numParams; i++) {
4755
- const kvp = KeyValuePair.deserialize(buf);
4705
+ for (const kvp of deserializeKvpList(buf, numParams)) {
4756
4706
  const param = exports.MessageParameter.fromKeyValuePair(kvp);
4757
4707
  if (param !== void 0) parameters.push(param);
4758
4708
  }
@@ -5095,6 +5045,8 @@ exports.VideoConfig = VideoConfig;
5095
5045
  exports.VideoFrameMarking = VideoFrameMarking;
5096
5046
  exports.applyMessageParameterUpdate = applyMessageParameterUpdate;
5097
5047
  exports.controlMessageTypeFromBigInt = controlMessageTypeFromBigInt;
5048
+ exports.deserializeKvpList = deserializeKvpList;
5049
+ exports.deserializeKvpListUntilEmpty = deserializeKvpListUntilEmpty;
5098
5050
  exports.fetchTypeFromBigInt = fetchTypeFromBigInt;
5099
5051
  exports.filterTypeFromBigInt = filterTypeFromBigInt;
5100
5052
  exports.groupOrderFromNumber = groupOrderFromNumber;
@@ -5104,6 +5056,7 @@ exports.locHeaderExtensionIdFromNumber = locHeaderExtensionIdFromNumber;
5104
5056
  exports.messageParameterTypeFromNumber = messageParameterTypeFromNumber;
5105
5057
  exports.publishDoneStatusCodeFromBigInt = publishDoneStatusCodeFromBigInt;
5106
5058
  exports.requestErrorCodeFromBigInt = requestErrorCodeFromBigInt;
5059
+ exports.serializeKvpList = serializeKvpList;
5107
5060
  exports.setupParameterTypeFromNumber = setupParameterTypeFromNumber;
5108
5061
  exports.tokenAliasTypeFromNumber = tokenAliasTypeFromNumber;
5109
5062
  exports.trackStatusCodeFromBigInt = trackStatusCodeFromBigInt;