@3dsource/angular-unreal-module 0.0.200-dev.1 → 0.0.200-dev.2

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

@@ -3,9 +3,9 @@ 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, 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 { BehaviorSubject, EMPTY, NEVER, Observable, Subject, Subscription, TimeoutError, animationFrameScheduler, asyncScheduler, bufferTime, combineLatestWith, concat, concatMap, debounceTime, defer, delay, exhaustMap, 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 { catchError, debounceTime as debounceTime$1, distinctUntilChanged, exhaustMap as exhaustMap$1, 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";
 import { DIALOG_DATA, Dialog, DialogRef } from "@angular/cdk/dialog";
 import { HttpClient } from "@angular/common/http";
@@ -2847,13 +2847,6 @@ var WebRtcPlayerService = class WebRtcPlayerService extends SubService {
 		try {
 			Logger.log(`[DATACHANNEL] Setting up datachannel "${datachannel.label}" callbacks...`);
 			datachannel.binaryType = "arraybuffer";
-			fromEvent(datachannel, "close").pipe(filter$1(() => !this.isReconnecting()), take(1), takeUntil$1(this.destroy$)).subscribe((e) => {
-				Logger.warn(`[DATACHANNEL] Data channel disconnected: ${datachannel.label}(${datachannel.id})`, e);
-				this.store.dispatch(disconnectStream({
-					reason: DisconnectReason.DataChannelClosed,
-					message: "DataChannelClosed"
-				}));
-			});
 			fromEvent(datachannel, "error").pipe(takeUntil$1(merge(this.disconnect$, this.destroy$))).subscribe((e) => {
 				const message = `[DATACHANNEL] Data channel "${datachannel.label}" error. id:${datachannel.id}`;
 				Logger.error(message, e);
@@ -2864,18 +2857,19 @@ var WebRtcPlayerService = class WebRtcPlayerService extends SubService {
 			open$.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());
-			this.watchForStuckClose(datachannel, open$);
+			const stuckClose$ = open$.pipe(switchMap$1(() => interval(DC_WATCH_INTERVAL_MS)), map$1(() => datachannel.readyState), filter$1((state) => state === "closing" || state === "closed"), take(1), delay(DC_CLOSING_GRACE_MS), map$1(() => `stuck in "${datachannel.readyState}"`));
+			merge(fromEvent(datachannel, "close").pipe(map$1(() => "close event")), stuckClose$).pipe(filter$1(() => this.dcClient === datachannel && !this.isReconnecting()), take(1), takeUntil$1(this.destroy$)).subscribe((cause) => {
+				Logger.warn(`[DATACHANNEL] Data channel disconnected: ${datachannel.label}(${datachannel.id}), ${cause}`);
+				this.store.dispatch(disconnectStream({
+					reason: DisconnectReason.DataChannelClosed,
+					message: "DataChannelClosed"
+				}));
+			});
 		} catch (e) {
 			Logger.warn("[DATACHANNEL] Datachannel setup caused an exception: ", e);
 			this.dcClient = null;
 		}
 	}
-	watchForStuckClose(datachannel, open$) {
-		open$.pipe(switchMap$1(() => interval(DC_WATCH_INTERVAL_MS)), filter$1(() => datachannel.readyState === "closing" || datachannel.readyState === "closed"), take(1), switchMap$1(() => timer(DC_CLOSING_GRACE_MS)), filter$1(() => this.dcClient === datachannel && datachannel.readyState !== "open"), takeUntil$1(merge(fromEvent(datachannel, "close"), this.disconnect$, this.destroy$))).subscribe(() => {
-			Logger.warn(`[DATACHANNEL] "${datachannel.label}" stuck in "${datachannel.readyState}" with no close event, reconnecting the peer`);
-			this.tryReconnectOnSendFailure();
-		});
-	}
 	onDataChannelConnected() {
 		let statusMessage = "Session connected, video stream starting.";
 		if (navigator.userAgent.includes("Firefox")) statusMessage += "\n If you are experiencing connection problems please try Google Chrome";
@@ -3419,14 +3413,14 @@ var UnrealEffects = class UnrealEffects {
 			}), takeWhile((action) => action.type === initSignalling.type, true))));
 		});
 		this.showUnrealError$ = createEffect(() => {
-			return this.actions$.pipe(ofType(showUnrealErrorMessage), map(({ code }) => getRtcErrorMessage(code)), distinctUntilChanged(), filter$1(Truthy), exhaustMap((content) => this.dialog.open(UnrealErrorModalComponent, {
+			return this.actions$.pipe(ofType(showUnrealErrorMessage), map(({ code }) => getRtcErrorMessage(code)), distinctUntilChanged(), filter$1(Truthy), exhaustMap$1((content) => this.dialog.open(UnrealErrorModalComponent, {
 				scrollStrategy: this.scrollStrategy,
 				data: { content }
 			}).closed), map(() => showUnrealErrorMessage({ code: null })));
 		});
 		this.unrealReceiverReady$ = createEffect(() => {
 			const sessionEnded$ = this.actions$.pipe(ofType(setCirrusDisconnected, destroyUnrealScene, resetDataChannelForReconnect));
-			return this.actions$.pipe(ofType(dataChannelConnected), withLatestFrom$1(this.store.select(unrealFeature.selectIsReconnecting)), filter$1(([, isReconnecting]) => !isReconnecting), exhaustMap(() => concat(of(dataChannelReady()), NEVER).pipe(takeUntil$1(sessionEnded$))));
+			return this.actions$.pipe(ofType(dataChannelConnected), withLatestFrom$1(this.store.select(unrealFeature.selectIsReconnecting)), filter$1(([, isReconnecting]) => !isReconnecting), exhaustMap$1(() => concat(of(dataChannelReady()), NEVER).pipe(takeUntil$1(sessionEnded$))));
 		});
 		this.initAppByDataChannelReady$ = createEffect(() => {
 			return this.actions$.pipe(ofType(dataChannelReady), switchMap(() => {
@@ -3529,7 +3523,7 @@ var UnrealEffects = class UnrealEffects {
 			return this.actions$.pipe(ofType(initSignalling), withLatestFrom$1(this.store.select(unrealFeature.selectMatchUrls), this.store.select(selectIsAutostart), this.store.select(unrealFeature.selectCirrusConnected)), filter$1(([, , autoStart, cirrusConnected]) => {
 				if (cirrusConnected) Logger.warn(`SIGNALING REQUEST can't be called when cirrus connection is already established.`);
 				return autoStart && !cirrusConnected;
-			}), map(([, matchMakerUrls]) => [...matchMakerUrls].filter(Truthy)), filter$1((urls) => urls.length > 0), exhaustMap((urls) => this.streamAdoptionService.awaitAndAdopt$().pipe(switchMap((adopted) => adopted ? EMPTY : this.signallingService.connectToSignaling(urls)), takeUntil$1(this.actions$.pipe(ofType(abortEstablishingConnection))), ignoreElements(), startWith(setEstablishingConnection({ value: true })))));
+			}), map(([, matchMakerUrls]) => [...matchMakerUrls].filter(Truthy)), filter$1((urls) => urls.length > 0), exhaustMap$1((urls) => this.streamAdoptionService.awaitAndAdopt$().pipe(switchMap((adopted) => adopted ? EMPTY : this.signallingService.connectToSignaling(urls)), takeUntil$1(this.actions$.pipe(ofType(abortEstablishingConnection))), ignoreElements(), startWith(setEstablishingConnection({ value: true })))));
 		});
 	}
 	canPeerReconnect() {
@@ -4628,18 +4622,18 @@ var InputService = class InputService extends SubService {
 		if (this.unrealConfig?.playwright) return;
 		const visibilityHiddenTrigger$ = fromEvent(document, "visibilitychange").pipe(map$1(() => document.visibilityState === "hidden"), filter$1(Truthy));
 		const visibilityVisibleTrigger$ = fromEvent(document, "visibilitychange").pipe(map$1(() => document.visibilityState === "visible"), filter$1(Truthy), startWith(true));
-		this.deactivatedVideoTrigger$ = merge(this.disconnect$, this.reInit$, visibilityHiddenTrigger$, this.destroy$);
-		merge(visibilityVisibleTrigger$, this.store.select(unrealFeature.selectViewportReady).pipe(filter$1(Truthy))).pipe(filter$1(() => !!this.video), takeUntil(this.destroy$)).subscribe(() => this.setup());
+		const unbound$ = merge(this.disconnect$, visibilityHiddenTrigger$, this.destroy$);
+		this.deactivatedVideoTrigger$ = merge(unbound$, this.reInit$);
+		const ready$ = merge(visibilityVisibleTrigger$, this.actions$.pipe(ofType(setViewportReady)));
+		this.videoService.video$.pipe(filter$1(Truthy), switchMap((video) => ready$.pipe(exhaustMap(() => {
+			this.setup(video);
+			return unbound$.pipe(take(1));
+		}))), takeUntil(this.destroy$)).subscribe();
 	}
 	useKeyboardKeys(keys) {
 		this.availableKeys = new Set(keys);
 	}
-	get video() {
-		return this.videoService.video;
-	}
-	setup() {
-		const video = this.video;
-		if (!video) return;
+	setup(video) {
 		this.options = InputOptions;
 		this.reInit$.next();
 		this.fingerIds.clear();