@blockcast/mmt-transport 0.2.2 → 0.3.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/README.md +44 -58
- package/dist/abr-controller.d.ts +34 -4
- package/dist/abr-controller.d.ts.map +1 -1
- package/dist/abr-controller.js +66 -17
- package/dist/abr-controller.js.map +1 -1
- package/dist/amt-gateway.d.ts.map +1 -1
- package/dist/amt-gateway.js +3 -4
- package/dist/amt-gateway.js.map +1 -1
- package/dist/driad-discovery.d.ts.map +1 -1
- package/dist/driad-discovery.js +3 -6
- package/dist/driad-discovery.js.map +1 -1
- package/dist/endpoint-config.d.ts +68 -0
- package/dist/endpoint-config.d.ts.map +1 -1
- package/dist/endpoint-config.js +118 -3
- package/dist/endpoint-config.js.map +1 -1
- package/dist/index.d.ts +10 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -11
- package/dist/index.js.map +1 -1
- package/dist/mmt-transport.no-modules.js +881 -60
- package/dist/mmt-transport.no-modules.js.map +4 -4
- package/dist/moqt-priority.d.ts +39 -0
- package/dist/moqt-priority.d.ts.map +1 -0
- package/dist/moqt-priority.js +41 -0
- package/dist/moqt-priority.js.map +1 -0
- package/dist/multicast-catalog-policy.d.ts +96 -0
- package/dist/multicast-catalog-policy.d.ts.map +1 -0
- package/dist/multicast-catalog-policy.js +660 -0
- package/dist/multicast-catalog-policy.js.map +1 -0
- package/dist/multicast-orchestrator.d.ts +24 -0
- package/dist/multicast-orchestrator.d.ts.map +1 -1
- package/dist/multicast-orchestrator.js +102 -9
- package/dist/multicast-orchestrator.js.map +1 -1
- package/dist/multicast-signaling-reconciler.d.ts +37 -0
- package/dist/multicast-signaling-reconciler.d.ts.map +1 -0
- package/dist/multicast-signaling-reconciler.js +161 -0
- package/dist/multicast-signaling-reconciler.js.map +1 -0
- package/dist/multicast-subscription-pool.d.ts.map +1 -1
- package/dist/multicast-subscription-pool.js +37 -10
- package/dist/multicast-subscription-pool.js.map +1 -1
- package/dist/multicast-tier.d.ts +19 -0
- package/dist/multicast-tier.d.ts.map +1 -1
- package/dist/multicast-tier.js +21 -4
- package/dist/multicast-tier.js.map +1 -1
- package/dist/no-modules.d.ts +40 -3
- package/dist/no-modules.d.ts.map +1 -1
- package/dist/no-modules.js +30 -3
- package/dist/no-modules.js.map +1 -1
- package/dist/packet-batch.d.ts +13 -0
- package/dist/packet-batch.d.ts.map +1 -0
- package/dist/packet-batch.js +14 -0
- package/dist/packet-batch.js.map +1 -0
- package/dist/stall-detector.d.ts +10 -0
- package/dist/stall-detector.d.ts.map +1 -1
- package/dist/stall-detector.js +21 -0
- package/dist/stall-detector.js.map +1 -1
- package/dist/takeover.d.ts +3 -0
- package/dist/takeover.d.ts.map +1 -1
- package/dist/takeover.js +35 -2
- package/dist/takeover.js.map +1 -1
- package/dist/transport-manager.d.ts +21 -17
- package/dist/transport-manager.d.ts.map +1 -1
- package/dist/transport-manager.js +63 -29
- package/dist/transport-manager.js.map +1 -1
- package/dist/types.d.ts +98 -123
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +12 -50
- package/dist/types.js.map +1 -1
- package/node_modules/@blockcast/mmt-alta-parse/README.md +181 -0
- package/node_modules/@blockcast/mmt-alta-parse/dist/.build-stamp +0 -0
- package/node_modules/@blockcast/mmt-alta-parse/dist/index.d.ts +57 -0
- package/node_modules/@blockcast/mmt-alta-parse/dist/index.d.ts.map +1 -0
- package/node_modules/@blockcast/mmt-alta-parse/dist/index.js +115 -0
- package/node_modules/@blockcast/mmt-alta-parse/dist/index.js.map +1 -0
- package/node_modules/@blockcast/mmt-alta-parse/package.json +50 -0
- package/node_modules/@blockcast/mmt-alta-parse/src/index.ts +136 -0
- package/node_modules/@blockcast/mmt-base/README.md +134 -0
- package/node_modules/@blockcast/mmt-base/dist/.build-stamp +0 -0
- package/node_modules/@blockcast/mmt-base/dist/fec-block-profile.d.ts +55 -0
- package/node_modules/@blockcast/mmt-base/dist/fec-block-profile.d.ts.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/fec-block-profile.js +128 -0
- package/node_modules/@blockcast/mmt-base/dist/fec-block-profile.js.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/index.d.ts +7 -0
- package/node_modules/@blockcast/mmt-base/dist/index.d.ts.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/index.js +7 -0
- package/node_modules/@blockcast/mmt-base/dist/index.js.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/mmtp.d.ts +292 -0
- package/node_modules/@blockcast/mmt-base/dist/mmtp.d.ts.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/mmtp.js +612 -0
- package/node_modules/@blockcast/mmt-base/dist/mmtp.js.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/net-constants.d.ts +18 -0
- package/node_modules/@blockcast/mmt-base/dist/net-constants.d.ts.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/net-constants.js +18 -0
- package/node_modules/@blockcast/mmt-base/dist/net-constants.js.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/ntp-short.d.ts +47 -0
- package/node_modules/@blockcast/mmt-base/dist/ntp-short.d.ts.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/ntp-short.js +54 -0
- package/node_modules/@blockcast/mmt-base/dist/ntp-short.js.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/serial-number.d.ts +57 -0
- package/node_modules/@blockcast/mmt-base/dist/serial-number.d.ts.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/serial-number.js +98 -0
- package/node_modules/@blockcast/mmt-base/dist/serial-number.js.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/signalling.d.ts +312 -0
- package/node_modules/@blockcast/mmt-base/dist/signalling.d.ts.map +1 -0
- package/node_modules/@blockcast/mmt-base/dist/signalling.js +637 -0
- package/node_modules/@blockcast/mmt-base/dist/signalling.js.map +1 -0
- package/node_modules/@blockcast/mmt-base/package.json +49 -0
- package/node_modules/@blockcast/mmt-base/src/fec-block-profile.ts +145 -0
- package/node_modules/@blockcast/mmt-base/src/index.ts +6 -0
- package/node_modules/@blockcast/mmt-base/src/mmtp.ts +892 -0
- package/node_modules/@blockcast/mmt-base/src/net-constants.ts +17 -0
- package/node_modules/@blockcast/mmt-base/src/ntp-short.ts +67 -0
- package/node_modules/@blockcast/mmt-base/src/serial-number.ts +107 -0
- package/node_modules/@blockcast/mmt-base/src/signalling.ts +862 -0
- package/package.json +13 -6
- package/src/abr-controller.ts +81 -17
- package/src/amt-gateway.ts +3 -5
- package/src/driad-discovery.ts +3 -6
- package/src/endpoint-config.ts +157 -3
- package/src/index.ts +54 -33
- package/src/moqt-priority.ts +51 -0
- package/src/multicast-catalog-policy.ts +753 -0
- package/src/multicast-orchestrator.ts +114 -10
- package/src/multicast-signaling-reconciler.ts +156 -0
- package/src/multicast-subscription-pool.ts +46 -11
- package/src/multicast-tier.ts +30 -3
- package/src/no-modules.ts +54 -2
- package/src/packet-batch.ts +17 -0
- package/src/stall-detector.ts +37 -0
- package/src/takeover.ts +41 -3
- package/src/transport-manager.ts +64 -34
- package/src/types.ts +103 -160
- package/dist/endpoint-config.test.d.ts +0 -2
- package/dist/endpoint-config.test.d.ts.map +0 -1
- package/dist/endpoint-config.test.js +0 -39
- package/dist/endpoint-config.test.js.map +0 -1
- package/dist/fec-client.d.ts +0 -442
- package/dist/fec-client.d.ts.map +0 -1
- package/dist/fec-client.js +0 -789
- package/dist/fec-client.js.map +0 -1
- package/dist/fec-client.test.d.ts +0 -8
- package/dist/fec-client.test.d.ts.map +0 -1
- package/dist/fec-client.test.js +0 -112
- package/dist/fec-client.test.js.map +0 -1
- package/dist/multicast-subscription-pool.test.d.ts +0 -2
- package/dist/multicast-subscription-pool.test.d.ts.map +0 -1
- package/dist/multicast-subscription-pool.test.js +0 -108
- package/dist/multicast-subscription-pool.test.js.map +0 -1
- package/dist/multicast-tier.test.d.ts +0 -2
- package/dist/multicast-tier.test.d.ts.map +0 -1
- package/dist/multicast-tier.test.js +0 -75
- package/dist/multicast-tier.test.js.map +0 -1
- package/dist/stall-detector.test.d.ts +0 -2
- package/dist/stall-detector.test.d.ts.map +0 -1
- package/dist/stall-detector.test.js +0 -33
- package/dist/stall-detector.test.js.map +0 -1
- package/dist/transport-manager.test.d.ts +0 -2
- package/dist/transport-manager.test.d.ts.map +0 -1
- package/dist/transport-manager.test.js +0 -155
- package/dist/transport-manager.test.js.map +0 -1
- package/src/endpoint-config.test.ts +0 -54
- package/src/fec-client.test.ts +0 -140
- package/src/fec-client.ts +0 -1103
- package/src/multicast-subscription-pool.test.ts +0 -115
- package/src/multicast-tier.test.ts +0 -80
- package/src/stall-detector.test.ts +0 -34
- package/src/transport-manager.test.ts +0 -192
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multicast-catalog-policy.js","sourceRoot":"","sources":["../src/multicast-catalog-policy.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,16 @@ export type OrchestratorCommand = {
|
|
|
16
16
|
export interface MulticastTierPacket {
|
|
17
17
|
endpointKey: string;
|
|
18
18
|
keyframe: boolean;
|
|
19
|
+
/**
|
|
20
|
+
* The packet's MMTP header `timestamp`: its UTC sending instant in NTP short
|
|
21
|
+
* format (ISO/IEC 23008-1 §9.2.2), which wraps every 2^16 s (~18.2 h). The
|
|
22
|
+
* orchestrator orders these only with RFC 1982 serial arithmetic
|
|
23
|
+
* (`compareNtpShort`), never with `<` or `Math.max`.
|
|
24
|
+
*
|
|
25
|
+
* A non-finite value means the host could not read a header; that packet
|
|
26
|
+
* neither raises the high-water mark nor commits. Any other value that is
|
|
27
|
+
* not NTP short is a host bug and throws a RangeError.
|
|
28
|
+
*/
|
|
19
29
|
timestamp: number;
|
|
20
30
|
hasValidCodecConfig: boolean;
|
|
21
31
|
}
|
|
@@ -30,6 +40,9 @@ export interface OrchestratorOptions {
|
|
|
30
40
|
export interface GoodputSample {
|
|
31
41
|
bitrate: number | undefined;
|
|
32
42
|
}
|
|
43
|
+
export interface HeadroomSample {
|
|
44
|
+
healthy: boolean;
|
|
45
|
+
}
|
|
33
46
|
export declare const DEFAULT_DWELL_MS = 3000;
|
|
34
47
|
export declare const DEFAULT_JOIN_DEADLINE_MS = 5000;
|
|
35
48
|
export declare function goodputFromStats(previous: {
|
|
@@ -49,6 +62,17 @@ export declare class MulticastOrchestrator {
|
|
|
49
62
|
get estimate(): number | undefined;
|
|
50
63
|
start(): MulticastTierEndpoint | undefined;
|
|
51
64
|
onGoodput(sample: GoodputSample): OrchestratorCommand | undefined;
|
|
65
|
+
onHeadroom(sample: HeadroomSample): OrchestratorCommand | undefined;
|
|
66
|
+
/**
|
|
67
|
+
* Feed a packet from the active tier (to advance the high-water mark) or
|
|
68
|
+
* from the in-flight target (to find a committable RAP).
|
|
69
|
+
*
|
|
70
|
+
* Serial order is only the true order while the compared instants are less
|
|
71
|
+
* than `NTP_SHORT_HALF_RANGE` (2^15 s, ~9.1 h) apart. Feeding every
|
|
72
|
+
* active-tier packet keeps the mark that close to the live stream. A mark
|
|
73
|
+
* refreshed only by commits can fall further behind than that, and a
|
|
74
|
+
* target RAP may then compare as older, so the join is abandoned.
|
|
75
|
+
*/
|
|
52
76
|
onTierPacket(packet: MulticastTierPacket): OrchestratorCommand | undefined;
|
|
53
77
|
poll(): OrchestratorCommand | undefined;
|
|
54
78
|
cancel(): OrchestratorCommand | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multicast-orchestrator.d.ts","sourceRoot":"","sources":["../src/multicast-orchestrator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"multicast-orchestrator.d.ts","sourceRoot":"","sources":["../src/multicast-orchestrator.ts"],"names":[],"mappings":"AACA,OAAO,EAAkD,KAAK,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAEjH,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,SAAS,CAAC;AACrD,MAAM,MAAM,mBAAmB,GAC5B;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,qBAAqB,CAAC;IAAC,MAAM,EAAE,qBAAqB,CAAA;CAAE,GACtF;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,qBAAqB,CAAC;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAE,GAClF;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,qBAAqB,CAAC;IAAC,MAAM,EAAE,qBAAqB,CAAA;CAAE,CAAC;AAE3F,MAAM,WAAW,mBAAmB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;;;;;OASG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IACnC,SAAS,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAC5C,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAAG,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAAE;AAC/D,MAAM,WAAW,cAAc;IAAG,OAAO,EAAE,OAAO,CAAC;CAAE;AAErD,eAAO,MAAM,gBAAgB,OAAQ,CAAC;AACtC,eAAO,MAAM,wBAAwB,OAAQ,CAAC;AAE9C,wBAAgB,gBAAgB,CAC/B,QAAQ,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,EAC7D,OAAO,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAChD,WAAW,SAAM,GACf,MAAM,GAAG,SAAS,CAMpB;AAED,qBAAa,qBAAqB;;IAgBrB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,mBAAmB;IASzD,IAAI,KAAK,IAAI,iBAAiB,CAAwB;IACtD,IAAI,OAAO,IAAI,qBAAqB,GAAG,SAAS,CAA0B;IAC1E,IAAI,MAAM,IAAI,qBAAqB,GAAG,SAAS,CAAyB;IACxE,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAA2B;IAE7D,KAAK,IAAI,qBAAqB,GAAG,SAAS;IAK1C,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,mBAAmB,GAAG,SAAS;IAiCjE,UAAU,CAAC,MAAM,EAAE,cAAc,GAAG,mBAAmB,GAAG,SAAS;IA4CnE;;;;;;;;;OASG;IACH,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,mBAAmB,GAAG,SAAS;IAiC1E,IAAI,IAAI,mBAAmB,GAAG,SAAS;IAMvC,MAAM,IAAI,mBAAmB,GAAG,SAAS;CA4BzC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { compareNtpShort, isNtpShort } from "@blockcast/mmt-base";
|
|
2
|
+
import { carriesMedia, endpointKey, selectMulticastTier } from "./multicast-tier.js";
|
|
2
3
|
export const DEFAULT_DWELL_MS = 3_000;
|
|
3
4
|
export const DEFAULT_JOIN_DEADLINE_MS = 5_000;
|
|
4
5
|
export function goodputFromStats(previous, current, minSampleMs = 500) {
|
|
@@ -18,7 +19,12 @@ export class MulticastOrchestrator {
|
|
|
18
19
|
#estimate;
|
|
19
20
|
#favored;
|
|
20
21
|
#joinStartedAt = 0;
|
|
21
|
-
|
|
22
|
+
/**
|
|
23
|
+
* Latest active-tier send time (NTP short), or undefined before the first.
|
|
24
|
+
* "Latest" is serial order, not the numerically largest value: after the
|
|
25
|
+
* field wraps, the largest value is the stale one.
|
|
26
|
+
*/
|
|
27
|
+
#highWater;
|
|
22
28
|
#dwellMs;
|
|
23
29
|
#joinDeadlineMs;
|
|
24
30
|
constructor(options) {
|
|
@@ -40,22 +46,74 @@ export class MulticastOrchestrator {
|
|
|
40
46
|
}
|
|
41
47
|
onGoodput(sample) {
|
|
42
48
|
const bitrate = sample.bitrate;
|
|
43
|
-
this.#estimate = bitrate;
|
|
44
49
|
if (!this.#current || this.options.adaptive === false)
|
|
45
50
|
return undefined;
|
|
46
51
|
if (this.#state === "joining")
|
|
47
52
|
return this.poll();
|
|
53
|
+
if (bitrate === undefined || !Number.isFinite(bitrate))
|
|
54
|
+
return undefined;
|
|
55
|
+
this.#estimate = bitrate;
|
|
48
56
|
const desired = selectMulticastTier(this.options.endpoints, bitrate);
|
|
49
57
|
if (!desired)
|
|
50
58
|
return undefined;
|
|
51
59
|
const desiredKey = endpointKey(desired);
|
|
60
|
+
if (desiredKey === endpointKey(this.#current)) {
|
|
61
|
+
if (this.#favored?.source === "goodput")
|
|
62
|
+
this.#favored = undefined;
|
|
63
|
+
return undefined;
|
|
64
|
+
}
|
|
65
|
+
if (typeof desired.bandwidth !== "number" || typeof this.#current.bandwidth !== "number" ||
|
|
66
|
+
desired.bandwidth >= this.#current.bandwidth) {
|
|
67
|
+
if (this.#favored?.source === "goodput")
|
|
68
|
+
this.#favored = undefined;
|
|
69
|
+
return undefined;
|
|
70
|
+
}
|
|
71
|
+
const now = this.#now();
|
|
72
|
+
if (!this.#favored || this.#favored.key !== desiredKey || this.#favored.source !== "goodput") {
|
|
73
|
+
this.#favored = { key: desiredKey, since: now, source: "goodput" };
|
|
74
|
+
return undefined;
|
|
75
|
+
}
|
|
76
|
+
if (now - this.#favored.since < this.#dwellMs)
|
|
77
|
+
return undefined;
|
|
78
|
+
this.#state = "joining";
|
|
79
|
+
this.#target = desired;
|
|
80
|
+
this.#joinStartedAt = now;
|
|
81
|
+
this.#favored = undefined;
|
|
82
|
+
return { kind: "join-target", current: this.#current, target: desired };
|
|
83
|
+
}
|
|
84
|
+
onHeadroom(sample) {
|
|
85
|
+
if (!this.#current || this.options.adaptive === false || this.#state === "joining")
|
|
86
|
+
return undefined;
|
|
87
|
+
if (!sample.healthy) {
|
|
88
|
+
if (this.#favored?.source === "headroom")
|
|
89
|
+
this.#favored = undefined;
|
|
90
|
+
return undefined;
|
|
91
|
+
}
|
|
92
|
+
if (this.#favored?.source === "goodput")
|
|
93
|
+
return undefined;
|
|
94
|
+
const currentBandwidth = this.#current.bandwidth;
|
|
95
|
+
if (typeof currentBandwidth !== "number")
|
|
96
|
+
return undefined;
|
|
97
|
+
// Ranked here rather than through selectMulticastTier: up-selection
|
|
98
|
+
// advances exactly one adjacent rung, where the selector fits a budget to
|
|
99
|
+
// an estimate. The media filter is shared so a repair-only endpoint above
|
|
100
|
+
// the current rung is not joined as an upgrade, which would swap the
|
|
101
|
+
// receiver onto repair symbols and no media.
|
|
102
|
+
const desired = this.options.endpoints
|
|
103
|
+
.filter((endpoint) => carriesMedia(endpoint) && typeof endpoint.bandwidth === "number" && endpoint.bandwidth > currentBandwidth)
|
|
104
|
+
.sort((a, b) => a.bandwidth - b.bandwidth)[0];
|
|
105
|
+
if (!desired) {
|
|
106
|
+
this.#favored = undefined;
|
|
107
|
+
return undefined;
|
|
108
|
+
}
|
|
109
|
+
const desiredKey = endpointKey(desired);
|
|
52
110
|
if (desiredKey === endpointKey(this.#current)) {
|
|
53
111
|
this.#favored = undefined;
|
|
54
112
|
return undefined;
|
|
55
113
|
}
|
|
56
114
|
const now = this.#now();
|
|
57
115
|
if (!this.#favored || this.#favored.key !== desiredKey) {
|
|
58
|
-
this.#favored = { key: desiredKey, since: now };
|
|
116
|
+
this.#favored = { key: desiredKey, since: now, source: "headroom" };
|
|
59
117
|
return undefined;
|
|
60
118
|
}
|
|
61
119
|
if (now - this.#favored.since < this.#dwellMs)
|
|
@@ -66,11 +124,26 @@ export class MulticastOrchestrator {
|
|
|
66
124
|
this.#favored = undefined;
|
|
67
125
|
return { kind: "join-target", current: this.#current, target: desired };
|
|
68
126
|
}
|
|
127
|
+
/**
|
|
128
|
+
* Feed a packet from the active tier (to advance the high-water mark) or
|
|
129
|
+
* from the in-flight target (to find a committable RAP).
|
|
130
|
+
*
|
|
131
|
+
* Serial order is only the true order while the compared instants are less
|
|
132
|
+
* than `NTP_SHORT_HALF_RANGE` (2^15 s, ~9.1 h) apart. Feeding every
|
|
133
|
+
* active-tier packet keeps the mark that close to the live stream. A mark
|
|
134
|
+
* refreshed only by commits can fall further behind than that, and a
|
|
135
|
+
* target RAP may then compare as older, so the join is abandoned.
|
|
136
|
+
*/
|
|
69
137
|
onTierPacket(packet) {
|
|
70
138
|
if (!this.#current)
|
|
71
139
|
return undefined;
|
|
72
|
-
|
|
73
|
-
|
|
140
|
+
const sentAt = tierPacketSendTime(packet);
|
|
141
|
+
// An instant exactly half the space from the mark (RFC 1982's undefined
|
|
142
|
+
// case) is neither later nor earlier, so it leaves the mark alone, as a
|
|
143
|
+
// reordered earlier packet does.
|
|
144
|
+
if (packet.endpointKey === endpointKey(this.#current) && sentAt !== undefined &&
|
|
145
|
+
(this.#highWater === undefined || compareNtpShort(sentAt, this.#highWater) === "after")) {
|
|
146
|
+
this.#highWater = sentAt;
|
|
74
147
|
}
|
|
75
148
|
if (this.#state !== "joining" || !this.#target)
|
|
76
149
|
return undefined;
|
|
@@ -80,15 +153,15 @@ export class MulticastOrchestrator {
|
|
|
80
153
|
if (packet.endpointKey !== endpointKey(this.#target) ||
|
|
81
154
|
!packet.keyframe ||
|
|
82
155
|
!packet.hasValidCodecConfig ||
|
|
83
|
-
|
|
84
|
-
|
|
156
|
+
sentAt === undefined ||
|
|
157
|
+
!this.#reachesHighWater(sentAt))
|
|
85
158
|
return undefined;
|
|
86
159
|
const command = {
|
|
87
160
|
kind: "commit-swap",
|
|
88
161
|
target: this.#target,
|
|
89
162
|
old: this.#current,
|
|
90
163
|
};
|
|
91
|
-
this.#
|
|
164
|
+
this.#highWater = sentAt;
|
|
92
165
|
this.#current = this.#target;
|
|
93
166
|
this.#target = undefined;
|
|
94
167
|
this.#state = "stable";
|
|
@@ -113,6 +186,17 @@ export class MulticastOrchestrator {
|
|
|
113
186
|
this.#state = "stable";
|
|
114
187
|
return command;
|
|
115
188
|
}
|
|
189
|
+
/**
|
|
190
|
+
* Whether a target RAP sent at `sentAt` is at or beyond the active tier's
|
|
191
|
+
* high-water mark. A pair exactly half the NTP-short space apart has no
|
|
192
|
+
* serial order, so it cannot show that and does not commit.
|
|
193
|
+
*/
|
|
194
|
+
#reachesHighWater(sentAt) {
|
|
195
|
+
if (this.#highWater === undefined)
|
|
196
|
+
return true;
|
|
197
|
+
const order = compareNtpShort(sentAt, this.#highWater);
|
|
198
|
+
return order === "after" || order === "equal";
|
|
199
|
+
}
|
|
116
200
|
#now() {
|
|
117
201
|
const now = this.options.now();
|
|
118
202
|
if (!Number.isFinite(now))
|
|
@@ -120,4 +204,13 @@ export class MulticastOrchestrator {
|
|
|
120
204
|
return now;
|
|
121
205
|
}
|
|
122
206
|
}
|
|
207
|
+
/** A tier packet's NTP-short send time, or undefined when the host had no header to read. */
|
|
208
|
+
function tierPacketSendTime(packet) {
|
|
209
|
+
if (!Number.isFinite(packet.timestamp))
|
|
210
|
+
return undefined;
|
|
211
|
+
if (!isNtpShort(packet.timestamp)) {
|
|
212
|
+
throw new RangeError(`Multicast tier packet timestamp must be an MMTP NTP-short send time, got ${packet.timestamp}`);
|
|
213
|
+
}
|
|
214
|
+
return packet.timestamp;
|
|
215
|
+
}
|
|
123
216
|
//# sourceMappingURL=multicast-orchestrator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multicast-orchestrator.js","sourceRoot":"","sources":["../src/multicast-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAA8B,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"multicast-orchestrator.js","sourceRoot":"","sources":["../src/multicast-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,mBAAmB,EAA8B,MAAM,qBAAqB,CAAC;AAqCjH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,CAAC;AACtC,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAE9C,MAAM,UAAU,gBAAgB,CAC/B,QAA6D,EAC7D,OAAgD,EAChD,WAAW,GAAG,GAAG;IAEjB,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;IAC7D,IAAI,UAAU,GAAG,WAAW,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7D,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,UAAU,CAAC;AACxC,CAAC;AAED,MAAM,OAAO,qBAAqB;IAgBJ;IAf7B,MAAM,GAAsB,QAAQ,CAAC;IACrC,QAAQ,CAAoC;IAC5C,OAAO,CAAoC;IAC3C,SAAS,CAAqB;IAC9B,QAAQ,CAA6E;IACrF,cAAc,GAAG,CAAC,CAAC;IACnB;;;;OAIG;IACH,UAAU,CAAqB;IACtB,QAAQ,CAAS;IACjB,eAAe,CAAS;IAEjC,YAA6B,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QACxD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,IAAI,gBAAgB,CAAC;QACpD,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,IAAI,wBAAwB,CAAC;QAC1E,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC;YAC5E,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACvE,CAAC;IACF,CAAC;IAED,IAAI,KAAK,KAAwB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACtD,IAAI,OAAO,KAAwC,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1E,IAAI,MAAM,KAAwC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IACxE,IAAI,QAAQ,KAAyB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAE7D,KAAK;QACJ,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACzG,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,SAAS,CAAC,MAAqB;QAC9B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,KAAK;YAAE,OAAO,SAAS,CAAC;QACxE,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;QAClD,IAAI,OAAO,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,OAAO,SAAS,CAAC;QACzE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;QACzB,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAC/B,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,UAAU,KAAK,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/C,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAM,KAAK,SAAS;gBAAE,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YACnE,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,KAAK,QAAQ;YACvF,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YAC/C,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAM,KAAK,SAAS;gBAAE,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YACnE,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC9F,IAAI,CAAC,QAAQ,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YACnE,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QAEhE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IACzE,CAAC;IAED,UAAU,CAAC,MAAsB;QAChC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACrG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAM,KAAK,UAAU;gBAAE,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YACpE,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAM,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAE1D,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;QACjD,IAAI,OAAO,gBAAgB,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;QAC3D,oEAAoE;QACpE,0EAA0E;QAC1E,0EAA0E;QAC1E,qEAAqE;QACrE,6CAA6C;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS;aACpC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CACpB,YAAY,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,SAAS,KAAK,QAAQ,IAAI,QAAQ,CAAC,SAAS,GAAG,gBAAgB,CACzG;aACA,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAU,GAAG,CAAC,CAAC,SAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACjD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC1B,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,UAAU,KAAK,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/C,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC1B,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,UAAU,EAAE,CAAC;YACxD,IAAI,CAAC,QAAQ,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;YACpE,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QAEhE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IACzE,CAAC;IAED;;;;;;;;;OASG;IACH,YAAY,CAAC,MAA2B;QACvC,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QACrC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC1C,wEAAwE;QACxE,wEAAwE;QACxE,iCAAiC;QACjC,IAAI,MAAM,CAAC,WAAW,KAAK,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,MAAM,KAAK,SAAS;YAC5E,CAAC,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC;YAC1F,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QAC1B,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,OAAO;YAAE,OAAO,OAAO,CAAC;QAC5B,IACC,MAAM,CAAC,WAAW,KAAK,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC;YAChD,CAAC,MAAM,CAAC,QAAQ;YAChB,CAAC,MAAM,CAAC,mBAAmB;YAC3B,MAAM,KAAK,SAAS;YACpB,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;YAC9B,OAAO,SAAS,CAAC;QAEnB,MAAM,OAAO,GAAwB;YACpC,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,GAAG,EAAE,IAAI,CAAC,QAAQ;SAClB,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;QACvB,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,IAAI;QACH,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QACnF,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,eAAe;YAAE,OAAO,SAAS,CAAC;QAC/E,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;IAED,MAAM;QACL,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QACnF,MAAM,OAAO,GAAwB;YACpC,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,MAAM,EAAE,IAAI,CAAC,OAAO;SACpB,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;QACvB,OAAO,OAAO,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,iBAAiB,CAAC,MAAc;QAC/B,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC/C,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACvD,OAAO,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,OAAO,CAAC;IAC/C,CAAC;IAED,IAAI;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QAC1F,OAAO,GAAG,CAAC;IACZ,CAAC;CACD;AAED,6FAA6F;AAC7F,SAAS,kBAAkB,CAAC,MAA2B;IACtD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IACzD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,UAAU,CACnB,4EAA4E,MAAM,CAAC,SAAS,EAAE,CAC9F,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,SAAS,CAAC;AACzB,CAAC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
export interface MulticastSignalingEndpoint {
|
|
2
|
+
endpointId: string;
|
|
3
|
+
endpointVersion: number;
|
|
4
|
+
protocol: "ssm" | "asm" | "amt";
|
|
5
|
+
sourceAddress?: string;
|
|
6
|
+
groupAddress: string;
|
|
7
|
+
port: number;
|
|
8
|
+
validUntil?: number;
|
|
9
|
+
tracks: Array<{
|
|
10
|
+
name: string;
|
|
11
|
+
packetId?: number;
|
|
12
|
+
[key: string]: unknown;
|
|
13
|
+
}>;
|
|
14
|
+
[key: string]: unknown;
|
|
15
|
+
}
|
|
16
|
+
type Catalog = Record<string, any>;
|
|
17
|
+
type Signal = Record<string, any>;
|
|
18
|
+
export declare function createMulticastSignalingReconciler(catalog: Catalog, options?: {
|
|
19
|
+
catalog?: Catalog;
|
|
20
|
+
}): {
|
|
21
|
+
apply(signal: Signal, now?: number): {
|
|
22
|
+
applied: boolean;
|
|
23
|
+
reason?: string;
|
|
24
|
+
action?: string;
|
|
25
|
+
};
|
|
26
|
+
snapshot: (now?: number) => {
|
|
27
|
+
catalogVersion: number;
|
|
28
|
+
endpoints: MulticastSignalingEndpoint[];
|
|
29
|
+
dormantEndpointIds: string[];
|
|
30
|
+
};
|
|
31
|
+
toCatalog(now?: number): {
|
|
32
|
+
multicast: any;
|
|
33
|
+
};
|
|
34
|
+
};
|
|
35
|
+
export declare function normalizeCatalogEndpoints(catalog: Catalog): MulticastSignalingEndpoint[];
|
|
36
|
+
export {};
|
|
37
|
+
//# sourceMappingURL=multicast-signaling-reconciler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multicast-signaling-reconciler.d.ts","sourceRoot":"","sources":["../src/multicast-signaling-reconciler.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,0BAA0B;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,CAAC;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAED,KAAK,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACnC,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAElC,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO;kBAcxF,MAAM;iBAyBwC,OAAO;iBAAW,MAAM;iBAAW,MAAM;;;;;;;;;;EA4DtG;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,0BAA0B,EAAE,CAMxF"}
|
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
import { isMulticastTrackPacketId, isValidMulticastGroupAddress } from "./endpoint-config.js";
|
|
2
|
+
export function createMulticastSignalingReconciler(catalog, options = {}) {
|
|
3
|
+
const initial = normalizeCatalogEndpoints(catalog);
|
|
4
|
+
const endpoints = new Map(initial.map(endpoint => [endpoint.endpointId, copyEndpoint(endpoint)]));
|
|
5
|
+
const versions = new Map(initial.map(endpoint => [endpoint.endpointId, endpoint.endpointVersion]));
|
|
6
|
+
const seen = new Set();
|
|
7
|
+
const dormant = new Set();
|
|
8
|
+
let catalogVersion = Number(catalog?.multicast?.version ?? catalog?.version ?? 0) || 0;
|
|
9
|
+
const snapshot = (now = Date.now()) => ({
|
|
10
|
+
catalogVersion,
|
|
11
|
+
endpoints: [...endpoints.values()].filter(endpoint => !dormant.has(endpoint.endpointId) && !isExpired(endpoint, now)).map(copyEndpoint),
|
|
12
|
+
dormantEndpointIds: [...dormant].sort(),
|
|
13
|
+
});
|
|
14
|
+
return {
|
|
15
|
+
apply(signal, now = Date.now()) {
|
|
16
|
+
if (!isObject(signal) || typeof signal.type !== "string" || typeof signal.msgId !== "string")
|
|
17
|
+
return { applied: false, reason: "invalid-message" };
|
|
18
|
+
if (seen.has(signal.msgId))
|
|
19
|
+
return { applied: false, reason: "duplicate-message" };
|
|
20
|
+
if (signal.expiresAt != null && Number(signal.expiresAt) < now)
|
|
21
|
+
return { applied: false, reason: "expired" };
|
|
22
|
+
const signalCatalogVersion = Number(signal.catalogVersion ?? 0);
|
|
23
|
+
if (!Number.isFinite(signalCatalogVersion))
|
|
24
|
+
return { applied: false, reason: "invalid-message" };
|
|
25
|
+
if (signalCatalogVersion < catalogVersion)
|
|
26
|
+
return { applied: false, reason: "stale-catalog" };
|
|
27
|
+
const result = applyFresh(signal, now);
|
|
28
|
+
if (result.applied) {
|
|
29
|
+
seen.add(signal.msgId);
|
|
30
|
+
// A heartbeat proves liveness but carries no catalog state. Ratcheting
|
|
31
|
+
// here would incorrectly reject the next real snapshot as stale.
|
|
32
|
+
if (signal.type !== "heartbeat") {
|
|
33
|
+
catalogVersion = Math.max(catalogVersion, signalCatalogVersion);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return result;
|
|
37
|
+
},
|
|
38
|
+
snapshot,
|
|
39
|
+
toCatalog(now = Date.now()) {
|
|
40
|
+
const current = snapshot(now);
|
|
41
|
+
return { ...catalog, multicast: { ...catalog.multicast, version: current.catalogVersion, endpoints: current.endpoints } };
|
|
42
|
+
},
|
|
43
|
+
};
|
|
44
|
+
function applyFresh(signal, now) {
|
|
45
|
+
switch (signal.type) {
|
|
46
|
+
case "snapshot": {
|
|
47
|
+
const next = signal.payload?.endpoints;
|
|
48
|
+
if (!Array.isArray(next))
|
|
49
|
+
return { applied: false, reason: "invalid-message" };
|
|
50
|
+
const normalized = next.map((endpoint, index) => normalizeEndpoint(endpoint, index));
|
|
51
|
+
if (normalized.some(endpoint => !endpoint || !isValidEndpoint(endpoint, options.catalog)))
|
|
52
|
+
return { applied: false, reason: "invalid-endpoint" };
|
|
53
|
+
const ids = new Set(normalized.map(endpoint => endpoint.endpointId));
|
|
54
|
+
if (ids.size !== normalized.length)
|
|
55
|
+
return { applied: false, reason: "duplicate-endpoint" };
|
|
56
|
+
endpoints.clear();
|
|
57
|
+
versions.clear();
|
|
58
|
+
dormant.clear();
|
|
59
|
+
for (const endpoint of normalized) {
|
|
60
|
+
versions.set(endpoint.endpointId, endpoint.endpointVersion);
|
|
61
|
+
if (!isExpired(endpoint, now))
|
|
62
|
+
endpoints.set(endpoint.endpointId, copyEndpoint(endpoint));
|
|
63
|
+
}
|
|
64
|
+
return { applied: true, action: "snapshot" };
|
|
65
|
+
}
|
|
66
|
+
case "add": return upsert(signal.payload?.endpoint, now);
|
|
67
|
+
case "update": {
|
|
68
|
+
const id = signal.payload?.endpointId;
|
|
69
|
+
const fields = signal.payload?.fields;
|
|
70
|
+
if (!endpoints.has(id))
|
|
71
|
+
return { applied: false, reason: "unknown-endpoint" };
|
|
72
|
+
if (isStale(id, signal.payload?.endpointVersion))
|
|
73
|
+
return { applied: false, reason: "stale-endpoint" };
|
|
74
|
+
if (!isObject(fields) || ["protocol", "sourceAddress", "groupAddress", "port"].some(key => Object.hasOwn(fields, key)))
|
|
75
|
+
return { applied: false, reason: "invalid-update" };
|
|
76
|
+
return upsert({ ...endpoints.get(id), ...fields, endpointVersion: signal.payload.endpointVersion }, now);
|
|
77
|
+
}
|
|
78
|
+
case "remove": {
|
|
79
|
+
const id = signal.payload?.endpointId;
|
|
80
|
+
if (!endpoints.has(id))
|
|
81
|
+
return { applied: false, reason: "unknown-endpoint" };
|
|
82
|
+
const endpointVersion = Number(signal.payload?.endpointVersion);
|
|
83
|
+
if (!Number.isFinite(endpointVersion))
|
|
84
|
+
return { applied: false, reason: "invalid-message" };
|
|
85
|
+
if (isStale(id, endpointVersion))
|
|
86
|
+
return { applied: false, reason: "stale-endpoint" };
|
|
87
|
+
endpoints.delete(id);
|
|
88
|
+
dormant.delete(id);
|
|
89
|
+
versions.set(id, endpointVersion);
|
|
90
|
+
return { applied: true, action: "drop" };
|
|
91
|
+
}
|
|
92
|
+
case "invalidate": {
|
|
93
|
+
const id = signal.payload?.endpointId;
|
|
94
|
+
if (!endpoints.has(id))
|
|
95
|
+
return { applied: false, reason: "unknown-endpoint" };
|
|
96
|
+
dormant.add(id);
|
|
97
|
+
return { applied: true, action: "drop" };
|
|
98
|
+
}
|
|
99
|
+
case "heartbeat": return { applied: true, action: "heartbeat" };
|
|
100
|
+
default: return { applied: false, reason: "unknown-message-type" };
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
function upsert(value, now) {
|
|
104
|
+
const endpoint = normalizeEndpoint(value, endpoints.size);
|
|
105
|
+
if (!endpoint || !isValidEndpoint(endpoint, options.catalog))
|
|
106
|
+
return { applied: false, reason: "invalid-endpoint" };
|
|
107
|
+
if (isStale(endpoint.endpointId, endpoint.endpointVersion))
|
|
108
|
+
return { applied: false, reason: "stale-endpoint" };
|
|
109
|
+
versions.set(endpoint.endpointId, endpoint.endpointVersion);
|
|
110
|
+
dormant.delete(endpoint.endpointId);
|
|
111
|
+
if (isExpired(endpoint, now))
|
|
112
|
+
endpoints.delete(endpoint.endpointId);
|
|
113
|
+
else
|
|
114
|
+
endpoints.set(endpoint.endpointId, copyEndpoint(endpoint));
|
|
115
|
+
return { applied: true, action: isExpired(endpoint, now) ? "drop" : "candidate" };
|
|
116
|
+
}
|
|
117
|
+
function isStale(id, version) {
|
|
118
|
+
const current = versions.get(id);
|
|
119
|
+
return current !== undefined && Number(version) <= current;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
export function normalizeCatalogEndpoints(catalog) {
|
|
123
|
+
const endpoints = catalog?.multicast?.endpoints;
|
|
124
|
+
if (!Array.isArray(endpoints))
|
|
125
|
+
return [];
|
|
126
|
+
return endpoints
|
|
127
|
+
.map(normalizeEndpoint)
|
|
128
|
+
.filter((endpoint) => !!endpoint && isValidEndpoint(endpoint, catalog));
|
|
129
|
+
}
|
|
130
|
+
function normalizeEndpoint(value, index) {
|
|
131
|
+
if (!isObject(value))
|
|
132
|
+
return undefined;
|
|
133
|
+
const endpoint = value;
|
|
134
|
+
const tracks = Array.isArray(endpoint.tracks) ? endpoint.tracks.map(track => typeof track === "string" ? { name: track } : { ...track }).filter(track => track.name) : [];
|
|
135
|
+
return { ...endpoint, endpointId: endpoint.endpointId || `${endpoint.sourceAddress || ""}|${endpoint.groupAddress || ""}|${endpoint.port || ""}|${index}`, endpointVersion: Number(endpoint.endpointVersion ?? 0), tracks };
|
|
136
|
+
}
|
|
137
|
+
function isValidEndpoint(endpoint, catalog) {
|
|
138
|
+
if (!endpoint.endpointId || !Number.isFinite(endpoint.endpointVersion))
|
|
139
|
+
return false;
|
|
140
|
+
if (!["ssm", "asm", "amt"].includes(endpoint.protocol))
|
|
141
|
+
return false;
|
|
142
|
+
if (endpoint.protocol === "ssm" && (typeof endpoint.sourceAddress !== "string" || endpoint.sourceAddress.trim().length === 0))
|
|
143
|
+
return false;
|
|
144
|
+
if (!isValidMulticastGroupAddress(endpoint.groupAddress) || !Number.isInteger(Number(endpoint.port)) || endpoint.port <= 0 || endpoint.port > 65535 || !endpoint.tracks.length)
|
|
145
|
+
return false;
|
|
146
|
+
const catalogTracks = new Set([...Object.keys(catalog?.video?.renditions ?? {}), ...Object.keys(catalog?.audio?.renditions ?? {})]);
|
|
147
|
+
// Every track must carry a valid packet_id (isMulticastTrackPacketId); one
|
|
148
|
+
// that does not -- including packet_id 0, the MMTP signaling flow --
|
|
149
|
+
// rejects the whole endpoint rather than silently dropping that track.
|
|
150
|
+
return endpoint.tracks.every(track => !!track.name && isMulticastTrackPacketId(track.packetId) && (catalogTracks.size === 0 || catalogTracks.has(track.name) || catalogTracks.has(track.name.replace(/\/repair$/, ""))));
|
|
151
|
+
}
|
|
152
|
+
function copyEndpoint(endpoint) {
|
|
153
|
+
return { ...endpoint, tracks: endpoint.tracks.map(track => ({ ...track })) };
|
|
154
|
+
}
|
|
155
|
+
function isExpired(endpoint, now) {
|
|
156
|
+
return endpoint.validUntil != null && Number(endpoint.validUntil) < now;
|
|
157
|
+
}
|
|
158
|
+
function isObject(value) {
|
|
159
|
+
return value !== null && typeof value === "object";
|
|
160
|
+
}
|
|
161
|
+
//# sourceMappingURL=multicast-signaling-reconciler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multicast-signaling-reconciler.js","sourceRoot":"","sources":["../src/multicast-signaling-reconciler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multicast-subscription-pool.d.ts","sourceRoot":"","sources":["../src/multicast-subscription-pool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"multicast-subscription-pool.d.ts","sourceRoot":"","sources":["../src/multicast-subscription-pool.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACX,eAAe,EACf,sBAAsB,EAEtB,gCAAgC,EAChC,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,6BAA6B;IAC7C,OAAO,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,OAAO,CAAC,CAAC,KAAK,EAAE,gCAAgC,GAAG,IAAI,CAAC;IACxD,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CAC7B;AAmBD,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAED,wFAAwF;AACxF,qBAAa,yBAAyB;;IAK/B,OAAO,CACZ,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,6BAA6B,GACrC,OAAO,CAAC,0BAA0B,CAAC;IA0DtC,IAAI,IAAI,IAAI,MAAM,CAA+B;CAuFjD;AAED,eAAO,MAAM,yBAAyB,2BAAkC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { multicastEndpointKey, normalizeMulticastEndpoint } from "./endpoint-config.js";
|
|
1
|
+
import { multicastEndpointKey, normalizeMulticastEndpoint, toWindowMulticastSubscribeConfig, } from "./endpoint-config.js";
|
|
2
|
+
import { subscriptionDeliversPacketBatches } from "./packet-batch.js";
|
|
2
3
|
/** Shares only IWA multicast/AMT subscriptions. Unicast sessions remain per manager. */
|
|
3
4
|
export class MulticastSubscriptionPool {
|
|
4
5
|
#entries = new Map();
|
|
@@ -70,20 +71,35 @@ export class MulticastSubscriptionPool {
|
|
|
70
71
|
}
|
|
71
72
|
get size() { return this.#entries.size; }
|
|
72
73
|
async #createEntry(gateway, endpoint, onClosed) {
|
|
73
|
-
const subscription = await gateway.subscribe({
|
|
74
|
+
const subscription = await gateway.subscribe(toWindowMulticastSubscribeConfig({
|
|
74
75
|
group: endpoint.groupAddress,
|
|
75
76
|
...(endpoint.sourceAddress ? { source: endpoint.sourceAddress } : {}),
|
|
76
77
|
port: endpoint.port,
|
|
77
|
-
consume: "bytes",
|
|
78
78
|
...(endpoint.mode ? { mode: endpoint.mode } : {}),
|
|
79
79
|
...(endpoint.amtRelay ? { amtRelay: endpoint.amtRelay } : {}),
|
|
80
80
|
...(endpoint.amtRelayPort ? { amtRelayPort: endpoint.amtRelayPort } : {}),
|
|
81
|
-
});
|
|
81
|
+
}));
|
|
82
82
|
const consumers = new Map();
|
|
83
83
|
let entry;
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
84
|
+
// A batch is delivered as the same per-packet onBytes calls the bytes
|
|
85
|
+
// surface makes, in arrival order and with each call isolated, so a
|
|
86
|
+
// consumer cannot tell the two apart; only the DOM event per packet is
|
|
87
|
+
// gone. The batch array and its elements are the provider's own, uncopied.
|
|
88
|
+
const packetListener = subscriptionDeliversPacketBatches(subscription)
|
|
89
|
+
? {
|
|
90
|
+
type: "packets",
|
|
91
|
+
listener: (event) => {
|
|
92
|
+
for (const data of event.detail) {
|
|
93
|
+
this.#dispatch(consumers, (consumer) => consumer.onBytes(data));
|
|
94
|
+
}
|
|
95
|
+
},
|
|
96
|
+
}
|
|
97
|
+
: {
|
|
98
|
+
type: "bytes",
|
|
99
|
+
listener: (event) => {
|
|
100
|
+
this.#dispatch(consumers, (consumer) => consumer.onBytes(event.detail));
|
|
101
|
+
},
|
|
102
|
+
};
|
|
87
103
|
const stateListener = (event) => {
|
|
88
104
|
this.#dispatch(consumers, (consumer) => consumer.onState?.(event.detail));
|
|
89
105
|
if (event.detail === "closed" && !entry.closed) {
|
|
@@ -95,8 +111,13 @@ export class MulticastSubscriptionPool {
|
|
|
95
111
|
const error = event.detail instanceof Error ? event.detail : new Error(String(event.detail));
|
|
96
112
|
this.#dispatch(consumers, (consumer) => consumer.onError?.(error));
|
|
97
113
|
};
|
|
98
|
-
entry = { subscription, consumers,
|
|
99
|
-
|
|
114
|
+
entry = { subscription, consumers, packetListener, stateListener, errorListener, closed: false };
|
|
115
|
+
if (packetListener.type === "packets") {
|
|
116
|
+
subscription.addEventListener("packets", packetListener.listener);
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
subscription.addEventListener("bytes", packetListener.listener);
|
|
120
|
+
}
|
|
100
121
|
subscription.addEventListener("state", stateListener);
|
|
101
122
|
subscription.addEventListener("error", errorListener);
|
|
102
123
|
return entry;
|
|
@@ -111,7 +132,13 @@ export class MulticastSubscriptionPool {
|
|
|
111
132
|
return id;
|
|
112
133
|
}
|
|
113
134
|
#detach(entry) {
|
|
114
|
-
|
|
135
|
+
const { packetListener } = entry;
|
|
136
|
+
if (packetListener.type === "packets") {
|
|
137
|
+
entry.subscription.removeEventListener("packets", packetListener.listener);
|
|
138
|
+
}
|
|
139
|
+
else {
|
|
140
|
+
entry.subscription.removeEventListener("bytes", packetListener.listener);
|
|
141
|
+
}
|
|
115
142
|
entry.subscription.removeEventListener("state", entry.stateListener);
|
|
116
143
|
entry.subscription.removeEventListener("error", entry.errorListener);
|
|
117
144
|
}
|