lavalink-client 1.1.11 → 1.1.14

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

@@ -89,6 +89,15 @@ export declare class ManagerUtils {
     isUnresolvedTrackQuery(data: UnresolvedQuery | any): boolean;
     getClosestTrack(data: UnresolvedTrack, player: Player): Promise<Track | undefined>;
     validateQueryString(node: LavalinkNode, queryString: string): void;
+    transformQuery(query: SearchQuery): {
+        query: string;
+        source: any;
+    };
+    transformLavaSearchQuery(query: LavaSearchQuery): {
+        query: string;
+        types: string[];
+        source: any;
+    };
     validateSourceString(node: LavalinkNode, sourceString: SearchPlatform): void;
 }
 /**
@@ -322,4 +331,13 @@ export interface LavaSearchResponse {
     /** Addition result data provided by plugins */
     pluginInfo: PluginInfo;
 }
+export type SearchQuery = {
+    query: string;
+    source?: SearchPlatform;
+} | string;
+export type LavaSearchQuery = {
+    query: string;
+    source: LavaSrcSearchPlatformBase;
+    types?: LavaSearchType[];
+};
 export {};

package/dist/esm/structures/Utils.js

@@ -153,84 +153,112 @@ export class ManagerUtils {
         if (!node.info.sourceManagers?.length)
             throw new Error("Lavalink Node, has no sourceManagers enabled");
         // missing links: beam.pro local getyarn.io clypit pornhub reddit ocreamix soundgasm
-        if ((SourceLinksRegexes.YoutubeMusicRegex.test(queryString) || SourceLinksRegexes.YoutubeRegex.test(queryString)) && !node.info.sourceManagers.includes("youtube")) {
+        if ((SourceLinksRegexes.YoutubeMusicRegex.test(queryString) || SourceLinksRegexes.YoutubeRegex.test(queryString)) && !node.info?.sourceManagers?.includes("youtube")) {
             throw new Error("Lavalink Node has not 'youtube' enabled");
         }
-        if ((SourceLinksRegexes.SoundCloudMobileRegex.test(queryString) || SourceLinksRegexes.SoundCloudRegex.test(queryString)) && !node.info.sourceManagers.includes("soundcloud")) {
+        if ((SourceLinksRegexes.SoundCloudMobileRegex.test(queryString) || SourceLinksRegexes.SoundCloudRegex.test(queryString)) && !node.info?.sourceManagers?.includes("soundcloud")) {
             throw new Error("Lavalink Node has not 'soundcloud' enabled");
         }
-        if (SourceLinksRegexes.bandcamp.test(queryString) && !node.info.sourceManagers.includes("bandcamp")) {
+        if (SourceLinksRegexes.bandcamp.test(queryString) && !node.info?.sourceManagers?.includes("bandcamp")) {
             throw new Error("Lavalink Node has not 'bandcamp' enabled");
         }
-        if (SourceLinksRegexes.TwitchTv.test(queryString) && !node.info.sourceManagers.includes("twitch")) {
+        if (SourceLinksRegexes.TwitchTv.test(queryString) && !node.info?.sourceManagers?.includes("twitch")) {
             throw new Error("Lavalink Node has not 'twitch' enabled");
         }
-        if (SourceLinksRegexes.vimeo.test(queryString) && !node.info.sourceManagers.includes("vimeo")) {
+        if (SourceLinksRegexes.vimeo.test(queryString) && !node.info?.sourceManagers?.includes("vimeo")) {
             throw new Error("Lavalink Node has not 'vimeo' enabled");
         }
-        if (SourceLinksRegexes.tiktok.test(queryString) && !node.info.sourceManagers.includes("tiktok")) {
+        if (SourceLinksRegexes.tiktok.test(queryString) && !node.info?.sourceManagers?.includes("tiktok")) {
             throw new Error("Lavalink Node has not 'tiktok' enabled");
         }
-        if (SourceLinksRegexes.mixcloud.test(queryString) && !node.info.sourceManagers.includes("mixcloud")) {
+        if (SourceLinksRegexes.mixcloud.test(queryString) && !node.info?.sourceManagers?.includes("mixcloud")) {
             throw new Error("Lavalink Node has not 'mixcloud' enabled");
         }
-        if (SourceLinksRegexes.AllSpotifyRegex.test(queryString) && !node.info.sourceManagers.includes("spotify")) {
+        if (SourceLinksRegexes.AllSpotifyRegex.test(queryString) && !node.info?.sourceManagers?.includes("spotify")) {
             throw new Error("Lavalink Node has not 'spotify' enabled");
         }
-        if (SourceLinksRegexes.appleMusic.test(queryString) && !node.info.sourceManagers.includes("applemusic")) {
+        if (SourceLinksRegexes.appleMusic.test(queryString) && !node.info?.sourceManagers?.includes("applemusic")) {
             throw new Error("Lavalink Node has not 'applemusic' enabled");
         }
-        if (SourceLinksRegexes.AllDeezerRegex.test(queryString) && !node.info.sourceManagers.includes("deezer")) {
+        if (SourceLinksRegexes.AllDeezerRegex.test(queryString) && !node.info?.sourceManagers?.includes("deezer")) {
             throw new Error("Lavalink Node has not 'deezer' enabled");
         }
-        if (SourceLinksRegexes.AllDeezerRegex.test(queryString) && node.info.sourceManagers.includes("deezer") && !node.info.sourceManagers.includes("http")) {
+        if (SourceLinksRegexes.AllDeezerRegex.test(queryString) && node.info?.sourceManagers?.includes("deezer") && !node.info?.sourceManagers?.includes("http")) {
             throw new Error("Lavalink Node has not 'http' enabled, which is required to have 'deezer' to work");
         }
-        if (SourceLinksRegexes.musicYandex.test(queryString) && !node.info.sourceManagers.includes("yandexmusic")) {
+        if (SourceLinksRegexes.musicYandex.test(queryString) && !node.info?.sourceManagers?.includes("yandexmusic")) {
             throw new Error("Lavalink Node has not 'yandexmusic' enabled");
         }
         return;
     }
+    transformQuery(query) {
+        const Query = {
+            query: typeof query === "string" ? query : query.query,
+            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?.toLowerCase?.()
+        };
+        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
+        }
+        return Query;
+    }
+    transformLavaSearchQuery(query) {
+        // 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?.toLowerCase?.()
+        };
+        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
+        }
+        return Query;
+    }
     validateSourceString(node, sourceString) {
         if (!sourceString)
             throw new Error(`No SourceString was provided`);
         const source = DefaultSources[sourceString.toLowerCase().trim()];
         if (!source)
             throw new Error(`Lavalink Node SearchQuerySource: '${sourceString}' is not available`);
-        if (source === "amsearch" && !node.info.sourceManagers.includes("applemusic")) {
+        if (!node.info)
+            throw new Error("Lavalink Node does not have any info cached yet, not ready yet!");
+        if (source === "amsearch" && !node.info?.sourceManagers?.includes("applemusic")) {
             throw new Error("Lavalink Node has not 'applemusic' enabled, which is required to have 'amsearch' work");
         }
-        if (source === "dzisrc" && !node.info.sourceManagers.includes("deezer")) {
+        if (source === "dzisrc" && !node.info?.sourceManagers?.includes("deezer")) {
             throw new Error("Lavalink Node has not 'deezer' enabled, which is required to have 'dzisrc' work");
         }
-        if (source === "dzsearch" && !node.info.sourceManagers.includes("deezer")) {
+        if (source === "dzsearch" && !node.info?.sourceManagers?.includes("deezer")) {
             throw new Error("Lavalink Node has not 'deezer' enabled, which is required to have 'dzsearch' work");
         }
-        if (source === "dzisrc" && node.info.sourceManagers.includes("deezer") && !node.info.sourceManagers.includes("http")) {
+        if (source === "dzisrc" && node.info?.sourceManagers?.includes("deezer") && !node.info?.sourceManagers?.includes("http")) {
             throw new Error("Lavalink Node has not 'http' enabled, which is required to have 'dzisrc' to work");
         }
-        if (source === "dzsearch" && node.info.sourceManagers.includes("deezer") && !node.info.sourceManagers.includes("http")) {
+        if (source === "dzsearch" && node.info?.sourceManagers?.includes("deezer") && !node.info?.sourceManagers?.includes("http")) {
             throw new Error("Lavalink Node has not 'http' enabled, which is required to have 'dzsearch' to work");
         }
-        if (source === "scsearch" && !node.info.sourceManagers.includes("soundcloud")) {
+        if (source === "scsearch" && !node.info?.sourceManagers?.includes("soundcloud")) {
             throw new Error("Lavalink Node has not 'soundcloud' enabled, which is required to have 'scsearch' work");
         }
-        if (source === "speak" && !node.info.plugins.find(c => c.name.toLowerCase().includes(LavalinkPlugins.DuncteBot_Plugin.toLowerCase()))) {
+        if (source === "speak" && !node.info?.plugins?.find(c => c.name.toLowerCase().includes(LavalinkPlugins.DuncteBot_Plugin.toLowerCase()))) {
             throw new Error("Lavalink Node has not 'speak' enabled, which is required to have 'speak' work");
         }
-        if (source === "tts" && !node.info.plugins.find(c => c.name.toLowerCase().includes(LavalinkPlugins.GoogleCloudTTS.toLowerCase()))) {
+        if (source === "tts" && !node.info?.plugins?.find(c => c.name.toLowerCase().includes(LavalinkPlugins.GoogleCloudTTS.toLowerCase()))) {
             throw new Error("Lavalink Node has not 'tts' enabled, which is required to have 'tts' work");
         }
-        if (source === "ftts" && !(node.info.sourceManagers.includes("ftts") || node.info.sourceManagers.includes("flowery-tts") || node.info.sourceManagers.includes("flowerytts"))) {
+        if (source === "ftts" && !(node.info?.sourceManagers?.includes("ftts") || node.info?.sourceManagers?.includes("flowery-tts") || node.info?.sourceManagers?.includes("flowerytts"))) {
             throw new Error("Lavalink Node has not 'flowery-tts' enabled, which is required to have 'ftts' work");
         }
-        if (source === "ymsearch" && !node.info.sourceManagers.includes("yandexmusic")) {
+        if (source === "ymsearch" && !node.info?.sourceManagers?.includes("yandexmusic")) {
             throw new Error("Lavalink Node has not 'yandexmusic' enabled, which is required to have 'ymsearch' work");
         }
-        if (source === "ytmsearch" && !node.info.sourceManagers.includes("youtube")) {
+        if (source === "ytmsearch" && !node.info.sourceManagers?.includes("youtube")) {
             throw new Error("Lavalink Node has not 'youtube' enabled, which is required to have 'ytmsearch' work");
         }
-        if (source === "ytsearch" && !node.info.sourceManagers.includes("youtube")) {
+        if (source === "ytsearch" && !node.info?.sourceManagers?.includes("youtube")) {
             throw new Error("Lavalink Node has not 'youtube' enabled, which is required to have 'ytsearch' work");
         }
         return;

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

@@ -2,7 +2,7 @@
 import { Dispatcher, Pool } from "undici";
 import { NodeManager } from "./NodeManager";
 import internal from "stream";
-import { InvalidLavalinkRestRequest, LavalinkPlayer, PlayerUpdateInfo, RoutePlanner, Session, Base64, SearchResult } from "./Utils";
+import { InvalidLavalinkRestRequest, LavalinkPlayer, PlayerUpdateInfo, RoutePlanner, Session, Base64, SearchResult, LavaSearchResponse, LavaSearchQuery, SearchQuery } from "./Utils";
 import { DestroyReasonsType } from "./Player";
 import { Track } from "./Track";
 /** Modifies any outgoing REST requests. */
@@ -135,7 +135,8 @@ export declare class LavalinkNode {
      * @returns The returned data
      */
     request(endpoint: string, modify?: ModifyRequest, parseAsText?: boolean): Promise<unknown>;
-    search(querySourceString: string, requestUser: unknown): Promise<SearchResult>;
+    search(query: SearchQuery, requestUser: unknown): Promise<SearchResult>;
+    lavaSearch(query: LavaSearchQuery, requestUser: unknown): Promise<SearchResult | LavaSearchResponse>;
     /**
      * Update the Player State on the Lavalink Server
      * @param data
@@ -160,7 +161,7 @@ export declare class LavalinkNode {
      * Destroys the Node-Connection (Websocket) and all player's of the node
      * @returns
      */
-    destroy(destroyReason?: DestroyReasonsType): void;
+    destroy(destroyReason?: DestroyReasonsType, deleteNode?: boolean): void;
     /** Returns if connected to the Node. */
     get connected(): boolean;
     /**

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

@@ -54,6 +54,22 @@ export declare interface NodeManager {
 export declare class NodeManager extends EventEmitter {
     nodes: MiniMap<string, LavalinkNode>;
     constructor(LavalinkManager: LavalinkManager);
+    /**
+     * Disconnects all Nodes from lavalink ws sockets
+     * @param deleteAllNodes if the nodes should also be deleted from nodeManager.nodes
+     * @returns amount of disconnected Nodes
+     */
+    disconnectAll(deleteAllNodes?: boolean): Promise<number>;
+    /**
+     * Connects all not connected nodes
+     * @returns Amount of connected Nodes
+     */
+    connectAll(): Promise<number>;
+    /**
+     * Forcefully reconnects all nodes
+     * @returns amount of nodes
+     */
+    reconnectAll(): Promise<number>;
     createNode(options: LavalinkNodeOptions): LavalinkNode;
     leastUsedNodes(sortType?: "memory" | "cpuLavalink" | "cpuSystem" | "calls" | "playingPlayers" | "players"): LavalinkNode[];
     deleteNode(node: LavalinkNodeIdentifier | LavalinkNode): void;

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

@@ -3,8 +3,8 @@ import { LavalinkManager } from "./LavalinkManager";
 import { LavalinkNode } from "./Node";
 import { Queue } from "./Queue";
 import { Track, UnresolvedTrack } from "./Track";
-import { LavalinkPlayerVoiceOptions, SearchPlatform, SearchResult, LavaSearchType, LavaSearchResponse, LavaSrcSearchPlatformBase } from "./Utils";
-type PlayerDestroyReasons = "QueueEmpty" | "NodeDestroy" | "NodeDeleted" | "LavalinkNoVoice" | "NodeReconnectFail" | "PlayerReconnectFail" | "Disconnected" | "ChannelDeleted";
+import { LavalinkPlayerVoiceOptions, SearchResult, LavaSearchResponse, LavaSearchQuery, SearchQuery } from "./Utils";
+type PlayerDestroyReasons = "QueueEmpty" | "NodeDestroy" | "NodeDeleted" | "LavalinkNoVoice" | "NodeReconnectFail" | "PlayerReconnectFail" | "Disconnected" | "ChannelDeleted" | "ReconnectAllNodes" | "DisconnectAllNodes";
 export type DestroyReasonsType = PlayerDestroyReasons | string;
 export declare const DestroyReasons: Record<PlayerDestroyReasons, PlayerDestroyReasons>;
 export interface PlayerJson {
@@ -138,20 +138,13 @@ 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<import("./Utils").UnresolvedSearchResult | SearchResult | LavaSearchResponse>;
+    lavaSearch(query: LavaSearchQuery, requestUser: unknown): Promise<SearchResult | LavaSearchResponse>;
     /**
      *
      * @param query Query for your data
      * @param requestUser
      */
-    search(query: {
-        query: string;
-        source?: SearchPlatform;
-    } | string, requestUser: unknown): Promise<import("./Utils").UnresolvedSearchResult | SearchResult>;
+    search(query: SearchQuery, requestUser: unknown): Promise<import("./Utils").UnresolvedSearchResult | SearchResult>;
     /**
      * Pause the player
      */

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

@@ -89,6 +89,15 @@ export declare class ManagerUtils {
     isUnresolvedTrackQuery(data: UnresolvedQuery | any): boolean;
     getClosestTrack(data: UnresolvedTrack, player: Player): Promise<Track | undefined>;
     validateQueryString(node: LavalinkNode, queryString: string): void;
+    transformQuery(query: SearchQuery): {
+        query: string;
+        source: any;
+    };
+    transformLavaSearchQuery(query: LavaSearchQuery): {
+        query: string;
+        types: string[];
+        source: any;
+    };
     validateSourceString(node: LavalinkNode, sourceString: SearchPlatform): void;
 }
 /**
@@ -322,4 +331,13 @@ export interface LavaSearchResponse {
     /** Addition result data provided by plugins */
     pluginInfo: PluginInfo;
 }
+export type SearchQuery = {
+    query: string;
+    source?: SearchPlatform;
+} | string;
+export type LavaSearchQuery = {
+    query: string;
+    source: LavaSrcSearchPlatformBase;
+    types?: LavaSearchType[];
+};
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lavalink-client",
-  "version": "1.1.11",
+  "version": "1.1.14",
   "description": "Easy, flexible and feature-rich lavalink@v4 Client. Both for Beginners and Proficients.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",