discord-player 5.3.2-dev.2 → 5.3.2

package/dist/utils/QueryResolver.js

@@ -1,68 +1,68 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryResolver = void 0;
-const ytdl_core_1 = require("ytdl-core");
-const youtube_sr_1 = require("youtube-sr");
-const types_1 = require("../types/types");
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-const soundcloud_scraper_1 = require("soundcloud-scraper");
-// #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})/;
-const vimeoRegex = /(http|https)?:\/\/(www\.|player\.)?vimeo\.com\/(?:channels\/(?:\w+\/)?|groups\/([^/]*)\/videos\/|video\/|)(\d+)(?:|\/\?)/;
-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*)?$/;
-// #endregion scary things above *sigh*
-class QueryResolver {
-    /**
-     * Query resolver
-     */
-    constructor() { } // eslint-disable-line @typescript-eslint/no-empty-function
-    /**
-     * Resolves the given search query
-     * @param {string} query The query
-     * @returns {QueryType}
-     */
-    static resolve(query) {
-        if ((0, soundcloud_scraper_1.validateURL)(query, "track"))
-            return types_1.QueryType.SOUNDCLOUD_TRACK;
-        if ((0, soundcloud_scraper_1.validateURL)(query, "playlist") || query.includes("/sets/"))
-            return types_1.QueryType.SOUNDCLOUD_PLAYLIST;
-        if (youtube_sr_1.YouTube.isPlaylist(query))
-            return types_1.QueryType.YOUTUBE_PLAYLIST;
-        if ((0, ytdl_core_1.validateID)(query) || (0, ytdl_core_1.validateURL)(query))
-            return types_1.QueryType.YOUTUBE_VIDEO;
-        if (spotifySongRegex.test(query))
-            return types_1.QueryType.SPOTIFY_SONG;
-        if (spotifyPlaylistRegex.test(query))
-            return types_1.QueryType.SPOTIFY_PLAYLIST;
-        if (spotifyAlbumRegex.test(query))
-            return types_1.QueryType.SPOTIFY_ALBUM;
-        if (vimeoRegex.test(query))
-            return types_1.QueryType.VIMEO;
-        if (facebookRegex.test(query))
-            return types_1.QueryType.FACEBOOK;
-        if (reverbnationRegex.test(query))
-            return types_1.QueryType.REVERBNATION;
-        if (attachmentRegex.test(query))
-            return types_1.QueryType.ARBITRARY;
-        return types_1.QueryType.YOUTUBE_SEARCH;
-    }
-    /**
-     * Parses vimeo id from url
-     * @param {string} query The query
-     * @returns {string}
-     */
-    static getVimeoID(query) {
-        return QueryResolver.resolve(query) === types_1.QueryType.VIMEO
-            ? query
-                .split("/")
-                .filter((x) => !!x)
-                .pop()
-            : null;
-    }
-}
-exports.QueryResolver = QueryResolver;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryResolver = void 0;
+const ytdl_core_1 = require("ytdl-core");
+const youtube_sr_1 = require("youtube-sr");
+const types_1 = require("../types/types");
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+const soundcloud_scraper_1 = require("soundcloud-scraper");
+// #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})/;
+const vimeoRegex = /(http|https)?:\/\/(www\.|player\.)?vimeo\.com\/(?:channels\/(?:\w+\/)?|groups\/([^/]*)\/videos\/|video\/|)(\d+)(?:|\/\?)/;
+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*)?$/;
+// #endregion scary things above *sigh*
+class QueryResolver {
+    /**
+     * Query resolver
+     */
+    constructor() { } // eslint-disable-line @typescript-eslint/no-empty-function
+    /**
+     * Resolves the given search query
+     * @param {string} query The query
+     * @returns {QueryType}
+     */
+    static resolve(query) {
+        if ((0, soundcloud_scraper_1.validateURL)(query, "track"))
+            return types_1.QueryType.SOUNDCLOUD_TRACK;
+        if ((0, soundcloud_scraper_1.validateURL)(query, "playlist") || query.includes("/sets/"))
+            return types_1.QueryType.SOUNDCLOUD_PLAYLIST;
+        if (youtube_sr_1.YouTube.isPlaylist(query))
+            return types_1.QueryType.YOUTUBE_PLAYLIST;
+        if ((0, ytdl_core_1.validateID)(query) || (0, ytdl_core_1.validateURL)(query))
+            return types_1.QueryType.YOUTUBE_VIDEO;
+        if (spotifySongRegex.test(query))
+            return types_1.QueryType.SPOTIFY_SONG;
+        if (spotifyPlaylistRegex.test(query))
+            return types_1.QueryType.SPOTIFY_PLAYLIST;
+        if (spotifyAlbumRegex.test(query))
+            return types_1.QueryType.SPOTIFY_ALBUM;
+        if (vimeoRegex.test(query))
+            return types_1.QueryType.VIMEO;
+        if (facebookRegex.test(query))
+            return types_1.QueryType.FACEBOOK;
+        if (reverbnationRegex.test(query))
+            return types_1.QueryType.REVERBNATION;
+        if (attachmentRegex.test(query))
+            return types_1.QueryType.ARBITRARY;
+        return types_1.QueryType.YOUTUBE_SEARCH;
+    }
+    /**
+     * Parses vimeo id from url
+     * @param {string} query The query
+     * @returns {string}
+     */
+    static getVimeoID(query) {
+        return QueryResolver.resolve(query) === types_1.QueryType.VIMEO
+            ? query
+                .split("/")
+                .filter((x) => !!x)
+                .pop()
+            : null;
+    }
+}
+exports.QueryResolver = QueryResolver;

package/dist/utils/Util.js

@@ -1,135 +1,136 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Util = void 0;
-class Util {
-    /**
-     * Utils
-     */
-    constructor() { } // eslint-disable-line @typescript-eslint/no-empty-function
-    /**
-     * Creates duration string
-     * @param {object} durObj The duration object
-     * @returns {string}
-     */
-    static durationString(durObj) {
-        return Object.values(durObj)
-            .map((m) => (isNaN(m) ? 0 : m))
-            .join(":");
-    }
-    /**
-     * Parses milliseconds to consumable time object
-     * @param {number} milliseconds The time in ms
-     * @returns {TimeData}
-     */
-    static parseMS(milliseconds) {
-        if (isNaN(milliseconds))
-            milliseconds = 0;
-        const round = milliseconds > 0 ? Math.floor : Math.ceil;
-        return {
-            days: round(milliseconds / 86400000),
-            hours: round(milliseconds / 3600000) % 24,
-            minutes: round(milliseconds / 60000) % 60,
-            seconds: round(milliseconds / 1000) % 60
-        };
-    }
-    /**
-     * Builds time code
-     * @param {TimeData} duration The duration object
-     * @returns {string}
-     */
-    static buildTimeCode(duration) {
-        const items = Object.keys(duration);
-        const required = ["days", "hours", "minutes", "seconds"];
-        const parsed = items.filter((x) => required.includes(x)).map((m) => duration[m]);
-        const final = parsed
-            .slice(parsed.findIndex((x) => x !== 0))
-            .map((x) => x.toString().padStart(2, "0"))
-            .join(":");
-        return final.length <= 3 ? `0:${final.padStart(2, "0") || 0}` : final;
-    }
-    /**
-     * Picks last item of the given array
-     * @param {any[]} arr The array
-     * @returns {any}
-     */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    static last(arr) {
-        if (!Array.isArray(arr))
-            return;
-        return arr[arr.length - 1];
-    }
-    /**
-     * Checks if the voice channel is empty
-     * @param {VoiceChannel|StageChannel} channel The voice channel
-     * @returns {boolean}
-     */
-    static isVoiceEmpty(channel) {
-        return channel.members.filter((member) => !member.user.bot).size === 0;
-    }
-    /**
-     * Safer require
-     * @param {string} id Node require id
-     * @returns {any}
-     */
-    static require(id) {
-        try {
-            return require(id);
-        }
-        catch {
-            return null;
-        }
-    }
-    /**
-     * Asynchronous timeout
-     * @param {number} time The time in ms to wait
-     * @returns {Promise<unknown>}
-     */
-    static wait(time) {
-        return new Promise((r) => setTimeout(r, time).unref());
-    }
-    static noop() { } // eslint-disable-line @typescript-eslint/no-empty-function
-    static async getFetch() {
-        if ("fetch" in globalThis)
-            return globalThis.fetch;
-        for (const lib of ["undici", "node-fetch"]) {
-            try {
-                return await Promise.resolve().then(() => __importStar(require(lib))).then((res) => res.fetch || res.default?.fetch || res.default);
-            }
-            catch {
-                try {
-                    // eslint-disable-next-line
-                    const res = require(lib);
-                    if (res)
-                        return res.fetch || res.default?.fetch || res.default;
-                }
-                catch {
-                    // no?
-                }
-            }
-        }
-    }
-}
-exports.Util = Util;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Util = void 0;
+const promises_1 = require("timers/promises");
+class Util {
+    /**
+     * Utils
+     */
+    constructor() { } // eslint-disable-line @typescript-eslint/no-empty-function
+    /**
+     * Creates duration string
+     * @param {object} durObj The duration object
+     * @returns {string}
+     */
+    static durationString(durObj) {
+        return Object.values(durObj)
+            .map((m) => (isNaN(m) ? 0 : m))
+            .join(":");
+    }
+    /**
+     * Parses milliseconds to consumable time object
+     * @param {number} milliseconds The time in ms
+     * @returns {TimeData}
+     */
+    static parseMS(milliseconds) {
+        if (isNaN(milliseconds))
+            milliseconds = 0;
+        const round = milliseconds > 0 ? Math.floor : Math.ceil;
+        return {
+            days: round(milliseconds / 86400000),
+            hours: round(milliseconds / 3600000) % 24,
+            minutes: round(milliseconds / 60000) % 60,
+            seconds: round(milliseconds / 1000) % 60
+        };
+    }
+    /**
+     * Builds time code
+     * @param {TimeData} duration The duration object
+     * @returns {string}
+     */
+    static buildTimeCode(duration) {
+        const items = Object.keys(duration);
+        const required = ["days", "hours", "minutes", "seconds"];
+        const parsed = items.filter((x) => required.includes(x)).map((m) => duration[m]);
+        const final = parsed
+            .slice(parsed.findIndex((x) => x !== 0))
+            .map((x) => x.toString().padStart(2, "0"))
+            .join(":");
+        return final.length <= 3 ? `0:${final.padStart(2, "0") || 0}` : final;
+    }
+    /**
+     * Picks last item of the given array
+     * @param {any[]} arr The array
+     * @returns {any}
+     */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    static last(arr) {
+        if (!Array.isArray(arr))
+            return;
+        return arr[arr.length - 1];
+    }
+    /**
+     * Checks if the voice channel is empty
+     * @param {VoiceChannel|StageChannel} channel The voice channel
+     * @returns {boolean}
+     */
+    static isVoiceEmpty(channel) {
+        return channel.members.filter((member) => !member.user.bot).size === 0;
+    }
+    /**
+     * Safer require
+     * @param {string} id Node require id
+     * @returns {any}
+     */
+    static require(id) {
+        try {
+            return require(id);
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * Asynchronous timeout
+     * @param {number} time The time in ms to wait
+     * @returns {Promise<unknown>}
+     */
+    static wait(time) {
+        return (0, promises_1.setTimeout)(time, undefined, { ref: false });
+    }
+    static noop() { } // eslint-disable-line @typescript-eslint/no-empty-function
+    static async getFetch() {
+        if ("fetch" in globalThis)
+            return globalThis.fetch;
+        for (const lib of ["node-fetch", "undici"]) {
+            try {
+                return await Promise.resolve().then(() => __importStar(require(lib))).then((res) => res.fetch || res.default?.fetch || res.default);
+            }
+            catch {
+                try {
+                    // eslint-disable-next-line
+                    const res = require(lib);
+                    if (res)
+                        return res.fetch || res.default?.fetch || res.default;
+                }
+                catch {
+                    // no?
+                }
+            }
+        }
+    }
+}
+exports.Util = Util;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-player",
-  "version": "5.3.2-dev.2",
+  "version": "5.3.2",
   "description": "Complete framework to facilitate music commands using discord.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",