lavalink-client 2.9.4 → 2.9.6

package/dist/index.d.cts

@@ -952,6 +952,8 @@ interface VoiceServer {
     guild_id: string;
     /** Server Endpoint */
     endpoint: string;
+    /** Voice Channel Id (Lavalink v4 DAVE support) */
+    channel_id?: string;
 }
 interface VoicePacket {
     /** Voice Packet Keys to send */
@@ -4096,6 +4098,11 @@ declare class LavalinkManager<CustomPlayerT extends Player = Player> extends Eve
      * @param eventData event data
      */
     private _emitDebugEvent;
+    private static readonly _noAudioDebugPrefix;
+    /**
+     * Emits NoAudioDebug and optionally logs to console when debugOptions.noAudio is enabled.
+     */
+    private _debugNoAudio;
     /**
      * Create the Lavalink Manager
      * @param options

package/dist/index.d.ts

@@ -952,6 +952,8 @@ interface VoiceServer {
     guild_id: string;
     /** Server Endpoint */
     endpoint: string;
+    /** Voice Channel Id (Lavalink v4 DAVE support) */
+    channel_id?: string;
 }
 interface VoicePacket {
     /** Voice Packet Keys to send */
@@ -4096,6 +4098,11 @@ declare class LavalinkManager<CustomPlayerT extends Player = Player> extends Eve
      * @param eventData event data
      */
     private _emitDebugEvent;
+    private static readonly _noAudioDebugPrefix;
+    /**
+     * Emits NoAudioDebug and optionally logs to console when debugOptions.noAudio is enabled.
+     */
+    private _debugNoAudio;
     /**
      * Create the Lavalink Manager
      * @param options

package/dist/index.js

@@ -1,69 +1,5 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var index_exports = {};
-__export(index_exports, {
-  DebugEvents: () => DebugEvents,
-  DefaultQueueStore: () => DefaultQueueStore,
-  DefaultSources: () => DefaultSources,
-  DestroyReasons: () => DestroyReasons,
-  DisconnectReasons: () => DisconnectReasons,
-  EQList: () => EQList,
-  FilterManager: () => FilterManager,
-  LavalinkManager: () => LavalinkManager,
-  LavalinkNode: () => LavalinkNode,
-  LavalinkPlugins: () => LavalinkPlugins,
-  ManagerUtils: () => ManagerUtils,
-  MiniMap: () => MiniMap,
-  NodeLinkExclusiveEvents: () => NodeLinkExclusiveEvents,
-  NodeLinkNode: () => NodeLinkNode,
-  NodeManager: () => NodeManager,
-  NodeSymbol: () => NodeSymbol,
-  Player: () => Player,
-  Queue: () => Queue,
-  QueueSaver: () => QueueSaver,
-  QueueSymbol: () => QueueSymbol,
-  RecommendationsStrings: () => RecommendationsStrings,
-  ReconnectionState: () => ReconnectionState,
-  SourceLinksRegexes: () => SourceLinksRegexes,
-  TrackSymbol: () => TrackSymbol,
-  UnresolvedTrackSymbol: () => UnresolvedTrackSymbol,
-  audioOutputsData: () => audioOutputsData,
-  parseLavalinkConnUrl: () => parseLavalinkConnUrl,
-  queueTrackEnd: () => queueTrackEnd,
-  safeStringify: () => safeStringify,
-  validSponsorBlocks: () => validSponsorBlocks
-});
-module.exports = __toCommonJS(index_exports);
-
 // src/structures/LavalinkManager.ts
-var import_node_events2 = require("events");
+import { EventEmitter as EventEmitter2 } from "events";
 
 // src/structures/Constants.ts
 var DebugEvents = /* @__PURE__ */ ((DebugEvents2) => {
@@ -404,11 +340,11 @@ var NodeLinkExclusiveEvents = [
 ];
 
 // src/structures/NodeManager.ts
-var import_node_events = require("events");
+import { EventEmitter } from "events";
 
 // src/structures/Node.ts
-var import_node_path = require("path");
-var import_ws = __toESM(require("ws"), 1);
+import { isAbsolute } from "path";
+import WebSocket from "ws";
 
 // src/structures/Types/Node.ts
 var ReconnectionState = /* @__PURE__ */ ((ReconnectionState2) => {
@@ -420,8 +356,8 @@ var ReconnectionState = /* @__PURE__ */ ((ReconnectionState2) => {
 })(ReconnectionState || {});
 
 // src/structures/Utils.ts
-var import_node_url = require("url");
-var import_types = require("util/types");
+import { URL as URL2 } from "url";
+import { isRegExp } from "util/types";
 
 // src/structures/LavalinkManagerStatics.ts
 var DefaultSources = {
@@ -591,7 +527,7 @@ var escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 function parseLavalinkConnUrl(connectionUrl) {
   if (!connectionUrl.startsWith("lavalink://"))
     throw new Error(`ConnectionUrl (${connectionUrl}) must start with 'lavalink://'`);
-  const parsed = new import_node_url.URL(connectionUrl);
+  const parsed = new URL2(connectionUrl);
   return {
     authorization: parsed.password,
     id: parsed.username,
@@ -856,7 +792,7 @@ var ManagerUtils = class {
         });
       }
       if (this.LavalinkManager.options?.linksBlacklist.some(
-        (v) => typeof v === "string" && queryString.toLowerCase().includes(v.toLowerCase()) || (0, import_types.isRegExp)(v) && v.test(queryString)
+        (v) => typeof v === "string" && queryString.toLowerCase().includes(v.toLowerCase()) || isRegExp(v) && v.test(queryString)
       )) {
         throw new Error(`Query string contains a link / word which is blacklisted.`);
       }
@@ -873,7 +809,7 @@ var ManagerUtils = class {
         });
       }
       if (!this.LavalinkManager.options?.linksWhitelist.some(
-        (v) => typeof v === "string" && queryString.toLowerCase().includes(v.toLowerCase()) || (0, import_types.isRegExp)(v) && v.test(queryString)
+        (v) => typeof v === "string" && queryString.toLowerCase().includes(v.toLowerCase()) || isRegExp(v) && v.test(queryString)
       )) {
         throw new Error(`Query string contains a link / word which isn't whitelisted.`);
       }
@@ -1349,7 +1285,7 @@ var LavalinkNode = class _LavalinkNode {
    * ```
    */
   get connected() {
-    return this.socket && this.socket.readyState === import_ws.default.OPEN;
+    return this.socket && this.socket.readyState === WebSocket.OPEN;
   }
   /**
    * Returns the current ConnectionStatus
@@ -1669,7 +1605,7 @@ var LavalinkNode = class _LavalinkNode {
       headers["Session-Id"] = this.options.sessionId || sessionId;
       this.sessionId = this.options.sessionId || sessionId;
     }
-    this.socket = new import_ws.default(
+    this.socket = new WebSocket(
       `ws${this.options.secure ? "s" : ""}://${this.options.host}:${this.options.port}/v4/websocket`,
       { headers }
     );
@@ -2623,7 +2559,7 @@ var LavalinkNode = class _LavalinkNode {
           player.connected = payload.state.connected;
           player.ping.ws = payload.state.ping >= 0 ? payload.state.ping : player.ping.ws <= 0 && player.connected ? null : player.ping.ws || 0;
           if (!player.createdTimeStamp && payload.state.time) player.createdTimeStamp = payload.state.time;
-          if (player.filterManager.filterUpdatedState === true && ((player.queue.current?.info?.duration || 0) <= (player.LavalinkManager.options.advancedOptions.maxFilterFixDuration || 6e5) || player.queue.current?.info?.uri && (0, import_node_path.isAbsolute)(player.queue.current?.info?.uri))) {
+          if (player.filterManager.filterUpdatedState === true && ((player.queue.current?.info?.duration || 0) <= (player.LavalinkManager.options.advancedOptions.maxFilterFixDuration || 6e5) || player.queue.current?.info?.uri && isAbsolute(player.queue.current?.info?.uri))) {
             player.filterManager.filterUpdatedState = false;
             this._emitDebugEvent("PlayerUpdateFilterFixApply" /* PlayerUpdateFilterFixApply */, {
               state: "log",
@@ -3428,7 +3364,7 @@ var NodeLinkNode = class extends LavalinkNode {
 LavalinkNode._NodeLinkClass = NodeLinkNode;
 
 // src/structures/NodeManager.ts
-var NodeManager = class extends import_node_events.EventEmitter {
+var NodeManager = class extends EventEmitter {
   /**
    * Emit an event
    * @param event The event to emit
@@ -6110,7 +6046,7 @@ var Player = class {
 };
 
 // src/structures/LavalinkManager.ts
-var LavalinkManager = class extends import_node_events2.EventEmitter {
+var LavalinkManager = class _LavalinkManager extends EventEmitter2 {
   /**
    * Emit an event
    * @param event The event to emit
@@ -6279,6 +6215,17 @@ var LavalinkManager = class extends import_node_events2.EventEmitter {
     if (!this.options?.advancedOptions?.enableDebugEvents) return;
     this.emit("debug", name, eventData);
   }
+  static _noAudioDebugPrefix = "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, ";
+  /**
+   * Emits NoAudioDebug and optionally logs to console when debugOptions.noAudio is enabled.
+   */
+  _debugNoAudio(state, functionLayer, messages, ...consoleArgs) {
+    this._emitDebugEvent("NoAudioDebug" /* NoAudioDebug */, { state, functionLayer, message: messages.message });
+    if (this.options?.advancedOptions?.debugOptions?.noAudio === true) {
+      const consoleMsg = messages.consoleMessage ?? messages.message;
+      console.debug(_LavalinkManager._noAudioDebugPrefix + consoleMsg, ...consoleArgs);
+    }
+  }
   /**
    * Create the Lavalink Manager
    * @param options
@@ -6510,28 +6457,22 @@ var LavalinkManager = class extends import_node_events2.EventEmitter {
    */
   async sendRawData(data) {
     if (!this.initiated) {
-      this._emitDebugEvent("NoAudioDebug" /* NoAudioDebug */, {
-        state: "log",
+      this._debugNoAudio("log", "LavalinkManager > sendRawData()", {
         message: "Manager is not initated yet",
-        functionLayer: "LavalinkManager > sendRawData()"
+        consoleMessage: "manager is not initated yet"
       });
-      if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-        console.debug(
-          "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, manager is not initated yet"
-        );
       return;
     }
     if (!("t" in data)) {
-      this._emitDebugEvent("NoAudioDebug" /* NoAudioDebug */, {
-        state: "error",
-        message: "No 't' in payload-data of the raw event:",
-        functionLayer: "LavalinkManager > sendRawData()"
-      });
-      if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-        console.debug(
-          "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, no 't' in payload-data of the raw event:",
-          data
-        );
+      this._debugNoAudio(
+        "error",
+        "LavalinkManager > sendRawData()",
+        {
+          message: "No 't' in payload-data of the raw event:",
+          consoleMessage: "no 't' in payload-data of the raw event:"
+        },
+        data
+      );
       return;
     }
     if ("CHANNEL_DELETE" === data.t) {
@@ -6544,132 +6485,94 @@ var LavalinkManager = class extends import_node_events2.EventEmitter {
     if (["VOICE_STATE_UPDATE", "VOICE_SERVER_UPDATE"].includes(data.t)) {
       const update = "d" in data ? data.d : data;
       if (!update) {
-        this._emitDebugEvent("NoAudioDebug" /* NoAudioDebug */, {
-          state: "warn",
-          message: `No Update data found in payload :: ${safeStringify(data, 2)}`,
-          functionLayer: "LavalinkManager > sendRawData()"
-        });
-        if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-          console.debug(
-            "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, no update data found in payload:",
-            data
-          );
+        this._debugNoAudio(
+          "warn",
+          "LavalinkManager > sendRawData()",
+          {
+            message: `No Update data found in payload :: ${safeStringify(data, 2)}`,
+            consoleMessage: "no update data found in payload:"
+          },
+          data
+        );
         return;
       }
       if (!("token" in update) && !("session_id" in update)) {
-        this._emitDebugEvent("NoAudioDebug" /* NoAudioDebug */, {
-          state: "error",
-          message: `No 'token' nor 'session_id' found in payload :: ${safeStringify(data, 2)}`,
-          functionLayer: "LavalinkManager > sendRawData()"
-        });
-        if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-          console.debug(
-            "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, no 'token' nor 'session_id' found in payload:",
-            data
-          );
+        this._debugNoAudio(
+          "error",
+          "LavalinkManager > sendRawData()",
+          {
+            message: `No 'token' nor 'session_id' found in payload :: ${safeStringify(data, 2)}`,
+            consoleMessage: "no 'token' nor 'session_id' found in payload:"
+          },
+          data
+        );
         return;
       }
       const player = this.getPlayer(update.guild_id);
       if (!player) {
-        this._emitDebugEvent("NoAudioDebug" /* NoAudioDebug */, {
-          state: "warn",
-          message: `No Lavalink Player found via key: 'guild_id' of update-data :: ${safeStringify(update, 2)}`,
-          functionLayer: "LavalinkManager > sendRawData()"
-        });
-        if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-          console.debug(
-            "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, No Lavalink Player found via key: 'guild_id' of update-data:",
-            update
-          );
+        this._debugNoAudio(
+          "warn",
+          "LavalinkManager > sendRawData()",
+          {
+            message: `No Lavalink Player found via key: 'guild_id' of update-data :: ${safeStringify(update, 2)}`,
+            consoleMessage: "No Lavalink Player found via key: 'guild_id' of update-data:"
+          },
+          update
+        );
         return;
       }
       if (player.get("internal_destroystatus") === true) {
-        this._emitDebugEvent("NoAudioDebug" /* NoAudioDebug */, {
-          state: "warn",
-          message: `Player is in a destroying state. can't signal the voice states`,
-          functionLayer: "LavalinkManager > sendRawData()"
+        this._debugNoAudio("warn", "LavalinkManager > sendRawData()", {
+          message: "Player is in a destroying state. can't signal the voice states"
         });
-        if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-          console.debug(
-            "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Player is in a destroying state. can't signal the voice states"
-          );
         return;
       }
       if ("token" in update) {
         if (!player.node?.sessionId) throw new Error("Lavalink Node is either not ready or not up to date");
         const sessionId2Use = player.voice?.sessionId || ("sessionId" in update ? update.sessionId : void 0);
         const channelId2Use = player.voice?.channelId || ("channel_id" in update ? update.channel_id : void 0);
+        const voiceData = {
+          token: update.token,
+          endpoint: update.endpoint,
+          sessionId: sessionId2Use,
+          channelId: channelId2Use
+        };
         if (!sessionId2Use) {
-          this.emit("debug", "NoAudioDebug" /* NoAudioDebug */, {
-            state: "error",
-            message: `Can't send updatePlayer for voice token session - Missing sessionId :: ${safeStringify({ voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, channelId: channelId2Use }, update, playerVoice: player.voice }, 2)}`,
-            functionLayer: "LavalinkManager > sendRawData()"
-          });
-          if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-            console.debug(
-              "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Can't send updatePlayer for voice token session - Missing sessionId",
-              {
-                voice: {
-                  token: update.token,
-                  endpoint: update.endpoint,
-                  sessionId: sessionId2Use,
-                  channelId: channelId2Use
-                },
-                update,
-                playerVoice: player.voice
-              }
-            );
+          this._debugNoAudio(
+            "error",
+            "LavalinkManager > sendRawData()",
+            {
+              message: `Can't send updatePlayer for voice token session - Missing sessionId :: ${safeStringify({ voice: voiceData, update, playerVoice: player.voice }, 2)}`,
+              consoleMessage: "Can't send updatePlayer for voice token session - Missing sessionId"
+            },
+            { voice: voiceData, update, playerVoice: player.voice }
+          );
         } else if (!channelId2Use) {
-          this.emit("debug", "NoAudioDebug" /* NoAudioDebug */, {
-            state: "error",
-            message: `Can't send updatePlayer for voice token session - Missing channelId :: ${safeStringify({ voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, channelId: channelId2Use }, update, playerVoice: player.voice }, 2)}`,
-            functionLayer: "LavalinkManager > sendRawData()"
-          });
-          if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-            console.debug(
-              "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Can't send updatePlayer for voice token session - Missing channelId",
-              {
-                voice: {
-                  token: update.token,
-                  endpoint: update.endpoint,
-                  sessionId: sessionId2Use,
-                  channelId: channelId2Use
-                },
-                update,
-                playerVoice: player.voice
-              }
-            );
+          this._debugNoAudio(
+            "error",
+            "LavalinkManager > sendRawData()",
+            {
+              message: `Can't send updatePlayer for voice token session - Missing channelId :: ${safeStringify({ voice: voiceData, update, playerVoice: player.voice }, 2)}`,
+              consoleMessage: "Can't send updatePlayer for voice token session - Missing channelId"
+            },
+            { voice: voiceData, update, playerVoice: player.voice }
+          );
         } else {
           await player.node.updatePlayer({
             guildId: player.guildId,
             playerOptions: {
-              voice: {
-                token: update.token,
-                endpoint: update.endpoint,
-                sessionId: sessionId2Use,
-                channelId: channelId2Use
-              }
+              voice: voiceData
             }
           });
-          this._emitDebugEvent("NoAudioDebug" /* NoAudioDebug */, {
-            state: "log",
-            message: `Sent updatePlayer for voice token session :: ${safeStringify({ voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, channelId: channelId2Use }, update, playerVoice: player.voice }, 2)}`,
-            functionLayer: "LavalinkManager > sendRawData()"
-          });
-          if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-            console.debug(
-              "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Sent updatePlayer for voice token session",
-              {
-                voice: {
-                  token: update.token,
-                  endpoint: update.endpoint,
-                  sessionId: sessionId2Use,
-                  channelId: channelId2Use
-                },
-                playerVoice: player.voice,
-                update
-              }
-            );
+          this._debugNoAudio(
+            "log",
+            "LavalinkManager > sendRawData()",
+            {
+              message: `Sent updatePlayer for voice token session :: ${safeStringify({ voice: voiceData, update, playerVoice: player.voice }, 2)}`,
+              consoleMessage: "Sent updatePlayer for voice token session"
+            },
+            { voice: voiceData, playerVoice: player.voice, update }
+          );
         }
         return;
       }
@@ -6681,36 +6584,30 @@ var LavalinkManager = class extends import_node_events2.EventEmitter {
             update.user_id
           );
         }
-        this._emitDebugEvent("NoAudioDebug" /* NoAudioDebug */, {
-          state: "warn",
-          message: `voice update user is not equal to provided client id of the LavalinkManager.options.client.id :: user: "${update.user_id}" manager client id: "${this.options?.client.id}"`,
-          functionLayer: "LavalinkManager > sendRawData()"
-        });
-        if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-          console.debug(
-            "Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, voice update user is not equal to provided client id of the manageroptions#client#id",
-            "user:",
-            update.user_id,
-            "manager client id:",
-            this.options?.client.id
-          );
+        this._debugNoAudio(
+          "warn",
+          "LavalinkManager > sendRawData()",
+          {
+            message: `voice update user is not equal to provided client id of the LavalinkManager.options.client.id :: user: "${update.user_id}" manager client id: "${this.options?.client.id}"`,
+            consoleMessage: "voice update user is not equal to provided client id of the manageroptions#client#id"
+          },
+          "user:",
+          update.user_id,
+          "manager client id:",
+          this.options?.client.id
+        );
         return;
       }
       if (update.channel_id) {
         if (player.voiceChannelId !== update.channel_id)
           this.emit("playerMove", player, player.voiceChannelId, update.channel_id);
         player.voice.sessionId = update.session_id || player.voice.sessionId;
-        player.voice.channelId = update.channel_id;
+        player.voice.channelId = update.channel_id || player.voice.channelId;
         if (!player.voice.sessionId) {
-          this._emitDebugEvent("NoAudioDebug" /* NoAudioDebug */, {
-            state: "warn",
+          this._debugNoAudio("warn", "LavalinkManager > sendRawData()", {
             message: `Function to assing sessionId provided, but no found in Payload: ${safeStringify({ update, playerVoice: player.voice }, 2)}`,
-            functionLayer: "LavalinkManager > sendRawData()"
+            consoleMessage: `Function to assing sessionId provided, but no found in Payload: ${safeStringify(update, 2)}`
           });
-          if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-            console.debug(
-              `Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Function to assing sessionId provided, but no found in Payload: ${safeStringify(update, 2)}`
-            );
         }
         player.voiceChannelId = update.channel_id;
         player.options.voiceChannelId = update.channel_id;
@@ -6776,8 +6673,7 @@ var LavalinkManager = class extends import_node_events2.EventEmitter {
     }
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   DebugEvents,
   DefaultQueueStore,
   DefaultSources,
@@ -6808,4 +6704,4 @@ var LavalinkManager = class extends import_node_events2.EventEmitter {
   queueTrackEnd,
   safeStringify,
   validSponsorBlocks
-});
+};