@3dsource/angular-unreal-module 0.0.123 → 0.0.124

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

@@ -1941,10 +1941,7 @@ class VideoService extends SubService {
                 interval(250).pipe(map(() => track.pcClient), switchMap$1((pcClient) => from(this.getStats(pcClient))), filter(Truthy))
             : of(null)), filter(Truthy), share());
         this.destroyAbort = new AbortController();
-        this.destroyRef.onDestroy(() => {
-            this.destroyAbort.abort();
-            this.destroy();
-        });
+        this.destroyRef.onDestroy(() => this.destroy());
     }
     setContainer(container = null) {
         this.container = container;
@@ -1956,6 +1953,9 @@ class VideoService extends SubService {
         this.VideoEncoderQP = Number(new TextDecoder('utf-16').decode(data));
     }
     create() {
+        if (!this.container) {
+            Logger.warn('VideoService.create(): no container set; <video> will be built but never attached to the DOM, which suppresses autoplay.');
+        }
         this.disconnect$
             .pipe(take(1), takeUntil$1(this.destroy$))
             .subscribe(() => this.destroy());
@@ -1964,26 +1964,35 @@ class VideoService extends SubService {
         this.createWebRtcAudio();
     }
     attachVideoStream(stream, pcClient) {
-        if (this.video) {
-            this.video.srcObject = stream;
-            this.videoTrack$.next({ stream, pcClient });
-        }
-        else {
+        if (!this.video) {
             Logger.error('Video element is not defined.');
+            return;
+        }
+        // Safari refuses muted-autoplay for MediaStreams that carry unmuted
+        // audio tracks, even when the <video> is muted. Route video tracks to
+        // the video element and audio tracks (if any) to the audio element.
+        this.video.srcObject = new MediaStream(stream.getVideoTracks());
+        const audioTracks = stream.getAudioTracks();
+        if (audioTracks.length && this.audio) {
+            this.audio.srcObject = new MediaStream(audioTracks);
+            this.playAudio(this.audio);
         }
+        this.videoTrack$.next({ stream, pcClient });
+        // Safari does not reliably honor the autoplay attribute when srcObject
+        // is bound post-creation for a WebRTC MediaStream; trigger play()
+        // explicitly and let safePlay() fall back if Safari refuses.
+        void this.safePlay(this.video);
     }
     attachAudioStream(stream) {
-        // do nothing the video has the same media stream as the audio track we have here (they are linked)
-        if (this.video?.srcObject === stream) {
+        if (!this.audio) {
             return;
         }
-        // the video element has some other media stream not associated with this audio track
-        else if (this.audio &&
-            this.video?.srcObject &&
-            this.video?.srcObject !== stream) {
-            this.audio.srcObject = stream;
-            this.playAudio(this.audio);
+        const audioTracks = stream.getAudioTracks();
+        if (!audioTracks.length) {
+            return;
         }
+        this.audio.srcObject = new MediaStream(audioTracks);
+        this.playAudio(this.audio);
     }
     play() {
         void this.safePlay(this.video);
@@ -2001,7 +2010,8 @@ class VideoService extends SubService {
                 typeof error === 'object' &&
                 'name' in error &&
                 error?.name !== 'NotAllowedError') {
-                throw error;
+                Logger.warn('safePlay() rejected with non-autoplay error:', error);
+                return;
             }
             // Try silent inline autoplay
             video.muted = true;
@@ -2046,6 +2056,11 @@ class VideoService extends SubService {
         }
         try {
             const stats = await pcClient.getStats(null);
+            // The service may have been destroyed while pcClient.getStats() was
+            // pending; bail before writing back to this.aggregatedStats.
+            if (!this.video) {
+                return null;
+            }
             return this.generateAggregatedStatsFunction(stats);
         }
         catch (err) {
@@ -2125,12 +2140,14 @@ class VideoService extends SubService {
             if (report.type === 'transport' &&
                 Object.hasOwn(report, 'selectedCandidatePairId')) {
                 const selectedPair = stats.get(report.selectedCandidatePairId);
-                const local = stats.get(selectedPair.localCandidateId);
-                const remote = stats.get(selectedPair.remoteCandidateId);
-                newStat.selectedPair = {
-                    local: { type: local?.candidateType, url: local?.url },
-                    remote: { type: remote?.candidateType, url: remote?.url },
-                };
+                if (selectedPair) {
+                    const local = stats.get(selectedPair.localCandidateId);
+                    const remote = stats.get(selectedPair.remoteCandidateId);
+                    newStat.selectedPair = {
+                        local: { type: local?.candidateType, url: local?.url },
+                        remote: { type: remote?.candidateType, url: remote?.url },
+                    };
+                }
             }
             // Store mimetype of each codec
             if (Object.hasOwn(newStat, 'codecs') &&
@@ -2170,6 +2187,19 @@ class VideoService extends SubService {
             return;
         }
         this.changeStatusMainVideoOnScene(false);
+        // Cancel any gesture listeners armed by safePlay/playAudio in this
+        // session, then arm a fresh controller for the next one. Without this,
+        // listeners survive mid-session disconnect$ → destroy() cycles.
+        this.destroyAbort.abort();
+        this.destroyAbort = new AbortController();
+        // Pause and detach streams before nulling — Safari can otherwise hold
+        // on to the RTCRtpReceiver until GC eventually clears srcObject.
+        this.video.pause();
+        this.video.srcObject = null;
+        if (this.audio) {
+            this.audio.pause();
+            this.audio.srcObject = null;
+        }
         this.video = null;
         this.audio = null;
         this.videoTrack$.next(null);
@@ -2194,7 +2224,14 @@ class VideoService extends SubService {
         video.id = STREAMING_VIDEO_ID;
         video.playsInline = true;
         video.muted = true;
-        video.autoplay = true;
+        // Safari occasionally resets `muted` when srcObject is rebound; the
+        // `defaultMuted` reflection makes the muted state sticky and keeps the
+        // muted-autoplay policy intact.
+        video.defaultMuted = true;
+        // No `autoplay` attribute on purpose: attachVideoStream() always calls
+        // safePlay() explicitly, and the attribute would create a second
+        // browser-internal play() Promise that we can't catch — which surfaces
+        // as an unhandled rejection when destroy() pauses the element.
         video.preload = 'auto';
         video.disablePictureInPicture = true;
         this.video = video;
@@ -2211,13 +2248,36 @@ class VideoService extends SubService {
         audio.id = STREAMING_AUDIO_ID;
         this.audio = audio;
     }
-    playAudio(audio) {
-        from(audio.play())
-            .pipe(catchError(() => fromEvent(document, 'click')), take(1))
-            .subscribe({
-            next: () => audio.play(),
-            error: () => ({}),
-        });
+    async playAudio(audio) {
+        try {
+            await audio.play();
+            return;
+        }
+        catch {
+            // Wait for the next real user gesture and retry.
+            const resume = async () => {
+                try {
+                    await audio.play();
+                }
+                catch {
+                    /* ignore — caller may need another gesture */
+                }
+                finally {
+                    window.removeEventListener('pointerdown', resume, true);
+                    window.removeEventListener('keydown', resume, true);
+                }
+            };
+            window.addEventListener('pointerdown', resume, {
+                once: true,
+                capture: true,
+                signal: this.destroyAbort.signal,
+            });
+            window.addEventListener('keydown', resume, {
+                once: true,
+                capture: true,
+                signal: this.destroyAbort.signal,
+            });
+        }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.12", ngImport: i0, type: VideoService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.12", ngImport: i0, type: VideoService }); }