discord-player 6.0.0-dev.5 → 6.0.0

package/dist/index.js

@@ -68,11 +68,13 @@ __export(src_exports, {
   GuildNodeManager: () => GuildNodeManager,
   GuildQueue: () => GuildQueue,
   GuildQueueAudioFilters: () => GuildQueueAudioFilters,
+  GuildQueueEvent: () => GuildQueueEvent,
   GuildQueueHistory: () => GuildQueueHistory,
   GuildQueuePlayerNode: () => GuildQueuePlayerNode,
   PCMAudioFilters: () => import_equalizer3.AudioFilters,
   Player: () => Player,
   PlayerError: () => PlayerError,
+  PlayerEvent: () => PlayerEvent,
   PlayerEventsEmitter: () => PlayerEventsEmitter,
   Playlist: () => Playlist,
   Q_BUTTERWORTH: () => import_equalizer3.Q_BUTTERWORTH,
@@ -89,9 +91,10 @@ __export(src_exports, {
   VolumeTransformer: () => import_equalizer3.VolumeTransformer,
   createFFmpegStream: () => createFFmpegStream,
   useHistory: () => useHistory,
+  useMasterPlayer: () => useMasterPlayer,
   usePlayer: () => usePlayer,
   useQueue: () => useQueue,
-  version: () => version
+  version: () => version2
 });
 module.exports = __toCommonJS(src_exports);
 var import_discord4 = require("discord.js");
@@ -175,6 +178,9 @@ var Util = class {
       detail
     });
   }
+  static randomChoice(src) {
+    return src[Math.floor(Math.random() * src.length)];
+  }
 };
 __name(Util, "Util");
 
@@ -317,7 +323,15 @@ BaseExtractor.identifier = "com.discord-player.extractor";
 
 // src/extractors/ExtractorExecutionContext.ts
 var import_utils2 = require("@discord-player/utils");
-var knownExtractorKeys = ["YouTubeExtractor", "SoundCloudExtractor", "ReverbnationExtractor", "VimeoExtractor", "AttachmentExtractor"];
+var knownExtractorKeys = [
+  "SoundCloudExtractor",
+  "AppleMusicExtractor",
+  "SpotifyExtractor",
+  "VimeoExtractor",
+  "YouTubeExtractor",
+  "ReverbnationExtractor",
+  "AttachmentExtractor"
+];
 var knownExtractorLib = "@discord-player/extractor";
 var ExtractorExecutionContext = class {
   constructor(player) {
@@ -603,8 +617,15 @@ var QueryType = {
   APPLE_MUSIC_SONG: "appleMusicSong",
   APPLE_MUSIC_ALBUM: "appleMusicAlbum",
   APPLE_MUSIC_PLAYLIST: "appleMusicPlaylist",
+  APPLE_MUSIC_SEARCH: "appleMusicSearch",
   FILE: "file"
 };
+var PlayerEvent = /* @__PURE__ */ ((PlayerEvent2) => {
+  PlayerEvent2["debug"] = "debug";
+  PlayerEvent2["error"] = "error";
+  PlayerEvent2["voiceStateUpdate"] = "voiceStateUpdate";
+  return PlayerEvent2;
+})(PlayerEvent || {});
 var QueueRepeatMode = /* @__PURE__ */ ((QueueRepeatMode2) => {
   QueueRepeatMode2[QueueRepeatMode2["OFF"] = 0] = "OFF";
   QueueRepeatMode2[QueueRepeatMode2["TRACK"] = 1] = "TRACK";
@@ -641,10 +662,10 @@ var QueryResolver = class {
     };
   }
   static resolve(query) {
-    query = query.trim();
-    if (soundcloud.validateURL(query, "track"))
+    query = !query.includes("youtube.com") ? query.trim() : query.replace(/(m(usic)?|gaming)\./, "").trim();
+    if ((soundcloud.validateURL || soundcloud.default.validateURL)(query, "track"))
       return QueryType.SOUNDCLOUD_TRACK;
-    if (soundcloud.validateURL(query, "playlist") || query.includes("/sets/"))
+    if ((soundcloud.validateURL || soundcloud.default.validateURL)(query, "playlist") || query.includes("/sets/"))
       return QueryType.SOUNDCLOUD_PLAYLIST;
     if (import_youtube_sr.YouTube.isPlaylist(query))
       return QueryType.YOUTUBE_PLAYLIST;
@@ -1092,7 +1113,7 @@ function createFFmpegStream(stream, options) {
     args.unshift("-ss", String(options.seek));
   if (Array.isArray(options.encoderArgs))
     args.push(...options.encoderArgs);
-  const transcoder = new prism.FFmpeg({ shell: false, args });
+  const transcoder = new (prism.FFmpeg || prism.default.FFmpeg)({ shell: false, args });
   transcoder.on("close", () => transcoder.destroy());
   if (typeof stream !== "string") {
     stream.on("error", () => transcoder.destroy());
@@ -1325,7 +1346,7 @@ var GuildQueueStatistics = class {
       memoryUsage: process.memoryUsage(),
       versions: {
         node: process.version,
-        player: "6.0.0-dev.5"
+        player: "6.0.0"
       }
     };
   }
@@ -1333,6 +1354,25 @@ var GuildQueueStatistics = class {
 __name(GuildQueueStatistics, "GuildQueueStatistics");
 
 // src/Structures/GuildQueue.ts
+var GuildQueueEvent = /* @__PURE__ */ ((GuildQueueEvent2) => {
+  GuildQueueEvent2["audioTrackAdd"] = "audioTrackadd";
+  GuildQueueEvent2["audioTracksAdd"] = "audioTracksAdd";
+  GuildQueueEvent2["audioTrackRemove"] = "audioTrackRemove";
+  GuildQueueEvent2["audioTracksRemove"] = "audioTracksRemove";
+  GuildQueueEvent2["connection"] = "connection";
+  GuildQueueEvent2["disconnect"] = "disconnect";
+  GuildQueueEvent2["debug"] = "debug";
+  GuildQueueEvent2["error"] = "error";
+  GuildQueueEvent2["emptyChannel"] = "emptyChannel";
+  GuildQueueEvent2["emptyQueue"] = "emptyQueue";
+  GuildQueueEvent2["playerStart"] = "playerStart";
+  GuildQueueEvent2["playerError"] = "playerError";
+  GuildQueueEvent2["playerFinish"] = "playerFinish";
+  GuildQueueEvent2["playerSkip"] = "playerSkip";
+  GuildQueueEvent2["playerTrigger"] = "playerTrigger";
+  GuildQueueEvent2["voiceStateUpdate"] = "voiceStateUpdate";
+  return GuildQueueEvent2;
+})(GuildQueueEvent || {});
 var _transitioning, _initializing, _deleted, _initializingPromises, _attachListeners, attachListeners_fn, _removeListeners, removeListeners_fn, _performStart, performStart_fn, _performFinish, performFinish_fn, _emitEnd, emitEnd_fn, _handleAutoplay, handleAutoplay_fn, _resolveInitializerAwaiters, resolveInitializerAwaiters_fn;
 var GuildQueue = class {
   constructor(player, options) {
@@ -1466,7 +1506,7 @@ var GuildQueue = class {
     return this.tracks.size < 1;
   }
   isPlaying() {
-    return this.dispatcher?.audioResource != null;
+    return this.dispatcher?.audioResource != null && !this.dispatcher.audioResource.ended;
   }
   addTrack(track) {
     const toAdd = track instanceof Playlist ? track.tracks : track;
@@ -1568,7 +1608,14 @@ removeListeners_fn = /* @__PURE__ */ __name(function(dispatcher) {
 _performStart = new WeakSet();
 performStart_fn = /* @__PURE__ */ __name(function(resource) {
   const track = resource?.metadata || this.currentTrack;
-  this.player.events.emit("playerTrigger", this, track, this.isTransitioning() ? "filters" : "normal");
+  const reason = this.isTransitioning() ? "filters" : "normal";
+  this.debug(
+    `Player triggered for Track ${JSON.stringify({
+      title: track?.title,
+      reason
+    })}`
+  );
+  this.player.events.emit("playerTrigger", this, track, reason);
   if (track && !this.isTransitioning())
     this.player.events.emit("playerStart", this, track);
   this.setTransitioning(false);
@@ -1577,25 +1624,38 @@ performStart_fn = /* @__PURE__ */ __name(function(resource) {
 _performFinish = new WeakSet();
 performFinish_fn = /* @__PURE__ */ __name(function(resource) {
   const track = resource?.metadata || this.currentTrack;
+  this.debug(
+    `Track ${JSON.stringify({
+      title: track?.title,
+      isTransitionMode: this.isTransitioning()
+    })} was marked as finished`
+  );
   if (track && !this.isTransitioning()) {
+    this.debug("Adding track to history and emitting finish event since transition mode is disabled...");
     this.history.push(track);
     this.node.resetProgress();
     this.player.events.emit("playerFinish", this, track);
     if (this.tracks.size < 1 && this.repeatMode === 0 /* OFF */) {
+      this.debug("No more tracks left in the queue to play and repeat mode is off, initiating #emitEnd()");
       __privateMethod(this, _emitEnd, emitEnd_fn).call(this);
     } else {
       if (this.repeatMode === 1 /* TRACK */) {
+        this.debug("Repeat mode is set to track, repeating last track from the history...");
         this.__current = this.history.tracks.dispatch() || track;
         return this.node.play(this.__current, { queue: false });
       }
-      if (this.repeatMode === 2 /* QUEUE */)
+      if (this.repeatMode === 2 /* QUEUE */) {
+        this.debug("Repeat mode is set to queue, moving last track from the history to current queue...");
         this.tracks.add(this.history.tracks.dispatch() || track);
+      }
       if (!this.tracks.size) {
         if (this.repeatMode === 3 /* AUTOPLAY */) {
+          this.debug("Repeat mode is set to autoplay, initiating autoplay handler...");
           __privateMethod(this, _handleAutoplay, handleAutoplay_fn).call(this, track);
           return;
         }
       } else {
+        this.debug("Initializing next track of the queue...");
         this.__current = this.tracks.dispatch();
         this.node.play(this.__current, {
           queue: false
@@ -1618,9 +1678,9 @@ emitEnd_fn = /* @__PURE__ */ __name(function() {
 }, "#emitEnd");
 _handleAutoplay = new WeakSet();
 handleAutoplay_fn = /* @__PURE__ */ __name(async function(track) {
-  let info = await import_youtube_sr2.YouTube.getVideo(track.url).then((x) => x.videos[0]).catch(Util.noop);
+  let info = await import_youtube_sr2.YouTube.getVideo(track.url).then((x) => Util.randomChoice(x.videos.slice(0, 5))).catch(Util.noop);
   if (!info)
-    info = await import_youtube_sr2.YouTube.search(track.author).then((x) => x[0]).catch(Util.noop);
+    info = await import_youtube_sr2.YouTube.search(track.author, { limit: 5, type: "video" }).then((x) => Util.randomChoice(x)).catch(Util.noop);
   if (!info) {
     return __privateMethod(this, _emitEnd, emitEnd_fn).call(this);
   }
@@ -1794,7 +1854,7 @@ var VoiceReceiverNode = class {
         setImmediate(async () => {
           if (options.mode === "pcm") {
             const pcm = receiveStream.pipe(
-              new prism2.opus.Decoder({
+              new (prism2.opus || prism2.default.opus).Decoder({
                 channels: 2,
                 frameSize: 960,
                 rate: 48e3
@@ -1945,6 +2005,14 @@ var import_voice5 = require("@discordjs/voice");
 var import_voice4 = require("@discordjs/voice");
 var import_utils6 = require("@discord-player/utils");
 var import_equalizer2 = require("@discord-player/equalizer");
+var needsKeepAlivePatch = (() => {
+  if ("DP_NO_KEEPALIVE_PATCH" in process.env)
+    return false;
+  if (import_voice4.version.includes("-dev") || import_voice4.version.startsWith("1"))
+    return false;
+  const [_major, minor, patch] = import_voice4.version.split(".").map((n) => parseInt(n));
+  return minor > 14 ? false : minor < 15 && patch < 1;
+})();
 var StreamDispatcher = class extends import_utils6.EventEmitter {
   constructor(connection, channel, queue, connectionTimeout = 2e4) {
     super();
@@ -1956,6 +2024,10 @@ var StreamDispatcher = class extends import_utils6.EventEmitter {
     this.voiceConnection = connection;
     this.audioPlayer = (0, import_voice4.createAudioPlayer)();
     this.channel = channel;
+    this.voiceConnection.on("debug", (m) => void this.emit("debug", m));
+    this.voiceConnection.on("error", (error) => void this.emit("error", error));
+    this.audioPlayer.on("debug", (m) => void this.emit("debug", m));
+    this.audioPlayer.on("error", (error) => void this.emit("error", error));
     this.dsp.onUpdate = () => {
       if (!this.dsp)
         return;
@@ -1971,7 +2043,18 @@ var StreamDispatcher = class extends import_utils6.EventEmitter {
         this.emit("sampleRate", this.dsp.resampler.targetSampleRate);
     };
     this.dsp.onError = (e) => this.emit("error", e);
-    this.voiceConnection.on("stateChange", async (_, newState) => {
+    this.voiceConnection.on("stateChange", async (oldState, newState) => {
+      if (needsKeepAlivePatch) {
+        this.queue.debug(`Detected @discordjs/voice version ${import_voice4.version} which needs keepAlive patch, applying patch...`);
+        const oldNetworking = Reflect.get(oldState, "networking");
+        const newNetworking = Reflect.get(newState, "networking");
+        const networkStateChangeHandler = /* @__PURE__ */ __name((_, newNetworkState) => {
+          const newUdp = Reflect.get(newNetworkState, "udp");
+          clearInterval(newUdp?.keepAliveInterval);
+        }, "networkStateChangeHandler");
+        oldNetworking?.off("stateChange", networkStateChangeHandler);
+        newNetworking?.on("stateChange", networkStateChangeHandler);
+      }
       if (newState.status === import_voice4.VoiceConnectionStatus.Disconnected) {
         if (newState.reason === import_voice4.VoiceConnectionDisconnectReason.WebSocketClose && newState.closeCode === 4014) {
           try {
@@ -2025,10 +2108,6 @@ var StreamDispatcher = class extends import_utils6.EventEmitter {
         this.audioResource = null;
       }
     });
-    this.audioPlayer.on("debug", (m) => void this.emit("debug", m));
-    this.audioPlayer.on("error", (error) => void this.emit("error", error));
-    this.voiceConnection.on("debug", (m) => void this.emit("debug", m));
-    this.voiceConnection.on("error", (error) => void this.emit("error", error));
     this.voiceConnection.subscribe(this.audioPlayer);
   }
   get paused() {
@@ -2185,7 +2264,8 @@ __name(StreamDispatcher, "StreamDispatcher");
 // src/VoiceInterface/VoiceUtils.ts
 var import_utils7 = require("@discord-player/utils");
 var VoiceUtils = class {
-  constructor() {
+  constructor(player) {
+    this.player = player;
     this.cache = new import_utils7.Collection();
   }
   async connect(channel, options) {
@@ -2201,7 +2281,8 @@ var VoiceUtils = class {
       guildId: channel.guild.id,
       channelId: channel.id,
       adapterCreator: channel.guild.voiceAdapterCreator,
-      selfDeaf: Boolean(options?.deaf)
+      selfDeaf: Boolean(options?.deaf),
+      debug: this.player.events.eventNames().includes("debug")
     });
     return conn;
   }
@@ -2295,7 +2376,8 @@ var import_discord3 = require("discord.js");
 var import_voice6 = require("@discordjs/voice");
 
 // src/utils/__internal__/_container.ts
-var instances = /* @__PURE__ */ new Map();
+var import_utils8 = require("@discord-player/utils");
+var instances = new import_utils8.Collection();
 
 // src/utils/__internal__/addPlayer.ts
 function addPlayer(player) {
@@ -2314,7 +2396,7 @@ __name(clearPlayer, "clearPlayer");
 
 // src/utils/__internal__/getPlayers.ts
 function getPlayers() {
-  return [...instances.values()];
+  return instances.array();
 }
 __name(getPlayers, "getPlayers");
 
@@ -2332,7 +2414,7 @@ var _Player = class extends PlayerEventsEmitter {
     __privateAdd(this, _lagMonitorInterval, void 0);
     this.id = import_discord3.SnowflakeUtil.generate().toString();
     this.nodes = new GuildNodeManager(this);
-    this.voiceUtils = new VoiceUtils();
+    this.voiceUtils = new VoiceUtils(this);
     this.extractors = new ExtractorExecutionContext(this);
     this.events = new PlayerEventsEmitter(["error", "playerError"]);
     this.client = client;
@@ -2539,7 +2621,8 @@ ${this.scanDeps()}`);
     const vc = this.client.channels.resolve(channel);
     if (!vc?.isVoiceBased())
       throw new Error("Expected a voice channel");
-    const result = query instanceof SearchResult ? query : await this.search(query, options);
+    const originalResult = query instanceof SearchResult ? query : await this.search(query, options);
+    const result = await options.afterSearch?.(originalResult) || originalResult;
     if (result.isEmpty()) {
       throw new Error(`No results found for "${query}" (Extractor: ${result.extractor?.identifier || "N/A"})`);
     }
@@ -2551,7 +2634,7 @@ ${this.scanDeps()}`);
     } else {
       queue.addTrack(result.playlist);
     }
-    if (!queue.node.isPlaying())
+    if (!queue.isPlaying())
       await queue.node.play();
     return {
       track: result.tracks[0],
@@ -2561,20 +2644,42 @@ ${this.scanDeps()}`);
     };
   }
   async search(query, options = {}) {
+    if (query instanceof SearchResult)
+      return query;
     if (options.requestedBy != null)
       options.requestedBy = this.client.users.resolve(options.requestedBy);
     options.blockExtractors ?? (options.blockExtractors = this.options.blockExtractors);
     if (query instanceof Track) {
-      this.debug(`Searching ${query.title}`);
       return new SearchResult(this, {
         playlist: query.playlist || null,
         tracks: [query],
-        query: query.toString(),
+        query: query.title,
         extractor: null,
         queryType: query.queryType,
         requestedBy: options.requestedBy
       });
     }
+    if (query instanceof Playlist) {
+      return new SearchResult(this, {
+        playlist: query,
+        tracks: query.tracks,
+        query: query.title,
+        extractor: null,
+        queryType: QueryType.AUTO,
+        requestedBy: options.requestedBy
+      });
+    }
+    if (Array.isArray(query)) {
+      const tracks = query.filter((t) => t instanceof Track);
+      return new SearchResult(this, {
+        playlist: null,
+        tracks,
+        query: "@@#%{{UserLoadedContent}}%#@@",
+        extractor: null,
+        queryType: QueryType.AUTO,
+        requestedBy: options.requestedBy
+      });
+    }
     this.debug(`Searching ${query}`);
     let extractor = null;
     options.searchEngine ?? (options.searchEngine = QueryType.AUTO);
@@ -2684,7 +2789,7 @@ Player._singletonKey = kSingleton;
 
 // src/hooks/common.ts
 var getPlayer = /* @__PURE__ */ __name(() => {
-  return getPlayers()[0];
+  return instances.first() || null;
 }, "getPlayer");
 var getQueue = /* @__PURE__ */ __name((node) => {
   const player = getPlayer();
@@ -2720,11 +2825,17 @@ function useQueue(node) {
 }
 __name(useQueue, "useQueue");
 
+// src/hooks/useMasterPlayer.ts
+function useMasterPlayer() {
+  return getPlayer();
+}
+__name(useMasterPlayer, "useMasterPlayer");
+
 // src/index.ts
 var import_equalizer3 = require("@discord-player/equalizer");
-var version = "6.0.0-dev.5";
+var version2 = "6.0.0";
 if (!import_discord4.version.startsWith("14")) {
-  process.emitWarning(`Discord.js v${import_discord4.version} is incompatible with Discord Player v${version}! Please use >=v14.x of Discord.js`);
+  process.emitWarning(`Discord.js v${import_discord4.version} is incompatible with Discord Player v${version2}! Please use >=v14.x of Discord.js`);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -2747,11 +2858,13 @@ if (!import_discord4.version.startsWith("14")) {
   GuildNodeManager,
   GuildQueue,
   GuildQueueAudioFilters,
+  GuildQueueEvent,
   GuildQueueHistory,
   GuildQueuePlayerNode,
   PCMAudioFilters,
   Player,
   PlayerError,
+  PlayerEvent,
   PlayerEventsEmitter,
   Playlist,
   Q_BUTTERWORTH,
@@ -2768,6 +2881,7 @@ if (!import_discord4.version.startsWith("14")) {
   VolumeTransformer,
   createFFmpegStream,
   useHistory,
+  useMasterPlayer,
   usePlayer,
   useQueue,
   version