@3dsource/angular-unreal-module 0.0.199 → 0.0.200-dev.0

package/fesm2022/3dsource-angular-unreal-module.mjs

@@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component, DestroyRef, Directive, ElementRef,
 import { JsonPipe, NgOptimizedImage, NgTemplateOutlet } from "@angular/common";
 import { Store, createAction, createFeature, createReducer, createSelector, on, props, provideState } from "@ngrx/store";
 import { Actions, createEffect, ofType, provideEffects } from "@ngrx/effects";
-import { BehaviorSubject, EMPTY, NEVER, Observable, Subject, Subscription, animationFrameScheduler, asyncScheduler, bufferTime, combineLatestWith, concat, concatMap, debounceTime, defer, delay, filter, firstValueFrom, from, fromEvent, ignoreElements, interval, map, merge, mergeMap, of, pairwise, repeat, retry, scan, share, shareReplay, skip, startWith, switchMap, take, takeUntil, takeWhile, tap, throttleTime, throwError, timeout, timer, timestamp, withLatestFrom } from "rxjs";
+import { BehaviorSubject, EMPTY, NEVER, Observable, Subject, Subscription, TimeoutError, animationFrameScheduler, asyncScheduler, bufferTime, combineLatestWith, concat, concatMap, debounceTime, defer, delay, filter, firstValueFrom, from, fromEvent, ignoreElements, interval, map, merge, mergeMap, of, pairwise, repeat, retry, scan, share, shareReplay, skip, startWith, switchMap, take, takeUntil, takeWhile, tap, throttleTime, throwError, timeout, timer, timestamp, withLatestFrom } from "rxjs";
 import { UNREAL_CONFIG } from "@3dsource/angular-unreal-module/config";
 import { catchError, debounceTime as debounceTime$1, distinctUntilChanged, exhaustMap, filter as filter$1, finalize, first, map as map$1, startWith as startWith$1, switchMap as switchMap$1, take as take$1, takeUntil as takeUntil$1, takeWhile as takeWhile$1, tap as tap$1, timeout as timeout$1, withLatestFrom as withLatestFrom$1 } from "rxjs/operators";
 import { v4 } from "uuid";
@@ -1804,6 +1804,7 @@ const ORCHESTRATION_ERROR_CODES = {
 };
 const RETRY_CODES = /* @__PURE__ */ new Set([ORCHESTRATION_ERROR_CODES.NO_AVAILABLE_INSTANCES.code, ORCHESTRATION_ERROR_CODES.LIMIT_REACHED.code]);
 function OrchestrationErrorHandler(msg) {
+	this.onOrchestrationError$.next(msg.payload);
 	if (RETRY_CODES.has(msg.payload.code)) {
 		const errorInfo = Object.values(ORCHESTRATION_ERROR_CODES).find(({ code }) => code === msg.payload.code);
 		this.store.dispatch(setOrchestrationMessage({ message: errorInfo?.description }));
@@ -1831,6 +1832,10 @@ var SignallingService = class SignallingService extends SubService {
 		this.onWebRtcIce$ = new Subject();
 		this.onWebRtcAnswer$ = new Subject();
 		this.onInstanceReady$ = new Subject();
+		this.onRequestStreamSent$ = new Subject();
+		this.onOrchestrationError$ = new Subject();
+		this.onCirrusClose$ = new Subject();
+		this.onPollResponse$ = new Subject();
 		this.abort$ = this.actions$.pipe(ofType(abortEstablishingConnection));
 		this.ws = null;
 		this.controlWs = null;
@@ -1978,8 +1983,13 @@ var SignallingService = class SignallingService extends SubService {
 		}));
 	}
 	pollLoop(url) {
-		return defer(() => this.httpClient.get(url)).pipe(timeout(POLLING_TIME), catchError((err) => {
+		let sentAt = 0;
+		return defer(() => {
+			sentAt = performance.now();
+			return this.httpClient.get(url);
+		}).pipe(timeout(POLLING_TIME), tap$1((data) => this.onPollResponse$.next(pollResponse(200, data, sentAt))), catchError((err) => {
 			const status = err?.status;
+			this.onPollResponse$.next(pollResponse(typeof status === "number" && status > 0 ? status : err instanceof TimeoutError ? "timeout" : "network", null, sentAt));
 			if (typeof status === "number" && status >= 400 && status < 500 && status !== 429) {
 				Logger.warn(`Polling HARD error on ${url} (HTTP ${status}); rotating URL`);
 				return throwError(() => err);
@@ -2122,6 +2132,7 @@ var SignallingService = class SignallingService extends SubService {
 				context
 			}
 		});
+		this.onRequestStreamSent$.next(this.correlationId);
 	}
 	isConnected() {
 		return !!(this.ws && this.ws.readyState === 1);
@@ -2161,6 +2172,15 @@ i0.ɵɵngDeclareClassMetadata({
 	}],
 	ctorParameters: () => []
 });
+function pollResponse(status, data, sentAt) {
+	return {
+		status,
+		ms: Math.round(performance.now() - sentAt),
+		ready: !!data?.signallingServer,
+		percent: data?.info?.percent ?? null,
+		message: data?.mm_message || data?.error || null
+	};
+}
 function finite(value) {
 	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
@@ -2908,6 +2928,13 @@ var StreamAdoptionService = class StreamAdoptionService {
 		this.store = inject(Store);
 		this.signalling = inject(SignallingService);
 		this.webRtc = inject(WebRtcPlayerService);
+		this.report$ = new Subject();
+		this.waitStarted$ = new Subject();
+		this.waiting = null;
+	}
+	waitingReport() {
+		const w = this.waiting;
+		return w ? reportOf(w.parked, "waiting", w.sincePerf) : null;
 	}
 	awaitAndAdopt$() {
 		return defer(() => {
@@ -2917,32 +2944,47 @@ var StreamAdoptionService = class StreamAdoptionService {
 				return of(false);
 			}
 			if (isAppOwned(slot)) return of(false);
-			if (slot.state !== "connecting") return of(this.tryAdoptOrTakeSlot());
+			if (slot.state !== "connecting") return of(this.settle(slot, null));
 			Logger.info("[Adoption] Prefetch in progress — waiting before connecting");
+			this.waitStarted$.next();
 			return this.awaitSettled$(slot);
 		});
 	}
 	awaitSettled$(parked) {
 		return new Observable((subscriber) => {
 			let done = false;
+			const sincePerf = performance.now();
+			this.waiting = {
+				parked,
+				sincePerf
+			};
 			parked.onSettled(() => {
 				if (done) return;
 				done = true;
-				let adopted = false;
-				try {
-					adopted = this.tryAdoptOrTakeSlot();
-				} catch (e) {
-					Logger.error("[Adoption] Adoption threw — falling back", e);
-					this.takeSlot();
-				}
-				subscriber.next(adopted);
+				this.waiting = null;
+				subscriber.next(this.settle(parked, sincePerf));
 				subscriber.complete();
 			});
 			return () => {
+				if (done) return;
 				done = true;
+				this.waiting = null;
+				this.report$.next(reportOf(parked, "abandoned", sincePerf));
 			};
 		});
 	}
+	settle(parked, sincePerf) {
+		let adopted = false;
+		try {
+			adopted = this.tryAdoptOrTakeSlot();
+		} catch (e) {
+			Logger.error("[Adoption] Adoption threw — falling back", e);
+			this.takeSlot();
+		}
+		const outcome = adopted ? "adopted" : parked.state === "failed" ? "failed" : parked.state === "ready" ? "dead" : null;
+		if (outcome) this.report$.next(reportOf(parked, outcome, sincePerf));
+		return adopted;
+	}
 	tryAdoptOrTakeSlot() {
 		const adopted = this.tryAdopt();
 		if (!adopted) this.takeSlot();
@@ -2969,7 +3011,7 @@ var StreamAdoptionService = class StreamAdoptionService {
 		if (!slot || isAppOwned(slot)) return false;
 		const parked = slot;
 		if (parked.state !== "ready") return false;
-		if (!parked.ws || parked.ws.readyState !== 1 || !parked.pc || !parked.dc || !parked.stream) {
+		if (parked.deadReason || !parked.ws || parked.ws.readyState !== 1 || !parked.pc || DEAD_PC_STATES.has(parked.pc.connectionState) || !parked.dc || DEAD_DC_STATES.has(parked.dc.readyState) || !parked.stream) {
 			Logger.warn("[Adoption] Parked stream is ready but transport is not live");
 			return false;
 		}
@@ -2980,6 +3022,7 @@ var StreamAdoptionService = class StreamAdoptionService {
 			pollingUrl: parked.pollingUrl ?? null,
 			ssData: parked.ssData ?? null,
 			streamRequestId: parked.ids?.streamRequestId || null,
+			correlationId: parked.ids?.correlationId || null,
 			kind: parked.kind ?? null,
 			instanceName: parked.instanceName ?? null,
 			eta: parked.eta ?? null,
@@ -3020,6 +3063,20 @@ i0.ɵɵngDeclareClassMetadata({
 		args: [{ providedIn: "root" }]
 	}]
 });
+const DEAD_PC_STATES = /* @__PURE__ */ new Set(["failed", "closed"]);
+const DEAD_DC_STATES = /* @__PURE__ */ new Set(["closing", "closed"]);
+function reportOf(parked, outcome, sincePerf) {
+	return {
+		outcome,
+		failReason: outcome === "dead" ? parked.deadReason ?? "transport-not-live" : parked.failReason ?? null,
+		failError: parked.failError ?? null,
+		waitMs: sincePerf === null ? null : Math.round(performance.now() - sincePerf),
+		kind: parked.kind ?? null,
+		instanceName: parked.instanceName ?? null,
+		streamRequestId: parked.ids?.streamRequestId || null,
+		trail: [...parked.trail ?? []]
+	};
+}
 var UnrealCallbackService = class UnrealCallbackService {
 	constructor() {
 		this.actions$ = inject(Actions);
@@ -3542,6 +3599,10 @@ const dropCodes = [
 function OnCloseHandler(e) {
 	const message = `WebSocket closed: ${JSON.stringify(e.code)} - ${e.reason}`;
 	Logger.warn(message);
+	this.onCirrusClose$.next({
+		code: e.code,
+		reason: e.reason
+	});
 	this.store.dispatch(setCirrusDisconnected());
 	if (dropCodes.includes(e.code)) this.store.dispatch(dropConnection());
 }
@@ -5155,6 +5216,7 @@ var StreamStatusTelemetryService2 = class StreamStatusTelemetryService2 {
 		this.videoService = inject(VideoService);
 		this.signallingService = inject(SignallingService);
 		this.webRtcPlayer = inject(WebRtcPlayerService);
+		this.adoption = inject(StreamAdoptionService);
 		this.unrealConfig = inject(UNREAL_CONFIG, { optional: true });
 		this.destroyRef = inject(DestroyRef);
 		this.destroy$ = new Subject();
@@ -5203,6 +5265,10 @@ var StreamStatusTelemetryService2 = class StreamStatusTelemetryService2 {
 				id: "region-resolving",
 				color: "#61afef",
 				milestones: [
+					{
+						id: "prefetch-wait-start",
+						event: this.adoption.waitStarted$
+					},
 					{
 						id: "region-ping-fetch-start",
 						event: this.actions$.pipe(ofType(regionPingFetchStart))
@@ -5235,6 +5301,10 @@ var StreamStatusTelemetryService2 = class StreamStatusTelemetryService2 {
 						id: "polling-ended",
 						event: this.actions$.pipe(ofType(pollingEnded))
 					},
+					{
+						id: "request-stream-sent",
+						event: this.signallingService.onRequestStreamSent$
+					},
 					this.awsInstanceResolvedEntry,
 					this.signalingServerConnectedEntry,
 					{
@@ -5248,12 +5318,7 @@ var StreamStatusTelemetryService2 = class StreamStatusTelemetryService2 {
 					this.configReceivedEntry,
 					{
 						id: "ssinfo-received",
-						event: this.store.select(unrealFeature.selectSsData).pipe(filter(Boolean), take(1), withLatestFrom(this.store.select(unrealFeature.selectAwsInstance), this.store.select(selectCirrusConnectionId)), map(([ssData, aws, connectionId]) => ({
-							client: aws.wsUrl,
-							instanceName: aws.instanceName,
-							...ssData,
-							connectionId
-						})))
+						event: this.store.select(unrealFeature.selectSsData).pipe(filter(Boolean), take(1), map(() => this.signalingParams()))
 					}
 				]
 			},
@@ -5396,12 +5461,48 @@ var StreamStatusTelemetryService2 = class StreamStatusTelemetryService2 {
 			handshakeFlow: null,
 			commandCount: 0,
 			times,
-			openPhaseIdx: 0
+			openPhaseIdx: 0,
+			connectCorrelationId: null,
+			orchestrationError: null,
+			iceServers: null,
+			cirrusClose: null,
+			aws: null,
+			prefetchReported: false,
+			polls: {
+				count: 0,
+				errors: 0,
+				last: null
+			}
 		};
 		sub.add(this.store.select(selectCirrusConnectionId).pipe(filter(Boolean), take(1)).subscribe((connectionId) => this.resolveWireId(connectionId)));
 		sub.add(this.signallingService.onWebRtcIce$.pipe(filter(Boolean)).subscribe(() => {
 			if (this.session) this.session.iceCandidateCount++;
 		}));
+		sub.add(this.signallingService.onRequestStreamSent$.subscribe((id) => {
+			if (!this.session) return;
+			this.session.connectCorrelationId = id;
+			this.session.aws = null;
+		}));
+		sub.add(this.signallingService.onOrchestrationError$.subscribe((e) => {
+			if (this.session) this.session.orchestrationError = `${e?.code}: ${e?.message ?? ""}`;
+		}));
+		sub.add(this.signallingService.onConfig$.pipe(take(1)).subscribe((msg) => {
+			if (this.session) this.session.iceServers = iceServerHosts(msg?.peerConnectionOptions?.iceServers);
+		}));
+		sub.add(this.actions$.pipe(ofType(setAwsInstance)).subscribe(() => {
+			if (this.session) this.session.aws = this.awsInstance$();
+		}));
+		sub.add(this.signallingService.onCirrusClose$.subscribe((close) => {
+			if (this.session) this.session.cirrusClose = close;
+		}));
+		sub.add(this.signallingService.onPollResponse$.subscribe((poll) => {
+			const polls = this.session?.polls;
+			if (!polls) return;
+			polls.count++;
+			if (poll.status !== 200) polls.errors++;
+			polls.last = poll;
+		}));
+		sub.add(this.adoption.report$.subscribe((report) => this.trackPrefetch(report)));
 		sub.add(this.actions$.pipe(ofType(answerSent), take(1)).subscribe(() => {
 			if (this.session) this.session.handshakeFlow = "server-offer";
 		}));
@@ -5447,7 +5548,10 @@ var StreamStatusTelemetryService2 = class StreamStatusTelemetryService2 {
 				}));
 			});
 		});
-		sub.add(this.actions$.pipe(ofType(streamAdopted)).subscribe(({ timings, region }) => this.emitAdoptedConnection(timings, region)));
+		sub.add(this.actions$.pipe(ofType(streamAdopted)).subscribe(({ timings, region, correlationId }) => {
+			if (this.session && correlationId) this.session.connectCorrelationId = correlationId;
+			this.emitAdoptedConnection(timings, region);
+		}));
 		const bootstrapInfo = this.collectBootstrapInfo();
 		const embedderUrl = this.collectEmbedderUrl();
 		this.emitLifecycle("stream.session_started", {
@@ -5475,14 +5579,19 @@ var StreamStatusTelemetryService2 = class StreamStatusTelemetryService2 {
 		const errorMessage = this.errorMessage$();
 		const granularMessage = errorMessage?.reason === granularReason ? errorMessage.message : void 0;
 		const includeGranular = granularReason && granularReason !== DisconnectReason.None;
+		const waiting = this.adoption.waitingReport();
+		if (waiting) this.trackPrefetch(waiting);
 		const openPhase = this.phaseCatalog[session.openPhaseIdx];
-		if (openPhase) this.emitPhaseEnded(openPhase, session.openPhaseIdx, null, true);
+		if (openPhase) this.emitPhaseEnded(openPhase, session.openPhaseIdx, openPhase.id === "signaling-connection" ? this.signalingParams() : null, true);
 		this.flushPaks(true);
+		const close = session.cirrusClose;
 		this.emitLifecycle("stream.session_ended", {
 			sessionId: id,
 			reason,
 			...includeGranular ? { disconnectReason: granularReason } : {},
 			...includeGranular && granularMessage ? { disconnectMessage: granularMessage } : {},
+			...close && { closeCode: close.code },
+			...close?.reason && { closeReason: close.reason },
 			timestamp: (/* @__PURE__ */ new Date()).toISOString()
 		});
 		this.flushOutbox(session, id);
@@ -5561,7 +5670,7 @@ var StreamStatusTelemetryService2 = class StreamStatusTelemetryService2 {
 		const region = parkedRegion ?? NO_REGION;
 		this.emitAdoptedPhase(0, startMs, 0, adoptionAtMs, regionParams(region));
 		this.emitAdoptedPhase(1, startMs, sigDur, adoptionAtMs, {
-			...this.adoptedSignalingParams(),
+			...this.signalingParams(),
 			...savings,
 			prefetchSignalingMs: sigDur
 		}, [{
@@ -5596,13 +5705,22 @@ var StreamStatusTelemetryService2 = class StreamStatusTelemetryService2 {
 		});
 		this.closePhase(bucketIdx);
 	}
-	adoptedSignalingParams() {
-		const aws = this.awsInstance$();
-		const ssData = this.ssData$();
+	signalingParams() {
+		const s = this.session;
+		const aws = s?.aws ?? this.awsInstance$();
 		return {
 			client: aws?.wsUrl ?? null,
 			instanceName: aws?.instanceName ?? null,
-			...ssData ?? {},
+			transport: aws ? aws.kind ?? "direct" : null,
+			orchestrationUrl: aws?.kind === "socket" ? aws.pollingUrl : null,
+			streamRequestId: aws?.streamRequestId ?? null,
+			connectCorrelationId: s?.connectCorrelationId ?? null,
+			orchestrationError: s?.orchestrationError ?? null,
+			iceServers: s?.iceServers ?? null,
+			orchPolls: s?.polls.count || null,
+			orchPollErrors: s?.polls.errors || null,
+			orchLastPoll: s?.polls.last ? pollText(s.polls.last) : null,
+			...this.ssData$() ?? {},
 			connectionId: this.connectionId$()
 		};
 	}
@@ -5845,6 +5963,26 @@ var StreamStatusTelemetryService2 = class StreamStatusTelemetryService2 {
 			...session?.wireId ? { sessionId: session.wireId } : {}
 		});
 	}
+	trackPrefetch(report) {
+		const session = this.session;
+		if (!session || session.prefetchReported) return;
+		session.prefetchReported = true;
+		this.track("stream.prefetch", {
+			sessionId: session.id,
+			outcome: report.outcome,
+			...report.failReason && { failReason: report.failReason },
+			...report.failError && { failError: report.failError },
+			...report.waitMs !== null && { waitMs: report.waitMs },
+			...report.kind && { kind: report.kind },
+			...report.instanceName && { instanceName: report.instanceName },
+			...report.streamRequestId && { streamRequestId: report.streamRequestId },
+			trail: report.trail.map((entry) => ({
+				...entry,
+				t: Math.round(entry.t - session.anchorPerf)
+			})),
+			timestamp: (/* @__PURE__ */ new Date()).toISOString()
+		});
+	}
 	emit(event, data) {
 		this.store.dispatch(trackTelemetryData({
 			event,
@@ -5915,6 +6053,26 @@ function iceParams(ice) {
 function fmtCounts(counts) {
 	return Object.entries(counts).map(([k, n]) => `${k} ${n}`).join(" · ") || null;
 }
+function pollText(poll) {
+	return [
+		poll.status,
+		poll.status === 200 ? poll.ready ? "ready" : "waiting" : null,
+		poll.percent !== null ? `${poll.percent}%` : null,
+		poll.message,
+		`${poll.ms}ms`
+	].filter((part) => part !== null && part !== "").join(" ");
+}
+function iceServerHosts(servers) {
+	const hosts = /* @__PURE__ */ new Set();
+	for (const server of servers ?? []) {
+		const urls = Array.isArray(server.urls) ? server.urls : [server.urls];
+		for (const url of urls) {
+			const m = /^(stuns?|turns?):([^:?/]+)/i.exec(url ?? "");
+			if (m) hosts.add(`${m[1].toLowerCase()}:${m[2].toLowerCase()}`);
+		}
+	}
+	return hosts.size ? [...hosts].join(", ") : null;
+}
 function toPhaseParams(value) {
 	if (!value || typeof value !== "object") return [];
 	const out = [];