@3dsource/angular-unreal-module 0.0.84-dev.1 → 0.0.85

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

@@ -3,7 +3,7 @@ import { InjectionToken, inject, Injectable, signal, makeEnvironmentProviders, p
 import { filter, withLatestFrom, distinctUntilChanged, switchMap, catchError, timeout, tap, map as map$1, takeUntil, exhaustMap, debounceTime, takeWhile, delay, skip as skip$1 } from 'rxjs/operators';
 import { createAction, props, Store, provideState, createReducer, on, createFeature, createSelector } from '@ngrx/store';
 import { Actions, ofType, provideEffects, createEffect } from '@ngrx/effects';
-import { skip, share, merge, Subject, interval, of, map, from, take, fromEvent, timer, throwError, defer, Observable, switchMap as switchMap$1, retry, timeout as timeout$1, tap as tap$1, startWith, combineLatestWith, takeUntil as takeUntil$1, auditTime, EMPTY, debounceTime as debounceTime$1, mergeMap, scan, concatMap, animationFrameScheduler, BehaviorSubject, distinctUntilChanged as distinctUntilChanged$1, concat } from 'rxjs';
+import { skip, share, merge, Subject, interval, of, map, from, take, fromEvent, timer, throwError, defer, Observable, switchMap as switchMap$1, retry, timeout as timeout$1, tap as tap$1, startWith, takeUntil as takeUntil$1, auditTime, EMPTY, debounceTime as debounceTime$1, mergeMap, scan, concatMap, animationFrameScheduler, BehaviorSubject, combineLatestWith, distinctUntilChanged as distinctUntilChanged$1, concat } from 'rxjs';
 import { Falsy, Truthy, Logger, calculateMedian, clampf, Signal, tapLog, generateUuid, COLOR_CODES, where, KeyboardNumericCode, InvertedKeyMap, Semaphore, lerp, getCanvasCached, getSnapshot, whereNot, HEXtoRGB, RGBtoHSV, inverseLerp, HSVtoRGB, RGBtoHEX, fpIsASameAsB, fitIntoRectangle } from '@3dsource/utils';
 import { HttpClient } from '@angular/common/http';
 import { DialogRef, DIALOG_DATA, Dialog } from '@angular/cdk/dialog';
@@ -1626,8 +1626,7 @@ class WebRtcPlayerService extends SubService {
             this.dcClient?.send(data);
         }
         else {
-            const error = `DataChannel connection not prepared or in state: ${this.dcClient?.readyState}`;
-            throw new Error(error);
+            Logger.colored('black', 'yellow', `DataChannel connection not prepared or in state: ${this.dcClient?.readyState}`);
         }
     }
     setConfig(parOptions = {}) {
@@ -2339,6 +2338,9 @@ class TouchEmulator {
         this.host.emitMouseWheel(this.delta, center.x, center.y);
     }
     registerTouchEvents(playerElement) {
+        if (!playerElement) {
+            return;
+        }
         let finger;
         fromEvent(playerElement, 'touchstart', {
             passive: false,
@@ -2539,6 +2541,7 @@ class InputService extends SubService {
         super();
         this.commandsSender = inject(UnrealCommunicatorService);
         this.isDevMode = inject(DevModeService).isDevMode;
+        this.videoService = inject(VideoService);
         this.defaultKeys = [
             KeyboardNumericCode.KeyW,
             KeyboardNumericCode.KeyS,
@@ -2575,18 +2578,21 @@ class InputService extends SubService {
         const visibilityHiddenTrigger$ = fromEvent(document, 'visibilitychange').pipe(map$1(() => document.visibilityState === 'hidden'), filter(Truthy));
         const visibilityVisibleTrigger$ = fromEvent(document, 'visibilitychange').pipe(map$1(() => document.visibilityState === 'visible'), filter(Truthy), startWith(true));
         this.deactivatedVideoTrigger$ = merge(this.disconnect$, this.reInit$, visibilityHiddenTrigger$);
-        fromSignal(UnrealInternalSignalEvents.OnVideoInitialized)
-            .pipe(combineLatestWith(visibilityVisibleTrigger$, this.store
-            .select(unrealFeature.selectViewportReady)
-            .pipe(filter(Truthy), startWith(true))), filter(([video]) => !!video))
-            .subscribe(([video]) => this.setup(video));
+        merge(visibilityVisibleTrigger$, this.store.select(unrealFeature.selectViewportReady).pipe(filter(Truthy))).subscribe(() => this.setup());
     }
     useKeyboardKeys(keys) {
         this.availableKeys = keys || [];
     }
-    setup(video) {
+    get video() {
+        return this.videoService.video;
+    }
+    setup() {
+        const video = this.video;
+        if (!video) {
+            return;
+        }
+        Logger.log('DEBUG: video initialized: ', video);
         this.options = InputOptions;
-        this.video = video;
         this.reInit$.next();
         merge(fromResizeObserver(video), fromSignal(UnrealInternalSignalEvents.VideoAdaptedToContainer))
             .pipe(debounceTime(300), takeUntil$1(this.deactivatedVideoTrigger$))
@@ -2594,7 +2600,7 @@ class InputService extends SubService {
             this.setupNormalizeAndQuantize(video);
         });
         this.setupNormalizeAndQuantize(video);
-        this.registerInputs();
+        this.registerInputs(video);
     }
     /**
      * We use `object-fit: cover` on the video element. Since the video can have
@@ -2692,20 +2698,20 @@ class InputService extends SubService {
     sendInputData(data) {
         this.commandsSender.sendInputData(data);
     }
-    registerInputs() {
+    registerInputs(video) {
         merge(this.store
             .select(unrealFeature.selectLowBandwidth)
             .pipe(distinctUntilChanged(), filter(Truthy)), fromEvent(window, 'blur'))
-            .pipe(filter(() => !!this.video), takeUntil$1(this.deactivatedVideoTrigger$))
+            .pipe(filter(() => !!video), takeUntil$1(this.deactivatedVideoTrigger$))
             .subscribe(() => this.releaseMouseButtons(255, 0, 0));
-        this.registerMouseEnterAndLeaveEvents(this.video);
-        this.registerHoveringMouseEvents(this.video);
+        this.registerMouseEnterAndLeaveEvents(video);
+        this.registerHoveringMouseEvents(video);
         this.registerKeyboardEvents(this.availableKeys);
         if (InputOptions.fakeMouseWithTouches) {
             new TouchEmulator(this);
         }
         else {
-            this.registerTouchEvents(this.video);
+            this.registerTouchEvents(video);
         }
     }
     getTouchPositionWithOffset({ clientX, clientY }) {
@@ -2728,7 +2734,7 @@ class InputService extends SubService {
         const rememberTouch = (touch) => {
             const finger = this.fingers.pop();
             if (finger === undefined) {
-                Logger.info('exhausted touch indentifiers');
+                Logger.info('exhausted touch identifiers');
                 return;
             }
             this.fingerIds.set(touch.identifier, finger);
@@ -2759,7 +2765,7 @@ class InputService extends SubService {
                 byte += 2;
                 data.setUint8(byte, this.fingerIds.get(touch.identifier));
                 byte += 1;
-                // force is between 0.0 and 1.0 so quantize into byte.
+                // force is between 0.0 and 1.0, so quantize into byte.
                 // iOs bug: Forced to be always 0.5 on all devices as we do not use forced touch any way;/
                 data.setUint8(byte, this.maxByteValue * 0.5);
                 byte += 1;
@@ -2897,9 +2903,9 @@ class InputService extends SubService {
             this.emitMouseUp(e.button, x, y);
             e.preventDefault();
         };
-        // When the context menu is shown then it is safest to release the button
-        // which was pressed when the event happened. This will guarantee we will
-        // get at least one mouse up corresponding to a mouse down event. Otherwise
+        // When the context menu is shown, then it is safest to release the button
+        // pressed when the event happened. This will guarantee we will
+        // get at least one mouse up corresponding to a mouse down event. Otherwise,
         // the mouse can get stuck.
         // https://github.com/facebook/react/issues/5531
         // playerElement.oncontextmenu = (e) => {
@@ -2982,7 +2988,7 @@ class InputService extends SubService {
                 this.getKeyCode(e),
                 Number(e.repeat),
             ]).buffer);
-            // Backspace is not considered a keypress in JavaScript but we need it
+            // Backspace is not considered a keypress in JavaScript, but we need it
             // to be so characters may be deleted in a UE4 text entry field.
             if (e.keyCode === SpecialKeyCodes.BackSpace) {
                 document.onkeypress({
@@ -3393,6 +3399,7 @@ function provideAngularUnrealModule(config) {
         },
         provideEnvironmentInitializer(() => {
             inject(AggregatorService);
+            inject(InputService);
             inject(StreamStatusTelemetryService);
             inject(ConsoleExtensionsService);
             inject(AFKService);
@@ -4870,11 +4877,9 @@ class UnrealSceneComponent {
         this.lightMode = this.store.selectSignal(unrealFeature.selectLowBandwidth);
         this.isFreezeFrameLoading = this.store.selectSignal(selectIsFreezeFrameLoading);
         this.commandsSender = inject(UnrealCommunicatorService);
-        this.inputService = inject(InputService);
         this.videoService = inject(VideoService);
         this.element = inject(ElementRef);
         this.destroyRef = inject(DestroyRef);
-        this.inputService.useKeyboardKeys(this.inputService.defaultKeys);
         this.destroyRef.onDestroy(() => this.store.dispatch(destroyUnrealScene()));
         effect(() => {
             const videoElement = this.videoElement();