lavalink-client 2.1.7 → 2.2.1

package/README.md

@@ -59,6 +59,8 @@ yarn add tomato6966/lavalink-client
 
 Check out the [Documentation](https://lc4.gitbook.io/lavalink-client) | or the [TSDocumentation](https://tomato6966.github.io/lavalink-client/) for **Examples**, and **__detailled__ Docs**, and to figure out **how to get started**. *note: it's not fully done yet (see the docs)*
 
+- __**INFO Note**__: Please use the **[TSDocumentation (auto generated, folder `/tsDocs`)](https://tomato6966.github.io/lavalink-client/)** to get the entire information of lavalink-client, *I don't have time to update the [custom written gitbook-documentation](https://lc4.gitbook.io/lavalink-client) (folder `/docs`, feel free to update it)*
+
 # Used in:
 
 - [Betty](https://betty.cx/)
@@ -185,10 +187,61 @@ client.lavalink = new LavalinkManager({
 })
 ```
 
+## How to do resuming
+
+```js
+// 1. while the player is playing, make sure to enable it:
+const durationToKeepPlayingInMS = 600_000;
+await player.node.updateSession(true, durationToKeepPlayingInMS);
+```
+
+```js
+// 2. make sure to have an eventlistener for resuming events somewhere
+client.lavalink.nodeManager.on("resumed", (node, payload, fetchedPlayers) => {
+  // create players:
+  for(const fetchedPlayer of fetchedPlayers) {
+    const player = client.lavalink.createPlayer({
+       guildId: fetchedPlayer.guildId,
+    });
+    player.setVolume(fetchedPlayer.volume);
+    // and apply other things (e.g. paused, voice, filters, state, ...) (stuff like vc channel, text channel you need to store somewhere)
+    await player.queue.utils.sync(); // only works with a queuestore
+    // you can now overwride the player.queue.current track from the fetchedPlayer, or use the one from the queue.uztils.sync function
+    // continue with your resuming code...
+  } 
+})
+``` 
+
 ***
 
+
+### How to use flowertts with custom options
+
+- First enable flowertts within the lava-src plugin
+- Then make sure to pass through the extraQueryUrlParams object
+
+```js
+const query = interaction.options.getString("text");
+const voice = interaction.options.getString("voice");
+
+const extraParams = new URLSearchParams();
+if(voice) extraParams.append(`voice`, voice);
+
+// all params for flowertts can be found here: https://flowery.pw/docs
+const response = await player.search({ 
+  query: `${query}`,
+  extraQueryUrlParams: extraParams, // as of my knowledge this is currently only used for flowertts, adjusting the playback url dynamically mid-request
+  source: "ftts"
+}, interaction.user);
+```
+
+
+*** 
+
+
 # UpdateLog
 
+
 ## **Version 1.2.0**
 - Added `player.stopPlaying()`: When executed it **clears the Queue** and **stops playing**, **without destroying the Player**
 - Adjusted `Player.skip()`
@@ -240,7 +293,7 @@ client.lavalink = new LavalinkManager({
 
 # Node Resuming got supported
 # First enable it by doing:
-+ await player.node.updateResuming(true, 360_000);
++ await player.node.updateSession(true, 360_000);
 # then when reconnecting to the node add to the node.createeOptions the sessionId: "" of the previous session
 # and after  connecting the nodeManager.on("resumed", (node, payload, players) => {}) will be executed, where you can sync the players!
 
@@ -298,3 +351,36 @@ 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)*
+
+## **Version 2.2.1**
+- Player position is now calculated instead of using intervals
+- Instaplayer fix update now requires quite good internet connection on the lavalink server due to removal of intervals for updating player.position (everything above 300mbps should be good)
+- Internal updates for handling query params and url-requests (url-parsing) to fix quite few bugs and make the code more readable, now you don't have to ever provide stuff encoded via encodeURIComponent anymore.
+- Added a bunch of jsdoc information, to make the autogenerated docs more accurate!
+
+- Because of the adjustments from the encoding, you now need to pass url params for stuff like flowery tts like this:
+
+```js
+const query = interaction.options.getString("text");
+const voice = interaction.options.getString("voice");
+
+const extraParams = new URLSearchParams();
+if(voice) extraParams.append(`voice`, voice);
+
+// all params for flowertts can be found here: https://flowery.pw/docs
+const response = await player.search({ 
+  query: `${query}`,
+  extraQueryUrlParams: extraParams, // as of my knowledge this is currently only used for flowertts, adjusting the playback url dynamically mid-request
+  source: "ftts"
+}, interaction.user);
+```

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/Filters.d.ts

@@ -7,7 +7,7 @@ export declare class FilterManager {
     /** The Equalizer bands currently applied to the Lavalink Server */
     equalizerBands: EQBand[];
     /** Private Util for the instaFix Filters option */
-    filterUpdatedState: number;
+    filterUpdatedState: boolean;
     /** All "Active" / "disabled" Player Filters */
     filters: PlayerFilters;
     /** The Filter Data sent to Lavalink, only if the filter is enabled (ofc.) */

package/dist/cjs/structures/Filters.js

@@ -8,7 +8,7 @@ class FilterManager {
     /** The Equalizer bands currently applied to the Lavalink Server */
     equalizerBands = [];
     /** Private Util for the instaFix Filters option */
-    filterUpdatedState = 0;
+    filterUpdatedState = false;
     /** All "Active" / "disabled" Player Filters */
     filters = {
         volume: false,
@@ -160,6 +160,8 @@ class FilterManager {
                 delete sendData[key];
         }
         const now = performance.now();
+        if (this.player.options.instaUpdateFiltersFix === true)
+            this.filterUpdatedState = true;
         await this.player.node.updatePlayer({
             guildId: this.player.guildId,
             playerOptions: {
@@ -167,8 +169,6 @@ class FilterManager {
             }
         });
         this.player.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
-        if (this.player.options.instaUpdateFiltersFix === true)
-            this.filterUpdatedState = 1;
         return;
     }
     /**
@@ -654,6 +654,8 @@ class FilterManager {
         if (!this.player.node.sessionId)
             throw new Error("The Lavalink-Node is either not ready or not up to date");
         const now = performance.now();
+        if (this.player.options.instaUpdateFiltersFix === true)
+            this.filterUpdatedState = true;
         await this.player.node.updatePlayer({
             guildId: this.player.guildId,
             playerOptions: {
@@ -661,8 +663,6 @@ class FilterManager {
             }
         });
         this.player.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
-        if (this.player.options.instaUpdateFiltersFix === true)
-            this.filterUpdatedState = 1;
         return this;
     }
     /** Clears the equalizer bands. */

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

@@ -6,6 +6,7 @@ import { DestroyReasonsType, Player, PlayerJson, PlayerOptions } from "./Player"
 import { ManagerQueueOptions } from "./Queue";
 import { Track, UnresolvedTrack } from "./Track";
 import { ChannelDeletePacket, GuildShardPayload, ManagerUtils, MiniMap, SearchPlatform, SponsorBlockChaptersLoaded, SponsorBlockChapterStarted, SponsorBlockSegmentSkipped, SponsorBlockSegmentsLoaded, TrackEndEvent, TrackExceptionEvent, TrackStartEvent, TrackStuckEvent, VoicePacket, VoiceServer, VoiceState, WebSocketClosedEvent } from "./Utils";
+/** How the botclient is allowed to be structured */
 export interface BotClientOptions {
     /** Bot Client Id */
     id: string;
@@ -14,6 +15,7 @@ export interface BotClientOptions {
     /** So users can pass entire objects / classes */
     [x: string | number | symbol]: unknown;
 }
+/** Sub Manager Options, for player specific things */
 export interface ManagerPlayerOptions {
     /** If the Lavalink Volume should be decremented by x number */
     volumeDecrementer?: number;
@@ -39,6 +41,7 @@ export interface ManagerPlayerOptions {
     };
     useUnresolvedData?: boolean;
 }
+/** Manager Options used to create the manager */
 export interface ManagerOptions {
     /** The Node Options, for all Nodes! (on init) */
     nodes: LavalinkNodeOptions[];
@@ -64,8 +67,12 @@ export interface ManagerOptions {
     linksAllowed?: boolean;
     /** Advanced Options for the Library, which may or may not be "library breaking" */
     advancedOptions?: {
+        /** Max duration for that the filter fix duration works (in ms) - default is 8mins */
+        maxFilterFixDuration?: number;
         /** 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 +85,7 @@ export interface ManagerOptions {
         };
     };
 }
-interface LavalinkManagerEvents {
+export interface LavalinkManagerEvents {
     /**
      * Emitted when a Track started playing.
      * @event Manager#trackStart
@@ -93,12 +100,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
@@ -237,6 +244,7 @@ export declare class LavalinkManager extends EventEmitter {
      *     linksBlacklist: [],
      *     linksWhitelist: [],
      *     advancedOptions: {
+     *       maxFilterFixDuration: 600_000,
      *       debugOptions: {
      *         noAudio: false,
      *         playerDestroy: {
@@ -307,10 +315,22 @@ export declare class LavalinkManager extends EventEmitter {
      * Delete's a player from the cache without destroying it on lavalink (only works when it's disconnected)
      * @param guildId
      * @returns
+     *
+     * @example
+     * ```ts
+     * client.lavalink.deletePlayer(interaction.guildId);
+     * // shouldn't be used except you know what you are doing.
+     * ```
      */
     deletePlayer(guildId: string): boolean;
     /**
      * Checks wether the the lib is useable based on if any node is connected
+     *
+     * @example
+     * ```ts
+     * if(!client.lavalink.useable) return console.error("can'T search yet, because there is no useable lavalink node.")
+     * // continue with code e.g. createing a player and searching
+     * ```
      */
     get useable(): boolean;
     /**
@@ -318,7 +338,6 @@ export declare class LavalinkManager extends EventEmitter {
      * @param clientData
      *
      * @example
-     *
      * ```ts
      * // on the bot ready event
      * client.on("ready", () => {
@@ -347,4 +366,3 @@ export declare class LavalinkManager extends EventEmitter {
      */
     sendRawData(data: VoicePacket | VoiceServer | VoiceState | ChannelDeletePacket): Promise<void>;
 }
-export {};

package/dist/cjs/structures/LavalinkManager.js

@@ -58,7 +58,9 @@ class LavalinkManager extends events_1.EventEmitter {
                 queueStore: options?.queueOptions?.queueStore ?? new Queue_1.DefaultQueueStore(),
             },
             advancedOptions: {
+                maxFilterFixDuration: options?.advancedOptions?.maxFilterFixDuration ?? 600000,
                 debugOptions: {
+                    logCustomSearches: options?.advancedOptions?.debugOptions?.logCustomSearches ?? false,
                     noAudio: options?.advancedOptions?.debugOptions?.noAudio ?? false,
                     playerDestroy: {
                         dontThrowError: options?.advancedOptions?.debugOptions?.playerDestroy?.dontThrowError ?? false,
@@ -149,6 +151,7 @@ class LavalinkManager extends events_1.EventEmitter {
      *     linksBlacklist: [],
      *     linksWhitelist: [],
      *     advancedOptions: {
+     *       maxFilterFixDuration: 600_000,
      *       debugOptions: {
      *         noAudio: false,
      *         playerDestroy: {
@@ -243,6 +246,12 @@ class LavalinkManager extends events_1.EventEmitter {
      * Delete's a player from the cache without destroying it on lavalink (only works when it's disconnected)
      * @param guildId
      * @returns
+     *
+     * @example
+     * ```ts
+     * client.lavalink.deletePlayer(interaction.guildId);
+     * // shouldn't be used except you know what you are doing.
+     * ```
      */
     deletePlayer(guildId) {
         const oldPlayer = this.getPlayer(guildId);
@@ -259,6 +268,12 @@ class LavalinkManager extends events_1.EventEmitter {
     }
     /**
      * Checks wether the the lib is useable based on if any node is connected
+     *
+     * @example
+     * ```ts
+     * if(!client.lavalink.useable) return console.error("can'T search yet, because there is no useable lavalink node.")
+     * // continue with code e.g. createing a player and searching
+     * ```
      */
     get useable() {
         return this.nodeManager.nodes.filter(v => v.connected).size > 0;
@@ -268,7 +283,6 @@ class LavalinkManager extends events_1.EventEmitter {
      * @param clientData
      *
      * @example
-     *
      * ```ts
      * // on the bot ready event
      * client.on("ready", () => {

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

@@ -1,5 +1,7 @@
 import { ClientCustomSearchPlatformUtils, LavalinkSearchPlatform, SearchPlatform, SourcesRegex } from "./Utils";
+/** Default Sources Record, to allow source parsing with multiple inputs. */
 export declare const DefaultSources: Record<SearchPlatform, LavalinkSearchPlatform | ClientCustomSearchPlatformUtils>;
+/** Lavalink Plugins definiton */
 export declare const LavalinkPlugins: {
     DuncteBot_Plugin: string;
     LavaSrc: string;
@@ -7,4 +9,5 @@ export declare const LavalinkPlugins: {
     LavaSearch: string;
     LavalinkFilterPlugin: string;
 };
+/** Lavalink Sources regexes for url validations */
 export declare const SourceLinksRegexes: Record<SourcesRegex, RegExp>;

package/dist/cjs/structures/LavalinkManagerStatics.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceLinksRegexes = exports.LavalinkPlugins = exports.DefaultSources = void 0;
+/** Default Sources Record, to allow source parsing with multiple inputs. */
 exports.DefaultSources = {
     // youtubemusic
     "youtube music": "ytmsearch",
@@ -50,10 +51,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
@@ -62,6 +67,7 @@ exports.DefaultSources = {
     "link": "link",
     "uri": "uri"
 };
+/** Lavalink Plugins definiton */
 exports.LavalinkPlugins = {
     DuncteBot_Plugin: "DuncteBot-plugin",
     LavaSrc: "lavasrc-plugin",
@@ -69,6 +75,7 @@ exports.LavalinkPlugins = {
     LavaSearch: "lavasearch-plugin",
     LavalinkFilterPlugin: "lavalink-filter-plugin"
 };
+/** Lavalink Sources regexes for url validations */
 exports.SourceLinksRegexes = {
     /** DEFAULT SUPPORTED BY LAVALINK */
     YoutubeRegex: /https?:\/\/?(?:www\.)?(?:(m|www)\.)?(?:youtu\.be\/|youtube\.com\/(?:embed\/|v\/|shorts|playlist\?|watch\?v=|watch\?.+(?:&|&);v=))([a-zA-Z0-9\-_]{11})?(?:(?:\?|&|&)index=((?:\d){1,3}))?(?:(?:\?|&|&)?list=([a-zA-Z\-_0-9]{34}))?(?:\S+)?/,