@norskvideo/ctl-test-harness 0.1.107 → 0.1.108
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/demo/run.d.ts +4 -0
- package/demo/run.js +8 -0
- package/package.json +1 -1
package/demo/run.d.ts
CHANGED
|
@@ -229,6 +229,10 @@ export interface MoqRelayHandle {
|
|
|
229
229
|
/** The relay's operator surface: the host's loopback, or the relay by name
|
|
230
230
|
* on norsk-net in direct reach. */
|
|
231
231
|
statusUrl: string;
|
|
232
|
+
/** Direct reach: where the daemon sends browsers for WebTransport, the relay
|
|
233
|
+
* by name on norsk-net (NORSK_CTL_MOQ_RELAY_PUBLIC_URL). Absent in publish
|
|
234
|
+
* reach, where ctl's default (advertised host, published port) is right. */
|
|
235
|
+
browserUrl?: string;
|
|
232
236
|
}
|
|
233
237
|
export interface SessionOptions {
|
|
234
238
|
mode: DemoMode;
|
package/demo/run.js
CHANGED
|
@@ -335,6 +335,8 @@ export function defaultDemoDeps(cwd) {
|
|
|
335
335
|
}
|
|
336
336
|
/** ctl's MOQ_RELAY_STATUS_INTERNAL_PORT: the relay's status surface inside its container. */
|
|
337
337
|
const MOQ_RELAY_STATUS_INTERNAL_PORT = 6791;
|
|
338
|
+
/** ctl's MOQ_RELAY_INTERNAL_PORT: the relay's WebTransport listener inside its container. */
|
|
339
|
+
const MOQ_RELAY_INTERNAL_PORT = 4443;
|
|
338
340
|
/** Where the store's config is: what `config set` with no daemon writes. */
|
|
339
341
|
const CONFIG_FILE = "config.yaml";
|
|
340
342
|
/** `config set` aimed at a port nothing listens on, so it takes its no-daemon
|
|
@@ -608,6 +610,10 @@ export class DemoSession {
|
|
|
608
610
|
// Per run, not just per slug: the store dir is, and a relay a cancelled
|
|
609
611
|
// run left behind must not be adopted by the next one.
|
|
610
612
|
const container = `norsk-moq-relay-${this.slug}-${createHash("sha256").update(this.storeDir).digest("hex").slice(0, 8)}`;
|
|
613
|
+
// The relay's ports are published on the docker host, which a runner
|
|
614
|
+
// container cannot reach; on norsk-net with it, its browser reaches the
|
|
615
|
+
// relay by name. An older ctl ignores the variable.
|
|
616
|
+
const browserUrl = netReachMode() === "direct" ? `https://${container}:${MOQ_RELAY_INTERNAL_PORT}` : undefined;
|
|
611
617
|
this.moqRelay = {
|
|
612
618
|
auth,
|
|
613
619
|
container,
|
|
@@ -621,6 +627,7 @@ export class DemoSession {
|
|
|
621
627
|
statusUrl: netReachMode() === "direct"
|
|
622
628
|
? `http://${container}:${MOQ_RELAY_STATUS_INTERNAL_PORT}`
|
|
623
629
|
: `http://127.0.0.1:${statusPort}`,
|
|
630
|
+
...(browserUrl ? { browserUrl } : {}),
|
|
624
631
|
};
|
|
625
632
|
this.deps.log(`MoQ relay ${container}: :${port}, quic :${quicPort}, status :${statusPort}, auth ${auth}`);
|
|
626
633
|
return {
|
|
@@ -629,6 +636,7 @@ export class DemoSession {
|
|
|
629
636
|
NORSK_CTL_MOQ_RELAY_PORT: String(port),
|
|
630
637
|
NORSK_CTL_MOQ_RELAY_QUIC_PORT: String(quicPort),
|
|
631
638
|
NORSK_CTL_MOQ_RELAY_STATUS_PORT: String(statusPort),
|
|
639
|
+
...(browserUrl ? { NORSK_CTL_MOQ_RELAY_PUBLIC_URL: browserUrl } : {}),
|
|
632
640
|
};
|
|
633
641
|
}
|
|
634
642
|
/** The daemon never removes its relay, on shutdown or otherwise. */
|