Add exception handling for the CreatePlayerAsync in LavalinkPlayerHandle

angelobreuer · Sep 1, 2024 · 7a489bc · 7a489bc
1 parent a3407b1
commit 7a489bc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/src/Lavalink4NET/Players/LavalinkPlayerHandle.cs b/src/Lavalink4NET/Players/LavalinkPlayerHandle.cs
@@ -141,12 +141,25 @@ private async ValueTask CompleteAsync(bool isVoiceServerUpdated, CancellationTok
         if (_value is TaskCompletionSource<ILavalinkPlayer> taskCompletionSource)
         {
             // _value is automatically set by CreatePlayerAsync
-            var player = await CreatePlayerAsync(cancellationToken).ConfigureAwait(false);
-
-            taskCompletionSource.TrySetResult(player);
-
-            Interlocked.Decrement(ref Diagnostics.PendingHandles);
-            Interlocked.Increment(ref Diagnostics.ActivePlayers);
+            try
+            {
+                // CreatePlayerAsync can throw if request to lavalink fails
+                // We should handle this to avoid never completed lavalink player handle
+                var player = await CreatePlayerAsync(cancellationToken).ConfigureAwait(false);
+
+                taskCompletionSource.TrySetResult(player);
+
+                Interlocked.Decrement(ref Diagnostics.PendingHandles);
+                Interlocked.Increment(ref Diagnostics.ActivePlayers);
+            }
+            catch (Exception e)
+            {
+                // Here we're passing CancellationToken.None to ensure what the player disposing event will properly
+                // clean up this handle from cache
+                await _playerContext.LifecycleNotifier!.NotifyDisposeAsync(_guildId, CancellationToken.None);
+                taskCompletionSource.TrySetException(e);
+                await DisposeAsync();
+            }
         }
         else
         {

diff --git a/src/Lavalink4NET/Players/PlayerManager.cs b/src/Lavalink4NET/Players/PlayerManager.cs
@@ -312,11 +312,10 @@ async ValueTask IPlayerLifecycleNotifier.NotifyDisposeAsync(ulong guildId, Cance
 
         await using var _ = playerHandle.ConfigureAwait(false);
 
-        Debug.Assert(playerHandle.Player is not null);
-        Debug.Assert(playerHandle.Player is { State: PlayerState.Destroyed, });
-
+        // Player can be null if lavalink node will throw while creating player
         if (playerHandle.Player is not null)
         {
+            Debug.Assert(playerHandle.Player is { State: PlayerState.Destroyed, });
             var eventArgs = new PlayerDestroyedEventArgs(playerHandle.Player);
 
             await PlayerDestroyed