Correct error handling

lavalink/lavalink.py

@@ -4,7 +4,7 @@
 import discord
 from discord.ext.commands import Bot
 
-from . import enums, log, node, player_manager
+from . import enums, log, node, player_manager, errors
 
 __all__ = [
     "initialize",
@@ -130,7 +130,7 @@ def get_player(guild_id: int) -> player_manager.Player:
 async def _on_guild_remove(guild):
     try:
         p = get_player(guild.id)
-    except (IndexError, KeyError):
+    except (errors.NodeNotFound, errors.PlayerNotFound):
         pass
     else:
         await p.disconnect()
@@ -185,7 +185,7 @@ def _get_event_args(data: enums.LavalinkEvents, raw_data: dict):
     try:
         node_ = node.get_node(guild_id, ignore_ready_status=True)
         player = node_.player_manager.get_player(guild_id)
-    except (IndexError, KeyError):
+    except (errors.NodeNotFound, errors.PlayerNotFound):
         if data != enums.LavalinkEvents.TRACK_END:
             log.debug(
                 "Got an event for a guild that we have no player for."
@@ -264,7 +264,7 @@ def _get_update_args(data: enums.PlayerState, raw_data: dict):
 
     try:
         player = get_player(guild_id)
-    except (KeyError, IndexError):
+    except (errors.NodeNotFound, errors.PlayerNotFound):
         log.debug(
             "Got a player update for a guild that we have no player for."
             " This may be because of a forced voice channel disconnect."

lavalink/node.py

@@ -649,7 +649,7 @@ async def on_socket_response(data):
 
     try:
         node = get_node(guild_id, ignore_ready_status=True)
-    except IndexError:
+    except NodeNotFound:
         ws_discord_log.info(
             f"Received unhandled Discord WS voice response for guild: %d, %s", int(guild_id), data
         )

lavalink/player_manager.py

@@ -8,7 +8,7 @@
 
 from . import log, ws_rll_log
 from .enums import *
-from .errors import PlayerNotFound
+from .errors import PlayerNotFound, NodeNotFound
 from .rest_api import RESTClient, Track
 
 if TYPE_CHECKING:
@@ -499,7 +499,7 @@ def _ensure_player(
         if channel is not None:
             try:
                 p = self.get_player(guild_id)
-            except KeyError:
+            except (PlayerNotFound, NodeNotFound):
                 log.debug("Received voice channel connection without a player.")
                 p = Player(self, channel)
                 self._player_dict[guild_id] = p
@@ -508,7 +508,7 @@ def _ensure_player(
     async def _remove_player(self, guild_id: int):
         try:
             p = self.get_player(guild_id)
-        except KeyError:
+        except (PlayerNotFound, NodeNotFound):
             pass
         else:
             del self._player_dict[guild_id]

tests/conftest.py

@@ -10,6 +10,7 @@
 from discord.ext.commands import AutoShardedBot
 
 import lavalink.node
+from lavalink import NodeNotFound, PlayerNotFound
 
 
 class ProxyWebSocket:
@@ -158,7 +159,7 @@ async def node(bot):
 
     try:
         await node_.disconnect()
-    except KeyError:
+    except (PlayerNotFound, NodeNotFound):
         pass