lavalink-client 1.1.1 → 1.1.3

package/dist/cjs/structures/Node.js

@@ -91,6 +91,8 @@ class LavalinkNode {
         this.calls++;
         if (options.method === "DELETE")
             return;
+        if (request.statusCode === 404)
+            throw new Error(`Node Request resulted into an error, request-URL: ${url} | headers: ${JSON.stringify(request.headers)}`);
         return parseAsText ? await request.body.text() : await request.body.json();
     }
     /**

package/dist/cjs/structures/Player.d.ts

@@ -2,8 +2,8 @@ import { EQBand, FilterData, FilterManager, LavalinkFilterData } from "./Filters
 import { LavalinkManager } from "./LavalinkManager";
 import { LavalinkNode } from "./Node";
 import { Queue } from "./Queue";
-import { Track } from "./Track";
-import { LavalinkPlayerVoiceOptions, SearchPlatform, SearchResult } from "./Utils";
+import { Track, UnresolvedTrack } from "./Track";
+import { LavalinkPlayerVoiceOptions, SearchPlatform, SearchResult, LavaSearchType, LavaSearchResponse, LavaSrcSearchPlatformBase } from "./Utils";
 type PlayerDestroyReasons = "QueueEmpty" | "NodeDestroy" | "NodeDeleted" | "LavalinkNoVoice" | "NodeReconnectFail" | "PlayerReconnectFail" | "Disconnected" | "ChannelDeleted";
 export type DestroyReasonsType = PlayerDestroyReasons | string;
 export declare const DestroyReasons: Record<PlayerDestroyReasons, PlayerDestroyReasons>;
@@ -43,7 +43,7 @@ export interface PlayerOptions {
 }
 export interface PlayOptions {
     /** Which Track to play | don't provide, if it should pick from the Queue */
-    track?: Track;
+    track?: Track | UnresolvedTrack;
     /** Encoded Track to use, instead of the queue system... */
     encodedTrack?: string | null;
     /** Encoded Track to use&search, instead of the queue system (yt only)... */
@@ -138,6 +138,11 @@ export declare class Player {
      * @param ignoreVolumeDecrementer If it should ignore the volumedecrementer option
      */
     setVolume(volume: number, ignoreVolumeDecrementer?: boolean): Promise<void>;
+    lavaSearch(query: {
+        query: string;
+        source: LavaSrcSearchPlatformBase;
+        types?: LavaSearchType[];
+    }, requestUser: unknown): Promise<SearchResult | LavaSearchResponse>;
     /**
      *
      * @param query Query for your data

package/dist/cjs/structures/Player.js

@@ -123,7 +123,9 @@ class Player {
             clearTimeout(this.get("internal_queueempty"));
             this.set("internal_queueempty", undefined);
         }
-        if (options?.track && this.LavalinkManager.utils.isTrack(options?.track)) {
+        if (options?.track && (this.LavalinkManager.utils.isTrack(options?.track) || this.LavalinkManager.utils.isUnresolvedTrack(options.track))) {
+            if (this.LavalinkManager.utils.isUnresolvedTrack(options.track))
+                await options.track.resolve(this);
             await this.queue.add(options?.track, 0);
             await (0, Utils_1.queueTrackEnd)(this);
         }
@@ -131,13 +133,17 @@ class Player {
             await (0, Utils_1.queueTrackEnd)(this);
         // @ts-ignore
         if (this.queue.current && this.LavalinkManager.utils.isUnresolvedTrack(this.queue.current)) {
-            try {
-                this.queue.current = await this.LavalinkManager.utils.getClosestTrack({ ...(this.queue.current || {}) }, this);
+            try { // @ts-ignore
+                this.queue.current = await this.queue.current.resolve(this);
             }
             catch (error) {
                 this.LavalinkManager.emit("trackError", this, this.queue.current, error);
+                if (options && "track" in options)
+                    delete options.track;
+                if (options && "encodedTrack" in options)
+                    delete options.encodedTrack;
                 if (this.queue.tracks[0])
-                    return this.play();
+                    return this.play(options);
                 return;
             }
         }
@@ -202,6 +208,37 @@ class Player {
         this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
         return;
     }
+    async lavaSearch(query, requestUser) {
+        // transform the query object
+        const Query = {
+            query: typeof query === "string" ? query : query.query,
+            types: query.types ? ["track", "playlist", "artist", "album", "text"].filter(v => query.types?.find(x => x.toLowerCase().startsWith(v))) : ["track", "playlist", "artist", "album", "text"],
+            source: LavalinkManagerStatics_1.DefaultSources[(typeof query === "string" ? undefined : query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform.toLowerCase()] ?? (typeof query === "string" ? undefined : query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform
+        };
+        // if user does player.search("ytsearch:Hello")
+        const foundSource = [...Object.keys(LavalinkManagerStatics_1.DefaultSources)].find(source => Query.query.toLowerCase().startsWith(`${source}:`.toLowerCase()))?.trim?.()?.toLowerCase?.();
+        if (foundSource && LavalinkManagerStatics_1.DefaultSources[foundSource]) {
+            Query.source = LavalinkManagerStatics_1.DefaultSources[foundSource]; // set the source to ytsearch:
+            Query.query = Query.query.slice(`${foundSource}:`.length, Query.query.length); // remove ytsearch: from the query
+        }
+        if (Query.source)
+            this.LavalinkManager.utils.validateSourceString(this.node, Query.source);
+        if (!["spsearch", "sprec", "amsearch", "dzsearch", "dzisrc", "ytmsearch", "ytsearch"].includes(Query.source))
+            throw new SyntaxError(`Query.source must be a source from LavaSrc: "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ytmsearch" | "ytsearch"`);
+        if (/^https?:\/\//.test(Query.query))
+            return await this.search({ query: Query.query, source: Query.source }, requestUser);
+        if (!this.node.info.plugins.find(v => v.name === "lavasearch-plugin"))
+            throw new RangeError(`there is no lavasearch-plugin available in the lavalink node: ${this.node.id}`);
+        const res = await this.node.request(`/loadsearch?query=${Query.source ? `${Query.source}:` : ""}${encodeURIComponent(Query.query)}${Query.types?.length ? `&types=${Query.types.join(",")}` : ""}`);
+        return {
+            tracks: res.tracks?.map(v => this.LavalinkManager.utils.buildTrack(v, requestUser)) || [],
+            albums: res.albums?.map(v => ({ info: v.info, pluginInfo: v?.plugin || v.pluginInfo, tracks: v.tracks.map(v => this.LavalinkManager.utils.buildTrack(v, requestUser)) })) || [],
+            artists: res.artists?.map(v => ({ info: v.info, pluginInfo: v?.plugin || v.pluginInfo, tracks: v.tracks.map(v => this.LavalinkManager.utils.buildTrack(v, requestUser)) })) || [],
+            playlists: res.playlists?.map(v => ({ info: v.info, pluginInfo: v?.plugin || v.pluginInfo, tracks: v.tracks.map(v => this.LavalinkManager.utils.buildTrack(v, requestUser)) })) || [],
+            texts: res.texts?.map(v => ({ text: v.text, pluginInfo: v?.plugin || v.pluginInfo })) || [],
+            pluginInfo: res.pluginInfo || res?.plugin
+        };
+    }
     /**
      *
      * @param query Query for your data
@@ -211,14 +248,18 @@ class Player {
         // transform the query object
         const Query = {
             query: typeof query === "string" ? query : query.query,
-            source: LavalinkManagerStatics_1.DefaultSources[(typeof query === "string" ? undefined : query.source) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform] ?? (typeof query === "string" ? undefined : query.source) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform
+            source: LavalinkManagerStatics_1.DefaultSources[(typeof query === "string" ? undefined : query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform.toLowerCase()] ?? (typeof query === "string" ? undefined : query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform
         };
         // if user does player.search("ytsearch:Hello")
-        const foundSource = [...Object.keys(LavalinkManagerStatics_1.DefaultSources)].find(source => Query.query.startsWith(`${source}:`));
+        const foundSource = [...Object.keys(LavalinkManagerStatics_1.DefaultSources)].find(source => Query.query?.toLowerCase?.()?.startsWith(`${source}:`.toLowerCase()))?.trim?.()?.toLowerCase?.();
         if (foundSource && LavalinkManagerStatics_1.DefaultSources[foundSource]) {
             Query.source = LavalinkManagerStatics_1.DefaultSources[foundSource]; // set the source to ytsearch:
-            Query.query = Query.query.replace(`${foundSource}:`, ""); // remove ytsearch: from the query
+            Query.query = Query.query.slice(`${foundSource}:`.length, Query.query.length); // remove ytsearch: from the query
         }
+        if (/^https?:\/\//.test(Query.query))
+            this.LavalinkManager.utils.validatedQueryString(this.node, Query.source);
+        else if (Query.source)
+            this.LavalinkManager.utils.validateSourceString(this.node, Query.source);
         // ftts query parameters: ?voice=Olivia&audio_format=ogg_opus&translate=False&silence=1000&speed=1.0 | example raw get query: https://api.flowery.pw/v1/tts?voice=Olivia&audio_format=ogg_opus&translate=False&silence=0&speed=1.0&text=Hello%20World
         // request the data 
         const res = await this.node.request(`/loadtracks?identifier=${!/^https?:\/\//.test(Query.query) ? `${Query.source}:${Query.source === "ftts" ? "//" : ""}` : ""}${encodeURIComponent(Query.query)}`);

package/dist/cjs/structures/Track.d.ts

@@ -17,7 +17,21 @@ export interface TrackInfo {
 }
 export interface PluginInfo {
     /** The Type provided by a plugin */
-    type?: string;
+    type?: "album" | "playlist" | "artist" | "recommendations" | string;
+    /** The Identifier provided by a plugin */
+    albumName?: string;
+    /** The url of the album art */
+    albumArtUrl?: string;
+    /** The url of the artist */
+    artistUrl?: string;
+    /** The url of the artist artwork */
+    artistArtworkUrl?: string;
+    /** The url of the preview */
+    previewUrl?: string;
+    /** Whether the track is a preview */
+    isPreview?: boolean;
+    /** The total number of tracks in the playlist */
+    totalTracks?: number;
     /** The Identifier provided by a plugin */
     identifier?: string;
     /** The ArtworkUrl provided by a plugin */

package/dist/cjs/structures/Utils.d.ts

@@ -7,13 +7,18 @@ export declare const TrackSymbol: unique symbol;
 export declare const UnresolvedTrackSymbol: unique symbol;
 export declare const QueueSymbol: unique symbol;
 export declare const NodeSymbol: unique symbol;
-export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ymsearch" | "speak" | "tts" | "ftts";
+export type LavaSrcSearchPlatformBase = "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ymsearch";
+export type LavaSrcSearchPlatform = LavaSrcSearchPlatformBase | "ftts";
+export type DuncteSearchPlatform = "speak" | "tts";
+export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | LavaSrcSearchPlatform | DuncteSearchPlatform;
 export type ClientSearchPlatform = "youtube" | "yt" | "youtube music" | "youtubemusic" | "ytm" | "soundcloud" | "sc" | "am" | "apple music" | "applemusic" | "apple" | "sp" | "spsuggestion" | "spotify" | "dz" | "deezer" | "yandex" | "yandex music" | "yandexmusic";
 export type SearchPlatform = LavalinkSearchPlatform | ClientSearchPlatform;
 export type SourcesRegex = "YoutubeRegex" | "YoutubeMusicRegex" | "SoundCloudRegex" | "SoundCloudMobileRegex" | "DeezerTrackRegex" | "DeezerArtistRegex" | "DeezerEpisodeRegex" | "DeezerMixesRegex" | "DeezerPageLinkRegex" | "DeezerPlaylistRegex" | "DeezerAlbumRegex" | "AllDeezerRegex" | "AllDeezerRegexWithoutPageLink" | "SpotifySongRegex" | "SpotifyPlaylistRegex" | "SpotifyArtistRegex" | "SpotifyEpisodeRegex" | "SpotifyShowRegex" | "SpotifyAlbumRegex" | "AllSpotifyRegex" | "mp3Url" | "m3uUrl" | "m3u8Url" | "mp4Url" | "m4aUrl" | "wavUrl" | "aacpUrl" | "tiktok" | "mixcloud" | "musicYandex" | "radiohost" | "bandcamp" | "appleMusic" | "TwitchTv" | "vimeo";
 export interface PlaylistInfo {
     /** The playlist title. */
     title: string;
+    /** The playlist name (if provided instead of title) */
+    name: string;
     /** The Playlist Author */
     author?: string;
     /** The Playlist Thumbnail */
@@ -72,7 +77,8 @@ export declare class ManagerUitls {
      * @param requester
      */
     buildUnresolvedTrack(query: UnresolvedQuery | UnresolvedTrack, requester: unknown): UnresolvedTrack;
-    validatedQuery(queryString: string, node: LavalinkNode): void;
+    validatedQueryString(node: LavalinkNode, queryString: string): void;
+    validateSourceString(node: LavalinkNode, sourceString: SearchPlatform): void;
 }
 /**
  * @internal
@@ -282,4 +288,27 @@ export interface NodeMessage extends NodeStats {
     guildId: string;
 }
 export declare function queueTrackEnd(player: Player): Promise<Track>;
+export type LavaSearchType = "track" | "album" | "artist" | "playlist" | "text" | "tracks" | "albums" | "artists" | "playlists" | "texts";
+export interface LavaSearchFilteredResponse {
+    info: PlaylistInfo;
+    pluginInfo: PluginInfo;
+    tracks: Track[];
+}
+export interface LavaSearchResponse {
+    /** An array of tracks, only present if track is in types */
+    tracks: Track[];
+    /** An array of albums, only present if album is in types */
+    albums: LavaSearchFilteredResponse[];
+    /** 	An array of artists, only present if artist is in types */
+    artists: LavaSearchFilteredResponse[];
+    /** 	An array of playlists, only present if playlist is in types */
+    playlists: LavaSearchFilteredResponse[];
+    /** An array of text results, only present if text is in types */
+    texts: {
+        text: string;
+        pluginInfo: PluginInfo;
+    }[];
+    /** Addition result data provided by plugins */
+    pluginInfo: PluginInfo;
+}
 export {};

package/dist/cjs/structures/Utils.js

@@ -112,7 +112,7 @@ class ManagerUitls {
             return false;
         if (data[exports.UnresolvedTrackSymbol] === true)
             return true;
-        return typeof data === "object" && "info" in data && typeof data.info.title === "string" && typeof data.resolve === "function";
+        return typeof data === "object" && (("info" in data && typeof data.info.title === "string") || typeof data.encoded === "string") && typeof data.resolve === "function";
     }
     /**
      * Checks if the provided argument is a valid UnresolvedTrack.
@@ -134,7 +134,7 @@ class ManagerUitls {
             throw new RangeError('Argument "query" must be present.');
         const unresolvedTrack = {
             encoded: query.encoded || undefined,
-            info: query.info ?? query,
+            info: query.info ? query.info : query.title ? query : undefined,
             requester: typeof this.manager.options?.playerOptions?.requesterTransformer === "function" ? this.manager.options?.playerOptions?.requesterTransformer((query?.requester || requester)) : requester,
             async resolve(player) {
                 const closest = await getClosestTrack(this, player, player.LavalinkManager.utils);
@@ -145,10 +145,12 @@ class ManagerUitls {
                 return;
             }
         };
+        if (!this.isUnresolvedTrack(unresolvedTrack))
+            throw SyntaxError("Could not build Unresolved Track");
         Object.defineProperty(unresolvedTrack, exports.UnresolvedTrackSymbol, { configurable: true, value: true });
         return unresolvedTrack;
     }
-    validatedQuery(queryString, node) {
+    validatedQueryString(node, queryString) {
         if (!node.info)
             throw new Error("No Lavalink Node was provided");
         if (!node.info.sourceManagers?.length)
@@ -190,12 +192,14 @@ class ManagerUitls {
         if (LavalinkManagerStatics_1.SourceLinksRegexes.musicYandex.test(queryString) && !node.info.sourceManagers.includes("yandexmusic")) {
             throw new Error("Lavalink Node has not 'yandexmusic' enabled");
         }
-        const hasSource = queryString.split(":")[0];
-        if (queryString.split(" ").length <= 1 || !queryString.split(" ")[0].includes(":"))
-            return;
-        const source = LavalinkManagerStatics_1.DefaultSources[hasSource];
+        return;
+    }
+    validateSourceString(node, sourceString) {
+        if (!sourceString)
+            throw new Error(`No SourceString was provided`);
+        const source = LavalinkManagerStatics_1.DefaultSources[sourceString.toLowerCase()] || Object.values(LavalinkManagerStatics_1.DefaultSources).find(v => v.toLowerCase() === sourceString?.toLowerCase());
         if (!source)
-            throw new Error(`Lavalink Node SearchQuerySource: '${hasSource}' is not available`);
+            throw new Error(`Lavalink Node SearchQuerySource: '${sourceString}' is not available`);
         if (source === "amsearch" && !node.info.sourceManagers.includes("applemusic")) {
             throw new Error("Lavalink Node has not 'applemusic' enabled, which is required to have 'amsearch' work");
         }
@@ -320,8 +324,8 @@ async function getClosestTrack(data, player, utils) {
         return utils.buildTrack(data, data.requester);
     if (!utils.isUnresolvedTrack(data))
         throw new RangeError("Track is not an unresolved Track");
-    if (!data?.info?.title)
-        throw new SyntaxError("the track title is required for unresolved tracks");
+    if (!data?.info?.title && typeof data.encoded !== "string" && !data.info.uri)
+        throw new SyntaxError("the track uri / title / encoded Base64 string is required for unresolved tracks");
     if (!data.requester)
         throw new SyntaxError("The requester is required");
     // try to decode the track, if possible

package/dist/esm/structures/Node.js

@@ -87,6 +87,8 @@ export class LavalinkNode {
         this.calls++;
         if (options.method === "DELETE")
             return;
+        if (request.statusCode === 404)
+            throw new Error(`Node Request resulted into an error, request-URL: ${url} | headers: ${JSON.stringify(request.headers)}`);
         return parseAsText ? await request.body.text() : await request.body.json();
     }
     /**

package/dist/esm/structures/Player.d.ts

@@ -2,8 +2,8 @@ import { EQBand, FilterData, FilterManager, LavalinkFilterData } from "./Filters
 import { LavalinkManager } from "./LavalinkManager";
 import { LavalinkNode } from "./Node";
 import { Queue } from "./Queue";
-import { Track } from "./Track";
-import { LavalinkPlayerVoiceOptions, SearchPlatform, SearchResult } from "./Utils";
+import { Track, UnresolvedTrack } from "./Track";
+import { LavalinkPlayerVoiceOptions, SearchPlatform, SearchResult, LavaSearchType, LavaSearchResponse, LavaSrcSearchPlatformBase } from "./Utils";
 type PlayerDestroyReasons = "QueueEmpty" | "NodeDestroy" | "NodeDeleted" | "LavalinkNoVoice" | "NodeReconnectFail" | "PlayerReconnectFail" | "Disconnected" | "ChannelDeleted";
 export type DestroyReasonsType = PlayerDestroyReasons | string;
 export declare const DestroyReasons: Record<PlayerDestroyReasons, PlayerDestroyReasons>;
@@ -43,7 +43,7 @@ export interface PlayerOptions {
 }
 export interface PlayOptions {
     /** Which Track to play | don't provide, if it should pick from the Queue */
-    track?: Track;
+    track?: Track | UnresolvedTrack;
     /** Encoded Track to use, instead of the queue system... */
     encodedTrack?: string | null;
     /** Encoded Track to use&search, instead of the queue system (yt only)... */
@@ -138,6 +138,11 @@ export declare class Player {
      * @param ignoreVolumeDecrementer If it should ignore the volumedecrementer option
      */
     setVolume(volume: number, ignoreVolumeDecrementer?: boolean): Promise<void>;
+    lavaSearch(query: {
+        query: string;
+        source: LavaSrcSearchPlatformBase;
+        types?: LavaSearchType[];
+    }, requestUser: unknown): Promise<SearchResult | LavaSearchResponse>;
     /**
      *
      * @param query Query for your data

package/dist/esm/structures/Player.js

@@ -120,7 +120,9 @@ export class Player {
             clearTimeout(this.get("internal_queueempty"));
             this.set("internal_queueempty", undefined);
         }
-        if (options?.track && this.LavalinkManager.utils.isTrack(options?.track)) {
+        if (options?.track && (this.LavalinkManager.utils.isTrack(options?.track) || this.LavalinkManager.utils.isUnresolvedTrack(options.track))) {
+            if (this.LavalinkManager.utils.isUnresolvedTrack(options.track))
+                await options.track.resolve(this);
             await this.queue.add(options?.track, 0);
             await queueTrackEnd(this);
         }
@@ -128,13 +130,17 @@ export class Player {
             await queueTrackEnd(this);
         // @ts-ignore
         if (this.queue.current && this.LavalinkManager.utils.isUnresolvedTrack(this.queue.current)) {
-            try {
-                this.queue.current = await this.LavalinkManager.utils.getClosestTrack({ ...(this.queue.current || {}) }, this);
+            try { // @ts-ignore
+                this.queue.current = await this.queue.current.resolve(this);
             }
             catch (error) {
                 this.LavalinkManager.emit("trackError", this, this.queue.current, error);
+                if (options && "track" in options)
+                    delete options.track;
+                if (options && "encodedTrack" in options)
+                    delete options.encodedTrack;
                 if (this.queue.tracks[0])
-                    return this.play();
+                    return this.play(options);
                 return;
             }
         }
@@ -199,6 +205,37 @@ export class Player {
         this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
         return;
     }
+    async lavaSearch(query, requestUser) {
+        // transform the query object
+        const Query = {
+            query: typeof query === "string" ? query : query.query,
+            types: query.types ? ["track", "playlist", "artist", "album", "text"].filter(v => query.types?.find(x => x.toLowerCase().startsWith(v))) : ["track", "playlist", "artist", "album", "text"],
+            source: DefaultSources[(typeof query === "string" ? undefined : query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform.toLowerCase()] ?? (typeof query === "string" ? undefined : query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform
+        };
+        // if user does player.search("ytsearch:Hello")
+        const foundSource = [...Object.keys(DefaultSources)].find(source => Query.query.toLowerCase().startsWith(`${source}:`.toLowerCase()))?.trim?.()?.toLowerCase?.();
+        if (foundSource && DefaultSources[foundSource]) {
+            Query.source = DefaultSources[foundSource]; // set the source to ytsearch:
+            Query.query = Query.query.slice(`${foundSource}:`.length, Query.query.length); // remove ytsearch: from the query
+        }
+        if (Query.source)
+            this.LavalinkManager.utils.validateSourceString(this.node, Query.source);
+        if (!["spsearch", "sprec", "amsearch", "dzsearch", "dzisrc", "ytmsearch", "ytsearch"].includes(Query.source))
+            throw new SyntaxError(`Query.source must be a source from LavaSrc: "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ytmsearch" | "ytsearch"`);
+        if (/^https?:\/\//.test(Query.query))
+            return await this.search({ query: Query.query, source: Query.source }, requestUser);
+        if (!this.node.info.plugins.find(v => v.name === "lavasearch-plugin"))
+            throw new RangeError(`there is no lavasearch-plugin available in the lavalink node: ${this.node.id}`);
+        const res = await this.node.request(`/loadsearch?query=${Query.source ? `${Query.source}:` : ""}${encodeURIComponent(Query.query)}${Query.types?.length ? `&types=${Query.types.join(",")}` : ""}`);
+        return {
+            tracks: res.tracks?.map(v => this.LavalinkManager.utils.buildTrack(v, requestUser)) || [],
+            albums: res.albums?.map(v => ({ info: v.info, pluginInfo: v?.plugin || v.pluginInfo, tracks: v.tracks.map(v => this.LavalinkManager.utils.buildTrack(v, requestUser)) })) || [],
+            artists: res.artists?.map(v => ({ info: v.info, pluginInfo: v?.plugin || v.pluginInfo, tracks: v.tracks.map(v => this.LavalinkManager.utils.buildTrack(v, requestUser)) })) || [],
+            playlists: res.playlists?.map(v => ({ info: v.info, pluginInfo: v?.plugin || v.pluginInfo, tracks: v.tracks.map(v => this.LavalinkManager.utils.buildTrack(v, requestUser)) })) || [],
+            texts: res.texts?.map(v => ({ text: v.text, pluginInfo: v?.plugin || v.pluginInfo })) || [],
+            pluginInfo: res.pluginInfo || res?.plugin
+        };
+    }
     /**
      *
      * @param query Query for your data
@@ -208,14 +245,18 @@ export class Player {
         // transform the query object
         const Query = {
             query: typeof query === "string" ? query : query.query,
-            source: DefaultSources[(typeof query === "string" ? undefined : query.source) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform] ?? (typeof query === "string" ? undefined : query.source) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform
+            source: DefaultSources[(typeof query === "string" ? undefined : query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform.toLowerCase()] ?? (typeof query === "string" ? undefined : query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager.options.playerOptions.defaultSearchPlatform
         };
         // if user does player.search("ytsearch:Hello")
-        const foundSource = [...Object.keys(DefaultSources)].find(source => Query.query.startsWith(`${source}:`));
+        const foundSource = [...Object.keys(DefaultSources)].find(source => Query.query?.toLowerCase?.()?.startsWith(`${source}:`.toLowerCase()))?.trim?.()?.toLowerCase?.();
         if (foundSource && DefaultSources[foundSource]) {
             Query.source = DefaultSources[foundSource]; // set the source to ytsearch:
-            Query.query = Query.query.replace(`${foundSource}:`, ""); // remove ytsearch: from the query
+            Query.query = Query.query.slice(`${foundSource}:`.length, Query.query.length); // remove ytsearch: from the query
         }
+        if (/^https?:\/\//.test(Query.query))
+            this.LavalinkManager.utils.validatedQueryString(this.node, Query.source);
+        else if (Query.source)
+            this.LavalinkManager.utils.validateSourceString(this.node, Query.source);
         // ftts query parameters: ?voice=Olivia&audio_format=ogg_opus&translate=False&silence=1000&speed=1.0 | example raw get query: https://api.flowery.pw/v1/tts?voice=Olivia&audio_format=ogg_opus&translate=False&silence=0&speed=1.0&text=Hello%20World
         // request the data 
         const res = await this.node.request(`/loadtracks?identifier=${!/^https?:\/\//.test(Query.query) ? `${Query.source}:${Query.source === "ftts" ? "//" : ""}` : ""}${encodeURIComponent(Query.query)}`);

package/dist/esm/structures/Track.d.ts

@@ -17,7 +17,21 @@ export interface TrackInfo {
 }
 export interface PluginInfo {
     /** The Type provided by a plugin */
-    type?: string;
+    type?: "album" | "playlist" | "artist" | "recommendations" | string;
+    /** The Identifier provided by a plugin */
+    albumName?: string;
+    /** The url of the album art */
+    albumArtUrl?: string;
+    /** The url of the artist */
+    artistUrl?: string;
+    /** The url of the artist artwork */
+    artistArtworkUrl?: string;
+    /** The url of the preview */
+    previewUrl?: string;
+    /** Whether the track is a preview */
+    isPreview?: boolean;
+    /** The total number of tracks in the playlist */
+    totalTracks?: number;
     /** The Identifier provided by a plugin */
     identifier?: string;
     /** The ArtworkUrl provided by a plugin */

package/dist/esm/structures/Utils.d.ts

@@ -7,13 +7,18 @@ export declare const TrackSymbol: unique symbol;
 export declare const UnresolvedTrackSymbol: unique symbol;
 export declare const QueueSymbol: unique symbol;
 export declare const NodeSymbol: unique symbol;
-export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ymsearch" | "speak" | "tts" | "ftts";
+export type LavaSrcSearchPlatformBase = "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ymsearch";
+export type LavaSrcSearchPlatform = LavaSrcSearchPlatformBase | "ftts";
+export type DuncteSearchPlatform = "speak" | "tts";
+export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | LavaSrcSearchPlatform | DuncteSearchPlatform;
 export type ClientSearchPlatform = "youtube" | "yt" | "youtube music" | "youtubemusic" | "ytm" | "soundcloud" | "sc" | "am" | "apple music" | "applemusic" | "apple" | "sp" | "spsuggestion" | "spotify" | "dz" | "deezer" | "yandex" | "yandex music" | "yandexmusic";
 export type SearchPlatform = LavalinkSearchPlatform | ClientSearchPlatform;
 export type SourcesRegex = "YoutubeRegex" | "YoutubeMusicRegex" | "SoundCloudRegex" | "SoundCloudMobileRegex" | "DeezerTrackRegex" | "DeezerArtistRegex" | "DeezerEpisodeRegex" | "DeezerMixesRegex" | "DeezerPageLinkRegex" | "DeezerPlaylistRegex" | "DeezerAlbumRegex" | "AllDeezerRegex" | "AllDeezerRegexWithoutPageLink" | "SpotifySongRegex" | "SpotifyPlaylistRegex" | "SpotifyArtistRegex" | "SpotifyEpisodeRegex" | "SpotifyShowRegex" | "SpotifyAlbumRegex" | "AllSpotifyRegex" | "mp3Url" | "m3uUrl" | "m3u8Url" | "mp4Url" | "m4aUrl" | "wavUrl" | "aacpUrl" | "tiktok" | "mixcloud" | "musicYandex" | "radiohost" | "bandcamp" | "appleMusic" | "TwitchTv" | "vimeo";
 export interface PlaylistInfo {
     /** The playlist title. */
     title: string;
+    /** The playlist name (if provided instead of title) */
+    name: string;
     /** The Playlist Author */
     author?: string;
     /** The Playlist Thumbnail */
@@ -72,7 +77,8 @@ export declare class ManagerUitls {
      * @param requester
      */
     buildUnresolvedTrack(query: UnresolvedQuery | UnresolvedTrack, requester: unknown): UnresolvedTrack;
-    validatedQuery(queryString: string, node: LavalinkNode): void;
+    validatedQueryString(node: LavalinkNode, queryString: string): void;
+    validateSourceString(node: LavalinkNode, sourceString: SearchPlatform): void;
 }
 /**
  * @internal
@@ -282,4 +288,27 @@ export interface NodeMessage extends NodeStats {
     guildId: string;
 }
 export declare function queueTrackEnd(player: Player): Promise<Track>;
+export type LavaSearchType = "track" | "album" | "artist" | "playlist" | "text" | "tracks" | "albums" | "artists" | "playlists" | "texts";
+export interface LavaSearchFilteredResponse {
+    info: PlaylistInfo;
+    pluginInfo: PluginInfo;
+    tracks: Track[];
+}
+export interface LavaSearchResponse {
+    /** An array of tracks, only present if track is in types */
+    tracks: Track[];
+    /** An array of albums, only present if album is in types */
+    albums: LavaSearchFilteredResponse[];
+    /** 	An array of artists, only present if artist is in types */
+    artists: LavaSearchFilteredResponse[];
+    /** 	An array of playlists, only present if playlist is in types */
+    playlists: LavaSearchFilteredResponse[];
+    /** An array of text results, only present if text is in types */
+    texts: {
+        text: string;
+        pluginInfo: PluginInfo;
+    }[];
+    /** Addition result data provided by plugins */
+    pluginInfo: PluginInfo;
+}
 export {};

package/dist/esm/structures/Utils.js

@@ -109,7 +109,7 @@ export class ManagerUitls {
             return false;
         if (data[UnresolvedTrackSymbol] === true)
             return true;
-        return typeof data === "object" && "info" in data && typeof data.info.title === "string" && typeof data.resolve === "function";
+        return typeof data === "object" && (("info" in data && typeof data.info.title === "string") || typeof data.encoded === "string") && typeof data.resolve === "function";
     }
     /**
      * Checks if the provided argument is a valid UnresolvedTrack.
@@ -131,7 +131,7 @@ export class ManagerUitls {
             throw new RangeError('Argument "query" must be present.');
         const unresolvedTrack = {
             encoded: query.encoded || undefined,
-            info: query.info ?? query,
+            info: query.info ? query.info : query.title ? query : undefined,
             requester: typeof this.manager.options?.playerOptions?.requesterTransformer === "function" ? this.manager.options?.playerOptions?.requesterTransformer((query?.requester || requester)) : requester,
             async resolve(player) {
                 const closest = await getClosestTrack(this, player, player.LavalinkManager.utils);
@@ -142,10 +142,12 @@ export class ManagerUitls {
                 return;
             }
         };
+        if (!this.isUnresolvedTrack(unresolvedTrack))
+            throw SyntaxError("Could not build Unresolved Track");
         Object.defineProperty(unresolvedTrack, UnresolvedTrackSymbol, { configurable: true, value: true });
         return unresolvedTrack;
     }
-    validatedQuery(queryString, node) {
+    validatedQueryString(node, queryString) {
         if (!node.info)
             throw new Error("No Lavalink Node was provided");
         if (!node.info.sourceManagers?.length)
@@ -187,12 +189,14 @@ export class ManagerUitls {
         if (SourceLinksRegexes.musicYandex.test(queryString) && !node.info.sourceManagers.includes("yandexmusic")) {
             throw new Error("Lavalink Node has not 'yandexmusic' enabled");
         }
-        const hasSource = queryString.split(":")[0];
-        if (queryString.split(" ").length <= 1 || !queryString.split(" ")[0].includes(":"))
-            return;
-        const source = DefaultSources[hasSource];
+        return;
+    }
+    validateSourceString(node, sourceString) {
+        if (!sourceString)
+            throw new Error(`No SourceString was provided`);
+        const source = DefaultSources[sourceString.toLowerCase()] || Object.values(DefaultSources).find(v => v.toLowerCase() === sourceString?.toLowerCase());
         if (!source)
-            throw new Error(`Lavalink Node SearchQuerySource: '${hasSource}' is not available`);
+            throw new Error(`Lavalink Node SearchQuerySource: '${sourceString}' is not available`);
         if (source === "amsearch" && !node.info.sourceManagers.includes("applemusic")) {
             throw new Error("Lavalink Node has not 'applemusic' enabled, which is required to have 'amsearch' work");
         }
@@ -314,8 +318,8 @@ async function getClosestTrack(data, player, utils) {
         return utils.buildTrack(data, data.requester);
     if (!utils.isUnresolvedTrack(data))
         throw new RangeError("Track is not an unresolved Track");
-    if (!data?.info?.title)
-        throw new SyntaxError("the track title is required for unresolved tracks");
+    if (!data?.info?.title && typeof data.encoded !== "string" && !data.info.uri)
+        throw new SyntaxError("the track uri / title / encoded Base64 string is required for unresolved tracks");
     if (!data.requester)
         throw new SyntaxError("The requester is required");
     // try to decode the track, if possible

package/dist/types/structures/Player.d.ts

@@ -2,8 +2,8 @@ import { EQBand, FilterData, FilterManager, LavalinkFilterData } from "./Filters
 import { LavalinkManager } from "./LavalinkManager";
 import { LavalinkNode } from "./Node";
 import { Queue } from "./Queue";
-import { Track } from "./Track";
-import { LavalinkPlayerVoiceOptions, SearchPlatform, SearchResult } from "./Utils";
+import { Track, UnresolvedTrack } from "./Track";
+import { LavalinkPlayerVoiceOptions, SearchPlatform, SearchResult, LavaSearchType, LavaSearchResponse, LavaSrcSearchPlatformBase } from "./Utils";
 type PlayerDestroyReasons = "QueueEmpty" | "NodeDestroy" | "NodeDeleted" | "LavalinkNoVoice" | "NodeReconnectFail" | "PlayerReconnectFail" | "Disconnected" | "ChannelDeleted";
 export type DestroyReasonsType = PlayerDestroyReasons | string;
 export declare const DestroyReasons: Record<PlayerDestroyReasons, PlayerDestroyReasons>;
@@ -43,7 +43,7 @@ export interface PlayerOptions {
 }
 export interface PlayOptions {
     /** Which Track to play | don't provide, if it should pick from the Queue */
-    track?: Track;
+    track?: Track | UnresolvedTrack;
     /** Encoded Track to use, instead of the queue system... */
     encodedTrack?: string | null;
     /** Encoded Track to use&search, instead of the queue system (yt only)... */
@@ -138,6 +138,11 @@ export declare class Player {
      * @param ignoreVolumeDecrementer If it should ignore the volumedecrementer option
      */
     setVolume(volume: number, ignoreVolumeDecrementer?: boolean): Promise<void>;
+    lavaSearch(query: {
+        query: string;
+        source: LavaSrcSearchPlatformBase;
+        types?: LavaSearchType[];
+    }, requestUser: unknown): Promise<SearchResult | LavaSearchResponse>;
     /**
      *
      * @param query Query for your data

package/dist/types/structures/Track.d.ts

@@ -17,7 +17,21 @@ export interface TrackInfo {
 }
 export interface PluginInfo {
     /** The Type provided by a plugin */
-    type?: string;
+    type?: "album" | "playlist" | "artist" | "recommendations" | string;
+    /** The Identifier provided by a plugin */
+    albumName?: string;
+    /** The url of the album art */
+    albumArtUrl?: string;
+    /** The url of the artist */
+    artistUrl?: string;
+    /** The url of the artist artwork */
+    artistArtworkUrl?: string;
+    /** The url of the preview */
+    previewUrl?: string;
+    /** Whether the track is a preview */
+    isPreview?: boolean;
+    /** The total number of tracks in the playlist */
+    totalTracks?: number;
     /** The Identifier provided by a plugin */
     identifier?: string;
     /** The ArtworkUrl provided by a plugin */

package/dist/types/structures/Utils.d.ts

@@ -7,13 +7,18 @@ export declare const TrackSymbol: unique symbol;
 export declare const UnresolvedTrackSymbol: unique symbol;
 export declare const QueueSymbol: unique symbol;
 export declare const NodeSymbol: unique symbol;
-export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ymsearch" | "speak" | "tts" | "ftts";
+export type LavaSrcSearchPlatformBase = "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ymsearch";
+export type LavaSrcSearchPlatform = LavaSrcSearchPlatformBase | "ftts";
+export type DuncteSearchPlatform = "speak" | "tts";
+export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | LavaSrcSearchPlatform | DuncteSearchPlatform;
 export type ClientSearchPlatform = "youtube" | "yt" | "youtube music" | "youtubemusic" | "ytm" | "soundcloud" | "sc" | "am" | "apple music" | "applemusic" | "apple" | "sp" | "spsuggestion" | "spotify" | "dz" | "deezer" | "yandex" | "yandex music" | "yandexmusic";
 export type SearchPlatform = LavalinkSearchPlatform | ClientSearchPlatform;
 export type SourcesRegex = "YoutubeRegex" | "YoutubeMusicRegex" | "SoundCloudRegex" | "SoundCloudMobileRegex" | "DeezerTrackRegex" | "DeezerArtistRegex" | "DeezerEpisodeRegex" | "DeezerMixesRegex" | "DeezerPageLinkRegex" | "DeezerPlaylistRegex" | "DeezerAlbumRegex" | "AllDeezerRegex" | "AllDeezerRegexWithoutPageLink" | "SpotifySongRegex" | "SpotifyPlaylistRegex" | "SpotifyArtistRegex" | "SpotifyEpisodeRegex" | "SpotifyShowRegex" | "SpotifyAlbumRegex" | "AllSpotifyRegex" | "mp3Url" | "m3uUrl" | "m3u8Url" | "mp4Url" | "m4aUrl" | "wavUrl" | "aacpUrl" | "tiktok" | "mixcloud" | "musicYandex" | "radiohost" | "bandcamp" | "appleMusic" | "TwitchTv" | "vimeo";
 export interface PlaylistInfo {
     /** The playlist title. */
     title: string;
+    /** The playlist name (if provided instead of title) */
+    name: string;
     /** The Playlist Author */
     author?: string;
     /** The Playlist Thumbnail */
@@ -72,7 +77,8 @@ export declare class ManagerUitls {
      * @param requester
      */
     buildUnresolvedTrack(query: UnresolvedQuery | UnresolvedTrack, requester: unknown): UnresolvedTrack;
-    validatedQuery(queryString: string, node: LavalinkNode): void;
+    validatedQueryString(node: LavalinkNode, queryString: string): void;
+    validateSourceString(node: LavalinkNode, sourceString: SearchPlatform): void;
 }
 /**
  * @internal
@@ -282,4 +288,27 @@ export interface NodeMessage extends NodeStats {
     guildId: string;
 }
 export declare function queueTrackEnd(player: Player): Promise<Track>;
+export type LavaSearchType = "track" | "album" | "artist" | "playlist" | "text" | "tracks" | "albums" | "artists" | "playlists" | "texts";
+export interface LavaSearchFilteredResponse {
+    info: PlaylistInfo;
+    pluginInfo: PluginInfo;
+    tracks: Track[];
+}
+export interface LavaSearchResponse {
+    /** An array of tracks, only present if track is in types */
+    tracks: Track[];
+    /** An array of albums, only present if album is in types */
+    albums: LavaSearchFilteredResponse[];
+    /** 	An array of artists, only present if artist is in types */
+    artists: LavaSearchFilteredResponse[];
+    /** 	An array of playlists, only present if playlist is in types */
+    playlists: LavaSearchFilteredResponse[];
+    /** An array of text results, only present if text is in types */
+    texts: {
+        text: string;
+        pluginInfo: PluginInfo;
+    }[];
+    /** Addition result data provided by plugins */
+    pluginInfo: PluginInfo;
+}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lavalink-client",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Easy and advanced lavalink client. Use it with lavalink plugins as well as latest lavalink versions",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",