Merge pull request #10 from KristofferStrube/feature/dispose-of-media…

…devices-from-service Changed so that `MediaDevices` made from service are disposed.
KristofferStrube · Oct 23, 2024 · 5d3cce3 · 5d3cce3
2 parents 112a15c + 5b6a1da
commit 5d3cce3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/samples/KristofferStrube.Blazor.MediaCaptureStreams.WasmExample/Pages/Index.razor b/samples/KristofferStrube.Blazor.MediaCaptureStreams.WasmExample/Pages/Index.razor
@@ -241,7 +241,7 @@ else
     {
         try
         {
-            var mediaDevices = await MediaDevicesService.GetMediaDevicesAsync();
+            await using var mediaDevices = await MediaDevicesService.GetMediaDevicesAsync();
             var mediaConstraints = new MediaStreamConstraints()
                 {
                     Video = new MediaTrackConstraints()

diff --git a/samples/KristofferStrube.Blazor.MediaCaptureStreams.WasmExample/Pages/Video.razor b/samples/KristofferStrube.Blazor.MediaCaptureStreams.WasmExample/Pages/Video.razor
@@ -140,6 +140,8 @@ else
         }
         videoStreamTrack = null;
         frameRate = null;
+        if (mediaDevices is not null)
+            await mediaDevices.DisposeAsync();
     }
 
     public async ValueTask DisposeAsync()

diff --git a/src/KristofferStrube.Blazor.MediaCaptureStreams/MediaDevicesService.cs b/src/KristofferStrube.Blazor.MediaCaptureStreams/MediaDevicesService.cs
@@ -20,6 +20,6 @@ public MediaDevicesService(IJSRuntime jSRuntime)
     public async Task<MediaDevices> GetMediaDevicesAsync()
     {
         IJSObjectReference jSInstance = await jSRuntime.InvokeAsync<IJSObjectReference>("navigator.mediaDevices.valueOf");
-        return await MediaDevices.CreateAsync(jSRuntime, jSInstance);
+        return await MediaDevices.CreateAsync(jSRuntime, jSInstance, new() { DisposesJSReference = true });
     }
 }
diff --git a/tests/IntegrationTests/MediaDevicesNotSupportedTest.cs b/tests/IntegrationTests/MediaDevicesNotSupportedTest.cs
@@ -12,7 +12,7 @@ public async Task GetUserMedia_Throws_NotSupportedErrorException_WhenNotSupporte
         // Arrange
         AfterRenderAsync = async () =>
         {
-            MediaDevices mediaDevices = await EvaluationContext.MediaDevicesService.GetMediaDevicesAsync();
+            await using MediaDevices mediaDevices = await EvaluationContext.MediaDevicesService.GetMediaDevicesAsync();
             MediaStream mediaStream = await mediaDevices.GetUserMediaAsync(new() { Audio = true });
             MediaStreamTrack[] videoTracks = await mediaStream.GetVideoTracksAsync();
             return videoTracks.Length;

diff --git a/tests/IntegrationTests/MediaDevicesTest.cs b/tests/IntegrationTests/MediaDevicesTest.cs
@@ -13,7 +13,7 @@ public async Task GetUserMedia_ReturnsOneAudioTrack_WhenQueryingAudio()
         // Arrange
         AfterRenderAsync = async () =>
         {
-            MediaDevices mediaDevices = await EvaluationContext.MediaDevicesService.GetMediaDevicesAsync();
+            await using MediaDevices mediaDevices = await EvaluationContext.MediaDevicesService.GetMediaDevicesAsync();
             MediaStream mediaStream = await mediaDevices.GetUserMediaAsync(new() { Audio = true });
             MediaStreamTrack[] audioTracks = await mediaStream.GetAudioTracksAsync();
             return audioTracks.Length;
@@ -32,7 +32,7 @@ public async Task GetUserMedia_ReturnsOneVideoTrack_WhenQueryingVideo()
         // Arrange
         AfterRenderAsync = async () =>
         {
-            MediaDevices mediaDevices = await EvaluationContext.MediaDevicesService.GetMediaDevicesAsync();
+            await using MediaDevices mediaDevices = await EvaluationContext.MediaDevicesService.GetMediaDevicesAsync();
             MediaStream mediaStream = await mediaDevices.GetUserMediaAsync(new() { Video = true });
             MediaStreamTrack[] videoTracks = await mediaStream.GetVideoTracksAsync();
             return videoTracks.Length;
@@ -51,7 +51,7 @@ public async Task GetUserMedia_Throws_TypeErrorException_WhenNoConstraintsDefine
         // Arrange
         AfterRenderAsync = async () =>
         {
-            MediaDevices mediaDevices = await EvaluationContext.MediaDevicesService.GetMediaDevicesAsync();
+            await using MediaDevices mediaDevices = await EvaluationContext.MediaDevicesService.GetMediaDevicesAsync();
             MediaStream mediaStream = await mediaDevices.GetUserMediaAsync(new() { });
             MediaStreamTrack[] videoTracks = await mediaStream.GetVideoTracksAsync();
             return videoTracks.Length;
@@ -70,7 +70,7 @@ public async Task GetUserMedia_Throws_OverconstrainedErrorException_WhenOvercons
         // Arrange
         AfterRenderAsync = async () =>
         {
-            MediaDevices mediaDevices = await EvaluationContext.MediaDevicesService.GetMediaDevicesAsync();
+            await using MediaDevices mediaDevices = await EvaluationContext.MediaDevicesService.GetMediaDevicesAsync();
 
             // Get video track
             MediaStream mediaStream = await mediaDevices.GetUserMediaAsync(new() { Video = true });