distube 3.0.7 → 3.2.1

package/dist/core/DisTubeStream.js.map

@@ -1 +1 @@
-{"version":3,"file":"DisTubeStream.js","sourceRoot":"","sources":["../../src/core/DisTubeStream.ts"],"names":[],"mappings":"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","sourcesContent":["import { isURL } from \"..\";\nimport { FFmpeg } from \"prism-media\";\nimport { DisTubeError } from \"../struct\";\nimport { StreamType } from \"@discordjs/voice\";\nimport type ytdl from \"@distube/ytdl-core\";\n\ninterface StreamOptions extends ytdl.downloadOptions {\n  /**\n   * Time to seek in seconds\n   */\n  seek?: number;\n  /**\n   * Additional FFmpeg arguments\n   */\n  ffmpegArgs?: string[];\n  /**\n   * If the stream url is live\n   */\n  isLive?: boolean;\n}\n\nexport const chooseBestVideoFormat = (formats: ytdl.videoFormat[], isLive = false) => {\n  let filter = (format: ytdl.videoFormat) => format.hasAudio;\n  if (isLive) filter = (format: ytdl.videoFormat) => format.hasAudio && format.isHLS;\n  formats = formats\n    .filter(filter)\n    .sort((a, b) => Number(b.audioBitrate) - Number(a.audioBitrate) || Number(a.bitrate) - Number(b.bitrate));\n  return formats.find(format => !format.hasVideo) || formats.sort((a, b) => Number(a.bitrate) - Number(b.bitrate))[0];\n};\n\n/**\n * Create a stream to play with {@link DisTubeVoice}\n * @private\n */\nexport class DisTubeStream {\n  /**\n   * Create a stream from ytdl video formats\n   * @param {ytdl.videoFormat[]} formats ytdl video formats\n   * @param {StreamOptions} options options\n   * @returns {DisTubeStream}\n   * @private\n   */\n  static YouTube(formats: ytdl.videoFormat[] | undefined, options: StreamOptions = {}): DisTubeStream {\n    if (!formats || !formats.length) throw new DisTubeError(\"UNAVAILABLE_VIDEO\");\n    if (!options || typeof options !== \"object\" || Array.isArray(options)) {\n      throw new DisTubeError(\"INVALID_TYPE\", \"object\", options, \"options\");\n    }\n    const bestFormat = chooseBestVideoFormat(formats, options.isLive);\n    if (!bestFormat) throw new DisTubeError(\"UNPLAYABLE_FORMATS\");\n    return new DisTubeStream(bestFormat.url, options);\n  }\n  /**\n   * Create a stream from a stream url\n   * @param {string} url stream url\n   * @param {StreamOptions} options options\n   * @returns {DisTubeStream}\n   * @private\n   */\n  static DirectLink(url: string, options: StreamOptions = {}): DisTubeStream {\n    if (!options || typeof options !== \"object\" || Array.isArray(options)) {\n      throw new DisTubeError(\"INVALID_TYPE\", \"object\", options, \"options\");\n    }\n    if (typeof url !== \"string\" || !isURL(url)) {\n      throw new DisTubeError(\"INVALID_TYPE\", \"an URL\", url);\n    }\n    return new DisTubeStream(url, options);\n  }\n  type: StreamType.Raw;\n  stream: FFmpeg;\n  url: string;\n  /**\n   * Create a DisTubeStream to play with {@link DisTubeVoice}\n   * @param {string} url Stream URL\n   * @param {StreamOptions} options Stream options\n   * @private\n   */\n  constructor(url: string, options: StreamOptions) {\n    /**\n     * Stream URL\n     * @type {string}\n     */\n    this.url = url;\n    /**\n     * Stream type\n     * @type {DiscordVoice.StreamType.Raw}\n     */\n    this.type = StreamType.Raw;\n    const args = [\n      \"-reconnect\",\n      \"1\",\n      \"-reconnect_streamed\",\n      \"1\",\n      \"-reconnect_delay_max\",\n      \"5\",\n      \"-i\",\n      url,\n      \"-analyzeduration\",\n      \"0\",\n      \"-loglevel\",\n      \"0\",\n      \"-ar\",\n      \"48000\",\n      \"-ac\",\n      \"2\",\n      \"-f\",\n      \"s16le\",\n    ];\n    if (typeof options.seek === \"number\" && options.seek > 0) {\n      args.unshift(\"-ss\", options.seek.toString());\n    }\n    if (Array.isArray(options.ffmpegArgs)) {\n      args.push(...options.ffmpegArgs);\n    }\n    /**\n     * FFmpeg stream (Duplex)\n     * @type {FFmpeg}\n     */\n    this.stream = new FFmpeg({ args, shell: false });\n  }\n}\n\nexport default DisTubeStream;\n"]}
+{"version":3,"file":"DisTubeStream.js","sourceRoot":"","sources":["../../src/core/DisTubeStream.ts"],"names":[],"mappings":"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","sourcesContent":["import { isURL } from \"..\";\nimport { FFmpeg } from \"prism-media\";\nimport { DisTubeError } from \"../struct\";\nimport { StreamType } from \"@discordjs/voice\";\nimport type ytdl from \"@distube/ytdl-core\";\n\ninterface StreamOptions extends ytdl.downloadOptions {\n  /**\n   * Time to seek in seconds\n   */\n  seek?: number;\n  /**\n   * Additional FFmpeg arguments\n   */\n  ffmpegArgs?: string[];\n  /**\n   * If the stream url is live\n   */\n  isLive?: boolean;\n}\n\nexport const chooseBestVideoFormat = (formats: ytdl.videoFormat[], isLive = false) => {\n  let filter = (format: ytdl.videoFormat) => format.hasAudio;\n  if (isLive) filter = (format: ytdl.videoFormat) => format.hasAudio && format.isHLS;\n  formats = formats\n    .filter(filter)\n    .sort((a, b) => Number(b.audioBitrate) - Number(a.audioBitrate) || Number(a.bitrate) - Number(b.bitrate));\n  return formats.find(format => !format.hasVideo) || formats.sort((a, b) => Number(a.bitrate) - Number(b.bitrate))[0];\n};\n\n/**\n * Create a stream to play with {@link DisTubeVoice}\n * @private\n */\nexport class DisTubeStream {\n  /**\n   * Create a stream from ytdl video formats\n   * @param {ytdl.videoFormat[]} formats ytdl video formats\n   * @param {StreamOptions} options options\n   * @returns {DisTubeStream}\n   * @private\n   */\n  static YouTube(formats: ytdl.videoFormat[] | undefined, options: StreamOptions = {}): DisTubeStream {\n    if (!formats || !formats.length) throw new DisTubeError(\"UNAVAILABLE_VIDEO\");\n    if (!options || typeof options !== \"object\" || Array.isArray(options)) {\n      throw new DisTubeError(\"INVALID_TYPE\", \"object\", options, \"options\");\n    }\n    const bestFormat = chooseBestVideoFormat(formats, options.isLive);\n    if (!bestFormat) throw new DisTubeError(\"UNPLAYABLE_FORMATS\");\n    return new DisTubeStream(bestFormat.url, options);\n  }\n  /**\n   * Create a stream from a stream url\n   * @param {string} url stream url\n   * @param {StreamOptions} options options\n   * @returns {DisTubeStream}\n   * @private\n   */\n  static DirectLink(url: string, options: StreamOptions = {}): DisTubeStream {\n    if (!options || typeof options !== \"object\" || Array.isArray(options)) {\n      throw new DisTubeError(\"INVALID_TYPE\", \"object\", options, \"options\");\n    }\n    if (typeof url !== \"string\" || !isURL(url)) {\n      throw new DisTubeError(\"INVALID_TYPE\", \"an URL\", url);\n    }\n    return new DisTubeStream(url, options);\n  }\n  type: StreamType.Raw;\n  stream: FFmpeg;\n  url: string;\n  /**\n   * Create a DisTubeStream to play with {@link DisTubeVoice}\n   * @param {string} url Stream URL\n   * @param {StreamOptions} options Stream options\n   * @private\n   */\n  constructor(url: string, options: StreamOptions) {\n    /**\n     * Stream URL\n     * @type {string}\n     */\n    this.url = url;\n    /**\n     * Stream type\n     * @type {DiscordVoice.StreamType.Raw}\n     */\n    this.type = StreamType.Raw;\n    const args = [\n      \"-reconnect\",\n      \"1\",\n      \"-reconnect_streamed\",\n      \"1\",\n      \"-reconnect_delay_max\",\n      \"5\",\n      \"-i\",\n      url,\n      \"-analyzeduration\",\n      \"0\",\n      \"-loglevel\",\n      \"0\",\n      \"-ar\",\n      \"48000\",\n      \"-ac\",\n      \"2\",\n      \"-f\",\n      \"s16le\",\n    ];\n    if (typeof options.seek === \"number\" && options.seek > 0) {\n      args.unshift(\"-ss\", options.seek.toString());\n    }\n    if (Array.isArray(options.ffmpegArgs)) {\n      args.push(...options.ffmpegArgs);\n    }\n    /**\n     * FFmpeg stream (Duplex)\n     * @type {FFmpeg}\n     */\n    this.stream = new FFmpeg({ args, shell: false });\n  }\n}\n"]}

package/dist/core/index.d.ts

@@ -1,7 +1,7 @@
 export * from "./DisTubeOptions";
-export * from "./voice";
-export * from "./manager";
 export * from "./DisTubeBase";
 export * from "./DisTubeStream";
+export * from "./manager";
+export * from "./voice";
 export * from "./DisTubeHandler";
 //# sourceMappingURL=index.d.ts.map

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC"}

package/dist/core/index.js

@@ -11,9 +11,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./DisTubeOptions"), exports);
-__exportStar(require("./voice"), exports);
-__exportStar(require("./manager"), exports);
 __exportStar(require("./DisTubeBase"), exports);
 __exportStar(require("./DisTubeStream"), exports);
+__exportStar(require("./manager"), exports);
+__exportStar(require("./voice"), exports);
 __exportStar(require("./DisTubeHandler"), exports);
 //# sourceMappingURL=index.js.map

package/dist/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAiC;AACjC,0CAAwB;AACxB,4CAA0B;AAC1B,gDAA8B;AAC9B,kDAAgC;AAChC,mDAAiC","sourcesContent":["export * from \"./DisTubeOptions\";\nexport * from \"./voice\";\nexport * from \"./manager\";\nexport * from \"./DisTubeBase\";\nexport * from \"./DisTubeStream\";\nexport * from \"./DisTubeHandler\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAiC;AACjC,gDAA8B;AAC9B,kDAAgC;AAChC,4CAA0B;AAC1B,0CAAwB;AACxB,mDAAiC","sourcesContent":["export * from \"./DisTubeOptions\";\nexport * from \"./DisTubeBase\";\nexport * from \"./DisTubeStream\";\nexport * from \"./manager\";\nexport * from \"./voice\";\nexport * from \"./DisTubeHandler\";\n"]}

package/dist/core/manager/BaseManager.d.ts

@@ -1,18 +1,22 @@
-import DisTubeBase from "../DisTubeBase";
+import { DisTubeBase } from "..";
 import { Collection } from "discord.js";
-import type { DisTube, GuildIDResolvable } from "../..";
+import type { GuildIdResolvable } from "../..";
 /**
  * Manages the collection of a data model.
  * @abstract
  * @private
+ * @extends DisTubeBase
  */
 export declare abstract class BaseManager<V> extends DisTubeBase {
+    /**
+     * The collection of items for this manager.
+     * @type {Discord.Collection}
+     * @abstract
+     */
     collection: Collection<string, V>;
-    constructor(distube: DisTube);
     add(id: string, data: V): V;
-    get(idOrInstance: GuildIDResolvable): V | undefined;
-    delete(idOrInstance: GuildIDResolvable): void;
-    has(idOrInstance: GuildIDResolvable): boolean;
+    get(idOrInstance: GuildIdResolvable): V | undefined;
+    delete(idOrInstance: GuildIdResolvable): void;
+    has(idOrInstance: GuildIdResolvable): boolean;
 }
-export default BaseManager;
 //# sourceMappingURL=BaseManager.d.ts.map

package/dist/core/manager/BaseManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseManager.d.ts","sourceRoot":"","sources":["../../../src/core/manager/BaseManager.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAExD;;;;GAIG;AACH,8BAAsB,WAAW,CAAC,CAAC,CAAE,SAAQ,WAAW;IACtD,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBACtB,OAAO,EAAE,OAAO;IAQ5B,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAQvB,GAAG,CAAC,YAAY,EAAE,iBAAiB,GAAG,CAAC,GAAG,SAAS;IAGnD,MAAM,CAAC,YAAY,EAAE,iBAAiB,GAAG,IAAI;IAG7C,GAAG,CAAC,YAAY,EAAE,iBAAiB,GAAG,OAAO;CAG9C;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"BaseManager.d.ts","sourceRoot":"","sources":["../../../src/core/manager/BaseManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAE/C;;;;;GAKG;AACH,8BAAsB,WAAW,CAAC,CAAC,CAAE,SAAQ,WAAW;IACtD;;;;OAIG;IACH,UAAU,wBAA+B;IACzC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAQvB,GAAG,CAAC,YAAY,EAAE,iBAAiB,GAAG,CAAC,GAAG,SAAS;IAGnD,MAAM,CAAC,YAAY,EAAE,iBAAiB,GAAG,IAAI;IAG7C,GAAG,CAAC,YAAY,EAAE,iBAAiB,GAAG,OAAO;CAG9C"}

package/dist/core/manager/BaseManager.js

@@ -1,23 +1,22 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseManager = void 0;
-const DisTubeBase_1 = __importDefault(require("../DisTubeBase"));
-const __1 = require("../..");
+const __1 = require("..");
+const __2 = require("../..");
 const discord_js_1 = require("discord.js");
 /**
  * Manages the collection of a data model.
  * @abstract
  * @private
+ * @extends DisTubeBase
  */
-class BaseManager extends DisTubeBase_1.default {
-    constructor(distube) {
-        super(distube);
+class BaseManager extends __1.DisTubeBase {
+    constructor() {
+        super(...arguments);
         /**
-         * Collection of of a data model.
+         * The collection of items for this manager.
          * @type {Discord.Collection}
+         * @abstract
          */
         this.collection = new discord_js_1.Collection();
     }
@@ -30,15 +29,14 @@ class BaseManager extends DisTubeBase_1.default {
         return data;
     }
     get(idOrInstance) {
-        return this.collection.get((0, __1.resolveGuildID)(idOrInstance));
+        return this.collection.get((0, __2.resolveGuildId)(idOrInstance));
     }
     delete(idOrInstance) {
-        this.collection.delete((0, __1.resolveGuildID)(idOrInstance));
+        this.collection.delete((0, __2.resolveGuildId)(idOrInstance));
     }
     has(idOrInstance) {
-        return this.collection.has((0, __1.resolveGuildID)(idOrInstance));
+        return this.collection.has((0, __2.resolveGuildId)(idOrInstance));
     }
 }
 exports.BaseManager = BaseManager;
-exports.default = BaseManager;
 //# sourceMappingURL=BaseManager.js.map

package/dist/core/manager/BaseManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseManager.js","sourceRoot":"","sources":["../../../src/core/manager/BaseManager.ts"],"names":[],"mappings":";;;;;;AAAA,iEAAyC;AACzC,6BAAuC;AACvC,2CAAwC;AAGxC;;;;GAIG;AACH,MAAsB,WAAe,SAAQ,qBAAW;IAEtD,YAAY,OAAgB;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf;;;WAGG;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAU,EAAE,CAAC;IACrC,CAAC;IACD,GAAG,CAAC,EAAU,EAAE,IAAO;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC;SACjB;QACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,GAAG,CAAC,YAA+B;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAA,kBAAc,EAAC,YAAY,CAAC,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,CAAC,YAA+B;QACpC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,kBAAc,EAAC,YAAY,CAAC,CAAC,CAAC;IACvD,CAAC;IACD,GAAG,CAAC,YAA+B;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAA,kBAAc,EAAC,YAAY,CAAC,CAAC,CAAC;IAC3D,CAAC;CACF;AA3BD,kCA2BC;AAED,kBAAe,WAAW,CAAC","sourcesContent":["import DisTubeBase from \"../DisTubeBase\";\nimport { resolveGuildID } from \"../..\";\nimport { Collection } from \"discord.js\";\nimport type { DisTube, GuildIDResolvable } from \"../..\";\n\n/**\n * Manages the collection of a data model.\n * @abstract\n * @private\n */\nexport abstract class BaseManager<V> extends DisTubeBase {\n  collection: Collection<string, V>;\n  constructor(distube: DisTube) {\n    super(distube);\n    /**\n     * Collection of of a data model.\n     * @type {Discord.Collection}\n     */\n    this.collection = new Collection();\n  }\n  add(id: string, data: V) {\n    const existing = this.get(id);\n    if (existing) {\n      return existing;\n    }\n    this.collection.set(id, data);\n    return data;\n  }\n  get(idOrInstance: GuildIDResolvable): V | undefined {\n    return this.collection.get(resolveGuildID(idOrInstance));\n  }\n  delete(idOrInstance: GuildIDResolvable): void {\n    this.collection.delete(resolveGuildID(idOrInstance));\n  }\n  has(idOrInstance: GuildIDResolvable): boolean {\n    return this.collection.has(resolveGuildID(idOrInstance));\n  }\n}\n\nexport default BaseManager;\n"]}
+{"version":3,"file":"BaseManager.js","sourceRoot":"","sources":["../../../src/core/manager/BaseManager.ts"],"names":[],"mappings":";;;AAAA,0BAAiC;AACjC,6BAAuC;AACvC,2CAAwC;AAGxC;;;;;GAKG;AACH,MAAsB,WAAe,SAAQ,eAAW;IAAxD;;QACE;;;;WAIG;QACH,eAAU,GAAG,IAAI,uBAAU,EAAa,CAAC;IAkB3C,CAAC;IAjBC,GAAG,CAAC,EAAU,EAAE,IAAO;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC;SACjB;QACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,GAAG,CAAC,YAA+B;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAA,kBAAc,EAAC,YAAY,CAAC,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,CAAC,YAA+B;QACpC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,kBAAc,EAAC,YAAY,CAAC,CAAC,CAAC;IACvD,CAAC;IACD,GAAG,CAAC,YAA+B;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAA,kBAAc,EAAC,YAAY,CAAC,CAAC,CAAC;IAC3D,CAAC;CACF;AAxBD,kCAwBC","sourcesContent":["import { DisTubeBase } from \"..\";\nimport { resolveGuildId } from \"../..\";\nimport { Collection } from \"discord.js\";\nimport type { GuildIdResolvable } from \"../..\";\n\n/**\n * Manages the collection of a data model.\n * @abstract\n * @private\n * @extends DisTubeBase\n */\nexport abstract class BaseManager<V> extends DisTubeBase {\n  /**\n   * The collection of items for this manager.\n   * @type {Discord.Collection}\n   * @abstract\n   */\n  collection = new Collection<string, V>();\n  add(id: string, data: V) {\n    const existing = this.get(id);\n    if (existing) {\n      return existing;\n    }\n    this.collection.set(id, data);\n    return data;\n  }\n  get(idOrInstance: GuildIdResolvable): V | undefined {\n    return this.collection.get(resolveGuildId(idOrInstance));\n  }\n  delete(idOrInstance: GuildIdResolvable): void {\n    this.collection.delete(resolveGuildId(idOrInstance));\n  }\n  has(idOrInstance: GuildIdResolvable): boolean {\n    return this.collection.has(resolveGuildId(idOrInstance));\n  }\n}\n"]}

package/dist/core/manager/QueueManager.d.ts

@@ -1,47 +1,27 @@
 import { BaseManager } from ".";
 import { Queue } from "../..";
 import type { Song } from "../..";
-import type { StageChannel, TextChannel, VoiceChannel } from "discord.js";
+import type { GuildTextBasedChannel, VoiceBasedChannel } from "discord.js";
 /**
  * Queue manager
+ * @extends BaseManager
  */
 export declare class QueueManager extends BaseManager<Queue> {
+    #private;
+    /**
+     * Collection of {@link Queue}.
+     * @name QueueManager#collection
+     * @type {Discord.Collection<string, Queue>}
+     */
     /**
      * Create a {@link Queue}
      * @private
-     * @param {Discord.VoiceChannel|Discord.StageChannel} channel A voice channel
+     * @param {Discord.BaseGuildVoiceChannel} channel A voice channel
      * @param {Song|Song[]} song First song
-     * @param {Discord.TextChannel} textChannel Default text channel
+     * @param {Discord.BaseGuildTextChannel} textChannel Default text channel
      * @returns {Promise<Queue|true>} Returns `true` if encounter an error
      */
-    create(channel: VoiceChannel | StageChannel, song: Song[] | Song, textChannel?: TextChannel): Promise<Queue | true>;
-    /**
-     * Get a Queue from this QueueManager.
-     * @method get
-     * @memberof QueueManager#
-     * @param {GuildIDResolvable} queue Resolvable thing from a guild
-     * @returns {Queue?}
-     */
-    /**
-     * Listen to DisTubeVoice events and handle the Queue
-     * @private
-     * @param {Queue} queue Queue
-     */
-    private _voiceEventHandler;
-    /**
-     * Handle the queue when a Song finish
-     * @private
-     * @param {Queue} queue queue
-     * @returns {Promise<void>}
-     */
-    private _handleSongFinish;
-    /**
-     * Handle error while playing
-     * @private
-     * @param {Queue} queue queue
-     * @param {Error} error error
-     */
-    private _handlePlayingError;
+    create(channel: VoiceBasedChannel, song: Song[] | Song, textChannel?: GuildTextBasedChannel): Promise<Queue | true>;
     /**
      * Play a song on voice connection
      * @private
@@ -49,12 +29,5 @@ export declare class QueueManager extends BaseManager<Queue> {
      * @returns {Promise<boolean>} error?
      */
     playSong(queue: Queue): Promise<boolean>;
-    /**
-     * Whether or not emit playSong event
-     * @param {Queue} queue Queue
-     * @private
-     * @returns {boolean}
-     */
-    private _emitPlaySong;
 }
 //# sourceMappingURL=QueueManager.d.ts.map

package/dist/core/manager/QueueManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueueManager.d.ts","sourceRoot":"","sources":["../../../src/core/manager/QueueManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC;AAChC,OAAO,EAAgB,KAAK,EAAc,MAAM,OAAO,CAAC;AACxD,OAAO,KAAK,EAAsB,IAAI,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1E;;GAEG;AACH,qBAAa,YAAa,SAAQ,WAAW,CAAC,KAAK,CAAC;IAClD;;;;;;;OAOG;IACG,MAAM,CACV,OAAO,EAAE,YAAY,GAAG,YAAY,EACpC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EACnB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAgBxB;;;;;;OAMG;IACH;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAc1B;;;;;OAKG;YACW,iBAAiB;IAyC/B;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAgB3B;;;;;OAKG;IACG,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC;IAiC9C;;;;;OAKG;IACH,OAAO,CAAC,aAAa;CAOtB"}
+{"version":3,"file":"QueueManager.d.ts","sourceRoot":"","sources":["../../../src/core/manager/QueueManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC;AAChC,OAAO,EAAgB,KAAK,EAAc,MAAM,OAAO,CAAC;AACxD,OAAO,KAAK,EAAsB,IAAI,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE3E;;;GAGG;AACH,qBAAa,YAAa,SAAQ,WAAW,CAAC,KAAK,CAAC;;IAClD;;;;OAIG;IACH;;;;;;;OAOG;IACG,MAAM,CACV,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EACnB,WAAW,CAAC,EAAE,qBAAqB,GAClC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IA+GxB;;;;;OAKG;IACG,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC;CA2C/C"}

package/dist/core/manager/QueueManager.js

@@ -1,18 +1,34 @@
 "use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _QueueManager_instances, _QueueManager_voiceEventHandler, _QueueManager_handleSongFinish, _QueueManager_handlePlayingError, _QueueManager_emitPlaySong;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueueManager = void 0;
 const _1 = require(".");
 const __1 = require("../..");
 /**
  * Queue manager
+ * @extends BaseManager
  */
 class QueueManager extends _1.BaseManager {
+    constructor() {
+        super(...arguments);
+        _QueueManager_instances.add(this);
+    }
+    /**
+     * Collection of {@link Queue}.
+     * @name QueueManager#collection
+     * @type {Discord.Collection<string, Queue>}
+     */
     /**
      * Create a {@link Queue}
      * @private
-     * @param {Discord.VoiceChannel|Discord.StageChannel} channel A voice channel
+     * @param {Discord.BaseGuildVoiceChannel} channel A voice channel
      * @param {Song|Song[]} song First song
-     * @param {Discord.TextChannel} textChannel Default text channel
+     * @param {Discord.BaseGuildTextChannel} textChannel Default text channel
      * @returns {Promise<Queue|true>} Returns `true` if encounter an error
      */
     async create(channel, song, textChannel) {
@@ -23,7 +39,7 @@ class QueueManager extends _1.BaseManager {
         await queue.taskQueue.queuing();
         try {
             await voice.join();
-            this._voiceEventHandler(queue);
+            __classPrivateFieldGet(this, _QueueManager_instances, "m", _QueueManager_voiceEventHandler).call(this, queue);
             this.add(queue.id, queue);
             this.emit("initQueue", queue);
             const err = await this.playSong(queue);
@@ -33,115 +49,6 @@ class QueueManager extends _1.BaseManager {
             queue.taskQueue.resolve();
         }
     }
-    /**
-     * Get a Queue from this QueueManager.
-     * @method get
-     * @memberof QueueManager#
-     * @param {GuildIDResolvable} queue Resolvable thing from a guild
-     * @returns {Queue?}
-     */
-    /**
-     * Listen to DisTubeVoice events and handle the Queue
-     * @private
-     * @param {Queue} queue Queue
-     */
-    _voiceEventHandler(queue) {
-        queue.listeners = {
-            disconnect: error => {
-                queue.delete();
-                this.emit("disconnect", queue);
-                if (error)
-                    this.emitError(error, queue.textChannel);
-            },
-            error: error => this._handlePlayingError(queue, error),
-            finish: () => this._handleSongFinish(queue),
-        };
-        for (const event of Object.keys(queue.listeners)) {
-            queue.voice.on(event, queue.listeners[event]);
-        }
-    }
-    /**
-     * Handle the queue when a Song finish
-     * @private
-     * @param {Queue} queue queue
-     * @returns {Promise<void>}
-     */
-    async _handleSongFinish(queue) {
-        this.emit("finishSong", queue, queue.songs[0]);
-        await queue.taskQueue.queuing();
-        try {
-            if (queue.stopped)
-                return;
-            if (queue.repeatMode === __1.RepeatMode.QUEUE && !queue.prev)
-                queue.songs.push(queue.songs[0]);
-            if (queue.prev) {
-                if (queue.repeatMode === __1.RepeatMode.QUEUE)
-                    queue.songs.unshift(queue.songs.pop());
-                else
-                    queue.songs.unshift(queue.previousSongs.pop());
-            }
-            if (queue.songs.length <= 1 && (queue.next || queue.repeatMode === __1.RepeatMode.DISABLED)) {
-                if (queue.autoplay) {
-                    try {
-                        await queue.addRelatedSong();
-                    }
-                    catch {
-                        this.emit("noRelated", queue);
-                    }
-                }
-                if (queue.songs.length <= 1) {
-                    if (this.options.leaveOnFinish)
-                        queue.voice.leave();
-                    if (!queue.autoplay)
-                        this.emit("finish", queue);
-                    queue.delete();
-                    return;
-                }
-            }
-            const emitPlaySong = this._emitPlaySong(queue);
-            if (!queue.prev && (queue.repeatMode !== __1.RepeatMode.SONG || queue.next)) {
-                const prev = queue.songs.shift();
-                delete prev.formats;
-                delete prev.streamURL;
-                if (this.options.savePreviousSongs)
-                    queue.previousSongs.push(prev);
-                else
-                    queue.previousSongs.push({ id: prev.id });
-            }
-            queue.next = queue.prev = false;
-            queue.beginTime = 0;
-            const err = await this.playSong(queue);
-            if (!err && emitPlaySong)
-                this.emit("playSong", queue, queue.songs[0]);
-        }
-        finally {
-            queue.taskQueue.resolve();
-        }
-    }
-    /**
-     * Handle error while playing
-     * @private
-     * @param {Queue} queue queue
-     * @param {Error} error error
-     */
-    _handlePlayingError(queue, error) {
-        const song = queue.songs.shift();
-        try {
-            error.name = "PlayingError";
-            error.message = `${error.message}\nID: ${song.id}\nName: ${song.name}`;
-        }
-        catch { }
-        this.emitError(error, queue.textChannel);
-        if (queue.songs.length > 0) {
-            this.playSong(queue).then(e => {
-                if (!e)
-                    this.emit("playSong", queue, queue.songs[0]);
-            });
-        }
-        else {
-            queue.stop();
-        }
-    }
     /**
      * Play a song on voice connection
      * @private
@@ -165,10 +72,7 @@ class QueueManager extends _1.BaseManager {
             if (source !== "youtube" && !streamURL) {
                 for (const plugin of [...this.distube.extractorPlugins, ...this.distube.customPlugins]) {
                     if (await plugin.validate(url)) {
-                        const info = [plugin.getStreamURL(url), plugin.getRelatedSongs(url)];
-                        const result = await Promise.all(info);
-                        song.streamURL = result[0];
-                        song.related = result[1];
+                        song.streamURL = await plugin.getStreamURL(url);
                         break;
                     }
                 }
@@ -183,22 +87,104 @@ class QueueManager extends _1.BaseManager {
             return false;
         }
         catch (e) {
-            this._handlePlayingError(queue, e);
+            __classPrivateFieldGet(this, _QueueManager_instances, "m", _QueueManager_handlePlayingError).call(this, queue, e);
             return true;
         }
     }
-    /**
-     * Whether or not emit playSong event
-     * @param {Queue} queue Queue
-     * @private
-     * @returns {boolean}
-     */
-    _emitPlaySong(queue) {
-        var _a, _b;
-        return (!this.options.emitNewSongOnly ||
-            (queue.repeatMode === __1.RepeatMode.SONG && queue.next) ||
-            (queue.repeatMode !== __1.RepeatMode.SONG && ((_a = queue.songs[0]) === null || _a === void 0 ? void 0 : _a.id) !== ((_b = queue.songs[1]) === null || _b === void 0 ? void 0 : _b.id)));
-    }
 }
 exports.QueueManager = QueueManager;
+_QueueManager_instances = new WeakSet(), _QueueManager_voiceEventHandler = function _QueueManager_voiceEventHandler(queue) {
+    queue.listeners = {
+        disconnect: error => {
+            queue.delete();
+            this.emit("disconnect", queue);
+            if (error)
+                this.emitError(error, queue.textChannel);
+        },
+        error: error => __classPrivateFieldGet(this, _QueueManager_instances, "m", _QueueManager_handlePlayingError).call(this, queue, error),
+        finish: () => __classPrivateFieldGet(this, _QueueManager_instances, "m", _QueueManager_handleSongFinish).call(this, queue),
+    };
+    for (const event of Object.keys(queue.listeners)) {
+        queue.voice.on(event, queue.listeners[event]);
+    }
+}, _QueueManager_handleSongFinish = 
+/**
+ * Handle the queue when a Song finish
+ * @private
+ * @param {Queue} queue queue
+ * @returns {Promise<void>}
+ */
+async function _QueueManager_handleSongFinish(queue) {
+    this.emit("finishSong", queue, queue.songs[0]);
+    await queue.taskQueue.queuing();
+    try {
+        if (queue.stopped)
+            return;
+        if (queue.repeatMode === __1.RepeatMode.QUEUE && !queue.prev)
+            queue.songs.push(queue.songs[0]);
+        if (queue.prev) {
+            if (queue.repeatMode === __1.RepeatMode.QUEUE)
+                queue.songs.unshift(queue.songs.pop());
+            else
+                queue.songs.unshift(queue.previousSongs.pop());
+        }
+        if (queue.songs.length <= 1 && (queue.next || queue.repeatMode === __1.RepeatMode.DISABLED)) {
+            if (queue.autoplay) {
+                try {
+                    await queue.addRelatedSong();
+                }
+                catch {
+                    this.emit("noRelated", queue);
+                }
+            }
+            if (queue.songs.length <= 1) {
+                if (this.options.leaveOnFinish)
+                    queue.voice.leave();
+                if (!queue.autoplay)
+                    this.emit("finish", queue);
+                queue.delete();
+                return;
+            }
+        }
+        const emitPlaySong = __classPrivateFieldGet(this, _QueueManager_instances, "m", _QueueManager_emitPlaySong).call(this, queue);
+        if (!queue.prev && (queue.repeatMode !== __1.RepeatMode.SONG || queue.next)) {
+            const prev = queue.songs.shift();
+            delete prev.formats;
+            delete prev.streamURL;
+            if (this.options.savePreviousSongs)
+                queue.previousSongs.push(prev);
+            else
+                queue.previousSongs.push({ id: prev.id });
+        }
+        queue.next = queue.prev = false;
+        queue.beginTime = 0;
+        const err = await this.playSong(queue);
+        if (!err && emitPlaySong)
+            this.emit("playSong", queue, queue.songs[0]);
+    }
+    finally {
+        queue.taskQueue.resolve();
+    }
+}, _QueueManager_handlePlayingError = function _QueueManager_handlePlayingError(queue, error) {
+    const song = queue.songs.shift();
+    try {
+        error.name = "PlayingError";
+        error.message = `${error.message}\nId: ${song.id}\nName: ${song.name}`;
+    }
+    catch { }
+    this.emitError(error, queue.textChannel);
+    if (queue.songs.length > 0) {
+        this.playSong(queue).then(e => {
+            if (!e)
+                this.emit("playSong", queue, queue.songs[0]);
+        });
+    }
+    else {
+        queue.stop();
+    }
+}, _QueueManager_emitPlaySong = function _QueueManager_emitPlaySong(queue) {
+    return (!this.options.emitNewSongOnly ||
+        (queue.repeatMode === __1.RepeatMode.SONG && queue.next) ||
+        (queue.repeatMode !== __1.RepeatMode.SONG && queue.songs[0]?.id !== queue.songs[1]?.id));
+};
 //# sourceMappingURL=QueueManager.js.map

package/dist/core/manager/QueueManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueueManager.js","sourceRoot":"","sources":["../../../src/core/manager/QueueManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseManager } from \".\";\nimport { DisTubeError, Queue, RepeatMode } from \"../..\";\nimport type { DisTubeVoiceEvents, Song } from \"../..\";\nimport type { StageChannel, TextChannel, VoiceChannel } from \"discord.js\";\n\n/**\n * Queue manager\n */\nexport class QueueManager extends BaseManager<Queue> {\n  /**\n   * Create a {@link Queue}\n   * @private\n   * @param {Discord.VoiceChannel|Discord.StageChannel} channel A voice channel\n   * @param {Song|Song[]} song First song\n   * @param {Discord.TextChannel} textChannel Default text channel\n   * @returns {Promise<Queue|true>} Returns `true` if encounter an error\n   */\n  async create(\n    channel: VoiceChannel | StageChannel,\n    song: Song[] | Song,\n    textChannel?: TextChannel,\n  ): Promise<Queue | true> {\n    if (this.has(channel.guild.id)) throw new DisTubeError(\"QUEUE_EXIST\");\n    const voice = this.voices.create(channel);\n    const queue = new Queue(this.distube, voice, song, textChannel);\n    await queue.taskQueue.queuing();\n    try {\n      await voice.join();\n      this._voiceEventHandler(queue);\n      this.add(queue.id, queue);\n      this.emit(\"initQueue\", queue);\n      const err = await this.playSong(queue);\n      return err || queue;\n    } finally {\n      queue.taskQueue.resolve();\n    }\n  }\n  /**\n   * Get a Queue from this QueueManager.\n   * @method get\n   * @memberof QueueManager#\n   * @param {GuildIDResolvable} queue Resolvable thing from a guild\n   * @returns {Queue?}\n   */\n  /**\n   * Listen to DisTubeVoice events and handle the Queue\n   * @private\n   * @param {Queue} queue Queue\n   */\n  private _voiceEventHandler(queue: Queue) {\n    queue.listeners = {\n      disconnect: error => {\n        queue.delete();\n        this.emit(\"disconnect\", queue);\n        if (error) this.emitError(error, queue.textChannel);\n      },\n      error: error => this._handlePlayingError(queue, error),\n      finish: () => this._handleSongFinish(queue),\n    };\n    for (const event of Object.keys(queue.listeners) as (keyof DisTubeVoiceEvents)[]) {\n      queue.voice.on(event, queue.listeners[event]);\n    }\n  }\n  /**\n   * Handle the queue when a Song finish\n   * @private\n   * @param {Queue} queue queue\n   * @returns {Promise<void>}\n   */\n  private async _handleSongFinish(queue: Queue): Promise<void> {\n    this.emit(\"finishSong\", queue, queue.songs[0]);\n    await queue.taskQueue.queuing();\n    try {\n      if (queue.stopped) return;\n      if (queue.repeatMode === RepeatMode.QUEUE && !queue.prev) queue.songs.push(queue.songs[0]);\n      if (queue.prev) {\n        if (queue.repeatMode === RepeatMode.QUEUE) queue.songs.unshift(queue.songs.pop() as Song);\n        else queue.songs.unshift(queue.previousSongs.pop() as Song);\n      }\n      if (queue.songs.length <= 1 && (queue.next || queue.repeatMode === RepeatMode.DISABLED)) {\n        if (queue.autoplay) {\n          try {\n            await queue.addRelatedSong();\n          } catch {\n            this.emit(\"noRelated\", queue);\n          }\n        }\n        if (queue.songs.length <= 1) {\n          if (this.options.leaveOnFinish) queue.voice.leave();\n          if (!queue.autoplay) this.emit(\"finish\", queue);\n          queue.delete();\n          return;\n        }\n      }\n      const emitPlaySong = this._emitPlaySong(queue);\n      if (!queue.prev && (queue.repeatMode !== RepeatMode.SONG || queue.next)) {\n        const prev = queue.songs.shift() as Song;\n        delete prev.formats;\n        delete prev.streamURL;\n        if (this.options.savePreviousSongs) queue.previousSongs.push(prev);\n        else queue.previousSongs.push({ id: prev.id } as Song);\n      }\n      queue.next = queue.prev = false;\n      queue.beginTime = 0;\n      const err = await this.playSong(queue);\n      if (!err && emitPlaySong) this.emit(\"playSong\", queue, queue.songs[0]);\n    } finally {\n      queue.taskQueue.resolve();\n    }\n  }\n  /**\n   * Handle error while playing\n   * @private\n   * @param {Queue} queue queue\n   * @param {Error} error error\n   */\n  private _handlePlayingError(queue: Queue, error: Error) {\n    const song = queue.songs.shift() as Song;\n    try {\n      error.name = \"PlayingError\";\n      error.message = `${error.message}\\nID: ${song.id}\\nName: ${song.name}`;\n    } catch {}\n    this.emitError(error, queue.textChannel);\n    if (queue.songs.length > 0) {\n      this.playSong(queue).then(e => {\n        if (!e) this.emit(\"playSong\", queue, queue.songs[0]);\n      });\n    } else {\n      queue.stop();\n    }\n  }\n\n  /**\n   * Play a song on voice connection\n   * @private\n   * @param {Queue} queue The guild queue\n   * @returns {Promise<boolean>} error?\n   */\n  async playSong(queue: Queue): Promise<boolean> {\n    if (!queue) return true;\n    if (!queue.songs.length) {\n      queue.stop();\n      return true;\n    }\n    if (queue.stopped) return false;\n    const song = queue.songs[0];\n    try {\n      const { url, source, formats, streamURL } = song;\n      if (source === \"youtube\" && !formats) song._patchYouTube(await this.handler.getYouTubeInfo(url));\n      if (source !== \"youtube\" && !streamURL) {\n        for (const plugin of [...this.distube.extractorPlugins, ...this.distube.customPlugins]) {\n          if (await plugin.validate(url)) {\n            const info = [plugin.getStreamURL(url), plugin.getRelatedSongs(url)] as const;\n            const result = await Promise.all(info);\n            song.streamURL = result[0];\n            song.related = result[1];\n            break;\n          }\n        }\n      }\n      const stream = this.handler.createStream(queue);\n      queue.voice.play(stream);\n      song.streamURL = stream.url;\n      if (queue.stopped) queue.stop();\n      else if (queue.paused) queue.voice.pause();\n      return false;\n    } catch (e: any) {\n      this._handlePlayingError(queue, e);\n      return true;\n    }\n  }\n  /**\n   * Whether or not emit playSong event\n   * @param {Queue} queue Queue\n   * @private\n   * @returns {boolean}\n   */\n  private _emitPlaySong(queue: Queue): boolean {\n    return (\n      !this.options.emitNewSongOnly ||\n      (queue.repeatMode === RepeatMode.SONG && queue.next) ||\n      (queue.repeatMode !== RepeatMode.SONG && queue.songs[0]?.id !== queue.songs[1]?.id)\n    );\n  }\n}\n"]}
+{"version":3,"file":"QueueManager.js","sourceRoot":"","sources":["../../../src/core/manager/QueueManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseManager } from \".\";\nimport { DisTubeError, Queue, RepeatMode } from \"../..\";\nimport type { DisTubeVoiceEvents, Song } from \"../..\";\nimport type { GuildTextBasedChannel, VoiceBasedChannel } from \"discord.js\";\n\n/**\n * Queue manager\n * @extends BaseManager\n */\nexport class QueueManager extends BaseManager<Queue> {\n  /**\n   * Collection of {@link Queue}.\n   * @name QueueManager#collection\n   * @type {Discord.Collection<string, Queue>}\n   */\n  /**\n   * Create a {@link Queue}\n   * @private\n   * @param {Discord.BaseGuildVoiceChannel} channel A voice channel\n   * @param {Song|Song[]} song First song\n   * @param {Discord.BaseGuildTextChannel} textChannel Default text channel\n   * @returns {Promise<Queue|true>} Returns `true` if encounter an error\n   */\n  async create(\n    channel: VoiceBasedChannel,\n    song: Song[] | Song,\n    textChannel?: GuildTextBasedChannel,\n  ): Promise<Queue | true> {\n    if (this.has(channel.guild.id)) throw new DisTubeError(\"QUEUE_EXIST\");\n    const voice = this.voices.create(channel);\n    const queue = new Queue(this.distube, voice, song, textChannel);\n    await queue.taskQueue.queuing();\n    try {\n      await voice.join();\n      this.#voiceEventHandler(queue);\n      this.add(queue.id, queue);\n      this.emit(\"initQueue\", queue);\n      const err = await this.playSong(queue);\n      return err || queue;\n    } finally {\n      queue.taskQueue.resolve();\n    }\n  }\n  /**\n   * Get a Queue from this QueueManager.\n   * @method get\n   * @memberof QueueManager#\n   * @param {GuildIdResolvable} queue Resolvable thing from a guild\n   * @returns {Queue?}\n   */\n  /**\n   * Listen to DisTubeVoice events and handle the Queue\n   * @private\n   * @param {Queue} queue Queue\n   */\n  #voiceEventHandler(queue: Queue) {\n    queue.listeners = {\n      disconnect: error => {\n        queue.delete();\n        this.emit(\"disconnect\", queue);\n        if (error) this.emitError(error, queue.textChannel);\n      },\n      error: error => this.#handlePlayingError(queue, error),\n      finish: () => this.#handleSongFinish(queue),\n    };\n    for (const event of Object.keys(queue.listeners) as (keyof DisTubeVoiceEvents)[]) {\n      queue.voice.on(event, queue.listeners[event]);\n    }\n  }\n  /**\n   * Handle the queue when a Song finish\n   * @private\n   * @param {Queue} queue queue\n   * @returns {Promise<void>}\n   */\n  async #handleSongFinish(queue: Queue): Promise<void> {\n    this.emit(\"finishSong\", queue, queue.songs[0]);\n    await queue.taskQueue.queuing();\n    try {\n      if (queue.stopped) return;\n      if (queue.repeatMode === RepeatMode.QUEUE && !queue.prev) queue.songs.push(queue.songs[0]);\n      if (queue.prev) {\n        if (queue.repeatMode === RepeatMode.QUEUE) queue.songs.unshift(queue.songs.pop() as Song);\n        else queue.songs.unshift(queue.previousSongs.pop() as Song);\n      }\n      if (queue.songs.length <= 1 && (queue.next || queue.repeatMode === RepeatMode.DISABLED)) {\n        if (queue.autoplay) {\n          try {\n            await queue.addRelatedSong();\n          } catch {\n            this.emit(\"noRelated\", queue);\n          }\n        }\n        if (queue.songs.length <= 1) {\n          if (this.options.leaveOnFinish) queue.voice.leave();\n          if (!queue.autoplay) this.emit(\"finish\", queue);\n          queue.delete();\n          return;\n        }\n      }\n      const emitPlaySong = this.#emitPlaySong(queue);\n      if (!queue.prev && (queue.repeatMode !== RepeatMode.SONG || queue.next)) {\n        const prev = queue.songs.shift() as Song;\n        delete prev.formats;\n        delete prev.streamURL;\n        if (this.options.savePreviousSongs) queue.previousSongs.push(prev);\n        else queue.previousSongs.push({ id: prev.id } as Song);\n      }\n      queue.next = queue.prev = false;\n      queue.beginTime = 0;\n      const err = await this.playSong(queue);\n      if (!err && emitPlaySong) this.emit(\"playSong\", queue, queue.songs[0]);\n    } finally {\n      queue.taskQueue.resolve();\n    }\n  }\n  /**\n   * Handle error while playing\n   * @private\n   * @param {Queue} queue queue\n   * @param {Error} error error\n   */\n  #handlePlayingError(queue: Queue, error: Error) {\n    const song = queue.songs.shift() as Song;\n    try {\n      error.name = \"PlayingError\";\n      error.message = `${error.message}\\nId: ${song.id}\\nName: ${song.name}`;\n    } catch {}\n    this.emitError(error, queue.textChannel);\n    if (queue.songs.length > 0) {\n      this.playSong(queue).then(e => {\n        if (!e) this.emit(\"playSong\", queue, queue.songs[0]);\n      });\n    } else {\n      queue.stop();\n    }\n  }\n\n  /**\n   * Play a song on voice connection\n   * @private\n   * @param {Queue} queue The guild queue\n   * @returns {Promise<boolean>} error?\n   */\n  async playSong(queue: Queue): Promise<boolean> {\n    if (!queue) return true;\n    if (!queue.songs.length) {\n      queue.stop();\n      return true;\n    }\n    if (queue.stopped) return false;\n    const song = queue.songs[0];\n    try {\n      const { url, source, formats, streamURL } = song;\n      if (source === \"youtube\" && !formats) song._patchYouTube(await this.handler.getYouTubeInfo(url));\n      if (source !== \"youtube\" && !streamURL) {\n        for (const plugin of [...this.distube.extractorPlugins, ...this.distube.customPlugins]) {\n          if (await plugin.validate(url)) {\n            song.streamURL = await plugin.getStreamURL(url);\n            break;\n          }\n        }\n      }\n      const stream = this.handler.createStream(queue);\n      queue.voice.play(stream);\n      song.streamURL = stream.url;\n      if (queue.stopped) queue.stop();\n      else if (queue.paused) queue.voice.pause();\n      return false;\n    } catch (e: any) {\n      this.#handlePlayingError(queue, e);\n      return true;\n    }\n  }\n  /**\n   * Whether or not emit playSong event\n   * @param {Queue} queue Queue\n   * @private\n   * @returns {boolean}\n   */\n  #emitPlaySong(queue: Queue): boolean {\n    return (\n      !this.options.emitNewSongOnly ||\n      (queue.repeatMode === RepeatMode.SONG && queue.next) ||\n      (queue.repeatMode !== RepeatMode.SONG && queue.songs[0]?.id !== queue.songs[1]?.id)\n    );\n  }\n}\n"]}

package/dist/core/voice/DJSAdapter.js

@@ -9,21 +9,18 @@ function trackClient(client) {
         return;
     trackedClients.add(client);
     client.ws.on(discord_js_1.Constants.WSEvents.VOICE_SERVER_UPDATE, (payload) => {
-        var _a;
-        (_a = adapters.get(payload.guild_id)) === null || _a === void 0 ? void 0 : _a.onVoiceServerUpdate(payload);
+        adapters.get(payload.guild_id)?.onVoiceServerUpdate(payload);
     });
     client.ws.on(discord_js_1.Constants.WSEvents.VOICE_STATE_UPDATE, (payload) => {
-        var _a, _b;
-        if (payload.guild_id && payload.session_id && payload.user_id === ((_a = client.user) === null || _a === void 0 ? void 0 : _a.id)) {
-            (_b = adapters.get(payload.guild_id)) === null || _b === void 0 ? void 0 : _b.onVoiceStateUpdate(payload);
+        if (payload.guild_id && payload.session_id && payload.user_id === client.user?.id) {
+            adapters.get(payload.guild_id)?.onVoiceStateUpdate(payload);
         }
     });
     client.on(discord_js_1.Constants.Events.SHARD_DISCONNECT, (_, shardID) => {
-        var _a;
         const guilds = trackedShards.get(shardID);
         if (guilds) {
             for (const guildID of guilds.values()) {
-                (_a = adapters.get(guildID)) === null || _a === void 0 ? void 0 : _a.destroy();
+                adapters.get(guildID)?.destroy();
             }
         }
         trackedShards.delete(shardID);