moqtail 0.10.1 → 0.12.0
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 +155 -184
- package/dist/client.d.cts +9 -12
- package/dist/client.d.ts +9 -12
- package/dist/client.js +155 -184
- package/dist/index.cjs +158 -184
- package/dist/index.d.cts +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +156 -185
- package/dist/model.cjs +139 -174
- package/dist/model.d.cts +2 -2
- package/dist/model.d.ts +2 -2
- package/dist/model.js +137 -175
- package/dist/{setup_parameter-BOeGq6Mv.d.cts → setup_parameter-BgNrJRDS.d.cts} +35 -1
- package/dist/{setup_parameter-BOeGq6Mv.d.ts → setup_parameter-BgNrJRDS.d.ts} +35 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -129,6 +129,7 @@ var TerminationError = class extends MOQtailError {
|
|
|
129
129
|
|
|
130
130
|
// src/model/common/pair.ts
|
|
131
131
|
var MAX_VALUE_LENGTH = 2 ** 16 - 1;
|
|
132
|
+
var MAX_U64 = 2n ** 64n - 1n;
|
|
132
133
|
var KeyValuePair = class _KeyValuePair {
|
|
133
134
|
/**
|
|
134
135
|
* The key/type identifier for this pair.
|
|
@@ -188,11 +189,29 @@ var KeyValuePair = class _KeyValuePair {
|
|
|
188
189
|
}
|
|
189
190
|
/**
|
|
190
191
|
* Serializes this key-value pair to a frozen byte buffer.
|
|
192
|
+
* Equivalent to {@link KeyValuePair.serializeDelta} with `prevType = 0n`.
|
|
191
193
|
* @returns The serialized buffer.
|
|
192
194
|
*/
|
|
193
195
|
serialize() {
|
|
196
|
+
return this.serializeDelta(0n);
|
|
197
|
+
}
|
|
198
|
+
/**
|
|
199
|
+
* Serializes this pair's wire form, encoding the Type as a delta from
|
|
200
|
+
* `prevType` (the type of the previous KVP in the same list, or 0n if this
|
|
201
|
+
* is the first entry).
|
|
202
|
+
* @param prevType - The type of the previous KVP in the same list.
|
|
203
|
+
* @throws ProtocolViolationError if this pair's type is less than prevType
|
|
204
|
+
* (Delta Type is an unsigned varint, so the list must be sorted ascending).
|
|
205
|
+
*/
|
|
206
|
+
serializeDelta(prevType) {
|
|
207
|
+
if (this.typeValue < prevType) {
|
|
208
|
+
throw new ProtocolViolationError(
|
|
209
|
+
"KeyValuePair.serializeDelta",
|
|
210
|
+
`type ${this.typeValue} is less than previous type ${prevType}; a KVP list must be sorted by ascending type to be delta-encoded`
|
|
211
|
+
);
|
|
212
|
+
}
|
|
194
213
|
const buf = new ByteBuffer();
|
|
195
|
-
buf.putVI(this.typeValue);
|
|
214
|
+
buf.putVI(this.typeValue - prevType);
|
|
196
215
|
if (isVarInt(this)) {
|
|
197
216
|
buf.putVI(this.value);
|
|
198
217
|
} else if (isBytes(this)) {
|
|
@@ -202,13 +221,32 @@ var KeyValuePair = class _KeyValuePair {
|
|
|
202
221
|
}
|
|
203
222
|
/**
|
|
204
223
|
* Deserializes a KeyValuePair from a buffer.
|
|
224
|
+
* Equivalent to {@link KeyValuePair.deserializeDelta} with `prevType = 0n`.
|
|
205
225
|
* @param buf - The buffer to read from.
|
|
206
226
|
* @returns The deserialized KeyValuePair.
|
|
207
227
|
* @throws LengthExceedsMaxError if blob length exceeds 65535 bytes.
|
|
208
228
|
* @throws NotEnoughBytesError if buffer does not contain enough bytes.
|
|
209
229
|
*/
|
|
210
230
|
static deserialize(buf) {
|
|
211
|
-
|
|
231
|
+
return _KeyValuePair.deserializeDelta(buf, 0n);
|
|
232
|
+
}
|
|
233
|
+
/**
|
|
234
|
+
* Deserializes a wire-form KVP whose Type field is a delta from `prevType`
|
|
235
|
+
* (the type of the previous KVP in the same list, or 0n if this is the
|
|
236
|
+
* first entry).
|
|
237
|
+
* @param buf - The buffer to read from.
|
|
238
|
+
* @param prevType - The type of the previous KVP in the same list.
|
|
239
|
+
* @throws ProtocolViolationError if prevType + delta exceeds 2^64 - 1.
|
|
240
|
+
*/
|
|
241
|
+
static deserializeDelta(buf, prevType) {
|
|
242
|
+
const deltaType = buf.getVI();
|
|
243
|
+
const typeValue = prevType + deltaType;
|
|
244
|
+
if (typeValue > MAX_U64) {
|
|
245
|
+
throw new ProtocolViolationError(
|
|
246
|
+
"KeyValuePair.deserializeDelta",
|
|
247
|
+
`previous type ${prevType} plus delta type ${deltaType} exceeds 2^64 - 1`
|
|
248
|
+
);
|
|
249
|
+
}
|
|
212
250
|
if (typeValue % 2n === 0n) {
|
|
213
251
|
const value = buf.getVI();
|
|
214
252
|
return new _KeyValuePair(typeValue, value);
|
|
@@ -243,6 +281,37 @@ var KeyValuePair = class _KeyValuePair {
|
|
|
243
281
|
return false;
|
|
244
282
|
}
|
|
245
283
|
};
|
|
284
|
+
function serializeKvpList(items) {
|
|
285
|
+
const sorted = [...items].sort((a, b) => a.typeValue < b.typeValue ? -1 : a.typeValue > b.typeValue ? 1 : 0);
|
|
286
|
+
const buf = new ByteBuffer();
|
|
287
|
+
let prevType = 0n;
|
|
288
|
+
for (const kvp of sorted) {
|
|
289
|
+
buf.putBytes(kvp.serializeDelta(prevType).toUint8Array());
|
|
290
|
+
prevType = kvp.typeValue;
|
|
291
|
+
}
|
|
292
|
+
return buf.freeze();
|
|
293
|
+
}
|
|
294
|
+
function deserializeKvpList(buf, count) {
|
|
295
|
+
const n = typeof count === "bigint" ? Number(count) : count;
|
|
296
|
+
const items = new Array(n);
|
|
297
|
+
let prevType = 0n;
|
|
298
|
+
for (let i = 0; i < n; i++) {
|
|
299
|
+
const kvp = KeyValuePair.deserializeDelta(buf, prevType);
|
|
300
|
+
prevType = kvp.typeValue;
|
|
301
|
+
items[i] = kvp;
|
|
302
|
+
}
|
|
303
|
+
return items;
|
|
304
|
+
}
|
|
305
|
+
function deserializeKvpListUntilEmpty(buf) {
|
|
306
|
+
const items = [];
|
|
307
|
+
let prevType = 0n;
|
|
308
|
+
while (buf.remaining > 0) {
|
|
309
|
+
const kvp = KeyValuePair.deserializeDelta(buf, prevType);
|
|
310
|
+
prevType = kvp.typeValue;
|
|
311
|
+
items.push(kvp);
|
|
312
|
+
}
|
|
313
|
+
return items;
|
|
314
|
+
}
|
|
246
315
|
function isVarInt(pair) {
|
|
247
316
|
return pair.typeValue % 2n === 0n;
|
|
248
317
|
}
|
|
@@ -845,13 +914,7 @@ var Datagram = class _Datagram {
|
|
|
845
914
|
buf.putU8(this.publisherPriority);
|
|
846
915
|
}
|
|
847
916
|
if (ObjectDatagramType.hasExtensions(this.type)) {
|
|
848
|
-
const
|
|
849
|
-
if (this.extensionHeaders) {
|
|
850
|
-
for (const header of this.extensionHeaders) {
|
|
851
|
-
extBuf.putKeyValuePair(header);
|
|
852
|
-
}
|
|
853
|
-
}
|
|
854
|
-
const extBytes = extBuf.toUint8Array();
|
|
917
|
+
const extBytes = this.extensionHeaders ? serializeKvpList(this.extensionHeaders).toUint8Array() : new Uint8Array(0);
|
|
855
918
|
buf.putLengthPrefixedBytes(extBytes);
|
|
856
919
|
}
|
|
857
920
|
if (ObjectDatagramType.isStatus(this.type)) {
|
|
@@ -882,10 +945,7 @@ var Datagram = class _Datagram {
|
|
|
882
945
|
if (ObjectDatagramType.hasExtensions(msgType)) {
|
|
883
946
|
const extBytes = buf.getLengthPrefixedBytes();
|
|
884
947
|
const headerBytes = new FrozenByteBuffer5(extBytes);
|
|
885
|
-
extensionHeaders =
|
|
886
|
-
while (headerBytes.remaining > 0) {
|
|
887
|
-
extensionHeaders.push(headerBytes.getKeyValuePair());
|
|
888
|
-
}
|
|
948
|
+
extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
|
|
889
949
|
}
|
|
890
950
|
let payload = null;
|
|
891
951
|
let objectStatus = null;
|
|
@@ -1057,9 +1117,7 @@ var FetchObject = class _FetchObject {
|
|
|
1057
1117
|
if (hasObjectId) buf.putVI(this.objectId);
|
|
1058
1118
|
if (hasPriority) buf.putU8(this.publisherPriority);
|
|
1059
1119
|
if (hasExtensions) {
|
|
1060
|
-
|
|
1061
|
-
for (const h of this.extensionHeaders) extBuf.putKeyValuePair(h);
|
|
1062
|
-
buf.putLengthPrefixedBytes(extBuf.toUint8Array());
|
|
1120
|
+
buf.putLengthPrefixedBytes(serializeKvpList(this.extensionHeaders).toUint8Array());
|
|
1063
1121
|
}
|
|
1064
1122
|
const payloadBytes = this.payload ?? new Uint8Array(0);
|
|
1065
1123
|
buf.putLengthPrefixedBytes(payloadBytes);
|
|
@@ -1145,10 +1203,7 @@ var FetchObject = class _FetchObject {
|
|
|
1145
1203
|
if (hasExtensions) {
|
|
1146
1204
|
const extLen = buf.getNumberVI();
|
|
1147
1205
|
const headerBytes = new FrozenByteBuffer5(buf.getBytes(extLen));
|
|
1148
|
-
extensionHeaders =
|
|
1149
|
-
while (headerBytes.remaining > 0) {
|
|
1150
|
-
extensionHeaders.push(headerBytes.getKeyValuePair());
|
|
1151
|
-
}
|
|
1206
|
+
extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
|
|
1152
1207
|
}
|
|
1153
1208
|
const payloadLen = buf.getNumberVI();
|
|
1154
1209
|
const payload = buf.getBytes(payloadLen);
|
|
@@ -1812,26 +1867,18 @@ var ImmutableExtensionsExtension = class _ImmutableExtensionsExtension {
|
|
|
1812
1867
|
extensions;
|
|
1813
1868
|
static TYPE = 11 /* ImmutableExtensions */;
|
|
1814
1869
|
toKeyValuePair() {
|
|
1815
|
-
|
|
1816
|
-
for (const kvp of this.extensions) {
|
|
1817
|
-
inner.putBytes(kvp.serialize().toUint8Array());
|
|
1818
|
-
}
|
|
1819
|
-
return KeyValuePair.tryNewBytes(_ImmutableExtensionsExtension.TYPE, inner.toUint8Array());
|
|
1870
|
+
return KeyValuePair.tryNewBytes(_ImmutableExtensionsExtension.TYPE, serializeKvpList(this.extensions).toUint8Array());
|
|
1820
1871
|
}
|
|
1821
1872
|
static fromKeyValuePair(pair) {
|
|
1822
1873
|
if (Number(pair.typeValue) !== _ImmutableExtensionsExtension.TYPE || !(pair.value instanceof Uint8Array))
|
|
1823
1874
|
return void 0;
|
|
1824
1875
|
const buf = new FrozenByteBuffer5(pair.value);
|
|
1825
|
-
const extensions =
|
|
1826
|
-
|
|
1827
|
-
|
|
1828
|
-
|
|
1829
|
-
|
|
1830
|
-
|
|
1831
|
-
"ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
|
|
1832
|
-
);
|
|
1833
|
-
}
|
|
1834
|
-
extensions.push(inner);
|
|
1876
|
+
const extensions = deserializeKvpListUntilEmpty(buf);
|
|
1877
|
+
if (extensions.some((inner) => Number(inner.typeValue) === 11 /* ImmutableExtensions */)) {
|
|
1878
|
+
throw new ProtocolViolationError(
|
|
1879
|
+
"ImmutableExtensionsExtension.fromKeyValuePair",
|
|
1880
|
+
"ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
|
|
1881
|
+
);
|
|
1835
1882
|
}
|
|
1836
1883
|
return new _ImmutableExtensionsExtension(extensions);
|
|
1837
1884
|
}
|
|
@@ -1918,18 +1965,11 @@ var TrackExtension;
|
|
|
1918
1965
|
}
|
|
1919
1966
|
TrackExtension2.toKeyValuePair = toKeyValuePair;
|
|
1920
1967
|
function deserializeAll(buf) {
|
|
1921
|
-
|
|
1922
|
-
while (buf.remaining > 0) {
|
|
1923
|
-
const kvp = KeyValuePair.deserialize(buf);
|
|
1924
|
-
result.push(fromKeyValuePair(kvp));
|
|
1925
|
-
}
|
|
1926
|
-
return result;
|
|
1968
|
+
return deserializeKvpListUntilEmpty(buf).map(fromKeyValuePair);
|
|
1927
1969
|
}
|
|
1928
1970
|
TrackExtension2.deserializeAll = deserializeAll;
|
|
1929
1971
|
function serializeInto(exts, payload) {
|
|
1930
|
-
|
|
1931
|
-
payload.putBytes(ext.toKeyValuePair().serialize().toUint8Array());
|
|
1932
|
-
}
|
|
1972
|
+
payload.putBytes(serializeKvpList(exts.map((ext) => ext.toKeyValuePair())).toUint8Array());
|
|
1933
1973
|
}
|
|
1934
1974
|
TrackExtension2.serializeInto = serializeInto;
|
|
1935
1975
|
function isDeliveryTimeout(ext) {
|
|
@@ -1970,26 +2010,21 @@ var ImmutableExtensionsObjectExtension = class _ImmutableExtensionsObjectExtensi
|
|
|
1970
2010
|
extensions;
|
|
1971
2011
|
static TYPE = 11 /* ImmutableExtensions */;
|
|
1972
2012
|
toKeyValuePair() {
|
|
1973
|
-
|
|
1974
|
-
|
|
1975
|
-
|
|
1976
|
-
|
|
1977
|
-
return KeyValuePair.tryNewBytes(_ImmutableExtensionsObjectExtension.TYPE, inner.toUint8Array());
|
|
2013
|
+
return KeyValuePair.tryNewBytes(
|
|
2014
|
+
_ImmutableExtensionsObjectExtension.TYPE,
|
|
2015
|
+
serializeKvpList(this.extensions).toUint8Array()
|
|
2016
|
+
);
|
|
1978
2017
|
}
|
|
1979
2018
|
static fromKeyValuePair(pair) {
|
|
1980
2019
|
if (Number(pair.typeValue) !== _ImmutableExtensionsObjectExtension.TYPE || !(pair.value instanceof Uint8Array))
|
|
1981
2020
|
return void 0;
|
|
1982
2021
|
const buf = new FrozenByteBuffer5(pair.value);
|
|
1983
|
-
const extensions =
|
|
1984
|
-
|
|
1985
|
-
|
|
1986
|
-
|
|
1987
|
-
|
|
1988
|
-
|
|
1989
|
-
"ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
|
|
1990
|
-
);
|
|
1991
|
-
}
|
|
1992
|
-
extensions.push(inner);
|
|
2022
|
+
const extensions = deserializeKvpListUntilEmpty(buf);
|
|
2023
|
+
if (extensions.some((inner) => Number(inner.typeValue) === 11 /* ImmutableExtensions */)) {
|
|
2024
|
+
throw new ProtocolViolationError(
|
|
2025
|
+
"ImmutableExtensionsObjectExtension.fromKeyValuePair",
|
|
2026
|
+
"ImmutableExtensions must not contain nested ImmutableExtensions (0x0B)"
|
|
2027
|
+
);
|
|
1993
2028
|
}
|
|
1994
2029
|
return new _ImmutableExtensionsObjectExtension(extensions);
|
|
1995
2030
|
}
|
|
@@ -2042,18 +2077,11 @@ var ObjectExtension;
|
|
|
2042
2077
|
}
|
|
2043
2078
|
ObjectExtension2.toKeyValuePair = toKeyValuePair;
|
|
2044
2079
|
function deserializeAll(buf) {
|
|
2045
|
-
|
|
2046
|
-
while (buf.remaining > 0) {
|
|
2047
|
-
const kvp = KeyValuePair.deserialize(buf);
|
|
2048
|
-
result.push(fromKeyValuePair(kvp));
|
|
2049
|
-
}
|
|
2050
|
-
return result;
|
|
2080
|
+
return deserializeKvpListUntilEmpty(buf).map(fromKeyValuePair);
|
|
2051
2081
|
}
|
|
2052
2082
|
ObjectExtension2.deserializeAll = deserializeAll;
|
|
2053
2083
|
function serializeInto(exts, payload) {
|
|
2054
|
-
|
|
2055
|
-
payload.putBytes(ext.toKeyValuePair().serialize().toUint8Array());
|
|
2056
|
-
}
|
|
2084
|
+
payload.putBytes(serializeKvpList(exts.map((ext) => ext.toKeyValuePair())).toUint8Array());
|
|
2057
2085
|
}
|
|
2058
2086
|
ObjectExtension2.serializeInto = serializeInto;
|
|
2059
2087
|
function isImmutableExtensions(ext) {
|
|
@@ -2075,6 +2103,12 @@ var ObjectExtension;
|
|
|
2075
2103
|
})(ObjectExtension || (ObjectExtension = {}));
|
|
2076
2104
|
|
|
2077
2105
|
// src/model/data/subgroup_object.ts
|
|
2106
|
+
function normalizeExtensionHeaders(extensionHeaders) {
|
|
2107
|
+
if (extensionHeaders === null || extensionHeaders.length === 0) {
|
|
2108
|
+
return null;
|
|
2109
|
+
}
|
|
2110
|
+
return extensionHeaders;
|
|
2111
|
+
}
|
|
2078
2112
|
var SubgroupObject = class _SubgroupObject {
|
|
2079
2113
|
constructor(objectId, extensionHeaders, objectStatus, payload) {
|
|
2080
2114
|
this.extensionHeaders = extensionHeaders;
|
|
@@ -2087,22 +2121,17 @@ var SubgroupObject = class _SubgroupObject {
|
|
|
2087
2121
|
payload;
|
|
2088
2122
|
objectId;
|
|
2089
2123
|
static newWithStatus(objectId, extensionHeaders, objectStatus) {
|
|
2090
|
-
return new _SubgroupObject(objectId, extensionHeaders, objectStatus, null);
|
|
2124
|
+
return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), objectStatus, null);
|
|
2091
2125
|
}
|
|
2092
2126
|
static newWithPayload(objectId, extensionHeaders, payload) {
|
|
2093
|
-
return new _SubgroupObject(objectId, extensionHeaders, null, payload);
|
|
2127
|
+
return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), null, payload);
|
|
2094
2128
|
}
|
|
2095
2129
|
serialize(previousObjectId) {
|
|
2096
2130
|
let objectIdDelta = previousObjectId ? this.objectId - previousObjectId - BigInt(1) : this.objectId;
|
|
2097
2131
|
const buf = new ByteBuffer();
|
|
2098
2132
|
buf.putVI(objectIdDelta);
|
|
2099
|
-
|
|
2100
|
-
|
|
2101
|
-
for (const header of this.extensionHeaders) {
|
|
2102
|
-
extensionHeaders.putKeyValuePair(header);
|
|
2103
|
-
}
|
|
2104
|
-
const headerBytes = extensionHeaders.toUint8Array();
|
|
2105
|
-
buf.putLengthPrefixedBytes(headerBytes);
|
|
2133
|
+
if (this.extensionHeaders !== null) {
|
|
2134
|
+
buf.putLengthPrefixedBytes(serializeKvpList(this.extensionHeaders).toUint8Array());
|
|
2106
2135
|
}
|
|
2107
2136
|
if (this.payload) {
|
|
2108
2137
|
buf.putLengthPrefixedBytes(this.payload);
|
|
@@ -2117,12 +2146,9 @@ var SubgroupObject = class _SubgroupObject {
|
|
|
2117
2146
|
let objectId = previousObjectId !== void 0 ? previousObjectId + objectDelta + BigInt(1) : objectDelta;
|
|
2118
2147
|
let extensionHeaders = null;
|
|
2119
2148
|
if (hasExtensions) {
|
|
2120
|
-
extensionHeaders = [];
|
|
2121
2149
|
const extLen = buf.getNumberVI();
|
|
2122
2150
|
const headerBytes = new FrozenByteBuffer5(buf.getBytes(extLen));
|
|
2123
|
-
|
|
2124
|
-
extensionHeaders.push(headerBytes.getKeyValuePair());
|
|
2125
|
-
}
|
|
2151
|
+
extensionHeaders = deserializeKvpListUntilEmpty(headerBytes);
|
|
2126
2152
|
}
|
|
2127
2153
|
const payloadLen = buf.getNumberVI();
|
|
2128
2154
|
let objectStatus = null;
|
|
@@ -2132,7 +2158,7 @@ var SubgroupObject = class _SubgroupObject {
|
|
|
2132
2158
|
} else {
|
|
2133
2159
|
payload = buf.getBytes(payloadLen);
|
|
2134
2160
|
}
|
|
2135
|
-
return new _SubgroupObject(objectId, extensionHeaders, objectStatus, payload);
|
|
2161
|
+
return new _SubgroupObject(objectId, normalizeExtensionHeaders(extensionHeaders), objectStatus, payload);
|
|
2136
2162
|
}
|
|
2137
2163
|
};
|
|
2138
2164
|
|
|
@@ -3353,9 +3379,7 @@ var PublishNamespace = class _PublishNamespace {
|
|
|
3353
3379
|
payload.putVI(this.requestId);
|
|
3354
3380
|
payload.putTuple(this.trackNamespace);
|
|
3355
3381
|
payload.putVI(this.parameters.length);
|
|
3356
|
-
|
|
3357
|
-
payload.putKeyValuePair(param.toKeyValuePair());
|
|
3358
|
-
}
|
|
3382
|
+
payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
3359
3383
|
const payloadBytes = payload.toUint8Array();
|
|
3360
3384
|
if (payloadBytes.length > 65535) {
|
|
3361
3385
|
throw new LengthExceedsMaxError("PublishNamespace::serialize(payloadBytes.length)", 65535, payloadBytes.length);
|
|
@@ -3376,10 +3400,7 @@ var PublishNamespace = class _PublishNamespace {
|
|
|
3376
3400
|
const requestId = buf.getVI();
|
|
3377
3401
|
const trackNamespace = buf.getTuple();
|
|
3378
3402
|
const paramCount = buf.getNumberVI();
|
|
3379
|
-
const rawParams =
|
|
3380
|
-
for (let i = 0; i < paramCount; i++) {
|
|
3381
|
-
rawParams[i] = buf.getKeyValuePair();
|
|
3382
|
-
}
|
|
3403
|
+
const rawParams = deserializeKvpList(buf, paramCount);
|
|
3383
3404
|
const parameters = MessageParameters.fromKeyValuePairs(rawParams);
|
|
3384
3405
|
return new _PublishNamespace(requestId, trackNamespace, parameters);
|
|
3385
3406
|
}
|
|
@@ -3496,9 +3517,7 @@ var ClientSetup = class _ClientSetup {
|
|
|
3496
3517
|
buf.putVI(32 /* ClientSetup */);
|
|
3497
3518
|
const payload = new ByteBuffer();
|
|
3498
3519
|
payload.putVI(this.setupParameters.length);
|
|
3499
|
-
|
|
3500
|
-
payload.putKeyValuePair(param);
|
|
3501
|
-
}
|
|
3520
|
+
payload.putBytes(serializeKvpList(this.setupParameters).toUint8Array());
|
|
3502
3521
|
const payloadBytes = payload.toUint8Array();
|
|
3503
3522
|
if (payloadBytes.length > 65535) {
|
|
3504
3523
|
throw new LengthExceedsMaxError("ClientSetup::serialize(payload_length)", 65535, payloadBytes.length);
|
|
@@ -3509,10 +3528,7 @@ var ClientSetup = class _ClientSetup {
|
|
|
3509
3528
|
}
|
|
3510
3529
|
static parsePayload(buf) {
|
|
3511
3530
|
const paramCount = buf.getNumberVI();
|
|
3512
|
-
const setupParameters =
|
|
3513
|
-
for (let i = 0; i < paramCount; i++) {
|
|
3514
|
-
setupParameters[i] = buf.getKeyValuePair();
|
|
3515
|
-
}
|
|
3531
|
+
const setupParameters = deserializeKvpList(buf, paramCount);
|
|
3516
3532
|
return new _ClientSetup(setupParameters);
|
|
3517
3533
|
}
|
|
3518
3534
|
};
|
|
@@ -3551,9 +3567,7 @@ var Fetch = class _Fetch {
|
|
|
3551
3567
|
}
|
|
3552
3568
|
}
|
|
3553
3569
|
payload.putVI(this.parameters.length);
|
|
3554
|
-
|
|
3555
|
-
payload.putKeyValuePair(param.toKeyValuePair());
|
|
3556
|
-
}
|
|
3570
|
+
payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
3557
3571
|
const payloadBytes = payload.toUint8Array();
|
|
3558
3572
|
if (payloadBytes.length > 65535) {
|
|
3559
3573
|
throw new LengthExceedsMaxError("Fetch::serialize(payload_length)", 65535, payloadBytes.length);
|
|
@@ -3592,10 +3606,7 @@ var Fetch = class _Fetch {
|
|
|
3592
3606
|
throw new Error(`Unknown fetch type: ${fetchType}`);
|
|
3593
3607
|
}
|
|
3594
3608
|
const paramCount = buf.getNumberVI();
|
|
3595
|
-
const rawParams =
|
|
3596
|
-
for (let i = 0; i < paramCount; i++) {
|
|
3597
|
-
rawParams[i] = buf.getKeyValuePair();
|
|
3598
|
-
}
|
|
3609
|
+
const rawParams = deserializeKvpList(buf, paramCount);
|
|
3599
3610
|
const parameters = MessageParameters.fromKeyValuePairs(rawParams);
|
|
3600
3611
|
return new _Fetch(requestId, props, parameters);
|
|
3601
3612
|
}
|
|
@@ -3651,9 +3662,7 @@ var FetchOk = class _FetchOk {
|
|
|
3651
3662
|
payload.putU8(this.endOfTrack ? 1 : 0);
|
|
3652
3663
|
payload.putLocation(this.endLocation);
|
|
3653
3664
|
payload.putVI(this.parameters.length);
|
|
3654
|
-
|
|
3655
|
-
payload.putKeyValuePair(param.toKeyValuePair());
|
|
3656
|
-
}
|
|
3665
|
+
payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
3657
3666
|
TrackExtension.serializeInto(this.trackExtensions, payload);
|
|
3658
3667
|
const payloadBytes = payload.toUint8Array();
|
|
3659
3668
|
if (payloadBytes.length > 65535) {
|
|
@@ -3682,10 +3691,7 @@ var FetchOk = class _FetchOk {
|
|
|
3682
3691
|
}
|
|
3683
3692
|
const endLocation = buf.getLocation();
|
|
3684
3693
|
const paramCount = buf.getNumberVI();
|
|
3685
|
-
const rawParams =
|
|
3686
|
-
for (let i = 0; i < paramCount; i++) {
|
|
3687
|
-
rawParams[i] = buf.getKeyValuePair();
|
|
3688
|
-
}
|
|
3694
|
+
const rawParams = deserializeKvpList(buf, paramCount);
|
|
3689
3695
|
const parameters = MessageParameters.fromKeyValuePairs(rawParams);
|
|
3690
3696
|
const trackExtensions = TrackExtension.deserializeAll(buf);
|
|
3691
3697
|
return new _FetchOk(requestId, endOfTrack, endLocation, parameters, trackExtensions);
|
|
@@ -3797,9 +3803,7 @@ var ServerSetup = class _ServerSetup {
|
|
|
3797
3803
|
buf.putVI(33 /* ServerSetup */);
|
|
3798
3804
|
const payload = new ByteBuffer();
|
|
3799
3805
|
payload.putVI(this.setupParameters.length);
|
|
3800
|
-
|
|
3801
|
-
payload.putKeyValuePair(param);
|
|
3802
|
-
}
|
|
3806
|
+
payload.putBytes(serializeKvpList(this.setupParameters).toUint8Array());
|
|
3803
3807
|
const payloadBytes = payload.toUint8Array();
|
|
3804
3808
|
if (payloadBytes.length > 65535) {
|
|
3805
3809
|
throw new LengthExceedsMaxError("ServerSetup::serialize(payloadBytes.length)", 65535, payloadBytes.length);
|
|
@@ -3810,10 +3814,7 @@ var ServerSetup = class _ServerSetup {
|
|
|
3810
3814
|
}
|
|
3811
3815
|
static parsePayload(buf) {
|
|
3812
3816
|
const paramCount = buf.getNumberVI();
|
|
3813
|
-
const setupParameters =
|
|
3814
|
-
for (let i = 0; i < paramCount; i++) {
|
|
3815
|
-
setupParameters[i] = buf.getKeyValuePair();
|
|
3816
|
-
}
|
|
3817
|
+
const setupParameters = deserializeKvpList(buf, paramCount);
|
|
3817
3818
|
return new _ServerSetup(setupParameters);
|
|
3818
3819
|
}
|
|
3819
3820
|
};
|
|
@@ -3856,9 +3857,7 @@ var Subscribe = class _Subscribe {
|
|
|
3856
3857
|
payload.putVI(this.requestId);
|
|
3857
3858
|
payload.putBytes(this.fullTrackName.serialize().toUint8Array());
|
|
3858
3859
|
payload.putVI(this.parameters.length);
|
|
3859
|
-
|
|
3860
|
-
payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
|
|
3861
|
-
}
|
|
3860
|
+
payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
3862
3861
|
const payloadBytes = payload.toUint8Array();
|
|
3863
3862
|
buf.putU16(payloadBytes.length);
|
|
3864
3863
|
buf.putBytes(payloadBytes);
|
|
@@ -3869,8 +3868,7 @@ var Subscribe = class _Subscribe {
|
|
|
3869
3868
|
const fullTrackName = buf.getFullTrackName();
|
|
3870
3869
|
const paramCount = Number(buf.getVI());
|
|
3871
3870
|
const parameters = [];
|
|
3872
|
-
for (
|
|
3873
|
-
const kvp = KeyValuePair.deserialize(buf);
|
|
3871
|
+
for (const kvp of deserializeKvpList(buf, paramCount)) {
|
|
3874
3872
|
const param = MessageParameter.fromKeyValuePair(kvp);
|
|
3875
3873
|
if (param !== void 0) parameters.push(param);
|
|
3876
3874
|
}
|
|
@@ -3947,9 +3945,7 @@ var Publish = class _Publish {
|
|
|
3947
3945
|
payload.putBytes(this.fullTrackName.serialize().toUint8Array());
|
|
3948
3946
|
payload.putVI(this.trackAlias);
|
|
3949
3947
|
payload.putVI(this.parameters.length);
|
|
3950
|
-
|
|
3951
|
-
payload.putKeyValuePair(param.toKeyValuePair());
|
|
3952
|
-
}
|
|
3948
|
+
payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
3953
3949
|
TrackExtension.serializeInto(this.trackExtensions, payload);
|
|
3954
3950
|
const payloadBytes = payload.toUint8Array();
|
|
3955
3951
|
if (payloadBytes.length > 65535) {
|
|
@@ -3964,10 +3960,7 @@ var Publish = class _Publish {
|
|
|
3964
3960
|
const fullTrackName = buf.getFullTrackName();
|
|
3965
3961
|
const trackAlias = buf.getVI();
|
|
3966
3962
|
const paramCount = buf.getNumberVI();
|
|
3967
|
-
const rawParams =
|
|
3968
|
-
for (let i = 0; i < paramCount; i++) {
|
|
3969
|
-
rawParams[i] = buf.getKeyValuePair();
|
|
3970
|
-
}
|
|
3963
|
+
const rawParams = deserializeKvpList(buf, paramCount);
|
|
3971
3964
|
const parameters = MessageParameters.fromKeyValuePairs(rawParams);
|
|
3972
3965
|
const trackExtensions = TrackExtension.deserializeAll(buf);
|
|
3973
3966
|
return new _Publish(requestId, fullTrackName, trackAlias, parameters, trackExtensions);
|
|
@@ -3991,9 +3984,7 @@ var PublishOk = class _PublishOk {
|
|
|
3991
3984
|
const payload = new ByteBuffer();
|
|
3992
3985
|
payload.putVI(this.requestId);
|
|
3993
3986
|
payload.putVI(this.parameters.length);
|
|
3994
|
-
|
|
3995
|
-
payload.putKeyValuePair(param.toKeyValuePair());
|
|
3996
|
-
}
|
|
3987
|
+
payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
3997
3988
|
const payloadBytes = payload.toUint8Array();
|
|
3998
3989
|
if (payloadBytes.length > 65535) {
|
|
3999
3990
|
throw new LengthExceedsMaxError("PublishOk::serialize(payloadBytes.length)", 65535, payloadBytes.length);
|
|
@@ -4005,10 +3996,7 @@ var PublishOk = class _PublishOk {
|
|
|
4005
3996
|
static parsePayload(buf) {
|
|
4006
3997
|
const requestId = buf.getVI();
|
|
4007
3998
|
const paramCount = buf.getVI();
|
|
4008
|
-
const kvps =
|
|
4009
|
-
for (let i = 0; i < paramCount; i++) {
|
|
4010
|
-
kvps.push(buf.getKeyValuePair());
|
|
4011
|
-
}
|
|
3999
|
+
const kvps = deserializeKvpList(buf, paramCount);
|
|
4012
4000
|
const parameters = MessageParameters.fromKeyValuePairs(kvps);
|
|
4013
4001
|
return new _PublishOk(requestId, parameters);
|
|
4014
4002
|
}
|
|
@@ -4036,9 +4024,7 @@ var SubscribeOk = class _SubscribeOk {
|
|
|
4036
4024
|
payload.putVI(this.requestId);
|
|
4037
4025
|
payload.putVI(this.trackAlias);
|
|
4038
4026
|
payload.putVI(this.parameters.length);
|
|
4039
|
-
|
|
4040
|
-
payload.putKeyValuePair(param.toKeyValuePair());
|
|
4041
|
-
}
|
|
4027
|
+
payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
4042
4028
|
TrackExtension.serializeInto(this.trackExtensions, payload);
|
|
4043
4029
|
const payloadBytes = payload.toUint8Array();
|
|
4044
4030
|
if (payloadBytes.length > 65535) {
|
|
@@ -4052,10 +4038,7 @@ var SubscribeOk = class _SubscribeOk {
|
|
|
4052
4038
|
const requestId = buf.getVI();
|
|
4053
4039
|
const trackAlias = buf.getVI();
|
|
4054
4040
|
const paramCount = buf.getNumberVI();
|
|
4055
|
-
const rawParams =
|
|
4056
|
-
for (let i = 0; i < paramCount; i++) {
|
|
4057
|
-
rawParams[i] = buf.getKeyValuePair();
|
|
4058
|
-
}
|
|
4041
|
+
const rawParams = deserializeKvpList(buf, paramCount);
|
|
4059
4042
|
const parameters = MessageParameters.fromKeyValuePairs(rawParams);
|
|
4060
4043
|
const trackExtensions = TrackExtension.deserializeAll(buf);
|
|
4061
4044
|
return new _SubscribeOk(requestId, trackAlias, parameters, trackExtensions);
|
|
@@ -4082,9 +4065,7 @@ var RequestUpdate = class _RequestUpdate {
|
|
|
4082
4065
|
payload.putVI(this.requestId);
|
|
4083
4066
|
payload.putVI(this.existingRequestId);
|
|
4084
4067
|
payload.putVI(this.parameters.length);
|
|
4085
|
-
|
|
4086
|
-
payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
|
|
4087
|
-
}
|
|
4068
|
+
payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
4088
4069
|
const payloadBytes = payload.toUint8Array();
|
|
4089
4070
|
if (payloadBytes.length > 65535) {
|
|
4090
4071
|
throw new LengthExceedsMaxError("RequestUpdate::serialize(payloadBytes)", 65535, payloadBytes.length);
|
|
@@ -4102,8 +4083,7 @@ var RequestUpdate = class _RequestUpdate {
|
|
|
4102
4083
|
throw new CastingError("RequestUpdate.deserialize paramCount", "bigint", "number", `${paramCountBig}`);
|
|
4103
4084
|
}
|
|
4104
4085
|
const parameters = [];
|
|
4105
|
-
for (
|
|
4106
|
-
const kvp = KeyValuePair.deserialize(buf);
|
|
4086
|
+
for (const kvp of deserializeKvpList(buf, paramCount)) {
|
|
4107
4087
|
const param = MessageParameter.fromKeyValuePair(kvp);
|
|
4108
4088
|
if (param !== void 0) parameters.push(param);
|
|
4109
4089
|
}
|
|
@@ -4260,9 +4240,7 @@ var TrackStatus = class _TrackStatus {
|
|
|
4260
4240
|
payload.putVI(this.endGroup);
|
|
4261
4241
|
}
|
|
4262
4242
|
payload.putVI(this.subscribeParameters.length);
|
|
4263
|
-
|
|
4264
|
-
payload.putKeyValuePair(param.toKeyValuePair());
|
|
4265
|
-
}
|
|
4243
|
+
payload.putBytes(serializeKvpList(this.subscribeParameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
4266
4244
|
const payloadBytes = payload.toUint8Array();
|
|
4267
4245
|
buf.putU16(payloadBytes.length);
|
|
4268
4246
|
buf.putBytes(payloadBytes);
|
|
@@ -4285,10 +4263,7 @@ var TrackStatus = class _TrackStatus {
|
|
|
4285
4263
|
endGroup = buf.getVI();
|
|
4286
4264
|
}
|
|
4287
4265
|
const paramCount = Number(buf.getVI());
|
|
4288
|
-
const rawParams =
|
|
4289
|
-
for (let i = 0; i < paramCount; i++) {
|
|
4290
|
-
rawParams[i] = buf.getKeyValuePair();
|
|
4291
|
-
}
|
|
4266
|
+
const rawParams = deserializeKvpList(buf, paramCount);
|
|
4292
4267
|
const subscribeParameters = MessageParameters.fromKeyValuePairs(rawParams);
|
|
4293
4268
|
return new _TrackStatus(
|
|
4294
4269
|
requestId,
|
|
@@ -4406,9 +4381,7 @@ var SubscribeNamespace = class _SubscribeNamespace {
|
|
|
4406
4381
|
payload.putTuple(this.trackNamespacePrefix);
|
|
4407
4382
|
payload.putVI(this.subscribeOptions);
|
|
4408
4383
|
payload.putVI(this.parameters.length);
|
|
4409
|
-
|
|
4410
|
-
payload.putKeyValuePair(param.toKeyValuePair());
|
|
4411
|
-
}
|
|
4384
|
+
payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
4412
4385
|
const payloadBytes = payload.toUint8Array();
|
|
4413
4386
|
if (payloadBytes.length > 65535) {
|
|
4414
4387
|
throw new LengthExceedsMaxError("SubscribeNamespace::serialize(payloadBytes.length)", 65535, payloadBytes.length);
|
|
@@ -4422,10 +4395,7 @@ var SubscribeNamespace = class _SubscribeNamespace {
|
|
|
4422
4395
|
const trackNamespacePrefix = buf.getTuple();
|
|
4423
4396
|
const subscribeOptions = Number(buf.getVI());
|
|
4424
4397
|
const paramCount = buf.getNumberVI();
|
|
4425
|
-
const rawParams =
|
|
4426
|
-
for (let i = 0; i < paramCount; i++) {
|
|
4427
|
-
rawParams[i] = buf.getKeyValuePair();
|
|
4428
|
-
}
|
|
4398
|
+
const rawParams = deserializeKvpList(buf, paramCount);
|
|
4429
4399
|
const parameters = MessageParameters.fromKeyValuePairs(rawParams);
|
|
4430
4400
|
return new _SubscribeNamespace(requestId, trackNamespacePrefix, subscribeOptions, parameters);
|
|
4431
4401
|
}
|
|
@@ -4476,9 +4446,7 @@ var RequestOk = class _RequestOk {
|
|
|
4476
4446
|
const payload = new ByteBuffer();
|
|
4477
4447
|
payload.putVI(this.requestId);
|
|
4478
4448
|
payload.putVI(BigInt(this.parameters.length));
|
|
4479
|
-
|
|
4480
|
-
payload.putBytes(param.toKeyValuePair().serialize().toUint8Array());
|
|
4481
|
-
}
|
|
4449
|
+
payload.putBytes(serializeKvpList(this.parameters.map((p) => p.toKeyValuePair())).toUint8Array());
|
|
4482
4450
|
const payloadBytes = payload.toUint8Array();
|
|
4483
4451
|
if (payloadBytes.length > 65535) {
|
|
4484
4452
|
throw new LengthExceedsMaxError("RequestOk::serialize(payloadBytes)", 65535, payloadBytes.length);
|
|
@@ -4495,8 +4463,7 @@ var RequestOk = class _RequestOk {
|
|
|
4495
4463
|
throw new CastingError("RequestOk.parsePayload numParams", "bigint", "number", `${numParamsBig}`);
|
|
4496
4464
|
}
|
|
4497
4465
|
const parameters = [];
|
|
4498
|
-
for (
|
|
4499
|
-
const kvp = KeyValuePair.deserialize(buf);
|
|
4466
|
+
for (const kvp of deserializeKvpList(buf, numParams)) {
|
|
4500
4467
|
const param = MessageParameter.fromKeyValuePair(kvp);
|
|
4501
4468
|
if (param !== void 0) parameters.push(param);
|
|
4502
4469
|
}
|
|
@@ -4851,9 +4818,7 @@ var Switch = class _Switch {
|
|
|
4851
4818
|
payload.putBytes(this.fullTrackName.serialize().toUint8Array());
|
|
4852
4819
|
payload.putVI(this.subscriptionRequestId);
|
|
4853
4820
|
payload.putVI(this.parameters.length);
|
|
4854
|
-
|
|
4855
|
-
payload.putBytes(param.serialize().toUint8Array());
|
|
4856
|
-
}
|
|
4821
|
+
payload.putBytes(serializeKvpList(this.parameters).toUint8Array());
|
|
4857
4822
|
const payloadBytes = payload.toUint8Array();
|
|
4858
4823
|
buf.putU16(payloadBytes.length);
|
|
4859
4824
|
buf.putBytes(payloadBytes);
|
|
@@ -4864,10 +4829,7 @@ var Switch = class _Switch {
|
|
|
4864
4829
|
const fullTrackName = buf.getFullTrackName();
|
|
4865
4830
|
const subscriptionRequestId = buf.getVI();
|
|
4866
4831
|
const paramCount = Number(buf.getVI());
|
|
4867
|
-
const parameters =
|
|
4868
|
-
for (let i = 0; i < paramCount; i++) {
|
|
4869
|
-
parameters.push(KeyValuePair.deserialize(buf));
|
|
4870
|
-
}
|
|
4832
|
+
const parameters = deserializeKvpList(buf, paramCount);
|
|
4871
4833
|
return new _Switch(requestId, fullTrackName, subscriptionRequestId, parameters);
|
|
4872
4834
|
}
|
|
4873
4835
|
};
|
|
@@ -5615,6 +5577,7 @@ var SubscribeRequest = class {
|
|
|
5615
5577
|
priority;
|
|
5616
5578
|
forward;
|
|
5617
5579
|
subscribeParameters;
|
|
5580
|
+
earlyDiscardPolicy;
|
|
5618
5581
|
largestLocation;
|
|
5619
5582
|
// Updated on each received object
|
|
5620
5583
|
streamsAccepted = 0n;
|
|
@@ -6450,6 +6413,11 @@ var handlerRequestsBlocked = async (_client, msg) => {
|
|
|
6450
6413
|
logger.debug("handler/requests_blocked", "not implemented", msg);
|
|
6451
6414
|
};
|
|
6452
6415
|
|
|
6416
|
+
// src/client/util/validators.ts
|
|
6417
|
+
function isValidTrackAlias(trackAlias) {
|
|
6418
|
+
return trackAlias !== void 0 && trackAlias >= 0n;
|
|
6419
|
+
}
|
|
6420
|
+
|
|
6453
6421
|
// src/client/handler/subscribe.ts
|
|
6454
6422
|
var handlerSubscribe = async (client, msg) => {
|
|
6455
6423
|
logger.debug("handler/subscribe", `received requestId=${msg.requestId} ftn="${msg.fullTrackName}"`);
|
|
@@ -6482,7 +6450,7 @@ var handlerSubscribe = async (client, msg) => {
|
|
|
6482
6450
|
await client.controlStream.send(response);
|
|
6483
6451
|
return;
|
|
6484
6452
|
}
|
|
6485
|
-
if (!track.trackAlias) throw new Error("Expected track alias to be set");
|
|
6453
|
+
if (!isValidTrackAlias(track.trackAlias)) throw new Error("Expected track alias to be set");
|
|
6486
6454
|
const largestLocation = track.trackSource.live.largestLocation;
|
|
6487
6455
|
const parameters = [...msg.parameters];
|
|
6488
6456
|
if (largestLocation) {
|
|
@@ -7402,14 +7370,17 @@ var MOQtailClient = class _MOQtailClient {
|
|
|
7402
7370
|
}
|
|
7403
7371
|
}
|
|
7404
7372
|
/**
|
|
7405
|
-
* Sets (or replaces) the early discard policy for incoming subgroup streams.
|
|
7373
|
+
* Sets (or replaces) the client-level default early discard policy for incoming subgroup streams.
|
|
7406
7374
|
*
|
|
7407
7375
|
* When set, each incoming subgroup QUIC stream is given a deadline of `subgroupReceiveTimeout` ms to
|
|
7408
7376
|
* complete. If the stream has not finished within that window it is cancelled — objects already
|
|
7409
7377
|
* delivered to the subscription are kept, but no further objects arrive from that stream.
|
|
7410
7378
|
*
|
|
7379
|
+
* This is a client-wide default. Individual subscriptions can override it via the `earlyDiscardPolicy`
|
|
7380
|
+
* field in {@link SubscribeOptions}, which takes precedence over this setting.
|
|
7381
|
+
*
|
|
7411
7382
|
* The policy takes effect on the next stream accepted after this call. Passing a new config
|
|
7412
|
-
* replaces the previous one. Pass `undefined` to remove the
|
|
7383
|
+
* replaces the previous one. Pass `undefined` to remove the default.
|
|
7413
7384
|
*
|
|
7414
7385
|
* @example
|
|
7415
7386
|
* ```ts
|
|
@@ -7486,7 +7457,6 @@ var MOQtailClient = class _MOQtailClient {
|
|
|
7486
7457
|
* // Register the track for live subscription
|
|
7487
7458
|
* client.addOrUpdateTrack({
|
|
7488
7459
|
* fullTrackName: { namespace: ["camera"], name: "main" },
|
|
7489
|
-
* forwardingPreference: ObjectForwardingPreference.Latest,
|
|
7490
7460
|
* trackSource: { live: liveReadableStream },
|
|
7491
7461
|
* publisherPriority: 0 // highest priority
|
|
7492
7462
|
* });
|
|
@@ -7496,7 +7466,6 @@ var MOQtailClient = class _MOQtailClient {
|
|
|
7496
7466
|
* const cache = new MemoryObjectCache(); // Caches are not yet fully supported
|
|
7497
7467
|
* client.addOrUpdateTrack({
|
|
7498
7468
|
* fullTrackName: { namespace: ["camera"], name: "main" },
|
|
7499
|
-
* forwardingPreference: ObjectForwardingPreference.Latest,
|
|
7500
7469
|
* trackSource: { live: liveReadableStream, past: cache },
|
|
7501
7470
|
* publisherPriority: 8
|
|
7502
7471
|
* });
|
|
@@ -7504,7 +7473,7 @@ var MOQtailClient = class _MOQtailClient {
|
|
|
7504
7473
|
*/
|
|
7505
7474
|
addOrUpdateTrack(track) {
|
|
7506
7475
|
this.#ensureActive();
|
|
7507
|
-
if (!track.trackAlias) {
|
|
7476
|
+
if (!isValidTrackAlias(track.trackAlias)) {
|
|
7508
7477
|
track.trackAlias = random60bitId();
|
|
7509
7478
|
}
|
|
7510
7479
|
this.trackSources.set(track.fullTrackName.toString(), track);
|
|
@@ -7636,6 +7605,7 @@ var MOQtailClient = class _MOQtailClient {
|
|
|
7636
7605
|
break;
|
|
7637
7606
|
}
|
|
7638
7607
|
const request = new SubscribeRequest(msg);
|
|
7608
|
+
request.earlyDiscardPolicy = args.earlyDiscardPolicy;
|
|
7639
7609
|
this.requests.set(request.requestId, request);
|
|
7640
7610
|
this.requestIdMap.addMapping(request.requestId, request.fullTrackName);
|
|
7641
7611
|
logger.debug("MOQtailClient", `subscribe: sending SUBSCRIBE requestId=${msg.requestId} ftn="${fullTrackName}"`);
|
|
@@ -7784,7 +7754,7 @@ var MOQtailClient = class _MOQtailClient {
|
|
|
7784
7754
|
const request = this.requests.get(subscriptionRequestId);
|
|
7785
7755
|
if (request instanceof SubscribeRequest) {
|
|
7786
7756
|
const trackAlias = this.subscriptionAliasMap.get(subscriptionRequestId);
|
|
7787
|
-
if (!trackAlias)
|
|
7757
|
+
if (!isValidTrackAlias(trackAlias))
|
|
7788
7758
|
throw new InternalError("MOQtailClient.subscribeUpdate", "Request exists but track alias mapping does not");
|
|
7789
7759
|
const subscription = this.subscriptions.get(trackAlias);
|
|
7790
7760
|
if (!subscription)
|
|
@@ -7837,7 +7807,7 @@ var MOQtailClient = class _MOQtailClient {
|
|
|
7837
7807
|
if (!(request instanceof SubscribeRequest))
|
|
7838
7808
|
throw new ProtocolViolationError("MOQtailClient.switch", "Request id is not a subscription");
|
|
7839
7809
|
const trackAlias = this.subscriptionAliasMap.get(subscriptionRequestId);
|
|
7840
|
-
if (!trackAlias)
|
|
7810
|
+
if (!isValidTrackAlias(trackAlias))
|
|
7841
7811
|
throw new InternalError("MOQtailClient.switch", "Request exists but track alias mapping does not");
|
|
7842
7812
|
const subscription = this.subscriptions.get(trackAlias);
|
|
7843
7813
|
if (!subscription) throw new InternalError("MOQtailClient.switch", "Request exists but subscription does not");
|
|
@@ -8502,11 +8472,12 @@ var MOQtailClient = class _MOQtailClient {
|
|
|
8502
8472
|
subscription.streamsAccepted++;
|
|
8503
8473
|
let firstObjectId = null;
|
|
8504
8474
|
let subgroupTimeoutId;
|
|
8505
|
-
|
|
8475
|
+
const effectiveDiscardPolicy = subscription.earlyDiscardPolicy ?? this.#earlyDiscardPolicy;
|
|
8476
|
+
if (effectiveDiscardPolicy?.subgroupReceiveTimeout !== void 0) {
|
|
8506
8477
|
subgroupTimeoutId = setTimeout(() => {
|
|
8507
8478
|
reader.cancel("early discard: subgroupReceiveTimeout exceeded").catch(() => {
|
|
8508
8479
|
});
|
|
8509
|
-
},
|
|
8480
|
+
}, effectiveDiscardPolicy.subgroupReceiveTimeout);
|
|
8510
8481
|
}
|
|
8511
8482
|
try {
|
|
8512
8483
|
while (true) {
|
|
@@ -8851,4 +8822,4 @@ var ClockNormalizer = class _ClockNormalizer {
|
|
|
8851
8822
|
}
|
|
8852
8823
|
};
|
|
8853
8824
|
|
|
8854
|
-
export { AudioLevel, AuthorizationToken, BaseByteBuffer13 as BaseByteBuffer, ByteBuffer, CMSFCatalog, CaptureTimestamp, CastingError, ClientSetup, ClockNormalizer, ControlMessage, ControlMessageType, ControlStream, Datagram, DefaultPublisherGroupOrderExtension, DefaultPublisherPriorityExtension, DeliveryTimeout, DeliveryTimeoutExtension, DynamicGroupsExtension, EndOfRangeKind, Expires, ExtensionHeader, ExtensionHeaders, Fetch, FetchCancel, FetchHeader, FetchHeaderType, FetchObject, FetchOk, FetchPublication, FetchRequest, FetchType, FilterType, Forward, FrozenByteBuffer5 as FrozenByteBuffer, FullTrackName, GoAway, GroupOrder, GroupOrderParam, Header, HybridTrackSource, ImmutableExtensionsExtension, ImmutableExtensionsObjectExtension, InternalError, InvalidTypeError, InvalidUTF8Error, KeyValueFormattingError, KeyValuePair, LOCHeaderExtensionId, LargestObject, LengthExceedsMaxError, LiveTrackSource, Location, LogLevel, Logger, MAX_FULL_TRACK_NAME_LENGTH, MAX_NAMESPACE_TUPLE_COUNT, MAX_REASON_PHRASE_LEN, MOQtailClient, MOQtailError, MaxAuthTokenCacheSize, MaxCacheDurationExtension, MaxRequestId, MaxRequestId2 as MaxRequestIdParameter, MemoryObjectCache, MessageParameter, MessageParameterType, MessageParameters, MoqtObject, Namespace, NamespaceDone, NamespaceSubscribeOptions, NetworkTelemetry, NewGroupRequest, NotEnoughBytesError, ObjectDatagramType, ObjectExtension, ObjectForwardingPreference, ObjectStatus, Path, PriorGroupIdGapExtension, PriorObjectIdGapExtension, ProtocolViolationError, Publish, PublishDone, PublishDoneStatusCode, PublishNamespace, PublishNamespaceCancel, PublishNamespaceDone, PublishNamespaceRequest, PublishOk, PublishPublication, PublishRequest, ReasonPhrase, RecvDatagramStream, RecvStream, RequestError, RequestErrorCode, RequestIdError, RequestIdMap, RequestOk, RequestUpdate, RequestsBlocked, RingBufferObjectCache, SUPPORTED_VERSIONS, SendDatagramStream, SendStream, ServerSetup, SetupParameter, SetupParameterType, SetupParameters, StaticTrackSource, SubgroupHeader, SubgroupHeaderType, SubgroupObject, Subscribe, SubscribeNamespace, SubscribeNamespaceRequest, SubscribeOk, SubscribePublication, SubscribeRequest, SubscriberPriority, SubscriptionFilter, Switch, TerminationCode, TerminationError, TimeoutError, TokenAliasType, TrackExtension, TrackExtensionType, TrackNameError, TrackStatus, TrackStatusCode, TrackStatusRequest, Tuple, TupleField, UnknownObjectExtension, UnknownTrackExtension, Unsubscribe, UnsubscribeNamespace, VarIntOverflowError, VideoConfig, VideoFrameMarking, applyMessageParameterUpdate, controlMessageTypeFromBigInt, fetchTypeFromBigInt, filterTypeFromBigInt, groupOrderFromNumber, isBytes, isVarInt, locHeaderExtensionIdFromNumber, logger, messageParameterTypeFromNumber, publishDoneStatusCodeFromBigInt, requestErrorCodeFromBigInt, setLogEnabledModules, setLogLevel, setupParameterTypeFromNumber, tokenAliasTypeFromNumber, trackStatusCodeFromBigInt };
|
|
8825
|
+
export { AudioLevel, AuthorizationToken, BaseByteBuffer13 as BaseByteBuffer, ByteBuffer, CMSFCatalog, CaptureTimestamp, CastingError, ClientSetup, ClockNormalizer, ControlMessage, ControlMessageType, ControlStream, Datagram, DefaultPublisherGroupOrderExtension, DefaultPublisherPriorityExtension, DeliveryTimeout, DeliveryTimeoutExtension, DynamicGroupsExtension, EndOfRangeKind, Expires, ExtensionHeader, ExtensionHeaders, Fetch, FetchCancel, FetchHeader, FetchHeaderType, FetchObject, FetchOk, FetchPublication, FetchRequest, FetchType, FilterType, Forward, FrozenByteBuffer5 as FrozenByteBuffer, FullTrackName, GoAway, GroupOrder, GroupOrderParam, Header, HybridTrackSource, ImmutableExtensionsExtension, ImmutableExtensionsObjectExtension, InternalError, InvalidTypeError, InvalidUTF8Error, KeyValueFormattingError, KeyValuePair, LOCHeaderExtensionId, LargestObject, LengthExceedsMaxError, LiveTrackSource, Location, LogLevel, Logger, MAX_FULL_TRACK_NAME_LENGTH, MAX_NAMESPACE_TUPLE_COUNT, MAX_REASON_PHRASE_LEN, MOQtailClient, MOQtailError, MaxAuthTokenCacheSize, MaxCacheDurationExtension, MaxRequestId, MaxRequestId2 as MaxRequestIdParameter, MemoryObjectCache, MessageParameter, MessageParameterType, MessageParameters, MoqtObject, Namespace, NamespaceDone, NamespaceSubscribeOptions, NetworkTelemetry, NewGroupRequest, NotEnoughBytesError, ObjectDatagramType, ObjectExtension, ObjectForwardingPreference, ObjectStatus, Path, PriorGroupIdGapExtension, PriorObjectIdGapExtension, ProtocolViolationError, Publish, PublishDone, PublishDoneStatusCode, PublishNamespace, PublishNamespaceCancel, PublishNamespaceDone, PublishNamespaceRequest, PublishOk, PublishPublication, PublishRequest, ReasonPhrase, RecvDatagramStream, RecvStream, RequestError, RequestErrorCode, RequestIdError, RequestIdMap, RequestOk, RequestUpdate, RequestsBlocked, RingBufferObjectCache, SUPPORTED_VERSIONS, SendDatagramStream, SendStream, ServerSetup, SetupParameter, SetupParameterType, SetupParameters, StaticTrackSource, SubgroupHeader, SubgroupHeaderType, SubgroupObject, Subscribe, SubscribeNamespace, SubscribeNamespaceRequest, SubscribeOk, SubscribePublication, SubscribeRequest, SubscriberPriority, SubscriptionFilter, Switch, TerminationCode, TerminationError, TimeoutError, TokenAliasType, TrackExtension, TrackExtensionType, TrackNameError, TrackStatus, TrackStatusCode, TrackStatusRequest, Tuple, TupleField, UnknownObjectExtension, UnknownTrackExtension, Unsubscribe, UnsubscribeNamespace, VarIntOverflowError, VideoConfig, VideoFrameMarking, applyMessageParameterUpdate, controlMessageTypeFromBigInt, deserializeKvpList, deserializeKvpListUntilEmpty, fetchTypeFromBigInt, filterTypeFromBigInt, groupOrderFromNumber, isBytes, isVarInt, locHeaderExtensionIdFromNumber, logger, messageParameterTypeFromNumber, publishDoneStatusCodeFromBigInt, requestErrorCodeFromBigInt, serializeKvpList, setLogEnabledModules, setLogLevel, setupParameterTypeFromNumber, tokenAliasTypeFromNumber, trackStatusCodeFromBigInt };
|