discord-player 6.0.0-dev.4 → 6.0.0-dev.5

package/dist/index.mjs

@@ -428,6 +428,12 @@ var Playlist = class {
   *[Symbol.iterator]() {
     yield* this.tracks;
   }
+  get estimatedDuration() {
+    return this.tracks.reduce((p, c) => p + c.durationMS, 0);
+  }
+  get durationFormatted() {
+    return Util.buildTimeCode(Util.parseMS(this.estimatedDuration));
+  }
   toJSON(withTracks = true) {
     const payload = {
       id: this.id,
@@ -466,6 +472,12 @@ var GuildQueueHistory = class {
   get disabled() {
     return this.queue.options.disableHistory;
   }
+  get size() {
+    return this.tracks.size;
+  }
+  getSize() {
+    return this.size;
+  }
   isEmpty() {
     return this.tracks.size < 1;
   }
@@ -485,14 +497,14 @@ var GuildQueueHistory = class {
     }
     this.queue.node.skip();
   }
-  async previous() {
+  async previous(preserveCurrent = true) {
     const track = this.tracks.dispatch();
     if (!track) {
       throw new Error("No previous track in the queue");
     }
     const current = this.currentTrack;
     await this.queue.node.play(track, { queue: false });
-    if (current)
+    if (current && preserveCurrent)
       this.queue.node.insert(current, 0);
   }
   back() {
@@ -750,6 +762,7 @@ var GuildQueuePlayerNode = class {
     if (!foundTrack)
       return null;
     this.queue.tracks.removeOne((t) => t.id === foundTrack.id);
+    this.queue.player.events.emit("audioTrackRemove", this.queue, foundTrack);
     return foundTrack;
   }
   jump(track) {
@@ -776,15 +789,20 @@ var GuildQueuePlayerNode = class {
     const removed = this.remove(idx);
     if (!removed)
       return false;
+    const toRemove = this.queue.tracks.store.filter((_, i) => i <= idx);
     this.queue.tracks.store.splice(0, idx, removed);
+    this.queue.player.events.emit("audioTracksRemove", this.queue, toRemove);
     return this.skip();
   }
   insert(track, index = 0) {
     if (!(track instanceof Track))
       throw new Error("invalid track");
     this.queue.tracks.store.splice(index, 0, track);
+    this.queue.player.events.emit("audioTrackAdd", this.queue, track);
   }
   stop(force = false) {
+    this.queue.tracks.clear();
+    this.queue.history.clear();
     if (!this.queue.dispatcher)
       return false;
     this.queue.dispatcher.end();
@@ -820,7 +838,7 @@ var GuildQueuePlayerNode = class {
     );
     if (res && options.queue) {
       this.queue.debug("Requested option requires to queue the track, adding the given track to queue instead...");
-      return this.queue.tracks.add(res);
+      return this.queue.addTrack(res);
     }
     const track = res || this.queue.tracks.dispatch();
     if (!track) {
@@ -849,7 +867,7 @@ var GuildQueuePlayerNode = class {
           this.queue.player.events.emit("playerSkip", this.queue, track);
           this.queue.player.events.emit("playerError", this.queue, error, track);
           this.queue.initializing = false;
-          this.play(this.queue.tracks.dispatch());
+          this.play(this.queue.tracks.dispatch(), { queue: false });
           return;
         }
         throw error;
@@ -1244,7 +1262,7 @@ var GuildQueueStatistics = class {
       memoryUsage: process.memoryUsage(),
       versions: {
         node: process.version,
-        player: "6.0.0-dev.4"
+        player: "6.0.0-dev.5"
       }
     };
   }
@@ -1306,6 +1324,12 @@ var GuildQueue = class {
     }
     this.debug(`GuildQueue initialized for guild ${this.options.guild.name} (ID: ${this.options.guild.id})`);
   }
+  get estimatedDuration() {
+    return this.tracks.store.reduce((a, c) => a + c.durationMS, 0);
+  }
+  get durationFormatted() {
+    return Util.buildTimeCode(Util.parseMS(this.estimatedDuration));
+  }
   get voiceReceiver() {
     return this.dispatcher?.receiver ?? null;
   }
@@ -1365,6 +1389,16 @@ var GuildQueue = class {
   setRepeatMode(mode) {
     this.repeatMode = mode;
   }
+  get size() {
+    return this.tracks.size;
+  }
+  getSize() {
+    return this.size;
+  }
+  clear() {
+    this.tracks.clear();
+    this.history.clear();
+  }
   isEmpty() {
     return this.tracks.size < 1;
   }
@@ -1376,7 +1410,6 @@ var GuildQueue = class {
     this.tracks.add(toAdd);
     const isMulti = Array.isArray(toAdd);
     if (isMulti) {
-      this.player.events.emit("audioTrackAdd", this, toAdd[0]);
       this.player.events.emit("audioTracksAdd", this, toAdd);
     } else {
       this.player.events.emit("audioTrackAdd", this, toAdd);
@@ -1725,6 +1758,30 @@ var SearchResult = class {
       track.extractor = this._data.extractor || null;
     });
   }
+  setQueryType(type) {
+    this._data.queryType = type;
+    return this;
+  }
+  setRequestedBy(user) {
+    this._data.requestedBy = user;
+    return this;
+  }
+  setExtractor(extractor) {
+    this._data.extractor = extractor;
+    return this;
+  }
+  setTracks(tracks) {
+    this._data.tracks = tracks;
+    return this;
+  }
+  setQuery(query) {
+    this._data.query = query;
+    return this;
+  }
+  setPlaylist(playlist) {
+    this._data.playlist = playlist;
+    return this;
+  }
   get query() {
     return this._data.query;
   }
@@ -1819,7 +1876,7 @@ var PlayerError = class extends Error {
 __name(PlayerError, "PlayerError");
 
 // src/VoiceInterface/VoiceUtils.ts
-import { joinVoiceChannel, getVoiceConnection } from "@discordjs/voice";
+import { joinVoiceChannel, getVoiceConnection, VoiceConnectionStatus as VoiceConnectionStatus2 } from "@discordjs/voice";
 
 // src/VoiceInterface/StreamDispatcher.ts
 import {
@@ -1866,7 +1923,8 @@ var StreamDispatcher = class extends EventEmitter2 {
             await entersState(this.voiceConnection, VoiceConnectionStatus.Connecting, this.connectionTimeout);
           } catch {
             try {
-              this.voiceConnection.destroy();
+              if (this.voiceConnection.state.status !== VoiceConnectionStatus.Destroyed)
+                this.voiceConnection.destroy();
             } catch (err) {
               this.emit("error", err);
             }
@@ -1876,7 +1934,8 @@ var StreamDispatcher = class extends EventEmitter2 {
           this.voiceConnection.rejoin();
         } else {
           try {
-            this.voiceConnection.destroy();
+            if (this.voiceConnection.state.status !== VoiceConnectionStatus.Destroyed)
+              this.voiceConnection.destroy();
           } catch (err) {
             this.emit("error", err);
           }
@@ -1913,6 +1972,8 @@ var StreamDispatcher = class extends EventEmitter2 {
     });
     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() {
@@ -1933,6 +1994,21 @@ var StreamDispatcher = class extends EventEmitter2 {
   isIdle() {
     return this.audioPlayer.state.status === AudioPlayerStatus.Idle;
   }
+  isDestroyed() {
+    return this.voiceConnection.state.status === VoiceConnectionStatus.Destroyed;
+  }
+  isDisconnected() {
+    return this.voiceConnection.state.status === VoiceConnectionStatus.Disconnected;
+  }
+  isReady() {
+    return this.voiceConnection.state.status === VoiceConnectionStatus.Ready;
+  }
+  isSignalling() {
+    return this.voiceConnection.state.status === VoiceConnectionStatus.Signalling;
+  }
+  isConnecting() {
+    return this.voiceConnection.state.status === VoiceConnectionStatus.Connecting;
+  }
   async createStream(src, ops) {
     if (!ops?.disableFilters)
       this.queue.debug("Initiating DSP filters pipeline...");
@@ -1992,12 +2068,16 @@ var StreamDispatcher = class extends EventEmitter2 {
     try {
       if (this.audioPlayer)
         this.audioPlayer.stop(true);
-      this.voiceConnection.destroy();
+      if (this.voiceConnection.state.status !== VoiceConnectionStatus.Destroyed)
+        this.voiceConnection.destroy();
     } catch {
     }
   }
   end() {
-    this.audioPlayer.stop();
+    try {
+      this.audioPlayer.stop();
+    } catch {
+    }
   }
   pause(interpolateSilence) {
     const success = this.audioPlayer.pause(interpolateSilence);
@@ -2072,8 +2152,12 @@ var VoiceUtils = class {
   }
   disconnect(connection) {
     if (connection instanceof StreamDispatcher)
-      return connection.voiceConnection.destroy();
-    return connection.destroy();
+      connection = connection.voiceConnection;
+    try {
+      if (connection.state.status !== VoiceConnectionStatus2.Destroyed)
+        return connection.destroy();
+    } catch {
+    }
   }
   getConnection(guild) {
     return this.cache.get(guild) || getVoiceConnection(guild);
@@ -2082,7 +2166,6 @@ var VoiceUtils = class {
 __name(VoiceUtils, "VoiceUtils");
 
 // src/utils/QueryCache.ts
-import Fuse from "fuse.js";
 var DEFAULT_EXPIRY_TIMEOUT = 18e6;
 var _defaultCache;
 var QueryCache = class {
@@ -2092,11 +2175,6 @@ var QueryCache = class {
     this.player = player;
     this.options = options;
     __privateAdd(this, _defaultCache, /* @__PURE__ */ new Map());
-    this.fuse = new Fuse([], {
-      keys: [
-        "url"
-      ]
-    });
     this.timer = setInterval(this.cleanup.bind(this), this.checkInterval).unref();
   }
   get checkInterval() {
@@ -2123,10 +2201,8 @@ var QueryCache = class {
     });
   }
   async resolve(context) {
-    const cacheData = await this.getData();
-    this.fuse.setCollection(cacheData.map((m) => m.data));
-    const result = this.fuse.search(context.query);
-    if (!result.length)
+    const result = __privateGet(this, _defaultCache).get(context.query);
+    if (!result)
       return new SearchResult(this.player, {
         query: context.query,
         requestedBy: context.requestedBy,
@@ -2134,7 +2210,7 @@ var QueryCache = class {
       });
     return new SearchResult(this.player, {
       query: context.query,
-      tracks: result.map((m) => m.item),
+      tracks: [result.data],
       playlist: null,
       queryType: context.queryType,
       requestedBy: context.requestedBy
@@ -2192,6 +2268,8 @@ var kSingleton = Symbol("InstanceDiscordPlayerSingleton");
 var _lastLatency, _voiceStateUpdateListener, _lagMonitorTimeout, _lagMonitorInterval;
 var _Player = class extends PlayerEventsEmitter {
   constructor(client, options = {}) {
+    if (!options.ignoreInstance && kSingleton in _Player)
+      return _Player[kSingleton];
     super(["error"]);
     __privateAdd(this, _lastLatency, -1);
     __privateAdd(this, _voiceStateUpdateListener, this.handleVoiceState.bind(this));
@@ -2243,20 +2321,23 @@ ${this.scanDeps()}`);
       }, this.options.lagMonitor).unref());
     }
     addPlayer(this);
-  }
-  debug(m) {
-    return this.emit("debug", m);
-  }
-  static singleton(client, options = {}) {
     if (!(kSingleton in _Player)) {
       Object.defineProperty(_Player, kSingleton, {
-        value: new _Player(client, options),
+        value: this,
         writable: true,
         configurable: true,
         enumerable: false
       });
     }
-    return _Player[kSingleton];
+  }
+  debug(m) {
+    return this.emit("debug", m);
+  }
+  static singleton(client, options = {}) {
+    return new _Player(client, {
+      ...options,
+      ignoreInstance: false
+    });
   }
   static getAllPlayers() {
     return getPlayers();
@@ -2300,20 +2381,20 @@ ${this.scanDeps()}`);
     const wasHandled = this.events.emit("voiceStateUpdate", queue, oldState, newState);
     if (wasHandled && !this.options.lockVoiceStateHandler)
       return;
-    if (oldState.channelId && !newState.channelId && newState.member.id === newState.guild.members.me.id) {
+    if (oldState.channelId && !newState.channelId && newState.member?.id === newState.guild.members.me?.id) {
       try {
         queue.delete();
       } catch {
       }
       return void this.events.emit("disconnect", queue);
     }
-    if (!oldState.channelId && newState.channelId && newState.member.id === newState.guild.members.me.id) {
+    if (!oldState.channelId && newState.channelId && newState.member?.id === newState.guild.members.me?.id) {
       if (newState.serverMute != null && oldState.serverMute !== newState.serverMute) {
         queue.node.setPaused(newState.serverMute);
       } else if (newState.channel?.type === ChannelType2.GuildStageVoice && newState.suppress != null && oldState.suppress !== newState.suppress) {
         queue.node.setPaused(newState.suppress);
         if (newState.suppress) {
-          newState.guild.members.me.voice.setRequestToSpeak(true).catch(Util.noop);
+          newState.guild.members.me?.voice.setRequestToSpeak(true).catch(Util.noop);
         }
       }
     }
@@ -2340,8 +2421,8 @@ ${this.scanDeps()}`);
       }
     }
     if (oldState.channelId && newState.channelId && oldState.channelId !== newState.channelId) {
-      if (newState.member.id === newState.guild.members.me.id) {
-        if (queue.connection && newState.member.id === newState.guild.members.me.id)
+      if (newState.member?.id === newState.guild.members.me?.id) {
+        if (queue.connection && newState.member?.id === newState.guild.members.me?.id)
           queue.channel = newState.channel;
         const emptyTimeout = queue.timeouts.get(`empty_${oldState.guild.id}`);
         const channelEmpty = Util.isVoiceEmpty(queue.channel);
@@ -2410,12 +2491,13 @@ ${this.scanDeps()}`);
     const queue = this.nodes.create(vc.guild, options.nodeOptions);
     if (!queue.channel)
       await queue.connect(vc, options.connectionOptions);
-    if (!result.hasPlaylist()) {
-      await queue.node.play(result.tracks[0]);
+    if (!result.playlist) {
+      queue.addTrack(result.tracks[0]);
     } else {
       queue.addTrack(result.playlist);
-      await queue.node.play();
     }
+    if (!queue.node.isPlaying())
+      await queue.node.play();
     return {
       track: result.tracks[0],
       extractor: result.extractor,
@@ -2545,6 +2627,44 @@ _lagMonitorTimeout = new WeakMap();
 _lagMonitorInterval = new WeakMap();
 Player._singletonKey = kSingleton;
 
+// src/hooks/common.ts
+var getPlayer = /* @__PURE__ */ __name(() => {
+  return getPlayers()[0];
+}, "getPlayer");
+var getQueue = /* @__PURE__ */ __name((node) => {
+  const player = getPlayer();
+  if (!player)
+    return null;
+  return player.nodes.resolve(node) || null;
+}, "getQueue");
+
+// src/hooks/useHistory.ts
+function useHistory(node) {
+  const queue = getQueue(node);
+  if (!queue)
+    return null;
+  return queue.history;
+}
+__name(useHistory, "useHistory");
+
+// src/hooks/usePlayer.ts
+function usePlayer(node) {
+  const queue = getQueue(node);
+  if (!queue)
+    return null;
+  return queue.node;
+}
+__name(usePlayer, "usePlayer");
+
+// src/hooks/useQueue.ts
+function useQueue(node) {
+  const queue = getQueue(node);
+  if (!queue)
+    return null;
+  return queue;
+}
+__name(useQueue, "useQueue");
+
 // src/index.ts
 import {
   AudioFilters as AudioFilters2,
@@ -2556,7 +2676,7 @@ import {
   AF_VAPORWAVE_RATE,
   FiltersChain as FiltersChain2
 } from "@discord-player/equalizer";
-var version = "6.0.0-dev.4";
+var version = "6.0.0-dev.5";
 if (!djsVersion.startsWith("14")) {
   process.emitWarning(`Discord.js v${djsVersion} is incompatible with Discord Player v${version}! Please use >=v14.x of Discord.js`);
 }
@@ -2589,6 +2709,7 @@ export {
   Playlist,
   Q_BUTTERWORTH,
   QueryCache,
+  QueryResolver,
   QueryType,
   QueueRepeatMode,
   SearchResult,
@@ -2599,6 +2720,9 @@ export {
   VoiceUtils,
   VolumeTransformer,
   createFFmpegStream,
+  useHistory,
+  usePlayer,
+  useQueue,
   version
 };
 //# sourceMappingURL=index.mjs.map