discord-player 5.3.1 → 5.3.2-dev.0

package/dist/Player.js

@@ -174,7 +174,7 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
     /**
      * Returns the queue if available
      * @param {GuildResolvable} guild The guild id
-     * @returns {Queue}
+     * @returns {Queue | undefined}
      */
     getQueue(guild) {
         guild = this.client.guilds.resolve(guild);
@@ -346,10 +346,11 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
                     description: spotifyData.description ?? "",
                     author: spotifyData.artists[0]?.name ?? "Unknown Artist",
                     url: spotifyData.external_urls?.spotify ?? query,
-                    thumbnail: spotifyData.album?.images[0]?.url ?? spotifyData.preview_url?.length
-                        ? `https://i.scdn.co/image/${spotifyData.preview_url?.split("?cid=")[1]}`
-                        : "https://www.scdn.co/i/_global/twitter_card-default.jpg",
-                    duration: Util_1.Util.buildTimeCode(Util_1.Util.parseMS(spotifyData.duration_ms)),
+                    thumbnail: (spotifyData.coverArt?.sources?.[0]?.url ??
+                        spotifyData.album?.images[0]?.url ??
+                        (spotifyData.preview_url?.length && `https://i.scdn.co/image/${spotifyData.preview_url?.split("?cid=")[1]}`)) ||
+                        "https://www.scdn.co/i/_global/twitter_card-default.jpg",
+                    duration: Util_1.Util.buildTimeCode(Util_1.Util.parseMS(spotifyData.duration_ms ?? spotifyData.duration ?? spotifyData.maxDuration)),
                     views: 0,
                     requestedBy: options.requestedBy,
                     source: "spotify"
@@ -366,7 +367,7 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
                 const playlist = new Playlist_1.Playlist(this, {
                     title: spotifyPlaylist.name ?? spotifyPlaylist.title,
                     description: spotifyPlaylist.description ?? "",
-                    thumbnail: spotifyPlaylist.images[0]?.url ?? "https://www.scdn.co/i/_global/twitter_card-default.jpg",
+                    thumbnail: spotifyPlaylist.coverArt?.sources?.[0]?.url ?? spotifyPlaylist.images[0]?.url ?? "https://www.scdn.co/i/_global/twitter_card-default.jpg",
                     type: spotifyPlaylist.type,
                     source: "spotify",
                     author: spotifyPlaylist.type !== "playlist"

package/dist/Structures/Queue.js

@@ -86,6 +86,7 @@ class Queue {
             leaveOnEnd: true,
             leaveOnStop: true,
             leaveOnEmpty: true,
+            leaveOnEndCooldown: 1000,
             leaveOnEmptyCooldown: 1000,
             autoSelfDeaf: true,
             ytdlOptions: {
@@ -175,9 +176,7 @@ class Queue {
                 this.previousTracks.push(resource.metadata);
             this.player.emit("trackEnd", this, resource.metadata);
             if (!this.tracks.length && this.repeatMode === types_1.QueueRepeatMode.OFF) {
-                if (this.options.leaveOnEnd)
-                    this.destroy();
-                this.player.emit("queueEnd", this);
+                this.emitEnd();
             }
             else if (!this.tracks.length && this.repeatMode === types_1.QueueRepeatMode.AUTOPLAY) {
                 this._handleAutoplay(Util_1.Util.last(this.previousTracks));
@@ -194,6 +193,25 @@ class Queue {
         });
         return this;
     }
+    emitEnd() {
+        const timeout = setTimeout(() => {
+            if (!this.player.queues.has(this.guild.id))
+                return;
+            if (this.tracks.length || this.current)
+                return;
+            if (this.options.leaveOnEnd)
+                this.destroy();
+            this.player.emit("queueEnd", this);
+        }, this.options.leaveOnEndCooldown || 0).unref();
+        this._cooldownsTimeout.set(`queueEnd_${this.guild.id}`, timeout);
+    }
+    refreshEndCooldown() {
+        const existingTimeout = this._cooldownsTimeout.get(`queueEnd_${this.guild.id}`);
+        if (this.tracks.length || this.current) {
+            clearTimeout(existingTimeout);
+            this._cooldownsTimeout.delete(`queueEnd_${this.guild.id}`);
+        }
+    }
     /**
      * Destroys this queue
      * @param {boolean} [disconnect=this.options.leaveOnStop] If it should leave on destroy
@@ -234,6 +252,7 @@ class Queue {
         if (!(track instanceof Track_1.default))
             throw new PlayerError_1.PlayerError("invalid track", PlayerError_1.ErrorStatusCode.INVALID_TRACK);
         this.tracks.push(track);
+        this.refreshEndCooldown();
         this.player.emit("trackAdd", this, track);
     }
     /**
@@ -246,6 +265,7 @@ class Queue {
         if (!tracks.every((y) => y instanceof Track_1.default))
             throw new PlayerError_1.PlayerError("invalid track", PlayerError_1.ErrorStatusCode.INVALID_TRACK);
         this.tracks.push(...tracks);
+        this.refreshEndCooldown();
         this.player.emit("tracksAdd", this, tracks);
     }
     /**
@@ -630,7 +650,9 @@ class Queue {
             if (this.options.spotifyBridge && track.raw.source === "spotify" && !track.raw.engine) {
                 track.raw.engine = await youtube_sr_1.default.search(`${track.author} ${track.title}`, { type: "video" })
                     .then((res) => res[0].url)
-                    .catch(() => null);
+                    .catch(() => {
+                    /* void */
+                });
                 spotifyResolved = true;
             }
             const url = track.raw.source === "spotify" ? track.raw.engine : track.url;
@@ -689,9 +711,7 @@ class Queue {
         if (tslib_1.__classPrivateFieldGet(this, _Queue_instances, "m", _Queue_watchDestroyed).call(this))
             return;
         if (!track || ![track.source, track.raw?.source].includes("youtube")) {
-            if (this.options.leaveOnEnd)
-                this.destroy();
-            return void this.player.emit("queueEnd", this);
+            return this.emitEnd();
         }
         let info = await youtube_sr_1.default.getVideo(track.url)
             .then((x) => x.videos[0])
@@ -702,9 +722,7 @@ class Queue {
                 .then((x) => x[0])
                 .catch(Util_1.Util.noop);
         if (!info) {
-            if (this.options.leaveOnEnd)
-                this.destroy();
-            return void this.player.emit("queueEnd", this);
+            return this.emitEnd();
         }
         const nextTrack = new Track_1.default(this.player, {
             title: info.title,

package/dist/index.d.ts

@@ -266,9 +266,9 @@ declare class Player extends TypedEmitter<PlayerEvents> {
     /**
      * Returns the queue if available
      * @param {GuildResolvable} guild The guild id
-     * @returns {Queue}
+     * @returns {Queue | undefined}
      */
-    getQueue<T = unknown>(guild: GuildResolvable): Queue<T>;
+    getQueue<T = unknown>(guild: GuildResolvable): Queue<T> | undefined;
     /**
      * Deletes a queue and returns deleted queue object
      * @param {GuildResolvable} guild The guild id to remove
@@ -366,6 +366,8 @@ declare class Queue<T = unknown> {
      * @returns {Promise<Queue>}
      */
     connect(channel: GuildChannelResolvable): Promise<this>;
+    private emitEnd;
+    private refreshEndCooldown;
     /**
      * Destroys this queue
      * @param {boolean} [disconnect=this.options.leaveOnStop] If it should leave on destroy
@@ -671,6 +673,7 @@ interface PlayerProgressbarOptions {
  * @property {boolean} [leaveOnStop=true] If it should leave on stop
  * @property {boolean} [leaveOnEmpty=true] If it should leave on empty
  * @property {number} [leaveOnEmptyCooldown=1000] The cooldown in ms
+ * @property {number} [leaveOnEndCooldown=1000] The cooldown in ms
  * @property {boolean} [autoSelfDeaf=true] If it should set the bot in deaf mode
  * @property {YTDLDownloadOptions} [ytdlOptions] The youtube download options
  * @property {number} [initialVolume=100] The initial player volume
@@ -683,6 +686,7 @@ interface PlayerProgressbarOptions {
  */
 interface PlayerOptions {
     leaveOnEnd?: boolean;
+    leaveOnEndCooldown?: number;
     leaveOnStop?: boolean;
     leaveOnEmpty?: boolean;
     leaveOnEmptyCooldown?: number;

package/dist/utils/QueryResolver.js

@@ -7,7 +7,7 @@ const types_1 = require("../types/types");
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 const soundcloud_scraper_1 = require("soundcloud-scraper");
-// scary things below *sigh*
+// #region scary things below *sigh*
 const spotifySongRegex = /https?:\/\/(?:embed\.|open\.)(?:spotify\.com\/)(?:track\/|\?uri=spotify:track:)((\w|-){22})/;
 const spotifyPlaylistRegex = /https?:\/\/(?:embed\.|open\.)(?:spotify\.com\/)(?:playlist\/|\?uri=spotify:playlist:)((\w|-){22})/;
 const spotifyAlbumRegex = /https?:\/\/(?:embed\.|open\.)(?:spotify\.com\/)(?:album\/|\?uri=spotify:album:)((\w|-){22})/;
@@ -15,7 +15,7 @@ const vimeoRegex = /(http|https)?:\/\/(www\.|player\.)?vimeo\.com\/(?:channels\/
 const facebookRegex = /(https?:\/\/)(www\.|m\.)?(facebook|fb).com\/.*\/videos\/.*/;
 const reverbnationRegex = /https:\/\/(www.)?reverbnation.com\/(.+)\/song\/(.+)/;
 const attachmentRegex = /^(?:(?:https?|ftp):\/\/)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/\S*)?$/;
-// scary things above *sigh*
+// #endregion scary things above *sigh*
 class QueryResolver {
     /**
      * Query resolver

package/dist/utils/Util.js

@@ -45,6 +45,8 @@ class Util {
      * @returns {TimeData}
      */
     static parseMS(milliseconds) {
+        if (isNaN(milliseconds))
+            milliseconds = 0;
         const round = milliseconds > 0 ? Math.floor : Math.ceil;
         return {
             days: round(milliseconds / 86400000),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-player",
-  "version": "5.3.1",
+  "version": "5.3.2-dev.0",
   "description": "Complete framework to facilitate music commands using discord.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -67,12 +67,14 @@
   "dependencies": {
     "@discordjs/voice": "^0.11.0",
     "libsodium-wrappers": "^0.7.10",
-    "soundcloud-scraper": "^5.0.3",
-    "spotify-url-info": "^3.1.2",
     "tiny-typed-emitter": "^2.1.0",
-    "tslib": "^2.4.0",
-    "youtube-sr": "^4.3.0",
-    "ytdl-core": "^4.11.0"
+    "tslib": "^2.4.0"
+  },
+  "peerDependencies": {
+    "soundcloud-scraper": "5.x",
+    "spotify-url-info": "3.x",
+    "youtube-sr": "4.x",
+    "ytdl-core": "4.x"
   },
   "devDependencies": {
     "@discordjs/ts-docgen": "^0.4.1",
@@ -89,8 +91,12 @@
     "opusscript": "^0.0.8",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
+    "soundcloud-scraper": "^5.0.3",
+    "spotify-url-info": "^3.1.7",
     "ts-node": "^10.9.1",
     "typedoc": "^0.23.10",
-    "typescript": "^4.7.4"
+    "typescript": "^4.7.4",
+    "youtube-sr": "^4.3.4",
+    "ytdl-core": "^4.11.2"
   }
 }