@3dsource/angular-unreal-module 0.0.197 → 0.0.199

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

@@ -2214,10 +2214,16 @@ function iceSnapshot(stats) {
 	};
 }
 var VideoService = class VideoService extends SubService {
+	get video() {
+		return this.video$.value;
+	}
+	set video(video) {
+		this.video$.next(video);
+	}
 	constructor() {
 		super();
 		this.isVideoPlaying = this.store.selectSignal(unrealFeature.selectIsVideoPlaying);
-		this.video = null;
+		this.video$ = new BehaviorSubject(null);
 		this.audio = null;
 		this.container = null;
 		this.latencyTestTimings = new LatencyTimings();
@@ -2568,7 +2574,7 @@ var WebRtcPlayerService = class WebRtcPlayerService extends SubService {
 			const pc = this.pcClient;
 			if (!pc) return;
 			await this.setupTransceiversAsync(pc);
-			this.dcClient = this.createDataChannel(pc, "UnrealDcConnection", { ordered: true });
+			this.createDataChannel(pc, "UnrealDcConnection", { ordered: true });
 			await this.createOffer(pc);
 		} catch (e) {
 			Logger.error("Failed to create WebRTC offer", e);
@@ -2581,15 +2587,17 @@ var WebRtcPlayerService = class WebRtcPlayerService extends SubService {
 	setupPeerConnection(config) {
 		this.closePC();
 		Logger.log("Creating new RTCPeerConnection with config");
-		this.pcClient = new RTCPeerConnection(config);
-		this.handlePeerConnectionEvents(this.pcClient);
+		this.ownPeerConnection(new RTCPeerConnection(config));
+	}
+	ownPeerConnection(pc) {
+		this.pcClient = pc;
+		this.handlePeerConnectionEvents(pc);
 		this.disconnect$.pipe(take(1), takeUntil$1(this.destroy$)).subscribe(() => {
 			this.closePC();
 		});
 	}
 	createDataChannel(pc, label, options) {
-		const datachannel = pc.createDataChannel(label, options);
-		return this.setupDataChannelCallbacks(datachannel);
+		this.ownDataChannel(pc.createDataChannel(label, options));
 	}
 	handleCandidateFromServer(iceCandidate) {
 		try {
@@ -2709,23 +2717,19 @@ var WebRtcPlayerService = class WebRtcPlayerService extends SubService {
 		return true;
 	}
 	adopt(pc, dc, stream, config, dcBuffer) {
-		this.closePC();
-		this.pcClient = pc;
 		this.cfg = config ?? {};
-		this.remoteDescriptionSet = true;
+		this.videoService.create();
 		pc.onicecandidate = null;
 		pc.ondatachannel = null;
 		pc.ontrack = null;
-		this.handlePeerConnectionEvents(pc);
-		this.disconnect$.pipe(take(1), takeUntil$1(this.destroy$)).subscribe(() => this.closePC());
+		this.closePC();
+		this.ownPeerConnection(pc);
+		this.remoteDescriptionSet = true;
+		this.videoService.attachVideoStream(stream, pc);
 		dc.onmessage = null;
 		dc.onopen = null;
 		dc.onclose = null;
-		this.dcClient = this.setupDataChannelCallbacks(dc);
-		for (const buffered of dcBuffer) this.onDataChannelMessage$.next(buffered);
-		this.onDataChannelConnected();
-		this.videoService.create();
-		this.videoService.attachVideoStream(stream, pc);
+		this.ownDataChannel(dc, dcBuffer);
 	}
 	setConfig(parOptions = {}) {
 		const urlParams = new URLSearchParams(window.location.search);
@@ -2778,9 +2782,7 @@ var WebRtcPlayerService = class WebRtcPlayerService extends SubService {
 			type: "iceCandidate",
 			candidate
 		}));
-		fromEvent(pcClient, "datachannel").pipe(tap((e) => Logger.info(`[DATACHANNEL] Received remote DC: label="${e.channel.label}" id=${e.channel.id} protocol="${e.channel.protocol}" ordered=${e.channel.ordered}`)), map$1((e) => e.channel), takeUntil$1(merge(this.disconnect$, this.destroy$))).subscribe((datachannel) => {
-			this.dcClient = this.setupDataChannelCallbacks(datachannel);
-		});
+		fromEvent(pcClient, "datachannel").pipe(tap((e) => Logger.info(`[DATACHANNEL] Received remote DC: label="${e.channel.label}" id=${e.channel.id} protocol="${e.channel.protocol}" ordered=${e.channel.ordered}`)), map$1((e) => e.channel), takeUntil$1(merge(this.disconnect$, this.destroy$))).subscribe((datachannel) => this.ownDataChannel(datachannel));
 		const onTrack$ = fromEvent(pcClient, "track").pipe(takeUntil$1(merge(this.disconnect$, this.destroy$)), filter$1((e) => !!e.track), tap((e) => Logger.info("Got track - " + e.track.kind + " id=" + e.track.id + " readyState=" + e.track.readyState)), share());
 		onTrack$.pipe(filter$1((e) => e.track.kind === "audio"), map$1((e) => e.streams[0])).subscribe((stream) => this.videoService.attachAudioStream(stream));
 		onTrack$.pipe(filter$1((e) => e.track.kind === "video"), map$1((e) => e.streams[0]), tap(() => Logger.info("Set video source from video track ontrack."))).subscribe((stream) => {
@@ -2818,7 +2820,8 @@ var WebRtcPlayerService = class WebRtcPlayerService extends SubService {
 			} else pc.addTransceiver("audio", { direction: "recvonly" });
 		}
 	}
-	setupDataChannelCallbacks(datachannel) {
+	ownDataChannel(datachannel, replay = []) {
+		this.dcClient = datachannel;
 		try {
 			Logger.log(`[DATACHANNEL] Setting up datachannel "${datachannel.label}" callbacks...`);
 			datachannel.binaryType = "arraybuffer";
@@ -2833,14 +2836,14 @@ var WebRtcPlayerService = class WebRtcPlayerService extends SubService {
 				const message = `[DATACHANNEL] Data channel "${datachannel.label}" error. id:${datachannel.id}`;
 				Logger.error(message, e);
 			});
-			fromEvent(datachannel, "open").pipe(tap(() => {
-				Logger.info(`[DATACHANNEL] Data channel "${datachannel.label}" connected. id:${datachannel.id}`);
-			}), takeUntil$1(merge(this.disconnect$, this.destroy$))).subscribe(() => this.onDataChannelConnected());
 			fromEvent(datachannel, "message").pipe(map$1((e) => e.data), takeUntil$1(merge(this.disconnect$, this.destroy$))).subscribe((data) => this.onDataChannelMessage$.next(data));
-			return datachannel;
+			for (const buffered of replay) this.onDataChannelMessage$.next(buffered);
+			(datachannel.readyState === "open" ? of(null) : fromEvent(datachannel, "open").pipe(take(1))).pipe(tap(() => {
+				Logger.info(`[DATACHANNEL] Data channel "${datachannel.label}" connected. id:${datachannel.id}`);
+			}), switchMap$1(() => this.videoService.video$.pipe(filter$1(Truthy), take(1))), takeUntil$1(merge(this.disconnect$, this.destroy$))).subscribe(() => this.onDataChannelConnected());
 		} catch (e) {
 			Logger.warn("[DATACHANNEL] Datachannel setup caused an exception: ", e);
-			return null;
+			this.dcClient = null;
 		}
 	}
 	onDataChannelConnected() {