lavalink-client 1.1.24 → 1.1.25

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

@@ -64,7 +64,7 @@ export interface ManagerOptions {
         playerDestroy?: {
             /** To show the debug reason at all times. */
             debugLog?: boolean;
-            /** If you get 'Error: Use Player#destroy(true) not PlayerManager#deletePlayer() to stop the Player' put it on true */
+            /** If you get 'Error: Use Player#destroy("reason") not LavalinkManager#deletePlayer() to stop the Player' put it on true */
             dontThrowError?: boolean;
         };
     };
@@ -102,7 +102,7 @@ interface LavalinkManagerEvents {
     "playerCreate": (player: Player) => void;
     /**
      * Emitted when a Player is moved within the channel.
-     * @event Manager.playerManager#move
+     * @event Manager#playerMove
      */
     "playerMove": (player: Player, oldVoiceChannelId: string, newVoiceChannelId: string) => void;
     /**
@@ -141,7 +141,8 @@ export declare class LavalinkManager extends EventEmitter {
     constructor(options: ManagerOptions);
     createPlayer(options: PlayerOptions): Player;
     getPlayer(guildId: string): Player;
-    deletePlayer(guildId: string, throwError?: boolean): boolean;
+    destroyPlayer(guildId: string, destroyReason?: string): Promise<Player>;
+    deletePlayer(guildId: string): boolean;
     get useable(): boolean;
     /**
      * Initiates the Manager.

package/dist/cjs/structures/LavalinkManager.js

@@ -101,15 +101,22 @@ class LavalinkManager extends events_1.EventEmitter {
     getPlayer(guildId) {
         return this.players.get(guildId);
     }
-    deletePlayer(guildId, throwError = true) {
+    destroyPlayer(guildId, destroyReason) {
         const oldPlayer = this.getPlayer(guildId);
         if (!oldPlayer)
             return;
-        if (oldPlayer.voiceChannelId === "string" && oldPlayer.connected) {
-            if (throwError)
-                throw new Error(`Use Player#destroy(true) not PlayerManager#deletePlayer() to stop the Player ${JSON.stringify(oldPlayer.toJSON?.())}`);
+        return oldPlayer.destroy(destroyReason);
+    }
+    deletePlayer(guildId) {
+        const oldPlayer = this.getPlayer(guildId);
+        if (!oldPlayer)
+            return;
+        // oldPlayer.connected is operational. you could also do oldPlayer.voice?.token 
+        if (oldPlayer.voiceChannelId === "string" && oldPlayer.connected && !oldPlayer.get("internal_destroywithoutdisconnect")) {
+            if (!this.options?.debugOptions?.playerDestroy?.dontThrowError)
+                throw new Error(`Use Player#destroy() not LavalinkManager#deletePlayer() to stop the Player ${JSON.stringify(oldPlayer.toJSON?.())}`);
             else
-                console.error("Use Player#destroy(true) not PlayerManager#deletePlayer() to stop the Player", oldPlayer.toJSON?.());
+                console.error("Use Player#destroy() not LavalinkManager#deletePlayer() to stop the Player", oldPlayer.toJSON?.());
         }
         return this.players.delete(guildId);
     }

package/dist/cjs/structures/Node.js

@@ -87,7 +87,7 @@ class LavalinkNode {
         modify?.(options);
         const url = new URL(`${this.poolAddress}${options.path}`);
         url.searchParams.append("trace", "true");
-        options.path = url.toString().replace(this.poolAddress, "");
+        options.path = url.pathname + url.search;
         const request = await this.rest.request(options);
         this.calls++;
         if (options.method === "DELETE")
@@ -171,7 +171,7 @@ class LavalinkNode {
             if (data.noReplace) {
                 const url = new URL(`${this.poolAddress}${r.path}`);
                 url.searchParams.append("noReplace", data.noReplace?.toString() || "false");
-                r.path = url.toString().replace(this.poolAddress, "");
+                r.path = url.pathname + url.search;
             }
         });
         return this.syncPlayerData({}, res), res;

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

@@ -192,7 +192,7 @@ export declare class Player {
     /**
      * Destroy the player and disconnect from the voice channel
      */
-    destroy(reason?: string): Promise<this>;
+    destroy(reason?: string, disconnect?: boolean): Promise<this>;
     /**
      * Move the player on a different Audio-Node
      * @param newNode New Node / New Node Id

package/dist/cjs/structures/Player.js

@@ -345,7 +345,7 @@ class Player {
     /**
      * Destroy the player and disconnect from the voice channel
      */
-    async destroy(reason) {
+    async destroy(reason, disconnect = true) {
         if (this.LavalinkManager.options.debugOptions.playerDestroy.debugLog)
             console.log(`Lavalink-Client-Debug | PlayerDestroy [::] destroy Function, [guildId ${this.guildId}] - Destroy-Reason: ${String(reason)}`);
         if (this.get("internal_destroystatus") === true) {
@@ -355,11 +355,14 @@ class Player {
         }
         this.set("internal_destroystatus", true);
         // disconnect player and set VoiceChannel to Null
-        await this.disconnect(true);
+        if (disconnect)
+            await this.disconnect(true);
+        else
+            this.set("internal_destroywithoutdisconnect", true);
         // Destroy the queue
         await this.queue.utils.destroy();
         // delete the player from cache
-        this.LavalinkManager.deletePlayer(this.guildId, !this.LavalinkManager.options.debugOptions.playerDestroy.dontThrowError);
+        this.LavalinkManager.deletePlayer(this.guildId);
         // destroy the player on lavalink side
         await this.node.destroyPlayer(this.guildId);
         if (this.LavalinkManager.options.debugOptions.playerDestroy.debugLog)

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

@@ -64,7 +64,7 @@ export interface ManagerOptions {
         playerDestroy?: {
             /** To show the debug reason at all times. */
             debugLog?: boolean;
-            /** If you get 'Error: Use Player#destroy(true) not PlayerManager#deletePlayer() to stop the Player' put it on true */
+            /** If you get 'Error: Use Player#destroy("reason") not LavalinkManager#deletePlayer() to stop the Player' put it on true */
             dontThrowError?: boolean;
         };
     };
@@ -102,7 +102,7 @@ interface LavalinkManagerEvents {
     "playerCreate": (player: Player) => void;
     /**
      * Emitted when a Player is moved within the channel.
-     * @event Manager.playerManager#move
+     * @event Manager#playerMove
      */
     "playerMove": (player: Player, oldVoiceChannelId: string, newVoiceChannelId: string) => void;
     /**
@@ -141,7 +141,8 @@ export declare class LavalinkManager extends EventEmitter {
     constructor(options: ManagerOptions);
     createPlayer(options: PlayerOptions): Player;
     getPlayer(guildId: string): Player;
-    deletePlayer(guildId: string, throwError?: boolean): boolean;
+    destroyPlayer(guildId: string, destroyReason?: string): Promise<Player>;
+    deletePlayer(guildId: string): boolean;
     get useable(): boolean;
     /**
      * Initiates the Manager.

package/dist/esm/structures/LavalinkManager.js

@@ -98,15 +98,22 @@ export class LavalinkManager extends EventEmitter {
     getPlayer(guildId) {
         return this.players.get(guildId);
     }
-    deletePlayer(guildId, throwError = true) {
+    destroyPlayer(guildId, destroyReason) {
         const oldPlayer = this.getPlayer(guildId);
         if (!oldPlayer)
             return;
-        if (oldPlayer.voiceChannelId === "string" && oldPlayer.connected) {
-            if (throwError)
-                throw new Error(`Use Player#destroy(true) not PlayerManager#deletePlayer() to stop the Player ${JSON.stringify(oldPlayer.toJSON?.())}`);
+        return oldPlayer.destroy(destroyReason);
+    }
+    deletePlayer(guildId) {
+        const oldPlayer = this.getPlayer(guildId);
+        if (!oldPlayer)
+            return;
+        // oldPlayer.connected is operational. you could also do oldPlayer.voice?.token 
+        if (oldPlayer.voiceChannelId === "string" && oldPlayer.connected && !oldPlayer.get("internal_destroywithoutdisconnect")) {
+            if (!this.options?.debugOptions?.playerDestroy?.dontThrowError)
+                throw new Error(`Use Player#destroy() not LavalinkManager#deletePlayer() to stop the Player ${JSON.stringify(oldPlayer.toJSON?.())}`);
             else
-                console.error("Use Player#destroy(true) not PlayerManager#deletePlayer() to stop the Player", oldPlayer.toJSON?.());
+                console.error("Use Player#destroy() not LavalinkManager#deletePlayer() to stop the Player", oldPlayer.toJSON?.());
         }
         return this.players.delete(guildId);
     }

package/dist/esm/structures/Node.js

@@ -83,7 +83,7 @@ export class LavalinkNode {
         modify?.(options);
         const url = new URL(`${this.poolAddress}${options.path}`);
         url.searchParams.append("trace", "true");
-        options.path = url.toString().replace(this.poolAddress, "");
+        options.path = url.pathname + url.search;
         const request = await this.rest.request(options);
         this.calls++;
         if (options.method === "DELETE")
@@ -167,7 +167,7 @@ export class LavalinkNode {
             if (data.noReplace) {
                 const url = new URL(`${this.poolAddress}${r.path}`);
                 url.searchParams.append("noReplace", data.noReplace?.toString() || "false");
-                r.path = url.toString().replace(this.poolAddress, "");
+                r.path = url.pathname + url.search;
             }
         });
         return this.syncPlayerData({}, res), res;

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

@@ -192,7 +192,7 @@ export declare class Player {
     /**
      * Destroy the player and disconnect from the voice channel
      */
-    destroy(reason?: string): Promise<this>;
+    destroy(reason?: string, disconnect?: boolean): Promise<this>;
     /**
      * Move the player on a different Audio-Node
      * @param newNode New Node / New Node Id

package/dist/esm/structures/Player.js

@@ -342,7 +342,7 @@ export class Player {
     /**
      * Destroy the player and disconnect from the voice channel
      */
-    async destroy(reason) {
+    async destroy(reason, disconnect = true) {
         if (this.LavalinkManager.options.debugOptions.playerDestroy.debugLog)
             console.log(`Lavalink-Client-Debug | PlayerDestroy [::] destroy Function, [guildId ${this.guildId}] - Destroy-Reason: ${String(reason)}`);
         if (this.get("internal_destroystatus") === true) {
@@ -352,11 +352,14 @@ export class Player {
         }
         this.set("internal_destroystatus", true);
         // disconnect player and set VoiceChannel to Null
-        await this.disconnect(true);
+        if (disconnect)
+            await this.disconnect(true);
+        else
+            this.set("internal_destroywithoutdisconnect", true);
         // Destroy the queue
         await this.queue.utils.destroy();
         // delete the player from cache
-        this.LavalinkManager.deletePlayer(this.guildId, !this.LavalinkManager.options.debugOptions.playerDestroy.dontThrowError);
+        this.LavalinkManager.deletePlayer(this.guildId);
         // destroy the player on lavalink side
         await this.node.destroyPlayer(this.guildId);
         if (this.LavalinkManager.options.debugOptions.playerDestroy.debugLog)

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

@@ -64,7 +64,7 @@ export interface ManagerOptions {
         playerDestroy?: {
             /** To show the debug reason at all times. */
             debugLog?: boolean;
-            /** If you get 'Error: Use Player#destroy(true) not PlayerManager#deletePlayer() to stop the Player' put it on true */
+            /** If you get 'Error: Use Player#destroy("reason") not LavalinkManager#deletePlayer() to stop the Player' put it on true */
             dontThrowError?: boolean;
         };
     };
@@ -102,7 +102,7 @@ interface LavalinkManagerEvents {
     "playerCreate": (player: Player) => void;
     /**
      * Emitted when a Player is moved within the channel.
-     * @event Manager.playerManager#move
+     * @event Manager#playerMove
      */
     "playerMove": (player: Player, oldVoiceChannelId: string, newVoiceChannelId: string) => void;
     /**
@@ -141,7 +141,8 @@ export declare class LavalinkManager extends EventEmitter {
     constructor(options: ManagerOptions);
     createPlayer(options: PlayerOptions): Player;
     getPlayer(guildId: string): Player;
-    deletePlayer(guildId: string, throwError?: boolean): boolean;
+    destroyPlayer(guildId: string, destroyReason?: string): Promise<Player>;
+    deletePlayer(guildId: string): boolean;
     get useable(): boolean;
     /**
      * Initiates the Manager.

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

@@ -192,7 +192,7 @@ export declare class Player {
     /**
      * Destroy the player and disconnect from the voice channel
      */
-    destroy(reason?: string): Promise<this>;
+    destroy(reason?: string, disconnect?: boolean): Promise<this>;
     /**
      * Move the player on a different Audio-Node
      * @param newNode New Node / New Node Id

package/package.json

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