2.10.0

Fix Support for Other Source and Playlist Types

.gitignore

@@ -10,6 +10,7 @@ build/
 Pipfile.lock
 .mypy_cache/
 .vscode/
+.idea/
 .venv/
 *.code-workspace
 *.ini

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
     -   id: check-ast
     -   id: check-builtin-literals
@@ -11,31 +11,23 @@ repos:
     -   id: requirements-txt-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 23.10.1
     hooks:
     - id: black
-      language_version: python3.11
+      language_version: python3.13
--   repo: https://github.com/asottile/blacken-docs
-    rev: 1.15.0
-    hooks:
-    -   id: blacken-docs
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.10.1
+    rev: v3.15.0
     hooks:
     -   id: pyupgrade
         args: [--py37-plus, --keep-runtime-typing]
 -   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.10.0
+    rev: v3.12.0
     hooks:
     -   id: reorder-python-imports
 -   repo: https://github.com/asottile/add-trailing-comma
-    rev: v3.0.1
+    rev: v3.1.0
     hooks:
     -   id: add-trailing-comma
--   repo: https://github.com/hadialqattan/pycln
-    rev: v2.2.2
-    hooks:
-    -   id: pycln
 
 default_language_version:
-    python: python3.11
+    python: python3.13

Pipfile

@@ -6,6 +6,7 @@ name = "pypi"
 [packages]
 orjson = "*"
 "discord.py" = {extras = ["voice"], version = "*"}
+websockets = "*"
 
 [dev-packages]
 mypy = "*"

docs/hdi/events.md

@@ -13,11 +13,9 @@ The classes listed here are as they appear in Pomice. When you use them within y
 the way you use them will be different. Here's an example on how you would use the `TrackStartEvent` within an event listener in a cog:
 
 ```py
-
 @commands.Cog.listener
 async def on_pomice_track_start(self, player: Player, track: Track):
     ...
-
 ```
 
 ## Event definitions

docs/hdi/pool.md

@@ -66,13 +66,10 @@ After you have initialized your function, we need to fill in the proper paramete
   - Set this value to `True` if you want Pomice to automatically switch all players to another available node if one disconnects.
     You must have two or more nodes to be able to do this.
 
-* - `log_level`
+* - `logger`
-  - `LogLevel`
+  - `Optional[logging.Logger]`
-  - The logging level for the node. The default logging level is `LogLevel.INFO`.
+  - If you would like to receive logging information from Pomice, set this to your logger class
 
-* - `log_handler`
-  - `Optional[logging.Handler]`
-  - The logging handler for the node. Set to `None` to default to the built-in logging handler.
 
 :::
 
@@ -93,13 +90,13 @@ await NodePool.create_node(
     spotify_client_secret="<your spotify client secret here>"
     apple_music=<True/False>,
     fallback=<True/False>,
-    log_level=<optional LogLevel here>
+    logger=<your logger here>
 )
 
 ```
 :::{important}
 
-For features like Spotify and Apple Music, you are **not required** to fill in anything for them if you do not want to use them. If you do end up queuing a Spotify or Apple Music track anyway, they will **not work** because these options are not enabled.
+For features like Spotify and Apple Music, you are **not required** to fill in anything for them if you do not want to use them. If you do end up queuing a Spotify or Apple Music track, it is **up to you** on how you decide to handle it, whether it be through your own methods or a Lavalink plugin.
 
 :::
 

docs/quickstart.md

@@ -10,63 +10,71 @@ import re
 
 from discord.ext import commands
 
-URL_REG = re.compile(r'https?://(?:www\.)?.+')
+URL_REG = re.compile(r"https?://(?:www\.)?.+")
+
 
 class MyBot(commands.Bot):
+    def __init__(self) -> None:
+        super().__init__(
+            command_prefix="!",
+            activity=discord.Activity(
+                type=discord.ActivityType.listening, name="to music!"
+            ),
+        )
 
-   def __init__(self) -> None:
+        self.add_cog(Music(self))
-      super().__init__(command_prefix='!', activity=discord.Activity(type=discord.ActivityType.listening, name='to music!'))
 
-      self.add_cog(Music(self))
+    async def on_ready(self) -> None:
-
+        print("I'm online!")
-   async def on_ready(self) -> None:
+        await self.cogs["Music"].start_nodes()
-      print("I'm online!")
-      await self.cogs["Music"].start_nodes()
 
 
 class Music(commands.Cog):
+    def __init__(self, bot) -> None:
+        self.bot = bot
 
-   def __init__(self, bot) -> None:
+        self.pomice = pomice.NodePool()
-      self.bot = bot
 
-      self.pomice = pomice.NodePool()
+    async def start_nodes(self):
+        await self.pomice.create_node(
+            bot=self.bot,
+            host="127.0.0.1",
+            port="3030",
+            password="youshallnotpass",
+            identifier="MAIN",
+        )
+        print(f"Node is ready!")
 
-   async def start_nodes(self):
+    @commands.command(name="join", aliases=["connect"])
-      await self.pomice.create_node(bot=self.bot, host='127.0.0.1', port='3030',
+    async def join(
-                                    password='youshallnotpass', identifier='MAIN')
+        self, ctx: commands.Context, *, channel: discord.TextChannel = None
-      print(f"Node is ready!")
+    ) -> None:
-
+        if not channel:
-
+            channel = getattr(ctx.author.voice, "channel", None)
-
-   @commands.command(name='join', aliases=['connect'])
-   async def join(self, ctx: commands.Context, *, channel: discord.TextChannel = None) -> None:
-
-      if not channel:
-            channel = getattr(ctx.author.voice, 'channel', None)
             if not channel:
-               raise commands.CheckFailure('You must be in a voice channel to use this command'
+                raise commands.CheckFailure(
-                                          'without specifying the channel argument.')
+                    "You must be in a voice channel to use this command"
+                    "without specifying the channel argument."
+                )
 
+        await ctx.author.voice.channel.connect(cls=pomice.Player)
+        await ctx.send(f"Joined the voice channel `{channel}`")
 
-      await ctx.author.voice.channel.connect(cls=pomice.Player)
+    @commands.command(name="play")
-      await ctx.send(f'Joined the voice channel `{channel}`')
+    async def play(self, ctx, *, search: str) -> None:
-
+        if not ctx.voice_client:
-   @commands.command(name='play')
-   async def play(self, ctx, *, search: str) -> None:
-
-      if not ctx.voice_client:
             await ctx.invoke(self.join)
 
-      player = ctx.voice_client
+        player = ctx.voice_client
 
-      results = await player.get_tracks(query=f'{search}')
+        results = await player.get_tracks(query=f"{search}")
 
-      if not results:
+        if not results:
-            raise commands.CommandError('No results were found for that search term.')
+            raise commands.CommandError("No results were found for that search term.")
 
-      if isinstance(results, pomice.Playlist):
+        if isinstance(results, pomice.Playlist):
             await player.play(track=results.tracks[0])
-      else:
+        else:
             await player.play(track=results[0])
 
 

pomice/__init__.py

@@ -3,7 +3,7 @@ Pomice
 ~~~~~~
 The modern Lavalink wrapper designed for discord.py.
 
-Copyright (c) 2023, cloudwithax
+Copyright (c) 2024, cloudwithax
 
 Licensed under GPL-3.0
 """
@@ -20,7 +20,7 @@ if not discord.version_info.major >= 2:
         "using 'pip install discord.py'",
     )
 
-__version__ = "2.7.2"
+__version__ = "2.10.0"
 __title__ = "pomice"
 __author__ = "cloudwithax"
 __license__ = "GPL-3.0"

pomice/applemusic/client.py

@@ -1,11 +1,14 @@
 from __future__ import annotations
 
+import asyncio
 import base64
 import logging
 import re
 from datetime import datetime
+from typing import AsyncGenerator
 from typing import Dict
 from typing import List
+from typing import Optional
 from typing import Union
 
 import aiohttp
@@ -17,10 +20,10 @@ from .objects import *
 __all__ = ("Client",)
 
 AM_URL_REGEX = re.compile(
-    r"https?://music.apple.com/(?P<country>[a-zA-Z]{2})/(?P<type>album|playlist|song|artist)/(?P<name>.+)/(?P<id>[^?]+)",
+    r"https?://music\.apple\.com/(?P<country>[a-zA-Z]{2})/(?P<type>album|playlist|song|artist)/(?P<name>.+?)/(?P<id>[^/?]+?)(?:/)?(?:\?.*)?$",
 )
 AM_SINGLE_IN_ALBUM_REGEX = re.compile(
-    r"https?://music.apple.com/(?P<country>[a-zA-Z]{2})/(?P<type>album|playlist|song|artist)/(?P<name>.+)/(?P<id>.+)(\?i=)(?P<id2>.+)",
+    r"https?://music\.apple\.com/(?P<country>[a-zA-Z]{2})/(?P<type>album|playlist|song|artist)/(?P<name>.+)/(?P<id>[^/?]+)(\?i=)(?P<id2>[^&]+)(?:&.*)?$",
 )
 
 AM_SCRIPT_REGEX = re.compile(r'<script.*?src="(/assets/index-.*?)"')
@@ -35,12 +38,14 @@ class Client:
     and translating it to a valid Lavalink track. No client auth is required here.
     """
 
-    def __init__(self) -> None:
+    def __init__(self, *, playlist_concurrency: int = 6) -> None:
         self.expiry: datetime = datetime(1970, 1, 1)
         self.token: str = ""
         self.headers: Dict[str, str] = {}
         self.session: aiohttp.ClientSession = None  # type: ignore
         self._log = logging.getLogger(__name__)
+        # Concurrency knob for parallel playlist page retrieval
+        self._playlist_concurrency = max(1, playlist_concurrency)
 
     async def _set_session(self, session: aiohttp.ClientSession) -> None:
         self.session = session
@@ -96,7 +101,8 @@ class Client:
         ).decode()
         token_data = json.loads(token_json)
         self.expiry = datetime.fromtimestamp(token_data["exp"])
-        self._log.debug(f"Fetched Apple Music bearer token successfully")
+        if self._log:
+            self._log.debug(f"Fetched Apple Music bearer token successfully")
 
     async def search(self, query: str) -> Union[Album, Playlist, Song, Artist]:
         if not self.token or datetime.utcnow() > self.expiry:
@@ -130,9 +136,10 @@ class Client:
             )
 
         data: dict = await resp.json(loads=json.loads)
-        self._log.debug(
+        if self._log:
-            f"Made request to Apple Music API with status {resp.status} and response {data}",
+            self._log.debug(
-        )
+                f"Made request to Apple Music API with status {resp.status} and response {data}",
+            )
 
         data = data["data"][0]
 
@@ -165,25 +172,127 @@ class Client:
                     "This playlist is empty and therefore cannot be queued.",
                 )
 
-            _next = track_data.get("next")
+            # Apple Music uses cursor pagination with 'next'. We'll fetch subsequent pages
-            if _next:
+            # concurrently by first collecting cursors in rolling waves.
-                next_page_url = AM_BASE_URL + _next
+            next_cursor = track_data.get("next")
-
+            semaphore = asyncio.Semaphore(self._playlist_concurrency)
-                while next_page_url is not None:
-                    resp = await self.session.get(next_page_url, headers=self.headers)
 
+            async def fetch_page(url: str) -> List[Song]:
+                async with semaphore:
+                    resp = await self.session.get(url, headers=self.headers)
                     if resp.status != 200:
-                        raise AppleMusicRequestException(
+                        if self._log:
-                            f"Error while fetching results: {resp.status} {resp.reason}",
+                            self._log.warning(
-                        )
+                                f"Apple Music page fetch failed {resp.status} {resp.reason} for {url}",
+                            )
+                        return []
+                    pj: dict = await resp.json(loads=json.loads)
+                    songs = [Song(track) for track in pj.get("data", [])]
+                    # Return songs; we will look for pj.get('next') in streaming iterator variant
+                    return songs, pj.get("next")  # type: ignore
 
-                    next_data: dict = await resp.json(loads=json.loads)
+            # We'll implement a wave-based approach similar to Spotify but need to follow cursors.
-                    album_tracks.extend(Song(track) for track in next_data["data"])
+            # Because we cannot know all cursors upfront, we'll iteratively fetch waves.
+            waves: List[List[Song]] = []
+            cursors: List[str] = []
+            if next_cursor:
+                cursors.append(next_cursor)
 
-                    _next = next_data.get("next")
+            # Limit total waves to avoid infinite loops in malformed responses
-                    if _next:
+            max_waves = 50
-                        next_page_url = AM_BASE_URL + _next
+            wave_size = self._playlist_concurrency * 2
-                    else:
+            wave_counter = 0
-                        next_page_url = None
+            while cursors and wave_counter < max_waves:
+                current = cursors[:wave_size]
+                cursors = cursors[wave_size:]
+                tasks = [
+                    fetch_page(AM_BASE_URL + cursor) for cursor in current  # type: ignore[arg-type]
+                ]
+                results = await asyncio.gather(*tasks, return_exceptions=True)
+                for res in results:
+                    if isinstance(res, tuple):  # (songs, next)
+                        songs, nxt = res
+                        if songs:
+                            waves.append(songs)
+                        if nxt:
+                            cursors.append(nxt)
+                wave_counter += 1
+
+            for w in waves:
+                album_tracks.extend(w)
 
             return Playlist(data, album_tracks)
+
+    async def iter_playlist_tracks(
+        self,
+        *,
+        query: str,
+        batch_size: int = 100,
+    ) -> AsyncGenerator[List[Song], None]:
+        """Stream Apple Music playlist tracks in batches.
+
+        Parameters
+        ----------
+        query: str
+            Apple Music playlist URL.
+        batch_size: int
+            Logical grouping size for yielded batches.
+        """
+        if not self.token or datetime.utcnow() > self.expiry:
+            await self.request_token()
+
+        result = AM_URL_REGEX.match(query)
+        if not result or result.group("type") != "playlist":
+            raise InvalidAppleMusicURL("Provided query is not a valid Apple Music playlist URL.")
+
+        country = result.group("country")
+        playlist_id = result.group("id")
+        request_url = AM_REQ_URL.format(country=country, type="playlist", id=playlist_id)
+        resp = await self.session.get(request_url, headers=self.headers)
+        if resp.status != 200:
+            raise AppleMusicRequestException(
+                f"Error while fetching results: {resp.status} {resp.reason}",
+            )
+        data: dict = await resp.json(loads=json.loads)
+        playlist_data = data["data"][0]
+        track_data: dict = playlist_data["relationships"]["tracks"]
+
+        first_page_tracks = [Song(track) for track in track_data["data"]]
+        for i in range(0, len(first_page_tracks), batch_size):
+            yield first_page_tracks[i : i + batch_size]
+
+        next_cursor = track_data.get("next")
+        semaphore = asyncio.Semaphore(self._playlist_concurrency)
+
+        async def fetch(cursor: str) -> tuple[List[Song], Optional[str]]:
+            url = AM_BASE_URL + cursor
+            async with semaphore:
+                r = await self.session.get(url, headers=self.headers)
+                if r.status != 200:
+                    if self._log:
+                        self._log.warning(
+                            f"Skipping Apple Music page due to {r.status} {r.reason}",
+                        )
+                    return [], None
+                pj: dict = await r.json(loads=json.loads)
+                songs = [Song(track) for track in pj.get("data", [])]
+                return songs, pj.get("next")
+
+        # Rolling waves of fetches following cursor chain
+        max_waves = 50
+        wave_size = self._playlist_concurrency * 2
+        waves = 0
+        cursors: List[str] = []
+        if next_cursor:
+            cursors.append(next_cursor)
+        while cursors and waves < max_waves:
+            current = cursors[:wave_size]
+            cursors = cursors[wave_size:]
+            results = await asyncio.gather(*[fetch(c) for c in current])
+            for songs, nxt in results:
+                if songs:
+                    for j in range(0, len(songs), batch_size):
+                        yield songs[j : j + batch_size]
+                if nxt:
+                    cursors.append(nxt)
+            waves += 1

pomice/enums.py

@@ -34,6 +34,11 @@ class SearchType(Enum):
     ytsearch = "ytsearch"
     ytmsearch = "ytmsearch"
     scsearch = "scsearch"
+    other = "other"
+
+    @classmethod
+    def _missing_(cls, value: object) -> "SearchType":  # type: ignore[override]
+        return cls.other
 
     def __str__(self) -> str:
         return self.value
@@ -54,6 +59,8 @@ class TrackType(Enum):
     TrackType.HTTP defines that the track is from an HTTP source.
 
     TrackType.LOCAL defines that the track is from a local source.
+
+    TrackType.OTHER defines that the track is from an unknown source (possible from 3rd-party plugins).
     """
 
     # We don't have to define anything special for these, since these just serve as flags
@@ -63,6 +70,11 @@ class TrackType(Enum):
     APPLE_MUSIC = "apple_music"
     HTTP = "http"
     LOCAL = "local"
+    OTHER = "other"
+
+    @classmethod
+    def _missing_(cls, value: object) -> "TrackType":  # type: ignore[override]
+        return cls.OTHER
 
     def __str__(self) -> str:
         return self.value
@@ -79,6 +91,8 @@ class PlaylistType(Enum):
     PlaylistType.SPOTIFY defines that the playlist is from Spotify
 
     PlaylistType.APPLE_MUSIC defines that the playlist is from Apple Music.
+
+    PlaylistType.OTHER defines that the playlist is from an unknown source (possible from 3rd-party plugins).
     """
 
     # We don't have to define anything special for these, since these just serve as flags
@@ -86,6 +100,11 @@ class PlaylistType(Enum):
     SOUNDCLOUD = "soundcloud"
     SPOTIFY = "spotify"
     APPLE_MUSIC = "apple_music"
+    OTHER = "other"
+
+    @classmethod
+    def _missing_(cls, value: object) -> "PlaylistType":  # type: ignore[override]
+        return cls.OTHER
 
     def __str__(self) -> str:
         return self.value
@@ -199,8 +218,12 @@ class URLRegex:
 
     """
 
+    # Spotify share links can include query parameters like ?si=XXXX, a trailing slash,
+    # or an intl locale segment (e.g. /intl-en/). Broaden the regex so we still capture
+    # the type and id while ignoring extra parameters. This prevents the URL from being
+    # treated as a generic Lavalink identifier and ensures internal Spotify handling runs.
     SPOTIFY_URL = re.compile(
-        r"https?://open.spotify.com/(?P<type>album|playlist|track|artist)/(?P<id>[a-zA-Z0-9]+)",
+        r"https?://open\.spotify\.com/(?:intl-[a-zA-Z-]+/)?(?P<type>album|playlist|track|artist)/(?P<id>[a-zA-Z0-9]+)(?:/)?(?:\?.*)?$",
     )
 
     DISCORD_MP3_URL = re.compile(
@@ -221,14 +244,17 @@ class URLRegex:
         r"(?P<video>^.*?)(\?t|&start)=(?P<time>\d+)?.*",
     )
 
+    # Apple Music links sometimes append additional query parameters (e.g. &l=en, &uo=4).
+    # Allow arbitrary query parameters so valid links are captured and parsed.
     AM_URL = re.compile(
-        r"https?://music.apple.com/(?P<country>[a-zA-Z]{2})/"
+        r"https?://music\.apple\.com/(?P<country>[a-zA-Z]{2})/"
-        r"(?P<type>album|playlist|song|artist)/(?P<name>.+)/(?P<id>[^?]+)",
+        r"(?P<type>album|playlist|song|artist)/(?P<name>.+?)/(?P<id>[^/?]+?)(?:/)?(?:\?.*)?$",
     )
 
+    # Single-in-album links may also carry extra query params beyond the ?i=<trackid> token.
     AM_SINGLE_IN_ALBUM_REGEX = re.compile(
-        r"https?://music.apple.com/(?P<country>[a-zA-Z]{2})/(?P<type>album|playlist|song|artist)/"
+        r"https?://music\.apple\.com/(?P<country>[a-zA-Z]{2})/(?P<type>album|playlist|song|artist)/"
-        r"(?P<name>.+)/(?P<id>.+)(\?i=)(?P<id2>.+)",
+        r"(?P<name>.+)/(?P<id>[^/?]+)(\?i=)(?P<id2>[^&]+)(?:&.*)?$",
     )
 
     SOUNDCLOUD_URL = re.compile(
@@ -273,3 +299,10 @@ class LogLevel(IntEnum):
     WARN = 30
     ERROR = 40
     CRITICAL = 50
+
+    @classmethod
+    def from_str(cls, level_str):
+        try:
+            return cls[level_str.upper()]
+        except KeyError:
+            raise ValueError(f"No such log level: {level_str}")

pomice/events.py

@@ -128,7 +128,6 @@ class TrackExceptionEvent(PomiceEvent):
 
     def __init__(self, data: dict, player: Player):
         self.player: Player = player
-        assert self.player._ending_track is not None
         self.track: Optional[Track] = self.player._ending_track
         # Error is for Lavalink <= 3.3
         self.exception: str = data.get(

pomice/player.py

@@ -213,7 +213,7 @@ class Player(VoiceProtocol):
         difference = (time.time() * 1000) - self._last_update
         position = self._last_position + difference
 
-        return min(position, current.length)
+        return round(min(position, current.length))
 
     @property
     def rate(self) -> float:
@@ -298,7 +298,8 @@ class Player(VoiceProtocol):
         self._last_update = int(state.get("time", 0))
         self._is_connected = bool(state.get("connected"))
         self._last_position = int(state.get("position", 0))
-        self._log.debug(f"Got player update state with data {state}")
+        if self._log:
+            self._log.debug(f"Got player update state with data {state}")
 
     async def _dispatch_voice_update(self, voice_data: Optional[Dict[str, Any]] = None) -> None:
         if {"sessionId", "event"} != self._voice_state.keys():
@@ -319,7 +320,10 @@ class Player(VoiceProtocol):
             data={"voice": data},
         )
 
-        self._log.debug(f"Dispatched voice update to {state['event']['endpoint']} with data {data}")
+        if self._log:
+            self._log.debug(
+                f"Dispatched voice update to {state['event']['endpoint']} with data {data}",
+            )
 
     async def on_voice_server_update(self, data: VoiceServerUpdate) -> None:
         self._voice_state.update({"event": data})
@@ -335,6 +339,10 @@ class Player(VoiceProtocol):
             return
 
         channel = self.guild.get_channel(int(channel_id))
+
+        if self.channel != channel:
+            self.channel = channel
+
         if not channel:
             await self.disconnect()
             self._voice_state.clear()
@@ -357,7 +365,8 @@ class Player(VoiceProtocol):
         if isinstance(event, TrackStartEvent):
             self._ending_track = self._current
 
-        self._log.debug(f"Dispatched event {data['type']} to player.")
+        if self._log:
+            self._log.debug(f"Dispatched event {data['type']} to player.")
 
     async def _refresh_endpoint_uri(self, session_id: Optional[str]) -> None:
         self._player_endpoint_uri = f"sessions/{session_id}/players"
@@ -379,14 +388,15 @@ class Player(VoiceProtocol):
             data=data or None,
         )
 
-        self._log.debug(f"Swapped all players to new node {new_node._identifier}.")
+        if self._log:
+            self._log.debug(f"Swapped all players to new node {new_node._identifier}.")
 
     async def get_tracks(
         self,
         query: str,
         *,
         ctx: Optional[commands.Context] = None,
-        search_type: SearchType = SearchType.ytsearch,
+        search_type: SearchType | None = SearchType.ytsearch,
         filters: Optional[List[Filter]] = None,
     ) -> Optional[Union[List[Track], Playlist]]:
         """Fetches tracks from the node's REST api to parse into Lavalink.
@@ -452,7 +462,8 @@ class Player(VoiceProtocol):
             data={"encodedTrack": None},
         )
 
-        self._log.debug(f"Player has been stopped.")
+        if self._log:
+            self._log.debug(f"Player has been stopped.")
 
     async def disconnect(self, *, force: bool = False) -> None:
         """Disconnects the player from voice."""
@@ -480,7 +491,8 @@ class Player(VoiceProtocol):
                 guild_id=self._guild.id,
             )
 
-        self._log.debug("Player has been destroyed.")
+        if self._log:
+            self._log.debug("Player has been destroyed.")
 
     async def play(
         self,
@@ -492,8 +504,11 @@ class Player(VoiceProtocol):
     ) -> Track:
         """Plays a track. If a Spotify track is passed in, it will be handled accordingly."""
 
+        if not track._search_type:
+            track.original = track
+
         # Make sure we've never searched the track before
-        if track.original is None:
+        if track._search_type and track.original is None:
             # First lets try using the tracks ISRC, every track has one (hopefully)
             try:
                 if not track.isrc:
@@ -573,9 +588,10 @@ class Player(VoiceProtocol):
             query=f"noReplace={ignore_if_playing}",
         )
 
-        self._log.debug(
+        if self._log:
-            f"Playing {track.title} from uri {track.uri} with a length of {track.length}",
+            self._log.debug(
-        )
+                f"Playing {track.title} from uri {track.uri} with a length of {track.length}",
+            )
 
         return self._current
 
@@ -596,7 +612,8 @@ class Player(VoiceProtocol):
             data={"position": position},
         )
 
-        self._log.debug(f"Seeking to {position}.")
+        if self._log:
+            self._log.debug(f"Seeking to {position}.")
         return self.position
 
     async def set_pause(self, pause: bool) -> bool:
@@ -609,7 +626,8 @@ class Player(VoiceProtocol):
         )
         self._paused = pause
 
-        self._log.debug(f"Player has been {'paused' if pause else 'resumed'}.")
+        if self._log:
+            self._log.debug(f"Player has been {'paused' if pause else 'resumed'}.")
         return self._paused
 
     async def set_volume(self, volume: int) -> int:
@@ -622,7 +640,8 @@ class Player(VoiceProtocol):
         )
         self._volume = volume
 
-        self._log.debug(f"Player volume has been adjusted to {volume}")
+        if self._log:
+            self._log.debug(f"Player volume has been adjusted to {volume}")
         return self._volume
 
     async def move_to(self, channel: VoiceChannel) -> None:
@@ -651,9 +670,11 @@ class Player(VoiceProtocol):
             data={"filters": payload},
         )
 
-        self._log.debug(f"Filter has been applied to player with tag {_filter.tag}")
+        if self._log:
+            self._log.debug(f"Filter has been applied to player with tag {_filter.tag}")
         if fast_apply:
-            self._log.debug(f"Fast apply passed, now applying filter instantly.")
+            if self._log:
+                self._log.debug(f"Fast apply passed, now applying filter instantly.")
             await self.seek(self.position)
 
         return self._filters
@@ -674,9 +695,11 @@ class Player(VoiceProtocol):
             guild_id=self._guild.id,
             data={"filters": payload},
         )
-        self._log.debug(f"Filter has been removed from player with tag {filter_tag}")
+        if self._log:
+            self._log.debug(f"Filter has been removed from player with tag {filter_tag}")
         if fast_apply:
-            self._log.debug(f"Fast apply passed, now removing filter instantly.")
+            if self._log:
+                self._log.debug(f"Fast apply passed, now removing filter instantly.")
             await self.seek(self.position)
 
         return self._filters
@@ -705,9 +728,11 @@ class Player(VoiceProtocol):
             guild_id=self._guild.id,
             data={"filters": payload},
         )
-        self._log.debug(f"Filter with tag {filter_tag} has been edited to {edited_filter!r}")
+        if self._log:
+            self._log.debug(f"Filter with tag {filter_tag} has been edited to {edited_filter!r}")
         if fast_apply:
-            self._log.debug(f"Fast apply passed, now editing filter instantly.")
+            if self._log:
+                self._log.debug(f"Fast apply passed, now editing filter instantly.")
             await self.seek(self.position)
 
         return self._filters
@@ -731,8 +756,10 @@ class Player(VoiceProtocol):
             guild_id=self._guild.id,
             data={"filters": {}},
         )
-        self._log.debug(f"All filters have been removed from player.")
+        if self._log:
+            self._log.debug(f"All filters have been removed from player.")
 
         if fast_apply:
-            self._log.debug(f"Fast apply passed, now removing all filters instantly.")
+            if self._log:
+                self._log.debug(f"Fast apply passed, now removing all filters instantly.")
             await self.seek(self.position)

pomice/pool.py

@@ -21,7 +21,12 @@ import orjson as json
 from discord import Client
 from discord.ext import commands
 from discord.utils import MISSING
-from websockets import client
+
+try:
+    from websockets.legacy import client  # websockets >= 10.0
+except ImportError:
+    import websockets.client as client  # websockets < 10.0  # type: ignore
+
 from websockets import exceptions
 from websockets import typing as wstype
 
@@ -30,7 +35,6 @@ from . import applemusic
 from . import spotify
 from .enums import *
 from .enums import LogLevel
-from .exceptions import AppleMusicNotEnabled
 from .exceptions import InvalidSpotifyClientAuthorization
 from .exceptions import LavalinkVersionIncompatible
 from .exceptions import NodeConnectionFailure
@@ -97,7 +101,6 @@ class Node:
         "_apple_music_client",
         "_route_planner",
         "_log",
-        "_log_handler",
         "_stats",
         "available",
     )
@@ -121,8 +124,7 @@ class Node:
         spotify_client_secret: Optional[str] = None,
         apple_music: bool = False,
         fallback: bool = False,
-        log_level: LogLevel = LogLevel.INFO,
+        logger: Optional[logging.Logger] = None,
-        log_handler: Optional[logging.Handler] = None,
     ):
         if not isinstance(port, int):
             raise TypeError("Port must be an integer")
@@ -138,8 +140,6 @@ class Node:
         self._resume_timeout: int = resume_timeout
         self._secure: bool = secure
         self._fallback: bool = fallback
-        self._log_level: LogLevel = log_level
-        self._log_handler = log_handler
 
         self._websocket_uri: str = f"{'wss' if self._secure else 'ws'}://{self._host}:{self._port}"
         self._rest_uri: str = f"{'https' if self._secure else 'http'}://{self._host}:{self._port}"
@@ -154,7 +154,7 @@ class Node:
         self._version: LavalinkVersion = LavalinkVersion(0, 0, 0)
 
         self._route_planner = RoutePlanner(self)
-        self._log = self._setup_logging(self._log_level)
+        self._log = logger
 
         if not self._bot.user:
             raise NodeCreationError("Bot user is not ready yet.")
@@ -232,31 +232,6 @@ class Node:
         """Alias for `Node.latency`, returns the latency of the node"""
         return self.latency
 
-    def _setup_logging(self, level: LogLevel) -> logging.Logger:
-        logger = logging.getLogger("pomice")
-
-        handler = None
-
-        if self._log_handler:
-            handler = self._log_handler
-            logger.setLevel(handler.level)
-        else:
-            handler = logging.StreamHandler()
-            logger.setLevel(level)
-            dt_fmt = "%Y-%m-%d %H:%M:%S"
-            formatter = logging.Formatter(
-                "[{asctime}] [{levelname:<8}] {name}: {message}",
-                dt_fmt,
-                style="{",
-            )
-            handler.setFormatter(formatter)
-
-        if handler:
-            logger.handlers.clear()
-            logger.addHandler(handler)
-
-        return logger
-
     async def _handle_version_check(self, version: str) -> None:
         if version.endswith("-SNAPSHOT"):
             # we're just gonna assume all snapshot versions correlate with v4
@@ -278,7 +253,8 @@ class Node:
             int(_version_groups[2] or 0),
         )
 
-        self._log.debug(f"Parsed Lavalink version: {major}.{minor}.{fix}")
+        if self._log:
+            self._log.debug(f"Parsed Lavalink version: {major}.{minor}.{fix}")
         self._version = LavalinkVersion(major=major, minor=minor, fix=fix)
         if self._version < LavalinkVersion(3, 7, 0):
             self._available = False
@@ -332,12 +308,13 @@ class Node:
         if not self._resume_key:
             return
 
-        data = {"timeout": self._resume_timeout}
+        data: Dict[str, Union[int, str, bool]] = {"timeout": self._resume_timeout}
 
         if self._version.major == 3:
             data["resumingKey"] = self._resume_key
         elif self._version.major == 4:
-            self._log.warning("Using a resume key with Lavalink v4 is deprecated.")
+            if self._log:
+                self._log.warning("Using a resume key with Lavalink v4 is deprecated.")
             data["resuming"] = True
 
         await self.send(
@@ -352,7 +329,8 @@ class Node:
             try:
                 msg = await self._websocket.recv()
                 data = json.loads(msg)
-                self._log.debug(f"Recieved raw websocket message {msg}")
+                if self._log:
+                    self._log.debug(f"Recieved raw websocket message {msg}")
                 self._loop.create_task(self._handle_ws_msg(data=data))
             except exceptions.ConnectionClosed:
                 if self.player_count > 0:
@@ -366,14 +344,18 @@ class Node:
 
                 backoff = ExponentialBackoff(base=7)
                 retry = backoff.delay()
-                self._log.debug(f"Retrying connection to Node {self._identifier} in {retry} secs")
+                if self._log:
+                    self._log.debug(
+                        f"Retrying connection to Node {self._identifier} in {retry} secs",
+                    )
                 await asyncio.sleep(retry)
 
                 if not self.is_connected:
                     self._loop.create_task(self.connect(reconnect=True))
 
     async def _handle_ws_msg(self, data: dict) -> None:
-        self._log.debug(f"Recieved raw payload from Node {self._identifier} with data {data}")
+        if self._log:
+            self._log.debug(f"Recieved raw payload from Node {self._identifier} with data {data}")
         op = data.get("op", None)
 
         if op == "stats":
@@ -426,9 +408,10 @@ class Node:
             headers=self._headers,
             json=data or {},
         )
-        self._log.debug(
+        if self._log:
-            f"Making REST request to Node {self._identifier} with method {method} to {uri}",
+            self._log.debug(
-        )
+                f"Making REST request to Node {self._identifier} with method {method} to {uri}",
+            )
         if resp.status >= 300:
             resp_data: dict = await resp.json()
             raise NodeRestException(
@@ -436,20 +419,23 @@ class Node:
             )
 
         if method == "DELETE" or resp.status == 204:
-            self._log.debug(
+            if self._log:
-                f"REST request to Node {self._identifier} with method {method} to {uri} completed sucessfully and returned no data.",
+                self._log.debug(
-            )
+                    f"REST request to Node {self._identifier} with method {method} to {uri} completed sucessfully and returned no data.",
+                )
             return await resp.json(content_type=None)
 
         if resp.content_type == "text/plain":
-            self._log.debug(
+            if self._log:
-                f"REST request to Node {self._identifier} with method {method} to {uri} completed sucessfully and returned text with body {await resp.text()}",
+                self._log.debug(
-            )
+                    f"REST request to Node {self._identifier} with method {method} to {uri} completed sucessfully and returned text with body {await resp.text()}",
+                )
             return await resp.text()
 
-        self._log.debug(
+        if self._log:
-            f"REST request to Node {self._identifier} with method {method} to {uri} completed sucessfully and returned JSON with body {await resp.json()}",
+            self._log.debug(
-        )
+                f"REST request to Node {self._identifier} with method {method} to {uri} completed sucessfully and returned JSON with body {await resp.json()}",
+            )
         return await resp.json()
 
     def get_player(self, guild_id: int) -> Optional[Player]:
@@ -463,7 +449,17 @@ class Node:
         start = time.perf_counter()
 
         if not self._session:
-            self._session = aiohttp.ClientSession()
+            # Configure connection pooling for optimal concurrent request performance
+            connector = aiohttp.TCPConnector(
+                limit=100,  # Total connection limit
+                limit_per_host=30,  # Per-host connection limit
+                ttl_dns_cache=300,  # DNS cache TTL in seconds
+            )
+            timeout = aiohttp.ClientTimeout(total=30, connect=10)
+            self._session = aiohttp.ClientSession(
+                connector=connector,
+                timeout=timeout,
+            )
 
         try:
             if not reconnect:
@@ -477,25 +473,28 @@ class Node:
                 await self._handle_version_check(version=version)
                 await self._set_ext_client_session(session=self._session)
 
-                self._log.debug(
+                if self._log:
-                    f"Version check from Node {self._identifier} successful. Returned version {version}",
+                    self._log.debug(
-                )
+                        f"Version check from Node {self._identifier} successful. Returned version {version}",
+                    )
 
-            self._websocket = await client.connect(
+            self._websocket = await client.connect(  # type: ignore
                 f"{self._websocket_uri}/v{self._version.major}/websocket",
                 extra_headers=self._headers,
                 ping_interval=self._heartbeat,
             )
 
             if reconnect:
-                self._log.debug(f"Trying to reconnect to Node {self._identifier}...")
+                if self._log:
+                    self._log.debug(f"Trying to reconnect to Node {self._identifier}...")
                 if self.player_count:
                     for player in self.players.values():
                         await player._refresh_endpoint_uri(self._session_id)
 
-            self._log.debug(
+            if self._log:
-                f"Node {self._identifier} successfully connected to websocket using {self._websocket_uri}/v{self._version.major}/websocket",
+                self._log.debug(
-            )
+                    f"Node {self._identifier} successfully connected to websocket using {self._websocket_uri}/v{self._version.major}/websocket",
+                )
 
             if not self._task:
                 self._task = self._loop.create_task(self._listen())
@@ -504,7 +503,8 @@ class Node:
 
             end = time.perf_counter()
 
-            self._log.info(f"Connected to node {self._identifier}. Took {end - start:.3f}s")
+            if self._log:
+                self._log.info(f"Connected to node {self._identifier}. Took {end - start:.3f}s")
             return self
 
         except (aiohttp.ClientConnectorError, OSError, ConnectionRefusedError):
@@ -529,20 +529,23 @@ class Node:
 
         for player in self.players.copy().values():
             await player.destroy()
-            self._log.debug("All players disconnected from node.")
+            if self._log:
+                self._log.debug("All players disconnected from node.")
 
         await self._websocket.close()
         await self._session.close()
-        self._log.debug("Websocket and http session closed.")
+        if self._log:
+            self._log.debug("Websocket and http session closed.")
 
         del self._pool._nodes[self._identifier]
         self.available = False
         self._task.cancel()
 
         end = time.perf_counter()
-        self._log.info(
+        if self._log:
-            f"Successfully disconnected from node {self._identifier} and closed all sessions. Took {end - start:.3f}s",
+            self._log.info(
-        )
+                f"Successfully disconnected from node {self._identifier} and closed all sessions. Took {end - start:.3f}s",
+            )
 
     async def build_track(self, identifier: str, ctx: Optional[commands.Context] = None) -> Track:
         """
@@ -557,11 +560,14 @@ class Node:
             path="decodetrack",
             query=f"encodedTrack={quote(identifier)}",
         )
+
+        track_info = data["info"] if self._version.major >= 4 else data
+
         return Track(
             track_id=identifier,
             ctx=ctx,
-            info=data,
+            info=track_info,
-            track_type=TrackType(data["sourceName"]),
+            track_type=TrackType(track_info["sourceName"]),
         )
 
     async def get_tracks(
@@ -569,7 +575,7 @@ class Node:
         query: str,
         *,
         ctx: Optional[commands.Context] = None,
-        search_type: SearchType = SearchType.ytsearch,
+        search_type: Optional[SearchType] = SearchType.ytsearch,
         filters: Optional[List[Filter]] = None,
     ) -> Optional[Union[Playlist, List[Track]]]:
         """Fetches tracks from the node's REST api to parse into Lavalink.
@@ -590,13 +596,13 @@ class Node:
             for filter in filters:
                 filter.set_preload()
 
-        if URLRegex.AM_URL.match(query):
+        # Due to the inclusion of plugins in the v4 update
-            if not self._apple_music_client:
+        # we are doing away with raising an error if pomice detects
-                raise AppleMusicNotEnabled(
+        # either a Spotify or Apple Music URL and the respective client
-                    "You must have Apple Music functionality enabled in order to play Apple Music tracks."
+        # is not enabled. Instead, we will just only parse the URL
-                    "Please set apple_music to True in your Node class.",
+        # if the client is enabled and the URL is valid.
-                )
 
+        if self._apple_music_client and URLRegex.AM_URL.match(query):
             apple_music_results = await self._apple_music_client.search(query=query)
             if isinstance(apple_music_results, applemusic.Song):
                 return [
@@ -604,7 +610,7 @@ class Node:
                         track_id=apple_music_results.id,
                         ctx=ctx,
                         track_type=TrackType.APPLE_MUSIC,
-                        search_type=search_type,
+                        search_type=search_type or SearchType.ytsearch,
                         filters=filters,
                         info={
                             "title": apple_music_results.name,
@@ -626,7 +632,7 @@ class Node:
                     track_id=track.id,
                     ctx=ctx,
                     track_type=TrackType.APPLE_MUSIC,
-                    search_type=search_type,
+                    search_type=search_type or SearchType.ytsearch,
                     filters=filters,
                     info={
                         "title": track.name,
@@ -655,14 +661,7 @@ class Node:
                 uri=apple_music_results.url,
             )
 
-        elif URLRegex.SPOTIFY_URL.match(query):
+        elif self._spotify_client and URLRegex.SPOTIFY_URL.match(query):
-            if not self._spotify_client_id and not self._spotify_client_secret:
-                raise InvalidSpotifyClientAuthorization(
-                    "You did not provide proper Spotify client authorization credentials. "
-                    "If you would like to use the Spotify searching feature, "
-                    "please obtain Spotify API credentials here: https://developer.spotify.com/",
-                )
-
             spotify_results = await self._spotify_client.search(query=query)  # type: ignore
 
             if isinstance(spotify_results, spotify.Track):
@@ -671,7 +670,7 @@ class Node:
                         track_id=spotify_results.id,
                         ctx=ctx,
                         track_type=TrackType.SPOTIFY,
-                        search_type=search_type,
+                        search_type=search_type or SearchType.ytsearch,
                         filters=filters,
                         info={
                             "title": spotify_results.name,
@@ -693,7 +692,7 @@ class Node:
                     track_id=track.id,
                     ctx=ctx,
                     track_type=TrackType.SPOTIFY,
-                    search_type=search_type,
+                    search_type=search_type or SearchType.ytsearch,
                     filters=filters,
                     info={
                         "title": track.name,
@@ -722,63 +721,14 @@ class Node:
                 uri=spotify_results.uri,
             )
 
-        elif discord_url := URLRegex.DISCORD_MP3_URL.match(query):
-            data: dict = await self.send(
-                method="GET",
-                path="loadtracks",
-                query=f"identifier={quote(query)}",
-            )
-
-            track: dict = data["tracks"][0]
-            info: dict = track["info"]
-
-            return [
-                Track(
-                    track_id=track["track"],
-                    info={
-                        "title": discord_url.group("file"),
-                        "author": "Unknown",
-                        "length": info["length"],
-                        "uri": info["uri"],
-                        "position": info["position"],
-                        "identifier": info["identifier"],
-                    },
-                    ctx=ctx,
-                    track_type=TrackType.HTTP,
-                    filters=filters,
-                ),
-            ]
-
-        elif path.exists(path.dirname(query)):
-            local_file = Path(query)
-            data: dict = await self.send(  # type: ignore
-                method="GET",
-                path="loadtracks",
-                query=f"identifier={quote(query)}",
-            )
-
-            track: dict = data["tracks"][0]  # type: ignore
-            info: dict = track["info"]  # type: ignore
-
-            return [
-                Track(
-                    track_id=track["track"],
-                    info={
-                        "title": local_file.name,
-                        "author": "Unknown",
-                        "length": info["length"],
-                        "uri": quote(local_file.as_uri()),
-                        "position": info["position"],
-                        "identifier": info["identifier"],
-                    },
-                    ctx=ctx,
-                    track_type=TrackType.LOCAL,
-                    filters=filters,
-                ),
-            ]
-
         else:
-            if not URLRegex.BASE_URL.match(query) and not re.match(r"(?:ytm?|sc)search:.", query):
+            if (
+                search_type
+                and not URLRegex.BASE_URL.match(query)
+                and not re.match(r"(?:[a-z]+?)search:.", query)
+                and not URLRegex.DISCORD_MP3_URL.match(query)
+                and not path.exists(path.dirname(query))
+            ):
                 query = f"{search_type}:{query}"
 
             # If YouTube url contains a timestamp, capture it for use later.
@@ -804,7 +754,7 @@ class Node:
             )
 
         elif load_type in ("LOAD_FAILED", "error"):
-            exception = data["exception"]
+            exception = data["data"] if self._version.major >= 4 else data["exception"]
             raise TrackLoadError(
                 f"{exception['message']} [{exception['severity']}]",
             )
@@ -813,6 +763,12 @@ class Node:
             return None
 
         elif load_type in ("PLAYLIST_LOADED", "playlist"):
+            if self._version.major >= 4:
+                track_list = data[data_type]["tracks"]
+                playlist_info = data[data_type]["info"]
+            else:
+                track_list = data[data_type]
+                playlist_info = data["playlistInfo"]
             tracks = [
                 Track(
                     track_id=track["encoded"],
@@ -820,10 +776,10 @@ class Node:
                     ctx=ctx,
                     track_type=TrackType(track["info"]["sourceName"]),
                 )
-                for track in data[data_type]
+                for track in track_list
             ]
             return Playlist(
-                playlist_info=data["playlistInfo"],
+                playlist_info=playlist_info,
                 tracks=tracks,
                 playlist_type=PlaylistType(tracks[0].track_type.value),
                 thumbnail=tracks[0].thumbnail,
@@ -831,6 +787,49 @@ class Node:
             )
 
         elif load_type in ("SEARCH_RESULT", "TRACK_LOADED", "track", "search"):
+            if self._version.major >= 4 and isinstance(data[data_type], dict):
+                data[data_type] = [data[data_type]]
+
+            if path.exists(path.dirname(query)):
+                local_file = Path(query)
+
+                return [
+                    Track(
+                        track_id=track["encoded"],
+                        info={
+                            "title": local_file.name,
+                            "author": "Unknown",
+                            "length": track["info"]["length"],
+                            "uri": quote(local_file.as_uri()),
+                            "position": track["info"]["position"],
+                            "identifier": track["info"]["identifier"],
+                        },
+                        ctx=ctx,
+                        track_type=TrackType.LOCAL,
+                        filters=filters,
+                    )
+                    for track in data[data_type]
+                ]
+
+            elif discord_url := URLRegex.DISCORD_MP3_URL.match(query):
+                return [
+                    Track(
+                        track_id=track["encoded"],
+                        info={
+                            "title": discord_url.group("file"),
+                            "author": "Unknown",
+                            "length": track["info"]["length"],
+                            "uri": track["info"]["uri"],
+                            "position": track["info"]["position"],
+                            "identifier": track["info"]["identifier"],
+                        },
+                        ctx=ctx,
+                        track_type=TrackType.HTTP,
+                        filters=filters,
+                    )
+                    for track in data[data_type]
+                ]
+
             return [
                 Track(
                     track_id=track["encoded"],
@@ -897,6 +896,57 @@ class Node:
                 "The specfied track must be either a YouTube or Spotify track to recieve recommendations.",
             )
 
+    async def search_spotify_recommendations(
+        self,
+        query: str,
+        *,
+        ctx: Optional[commands.Context] = None,
+        filters: Optional[List[Filter]] = None,
+    ) -> Optional[Union[List[Track], Playlist]]:
+        """
+        Searches for recommendations on Spotify and returns a list of tracks based on the query.
+        You must have Spotify enabled for this to work.
+        You can pass in a discord.py Context object to get a
+        Context object on all tracks that get recommended.
+        """
+
+        if not self._spotify_client:
+            raise InvalidSpotifyClientAuthorization(
+                "You must have Spotify enabled to use this feature.",
+            )
+
+        results = await self._spotify_client.track_search(query=query)  # type: ignore
+        if not results:
+            raise TrackLoadError(
+                "Unable to find any tracks based on the query.",
+            )
+
+        tracks = [
+            Track(
+                track_id=track.id,
+                ctx=ctx,
+                track_type=TrackType.SPOTIFY,
+                info={
+                    "title": track.name,
+                    "author": track.artists,
+                    "length": track.length,
+                    "identifier": track.id,
+                    "uri": track.uri,
+                    "isStream": False,
+                    "isSeekable": True,
+                    "position": 0,
+                    "thumbnail": track.image,
+                    "isrc": track.isrc,
+                },
+                requester=self.bot.user,
+            )
+            for track in results
+        ]
+
+        track = tracks[0]
+
+        return await self.get_recommendations(track=track, ctx=ctx)
+
 
 class NodePool:
     """The base class for the node pool.
@@ -987,8 +1037,7 @@ class NodePool:
         session: Optional[aiohttp.ClientSession] = None,
         apple_music: bool = False,
         fallback: bool = False,
-        log_level: LogLevel = LogLevel.INFO,
+        logger: Optional[logging.Logger] = None,
-        log_handler: Optional[logging.Handler] = None,
     ) -> Node:
         """Creates a Node object to be then added into the node pool.
         For Spotify searching capabilites, pass in valid Spotify API credentials.
@@ -1015,8 +1064,7 @@ class NodePool:
             spotify_client_secret=spotify_client_secret,
             apple_music=apple_music,
             fallback=fallback,
-            log_level=log_level,
+            logger=logger,
-            log_handler=log_handler,
         )
 
         await node.connect()

pomice/queue.py

@@ -203,9 +203,13 @@ class Queue(Iterable[Track]):
             raise QueueEmpty("No items in the queue.")
 
         if self._loop_mode == LoopMode.QUEUE:
-            # recurse if the item isnt in the queue
+            # set current item to first track in queue if not set already
-            if self._current_item not in self._queue:
+            # otherwise exception will be raised
-                self.get()
+            if not self._current_item or self._current_item not in self._queue:
+                if self._queue:
+                    item = self._queue[0]
+                else:
+                    raise QueueEmpty("No items in the queue.")
 
             # set current item to first track in queue if not set already
             if not self._current_item:

pomice/spotify/client.py

@@ -1,13 +1,16 @@
 from __future__ import annotations
 
+import asyncio
 import logging
 import re
 import time
 from base64 import b64encode
+from typing import AsyncGenerator
 from typing import Dict
 from typing import List
 from typing import Optional
 from typing import Union
+from urllib.parse import quote
 
 import aiohttp
 import orjson as json
@@ -21,8 +24,10 @@ __all__ = ("Client",)
 
 GRANT_URL = "https://accounts.spotify.com/api/token"
 REQUEST_URL = "https://api.spotify.com/v1/{type}s/{id}"
+# Keep this in sync with URLRegex.SPOTIFY_URL (enums.py). Accept intl locale segment,
+# optional trailing slash, and query parameters.
 SPOTIFY_URL_REGEX = re.compile(
-    r"https?://open.spotify.com/(?P<type>album|playlist|track|artist)/(?P<id>[a-zA-Z0-9]+)",
+    r"https?://open\.spotify\.com/(?:intl-[a-zA-Z-]+/)?(?P<type>album|playlist|track|artist)/(?P<id>[a-zA-Z0-9]+)(?:/)?(?:\?.*)?$",
 )
 
 
@@ -32,29 +37,39 @@ class Client:
     for any Spotify URL you throw at it.
     """
 
-    def __init__(self, client_id: str, client_secret: str) -> None:
+    def __init__(
-        self._client_id: str = client_id
+        self,
-        self._client_secret: str = client_secret
+        client_id: str,
+        client_secret: str,
+        *,
+        playlist_concurrency: int = 10,
+        playlist_page_limit: Optional[int] = None,
+    ) -> None:
+        self._client_id = client_id
+        self._client_secret = client_secret
 
-        self.session: aiohttp.ClientSession = None  # type: ignore
+        # HTTP session will be injected by Node
+        self.session: Optional[aiohttp.ClientSession] = None
 
         self._bearer_token: Optional[str] = None
         self._expiry: float = 0.0
-        self._auth_token = b64encode(
+        self._auth_token = b64encode(f"{self._client_id}:{self._client_secret}".encode())
-            f"{self._client_id}:{self._client_secret}".encode(),
+        self._grant_headers = {"Authorization": f"Basic {self._auth_token.decode()}"}
-        )
-        self._grant_headers = {
-            "Authorization": f"Basic {self._auth_token.decode()}",
-        }
         self._bearer_headers: Optional[Dict] = None
         self._log = logging.getLogger(__name__)
 
+        # Performance tuning knobs
+        self._playlist_concurrency = max(1, playlist_concurrency)
+        self._playlist_page_limit = playlist_page_limit
+
     async def _set_session(self, session: aiohttp.ClientSession) -> None:
         self.session = session
 
     async def _fetch_bearer_token(self) -> None:
         _data = {"grant_type": "client_credentials"}
 
+        if not self.session:
+            raise SpotifyRequestException("HTTP session not initialized for Spotify client.")
         resp = await self.session.post(GRANT_URL, data=_data, headers=self._grant_headers)
 
         if resp.status != 200:
@@ -63,7 +78,8 @@ class Client:
             )
 
         data: dict = await resp.json(loads=json.loads)
-        self._log.debug(f"Fetched Spotify bearer token successfully")
+        if self._log:
+            self._log.debug(f"Fetched Spotify bearer token successfully")
 
         self._bearer_token = data["access_token"]
         self._expiry = time.time() + (int(data["expires_in"]) - 10)
@@ -84,6 +100,8 @@ class Client:
 
         request_url = REQUEST_URL.format(type=spotify_type, id=spotify_id)
 
+        if not self.session:
+            raise SpotifyRequestException("HTTP session not initialized for Spotify client.")
         resp = await self.session.get(request_url, headers=self._bearer_headers)
         if resp.status != 200:
             raise SpotifyRequestException(
@@ -91,15 +109,18 @@ class Client:
             )
 
         data: dict = await resp.json(loads=json.loads)
-        self._log.debug(
+        if self._log:
-            f"Made request to Spotify API with status {resp.status} and response {data}",
+            self._log.debug(
-        )
+                f"Made request to Spotify API with status {resp.status} and response {data}",
+            )
 
         if spotify_type == "track":
             return Track(data)
         elif spotify_type == "album":
             return Album(data)
         elif spotify_type == "artist":
+            if not self.session:
+                raise SpotifyRequestException("HTTP session not initialized for Spotify client.")
             resp = await self.session.get(
                 f"{request_url}/top-tracks?market=US",
                 headers=self._bearer_headers,
@@ -113,37 +134,178 @@ class Client:
             tracks = track_data["tracks"]
             return Artist(data, tracks)
         else:
+            # For playlists we optionally use a reduced fields payload to shrink response sizes.
+            # NB: We cannot apply fields filter to initial request because original metadata is needed.
             tracks = [
                 Track(track["track"])
                 for track in data["tracks"]["items"]
                 if track["track"] is not None
             ]
 
-            if not len(tracks):
+            if not tracks:
                 raise SpotifyRequestException(
                     "This playlist is empty and therefore cannot be queued.",
                 )
 
-            next_page_url = data["tracks"]["next"]
+            total_tracks = data["tracks"]["total"]
+            limit = data["tracks"]["limit"]
 
-            while next_page_url is not None:
+            # Short‑circuit small playlists (single page)
-                resp = await self.session.get(next_page_url, headers=self._bearer_headers)
+            if total_tracks <= limit:
-                if resp.status != 200:
+                return Playlist(data, tracks)
-                    raise SpotifyRequestException(
+
-                        f"Error while fetching results: {resp.status} {resp.reason}",
+            # Build remaining page URLs; Spotify supports offset-based pagination.
+            remaining_offsets = range(limit, total_tracks, limit)
+            page_urls: List[str] = []
+            fields_filter = (
+                "items(track(name,duration_ms,id,is_local,external_urls,external_ids,artists(name),album(images)))"
+                ",next"
+            )
+            for idx, offset in enumerate(remaining_offsets):
+                if self._playlist_page_limit is not None and idx >= self._playlist_page_limit:
+                    break
+                page_urls.append(
+                    f"{request_url}/tracks?offset={offset}&limit={limit}&fields={quote(fields_filter)}",
+                )
+
+            if page_urls:
+                semaphore = asyncio.Semaphore(self._playlist_concurrency)
+
+                async def fetch_page(url: str) -> Optional[List[Track]]:
+                    async with semaphore:
+                        if not self.session:
+                            raise SpotifyRequestException(
+                                "HTTP session not initialized for Spotify client.",
+                            )
+                        resp = await self.session.get(url, headers=self._bearer_headers)
+                        if resp.status != 200:
+                            if self._log:
+                                self._log.warning(
+                                    f"Page fetch failed {resp.status} {resp.reason} for {url}",
+                                )
+                            return None
+                        page_json: dict = await resp.json(loads=json.loads)
+                        return [
+                            Track(item["track"])
+                            for item in page_json.get("items", [])
+                            if item.get("track") is not None
+                        ]
+
+                # Chunk gather in waves to avoid creating thousands of tasks at once
+                aggregated: List[Track] = []
+                wave_size = self._playlist_concurrency * 2
+                for i in range(0, len(page_urls), wave_size):
+                    wave = page_urls[i : i + wave_size]
+                    results = await asyncio.gather(
+                        *[fetch_page(url) for url in wave],
+                        return_exceptions=False,
                     )
+                    for result in results:
+                        if result:
+                            aggregated.extend(result)
 
-                next_data: dict = await resp.json(loads=json.loads)
+                tracks.extend(aggregated)
-
-                tracks += [
-                    Track(track["track"])
-                    for track in next_data["items"]
-                    if track["track"] is not None
-                ]
-                next_page_url = next_data["next"]
 
             return Playlist(data, tracks)
 
+    async def iter_playlist_tracks(
+        self,
+        *,
+        query: str,
+        batch_size: int = 100,
+    ) -> AsyncGenerator[List[Track], None]:
+        """Stream playlist tracks in batches without waiting for full materialization.
+
+        Parameters
+        ----------
+        query: str
+            Spotify playlist URL.
+        batch_size: int
+            Number of tracks yielded per batch (logical grouping after fetch). Does not alter API page size.
+        """
+        if not self._bearer_token or time.time() >= self._expiry:
+            await self._fetch_bearer_token()
+
+        match = SPOTIFY_URL_REGEX.match(query)
+        if not match or match.group("type") != "playlist":
+            raise InvalidSpotifyURL("Provided query is not a valid Spotify playlist URL.")
+
+        playlist_id = match.group("id")
+        request_url = REQUEST_URL.format(type="playlist", id=playlist_id)
+        if not self.session:
+            raise SpotifyRequestException("HTTP session not initialized for Spotify client.")
+        resp = await self.session.get(request_url, headers=self._bearer_headers)
+        if resp.status != 200:
+            raise SpotifyRequestException(
+                f"Error while fetching results: {resp.status} {resp.reason}",
+            )
+        data: dict = await resp.json(loads=json.loads)
+
+        # Yield first page immediately
+        first_page_tracks = [
+            Track(item["track"])
+            for item in data["tracks"]["items"]
+            if item.get("track") is not None
+        ]
+        # Batch yield
+        for i in range(0, len(first_page_tracks), batch_size):
+            yield first_page_tracks[i : i + batch_size]
+
+        total = data["tracks"]["total"]
+        limit = data["tracks"]["limit"]
+        remaining_offsets = range(limit, total, limit)
+        fields_filter = (
+            "items(track(name,duration_ms,id,is_local,external_urls,external_ids,artists(name),album(images)))"
+            ",next"
+        )
+
+        semaphore = asyncio.Semaphore(self._playlist_concurrency)
+
+        async def fetch(offset: int) -> List[Track]:
+            url = (
+                f"{request_url}/tracks?offset={offset}&limit={limit}&fields={quote(fields_filter)}"
+            )
+            async with semaphore:
+                if not self.session:
+                    raise SpotifyRequestException(
+                        "HTTP session not initialized for Spotify client.",
+                    )
+                r = await self.session.get(url, headers=self._bearer_headers)
+                if r.status != 200:
+                    if self._log:
+                        self._log.warning(
+                            f"Skipping page offset={offset} due to {r.status} {r.reason}",
+                        )
+                    return []
+                pj: dict = await r.json(loads=json.loads)
+                return [
+                    Track(item["track"])
+                    for item in pj.get("items", [])
+                    if item.get("track") is not None
+                ]
+
+        # Fetch pages in rolling waves; yield promptly as soon as a wave completes.
+        wave_size = self._playlist_concurrency * 2
+        for i, offset in enumerate(remaining_offsets):
+            # Build wave
+            if i % wave_size == 0:
+                wave_offsets = list(
+                    o for o in remaining_offsets if o >= offset and o < offset + wave_size
+                )
+                results = await asyncio.gather(*[fetch(o) for o in wave_offsets])
+                for page_tracks in results:
+                    if not page_tracks:
+                        continue
+                    for j in range(0, len(page_tracks), batch_size):
+                        yield page_tracks[j : j + batch_size]
+                # Skip ahead in iterator by adjusting enumerate drive (consume extras)
+                # Fast-forward the generator manually
+                for _ in range(len(wave_offsets) - 1):
+                    try:
+                        next(remaining_offsets)  # type: ignore
+                    except StopIteration:
+                        break
+
     async def get_recommendations(self, *, query: str) -> List[Track]:
         if not self._bearer_token or time.time() >= self._expiry:
             await self._fetch_bearer_token()
@@ -165,6 +327,8 @@ class Client:
             id=f"?seed_tracks={spotify_id}",
         )
 
+        if not self.session:
+            raise SpotifyRequestException("HTTP session not initialized for Spotify client.")
         resp = await self.session.get(request_url, headers=self._bearer_headers)
         if resp.status != 200:
             raise SpotifyRequestException(
@@ -175,3 +339,22 @@ class Client:
         tracks = [Track(track) for track in data["tracks"]]
 
         return tracks
+
+    async def track_search(self, *, query: str) -> List[Track]:
+        if not self._bearer_token or time.time() >= self._expiry:
+            await self._fetch_bearer_token()
+
+        request_url = f"https://api.spotify.com/v1/search?q={quote(query)}&type=track"
+
+        if not self.session:
+            raise SpotifyRequestException("HTTP session not initialized for Spotify client.")
+        resp = await self.session.get(request_url, headers=self._bearer_headers)
+        if resp.status != 200:
+            raise SpotifyRequestException(
+                f"Error while fetching results: {resp.status} {resp.reason}",
+            )
+
+        data: dict = await resp.json(loads=json.loads)
+        tracks = [Track(track) for track in data["tracks"]["items"]]
+
+        return tracks