lavalink-client 2.1.7 → 2.2.0

package/README.md

@@ -189,6 +189,7 @@ client.lavalink = new LavalinkManager({
 
 # UpdateLog
 
+
 ## **Version 1.2.0**
 - Added `player.stopPlaying()`: When executed it **clears the Queue** and **stops playing**, **without destroying the Player**
 - Adjusted `Player.skip()`
@@ -298,3 +299,13 @@ Most features of this update got tested, but if you encounter any bugs feel free
 - Enforce link searches for users with following searchPlatform Options: "http" | "https" | "link" | "uri"
   - Additionally strongend the code behind that
 - Added searchPlatform for local tracks (aka files on the lavalink server...): "local"
+
+## **Version 2.2.0**
+- Changed console.error to throw error on queue.utils.sync if no data was provided/found
+- Changed undici.fetch to native fetch, but requires nodejs v18+ to support other runtimes, e.g. bun
+- Added sourceNames for `bandcamp` (from native lavalink) if it's supported it will use lavalink'S search, else the client search on player.search({ source: "bandcamp" }) (you can also use bcsearch or bc)
+- Added sourceName for `phsearch` from the dunktebot plugin, released in v.1.7.0
+- Support for youtube still going via the youtube-source plugin (disable youtube for lavalink, and use the plugin instead)
+- Exporting events
+- Added new debugOption: logCustomSearches
+- *(Next version update i will remove the internal interval for position update, to calculations)*

package/dist/cjs/structures/CustomSearches/BandCampSearch.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bandCampSearch = void 0;
-const undici_1 = require("undici");
 const bandCampSearch = async (player, query, requestUser) => {
     let error = null;
     let tracks = [];
+    if (player.LavalinkManager.options.advancedOptions.debugOptions.logCustomSearches)
+        console.log(`Lavalink-Client-Debug | SEARCHING | - ${query} on lavalink-client`);
     player.LavalinkManager.utils.validateQueryString(player.node, query);
     try {
-        const data = await (0, undici_1.fetch)(`https://bandcamp.com/api/nusearch/2/autocomplete?q=${encodeURIComponent(query)}`, {
+        const data = await fetch(`https://bandcamp.com/api/nusearch/2/autocomplete?q=${encodeURIComponent(query)}`, {
             headers: {
                 'User-Agent': 'android-async-http/1.4.1 (http://loopj.com/android-async-http)',
                 'Cookie': '$Version=1'

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

@@ -66,6 +66,8 @@ export interface ManagerOptions {
     advancedOptions?: {
         /** optional */
         debugOptions?: {
+            /** For logging custom searches */
+            logCustomSearches?: boolean;
             /** logs for debugging the "no-Audio" playing error */
             noAudio?: boolean;
             /** For Logging the Destroy function */
@@ -78,7 +80,7 @@ export interface ManagerOptions {
         };
     };
 }
-interface LavalinkManagerEvents {
+export interface LavalinkManagerEvents {
     /**
      * Emitted when a Track started playing.
      * @event Manager#trackStart
@@ -93,12 +95,12 @@ interface LavalinkManagerEvents {
      * Emitted when a Track got stuck while playing.
      * @event Manager#trackStuck
      */
-    "trackStuck": (player: Player, track: Track, payload: TrackStuckEvent) => void;
+    "trackStuck": (player: Player, track: Track | null, payload: TrackStuckEvent) => void;
     /**
      * Emitted when a Track errored.
      * @event Manager#trackError
      */
-    "trackError": (player: Player, track: Track | UnresolvedTrack, payload: TrackExceptionEvent) => void;
+    "trackError": (player: Player, track: Track | UnresolvedTrack | null, payload: TrackExceptionEvent) => void;
     /**
      * Emitted when the Playing finished and no more tracks in the queue.
      * @event Manager#queueEnd
@@ -347,4 +349,3 @@ export declare class LavalinkManager extends EventEmitter {
      */
     sendRawData(data: VoicePacket | VoiceServer | VoiceState | ChannelDeletePacket): Promise<void>;
 }
-export {};

package/dist/cjs/structures/LavalinkManager.js

@@ -59,6 +59,7 @@ class LavalinkManager extends events_1.EventEmitter {
             },
             advancedOptions: {
                 debugOptions: {
+                    logCustomSearches: options?.advancedOptions?.debugOptions?.logCustomSearches ?? false,
                     noAudio: options?.advancedOptions?.debugOptions?.noAudio ?? false,
                     playerDestroy: {
                         dontThrowError: options?.advancedOptions?.debugOptions?.playerDestroy?.dontThrowError ?? false,

package/dist/cjs/structures/LavalinkManagerStatics.js

@@ -50,10 +50,14 @@ exports.DefaultSources = {
     "flowery": "ftts",
     "flowery.tts": "ftts",
     "flowerytts": "ftts",
-    // Client sided search platforms
+    // Client sided search platforms (after lavalinkv4.0.6 it will search via bcsearch on the node itself)
     "bandcamp": "bcsearch",
     "bc": "bcsearch",
     "bcsearch": "bcsearch",
+    // other searches:
+    "phsearch": "phsearch",
+    "pornhub": "phsearch",
+    "porn": "phsearch",
     // local files
     "local": "local",
     // http requests

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

@@ -1,12 +1,13 @@
 /// <reference types="node" />
 import internal from "stream";
-import { Dispatcher, Pool } from "undici";
 import { NodeManager } from "./NodeManager";
 import { DestroyReasonsType, Player } from "./Player";
 import { Track } from "./Track";
 import { Base64, InvalidLavalinkRestRequest, LavalinkPlayer, LavaSearchQuery, LavaSearchResponse, PlayerUpdateInfo, RoutePlanner, SearchQuery, SearchResult, Session } from "./Utils";
-/** Modifies any outgoing REST requests. */
-export type ModifyRequest = (options: Dispatcher.RequestOptions) => void;
+/** Ability to manipulate fetch requests */
+export type ModifyRequest = (options: RequestInit & {
+    path: string;
+}) => void;
 export declare const validSponsorBlocks: string[];
 export type SponsorBlockSegment = "sponsor" | "selfpromo" | "interaction" | "intro" | "outro" | "preview" | "music_offtopic" | "filler";
 export interface LavalinkNodeOptions {
@@ -24,14 +25,12 @@ export interface LavalinkNodeOptions {
     id?: string;
     /** Voice Regions of this Node */
     regions?: string[];
-    /** Options for the undici http pool used for http requests */
-    poolOptions?: Pool.Options;
     /** The retryAmount for the node. */
     retryAmount?: number;
     /** The retryDelay for the node. */
     retryDelay?: number;
-    /** Pool Undici Options - requestTimeout */
-    requestTimeout?: number;
+    /** signal for cancelling requests - default: AbortSignal.timeout(options.requestSignalTimeoutMS || 10000) - put <= 0 to disable */
+    requestSignalTimeoutMS?: number;
 }
 export interface MemoryStats {
     /** The free memory of the allocated amount. */
@@ -145,8 +144,6 @@ export declare class LavalinkNode {
     private reconnectAttempts;
     /** The Socket of the Lavalink */
     private socket;
-    /** The Rest Server for this Lavalink */
-    private rest;
     /** Version of what the Lavalink Server should be */
     private version;
     /**
@@ -168,7 +165,7 @@ export declare class LavalinkNode {
      * @param modify Used to modify the request before being sent
      * @returns The returned data
      */
-    request(endpoint: string, modify?: ModifyRequest, parseAsText?: boolean): Promise<unknown>;
+    request(endpoint: string, modify?: ModifyRequest, parseAsText?: boolean): Promise<any>;
     /**
      * Search something raw on the node, please note only add tracks to players of that node
      * @param query SearchQuery Object
@@ -188,7 +185,7 @@ export declare class LavalinkNode {
      * @param guildId
      * @returns
      */
-    destroyPlayer(guildId: any): Promise<unknown>;
+    destroyPlayer(guildId: any): Promise<any>;
     /**
      * Connect to the Lavalink Node
      * @param sessionId Provide the Session Id of the previous connection, to resume the node and it's player(s)
@@ -266,12 +263,12 @@ export declare class LavalinkNode {
         /**
          * Release all blacklisted IP addresses into pool of IPs
          */
-        unmarkAllFailedAddresses: () => Promise<unknown>;
+        unmarkAllFailedAddresses: () => Promise<any>;
     };
     /** Private Utils */
     private validate;
     private syncPlayerData;
-    private get poolAddress();
+    private get restAddress();
     private reconnect;
     private open;
     private close;

package/dist/cjs/structures/Node.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LavalinkNode = exports.validSponsorBlocks = void 0;
 const tslib_1 = require("tslib");
 const path_1 = require("path");
-const undici_1 = require("undici");
 const ws_1 = tslib_1.__importDefault(require("ws"));
 const Player_1 = require("./Player");
 const Utils_1 = require("./Utils");
@@ -47,8 +46,6 @@ class LavalinkNode {
     reconnectAttempts = 1;
     /** The Socket of the Lavalink */
     socket = null;
-    /** The Rest Server for this Lavalink */
-    rest;
     /** Version of what the Lavalink Server should be */
     version = "v4";
     /**
@@ -61,14 +58,13 @@ class LavalinkNode {
             secure: false,
             retryAmount: 5,
             retryDelay: 30e3,
-            requestTimeout: 10e3,
+            requestSignalTimeoutMS: 10000,
             ...options
         };
         this.NodeManager = manager;
         this.validate();
         if (this.options.secure && this.options.port !== 443)
             throw new SyntaxError("If secure is true, then the port must be 443");
-        this.rest = new undici_1.Pool(this.poolAddress, this.options.poolOptions);
         this.options.regions = (this.options.regions || []).map(a => a.toLowerCase());
         Object.defineProperty(this, Utils_1.NodeSymbol, { configurable: true, value: true });
     }
@@ -83,15 +79,15 @@ class LavalinkNode {
             path: `/${this.version}/${endpoint.replace(/^\//gm, "")}`,
             method: "GET",
             headers: {
-                Authorization: this.options.authorization
+                "Authorization": this.options.authorization
             },
-            headersTimeout: this.options.requestTimeout,
+            signal: this.options.requestSignalTimeoutMS && this.options.requestSignalTimeoutMS > 0 ? AbortSignal.timeout(this.options.requestSignalTimeoutMS) : undefined,
         };
         modify?.(options);
-        const url = new URL(`${this.poolAddress}${options.path}`);
+        const url = new URL(`${this.restAddress}${options.path}`);
         url.searchParams.append("trace", "true");
-        options.path = url.pathname + url.search;
-        const request = await this.rest.request(options);
+        delete options.path;
+        const request = await fetch(url.href, options);
         this.calls++;
         return { request, options };
     }
@@ -105,9 +101,9 @@ class LavalinkNode {
         const { request, options } = await this.rawRequest(endpoint, modify);
         if (["DELETE", "PUT"].includes(options.method))
             return;
-        if (request.statusCode === 404)
+        if (request.status === 404)
             throw new Error(`Node Request resulted into an error, request-PATH: ${options.path} | headers: ${JSON.stringify(request.headers)}`);
-        return parseAsText ? await request.body.text() : await request.body.json();
+        return parseAsText ? await request.text() : await request.json();
     }
     /**
      * Search something raw on the node, please note only add tracks to players of that node
@@ -120,8 +116,8 @@ class LavalinkNode {
         this.NodeManager.LavalinkManager.utils.validateQueryString(this, Query.query, Query.source);
         if (Query.source)
             this.NodeManager.LavalinkManager.utils.validateSourceString(this, Query.source);
-        if (["bcsearch", "bandcamp"].includes(Query.source)) {
-            throw new Error("Bandcamp Search only works on the player!");
+        if (["bcsearch", "bandcamp"].includes(Query.source) && !this.info.sourceManagers.includes("bandcamp")) {
+            throw new Error("Bandcamp Search only works on the player (lavaplayer version < 2.2.0!");
         }
         let uri = `/loadtracks?identifier=`;
         if (/^https?:\/\//.test(Query.query) || ["http", "https", "link", "uri"].includes(Query.source)) { // if it's a link simply encode it
@@ -169,7 +165,7 @@ class LavalinkNode {
         const { request } = await this.rawRequest(`/loadsearch?query=${Query.source ? `${Query.source}:` : ""}${encodeURIComponent(Query.query)}${Query.types?.length ? `&types=${Query.types.join(",")}` : ""}`);
         if (throwOnEmpty === true)
             throw new Error("Nothing found");
-        const res = (request.statusCode === 204 ? {} : await request.body.json());
+        const res = (request.status === 204 ? {} : await request.json());
         return {
             tracks: res.tracks?.map(v => this.NodeManager.LavalinkManager.utils.buildTrack(v, requestUser)) || [],
             albums: res.albums?.map(v => ({ info: v.info, pluginInfo: v?.plugin || v.pluginInfo, tracks: v.tracks.map(v => this.NodeManager.LavalinkManager.utils.buildTrack(v, requestUser)) })) || [],
@@ -194,7 +190,7 @@ class LavalinkNode {
             r.headers["Content-Type"] = "application/json";
             r.body = JSON.stringify(data.playerOptions);
             if (data.noReplace) {
-                const url = new URL(`${this.poolAddress}${r.path}`);
+                const url = new URL(`${this.restAddress}${r.path}`);
                 url.searchParams.append("noReplace", data.noReplace === true && typeof data.noReplace === "boolean" ? "true" : "false");
                 r.path = url.pathname + url.search;
             }
@@ -475,7 +471,7 @@ class LavalinkNode {
         }
         return true;
     }
-    get poolAddress() {
+    get restAddress() {
         return `http${this.options.secure ? "s" : ""}://${this.options.host}:${this.options.port}`;
     }
     reconnect(instaReconnect = false) {
@@ -510,9 +506,9 @@ class LavalinkNode {
             clearTimeout(this.reconnectTimeout);
         // reset the reconnect attempts amount
         this.reconnectAttempts = 1;
-        this.info = await this.fetchInfo().catch(() => null);
+        this.info = await this.fetchInfo().catch((e) => (console.error(e, "ON-OPEN-FETCH"), null));
         if (!this.info && ["v3", "v4"].includes(this.version)) {
-            const errorString = `Lavalink Node (${this.poolAddress}) does not provide any /${this.version}/info`;
+            const errorString = `Lavalink Node (${this.restAddress}) does not provide any /${this.version}/info`;
             throw new Error(errorString);
         }
         this.NodeManager.emit("connect", this);

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

@@ -5,7 +5,7 @@ import { LavalinkNode, LavalinkNodeOptions } from "./Node";
 import { DestroyReasonsType } from "./Player";
 import { LavalinkPlayer, MiniMap } from "./Utils";
 type LavalinkNodeIdentifier = string;
-interface NodeManagerEvents {
+export interface NodeManagerEvents {
     /**
      * Emitted when a Node is created.
      * @event Manager.nodeManager#create

package/dist/cjs/structures/Player.js

@@ -132,17 +132,17 @@ class Player {
         if (options?.clientTrack && (this.LavalinkManager.utils.isTrack(options?.clientTrack) || this.LavalinkManager.utils.isUnresolvedTrack(options.clientTrack))) {
             if (this.LavalinkManager.utils.isUnresolvedTrack(options.clientTrack))
                 await options.clientTrack.resolve(this);
-            if (typeof options.track.userData === "object")
-                options.clientTrack.userData = { ...(options?.clientTrack.userData || {}), ...(options.track.userData || {}) };
+            if ((typeof options.track?.userData === "object" || typeof options.clientTrack?.userData === "object") && options.clientTrack)
+                options.clientTrack.userData = { ...(options?.clientTrack.userData || {}), ...(options.track?.userData || {}) };
             await this.queue.add(options?.clientTrack, 0);
             return await this.skip();
         }
         else if (options?.track?.encoded) {
             // handle play encoded options manually // TODO let it resolve by lavalink!
             const track = await this.node.decode.singleTrack(options.track?.encoded, options.track?.requester || this.queue?.current?.requester || this.queue.previous?.[0]?.requester || this.queue.tracks?.[0]?.requester || this.LavalinkManager.options.client);
-            if (typeof options.track.userData === "object")
-                track.userData = { ...(track.userData || {}), ...(options.track.userData || {}) };
             if (track) {
+                if (typeof options.track?.userData === "object")
+                    track.userData = { ...(track.userData || {}), ...(options.track.userData || {}) };
                 replaced = true;
                 this.queue.add(track, 0);
                 await (0, Utils_1.queueTrackEnd)(this);
@@ -153,9 +153,9 @@ class Player {
             const res = await this.search({
                 query: options?.track?.identifier
             }, options?.track?.requester || this.queue?.current?.requester || this.queue.previous?.[0]?.requester || this.queue.tracks?.[0]?.requester || this.LavalinkManager.options.client);
-            if (typeof options.track.userData === "object")
-                res.tracks[0].userData = { ...(res.tracks[0].userData || {}), ...(options.track.userData || {}) };
             if (res.tracks[0]) {
+                if (typeof options.track?.userData === "object")
+                    res.tracks[0].userData = { ...(res.tracks[0].userData || {}), ...(options.track.userData || {}) };
                 replaced = true;
                 this.queue.add(res.tracks[0], 0);
                 await (0, Utils_1.queueTrackEnd)(this);
@@ -167,8 +167,8 @@ class Player {
             try {
                 // resolve the unresolved track
                 await this.queue.current.resolve(this);
-                if (typeof options.track.userData === "object")
-                    this.queue.current.userData = { ...(this.queue.current.userData || {}), ...(options.track.userData || {}) };
+                if (typeof options.track?.userData === "object" && this.queue.current)
+                    this.queue.current.userData = { ...(this.queue.current?.userData || {}), ...(options.track?.userData || {}) };
             }
             catch (error) {
                 this.LavalinkManager.emit("trackError", this, this.queue.current, error);
@@ -264,7 +264,7 @@ class Player {
      */
     async search(query, requestUser) {
         const Query = this.LavalinkManager.utils.transformQuery(query);
-        if (["bcsearch", "bandcamp"].includes(Query.source))
+        if (["bcsearch", "bandcamp"].includes(Query.source) && !this.node.info.sourceManagers.includes("bandcamp"))
             return await (0, BandCampSearch_1.bandCampSearch)(this, Query.query, requestUser);
         return this.node.search(Query, requestUser);
     }

package/dist/cjs/structures/Queue.js

@@ -81,7 +81,7 @@ class Queue {
         sync: async (override = true, dontSyncCurrent = true) => {
             const data = await this.QueueSaver.get(this.guildId);
             if (!data)
-                return console.log("No data found to sync for guildId: ", this.guildId);
+                throw new Error(`No data found to sync for guildId: ${this.guildId}`);
             if (!dontSyncCurrent && !this.current && (this.managerUtils.isTrack(data.current)))
                 this.current = data.current;
             if (Array.isArray(data.tracks) && data?.tracks.length && data.tracks.some(track => this.managerUtils.isTrack(track) || this.managerUtils.isUnresolvedTrack(track)))

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

@@ -14,10 +14,10 @@ export type IntegerNumber = Opaque<number, 'Int'>;
 export type FloatNumber = Opaque<number, 'Float'>;
 export type LavaSrcSearchPlatformBase = "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ymsearch";
 export type LavaSrcSearchPlatform = LavaSrcSearchPlatformBase | "ftts";
-export type DuncteSearchPlatform = "speak" | "tts";
+export type DuncteSearchPlatform = "speak" | "phsearch" | "pornhub" | "porn" | "tts";
 export type LavalinkClientSearchPlatform = "bcsearch";
 export type LavalinkClientSearchPlatformResolve = "bandcamp" | "bc";
-export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | LavaSrcSearchPlatform | DuncteSearchPlatform | LavalinkClientSearchPlatform;
+export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | "bcsearch" | LavaSrcSearchPlatform | DuncteSearchPlatform | LavalinkClientSearchPlatform;
 export type ClientCustomSearchPlatformUtils = "local" | "http" | "https" | "link" | "uri";
 export type ClientSearchPlatform = ClientCustomSearchPlatformUtils | // for file/link requests
 "youtube" | "yt" | "youtube music" | "youtubemusic" | "ytm" | "musicyoutube" | "music youtube" | "soundcloud" | "sc" | "am" | "apple music" | "applemusic" | "apple" | "musicapple" | "music apple" | "sp" | "spsuggestion" | "spotify" | "spotify.com" | "spotifycom" | "dz" | "deezer" | "yandex" | "yandex music" | "yandexmusic" | "flowerytts" | "flowery" | "flowery.tts" | LavalinkClientSearchPlatformResolve | LavalinkClientSearchPlatform;

package/dist/cjs/structures/Utils.js

@@ -50,7 +50,7 @@ class ManagerUtils {
                     identifier: data.info.identifier,
                     title: data.info.title,
                     author: data.info.author,
-                    duration: data.info.length || data.info.duration,
+                    duration: data.info.duration || data.info.length,
                     artworkUrl: data.info.artworkUrl || data.pluginInfo?.artworkUrl || data.plugin?.artworkUrl,
                     uri: data.info.uri,
                     sourceName: data.info.sourceName,
@@ -206,7 +206,7 @@ class ManagerUtils {
             throw new Error("Lavalink Node has not 'soundcloud' enabled");
         }
         if (LavalinkManagerStatics_1.SourceLinksRegexes.bandcamp.test(queryString) && !node.info?.sourceManagers?.includes("bandcamp")) {
-            throw new Error("Lavalink Node has not 'bandcamp' enabled");
+            throw new Error("Lavalink Node has not 'bandcamp' enabled (introduced with lavaplayer 2.2.0 or lavalink 4.0.6)");
         }
         if (LavalinkManagerStatics_1.SourceLinksRegexes.TwitchTv.test(queryString) && !node.info?.sourceManagers?.includes("twitch")) {
             throw new Error("Lavalink Node has not 'twitch' enabled");
@@ -238,9 +238,10 @@ class ManagerUtils {
         return;
     }
     transformQuery(query) {
+        const sourceOfQuery = typeof query === "string" ? undefined : (LavalinkManagerStatics_1.DefaultSources[(query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager?.options?.playerOptions?.defaultSearchPlatform?.toLowerCase?.()] ?? (query.source?.trim?.()?.toLowerCase?.()));
         const Query = {
             query: typeof query === "string" ? query : query.query,
-            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?.toLowerCase?.()
+            source: sourceOfQuery ?? this.LavalinkManager?.options?.playerOptions?.defaultSearchPlatform?.toLowerCase?.()
         };
         const foundSource = Object.keys(LavalinkManagerStatics_1.DefaultSources).find(source => Query.query?.toLowerCase?.()?.startsWith(`${source}:`.toLowerCase()))?.trim?.()?.toLowerCase?.();
         // ignore links...
@@ -252,10 +253,11 @@ class ManagerUtils {
     }
     transformLavaSearchQuery(query) {
         // transform the query object
+        const sourceOfQuery = typeof query === "string" ? undefined : (LavalinkManagerStatics_1.DefaultSources[(query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager?.options?.playerOptions?.defaultSearchPlatform?.toLowerCase?.()] ?? (query.source?.trim?.()?.toLowerCase?.()));
         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?.toLowerCase?.()
+            source: sourceOfQuery ?? this.LavalinkManager?.options?.playerOptions?.defaultSearchPlatform?.toLowerCase?.()
         };
         const foundSource = Object.keys(LavalinkManagerStatics_1.DefaultSources).find(source => Query.query.toLowerCase().startsWith(`${source}:`.toLowerCase()))?.trim?.()?.toLowerCase?.();
         if (foundSource && LavalinkManagerStatics_1.DefaultSources[foundSource]) {

package/dist/esm/structures/CustomSearches/BandCampSearch.js

@@ -1,7 +1,8 @@
-import { fetch } from "undici";
 export const bandCampSearch = async (player, query, requestUser) => {
     let error = null;
     let tracks = [];
+    if (player.LavalinkManager.options.advancedOptions.debugOptions.logCustomSearches)
+        console.log(`Lavalink-Client-Debug | SEARCHING | - ${query} on lavalink-client`);
     player.LavalinkManager.utils.validateQueryString(player.node, query);
     try {
         const data = await fetch(`https://bandcamp.com/api/nusearch/2/autocomplete?q=${encodeURIComponent(query)}`, {

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

@@ -66,6 +66,8 @@ export interface ManagerOptions {
     advancedOptions?: {
         /** optional */
         debugOptions?: {
+            /** For logging custom searches */
+            logCustomSearches?: boolean;
             /** logs for debugging the "no-Audio" playing error */
             noAudio?: boolean;
             /** For Logging the Destroy function */
@@ -78,7 +80,7 @@ export interface ManagerOptions {
         };
     };
 }
-interface LavalinkManagerEvents {
+export interface LavalinkManagerEvents {
     /**
      * Emitted when a Track started playing.
      * @event Manager#trackStart
@@ -93,12 +95,12 @@ interface LavalinkManagerEvents {
      * Emitted when a Track got stuck while playing.
      * @event Manager#trackStuck
      */
-    "trackStuck": (player: Player, track: Track, payload: TrackStuckEvent) => void;
+    "trackStuck": (player: Player, track: Track | null, payload: TrackStuckEvent) => void;
     /**
      * Emitted when a Track errored.
      * @event Manager#trackError
      */
-    "trackError": (player: Player, track: Track | UnresolvedTrack, payload: TrackExceptionEvent) => void;
+    "trackError": (player: Player, track: Track | UnresolvedTrack | null, payload: TrackExceptionEvent) => void;
     /**
      * Emitted when the Playing finished and no more tracks in the queue.
      * @event Manager#queueEnd
@@ -347,4 +349,3 @@ export declare class LavalinkManager extends EventEmitter {
      */
     sendRawData(data: VoicePacket | VoiceServer | VoiceState | ChannelDeletePacket): Promise<void>;
 }
-export {};

package/dist/esm/structures/LavalinkManager.js

@@ -56,6 +56,7 @@ export class LavalinkManager extends EventEmitter {
             },
             advancedOptions: {
                 debugOptions: {
+                    logCustomSearches: options?.advancedOptions?.debugOptions?.logCustomSearches ?? false,
                     noAudio: options?.advancedOptions?.debugOptions?.noAudio ?? false,
                     playerDestroy: {
                         dontThrowError: options?.advancedOptions?.debugOptions?.playerDestroy?.dontThrowError ?? false,

package/dist/esm/structures/LavalinkManagerStatics.js

@@ -47,10 +47,14 @@ export const DefaultSources = {
     "flowery": "ftts",
     "flowery.tts": "ftts",
     "flowerytts": "ftts",
-    // Client sided search platforms
+    // Client sided search platforms (after lavalinkv4.0.6 it will search via bcsearch on the node itself)
     "bandcamp": "bcsearch",
     "bc": "bcsearch",
     "bcsearch": "bcsearch",
+    // other searches:
+    "phsearch": "phsearch",
+    "pornhub": "phsearch",
+    "porn": "phsearch",
     // local files
     "local": "local",
     // http requests

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

@@ -1,12 +1,13 @@
 /// <reference types="node" />
 import internal from "stream";
-import { Dispatcher, Pool } from "undici";
 import { NodeManager } from "./NodeManager";
 import { DestroyReasonsType, Player } from "./Player";
 import { Track } from "./Track";
 import { Base64, InvalidLavalinkRestRequest, LavalinkPlayer, LavaSearchQuery, LavaSearchResponse, PlayerUpdateInfo, RoutePlanner, SearchQuery, SearchResult, Session } from "./Utils";
-/** Modifies any outgoing REST requests. */
-export type ModifyRequest = (options: Dispatcher.RequestOptions) => void;
+/** Ability to manipulate fetch requests */
+export type ModifyRequest = (options: RequestInit & {
+    path: string;
+}) => void;
 export declare const validSponsorBlocks: string[];
 export type SponsorBlockSegment = "sponsor" | "selfpromo" | "interaction" | "intro" | "outro" | "preview" | "music_offtopic" | "filler";
 export interface LavalinkNodeOptions {
@@ -24,14 +25,12 @@ export interface LavalinkNodeOptions {
     id?: string;
     /** Voice Regions of this Node */
     regions?: string[];
-    /** Options for the undici http pool used for http requests */
-    poolOptions?: Pool.Options;
     /** The retryAmount for the node. */
     retryAmount?: number;
     /** The retryDelay for the node. */
     retryDelay?: number;
-    /** Pool Undici Options - requestTimeout */
-    requestTimeout?: number;
+    /** signal for cancelling requests - default: AbortSignal.timeout(options.requestSignalTimeoutMS || 10000) - put <= 0 to disable */
+    requestSignalTimeoutMS?: number;
 }
 export interface MemoryStats {
     /** The free memory of the allocated amount. */
@@ -145,8 +144,6 @@ export declare class LavalinkNode {
     private reconnectAttempts;
     /** The Socket of the Lavalink */
     private socket;
-    /** The Rest Server for this Lavalink */
-    private rest;
     /** Version of what the Lavalink Server should be */
     private version;
     /**
@@ -168,7 +165,7 @@ export declare class LavalinkNode {
      * @param modify Used to modify the request before being sent
      * @returns The returned data
      */
-    request(endpoint: string, modify?: ModifyRequest, parseAsText?: boolean): Promise<unknown>;
+    request(endpoint: string, modify?: ModifyRequest, parseAsText?: boolean): Promise<any>;
     /**
      * Search something raw on the node, please note only add tracks to players of that node
      * @param query SearchQuery Object
@@ -188,7 +185,7 @@ export declare class LavalinkNode {
      * @param guildId
      * @returns
      */
-    destroyPlayer(guildId: any): Promise<unknown>;
+    destroyPlayer(guildId: any): Promise<any>;
     /**
      * Connect to the Lavalink Node
      * @param sessionId Provide the Session Id of the previous connection, to resume the node and it's player(s)
@@ -266,12 +263,12 @@ export declare class LavalinkNode {
         /**
          * Release all blacklisted IP addresses into pool of IPs
          */
-        unmarkAllFailedAddresses: () => Promise<unknown>;
+        unmarkAllFailedAddresses: () => Promise<any>;
     };
     /** Private Utils */
     private validate;
     private syncPlayerData;
-    private get poolAddress();
+    private get restAddress();
     private reconnect;
     private open;
     private close;

package/dist/esm/structures/Node.js

@@ -1,5 +1,4 @@
 import { isAbsolute } from "path";
-import { Pool } from "undici";
 import WebSocket from "ws";
 import { DestroyReasons } from "./Player";
 import { NodeSymbol, queueTrackEnd } from "./Utils";
@@ -43,8 +42,6 @@ export class LavalinkNode {
     reconnectAttempts = 1;
     /** The Socket of the Lavalink */
     socket = null;
-    /** The Rest Server for this Lavalink */
-    rest;
     /** Version of what the Lavalink Server should be */
     version = "v4";
     /**
@@ -57,14 +54,13 @@ export class LavalinkNode {
             secure: false,
             retryAmount: 5,
             retryDelay: 30e3,
-            requestTimeout: 10e3,
+            requestSignalTimeoutMS: 10000,
             ...options
         };
         this.NodeManager = manager;
         this.validate();
         if (this.options.secure && this.options.port !== 443)
             throw new SyntaxError("If secure is true, then the port must be 443");
-        this.rest = new Pool(this.poolAddress, this.options.poolOptions);
         this.options.regions = (this.options.regions || []).map(a => a.toLowerCase());
         Object.defineProperty(this, NodeSymbol, { configurable: true, value: true });
     }
@@ -79,15 +75,15 @@ export class LavalinkNode {
             path: `/${this.version}/${endpoint.replace(/^\//gm, "")}`,
             method: "GET",
             headers: {
-                Authorization: this.options.authorization
+                "Authorization": this.options.authorization
             },
-            headersTimeout: this.options.requestTimeout,
+            signal: this.options.requestSignalTimeoutMS && this.options.requestSignalTimeoutMS > 0 ? AbortSignal.timeout(this.options.requestSignalTimeoutMS) : undefined,
         };
         modify?.(options);
-        const url = new URL(`${this.poolAddress}${options.path}`);
+        const url = new URL(`${this.restAddress}${options.path}`);
         url.searchParams.append("trace", "true");
-        options.path = url.pathname + url.search;
-        const request = await this.rest.request(options);
+        delete options.path;
+        const request = await fetch(url.href, options);
         this.calls++;
         return { request, options };
     }
@@ -101,9 +97,9 @@ export class LavalinkNode {
         const { request, options } = await this.rawRequest(endpoint, modify);
         if (["DELETE", "PUT"].includes(options.method))
             return;
-        if (request.statusCode === 404)
+        if (request.status === 404)
             throw new Error(`Node Request resulted into an error, request-PATH: ${options.path} | headers: ${JSON.stringify(request.headers)}`);
-        return parseAsText ? await request.body.text() : await request.body.json();
+        return parseAsText ? await request.text() : await request.json();
     }
     /**
      * Search something raw on the node, please note only add tracks to players of that node
@@ -116,8 +112,8 @@ export class LavalinkNode {
         this.NodeManager.LavalinkManager.utils.validateQueryString(this, Query.query, Query.source);
         if (Query.source)
             this.NodeManager.LavalinkManager.utils.validateSourceString(this, Query.source);
-        if (["bcsearch", "bandcamp"].includes(Query.source)) {
-            throw new Error("Bandcamp Search only works on the player!");
+        if (["bcsearch", "bandcamp"].includes(Query.source) && !this.info.sourceManagers.includes("bandcamp")) {
+            throw new Error("Bandcamp Search only works on the player (lavaplayer version < 2.2.0!");
         }
         let uri = `/loadtracks?identifier=`;
         if (/^https?:\/\//.test(Query.query) || ["http", "https", "link", "uri"].includes(Query.source)) { // if it's a link simply encode it
@@ -165,7 +161,7 @@ export class LavalinkNode {
         const { request } = await this.rawRequest(`/loadsearch?query=${Query.source ? `${Query.source}:` : ""}${encodeURIComponent(Query.query)}${Query.types?.length ? `&types=${Query.types.join(",")}` : ""}`);
         if (throwOnEmpty === true)
             throw new Error("Nothing found");
-        const res = (request.statusCode === 204 ? {} : await request.body.json());
+        const res = (request.status === 204 ? {} : await request.json());
         return {
             tracks: res.tracks?.map(v => this.NodeManager.LavalinkManager.utils.buildTrack(v, requestUser)) || [],
             albums: res.albums?.map(v => ({ info: v.info, pluginInfo: v?.plugin || v.pluginInfo, tracks: v.tracks.map(v => this.NodeManager.LavalinkManager.utils.buildTrack(v, requestUser)) })) || [],
@@ -190,7 +186,7 @@ export class LavalinkNode {
             r.headers["Content-Type"] = "application/json";
             r.body = JSON.stringify(data.playerOptions);
             if (data.noReplace) {
-                const url = new URL(`${this.poolAddress}${r.path}`);
+                const url = new URL(`${this.restAddress}${r.path}`);
                 url.searchParams.append("noReplace", data.noReplace === true && typeof data.noReplace === "boolean" ? "true" : "false");
                 r.path = url.pathname + url.search;
             }
@@ -471,7 +467,7 @@ export class LavalinkNode {
         }
         return true;
     }
-    get poolAddress() {
+    get restAddress() {
         return `http${this.options.secure ? "s" : ""}://${this.options.host}:${this.options.port}`;
     }
     reconnect(instaReconnect = false) {
@@ -506,9 +502,9 @@ export class LavalinkNode {
             clearTimeout(this.reconnectTimeout);
         // reset the reconnect attempts amount
         this.reconnectAttempts = 1;
-        this.info = await this.fetchInfo().catch(() => null);
+        this.info = await this.fetchInfo().catch((e) => (console.error(e, "ON-OPEN-FETCH"), null));
         if (!this.info && ["v3", "v4"].includes(this.version)) {
-            const errorString = `Lavalink Node (${this.poolAddress}) does not provide any /${this.version}/info`;
+            const errorString = `Lavalink Node (${this.restAddress}) does not provide any /${this.version}/info`;
             throw new Error(errorString);
         }
         this.NodeManager.emit("connect", this);

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

@@ -5,7 +5,7 @@ import { LavalinkNode, LavalinkNodeOptions } from "./Node";
 import { DestroyReasonsType } from "./Player";
 import { LavalinkPlayer, MiniMap } from "./Utils";
 type LavalinkNodeIdentifier = string;
-interface NodeManagerEvents {
+export interface NodeManagerEvents {
     /**
      * Emitted when a Node is created.
      * @event Manager.nodeManager#create

package/dist/esm/structures/Player.js

@@ -129,17 +129,17 @@ export class Player {
         if (options?.clientTrack && (this.LavalinkManager.utils.isTrack(options?.clientTrack) || this.LavalinkManager.utils.isUnresolvedTrack(options.clientTrack))) {
             if (this.LavalinkManager.utils.isUnresolvedTrack(options.clientTrack))
                 await options.clientTrack.resolve(this);
-            if (typeof options.track.userData === "object")
-                options.clientTrack.userData = { ...(options?.clientTrack.userData || {}), ...(options.track.userData || {}) };
+            if ((typeof options.track?.userData === "object" || typeof options.clientTrack?.userData === "object") && options.clientTrack)
+                options.clientTrack.userData = { ...(options?.clientTrack.userData || {}), ...(options.track?.userData || {}) };
             await this.queue.add(options?.clientTrack, 0);
             return await this.skip();
         }
         else if (options?.track?.encoded) {
             // handle play encoded options manually // TODO let it resolve by lavalink!
             const track = await this.node.decode.singleTrack(options.track?.encoded, options.track?.requester || this.queue?.current?.requester || this.queue.previous?.[0]?.requester || this.queue.tracks?.[0]?.requester || this.LavalinkManager.options.client);
-            if (typeof options.track.userData === "object")
-                track.userData = { ...(track.userData || {}), ...(options.track.userData || {}) };
             if (track) {
+                if (typeof options.track?.userData === "object")
+                    track.userData = { ...(track.userData || {}), ...(options.track.userData || {}) };
                 replaced = true;
                 this.queue.add(track, 0);
                 await queueTrackEnd(this);
@@ -150,9 +150,9 @@ export class Player {
             const res = await this.search({
                 query: options?.track?.identifier
             }, options?.track?.requester || this.queue?.current?.requester || this.queue.previous?.[0]?.requester || this.queue.tracks?.[0]?.requester || this.LavalinkManager.options.client);
-            if (typeof options.track.userData === "object")
-                res.tracks[0].userData = { ...(res.tracks[0].userData || {}), ...(options.track.userData || {}) };
             if (res.tracks[0]) {
+                if (typeof options.track?.userData === "object")
+                    res.tracks[0].userData = { ...(res.tracks[0].userData || {}), ...(options.track.userData || {}) };
                 replaced = true;
                 this.queue.add(res.tracks[0], 0);
                 await queueTrackEnd(this);
@@ -164,8 +164,8 @@ export class Player {
             try {
                 // resolve the unresolved track
                 await this.queue.current.resolve(this);
-                if (typeof options.track.userData === "object")
-                    this.queue.current.userData = { ...(this.queue.current.userData || {}), ...(options.track.userData || {}) };
+                if (typeof options.track?.userData === "object" && this.queue.current)
+                    this.queue.current.userData = { ...(this.queue.current?.userData || {}), ...(options.track?.userData || {}) };
             }
             catch (error) {
                 this.LavalinkManager.emit("trackError", this, this.queue.current, error);
@@ -261,7 +261,7 @@ export class Player {
      */
     async search(query, requestUser) {
         const Query = this.LavalinkManager.utils.transformQuery(query);
-        if (["bcsearch", "bandcamp"].includes(Query.source))
+        if (["bcsearch", "bandcamp"].includes(Query.source) && !this.node.info.sourceManagers.includes("bandcamp"))
             return await bandCampSearch(this, Query.query, requestUser);
         return this.node.search(Query, requestUser);
     }

package/dist/esm/structures/Queue.js

@@ -76,7 +76,7 @@ export class Queue {
         sync: async (override = true, dontSyncCurrent = true) => {
             const data = await this.QueueSaver.get(this.guildId);
             if (!data)
-                return console.log("No data found to sync for guildId: ", this.guildId);
+                throw new Error(`No data found to sync for guildId: ${this.guildId}`);
             if (!dontSyncCurrent && !this.current && (this.managerUtils.isTrack(data.current)))
                 this.current = data.current;
             if (Array.isArray(data.tracks) && data?.tracks.length && data.tracks.some(track => this.managerUtils.isTrack(track) || this.managerUtils.isUnresolvedTrack(track)))

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

@@ -14,10 +14,10 @@ export type IntegerNumber = Opaque<number, 'Int'>;
 export type FloatNumber = Opaque<number, 'Float'>;
 export type LavaSrcSearchPlatformBase = "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ymsearch";
 export type LavaSrcSearchPlatform = LavaSrcSearchPlatformBase | "ftts";
-export type DuncteSearchPlatform = "speak" | "tts";
+export type DuncteSearchPlatform = "speak" | "phsearch" | "pornhub" | "porn" | "tts";
 export type LavalinkClientSearchPlatform = "bcsearch";
 export type LavalinkClientSearchPlatformResolve = "bandcamp" | "bc";
-export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | LavaSrcSearchPlatform | DuncteSearchPlatform | LavalinkClientSearchPlatform;
+export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | "bcsearch" | LavaSrcSearchPlatform | DuncteSearchPlatform | LavalinkClientSearchPlatform;
 export type ClientCustomSearchPlatformUtils = "local" | "http" | "https" | "link" | "uri";
 export type ClientSearchPlatform = ClientCustomSearchPlatformUtils | // for file/link requests
 "youtube" | "yt" | "youtube music" | "youtubemusic" | "ytm" | "musicyoutube" | "music youtube" | "soundcloud" | "sc" | "am" | "apple music" | "applemusic" | "apple" | "musicapple" | "music apple" | "sp" | "spsuggestion" | "spotify" | "spotify.com" | "spotifycom" | "dz" | "deezer" | "yandex" | "yandex music" | "yandexmusic" | "flowerytts" | "flowery" | "flowery.tts" | LavalinkClientSearchPlatformResolve | LavalinkClientSearchPlatform;

package/dist/esm/structures/Utils.js

@@ -46,7 +46,7 @@ export class ManagerUtils {
                     identifier: data.info.identifier,
                     title: data.info.title,
                     author: data.info.author,
-                    duration: data.info.length || data.info.duration,
+                    duration: data.info.duration || data.info.length,
                     artworkUrl: data.info.artworkUrl || data.pluginInfo?.artworkUrl || data.plugin?.artworkUrl,
                     uri: data.info.uri,
                     sourceName: data.info.sourceName,
@@ -202,7 +202,7 @@ export class ManagerUtils {
             throw new Error("Lavalink Node has not 'soundcloud' enabled");
         }
         if (SourceLinksRegexes.bandcamp.test(queryString) && !node.info?.sourceManagers?.includes("bandcamp")) {
-            throw new Error("Lavalink Node has not 'bandcamp' enabled");
+            throw new Error("Lavalink Node has not 'bandcamp' enabled (introduced with lavaplayer 2.2.0 or lavalink 4.0.6)");
         }
         if (SourceLinksRegexes.TwitchTv.test(queryString) && !node.info?.sourceManagers?.includes("twitch")) {
             throw new Error("Lavalink Node has not 'twitch' enabled");
@@ -234,9 +234,10 @@ export class ManagerUtils {
         return;
     }
     transformQuery(query) {
+        const sourceOfQuery = typeof query === "string" ? undefined : (DefaultSources[(query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager?.options?.playerOptions?.defaultSearchPlatform?.toLowerCase?.()] ?? (query.source?.trim?.()?.toLowerCase?.()));
         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?.()
+            source: sourceOfQuery ?? this.LavalinkManager?.options?.playerOptions?.defaultSearchPlatform?.toLowerCase?.()
         };
         const foundSource = Object.keys(DefaultSources).find(source => Query.query?.toLowerCase?.()?.startsWith(`${source}:`.toLowerCase()))?.trim?.()?.toLowerCase?.();
         // ignore links...
@@ -248,10 +249,11 @@ export class ManagerUtils {
     }
     transformLavaSearchQuery(query) {
         // transform the query object
+        const sourceOfQuery = typeof query === "string" ? undefined : (DefaultSources[(query.source?.trim?.()?.toLowerCase?.()) ?? this.LavalinkManager?.options?.playerOptions?.defaultSearchPlatform?.toLowerCase?.()] ?? (query.source?.trim?.()?.toLowerCase?.()));
         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?.()
+            source: sourceOfQuery ?? 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]) {

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

@@ -66,6 +66,8 @@ export interface ManagerOptions {
     advancedOptions?: {
         /** optional */
         debugOptions?: {
+            /** For logging custom searches */
+            logCustomSearches?: boolean;
             /** logs for debugging the "no-Audio" playing error */
             noAudio?: boolean;
             /** For Logging the Destroy function */
@@ -78,7 +80,7 @@ export interface ManagerOptions {
         };
     };
 }
-interface LavalinkManagerEvents {
+export interface LavalinkManagerEvents {
     /**
      * Emitted when a Track started playing.
      * @event Manager#trackStart
@@ -93,12 +95,12 @@ interface LavalinkManagerEvents {
      * Emitted when a Track got stuck while playing.
      * @event Manager#trackStuck
      */
-    "trackStuck": (player: Player, track: Track, payload: TrackStuckEvent) => void;
+    "trackStuck": (player: Player, track: Track | null, payload: TrackStuckEvent) => void;
     /**
      * Emitted when a Track errored.
      * @event Manager#trackError
      */
-    "trackError": (player: Player, track: Track | UnresolvedTrack, payload: TrackExceptionEvent) => void;
+    "trackError": (player: Player, track: Track | UnresolvedTrack | null, payload: TrackExceptionEvent) => void;
     /**
      * Emitted when the Playing finished and no more tracks in the queue.
      * @event Manager#queueEnd
@@ -347,4 +349,3 @@ export declare class LavalinkManager extends EventEmitter {
      */
     sendRawData(data: VoicePacket | VoiceServer | VoiceState | ChannelDeletePacket): Promise<void>;
 }
-export {};

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

@@ -1,12 +1,13 @@
 /// <reference types="node" />
 import internal from "stream";
-import { Dispatcher, Pool } from "undici";
 import { NodeManager } from "./NodeManager";
 import { DestroyReasonsType, Player } from "./Player";
 import { Track } from "./Track";
 import { Base64, InvalidLavalinkRestRequest, LavalinkPlayer, LavaSearchQuery, LavaSearchResponse, PlayerUpdateInfo, RoutePlanner, SearchQuery, SearchResult, Session } from "./Utils";
-/** Modifies any outgoing REST requests. */
-export type ModifyRequest = (options: Dispatcher.RequestOptions) => void;
+/** Ability to manipulate fetch requests */
+export type ModifyRequest = (options: RequestInit & {
+    path: string;
+}) => void;
 export declare const validSponsorBlocks: string[];
 export type SponsorBlockSegment = "sponsor" | "selfpromo" | "interaction" | "intro" | "outro" | "preview" | "music_offtopic" | "filler";
 export interface LavalinkNodeOptions {
@@ -24,14 +25,12 @@ export interface LavalinkNodeOptions {
     id?: string;
     /** Voice Regions of this Node */
     regions?: string[];
-    /** Options for the undici http pool used for http requests */
-    poolOptions?: Pool.Options;
     /** The retryAmount for the node. */
     retryAmount?: number;
     /** The retryDelay for the node. */
     retryDelay?: number;
-    /** Pool Undici Options - requestTimeout */
-    requestTimeout?: number;
+    /** signal for cancelling requests - default: AbortSignal.timeout(options.requestSignalTimeoutMS || 10000) - put <= 0 to disable */
+    requestSignalTimeoutMS?: number;
 }
 export interface MemoryStats {
     /** The free memory of the allocated amount. */
@@ -145,8 +144,6 @@ export declare class LavalinkNode {
     private reconnectAttempts;
     /** The Socket of the Lavalink */
     private socket;
-    /** The Rest Server for this Lavalink */
-    private rest;
     /** Version of what the Lavalink Server should be */
     private version;
     /**
@@ -168,7 +165,7 @@ export declare class LavalinkNode {
      * @param modify Used to modify the request before being sent
      * @returns The returned data
      */
-    request(endpoint: string, modify?: ModifyRequest, parseAsText?: boolean): Promise<unknown>;
+    request(endpoint: string, modify?: ModifyRequest, parseAsText?: boolean): Promise<any>;
     /**
      * Search something raw on the node, please note only add tracks to players of that node
      * @param query SearchQuery Object
@@ -188,7 +185,7 @@ export declare class LavalinkNode {
      * @param guildId
      * @returns
      */
-    destroyPlayer(guildId: any): Promise<unknown>;
+    destroyPlayer(guildId: any): Promise<any>;
     /**
      * Connect to the Lavalink Node
      * @param sessionId Provide the Session Id of the previous connection, to resume the node and it's player(s)
@@ -266,12 +263,12 @@ export declare class LavalinkNode {
         /**
          * Release all blacklisted IP addresses into pool of IPs
          */
-        unmarkAllFailedAddresses: () => Promise<unknown>;
+        unmarkAllFailedAddresses: () => Promise<any>;
     };
     /** Private Utils */
     private validate;
     private syncPlayerData;
-    private get poolAddress();
+    private get restAddress();
     private reconnect;
     private open;
     private close;

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

@@ -5,7 +5,7 @@ import { LavalinkNode, LavalinkNodeOptions } from "./Node";
 import { DestroyReasonsType } from "./Player";
 import { LavalinkPlayer, MiniMap } from "./Utils";
 type LavalinkNodeIdentifier = string;
-interface NodeManagerEvents {
+export interface NodeManagerEvents {
     /**
      * Emitted when a Node is created.
      * @event Manager.nodeManager#create

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

@@ -14,10 +14,10 @@ export type IntegerNumber = Opaque<number, 'Int'>;
 export type FloatNumber = Opaque<number, 'Float'>;
 export type LavaSrcSearchPlatformBase = "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ymsearch";
 export type LavaSrcSearchPlatform = LavaSrcSearchPlatformBase | "ftts";
-export type DuncteSearchPlatform = "speak" | "tts";
+export type DuncteSearchPlatform = "speak" | "phsearch" | "pornhub" | "porn" | "tts";
 export type LavalinkClientSearchPlatform = "bcsearch";
 export type LavalinkClientSearchPlatformResolve = "bandcamp" | "bc";
-export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | LavaSrcSearchPlatform | DuncteSearchPlatform | LavalinkClientSearchPlatform;
+export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | "bcsearch" | LavaSrcSearchPlatform | DuncteSearchPlatform | LavalinkClientSearchPlatform;
 export type ClientCustomSearchPlatformUtils = "local" | "http" | "https" | "link" | "uri";
 export type ClientSearchPlatform = ClientCustomSearchPlatformUtils | // for file/link requests
 "youtube" | "yt" | "youtube music" | "youtubemusic" | "ytm" | "musicyoutube" | "music youtube" | "soundcloud" | "sc" | "am" | "apple music" | "applemusic" | "apple" | "musicapple" | "music apple" | "sp" | "spsuggestion" | "spotify" | "spotify.com" | "spotifycom" | "dz" | "deezer" | "yandex" | "yandex music" | "yandexmusic" | "flowerytts" | "flowery" | "flowery.tts" | LavalinkClientSearchPlatformResolve | LavalinkClientSearchPlatform;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lavalink-client",
-  "version": "2.1.7",
+  "version": "2.2.0",
   "description": "Easy, flexible and feature-rich lavalink@v4 Client. Both for Beginners and Proficients.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -59,8 +59,10 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "undici": "^5.23.0",
     "tslib": "^2.6.1",
     "ws": "^8.13.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }